Merge branch 'main' into brennanb2025/agent-status-child-marker-revision-rule

.github/pull_request_template.md

@@ -1,14 +1,14 @@
 ## ELI5
 
-<!-- Simple high-level explanation -->
+<!-- Simple high-level explanation, in plain language. No jargon. -->
 
 ## What Changed
 
-<!-- Describe the change clearly and keep scope tight. -->
+<!-- Describe the change clearly and keep scope tight. Cover the before and after as the user experiences it, and the mechanism you changed — not just the symptom. -->
 
 ## Why
 
-<!-- What problem does this solve, and why is this approach right? -->
+<!-- What problem does this solve, and why is this approach better than the alternatives you considered? -->
 
 ## Linked Issue
 
@@ -47,7 +47,7 @@ Ensure no issues in: Security, Cross-platoform support (Linux, Windows, Mac), Re
 ## Checklist
 
 - [ ] This PR is small and focused
-- [ ] I explained what changed and why (including ELI5)
+- [ ] I explained what changed and why (ELI5, the user-facing before/after, the mechanism, and why over the alternatives)
 - [ ] Before/after screenshots or videos attached for UI changes, or `N/A` with reason
 - [ ] Self-reviewed for correctness, security, and performance
 - [ ] Cross-platform, SSH/remote, and path/shortcut impact considered (or N/A)

.github/workflows/mobile.yml

@@ -12,6 +12,20 @@ on:
       # Why: the mobile terminal link parsers are conformance-tested against
       # these shared fixtures; desktop-side fixture edits must re-run this suite.
       - 'src/shared/terminal-file-link-conformance.ts'
+      # Why: mobile imports the negotiated capability names directly and records
+      # the whole capability read verbatim in its goldens, so a capability added
+      # desktop-side rewrites a mobile fixture and must re-run this suite.
+      - 'src/shared/protocol-version.ts'
+      # Why: mobile's rpc-params-contract.ts is a type-only re-export of the
+      # generated params catalog, and mobile/tsconfig.json includes **/*.ts. A
+      # schema edit anywhere under here changes mobile's types, so a desktop-only
+      # change can break mobile's typecheck with no other mobile signal.
+      - 'src/shared/rpc-contract/**'
+      # Why: the catalog above holds params only. This file is the sole holder of
+      # the agent.launch RESULT shape, and mobile imports it as a value, not just
+      # a type. CROSS_VERSION_WIRE_PREFIXES already treats it as wire-critical, so
+      # without this one gate classes it that way while this one cannot see it.
+      - 'src/shared/agent-launch-intent.ts'
       # Why: this job holds the only checks that load the Fastfile, so edits to
       # it or to the release workflow it guards must re-run them.
       - '.github/workflows/mobile.yml'

AGENTS.md

@@ -48,6 +48,17 @@ Avoid type assertions except `as const`. Unavoidable casts need a line-specific
 - **Lint**: `oxlint`, or `pnpm run check:code-quality:changed` for changed files (full `pnpm lint` is slow); format with `pnpm format`
 - **Design system**: `pnpm run lint:design-system` for the full renderer report (not a gate); the changed-lines gate above is what CI enforces
 
+# Writing Pull Requests
+
+Fill in [`.github/pull_request_template.md`](./.github/pull_request_template.md), written for a reviewer who has never seen this code:
+
+- No jargon — plain language, no internal shorthand.
+- The before and after as the user experiences it.
+- The mechanism you changed, not just the symptom.
+- Why this approach over the alternatives you considered.
+
+Cover all four concisely. Don't pad or walk the diff.
+
 # Considerations
 
 ## Worktree Safety

cloud/apps/relay/src/cell-inventory-hold-samples.test.ts

@@ -67,4 +67,46 @@ describe('cell inventory hold samples', () => {
     expect(samples.consumeCounts().cellInventoryHolds).toBe(2)
     expect(samples.consumeCounts()).toEqual(emptyCellInventoryHoldCounts())
   })
+
+  // Why: this is the case the hold metrics alone cannot see. A NOWAIT grab that
+  // fails has no duration, so a retry storm used to leave every hold field at
+  // zero while the lock was saturated.
+  it('counts failed acquisitions in a window that recorded no holds', () => {
+    const samples = new CellInventoryHoldSamples()
+    for (let attempt = 0; attempt < 65; attempt++) samples.recordUnavailable()
+
+    const counts = samples.readCounts()
+
+    expect(counts.cellInventoryLockUnavailable).toBe(65)
+    expect(counts.cellInventoryHolds).toBe(0)
+    expect(counts.cellInventoryHoldMsMax).toBe(0)
+  })
+
+  it('reports failed acquisitions alongside the holds that did succeed', () => {
+    const samples = samplesOf([12, 34])
+    samples.recordUnavailable(3)
+
+    expect(samples.readCounts()).toMatchObject({
+      cellInventoryHolds: 2,
+      cellInventoryHoldMsMax: 34,
+      cellInventoryLockUnavailable: 3
+    })
+  })
+
+  it('ignores a failure count that is not a positive number', () => {
+    const samples = new CellInventoryHoldSamples()
+    samples.recordUnavailable(0)
+    samples.recordUnavailable(-2)
+    samples.recordUnavailable(Number.NaN)
+
+    expect(samples.readCounts()).toEqual(emptyCellInventoryHoldCounts())
+  })
+
+  it('resets failed acquisitions on consume', () => {
+    const samples = new CellInventoryHoldSamples()
+    samples.recordUnavailable(4)
+
+    expect(samples.consumeCounts().cellInventoryLockUnavailable).toBe(4)
+    expect(samples.consumeCounts()).toEqual(emptyCellInventoryHoldCounts())
+  })
 })

cloud/apps/relay/src/cell-inventory-hold-samples.ts

@@ -5,6 +5,14 @@ export type CellInventoryHoldCounts = {
   cellInventoryHoldMsMax: number
   cellInventoryHoldMsP95: number
   cellInventoryHolds: number
+  // Why: a failed acquisition produces no hold sample, so the hold fields alone
+  // read healthy while the lock is saturated. Split by wait policy, not by
+  // caller: fail-fast covers background sweeps that step aside by design AND
+  // request-path first attempts that retry, so it reads as contention pressure,
+  // not user-visible failure. An expired bounded wait has already spent its
+  // budget, so that lane is the one that tracks stalls.
+  cellInventoryLockUnavailable: number
+  cellInventoryLockTimeouts: number
 }
 
 // Bounded so a flush interval with heavy assignment traffic cannot grow the array
@@ -12,11 +20,19 @@ export type CellInventoryHoldCounts = {
 const MAX_SAMPLES = 2_048
 
 export function emptyCellInventoryHoldCounts(): CellInventoryHoldCounts {
-  return { cellInventoryHoldMsMax: 0, cellInventoryHoldMsP95: 0, cellInventoryHolds: 0 }
+  return {
+    cellInventoryHoldMsMax: 0,
+    cellInventoryHoldMsP95: 0,
+    cellInventoryHolds: 0,
+    cellInventoryLockUnavailable: 0,
+    cellInventoryLockTimeouts: 0
+  }
 }
 
 export class CellInventoryHoldSamples {
   private samples: number[] = []
+  private unavailable = 0
+  private timeouts = 0
 
   record(holdMs: number): void {
     if (!Number.isFinite(holdMs) || holdMs < 0) return
@@ -24,19 +40,37 @@ export class CellInventoryHoldSamples {
     this.samples.push(holdMs)
   }
 
+  // Counted, not sampled: a failed acquisition has no duration to record.
+  recordUnavailable(count = 1): void {
+    if (!Number.isFinite(count) || count <= 0) return
+    this.unavailable += count
+  }
+
+  recordLockTimeout(count = 1): void {
+    if (!Number.isFinite(count) || count <= 0) return
+    this.timeouts += count
+  }
+
   consumeCounts(): CellInventoryHoldCounts {
     const counts = this.readCounts()
     this.samples = []
+    this.unavailable = 0
+    this.timeouts = 0
     return counts
   }
 
   readCounts(): CellInventoryHoldCounts {
-    if (this.samples.length === 0) return emptyCellInventoryHoldCounts()
+    const failures = {
+      cellInventoryLockUnavailable: this.unavailable,
+      cellInventoryLockTimeouts: this.timeouts
+    }
+    if (this.samples.length === 0) return { ...emptyCellInventoryHoldCounts(), ...failures }
     const sorted = [...this.samples].sort((left, right) => left - right)
     return {
       cellInventoryHoldMsMax: round(sorted[sorted.length - 1]!),
       cellInventoryHoldMsP95: round(sorted[Math.ceil(0.95 * sorted.length) - 1] ?? 0),
-      cellInventoryHolds: sorted.length
+      cellInventoryHolds: sorted.length,
+      ...failures
     }
   }
 }

cloud/apps/relay/src/cell-inventory-lock-contention.test.ts

@@ -260,6 +260,64 @@ describe('bounded cell-inventory lock wait', () => {
     await database.close()
   })
 
+  // Why: the 55P03 rolls the transaction back, so a drain on the commit path
+  // alone would report zero for exactly the windows that were contended.
+  it('reports a NOWAIT deferral that rolled its transaction back', async () => {
+    const database = await openFakePostgres()
+    fakes.query.mockImplementation(async (sql: string) => {
+      if (sql.includes('FOR UPDATE NOWAIT')) {
+        throw Object.assign(new Error('could not obtain lock'), { code: '55P03' })
+      }
+      return { rows: [], rowCount: 0 }
+    })
+
+    await expect(
+      database.transaction(async (transaction) => {
+        await transaction.queryLocked(CELL_INVENTORY_SQL, [], {
+          failIfUnavailable: true,
+          measureHoldMs: true
+        })
+      })
+    ).rejects.toThrow('database_lock_unavailable')
+
+    const counts = consumeRelayCellInventoryHold(database)
+    expect(counts.cellInventoryLockUnavailable).toBe(1)
+    expect(counts.cellInventoryLockTimeouts).toBe(0)
+    await database.close()
+  })
+
+  // Why: a bounded request-path wait raises the same 55P03 without NOWAIT. Folding
+  // it into the deferral counter would hide user-visible stalls among by-design
+  // sweep skips, which outnumber them by roughly an order of magnitude.
+  it('counts an expired bounded wait apart from a NOWAIT deferral', async () => {
+    const database = await openFakePostgres()
+    fakes.query.mockImplementation(async (sql: string) => {
+      if (sql.includes('FOR UPDATE') && !sql.includes('NOWAIT')) {
+        throw Object.assign(new Error('canceling statement due to lock timeout'), {
+          code: '55P03'
+        })
+      }
+      return { rows: [], rowCount: 0 }
+    })
+
+    await expect(
+      database.transaction(async (transaction) => {
+        await transaction.queryLocked(CELL_INVENTORY_SQL, [], {
+          lockTimeoutMs: 500,
+          measureHoldMs: true
+        })
+      })
+    ).rejects.toThrow()
+
+    const counts = consumeRelayCellInventoryHold(database)
+    // One per attempt, not per request: 55P03 is retryable, so an exhausted
+    // request contributes POSTGRES_TRANSACTION_ATTEMPTS timeouts. Reading the
+    // metric as affected-requests would overstate it threefold.
+    expect(counts.cellInventoryLockTimeouts).toBe(3)
+    expect(counts.cellInventoryLockUnavailable).toBe(0)
+    await database.close()
+  })
+
   it('records no hold for a PostgreSQL transaction that took no measured lock', async () => {
     const database = await openFakePostgres()
 

cloud/apps/relay/src/database.ts

@@ -784,6 +784,8 @@ class SqliteDatabase extends SqliteTransaction {
 class PostgresTransaction implements RelayDatabase {
   readonly dialect = 'postgres' as const
   private heldFromMs: number | undefined
+  private lockUnavailable = 0
+  private lockTimeouts = 0
 
   constructor(protected readonly client: pg.PoolClient) {}
 
@@ -794,6 +796,20 @@ class PostgresTransaction implements RelayDatabase {
     return holdMs
   }
 
+  // Drained by the owning database on both the commit and the rollback path: a
+  // 55P03 rolls the transaction back, so counting only on success would drop it.
+  consumeLockUnavailable(): number {
+    const count = this.lockUnavailable
+    this.lockUnavailable = 0
+    return count
+  }
+
+  consumeLockTimeouts(): number {
+    const count = this.lockTimeouts
+    this.lockTimeouts = 0
+    return count
+  }
+
   async query(sql: string, params: unknown[] = []): Promise<SqlRow[]> {
     try {
       const result = await this.client.query(postgresSql(sql), params)
@@ -829,8 +845,14 @@ class PostgresTransaction implements RelayDatabase {
         options.failIfUnavailable &&
         String((error as { code?: unknown }).code) === '55P03'
       ) {
+        if (options.measureHoldMs) this.lockUnavailable += 1
         throw new Error('database_lock_unavailable')
       }
+      // A bounded wait that expires raises the same 55P03 without NOWAIT. This is
+      // the request path, so it is counted apart from by-design sweep deferrals.
+      if (bounded && options.measureHoldMs && String((error as { code?: unknown }).code) === '55P03') {
+        this.lockTimeouts += 1
+      }
       throw error
     } finally {
       // Restore on the error path too: the transaction may still be retried or
@@ -950,6 +972,7 @@ class PostgresDatabase implements RelayDatabase {
         options.failIfUnavailable &&
         String((error as { code?: unknown }).code) === '55P03'
       ) {
+        if (options.measureHoldMs) this.holds.recordUnavailable()
         throw new Error('database_lock_unavailable')
       }
       throw error
@@ -968,9 +991,13 @@ class PostgresDatabase implements RelayDatabase {
         const result = await operation(transaction)
         await client.query('COMMIT')
         this.holds.record(measuredHoldMs(transaction) ?? Number.NaN)
+        this.holds.recordUnavailable(transaction.consumeLockUnavailable())
+        this.holds.recordLockTimeout(transaction.consumeLockTimeouts())
         return result
       } catch (error) {
         await client.query('ROLLBACK').catch(() => undefined)
+        this.holds.recordUnavailable(transaction.consumeLockUnavailable())
+        this.holds.recordLockTimeout(transaction.consumeLockTimeouts())
         if (!retryablePostgresTransactionError(error) || attempt === POSTGRES_TRANSACTION_ATTEMPTS) {
           if (retryablePostgresTransactionError(error) && options.reportRetries !== false) {
             console.warn(

cloud/infra/terraform/relay-observability.tf

@@ -93,6 +93,11 @@ locals {
     db_waiters_max                     = { field = "databasePoolWaitersMax", description = "Maximum requests queued for a PostgreSQL connection during the interval." }
     db_oldest_wait_ms                  = { field = "databasePoolOldestWaitMs", description = "Current oldest PostgreSQL pool waiter age." }
     db_wait_ms_max                     = { field = "databasePoolWaitMsMax", description = "Maximum PostgreSQL pool wait during the interval." }
+    cell_inventory_hold_ms_max         = { field = "cellInventoryHoldMsMax", description = "Longest cell-inventory lock hold in the interval." }
+    cell_inventory_hold_ms_p95         = { field = "cellInventoryHoldMsP95", description = "Cell-inventory lock hold p95 in the interval; the bound is tuned against this." }
+    cell_inventory_holds               = { field = "cellInventoryHolds", description = "Cell-inventory locks acquired in the interval; the percentiles above summarise these." }
+    cell_inventory_lock_unavailable    = { field = "cellInventoryLockUnavailable", description = "Fail-fast cell-inventory acquisitions that found the lock held. Includes background sweeps, which step aside by design, so this is contention pressure rather than user-visible failure." }
+    cell_inventory_lock_timeouts       = { field = "cellInventoryLockTimeouts", description = "Bounded cell-inventory waits that expired, counted per attempt rather than per request. This is the user-visible lane." }
   }
 
   # Regions the director can hint or select. Pinned to relay-contract's RELAY_REGIONS by

config/localization-coverage-allowlist.json

@@ -89,5 +89,131 @@
     "text": "ghostty",
     "dynamic": false,
     "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:title",
+    "text": "Default shell",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:description",
+    "text": "Shell used for new terminal panes",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:keywords",
+    "text": "shell",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:keywords",
+    "text": "terminal",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:keywords",
+    "text": "fish",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:keywords",
+    "text": "zsh",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:keywords",
+    "text": "bash",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:keywords",
+    "text": "nushell",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:keywords",
+    "text": "default",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "jsx-attribute:title",
+    "text": "Terminal shell",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "jsx-attribute:description",
+    "text": "Choose what Orca opens for new local terminal panes.",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "jsx-attribute:ariaLabel",
+    "text": "Terminal shell",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:label",
+    "text": "System shell (",
+    "dynamic": true,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "object-property:label",
+    "text": "Custom shell",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "jsx-attribute:placeholder",
+    "text": "fish, nu, or /bin/zsh",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "jsx-attribute:aria-label",
+    "text": "Custom shell executable",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "jsx-text",
+    "text": "Enter a shell name on PATH or an executable path. Orca starts it as a login shell.",
+    "dynamic": false,
+    "count": 1
+  },
+  {
+    "filePath": "src/renderer/src/components/settings/TerminalPane.tsx",
+    "kind": "jsx-text",
+    "text": ". Switch to System shell or choose an executable on this host.",
+    "dynamic": false,
+    "count": 1
   }
 ]

config/scripts/computer-use-skill-guidance.test.mjs

@@ -12,14 +12,23 @@ const stubPath = join(projectDir, 'skills', 'computer-use', 'SKILL.md')
 const bundledGuide = BUNDLED_SKILL_GUIDES.find((guide) => guide.name === 'computer-use')?.markdown
 
 describe('computer-use skill guidance', () => {
-  it('keeps discovery scoped to desktop control and out of the embedded browser', () => {
+  it('keeps discovery scoped to last-resort GUI and out of the embedded browser', () => {
     const frontmatter = /^---\n([\s\S]*?)\n---\n/u.exec(readFileSync(guidePath, 'utf8'))?.[1] ?? ''
     const description = frontmatter.replace(/\s+/gu, ' ')
 
-    expect(description).toContain('OS/window-level inspection and input')
-    expect(description).toContain('external browser window')
-    expect(description).toContain("Not for Orca's embedded browser (use `orca-cli`)")
-    expect(description).toContain('page-only automation (use Playwright or CDP)')
+    expect(description).toContain('Drives the GUI of a visible local app window')
+    expect(description).toContain(
+      'Prefer a programmatic path (shell, filesystem, git, HTTP, existing CLIs) whenever it can complete the task.'
+    )
+    expect(description).toContain(
+      'Use only when a visible window needs GUI control those cannot reach.'
+    )
+    expect(description).toContain('external browser windows')
+    expect(description).toContain("Do not use for Orca's embedded browser (`orca-cli`)")
+    expect(description).not.toMatch(/Playwright/iu)
+    expect(description).not.toContain('page-only')
+    expect(description).not.toContain('OS/window-level')
+    expect(description).not.toContain('Desktop or Documents')
     expect(description).not.toContain('read Slack')
     expect(description).not.toContain('get app state')
   })
@@ -27,8 +36,15 @@ describe('computer-use skill guidance', () => {
   it('keeps web-app targeting on the computer-use surface', () => {
     const skill = readFileSync(guidePath, 'utf8')
 
-    expect(skill).toContain('Use this skill for desktop UI through `orca computer`')
-    expect(skill).toContain('external desktop browser window that needs desktop-level control')
+    expect(skill).toContain('Use this skill to drive a visible app window through `orca computer`')
+    expect(skill).toContain(
+      'Prefer a programmatic path (shell, filesystem, git, HTTP, existing CLIs) whenever it can complete the task'
+    )
+    expect(skill).toContain(
+      'use this skill only when a visible window needs GUI control those cannot reach'
+    )
+    expect(skill).toContain('browser windows (Chrome, Edge, Safari)')
+    expect(skill).not.toMatch(/Playwright/iu)
     expect(skill).not.toMatch(/\borca goto\b/iu)
     expect(skill).not.toMatch(/\borca snapshot\b/iu)
     expect(skill).not.toMatch(/\borca click\b/iu)

config/scripts/orca-cli-skill-guidance.test.mjs

@@ -27,11 +27,12 @@ function readSkill(path = guidePath) {
 describe('orca CLI skill guidance', () => {
   it('keeps external browser routing at the OS/page boundary', () => {
     const skill = readSkill(guidePath)
-    const description = skill.replace(/\s+/gu, ' ')
+    const description = (/^---\n([\s\S]*?)\n---\n/u.exec(skill)?.[1] ?? '').replace(/\s+/gu, ' ')
 
     expect(description).toContain(
-      'Use Computer Use only for external windows or desktop UI that needs OS-level control, and Playwright or CDP for external pages.'
+      'Use Computer Use only when a visible window needs GUI control that a CLI, filesystem, or API cannot do.'
     )
+    expect(description).not.toMatch(/Playwright/iu)
     expect(skill).toContain(
       'For external Chrome/Safari/webviews or Orca app chrome/settings, use the Computer Use skill/tool only when the task requires OS/window-level control'
     )

config/scripts/orchestration-skill-guidance.test.mjs

@@ -51,15 +51,12 @@ describe('orchestration skill routing', () => {
     }
   })
 
-  it('keeps external browser routing at the OS/page boundary', () => {
+  it('does not advertise Computer Use or page automation from orchestration discovery', () => {
     const description = readDescription()
 
-    expect(description).toContain(
-      "Use Computer Use for external browser windows, webviews, Orca app UI, or desktop UI outside Orca's embedded browser only when the task requires OS/window-level control such as focus, menus, dialogs, coordinates, or screenshots."
-    )
-    expect(description).toContain(
-      "`orca-cli` for Orca's embedded pages and a page-automation tool such as Playwright or CDP for external pages."
-    )
+    expect(description).not.toMatch(/Computer Use/iu)
+    expect(description).not.toMatch(/Playwright/iu)
+    expect(description).not.toContain('embedded pages')
   })
 })
 

config/scripts/pr-code-change-scope.mjs

@@ -113,6 +113,8 @@ const CROSS_VERSION_WIRE_PREFIXES = [
   'src/shared/browser-client-host-protocol',
   'src/shared/browser-network-tunnel-protocol',
   'src/shared/browser-client-host-placement',
+  'src/shared/agent-launch-intent',
+  'src/shared/rpc-contract/agent-launch-params',
   'src/shared/agent-session-wire',
   'src/shared/agent-session-mutation-envelope',
   'src/shared/agent-session-journal-',
@@ -121,6 +123,7 @@ const CROSS_VERSION_WIRE_PREFIXES = [
   'src/main/native-chat/agent-session-wire/',
   'src/main/runtime/agent-session-record-store',
   'src/main/runtime/rpc/dispatcher',
+  'src/main/runtime/rpc/methods/agent-launch',
   'src/main/runtime/rpc/methods/ai-vault.ts',
   'src/main/runtime/rpc/methods/browser-tab-create-schema',
   'src/main/runtime/rpc/methods/session-tabs.ts',

config/scripts/run-multi-workspace-typing-bench.mjs

@@ -4,7 +4,8 @@
  *
  * Usage:
  *   pnpm bench:multi-workspace-typing [-- --panes 8 --rate-kbps 512 \
- *     --keys 48 --cadence-ms 250 --cpu-workers 4 --label before-fix]
+ *     --keys 48 --cadence-ms 250 --cpu-workers 4 --worktrees 870 \
+ *     --repositories 27 --terminal-tabs 1410 --unified-tabs 2000 --label before-fix]
  *
  * Results land in tests/tools/benchmarks/results/multi-workspace-typing-*.json.
  * Run once per build/config with distinct --label values, then diff the
@@ -15,15 +16,34 @@ import { spawn } from 'node:child_process'
 const npxCommand = process.platform === 'win32' ? 'npx.cmd' : 'npx'
 
 const knobByFlag = {
+  '--visited-workspaces': 'ORCA_TYPING_BENCH_VISITED_WORKSPACES',
+  '--load-workspaces': 'ORCA_TYPING_BENCH_LOAD_WORKSPACES',
   '--panes': 'ORCA_TYPING_BENCH_LOAD_PANES',
   '--rate-kbps': 'ORCA_TYPING_BENCH_RATE_KBPS',
   '--keys': 'ORCA_TYPING_BENCH_KEYS',
   '--cadence-ms': 'ORCA_TYPING_BENCH_KEY_CADENCE_MS',
   '--cpu-workers': 'ORCA_TYPING_BENCH_CPU_WORKERS',
+  '--worktrees': 'ORCA_TYPING_BENCH_METADATA_WORKTREES',
+  '--repositories': 'ORCA_TYPING_BENCH_METADATA_REPOSITORIES',
+  '--terminal-tabs': 'ORCA_TYPING_BENCH_METADATA_TERMINAL_TABS',
+  '--unified-tabs': 'ORCA_TYPING_BENCH_METADATA_UNIFIED_TABS',
+  '--sleepers': 'ORCA_TYPING_BENCH_METADATA_SLEEPERS',
+  '--live-statuses': 'ORCA_TYPING_BENCH_METADATA_LIVE_STATUSES',
+  '--panes-per-tab': 'ORCA_TYPING_BENCH_METADATA_PANES',
+  '--status-history': 'ORCA_TYPING_BENCH_METADATA_STATUS_HISTORY',
+  '--status-interval-ms': 'ORCA_TYPING_BENCH_METADATA_STATUS_INTERVAL_MS',
+  '--agent-rows': 'ORCA_TYPING_BENCH_AGENT_ROWS',
+  '--title-change-ms': 'ORCA_TYPING_BENCH_TITLE_CHANGE_MS',
+  '--lifecycle-ms': 'ORCA_TYPING_BENCH_LIFECYCLE_MS',
+  '--cpu-profile': 'ORCA_TYPING_BENCH_CPU_PROFILE',
+  '--pty-metadata': 'ORCA_TYPING_BENCH_PTY_METADATA',
+  '--metadata-status': 'ORCA_TYPING_BENCH_METADATA_STATUS',
+  '--metadata-titles': 'ORCA_TYPING_BENCH_METADATA_TITLES',
+  '--instrumentation': 'ORCA_TYPING_BENCH_INSTRUMENTATION',
   '--label': 'ORCA_TYPING_BENCH_LABEL'
 }
 
-const env = { ...process.env, ORCA_TYPING_BENCH: '1' }
+const env = { ...process.env, ORCA_BACKGROUND_LAUNCH: '1', ORCA_TYPING_BENCH: '1' }
 const passthroughArgs = []
 const argv = process.argv.slice(2)
 for (let i = 0; i < argv.length; i++) {

docs/assets/readme-downloads.svg

@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 59m">
-  <title>downloads: 59m</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 60m">
+  <title>downloads: 60m</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="90" y="15" fill="#010101" fill-opacity=".3">59m</text>
-    <text x="90" y="14">59m</text>
+    <text x="90" y="15" fill="#010101" fill-opacity=".3">60m</text>
+    <text x="90" y="14">60m</text>
   </g>
 </svg>

docs/reference/agent-session-search-contract.md

@@ -29,10 +29,12 @@ Results contain `kind: 'results'`, `hits`, `page: { cursor, hasMore }`,
 contains `route`, optional `repairedTerms`, and `scope`. Diagnostics never appear
 at the top level. Status is never attached to search results.
 
-A cursor belongs to one query and one host's index generation. Query, scope,
-filters, and sorting must remain the same; page size may change. Writes that
-advance the generation can invalidate it, including retention purges. A refused
-cursor yields `{ kind: 'stale-cursor', generation, expectedGeneration? }` and the
+A cursor belongs to one query, one host's index generation, and an opaque persisted
+index incarnation. Query, scope, filters, and sorting must remain the same; page
+size may change. Writes that advance the generation can invalidate it, including
+retention purges. Clearing or rebuilding the database invalidates it even when the
+new generation counter matches. A refused cursor yields
+`{ kind: 'stale-cursor', generation, expectedGeneration? }` and the
 client discards it and issues page 1 without a cursor. Reusing that refused cursor
 continues to fail; there is no server-side cursor acknowledgement state.
 Malformed cursors and cursors for a different query yield
@@ -117,6 +119,13 @@ empty, current index. A registered service may report disabled or not-ready.
 
 - Desktop: `aiVault:searchSessions` and `aiVault:searchStatus`, via preload.
 - Runtime and relay: `aiVault.searchSessions` and `aiVault.searchStatus`.
+- CLI: `orca search` calls both over the runtime RPC, against the host that
+  `--environment` / `--pairing-code` selects and no other. It reuses
+  `createSessionSearchClient`, so an old host's refusal reaches the caller as
+  `unavailable/no-service` rather than an error, and needs no new capability.
+  In an Orca SSH terminal, the forwarded CLI defaults to the controlling Orca
+  runtime's index. `--path` filters that index; it does not select the SSH host.
+  `--environment` / `--pairing-code` can explicitly select a paired runtime.
 - Desktop preload optionally accepts an execution host scope as a separate
   routing argument. It addresses exactly that host; missing connections never
   fall back to the local index. The web preload addresses its own paired runtime,
@@ -131,7 +140,33 @@ uses the absent-service sentinel above. Transport failures, authentication error
 and invalid payloads remain errors. Unknown request fields are stripped for wire
 compatibility.
 
-The process-local `setSessionSearchService(service | null)` registry is the only
-production seam in this PR. Tests use fake services and a real synthetic store.
-Nothing constructs an engine or indexer in production. PR 3b owns process
-lifecycle, consent/settings application, and registration of the production service.
+The process-local `setSessionSearchService(service | null)` registry connects
+these endpoints to the production service installed by PR 3b. Desktop indexing
+runs in the scanner child; orcad and the SSH relay register their own in-process
+services. Registration alone does not grant consent.
+
+## Desktop index controls (PR8)
+
+Settings → Agent Session History controls this desktop's persisted
+`aiVaultSearch { enabled, historyDays }` policy. It stays local even when another
+execution host is selected. Paired clients cannot grant consent or clear an index
+through this surface; SSH relay registration remains disabled without a separate
+host consent mechanism.
+
+`aiVault.clearSearchIndex()` is a no-argument desktop-only preload operation over
+`aiVault:clearSearchIndex`. It addresses the local scanner child, not the selected
+remote host. The child's existing interactive request lane executes `searchClear`
+through `SessionSearchInstance.clear()`: close the indexer and database handles,
+remove the SQLite database and sidecars, then reconstruct only if consent remains
+enabled. Errors propagate to the settings pane. This operation never deletes
+original transcripts. There is no new runtime or relay method. Opaque cursors also
+carry a persistent database identity: clearing creates a new identity, so a
+pre-clear or legacy cursor returns `stale-cursor` even if the rebuilt numeric
+generation happens to match. Reopening the same database preserves its identity.
+
+Disabling closes the indexer and keeps the index copy; clearing deletes the copy.
+Changing retention reuses the existing close-and-construct policy application.
+The settings pane reads status only while enabled and visible, polls only an
+observed indexing phase, and stops on completion or error. Opening the pane,
+changing policy, or pressing Refresh obtains a new observation. The indexer's own
+schedule does not depend on the pane.

docs/reference/agent-session-search-query-tuning.md

@@ -215,5 +215,15 @@ first page without a cursor. The caller can retry from page one. No long-lived
 read transaction is needed, and a mixed page is never returned as a valid snapshot.
 
 Repository/path operators are applied before a phrase or AND route is accepted.
-Candidate truncation remains explicit, including when an earlier route reached
-its cap but had no eligible sessions.
+Candidate truncation is reported by the rung that answered, not by every rung
+tried. Each rung of the ladder matches a superset of the one before it, so a
+rung that reached its cap with no eligible sessions is always followed by one
+that reaches it too: a full candidate set stays explicit either way.
+
+The phrase and AND rungs run for prose as well as for literal-looking input,
+over the query's tokens as typed rather than the stop-word-stripped OR body. A
+sentence pasted out of a transcript is ordinary words in order; over OR its
+common words fill the candidate limit with recent sessions and the old session
+holding the sentence never reaches ranking. The cost is two FTS queries that
+usually miss, which on the corpus above sits inside this harness's run-to-run
+noise. A one-token query still takes the rung only when it looked literal.

docs/reference/remote-wire-compatibility.md

@@ -75,6 +75,42 @@ Treat these as wire changes even though nothing in the codec moves:
 If old clients cannot interpret the new projection correctly, gate it behind a
 runtime capability the same way Rule 2 gates an opcode.
 
+## Rule 4 — an enum arm set is a wire surface; unknown arms must degrade, never reject
+
+A closed `z.enum` in a client-side reply schema is a version claim: it asserts the host
+will never send an arm this build has not heard of. A newer host that adds one arm then
+has its whole reply refused, or has the row carrying it silently dropped, even though
+every member the client actually reads is present and well-formed.
+
+Declare the arm set open instead, with `openEnum` in `src/shared/zod-salvage.ts`:
+
+```ts
+// unknown arm degrades to a member the reader already handles; a non-string stays fatal
+status: openEnum(GIT_BRANCH_COMPARE_STATUS, 'error')
+```
+
+Do not reach for `.catch()`. It swallows absence and the wrong type as well, which turns
+a member the reader depends on into a silent default.
+
+A fallback does not have to be an arm. `git.status`'s `area` is the worked example:
+`staged`, `unstaged` and `untracked` each grant an affordance, so coercing an unknown area
+to one of them offers stage, unstage or commit against a row the client cannot place. It
+degrades to absent instead, which withholds all three — every reader is an equality check
+against a known arm, so the row lands in no section — while keeping the row itself. That
+last part is the point. Dropping the row would also drop it from the unresolved-conflict
+gate, and a conflicted worktree that looks clean is granted a hosted-review create it
+should not have. Withholding an affordance is a degrade; removing the evidence a gate
+reads is not.
+
+A fallback is only ever allowed to shape a *reading*. If the member is sent back to the
+host — a token the client echoes into a later call's params — pass it through as
+`z.string()` and let the send site keep it verbatim. `hostedReview`'s `provider` is the
+case: the eligibility reply names it and the create call returns it, so an
+`openEnum(..., 'unsupported')` there does not soften how the client reads a newer host's
+provider, it puts `unsupported` on the wire and makes that host refuse its own. A
+reply-schema fallback must never shape a param. Gate on the token instead, where the
+client decides what it is willing to do with an arm it does not know.
+
 ## Enforcement
 
 `tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts` runs the real

docs/site/content/docs/browser/overview.mdx

@@ -62,4 +62,4 @@ The browser is also scriptable by agents via the [Orca CLI](/docs/cli/overview)
 ## Next steps
 
 - [Design Mode](/docs/browser/design-mode) — turn the browser into a pointer-to-code feedback loop.
-- [Browser-use profiles](/docs/browser/profiles) — run the browser with a specific login, cookie jar, or user agent.
+- [Browser-use profiles](/docs/browser/profiles) — run the browser with a specific login or cookie jar.

docs/site/content/docs/browser/profiles.mdx

@@ -2,16 +2,19 @@
 title: Browser-use profiles
 ---
 
-Browser-use profiles let you run the Orca browser with a specific identity — a logged-in user, a particular cookie jar, a custom user-agent. Useful when an agent needs to log in, reproduce a session-specific bug, or emulate multiple users.
+Browser-use profiles let you run the Orca browser with a specific identity — a logged-in user or a particular cookie jar. Useful when an agent needs to log in, reproduce a session-specific bug, or emulate multiple users.
 
 ## Create a profile
 
 1. Open [Settings → Browser → Profiles](/docs/settings).
 1. Click **Add profile**, give it a name.
-1. Optionally seed it with cookies, a user-agent, and a viewport size.
-1. Default profiles remove Orca and Electron tokens from the browser engine's user agent, preserving the Chrome-shaped identity expected by imported sessions. This focused compatibility measure does not make the embedded browser identical to Chrome. Google sign-in hosts use a scoped Firefox identity. If a site rejects the cleaned identity, including some Cloudflare-protected sites, create a profile that keeps the **native Electron user agent** instead.
+1. Optionally seed it with cookies and a viewport size.
 
-You can also create a no-spoof profile from the CLI with `orca tab profile create --no-ua-spoof` when you script browser setup.
+## Browser identity
+
+The browser user agent is an app-wide choice because documents and web workers must present one coherent identity. Open **Settings → Browser → Browser identity** to choose between the cleaned identity and Electron's native identity. The change takes effect after you restart Orca.
+
+The cleaned identity removes Orca and Electron tokens from the browser engine's user agent, preserving the Chrome-shaped identity expected by imported sessions. This focused compatibility measure does not make the embedded browser identical to Chrome. In **Cleaned** mode, Google sign-in hosts use a scoped Firefox identity. **Native** mode keeps Electron's identity for sites that reject the cleaned identity, including some Cloudflare-protected sites, but Google sign-in is unavailable; switch back to **Cleaned** and restart Orca to sign in.
 
 ## Cookie import and Google sign-in
 

mobile/rpc-foundation/goldens/aivault-history-scan-fulfilled.json

@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "7add46922ba5486e56c8acd99a53d083b605f5d98f3cc44ee3cb350ec0406080",
   "scenarioSha256": "0431ac82cbb8c60b16f4432fd0da7cff665485d668e512b20fc1168ec63db3fe",
   "platform": "darwin",
@@ -13,51 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "56c96fec6d08": {
-      "name": "aiVault.listSessions#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}",
-      "sent": 2
-    },
-    "6e50957443ea": {
-      "name": "status.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "status.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "capabilities": ["aiVault.v1"]
-          }
-        }
-      }
-    },
-    "852980e2efc0": {
-      "name": "status.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 1
-    },
-    "b567072e5440": {
+    "3719c54df702": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -98,6 +56,45 @@
         }
       }
     },
+    "4a76a58cbdac": {
+      "name": "status.get#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "status.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "capabilities": ["aiVault.v1"]
+          }
+        }
+      }
+    },
+    "97bd894604ee": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}"
+    },
     "cd739a80b7a8": {
       "activeWorktreePath": "/repo/feature",
       "hostStatusResult": {
@@ -117,6 +114,11 @@
         ]
       }
     },
+    "d08f74d65ee6": {
+      "name": "status.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -132,8 +134,8 @@
       {
         "id": "ready",
         "observation": {
-          "sender": ["6e50957443ea", "b567072e5440"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "3719c54df702"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/aivault-history-scan-unsupported.json

@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "7add46922ba5486e56c8acd99a53d083b605f5d98f3cc44ee3cb350ec0406080",
   "scenarioSha256": "e97c6db772a70ee1912419ac67835b6074aaf9a341d4360389a11465f08092c5",
   "platform": "darwin",
@@ -24,8 +24,9 @@
         "kind": "unsupported"
       }
     },
-    "6f30f8b6f3d7": {
+    "a3b75b607f63": {
       "name": "status.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -57,10 +58,10 @@
         }
       }
     },
-    "852980e2efc0": {
+    "d08f74d65ee6": {
       "name": "status.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -77,8 +78,8 @@
       {
         "id": "unsupported",
         "observation": {
-          "sender": ["6f30f8b6f3d7"],
-          "payloads": ["852980e2efc0"],
+          "sender": ["a3b75b607f63"],
+          "payloads": ["d08f74d65ee6"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/aivault-history-scan-worktrees-late.json

@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "7add46922ba5486e56c8acd99a53d083b605f5d98f3cc44ee3cb350ec0406080",
   "scenarioSha256": "10011c7c75e74d9c2e880c5458c9156264ae07e91956a80946ede1d4e684952a",
   "platform": "darwin",
@@ -13,21 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "33d053404f10": {
-      "activeWorktreePath": {
-        "$rpc": "null"
-      },
-      "hostStatusResult": {
-        "capabilities": ["aiVault.v1"]
-      },
-      "refreshing": false,
-      "scope": "workspace",
-      "screenState": {
-        "kind": "loading"
-      }
-    },
-    "38364726a135": {
+    "05215ca2ea35": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
@@ -68,13 +56,22 @@
         }
       }
     },
-    "4f3bdb245d26": {
-      "name": "aiVault.listSessions#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}",
-      "sent": 3
+    "33d053404f10": {
+      "activeWorktreePath": {
+        "$rpc": "null"
+      },
+      "hostStatusResult": {
+        "capabilities": ["aiVault.v1"]
+      },
+      "refreshing": false,
+      "scope": "workspace",
+      "screenState": {
+        "kind": "loading"
+      }
     },
-    "6e50957443ea": {
+    "4a76a58cbdac": {
       "name": "status.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -106,13 +103,9 @@
         }
       }
     },
-    "852980e2efc0": {
-      "name": "status.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 1
-    },
-    "9cac597c56da": {
+    "4e35efd1ee45": {
       "name": "status.get#2",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -144,10 +137,10 @@
         }
       }
     },
-    "b33a14df0df6": {
-      "name": "status.get#2",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 2
+    "72d9a278aca3": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}"
     },
     "cd739a80b7a8": {
       "activeWorktreePath": "/repo/feature",
@@ -168,6 +161,11 @@
         ]
       }
     },
+    "d08f74d65ee6": {
+      "name": "status.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -175,6 +173,11 @@
       "value": {
         "$rpc": "undefined"
       }
+    },
+    "f1834177e593": {
+      "name": "status.get#2",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
     }
   },
   "recording": {
@@ -183,8 +186,8 @@
       {
         "id": "held",
         "observation": {
-          "sender": ["6e50957443ea"],
-          "payloads": ["852980e2efc0"],
+          "sender": ["4a76a58cbdac"],
+          "payloads": ["d08f74d65ee6"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -195,8 +198,8 @@
       {
         "id": "ready",
         "observation": {
-          "sender": ["6e50957443ea", "9cac597c56da", "38364726a135"],
-          "payloads": ["852980e2efc0", "b33a14df0df6", "4f3bdb245d26"],
+          "sender": ["4a76a58cbdac", "4e35efd1ee45", "05215ca2ea35"],
+          "payloads": ["d08f74d65ee6", "f1834177e593", "72d9a278aca3"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "worktrees-loaded": "eb79a9b3682a"

mobile/rpc-foundation/goldens/aivault-history-screen-listed.json

@@ -3,20 +3,41 @@
   "family": "aiVault.history-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
-  "adapterSha256": "694e6a331a7b0a742059ac6575ee8fd5cdeb3ba80abe58cbd216f6bc4a24e400",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
+  "adapterSha256": "c78ab47eea594b7e1988403321ff9ba135ca60c513bb9d5848bdde26c0ffe3c3",
   "scenarioSha256": "d52d3c5858298a4a6a90bd9a8986b780004477de105fe93f6303d9c303ffea38",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "017d690f964b": {
-      "name": "aiVault.listSessions#1",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}",
-      "sent": 4
+    "03106dceb986": {
+      "name": "status.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "status.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
     },
     "035edfd9a1b9": {
       "crash": {
@@ -35,8 +56,107 @@
       "labels": ["Back", "Refresh agent sessions"],
       "text": ["Agent Session History", "orca-history", "Workspace", "Project", "All"]
     },
-    "074d2293c010": {
+    "3a91d2093c6e": {
       "name": "worktree.ps#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"supportsWorktreeVisibilitySourceDefaults\":true}}"
+    },
+    "3aaa7e04cda5": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "aiVault.listSessions"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": false,
+            "limit": 500,
+            "scopePaths": ["/repo/feature"]
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "4cebf6258ec1": {
+      "name": "worktree.ps#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.ps"
+        },
+        {
+          "name": "params",
+          "value": {
+            "limit": 10000
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "4d676e55076c": {
+      "name": "status.get#2",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "status.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "capabilities": ["aiVault.v1"]
+          }
+        }
+      }
+    },
+    "4d68bff46cff": {
+      "name": "status.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
+    "8d930b47bf2f": {
+      "name": "worktree.ps#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -79,101 +199,9 @@
         }
       }
     },
-    "29ba09534e96": {
-      "name": "status.get#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "status.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "capabilities": ["aiVault.v1"]
-          }
-        }
-      }
-    },
-    "522b745543f1": {
-      "name": "aiVault.listSessions#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "aiVault.listSessions"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": false,
-            "limit": 500,
-            "scopePaths": ["/repo/feature"]
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "6ae619d3108a": {
-      "name": "status.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "status.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "capabilities": ["aiVault.v1"]
-          }
-        }
-      }
-    },
-    "8c2a1dcb9598": {
+    "a6bb0efe5318": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 7,
       "args": [
         {
           "name": "method",
@@ -235,8 +263,9 @@
         }
       }
     },
-    "ba9fd57319d3": {
+    "acf501fa9958": {
       "name": "status.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -256,35 +285,23 @@
         }
       ],
       "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "bc1a8e138f82": {
-      "name": "worktree.ps#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.ps"
-        },
-        {
-          "name": "params",
-          "value": {
-            "limit": 10000
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "capabilities": ["aiVault.v1"]
           }
         }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
       }
     },
+    "cee4e3edb0a1": {
+      "name": "status.get#2",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
     "d22bb2f62cea": {
       "crash": {
         "$rpc": "null"
@@ -301,15 +318,10 @@
       "labels": ["Back", "Refresh agent sessions"],
       "text": ["Agent Session History", "orca-history"]
     },
-    "d4ef0569dbbc": {
-      "name": "status.get#2",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 3
-    },
-    "de79fb948454": {
-      "name": "worktree.ps#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"supportsWorktreeVisibilitySourceDefaults\":true}}",
-      "sent": 2
+    "d3c3ce66625d": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}"
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -318,11 +330,6 @@
       "value": {
         "$rpc": "undefined"
       }
-    },
-    "ff0ffaddbbf7": {
-      "name": "status.get#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 2
     }
   },
   "recording": {
@@ -331,8 +338,8 @@
       {
         "id": "worktrees-pending",
         "observation": {
-          "sender": ["bc1a8e138f82", "ba9fd57319d3"],
-          "payloads": ["de79fb948454", "ff0ffaddbbf7"],
+          "sender": ["4cebf6258ec1", "03106dceb986"],
+          "payloads": ["3a91d2093c6e", "4d68bff46cff"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -343,8 +350,8 @@
       {
         "id": "worktrees-listed",
         "observation": {
-          "sender": ["074d2293c010", "6ae619d3108a", "29ba09534e96", "522b745543f1"],
-          "payloads": ["de79fb948454", "ff0ffaddbbf7", "d4ef0569dbbc", "017d690f964b"],
+          "sender": ["8d930b47bf2f", "acf501fa9958", "4d676e55076c", "3aaa7e04cda5"],
+          "payloads": ["3a91d2093c6e", "4d68bff46cff", "cee4e3edb0a1", "d3c3ce66625d"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -355,8 +362,8 @@
       {
         "id": "ready",
         "observation": {
-          "sender": ["074d2293c010", "6ae619d3108a", "29ba09534e96", "8c2a1dcb9598"],
-          "payloads": ["de79fb948454", "ff0ffaddbbf7", "d4ef0569dbbc", "017d690f964b"],
+          "sender": ["8d930b47bf2f", "acf501fa9958", "4d676e55076c", "a6bb0efe5318"],
+          "payloads": ["3a91d2093c6e", "4d68bff46cff", "cee4e3edb0a1", "d3c3ce66625d"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/aivault-history-screen-worktrees.json

@@ -3,23 +3,143 @@
   "family": "aiVault.history-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
-  "adapterSha256": "694e6a331a7b0a742059ac6575ee8fd5cdeb3ba80abe58cbd216f6bc4a24e400",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
+  "adapterSha256": "c78ab47eea594b7e1988403321ff9ba135ca60c513bb9d5848bdde26c0ffe3c3",
   "scenarioSha256": "f50f63c4e2a69793b3d322ed16089c4241ff6169d8f9549106480230fb8dd5e7",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "017d690f964b": {
-      "name": "aiVault.listSessions#1",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}",
-      "sent": 4
+    "03106dceb986": {
+      "name": "status.get#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "status.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
     },
-    "074d2293c010": {
+    "3a91d2093c6e": {
       "name": "worktree.ps#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"supportsWorktreeVisibilitySourceDefaults\":true}}"
+    },
+    "3aaa7e04cda5": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "aiVault.listSessions"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": false,
+            "limit": 500,
+            "scopePaths": ["/repo/feature"]
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "4cebf6258ec1": {
+      "name": "worktree.ps#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.ps"
+        },
+        {
+          "name": "params",
+          "value": {
+            "limit": 10000
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "4d676e55076c": {
+      "name": "status.get#2",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "status.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "capabilities": ["aiVault.v1"]
+          }
+        }
+      }
+    },
+    "4d68bff46cff": {
+      "name": "status.get#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
+    "8d930b47bf2f": {
+      "name": "worktree.ps#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -62,68 +182,9 @@
         }
       }
     },
-    "29ba09534e96": {
-      "name": "status.get#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "status.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "capabilities": ["aiVault.v1"]
-          }
-        }
-      }
-    },
-    "522b745543f1": {
-      "name": "aiVault.listSessions#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "aiVault.listSessions"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": false,
-            "limit": 500,
-            "scopePaths": ["/repo/feature"]
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "6ae619d3108a": {
+    "acf501fa9958": {
       "name": "status.get#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -155,55 +216,10 @@
         }
       }
     },
-    "ba9fd57319d3": {
-      "name": "status.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "status.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "bc1a8e138f82": {
-      "name": "worktree.ps#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.ps"
-        },
-        {
-          "name": "params",
-          "value": {
-            "limit": 10000
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
+    "cee4e3edb0a1": {
+      "name": "status.get#2",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
     },
     "d22bb2f62cea": {
       "crash": {
@@ -221,15 +237,10 @@
       "labels": ["Back", "Refresh agent sessions"],
       "text": ["Agent Session History", "orca-history"]
     },
-    "d4ef0569dbbc": {
-      "name": "status.get#2",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 3
-    },
-    "de79fb948454": {
-      "name": "worktree.ps#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"supportsWorktreeVisibilitySourceDefaults\":true}}",
-      "sent": 2
+    "d3c3ce66625d": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}"
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -238,11 +249,6 @@
       "value": {
         "$rpc": "undefined"
       }
-    },
-    "ff0ffaddbbf7": {
-      "name": "status.get#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 2
     }
   },
   "recording": {
@@ -251,8 +257,8 @@
       {
         "id": "worktrees-pending",
         "observation": {
-          "sender": ["bc1a8e138f82", "ba9fd57319d3"],
-          "payloads": ["de79fb948454", "ff0ffaddbbf7"],
+          "sender": ["4cebf6258ec1", "03106dceb986"],
+          "payloads": ["3a91d2093c6e", "4d68bff46cff"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -263,8 +269,8 @@
       {
         "id": "worktrees-listed",
         "observation": {
-          "sender": ["074d2293c010", "6ae619d3108a", "29ba09534e96", "522b745543f1"],
-          "payloads": ["de79fb948454", "ff0ffaddbbf7", "d4ef0569dbbc", "017d690f964b"],
+          "sender": ["8d930b47bf2f", "acf501fa9958", "4d676e55076c", "3aaa7e04cda5"],
+          "payloads": ["3a91d2093c6e", "4d68bff46cff", "cee4e3edb0a1", "d3c3ce66625d"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/aivault-resume-launch-create-refused.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "ebf1bbc01ad7704fe79eff0969fcc2d4af8ebfa7c2410d2ed9d3ae8c6976b434",
   "platform": "darwin",
@@ -13,22 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "62643ed38326": {
-      "failure": "Workspace is busy",
-      "launched": "unlaunched"
-    },
-    "6e913cd7b306": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Workspace is busy",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "a7dec90e01a8": {
+    "3e6273f4fe55": {
       "name": "session.tabs.createTerminal#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -64,10 +51,24 @@
         }
       }
     },
-    "af416f104f9a": {
+    "62643ed38326": {
+      "failure": "Workspace is busy",
+      "launched": "unlaunched"
+    },
+    "6e913cd7b306": {
+      "status": "rejected",
+      "startedAt": 0,
+      "settledAt": 0,
+      "error": {
+        "category": "Error",
+        "message": "Workspace is busy",
+        "isRpcDeliveryUnknown": false
+      }
+    },
+    "88cd0d2b1302": {
       "name": "session.tabs.createTerminal#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
     }
   },
   "recording": {
@@ -76,8 +77,8 @@
       {
         "id": "create-refused",
         "observation": {
-          "sender": ["a7dec90e01a8"],
-          "payloads": ["af416f104f9a"],
+          "sender": ["3e6273f4fe55"],
+          "payloads": ["88cd0d2b1302"],
           "settlements": {
             "bare": "6e913cd7b306"
           },

mobile/rpc-foundation/goldens/aivault-resume-launch-invalid-tab.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "281ccf5a082f3788ae8bf19f742ea4baf35c20c78bc91d7d91873845583e1a91",
   "platform": "darwin",
@@ -13,15 +13,15 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
+    "0bce25f5646d": {
+      "name": "session.tabs.createTerminal#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"env\":{\"ORCA_RESUME\":\"1\"},\"envToDelete\":[\"CODEX_HOME\"],\"launchAgent\":\"codex\",\"clientMutationId\":\"resume-mutation-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
+    },
     "432332c9740e": {
       "failure": "Created terminal response was invalid",
       "launched": "unlaunched"
     },
-    "495d8519301e": {
-      "name": "session.tabs.createTerminal#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"env\":{\"ORCA_RESUME\":\"1\"},\"envToDelete\":[\"CODEX_HOME\"],\"launchAgent\":\"codex\",\"clientMutationId\":\"resume-mutation-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}",
-      "sent": 1
-    },
     "681fc4d59b92": {
       "status": "rejected",
       "startedAt": 0,
@@ -32,8 +32,9 @@
         "isRpcDeliveryUnknown": false
       }
     },
-    "af9961132c24": {
+    "8de69c55b96f": {
       "name": "session.tabs.createTerminal#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -83,8 +84,8 @@
       {
         "id": "invalid-tab",
         "observation": {
-          "sender": ["af9961132c24"],
-          "payloads": ["495d8519301e"],
+          "sender": ["8de69c55b96f"],
+          "payloads": ["0bce25f5646d"],
           "settlements": {
             "full": "681fc4d59b92"
           },

mobile/rpc-foundation/goldens/aivault-resume-launch-locked.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "941fcf202417c94ef546f5ee331983689d8b72397dac6f61dda944ca24abed9e",
   "platform": "darwin",
@@ -13,6 +13,11 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
+    "0bce25f5646d": {
+      "name": "session.tabs.createTerminal#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"env\":{\"ORCA_RESUME\":\"1\"},\"envToDelete\":[\"CODEX_HOME\"],\"launchAgent\":\"codex\",\"clientMutationId\":\"resume-mutation-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
+    },
     "0f026fafa7e1": {
       "status": "rejected",
       "startedAt": 0,
@@ -23,55 +28,14 @@
         "isRpcDeliveryUnknown": false
       }
     },
-    "39cabd8258a3": {
+    "7d9e7036f3d0": {
       "name": "terminal.send#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-9\",\"text\":\"codex resume rollout\",\"enter\":true}}",
-      "sent": 2
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-9\",\"text\":\"codex resume rollout\",\"enter\":true}}"
     },
-    "495d8519301e": {
-      "name": "session.tabs.createTerminal#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"env\":{\"ORCA_RESUME\":\"1\"},\"envToDelete\":[\"CODEX_HOME\"],\"launchAgent\":\"codex\",\"clientMutationId\":\"resume-mutation-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}",
-      "sent": 1
-    },
-    "5f84c02b1f7b": {
-      "name": "terminal.send#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "terminal.send"
-        },
-        {
-          "name": "params",
-          "value": {
-            "enter": true,
-            "terminal": "terminal-9",
-            "text": "codex resume rollout"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "timeoutMs": 30000
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "send": {
-              "accepted": false
-            }
-          }
-        }
-      }
-    },
-    "6b1e36abce6b": {
+    "a67829619e64": {
       "name": "session.tabs.createTerminal#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -117,6 +81,44 @@
         }
       }
     },
+    "cb651a7fb6ff": {
+      "name": "terminal.send#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "terminal.send"
+        },
+        {
+          "name": "params",
+          "value": {
+            "enter": true,
+            "terminal": "terminal-9",
+            "text": "codex resume rollout"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 30000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "send": {
+              "accepted": false
+            }
+          }
+        }
+      }
+    },
     "da57c90b80d6": {
       "failure": "Terminal input is locked",
       "launched": "unlaunched"
@@ -128,8 +130,8 @@
       {
         "id": "input-locked",
         "observation": {
-          "sender": ["6b1e36abce6b", "5f84c02b1f7b"],
-          "payloads": ["495d8519301e", "39cabd8258a3"],
+          "sender": ["a67829619e64", "cb651a7fb6ff"],
+          "payloads": ["0bce25f5646d", "7d9e7036f3d0"],
           "settlements": {
             "full": "0f026fafa7e1"
           },

mobile/rpc-foundation/goldens/aivault-resume-launch-sent.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "f0ac1c996e5b1b4043e0a081978476c6c2dd8a5d517d5752857721205a588fb0",
   "platform": "darwin",
@@ -13,10 +13,10 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "39cabd8258a3": {
-      "name": "terminal.send#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-9\",\"text\":\"codex resume rollout\",\"enter\":true}}",
-      "sent": 2
+    "0bce25f5646d": {
+      "name": "session.tabs.createTerminal#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"env\":{\"ORCA_RESUME\":\"1\"},\"envToDelete\":[\"CODEX_HOME\"],\"launchAgent\":\"codex\",\"clientMutationId\":\"resume-mutation-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}"
     },
     "400d946a183d": {
       "failure": {
@@ -28,13 +28,24 @@
         "title": "codex"
       }
     },
-    "495d8519301e": {
-      "name": "session.tabs.createTerminal#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"session.tabs.createTerminal\",\"params\":{\"worktree\":\"id:workspace-1\",\"env\":{\"ORCA_RESUME\":\"1\"},\"envToDelete\":[\"CODEX_HOME\"],\"launchAgent\":\"codex\",\"clientMutationId\":\"resume-mutation-1\",\"activate\":false,\"select\":true,\"navigation\":\"caller\"}}",
-      "sent": 1
+    "6e79da536ca9": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "id": "tab-9",
+        "terminal": "terminal-9",
+        "title": "codex"
+      }
     },
-    "6b1e36abce6b": {
+    "7d9e7036f3d0": {
+      "name": "terminal.send#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-9\",\"text\":\"codex resume rollout\",\"enter\":true}}"
+    },
+    "a67829619e64": {
       "name": "session.tabs.createTerminal#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -80,18 +91,9 @@
         }
       }
     },
-    "6e79da536ca9": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "id": "tab-9",
-        "terminal": "terminal-9",
-        "title": "codex"
-      }
-    },
-    "a84f5d45a48b": {
+    "cceac9bcb36d": {
       "name": "terminal.send#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -134,8 +136,8 @@
       {
         "id": "resumed",
         "observation": {
-          "sender": ["6b1e36abce6b", "a84f5d45a48b"],
-          "payloads": ["495d8519301e", "39cabd8258a3"],
+          "sender": ["a67829619e64", "cceac9bcb36d"],
+          "payloads": ["0bce25f5646d", "7d9e7036f3d0"],
           "settlements": {
             "full": "6e79da536ca9"
           },

mobile/rpc-foundation/goldens/aivault-resume-prepare-refused.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "dc9926f95475413627315e1f1c96740ececa697c6a0a5e3c42e18cfd4d58448a",
   "platform": "darwin",
@@ -23,8 +23,9 @@
         "isRpcDeliveryUnknown": false
       }
     },
-    "3a299ed75c3d": {
+    "6f601b6d009a": {
       "name": "aiVault.prepareSessionResume#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -60,14 +61,14 @@
         }
       }
     },
-    "770627dbd25d": {
-      "name": "aiVault.prepareSessionResume#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.prepareSessionResume\",\"params\":{\"agent\":\"codex\",\"filePath\":\"/sessions/rollout.jsonl\",\"codexHome\":\"/hosts/codex-runtime-home/home\",\"executionHostId\":\"local\"}}",
-      "sent": 1
-    },
     "7e4864f4412b": {
       "failure": "codex home is locked",
       "prepared": "unprepared"
+    },
+    "88c8bb20eb6f": {
+      "name": "aiVault.prepareSessionResume#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.prepareSessionResume\",\"params\":{\"agent\":\"codex\",\"filePath\":\"/sessions/rollout.jsonl\",\"codexHome\":\"/hosts/codex-runtime-home/home\",\"executionHostId\":\"local\"}}"
     }
   },
   "recording": {
@@ -76,8 +77,8 @@
       {
         "id": "refused",
         "observation": {
-          "sender": ["3a299ed75c3d"],
-          "payloads": ["770627dbd25d"],
+          "sender": ["6f601b6d009a"],
+          "payloads": ["88c8bb20eb6f"],
           "settlements": {
             "prepare": "1c21b98bedb1"
           },

mobile/rpc-foundation/goldens/aivault-resume-prepare-repin.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "6719aea706086a68709894546f9595264407db2df94fa56180cb3c68b08aaa69",
   "platform": "darwin",
@@ -35,13 +35,9 @@
         "filePath": "/sessions/rollout.jsonl"
       }
     },
-    "770627dbd25d": {
-      "name": "aiVault.prepareSessionResume#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.prepareSessionResume\",\"params\":{\"agent\":\"codex\",\"filePath\":\"/sessions/rollout.jsonl\",\"codexHome\":\"/hosts/codex-runtime-home/home\",\"executionHostId\":\"local\"}}",
-      "sent": 1
-    },
-    "d8803e70463f": {
+    "66ff2c43e820": {
       "name": "aiVault.prepareSessionResume#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -76,6 +72,11 @@
           }
         }
       }
+    },
+    "88c8bb20eb6f": {
+      "name": "aiVault.prepareSessionResume#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.prepareSessionResume\",\"params\":{\"agent\":\"codex\",\"filePath\":\"/sessions/rollout.jsonl\",\"codexHome\":\"/hosts/codex-runtime-home/home\",\"executionHostId\":\"local\"}}"
     }
   },
   "recording": {
@@ -84,8 +85,8 @@
       {
         "id": "repinned",
         "observation": {
-          "sender": ["d8803e70463f"],
-          "payloads": ["770627dbd25d"],
+          "sender": ["66ff2c43e820"],
+          "payloads": ["88c8bb20eb6f"],
           "settlements": {
             "prepare": "15e10cea84b9"
           },

mobile/rpc-foundation/goldens/aivault-resume-prepare-skipped.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "3afaf2807506f5bde2159b367f34c6b777739d6aad564796d54ac0da05b5bd02",
   "platform": "darwin",

mobile/rpc-foundation/goldens/aivault-resume-prepare-unavailable.json

@@ -3,9 +3,9 @@
   "family": "aiVault.resume-preparation",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "2f43211e4084c0493bd02ec98868acf53a4c748f89a70cd9657c9c3ee87b12fb",
   "scenarioSha256": "a5eedea5f551e0ca0e143292f1d9aa8920dd7af62a02d8e8777666ab3779c019",
   "platform": "darwin",
@@ -13,13 +13,25 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "770627dbd25d": {
+    "88c8bb20eb6f": {
       "name": "aiVault.prepareSessionResume#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.prepareSessionResume\",\"params\":{\"agent\":\"codex\",\"filePath\":\"/sessions/rollout.jsonl\",\"codexHome\":\"/hosts/codex-runtime-home/home\",\"executionHostId\":\"local\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.prepareSessionResume\",\"params\":{\"agent\":\"codex\",\"filePath\":\"/sessions/rollout.jsonl\",\"codexHome\":\"/hosts/codex-runtime-home/home\",\"executionHostId\":\"local\"}}"
     },
-    "a25c46d6c1db": {
+    "e839ea279e77": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "agent": "codex",
+        "codexHome": "/hosts/codex-runtime-home/home",
+        "executionHostId": "local",
+        "filePath": "/sessions/rollout.jsonl"
+      }
+    },
+    "e8fdd9c76c0f": {
       "name": "aiVault.prepareSessionResume#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -55,17 +67,6 @@
         }
       }
     },
-    "e839ea279e77": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "agent": "codex",
-        "codexHome": "/hosts/codex-runtime-home/home",
-        "executionHostId": "local",
-        "filePath": "/sessions/rollout.jsonl"
-      }
-    },
     "f9dc8bff0bbd": {
       "failure": {
         "$rpc": "null"
@@ -84,8 +85,8 @@
       {
         "id": "degraded-to-legacy",
         "observation": {
-          "sender": ["a25c46d6c1db"],
-          "payloads": ["770627dbd25d"],
+          "sender": ["e8fdd9c76c0f"],
+          "payloads": ["88c8bb20eb6f"],
           "settlements": {
             "prepare": "e839ea279e77"
           },

mobile/rpc-foundation/goldens/b1.json

@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "23ffc912a432dcd3ff70be1903a8d518cf85634f27a2be6d21585963e338e7e3",
   "platform": "darwin",
@@ -13,160 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "0d903486cbe8": {
-      "name": "files.list#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.list"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 240
-      }
-    },
-    "1ba589a74085": {
-      "name": "files.searchPaths#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.searchPaths"
-        },
-        {
-          "name": "params",
-          "value": {
-            "limit": 16,
-            "query": "fresh",
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 240,
-        "settledAt": 240,
-        "value": {
-          "error": {
-            "code": "method_not_found",
-            "message": "Unknown method"
-          },
-          "id": "frame-3",
-          "ok": false
-        }
-      }
-    },
-    "387248eb3124": {
-      "name": "files.searchPaths#2",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"fresh\",\"limit\":16}}",
-      "sent": 3
-    },
-    "3b6419fbab75": {
-      "status": "fulfilled",
-      "startedAt": 240,
-      "settledAt": 240,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "602e35a92eec": {
-      "files": []
-    },
-    "603254c040fc": {
-      "name": "files.list#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.list"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 120,
-        "settledAt": 240,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "files": [
-              {
-                "relativePath": "old.ts"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "a129552fdc6e": {
-      "files": ["third.ts"]
-    },
-    "a4643cbb0362": {
-      "name": "files.list#2",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}",
-      "sent": 4
-    },
-    "b2434f1de9f6": {
-      "name": "files.list#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.list"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 120
-      }
-    },
-    "bb65fa195d1c": {
-      "name": "files.list#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}",
-      "sent": 2
-    },
-    "c0821dc354d7": {
+    "32c9018052ba": {
       "name": "files.searchPaths#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -201,21 +50,54 @@
         }
       }
     },
-    "cd59dd2431e0": {
-      "name": "files.searchPaths#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}",
-      "sent": 1
-    },
-    "d2ad71e601c4": {
+    "3b6419fbab75": {
       "status": "fulfilled",
-      "startedAt": 120,
-      "settledAt": 120,
+      "startedAt": 240,
+      "settledAt": 240,
       "value": {
         "$rpc": "undefined"
       }
     },
-    "daf226a0261c": {
+    "602e35a92eec": {
+      "files": []
+    },
+    "82aa78cec383": {
       "name": "files.list#2",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 240
+      }
+    },
+    "8db0d1234c94": {
+      "name": "files.searchPaths#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}"
+    },
+    "a129552fdc6e": {
+      "files": ["third.ts"]
+    },
+    "a7dc0e022f15": {
+      "name": "files.list#2",
+      "ordinal": 7,
       "args": [
         {
           "name": "method",
@@ -254,6 +136,93 @@
         }
       }
     },
+    "b272f776e5de": {
+      "name": "files.list#2",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}"
+    },
+    "c9b9d7a9b388": {
+      "name": "files.list#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}"
+    },
+    "d2ad71e601c4": {
+      "status": "fulfilled",
+      "startedAt": 120,
+      "settledAt": 120,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "d9f32749aeb3": {
+      "name": "files.list#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 120,
+        "settledAt": 240,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "files": [
+              {
+                "relativePath": "old.ts"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "ea94d4508bba": {
+      "name": "files.list#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 120
+      }
+    },
+    "eae0ce09f0e8": {
+      "name": "files.searchPaths#2",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"fresh\",\"limit\":16}}"
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -261,6 +230,43 @@
       "value": {
         "$rpc": "undefined"
       }
+    },
+    "f461501d556e": {
+      "name": "files.searchPaths#2",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.searchPaths"
+        },
+        {
+          "name": "params",
+          "value": {
+            "limit": 16,
+            "query": "fresh",
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 240,
+        "settledAt": 240,
+        "value": {
+          "error": {
+            "code": "method_not_found",
+            "message": "Unknown method"
+          },
+          "id": "frame-3",
+          "ok": false
+        }
+      }
     }
   },
   "recording": {
@@ -269,8 +275,8 @@
       {
         "id": "old-pending",
         "observation": {
-          "sender": ["c0821dc354d7", "b2434f1de9f6"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "ea94d4508bba"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a"
@@ -282,8 +288,8 @@
       {
         "id": "stale-arrived-fresh-pending",
         "observation": {
-          "sender": ["c0821dc354d7", "603254c040fc", "1ba589a74085", "0d903486cbe8"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c", "387248eb3124", "a4643cbb0362"],
+          "sender": ["32c9018052ba", "d9f32749aeb3", "f461501d556e", "82aa78cec383"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388", "eae0ce09f0e8", "b272f776e5de"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -298,8 +304,8 @@
       {
         "id": "third-query",
         "observation": {
-          "sender": ["c0821dc354d7", "603254c040fc", "1ba589a74085", "0d903486cbe8"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c", "387248eb3124", "a4643cbb0362"],
+          "sender": ["32c9018052ba", "d9f32749aeb3", "f461501d556e", "82aa78cec383"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388", "eae0ce09f0e8", "b272f776e5de"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -315,8 +321,8 @@
       {
         "id": "fresh-arrived",
         "observation": {
-          "sender": ["c0821dc354d7", "603254c040fc", "1ba589a74085", "daf226a0261c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c", "387248eb3124", "a4643cbb0362"],
+          "sender": ["32c9018052ba", "d9f32749aeb3", "f461501d556e", "a7dc0e022f15"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388", "eae0ce09f0e8", "b272f776e5de"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",

mobile/rpc-foundation/goldens/b2.json

@@ -3,9 +3,9 @@
   "family": "project-explicit-false",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "b31992be2f91bd61fbe1b8a5400da3b7a56753564b0b0b2b38bc5d549812d693",
   "platform": "darwin",
@@ -13,11 +13,6 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "02839f22d2db": {
-      "name": "projectMutating",
-      "value": false,
-      "sent": 1
-    },
     "0c4dced3e005": {
       "error": "",
       "mutating": true,
@@ -32,27 +27,9 @@
         "itemType": "ISSUE"
       }
     },
-    "204a5c5728c2": {
-      "error": "Cannot read properties of null (reading 'ok')",
-      "mutating": false,
-      "row": {
-        "content": {
-          "assignees": [],
-          "labels": [],
-          "number": 1,
-          "repository": "owner/repo"
-        },
-        "id": "item-1",
-        "itemType": "ISSUE"
-      }
-    },
-    "219dced97206": {
-      "name": "github.project.updateIssueBySlug#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.project.updateIssueBySlug\",\"params\":{\"owner\":\"owner\",\"repo\":\"repo\",\"host\":\"github.enterprise.test\",\"number\":1,\"updates\":{\"addLabels\":[\"recorded\"]}}}",
-      "sent": 1
-    },
-    "6f0142de3930": {
+    "1158580f696d": {
       "name": "github.project.updateIssueBySlug#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -90,22 +67,28 @@
         }
       }
     },
-    "7b2465eedefe": {
+    "204a5c5728c2": {
+      "error": "Cannot read properties of null (reading 'ok')",
+      "mutating": false,
+      "row": {
+        "content": {
+          "assignees": [],
+          "labels": [],
+          "number": 1,
+          "repository": "owner/repo"
+        },
+        "id": "item-1",
+        "itemType": "ISSUE"
+      }
+    },
+    "5d32aa29303c": {
       "name": "projectMutating",
-      "value": true,
-      "sent": 0
+      "ordinal": 1,
+      "value": true
     },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "a7b76954b136": {
-      "name": "projectRowDetailError",
-      "value": "Cannot read properties of null (reading 'ok')",
-      "sent": 1
-    },
-    "e5673036d45e": {
+    "7ecf3a14081d": {
       "name": "github.project.updateIssueBySlug#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -135,6 +118,20 @@
         "startedAt": 0
       }
     },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "c4a308482e58": {
+      "name": "github.project.updateIssueBySlug#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.project.updateIssueBySlug\",\"params\":{\"owner\":\"owner\",\"repo\":\"repo\",\"host\":\"github.enterprise.test\",\"number\":1,\"updates\":{\"addLabels\":[\"recorded\"]}}}"
+    },
+    "e9296dde8e41": {
+      "name": "projectMutating",
+      "ordinal": 5,
+      "value": false
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -142,6 +139,11 @@
       "value": {
         "$rpc": "undefined"
       }
+    },
+    "f2f279e9fa21": {
+      "name": "projectRowDetailError",
+      "ordinal": 4,
+      "value": "Cannot read properties of null (reading 'ok')"
     }
   },
   "recording": {
@@ -150,27 +152,27 @@
       {
         "id": "pending",
         "observation": {
-          "sender": ["e5673036d45e"],
-          "payloads": ["219dced97206"],
+          "sender": ["7ecf3a14081d"],
+          "payloads": ["c4a308482e58"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "submit": "9270aeb7d9c6"
           },
           "state": "0c4dced3e005",
-          "effects": ["7b2465eedefe"]
+          "effects": ["5d32aa29303c"]
         }
       },
       {
         "id": "settled",
         "observation": {
-          "sender": ["6f0142de3930"],
-          "payloads": ["219dced97206"],
+          "sender": ["1158580f696d"],
+          "payloads": ["c4a308482e58"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "submit": "eb79a9b3682a"
           },
           "state": "204a5c5728c2",
-          "effects": ["7b2465eedefe", "a7b76954b136", "02839f22d2db"]
+          "effects": ["5d32aa29303c", "f2f279e9fa21", "e9296dde8e41"]
         }
       }
     ]

mobile/rpc-foundation/goldens/b3.json

@@ -3,9 +3,9 @@
   "family": "linear-detail-barrier",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "d3b7f33d810e1fa420ac41a628cde9fe4a9e65fd57f89fbca0a40fc7d74951ab",
   "scenarioSha256": "130e493fcd7765e037405f59e6cc78a0cc1793b1ae092cad933ff9d5a9df8b7a",
   "platform": "darwin",
@@ -13,8 +13,120 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "034a83431f03": {
+    "0056f47b204a": {
       "name": "linear.getIssue#1",
+      "ordinal": 4,
+      "args": [
+        {
+          "name": "method",
+          "value": "linear.getIssue"
+        },
+        {
+          "name": "params",
+          "value": {
+            "id": "issue-1",
+            "workspaceId": "linear-workspace"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 30000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "1d3774209877": {
+      "name": "linear.issueComments#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "linear.issueComments"
+        },
+        {
+          "name": "params",
+          "value": {
+            "issueId": "issue-1",
+            "workspaceId": "linear-workspace"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 30000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "comments transport error",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "1eaad537f925": {
+      "name": "linear.getIssue#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.getIssue\",\"params\":{\"id\":\"issue-1\",\"workspaceId\":\"linear-workspace\"}}"
+    },
+    "264010756b38": {
+      "name": "detailLoading",
+      "ordinal": 3,
+      "value": true
+    },
+    "33614c90b6eb": {
+      "name": "detailPayload",
+      "ordinal": 1,
+      "value": {
+        "$rpc": "null"
+      }
+    },
+    "42903545f0f8": {
+      "error": "comments transport error",
+      "loading": false,
+      "payload": {
+        "$rpc": "null"
+      }
+    },
+    "51ea77da7dbd": {
+      "name": "detailError",
+      "ordinal": 8,
+      "value": "comments transport error"
+    },
+    "780aaf1d97be": {
+      "error": "",
+      "loading": true,
+      "payload": {
+        "$rpc": "null"
+      }
+    },
+    "7d8d46d494ff": {
+      "name": "linear.issueComments#1",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.issueComments\",\"params\":{\"issueId\":\"issue-1\",\"workspaceId\":\"linear-workspace\"}}"
+    },
+    "8ccd4fa759a5": {
+      "name": "detailLoading",
+      "ordinal": 9,
+      "value": false
+    },
+    "a4f1a8696a24": {
+      "name": "detailError",
+      "ordinal": 2,
+      "value": ""
+    },
+    "d3dc79e5717b": {
+      "name": "linear.getIssue#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -48,13 +160,9 @@
         }
       }
     },
-    "0e0abca05602": {
-      "name": "detailError",
-      "value": "comments transport error",
-      "sent": 2
-    },
-    "3cb9a384ce0e": {
+    "ea4a4f6523e7": {
       "name": "linear.issueComments#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
@@ -79,79 +187,6 @@
         "startedAt": 0
       }
     },
-    "42903545f0f8": {
-      "error": "comments transport error",
-      "loading": false,
-      "payload": {
-        "$rpc": "null"
-      }
-    },
-    "46d0f1129c84": {
-      "name": "linear.getIssue#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.getIssue\",\"params\":{\"id\":\"issue-1\",\"workspaceId\":\"linear-workspace\"}}",
-      "sent": 2
-    },
-    "4e7c4654b51d": {
-      "name": "linear.issueComments#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "linear.issueComments"
-        },
-        {
-          "name": "params",
-          "value": {
-            "issueId": "issue-1",
-            "workspaceId": "linear-workspace"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "timeoutMs": 30000
-          }
-        }
-      ],
-      "settlement": {
-        "status": "rejected",
-        "startedAt": 0,
-        "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "comments transport error",
-          "isRpcDeliveryUnknown": true
-        }
-      }
-    },
-    "56d172ecd2fe": {
-      "name": "detailLoading",
-      "value": true,
-      "sent": 0
-    },
-    "5b2b6dd0b30f": {
-      "name": "linear.issueComments#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.issueComments\",\"params\":{\"issueId\":\"issue-1\",\"workspaceId\":\"linear-workspace\"}}",
-      "sent": 2
-    },
-    "780aaf1d97be": {
-      "error": "",
-      "loading": true,
-      "payload": {
-        "$rpc": "null"
-      }
-    },
-    "9bd1de5d9753": {
-      "name": "detailPayload",
-      "value": {
-        "$rpc": "null"
-      },
-      "sent": 0
-    },
-    "9d6ce9f28401": {
-      "name": "detailError",
-      "value": "",
-      "sent": 0
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -159,37 +194,6 @@
       "value": {
         "$rpc": "undefined"
       }
-    },
-    "ee0c4638d266": {
-      "name": "detailLoading",
-      "value": false,
-      "sent": 2
-    },
-    "fc4ce176400a": {
-      "name": "linear.getIssue#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "linear.getIssue"
-        },
-        {
-          "name": "params",
-          "value": {
-            "id": "issue-1",
-            "workspaceId": "linear-workspace"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "timeoutMs": 30000
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
     }
   },
   "recording": {
@@ -198,42 +202,42 @@
       {
         "id": "pending",
         "observation": {
-          "sender": ["fc4ce176400a", "3cb9a384ce0e"],
-          "payloads": ["46d0f1129c84", "5b2b6dd0b30f"],
+          "sender": ["0056f47b204a", "ea4a4f6523e7"],
+          "payloads": ["1eaad537f925", "7d8d46d494ff"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
           "state": "780aaf1d97be",
-          "effects": ["9bd1de5d9753", "9d6ce9f28401", "56d172ecd2fe"]
+          "effects": ["33614c90b6eb", "a4f1a8696a24", "264010756b38"]
         }
       },
       {
         "id": "issue-refused-comments-pending",
         "observation": {
-          "sender": ["034a83431f03", "3cb9a384ce0e"],
-          "payloads": ["46d0f1129c84", "5b2b6dd0b30f"],
+          "sender": ["d3dc79e5717b", "ea4a4f6523e7"],
+          "payloads": ["1eaad537f925", "7d8d46d494ff"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
           "state": "780aaf1d97be",
-          "effects": ["9bd1de5d9753", "9d6ce9f28401", "56d172ecd2fe"]
+          "effects": ["33614c90b6eb", "a4f1a8696a24", "264010756b38"]
         }
       },
       {
         "id": "settled",
         "observation": {
-          "sender": ["034a83431f03", "4e7c4654b51d"],
-          "payloads": ["46d0f1129c84", "5b2b6dd0b30f"],
+          "sender": ["d3dc79e5717b", "1d3774209877"],
+          "payloads": ["1eaad537f925", "7d8d46d494ff"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
           "state": "42903545f0f8",
           "effects": [
-            "9bd1de5d9753",
-            "9d6ce9f28401",
-            "56d172ecd2fe",
-            "0e0abca05602",
-            "ee0c4638d266"
+            "33614c90b6eb",
+            "a4f1a8696a24",
+            "264010756b38",
+            "51ea77da7dbd",
+            "8ccd4fa759a5"
           ]
         }
       }

mobile/rpc-foundation/goldens/browser-dialog-accepted.json

@@ -3,9 +3,9 @@
   "family": "browser.dialog",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "95f377bc4d8bf1248cafed26b2e9f425ad37e8d3c99e354bd6a8c67eb9bd9b1b",
   "platform": "darwin",
@@ -13,6 +13,11 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
+    "93f4e9f3ead2": {
+      "name": "browser.dialogAccept#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.dialogAccept\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\"}}"
+    },
     "9855d4ec3415": {
       "busy": false,
       "dialog": {
@@ -24,21 +29,9 @@
       "keyboardValue": "hello",
       "pointerModifiers": []
     },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "f11babba920d": {
-      "name": "browser.dialogAccept#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.dialogAccept\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\"}}",
-      "sent": 1
-    },
-    "f23289a40300": {
+    "cd44f29d755e": {
       "name": "browser.dialogAccept#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -70,6 +63,14 @@
           }
         }
       }
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
     }
   },
   "recording": {
@@ -78,8 +79,8 @@
       {
         "id": "dismissed",
         "observation": {
-          "sender": ["f23289a40300"],
-          "payloads": ["f11babba920d"],
+          "sender": ["cd44f29d755e"],
+          "payloads": ["93f4e9f3ead2"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "dialog": "eb79a9b3682a"

mobile/rpc-foundation/goldens/browser-dialog-dismissed.json

@@ -3,9 +3,9 @@
   "family": "browser.dialog",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "5071188ee492a4ced5be793b2dab32baa9750ee6535128635f274fd79198e2f1",
   "platform": "darwin",
@@ -13,24 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "786423f11435": {
-      "name": "browser.dialogDismiss#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.dialogDismiss\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\"}}",
-      "sent": 1
-    },
-    "9855d4ec3415": {
-      "busy": false,
-      "dialog": {
-        "$rpc": "null"
-      },
-      "error": {
-        "$rpc": "null"
-      },
-      "keyboardValue": "hello",
-      "pointerModifiers": []
-    },
-    "be3e7ad116a5": {
+    "44cc0151aab3": {
       "name": "browser.dialogDismiss#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -63,6 +48,17 @@
         }
       }
     },
+    "9855d4ec3415": {
+      "busy": false,
+      "dialog": {
+        "$rpc": "null"
+      },
+      "error": {
+        "$rpc": "null"
+      },
+      "keyboardValue": "hello",
+      "pointerModifiers": []
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -70,6 +66,11 @@
       "value": {
         "$rpc": "undefined"
       }
+    },
+    "f27b7eb2da31": {
+      "name": "browser.dialogDismiss#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.dialogDismiss\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\"}}"
     }
   },
   "recording": {
@@ -78,8 +79,8 @@
       {
         "id": "dismissed",
         "observation": {
-          "sender": ["be3e7ad116a5"],
-          "payloads": ["786423f11435"],
+          "sender": ["44cc0151aab3"],
+          "payloads": ["f27b7eb2da31"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "dialog": "eb79a9b3682a"

mobile/rpc-foundation/goldens/browser-keyboard-input.json

@@ -3,9 +3,9 @@
   "family": "browser.keyboard",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "eb2294c30af70ebc2bac092dc5105249ae8cf1941f750406622f7ff6dd70cc1b",
   "platform": "darwin",
@@ -13,25 +13,37 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "1bc6d9688999": {
-      "name": "browser.keyboardInsertText#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.keyboardInsertText\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"text\":\"hello\"}}",
-      "sent": 1
-    },
-    "2f4d80d09d24": {
+    "6104536ec606": {
       "name": "browser.keypress#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"browser.keypress\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"key\":\"Enter\"}}",
-      "sent": 2
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"browser.keypress\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"key\":\"Enter\"}}"
     },
-    "5fe64ef6c1f3": {
+    "8160e8872519": {
+      "busy": false,
+      "dialog": {
+        "$rpc": "null"
+      },
+      "error": {
+        "$rpc": "null"
+      },
+      "keyboardValue": "",
+      "pointerModifiers": []
+    },
+    "86b725378b3b": {
+      "name": "browser.keyboardInsertText#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.keyboardInsertText\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"text\":\"hello\"}}"
+    },
+    "a5e12fd12d8a": {
       "name": "toast",
+      "ordinal": 3,
       "value": {
         "message": "Sent"
-      },
-      "sent": 1
+      }
     },
-    "770254847b6a": {
+    "d1075b8afeb6": {
       "name": "browser.keyboardInsertText#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -65,19 +77,9 @@
         }
       }
     },
-    "8160e8872519": {
-      "busy": false,
-      "dialog": {
-        "$rpc": "null"
-      },
-      "error": {
-        "$rpc": "null"
-      },
-      "keyboardValue": "",
-      "pointerModifiers": []
-    },
-    "c532c7fdcc69": {
+    "e6c97e728698": {
       "name": "browser.keypress#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -126,15 +128,15 @@
       {
         "id": "typed",
         "observation": {
-          "sender": ["770254847b6a", "c532c7fdcc69"],
-          "payloads": ["1bc6d9688999", "2f4d80d09d24"],
+          "sender": ["d1075b8afeb6", "e6c97e728698"],
+          "payloads": ["86b725378b3b", "6104536ec606"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "text": "eb79a9b3682a",
             "keypress": "eb79a9b3682a"
           },
           "state": "8160e8872519",
-          "effects": ["5fe64ef6c1f3"]
+          "effects": ["a5e12fd12d8a"]
         }
       }
     ]

mobile/rpc-foundation/goldens/browser-pointer-click-accepted.json

@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "73faa87b359a11959543542016295bb6b36a10934dd99ad5c1a77a4290a608cd",
   "platform": "darwin",
@@ -13,13 +13,33 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "0da10b838d9e": {
+    "002a5bcbde42": {
       "name": "browser.mouseClick#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseClick\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80,\"button\":\"left\",\"modifiers\":[],\"radius\":14}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseClick\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80,\"button\":\"left\",\"modifiers\":[],\"radius\":14}}"
     },
-    "5b621e308200": {
+    "9855d4ec3415": {
+      "busy": false,
+      "dialog": {
+        "$rpc": "null"
+      },
+      "error": {
+        "$rpc": "null"
+      },
+      "keyboardValue": "hello",
+      "pointerModifiers": []
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f14b569391f9": {
       "name": "browser.mouseClick#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -56,25 +76,6 @@
           }
         }
       }
-    },
-    "9855d4ec3415": {
-      "busy": false,
-      "dialog": {
-        "$rpc": "null"
-      },
-      "error": {
-        "$rpc": "null"
-      },
-      "keyboardValue": "hello",
-      "pointerModifiers": []
-    },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
     }
   },
   "recording": {
@@ -83,8 +84,8 @@
       {
         "id": "clicked",
         "observation": {
-          "sender": ["5b621e308200"],
-          "payloads": ["0da10b838d9e"],
+          "sender": ["f14b569391f9"],
+          "payloads": ["002a5bcbde42"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "click": "eb79a9b3682a"

mobile/rpc-foundation/goldens/browser-pointer-click-fallback.json

@@ -3,9 +3,9 @@
   "family": "browser.pointer-click",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "20779e28880cf62340bc34cef8f40a49311e11262ac069df909743da9b5500ff",
   "platform": "darwin",
@@ -13,58 +13,29 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "0da10b838d9e": {
+    "002a5bcbde42": {
       "name": "browser.mouseClick#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseClick\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80,\"button\":\"left\",\"modifiers\":[],\"radius\":14}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseClick\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80,\"button\":\"left\",\"modifiers\":[],\"radius\":14}}"
     },
-    "11a7e8034273": {
+    "08224c934905": {
       "name": "browser.mouseDown#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseDown\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"button\":\"left\"}}",
-      "sent": 3
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseDown\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"button\":\"left\"}}"
     },
-    "1961908d1da1": {
-      "name": "browser.mouseDown#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "browser.mouseDown"
-        },
-        {
-          "name": "params",
-          "value": {
-            "button": "left",
-            "page": "page-1",
-            "worktree": "id:worktree-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "down": true
-          }
-        }
-      }
-    },
-    "25ad8c6e489e": {
+    "125a546c8a77": {
       "name": "browser.mouseMove#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseMove\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80}}",
-      "sent": 2
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseMove\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80}}"
     },
-    "41b41cc39e88": {
+    "71b83de9e4d3": {
       "name": "browser.mouseUp#1",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseUp\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"button\":\"left\"}}"
+    },
+    "82ccdef1369f": {
+      "name": "browser.mouseUp#1",
+      "ordinal": 7,
       "args": [
         {
           "name": "method",
@@ -109,49 +80,9 @@
       "keyboardValue": "hello",
       "pointerModifiers": []
     },
-    "aa160e9b114e": {
-      "name": "browser.mouseUp#1",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseUp\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"button\":\"left\"}}",
-      "sent": 4
-    },
-    "b3273afd3ec2": {
-      "name": "browser.mouseMove#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "browser.mouseMove"
-        },
-        {
-          "name": "params",
-          "value": {
-            "page": "page-1",
-            "worktree": "id:worktree-1",
-            "x": 40,
-            "y": 80
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "moved": true
-          }
-        }
-      }
-    },
-    "cf9ea7b52a57": {
+    "d333a2a9fd72": {
       "name": "browser.mouseClick#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -190,6 +121,79 @@
         }
       }
     },
+    "dbfbacf8be29": {
+      "name": "browser.mouseMove#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "browser.mouseMove"
+        },
+        {
+          "name": "params",
+          "value": {
+            "page": "page-1",
+            "worktree": "id:worktree-1",
+            "x": 40,
+            "y": 80
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "moved": true
+          }
+        }
+      }
+    },
+    "e3ae5f4e0dc4": {
+      "name": "browser.mouseDown#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "browser.mouseDown"
+        },
+        {
+          "name": "params",
+          "value": {
+            "button": "left",
+            "page": "page-1",
+            "worktree": "id:worktree-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "down": true
+          }
+        }
+      }
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -205,8 +209,8 @@
       {
         "id": "clicked-by-fallback",
         "observation": {
-          "sender": ["cf9ea7b52a57", "b3273afd3ec2", "1961908d1da1", "41b41cc39e88"],
-          "payloads": ["0da10b838d9e", "25ad8c6e489e", "11a7e8034273", "aa160e9b114e"],
+          "sender": ["d333a2a9fd72", "dbfbacf8be29", "e3ae5f4e0dc4", "82ccdef1369f"],
+          "payloads": ["002a5bcbde42", "125a546c8a77", "08224c934905", "71b83de9e4d3"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "click": "eb79a9b3682a"

mobile/rpc-foundation/goldens/browser-wheel-scrolled.json

@@ -3,9 +3,9 @@
   "family": "browser.wheel",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "55971752f963202d30160851197a301089b0f3ebd0c46725af1a461d8310d658",
   "scenarioSha256": "e1bc21248ccff45ff217e385a51618b6f5724c037bfbefa03bb76a48dd4d793b",
   "platform": "darwin",
@@ -13,49 +13,14 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "56a99047a121": {
-      "name": "browser.mouseMove#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "browser.mouseMove"
-        },
-        {
-          "name": "params",
-          "value": {
-            "page": "page-1",
-            "worktree": "id:worktree-1",
-            "x": 40,
-            "y": 80
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "moved": true
-          }
-        }
-      }
-    },
-    "60d1415b69e8": {
-      "name": "browser.mouseMove#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseMove\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80}}",
-      "sent": 1
-    },
-    "71b1fb55eafa": {
+    "0ea51271b822": {
       "name": "browser.mouseWheel#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseWheel\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"dx\":0,\"dy\":-120}}"
+    },
+    "4ee27ce5e118": {
+      "name": "browser.mouseWheel#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -90,6 +55,48 @@
         }
       }
     },
+    "5099a516ef10": {
+      "name": "browser.mouseMove#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseMove\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"x\":40,\"y\":80}}"
+    },
+    "5972986e0d80": {
+      "name": "browser.mouseMove#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "browser.mouseMove"
+        },
+        {
+          "name": "params",
+          "value": {
+            "page": "page-1",
+            "worktree": "id:worktree-1",
+            "x": 40,
+            "y": 80
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "moved": true
+          }
+        }
+      }
+    },
     "9855d4ec3415": {
       "busy": false,
       "dialog": {
@@ -101,11 +108,6 @@
       "keyboardValue": "hello",
       "pointerModifiers": []
     },
-    "d2d492cca894": {
-      "name": "browser.mouseWheel#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"browser.mouseWheel\",\"params\":{\"worktree\":\"id:worktree-1\",\"page\":\"page-1\",\"dx\":0,\"dy\":-120}}",
-      "sent": 2
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -121,8 +123,8 @@
       {
         "id": "scrolled",
         "observation": {
-          "sender": ["56a99047a121", "71b1fb55eafa"],
-          "payloads": ["60d1415b69e8", "d2d492cca894"],
+          "sender": ["5972986e0d80", "4ee27ce5e118"],
+          "payloads": ["5099a516ef10", "0ea51271b822"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "wheel": "eb79a9b3682a"

mobile/rpc-foundation/goldens/clipboard-image-attachment-anonymous.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "d4031721b16d7c281c544e7b2eef774fd20dda1890d7ebaadcbbb1eda4d276fd",
   "platform": "darwin",
@@ -13,67 +13,21 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "037a93bf236b": {
-      "name": "terminal.send#1",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-1\",\"text\":\"\\u001b[200~/tmp/img.png\\u001b[201~ \",\"enter\":false}}",
-      "sent": 4
-    },
-    "1c2f6fe81321": {
+    "08a3a6323626": {
       "name": "before-terminal-send",
+      "ordinal": 8,
       "value": {
         "terminal": "terminal-1"
-      },
-      "sent": 3
-    },
-    "308e09c6a619": {
-      "name": "terminal.send#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "terminal.send"
-        },
-        {
-          "name": "params",
-          "value": {
-            "enter": false,
-            "terminal": "terminal-1",
-            "text": "\u001b[200~/tmp/img.png\u001b[201~ "
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-4",
-          "ok": true,
-          "result": {
-            "send": {
-              "accepted": false
-            }
-          }
-        }
       }
     },
-    "5f71b4d3d25c": {
-      "name": "upload-start",
-      "value": {},
-      "sent": 0
-    },
-    "72c805fadcfb": {
-      "name": "clipboard.appendImageUploadChunk#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}",
-      "sent": 2
-    },
-    "7e48c58139e5": {
+    "6696a47819e1": {
       "name": "clipboard.startImageUpload#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}"
+    },
+    "7c2e3ea286aa": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -112,19 +66,68 @@
       "settledAt": 0,
       "value": false
     },
+    "814ccd56a769": {
+      "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}"
+    },
+    "8452698ac11a": {
+      "name": "clipboard.commitImageUpload#1",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}"
+    },
+    "89d34592cd07": {
+      "name": "terminal.send#1",
+      "ordinal": 9,
+      "args": [
+        {
+          "name": "method",
+          "value": "terminal.send"
+        },
+        {
+          "name": "params",
+          "value": {
+            "enter": false,
+            "terminal": "terminal-1",
+            "text": "\u001b[200~/tmp/img.png\u001b[201~ "
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "send": {
+              "accepted": false
+            }
+          }
+        }
+      }
+    },
     "8aa742456efd": {
       "attached": false,
       "failure": {
         "$rpc": "null"
       }
     },
-    "8dfd1f053efc": {
-      "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}",
-      "sent": 1
+    "994fccf9b305": {
+      "name": "upload-start",
+      "ordinal": 1,
+      "value": {}
     },
-    "e93276a9971b": {
+    "b50d2ec23283": {
       "name": "clipboard.commitImageUpload#1",
+      "ordinal": 6,
       "args": [
         {
           "name": "method",
@@ -154,13 +157,14 @@
         }
       }
     },
-    "e9a3deaf4515": {
-      "name": "clipboard.commitImageUpload#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}",
-      "sent": 3
+    "b8f944bef6f2": {
+      "name": "terminal.send#1",
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-1\",\"text\":\"\\u001b[200~/tmp/img.png\\u001b[201~ \",\"enter\":false}}"
     },
-    "f1a3d38271bc": {
+    "f05e4695ffa3": {
       "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -201,13 +205,13 @@
       {
         "id": "rejected",
         "observation": {
-          "sender": ["7e48c58139e5", "f1a3d38271bc", "e93276a9971b", "308e09c6a619"],
-          "payloads": ["8dfd1f053efc", "72c805fadcfb", "e9a3deaf4515", "037a93bf236b"],
+          "sender": ["7c2e3ea286aa", "f05e4695ffa3", "b50d2ec23283", "89d34592cd07"],
+          "payloads": ["6696a47819e1", "814ccd56a769", "8452698ac11a", "b8f944bef6f2"],
           "settlements": {
             "anonymous": "7ed3d39f0607"
           },
           "state": "8aa742456efd",
-          "effects": ["5f71b4d3d25c", "1c2f6fe81321"]
+          "effects": ["994fccf9b305", "08a3a6323626"]
         }
       }
     ]

mobile/rpc-foundation/goldens/clipboard-image-attachment-blocked-before-send.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "ea04d03c15d3cb94be7fe111a8a6219c4e0304095679bbae62af623f5b36c9f4",
   "platform": "darwin",
@@ -13,25 +13,21 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "1c2f6fe81321": {
+    "08a3a6323626": {
       "name": "before-terminal-send",
+      "ordinal": 8,
       "value": {
         "terminal": "terminal-1"
-      },
-      "sent": 3
+      }
     },
-    "5f71b4d3d25c": {
-      "name": "upload-start",
-      "value": {},
-      "sent": 0
-    },
-    "72c805fadcfb": {
-      "name": "clipboard.appendImageUploadChunk#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}",
-      "sent": 2
-    },
-    "7e48c58139e5": {
+    "6696a47819e1": {
       "name": "clipboard.startImageUpload#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}"
+    },
+    "7c2e3ea286aa": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -70,19 +66,30 @@
       "settledAt": 0,
       "value": false
     },
+    "814ccd56a769": {
+      "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}"
+    },
+    "8452698ac11a": {
+      "name": "clipboard.commitImageUpload#1",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}"
+    },
     "8aa742456efd": {
       "attached": false,
       "failure": {
         "$rpc": "null"
       }
     },
-    "8dfd1f053efc": {
-      "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}",
-      "sent": 1
+    "994fccf9b305": {
+      "name": "upload-start",
+      "ordinal": 1,
+      "value": {}
     },
-    "e93276a9971b": {
+    "b50d2ec23283": {
       "name": "clipboard.commitImageUpload#1",
+      "ordinal": 6,
       "args": [
         {
           "name": "method",
@@ -112,13 +119,9 @@
         }
       }
     },
-    "e9a3deaf4515": {
-      "name": "clipboard.commitImageUpload#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}",
-      "sent": 3
-    },
-    "f1a3d38271bc": {
+    "f05e4695ffa3": {
       "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -159,13 +162,13 @@
       {
         "id": "blocked",
         "observation": {
-          "sender": ["7e48c58139e5", "f1a3d38271bc", "e93276a9971b"],
-          "payloads": ["8dfd1f053efc", "72c805fadcfb", "e9a3deaf4515"],
+          "sender": ["7c2e3ea286aa", "f05e4695ffa3", "b50d2ec23283"],
+          "payloads": ["6696a47819e1", "814ccd56a769", "8452698ac11a"],
           "settlements": {
             "blocked": "7ed3d39f0607"
           },
           "state": "8aa742456efd",
-          "effects": ["5f71b4d3d25c", "1c2f6fe81321"]
+          "effects": ["994fccf9b305", "08a3a6323626"]
         }
       }
     ]

mobile/rpc-foundation/goldens/clipboard-image-attachment-cancelled.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "e6be7d5dd6b4f5083627a3ba864b1b040d71bf72b60ad940b7d0d575964a7b80",
   "platform": "darwin",

mobile/rpc-foundation/goldens/clipboard-image-attachment-pasted.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "60273f74d8fe869723cbbd1a459d7d789a92e07a0f1e9444b42e2d7767e5bec1",
   "platform": "darwin",
@@ -13,81 +13,16 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "1c2f6fe81321": {
+    "08a3a6323626": {
       "name": "before-terminal-send",
+      "ordinal": 8,
       "value": {
         "terminal": "terminal-1"
-      },
-      "sent": 3
-    },
-    "5f71b4d3d25c": {
-      "name": "upload-start",
-      "value": {},
-      "sent": 0
-    },
-    "72c805fadcfb": {
-      "name": "clipboard.appendImageUploadChunk#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}",
-      "sent": 2
-    },
-    "7e48c58139e5": {
-      "name": "clipboard.startImageUpload#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "clipboard.startImageUpload"
-        },
-        {
-          "name": "params",
-          "value": {
-            "connectionId": "connection-1",
-            "expectedBase64Length": 32
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "uploadId": "upload-1"
-          }
-        }
       }
     },
-    "84e5ca07cb7a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": true
-    },
-    "860d6a5b4609": {
-      "name": "terminal.send#1",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-1\",\"text\":\"\\u001b[200~/tmp/img.png\\u001b[201~ \",\"enter\":false,\"client\":{\"id\":\"device-token-1\",\"type\":\"mobile\"}}}",
-      "sent": 4
-    },
-    "8dfd1f053efc": {
-      "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}",
-      "sent": 1
-    },
-    "b7a44aafa946": {
-      "attached": true,
-      "failure": {
-        "$rpc": "null"
-      }
-    },
-    "bc40e57896c9": {
+    "349431e2edcd": {
       "name": "terminal.send#1",
+      "ordinal": 9,
       "args": [
         {
           "name": "method",
@@ -127,8 +62,75 @@
         }
       }
     },
-    "e93276a9971b": {
+    "5af5db426de7": {
+      "name": "terminal.send#1",
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"terminal.send\",\"params\":{\"terminal\":\"terminal-1\",\"text\":\"\\u001b[200~/tmp/img.png\\u001b[201~ \",\"enter\":false,\"client\":{\"id\":\"device-token-1\",\"type\":\"mobile\"}}}"
+    },
+    "6696a47819e1": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}"
+    },
+    "7c2e3ea286aa": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "clipboard.startImageUpload"
+        },
+        {
+          "name": "params",
+          "value": {
+            "connectionId": "connection-1",
+            "expectedBase64Length": 32
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "uploadId": "upload-1"
+          }
+        }
+      }
+    },
+    "814ccd56a769": {
+      "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}"
+    },
+    "8452698ac11a": {
       "name": "clipboard.commitImageUpload#1",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}"
+    },
+    "84e5ca07cb7a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": true
+    },
+    "994fccf9b305": {
+      "name": "upload-start",
+      "ordinal": 1,
+      "value": {}
+    },
+    "b50d2ec23283": {
+      "name": "clipboard.commitImageUpload#1",
+      "ordinal": 6,
       "args": [
         {
           "name": "method",
@@ -158,13 +160,15 @@
         }
       }
     },
-    "e9a3deaf4515": {
-      "name": "clipboard.commitImageUpload#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}",
-      "sent": 3
+    "b7a44aafa946": {
+      "attached": true,
+      "failure": {
+        "$rpc": "null"
+      }
     },
-    "f1a3d38271bc": {
+    "f05e4695ffa3": {
       "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -205,13 +209,13 @@
       {
         "id": "attached",
         "observation": {
-          "sender": ["7e48c58139e5", "f1a3d38271bc", "e93276a9971b", "bc40e57896c9"],
-          "payloads": ["8dfd1f053efc", "72c805fadcfb", "e9a3deaf4515", "860d6a5b4609"],
+          "sender": ["7c2e3ea286aa", "f05e4695ffa3", "b50d2ec23283", "349431e2edcd"],
+          "payloads": ["6696a47819e1", "814ccd56a769", "8452698ac11a", "5af5db426de7"],
           "settlements": {
             "normal": "84e5ca07cb7a"
           },
           "state": "b7a44aafa946",
-          "effects": ["5f71b4d3d25c", "1c2f6fe81321"]
+          "effects": ["994fccf9b305", "08a3a6323626"]
         }
       }
     ]

mobile/rpc-foundation/goldens/clipboard-image-attachment-upload-refused.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-attachment",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "e7f492523421873f045726e15ec95eac26d43f7e971a33fd89ec1a9749492987",
   "platform": "darwin",
@@ -13,32 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "5f71b4d3d25c": {
-      "name": "upload-start",
-      "value": {},
-      "sent": 0
-    },
-    "765ab192e1a5": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Image is too large",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "8dfd1f053efc": {
-      "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}",
-      "sent": 1
-    },
-    "cc325ad637ea": {
-      "attached": "unattached",
-      "failure": "Image is too large"
-    },
-    "ec6fd7f06461": {
+    "3c402c915494": {
       "name": "clipboard.startImageUpload#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -71,6 +48,30 @@
           "ok": false
         }
       }
+    },
+    "6696a47819e1": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}"
+    },
+    "765ab192e1a5": {
+      "status": "rejected",
+      "startedAt": 0,
+      "settledAt": 0,
+      "error": {
+        "category": "Error",
+        "message": "Image is too large",
+        "isRpcDeliveryUnknown": false
+      }
+    },
+    "994fccf9b305": {
+      "name": "upload-start",
+      "ordinal": 1,
+      "value": {}
+    },
+    "cc325ad637ea": {
+      "attached": "unattached",
+      "failure": "Image is too large"
     }
   },
   "recording": {
@@ -79,13 +80,13 @@
       {
         "id": "upload-refused",
         "observation": {
-          "sender": ["ec6fd7f06461"],
-          "payloads": ["8dfd1f053efc"],
+          "sender": ["3c402c915494"],
+          "payloads": ["6696a47819e1"],
           "settlements": {
             "normal": "765ab192e1a5"
           },
           "state": "cc325ad637ea",
-          "effects": ["5f71b4d3d25c"]
+          "effects": ["994fccf9b305"]
         }
       }
     ]

mobile/rpc-foundation/goldens/clipboard-image-upload-aborts-on-chunk-failure.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "195c2f15d81c70012ea88750ab3f84bfe512f7e422f7d2d09fb7919bd9cfd85a",
   "platform": "darwin",
@@ -13,8 +13,23 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "3de611958398": {
+    "8e6c4f65042a": {
       "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-2\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}"
+    },
+    "b49be31d506e": {
+      "failure": "Upload slot expired",
+      "path": "unsaved"
+    },
+    "bdd08542c5fc": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":null}}"
+    },
+    "c81557ea67fa": {
+      "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -49,70 +64,9 @@
         }
       }
     },
-    "48054ee45c76": {
-      "name": "clipboard.appendImageUploadChunk#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-2\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}",
-      "sent": 2
-    },
-    "63762ba12023": {
-      "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":null}}",
-      "sent": 1
-    },
-    "9cfc668f592b": {
-      "name": "clipboard.abortImageUpload#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "clipboard.abortImageUpload"
-        },
-        {
-          "name": "params",
-          "value": {
-            "uploadId": "upload-2"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "aborted": true
-          }
-        }
-      }
-    },
-    "b49be31d506e": {
-      "failure": "Upload slot expired",
-      "path": "unsaved"
-    },
-    "bf6d0aeb2281": {
-      "name": "clipboard.abortImageUpload#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.abortImageUpload\",\"params\":{\"uploadId\":\"upload-2\"}}",
-      "sent": 3
-    },
-    "ead0111942f4": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "Upload slot expired",
-        "isRpcDeliveryUnknown": false
-      }
-    },
-    "eddc5bc46b9b": {
+    "ca96681f306d": {
       "name": "clipboard.startImageUpload#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -146,6 +100,55 @@
           }
         }
       }
+    },
+    "cd036aabcfa0": {
+      "name": "clipboard.abortImageUpload#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "clipboard.abortImageUpload"
+        },
+        {
+          "name": "params",
+          "value": {
+            "uploadId": "upload-2"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "aborted": true
+          }
+        }
+      }
+    },
+    "e6cb8187ff0a": {
+      "name": "clipboard.abortImageUpload#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.abortImageUpload\",\"params\":{\"uploadId\":\"upload-2\"}}"
+    },
+    "ead0111942f4": {
+      "status": "rejected",
+      "startedAt": 0,
+      "settledAt": 0,
+      "error": {
+        "category": "Error",
+        "message": "Upload slot expired",
+        "isRpcDeliveryUnknown": false
+      }
     }
   },
   "recording": {
@@ -154,8 +157,8 @@
       {
         "id": "aborted",
         "observation": {
-          "sender": ["eddc5bc46b9b", "3de611958398", "9cfc668f592b"],
-          "payloads": ["63762ba12023", "48054ee45c76", "bf6d0aeb2281"],
+          "sender": ["ca96681f306d", "c81557ea67fa", "cd036aabcfa0"],
+          "payloads": ["bdd08542c5fc", "8e6c4f65042a", "e6cb8187ff0a"],
           "settlements": {
             "local": "ead0111942f4"
           },

mobile/rpc-foundation/goldens/clipboard-image-upload-chunked.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "160101326d39705c2036c12646ff6b13d997a1cf91bdc86e5e29279ba31867e4",
   "platform": "darwin",
@@ -13,100 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "72c805fadcfb": {
-      "name": "clipboard.appendImageUploadChunk#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}",
-      "sent": 2
-    },
-    "7ab518750e0f": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": "/tmp/img.png"
-    },
-    "7e48c58139e5": {
-      "name": "clipboard.startImageUpload#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "clipboard.startImageUpload"
-        },
-        {
-          "name": "params",
-          "value": {
-            "connectionId": "connection-1",
-            "expectedBase64Length": 32
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "uploadId": "upload-1"
-          }
-        }
-      }
-    },
-    "8dfd1f053efc": {
-      "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}",
-      "sent": 1
-    },
-    "a77b999a5f7c": {
-      "failure": {
-        "$rpc": "null"
-      },
-      "path": "/tmp/img.png"
-    },
-    "e93276a9971b": {
-      "name": "clipboard.commitImageUpload#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "clipboard.commitImageUpload"
-        },
-        {
-          "name": "params",
-          "value": {
-            "uploadId": "upload-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": "/tmp/img.png"
-        }
-      }
-    },
-    "e9a3deaf4515": {
-      "name": "clipboard.commitImageUpload#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}",
-      "sent": 3
-    },
-    "f1a3d38271bc": {
+    "261840506035": {
       "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -139,6 +48,100 @@
           }
         }
       }
+    },
+    "28e38d6e1608": {
+      "name": "clipboard.appendImageUploadChunk#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.appendImageUploadChunk\",\"params\":{\"uploadId\":\"upload-1\",\"offset\":0,\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}}"
+    },
+    "7442a814fa13": {
+      "name": "clipboard.commitImageUpload#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "clipboard.commitImageUpload"
+        },
+        {
+          "name": "params",
+          "value": {
+            "uploadId": "upload-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": "/tmp/img.png"
+        }
+      }
+    },
+    "7ab518750e0f": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": "/tmp/img.png"
+    },
+    "7bc2e4227914": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}"
+    },
+    "a13ad28e242d": {
+      "name": "clipboard.commitImageUpload#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}"
+    },
+    "a77b999a5f7c": {
+      "failure": {
+        "$rpc": "null"
+      },
+      "path": "/tmp/img.png"
+    },
+    "d2a1a0e3d100": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "clipboard.startImageUpload"
+        },
+        {
+          "name": "params",
+          "value": {
+            "connectionId": "connection-1",
+            "expectedBase64Length": 32
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "uploadId": "upload-1"
+          }
+        }
+      }
     }
   },
   "recording": {
@@ -147,8 +150,8 @@
       {
         "id": "uploaded",
         "observation": {
-          "sender": ["7e48c58139e5", "f1a3d38271bc", "e93276a9971b"],
-          "payloads": ["8dfd1f053efc", "72c805fadcfb", "e9a3deaf4515"],
+          "sender": ["d2a1a0e3d100", "261840506035", "7442a814fa13"],
+          "payloads": ["7bc2e4227914", "28e38d6e1608", "a13ad28e242d"],
           "settlements": {
             "remote": "7ab518750e0f"
           },

mobile/rpc-foundation/goldens/clipboard-image-upload-single-frame-fallback.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "89ffa843d08ee27dd44b7bba507ce84661b0df73c35f7a8c273e004604710dc9",
   "platform": "darwin",
@@ -13,8 +13,64 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "12f2bb1c7b16": {
+    "7bc2e4227914": {
       "name": "clipboard.startImageUpload#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}"
+    },
+    "7f1260e77032": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": "/tmp/legacy.png"
+    },
+    "83066435034c": {
+      "name": "clipboard.saveImageAsTempFile#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "clipboard.saveImageAsTempFile"
+        },
+        {
+          "name": "params",
+          "value": {
+            "connectionId": "connection-1",
+            "contentBase64": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": "/tmp/legacy.png"
+        }
+      }
+    },
+    "923de2c0221d": {
+      "failure": {
+        "$rpc": "null"
+      },
+      "path": "/tmp/legacy.png"
+    },
+    "bf02ba1bc517": {
+      "name": "clipboard.saveImageAsTempFile#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.saveImageAsTempFile\",\"params\":{\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\",\"connectionId\":\"connection-1\"}}"
+    },
+    "fa3470507c98": {
+      "name": "clipboard.startImageUpload#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -47,60 +103,6 @@
           "ok": false
         }
       }
-    },
-    "61599dd8e71a": {
-      "name": "clipboard.saveImageAsTempFile#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "clipboard.saveImageAsTempFile"
-        },
-        {
-          "name": "params",
-          "value": {
-            "connectionId": "connection-1",
-            "contentBase64": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": "/tmp/legacy.png"
-        }
-      }
-    },
-    "7f1260e77032": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": "/tmp/legacy.png"
-    },
-    "8dfd1f053efc": {
-      "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}",
-      "sent": 1
-    },
-    "923de2c0221d": {
-      "failure": {
-        "$rpc": "null"
-      },
-      "path": "/tmp/legacy.png"
-    },
-    "d6a7fe2e0164": {
-      "name": "clipboard.saveImageAsTempFile#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.saveImageAsTempFile\",\"params\":{\"contentBase64\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\",\"connectionId\":\"connection-1\"}}",
-      "sent": 2
     }
   },
   "recording": {
@@ -109,8 +111,8 @@
       {
         "id": "fell-back",
         "observation": {
-          "sender": ["12f2bb1c7b16", "61599dd8e71a"],
-          "payloads": ["8dfd1f053efc", "d6a7fe2e0164"],
+          "sender": ["fa3470507c98", "83066435034c"],
+          "payloads": ["7bc2e4227914", "bf02ba1bc517"],
           "settlements": {
             "remote": "7f1260e77032"
           },

mobile/rpc-foundation/goldens/clipboard-image-upload-start-refused.json

@@ -3,9 +3,9 @@
   "family": "clipboard.image-upload",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "16779b663f4faec8cbccdb42efd7b568a2912845b161f8a4827754687eb4235c",
   "scenarioSha256": "bf0227939c2d41d6a1ebc5b07a31196043e78f1580811bd32ec6fc5f447f5934",
   "platform": "darwin",
@@ -23,17 +23,14 @@
         "isRpcDeliveryUnknown": false
       }
     },
-    "8dfd1f053efc": {
+    "7bc2e4227914": {
       "name": "clipboard.startImageUpload#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.startImageUpload\",\"params\":{\"expectedBase64Length\":32,\"connectionId\":\"connection-1\"}}"
     },
-    "a69f0ea71c3c": {
-      "failure": "Image is too large",
-      "path": "unsaved"
-    },
-    "ec6fd7f06461": {
+    "a338b739235b": {
       "name": "clipboard.startImageUpload#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -66,6 +63,10 @@
           "ok": false
         }
       }
+    },
+    "a69f0ea71c3c": {
+      "failure": "Image is too large",
+      "path": "unsaved"
     }
   },
   "recording": {
@@ -74,8 +75,8 @@
       {
         "id": "start-refused",
         "observation": {
-          "sender": ["ec6fd7f06461"],
-          "payloads": ["8dfd1f053efc"],
+          "sender": ["a338b739235b"],
+          "payloads": ["7bc2e4227914"],
           "settlements": {
             "remote": "765ab192e1a5"
           },

mobile/rpc-foundation/goldens/codex-reset-credit-consumed.json

@@ -3,9 +3,9 @@
   "family": "components.codex-reset-credit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "76b53dea504a688493843e23e8e7d052fc196f559bb1e2579d0fd38bf3156d0e",
   "scenarioSha256": "00260be9809576607ac91bfacd9fa6cc4f8a190c6b88804c977ea07d36d7162e",
   "platform": "darwin",
@@ -18,10 +18,13 @@
         "$rpc": "null"
       }
     },
-    "31c5054bc660": {
-      "name": "accounts.consumeCodexResetCredit#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"accounts.consumeCodexResetCredit\",\"params\":{\"idempotencyKey\":\"00000000-0000-4000-8000-000000000001\",\"expectedScope\":{\"target\":{\"runtime\":\"host\",\"wslDistro\":null},\"accountId\":\"codex-1\",\"accountRevision\":1700000000000,\"offerRevision\":\"v1:[1,null,null,[],null,null,1700000000000]\"}}}",
-      "sent": 1
+    "3ec97892842e": {
+      "name": "device-store.setItem",
+      "ordinal": 1,
+      "value": {
+        "key": "orca:codex-reset-credit-attempt:v1:0832055c2fa90e8e145c588ad4db656a2fc2840ed2e851a28494eae769db9b3e",
+        "value": "{\"v\":1,\"hostId\":\"host-1\",\"expectedScope\":{\"target\":{\"runtime\":\"host\",\"wslDistro\":null},\"accountId\":\"codex-1\",\"accountRevision\":1700000000000,\"offerRevision\":\"v1:[1,null,null,[],null,null,1700000000000]\"},\"idempotencyKey\":\"00000000-0000-4000-8000-000000000001\"}"
+      }
     },
     "60304d1e19bb": {
       "settled": {
@@ -29,8 +32,9 @@
         "outcome": "reset"
       }
     },
-    "90f55bfe00c2": {
+    "710747f3b781": {
       "name": "accounts.consumeCodexResetCredit#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -69,16 +73,14 @@
       "status": "pending",
       "startedAt": 0
     },
-    "ab755576c214": {
-      "name": "device-store.setItem",
-      "value": {
-        "key": "orca:codex-reset-credit-attempt:v1:0832055c2fa90e8e145c588ad4db656a2fc2840ed2e851a28494eae769db9b3e",
-        "value": "{\"v\":1,\"hostId\":\"host-1\",\"expectedScope\":{\"target\":{\"runtime\":\"host\",\"wslDistro\":null},\"accountId\":\"codex-1\",\"accountRevision\":1700000000000,\"offerRevision\":\"v1:[1,null,null,[],null,null,1700000000000]\"},\"idempotencyKey\":\"00000000-0000-4000-8000-000000000001\"}"
-      },
-      "sent": 0
-    },
-    "c4a98628ea44": {
+    "bc4b6f4f75c6": {
       "name": "accounts.consumeCodexResetCredit#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"accounts.consumeCodexResetCredit\",\"params\":{\"idempotencyKey\":\"00000000-0000-4000-8000-000000000001\",\"expectedScope\":{\"target\":{\"runtime\":\"host\",\"wslDistro\":null},\"accountId\":\"codex-1\",\"accountRevision\":1700000000000,\"offerRevision\":\"v1:[1,null,null,[],null,null,1700000000000]\"}}}"
+    },
+    "c0587d8ea125": {
+      "name": "accounts.consumeCodexResetCredit#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -263,25 +265,25 @@
       {
         "id": "requested",
         "observation": {
-          "sender": ["90f55bfe00c2"],
-          "payloads": ["31c5054bc660"],
+          "sender": ["710747f3b781"],
+          "payloads": ["bc4b6f4f75c6"],
           "settlements": {
             "confirm": "9270aeb7d9c6"
           },
           "state": "0a07efb53f1e",
-          "effects": ["ab755576c214"]
+          "effects": ["3ec97892842e"]
         }
       },
       {
         "id": "consumed",
         "observation": {
-          "sender": ["c4a98628ea44"],
-          "payloads": ["31c5054bc660"],
+          "sender": ["c0587d8ea125"],
+          "payloads": ["bc4b6f4f75c6"],
           "settlements": {
             "confirm": "fed9e1669a83"
           },
           "state": "60304d1e19bb",
-          "effects": ["ab755576c214"]
+          "effects": ["3ec97892842e"]
         }
       }
     ]

mobile/rpc-foundation/goldens/codex-reset-credit-resumed.json

@@ -3,9 +3,9 @@
   "family": "components.codex-reset-credit",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "76b53dea504a688493843e23e8e7d052fc196f559bb1e2579d0fd38bf3156d0e",
   "scenarioSha256": "d85a4031b701e563941afcdd7375cf78a1ee1487a0dab722f8516c2bc8d3dcee",
   "platform": "darwin",
@@ -102,8 +102,62 @@
         "outcome": "alreadyRedeemed"
       }
     },
-    "1c9f0c57c36d": {
+    "413aa2c48b5e": {
+      "name": "device-store.removeItem",
+      "ordinal": 3,
+      "value": {
+        "key": "orca:codex-reset-credit-attempt:v1:0832055c2fa90e8e145c588ad4db656a2fc2840ed2e851a28494eae769db9b3e"
+      }
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "9c4bad2e8f67": {
       "name": "accounts.consumeCodexResetCredit#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "accounts.consumeCodexResetCredit"
+        },
+        {
+          "name": "params",
+          "value": {
+            "expectedScope": {
+              "accountId": "codex-1",
+              "accountRevision": 1700000000000,
+              "offerRevision": "v1:[1,null,null,[],null,null,1700000000000]",
+              "target": {
+                "runtime": "host",
+                "wslDistro": {
+                  "$rpc": "null"
+                }
+              }
+            },
+            "idempotencyKey": "11111111-1111-4111-8111-111111111111"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 90000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "cce83ed60c84": {
+      "name": "accounts.consumeCodexResetCredit#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"accounts.consumeCodexResetCredit\",\"params\":{\"idempotencyKey\":\"11111111-1111-4111-8111-111111111111\",\"expectedScope\":{\"target\":{\"runtime\":\"host\",\"wslDistro\":null},\"accountId\":\"codex-1\",\"accountRevision\":1700000000000,\"offerRevision\":\"v1:[1,null,null,[],null,null,1700000000000]\"}}}"
+    },
+    "ecc8e2860eba": {
+      "name": "accounts.consumeCodexResetCredit#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -202,58 +256,6 @@
           }
         }
       }
-    },
-    "897e4d77e2a0": {
-      "name": "accounts.consumeCodexResetCredit#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"accounts.consumeCodexResetCredit\",\"params\":{\"idempotencyKey\":\"11111111-1111-4111-8111-111111111111\",\"expectedScope\":{\"target\":{\"runtime\":\"host\",\"wslDistro\":null},\"accountId\":\"codex-1\",\"accountRevision\":1700000000000,\"offerRevision\":\"v1:[1,null,null,[],null,null,1700000000000]\"}}}",
-      "sent": 1
-    },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "c19953b572ef": {
-      "name": "accounts.consumeCodexResetCredit#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "accounts.consumeCodexResetCredit"
-        },
-        {
-          "name": "params",
-          "value": {
-            "expectedScope": {
-              "accountId": "codex-1",
-              "accountRevision": 1700000000000,
-              "offerRevision": "v1:[1,null,null,[],null,null,1700000000000]",
-              "target": {
-                "runtime": "host",
-                "wslDistro": {
-                  "$rpc": "null"
-                }
-              }
-            },
-            "idempotencyKey": "11111111-1111-4111-8111-111111111111"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "timeoutMs": 90000
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "c55ed0a410f8": {
-      "name": "device-store.removeItem",
-      "value": {
-        "key": "orca:codex-reset-credit-attempt:v1:0832055c2fa90e8e145c588ad4db656a2fc2840ed2e851a28494eae769db9b3e"
-      },
-      "sent": 1
     }
   },
   "recording": {
@@ -262,8 +264,8 @@
       {
         "id": "requested",
         "observation": {
-          "sender": ["c19953b572ef"],
-          "payloads": ["897e4d77e2a0"],
+          "sender": ["9c4bad2e8f67"],
+          "payloads": ["cce83ed60c84"],
           "settlements": {
             "confirm": "9270aeb7d9c6"
           },
@@ -274,13 +276,13 @@
       {
         "id": "consumed",
         "observation": {
-          "sender": ["1c9f0c57c36d"],
-          "payloads": ["897e4d77e2a0"],
+          "sender": ["ecc8e2860eba"],
+          "payloads": ["cce83ed60c84"],
           "settlements": {
             "confirm": "074c5080c062"
           },
           "state": "0e5764df4bfd",
-          "effects": ["c55ed0a410f8"]
+          "effects": ["413aa2c48b5e"]
         }
       }
     ]

mobile/rpc-foundation/goldens/components-codex-capability.json

@@ -3,9 +3,9 @@
   "family": "components.codex-reset-capability",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "88570b9d2376863c7f88d7ed8c745a5fb771deddbc7409f8944fa861dd4bdce9",
   "platform": "darwin",
@@ -16,8 +16,9 @@
     "578b9d38ecc7": {
       "supported": true
     },
-    "6a0093a8288b": {
+    "83aeff886309": {
       "name": "status.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -55,10 +56,10 @@
       "settledAt": 0,
       "value": true
     },
-    "852980e2efc0": {
+    "d08f74d65ee6": {
       "name": "status.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
     }
   },
   "recording": {
@@ -67,8 +68,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["6a0093a8288b"],
-          "payloads": ["852980e2efc0"],
+          "sender": ["83aeff886309"],
+          "payloads": ["d08f74d65ee6"],
           "settlements": {
             "probe": "84e5ca07cb7a"
           },

mobile/rpc-foundation/goldens/components-setup-ask.json

@@ -3,9 +3,9 @@
   "family": "components.setup-script",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "d4052f119c7ed68dc922c8beeb0074701f1532b10e48e284fb71aa165a17e437",
   "platform": "darwin",
@@ -13,8 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "28e75475e9e0": {
+    "2bf6d40fe6a5": {
       "name": "repo.hooks#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -38,8 +39,38 @@
         "startedAt": 0
       }
     },
-    "3515a8adcd6d": {
+    "5d1cf72f4e12": {
+      "advanced": true,
+      "command": "pnpm install",
+      "run": true,
+      "runPolicy": "ask",
+      "source": "repo",
+      "trust": {
+        "$rpc": "null"
+      }
+    },
+    "79deedc9f2ed": {
       "name": "repo.hooks#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.hooks\",\"params\":{\"repo\":\"id:repo-1\"}}"
+    },
+    "80cf8444e458": {
+      "advanced": false,
+      "command": {
+        "$rpc": "null"
+      },
+      "run": true,
+      "runPolicy": "run-by-default",
+      "source": {
+        "$rpc": "null"
+      },
+      "trust": {
+        "$rpc": "null"
+      }
+    },
+    "a4e4636264db": {
+      "name": "repo.hooks#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -80,35 +111,6 @@
         }
       }
     },
-    "5d1cf72f4e12": {
-      "advanced": true,
-      "command": "pnpm install",
-      "run": true,
-      "runPolicy": "ask",
-      "source": "repo",
-      "trust": {
-        "$rpc": "null"
-      }
-    },
-    "80cf8444e458": {
-      "advanced": false,
-      "command": {
-        "$rpc": "null"
-      },
-      "run": true,
-      "runPolicy": "run-by-default",
-      "source": {
-        "$rpc": "null"
-      },
-      "trust": {
-        "$rpc": "null"
-      }
-    },
-    "d9f709e8100e": {
-      "name": "repo.hooks#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.hooks\",\"params\":{\"repo\":\"id:repo-1\"}}",
-      "sent": 1
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -124,8 +126,8 @@
       {
         "id": "hooks-pending",
         "observation": {
-          "sender": ["28e75475e9e0"],
-          "payloads": ["d9f709e8100e"],
+          "sender": ["2bf6d40fe6a5"],
+          "payloads": ["79deedc9f2ed"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -136,8 +138,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["3515a8adcd6d"],
-          "payloads": ["d9f709e8100e"],
+          "sender": ["a4e4636264db"],
+          "payloads": ["79deedc9f2ed"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/components-target-local.json

@@ -3,9 +3,9 @@
   "family": "components.execution-target-local",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "2e0d3021621698b63117e250dd5e9762b5bfb3dc1911e27c510e9539bd2ee6c9",
   "platform": "darwin",
@@ -28,8 +28,27 @@
         }
       }
     },
-    "3579737ce1a6": {
+    "986a776213e8": {
+      "detected": ["claude"],
+      "gate": {
+        "connectInProgress": true,
+        "error": {
+          "$rpc": "null"
+        },
+        "requiresConnection": false,
+        "status": {
+          "$rpc": "null"
+        }
+      }
+    },
+    "9b8ae0c8eec5": {
       "name": "preflight.detectAgents#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}"
+    },
+    "a4fe12488bc4": {
+      "name": "preflight.detectAgents#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -53,8 +72,17 @@
         "startedAt": 0
       }
     },
-    "6806cee7c59f": {
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f15d8f54be02": {
       "name": "preflight.detectAgents#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -83,32 +111,6 @@
           "result": ["claude"]
         }
       }
-    },
-    "986a776213e8": {
-      "detected": ["claude"],
-      "gate": {
-        "connectInProgress": true,
-        "error": {
-          "$rpc": "null"
-        },
-        "requiresConnection": false,
-        "status": {
-          "$rpc": "null"
-        }
-      }
-    },
-    "c56f76942e16": {
-      "name": "preflight.detectAgents#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectAgents\"}",
-      "sent": 1
-    },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
     }
   },
   "recording": {
@@ -117,8 +119,8 @@
       {
         "id": "detect-pending",
         "observation": {
-          "sender": ["3579737ce1a6"],
-          "payloads": ["c56f76942e16"],
+          "sender": ["a4fe12488bc4"],
+          "payloads": ["9b8ae0c8eec5"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -129,8 +131,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["6806cee7c59f"],
-          "payloads": ["c56f76942e16"],
+          "sender": ["f15d8f54be02"],
+          "payloads": ["9b8ae0c8eec5"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/components-target-ssh.json

@@ -3,9 +3,9 @@
   "family": "components.execution-target",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "5cfbce3c7d97d908fbd447646d611e41a8aa1f61f684b9b710c4b67d6ff023a7",
   "scenarioSha256": "82b891c7a7a2f255e2d22a372ee6112c9cc1f650259244e87f2e8c1356e97e5f",
   "platform": "darwin",
@@ -13,59 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "0b078c630b23": {
-      "name": "preflight.detectRemoteAgents#2",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectRemoteAgents\",\"params\":{\"connectionId\":\"ssh-1\"}}",
-      "sent": 4
-    },
-    "14b354ce0ded": {
-      "name": "ssh.getState#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.getState\",\"params\":{\"targetId\":\"ssh-1\"}}",
-      "sent": 1
-    },
-    "4e2e9a890ced": {
-      "detected": ["codex"],
-      "gate": {
-        "connectInProgress": false,
-        "error": {
-          "$rpc": "null"
-        },
-        "requiresConnection": false,
-        "status": "connected"
-      }
-    },
-    "6004e75ef39e": {
-      "name": "preflight.detectRemoteAgents#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "preflight.detectRemoteAgents"
-        },
-        {
-          "name": "params",
-          "value": {
-            "connectionId": "ssh-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "77f42ff60d15": {
-      "name": "ssh.connect#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.connect\",\"params\":{\"targetId\":\"ssh-1\"}}",
-      "sent": 3
-    },
-    "81c9c204b647": {
+    "0355054e5e71": {
       "name": "ssh.connect#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
@@ -104,8 +54,98 @@
         }
       }
     },
-    "89aa7a3bd619": {
+    "10b5ec5ae537": {
+      "name": "preflight.detectRemoteAgents#2",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectRemoteAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "connectionId": "ssh-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "12098dde49de": {
+      "name": "ssh.connect#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.connect\",\"params\":{\"targetId\":\"ssh-1\"}}"
+    },
+    "4aa26501c485": {
+      "name": "preflight.detectRemoteAgents#2",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectRemoteAgents\",\"params\":{\"connectionId\":\"ssh-1\"}}"
+    },
+    "4e2e9a890ced": {
+      "detected": ["codex"],
+      "gate": {
+        "connectInProgress": false,
+        "error": {
+          "$rpc": "null"
+        },
+        "requiresConnection": false,
+        "status": "connected"
+      }
+    },
+    "70b1e8fb528a": {
+      "name": "preflight.detectRemoteAgents#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "preflight.detectRemoteAgents"
+        },
+        {
+          "name": "params",
+          "value": {
+            "connectionId": "ssh-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": ["codex"]
+        }
+      }
+    },
+    "8265ec539d5a": {
+      "name": "preflight.detectRemoteAgents#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectRemoteAgents\",\"params\":{\"connectionId\":\"ssh-1\"}}"
+    },
+    "a11809a84754": {
       "name": "ssh.getState#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.getState\",\"params\":{\"targetId\":\"ssh-1\"}}"
+    },
+    "b53739a58194": {
+      "name": "ssh.getState#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -144,44 +184,9 @@
         }
       }
     },
-    "9a892112da5b": {
-      "name": "preflight.detectRemoteAgents#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "preflight.detectRemoteAgents"
-        },
-        {
-          "name": "params",
-          "value": {
-            "connectionId": "ssh-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": ["codex"]
-        }
-      }
-    },
-    "bb1f9f7430c4": {
-      "name": "preflight.detectRemoteAgents#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"preflight.detectRemoteAgents\",\"params\":{\"connectionId\":\"ssh-1\"}}",
-      "sent": 2
-    },
-    "ca123825be51": {
+    "b6835adccf60": {
       "name": "ssh.getState#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -235,8 +240,8 @@
       {
         "id": "state-pending",
         "observation": {
-          "sender": ["ca123825be51"],
-          "payloads": ["14b354ce0ded"],
+          "sender": ["b6835adccf60"],
+          "payloads": ["a11809a84754"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -247,8 +252,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["89aa7a3bd619", "9a892112da5b", "81c9c204b647", "6004e75ef39e"],
-          "payloads": ["14b354ce0ded", "bb1f9f7430c4", "77f42ff60d15", "0b078c630b23"],
+          "sender": ["b53739a58194", "70b1e8fb528a", "0355054e5e71", "10b5ec5ae537"],
+          "payloads": ["a11809a84754", "8265ec539d5a", "12098dde49de", "4aa26501c485"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "connect": "eb79a9b3682a"

mobile/rpc-foundation/goldens/diff-review-branch-compare.json

@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "b7579013e65f0f5fe503c10cf2294cb9d4ac1938108275de001db6e02cf2cc21",
   "platform": "darwin",
@@ -13,11 +13,6 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "200c85aa119b": {
-      "name": "worktree.show#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 2
-    },
     "229fc359ecb7": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -29,8 +24,51 @@
         }
       }
     },
-    "632a4405f3fe": {
+    "284ce622e74a": {
+      "name": "worktree.show#2",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.show"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "worktree": {
+              "baseRef": "origin/main",
+              "linkedPR": 12
+            }
+          }
+        }
+      }
+    },
+    "412402e093cc": {
+      "name": "git.branchCompare#2",
+      "ordinal": 12,
+      "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}"
+    },
+    "4b4f2d7405b8": {
       "name": "repo.list#2",
+      "ordinal": 8,
       "args": [
         {
           "name": "method",
@@ -67,44 +105,9 @@
         }
       }
     },
-    "67a8e862c3ba": {
-      "name": "worktree.show#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.show"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "worktree": {
-              "baseRef": "origin/main",
-              "linkedPR": 12
-            }
-          }
-        }
-      }
-    },
-    "6e017fb85c11": {
+    "4e6543b26313": {
       "name": "git.branchCompare#2",
+      "ordinal": 11,
       "args": [
         {
           "name": "method",
@@ -138,123 +141,9 @@
         }
       }
     },
-    "74dba677d335": {
-      "name": "git.branchCompare#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}",
-      "sent": 3
-    },
-    "768c9c0dbef7": {
-      "name": "repo.list#2",
-      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}",
-      "sent": 5
-    },
-    "78b49c8df1cc": {
-      "name": "git.branchCompare#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.branchCompare"
-        },
-        {
-          "name": "params",
-          "value": {
-            "baseRef": "origin/main",
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "forbidden",
-            "message": "git is not available"
-          },
-          "id": "frame-3",
-          "ok": false
-        }
-      }
-    },
-    "8631a8317157": {
-      "name": "worktree.show#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.show"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-4",
-          "ok": true,
-          "result": {
-            "worktree": {
-              "baseRef": "origin/main",
-              "linkedPR": 12
-            }
-          }
-        }
-      }
-    },
-    "8bee98be77d2": {
-      "name": "worktree.show#2",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 5
-    },
-    "9f5d0ac26269": {
-      "branchCompare": {
-        "result": {
-          "$rpc": "null"
-        }
-      },
-      "diff": "unloaded",
-      "snapshot": "unloaded"
-    },
-    "a3e1aa9bf7e3": {
-      "branchCompare": {
-        "error": "Committed changes response was invalid",
-        "result": {
-          "$rpc": "null"
-        }
-      },
-      "diff": "unloaded",
-      "snapshot": "unloaded"
-    },
-    "ad49fec56c14": {
-      "name": "repo.list#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}",
-      "sent": 2
-    },
-    "be3553f1a790": {
-      "name": "git.branchCompare#2",
-      "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}",
-      "sent": 6
-    },
-    "eb882796a820": {
+    "5b296b205440": {
       "name": "repo.list#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -291,6 +180,118 @@
         }
       }
     },
+    "80d0ff3c81e8": {
+      "name": "worktree.show#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
+    },
+    "94cc9c5a329b": {
+      "name": "worktree.show#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.show"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "worktree": {
+              "baseRef": "origin/main",
+              "linkedPR": 12
+            }
+          }
+        }
+      }
+    },
+    "9f5d0ac26269": {
+      "branchCompare": {
+        "result": {
+          "$rpc": "null"
+        }
+      },
+      "diff": "unloaded",
+      "snapshot": "unloaded"
+    },
+    "a3e1aa9bf7e3": {
+      "branchCompare": {
+        "error": "Committed changes response was invalid",
+        "result": {
+          "$rpc": "null"
+        }
+      },
+      "diff": "unloaded",
+      "snapshot": "unloaded"
+    },
+    "ca8f7f7c9891": {
+      "name": "repo.list#2",
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "cf9290001484": {
+      "name": "git.branchCompare#1",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.branchCompare"
+        },
+        {
+          "name": "params",
+          "value": {
+            "baseRef": "origin/main",
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "forbidden",
+            "message": "git is not available"
+          },
+          "id": "frame-3",
+          "ok": false
+        }
+      }
+    },
+    "d64700b9de3b": {
+      "name": "repo.list#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "ee6fc162c326": {
+      "name": "worktree.show#2",
+      "ordinal": 9,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
+    },
     "ef9013648cfb": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -300,6 +301,11 @@
           "$rpc": "null"
         }
       }
+    },
+    "fb450de97b86": {
+      "name": "git.branchCompare#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}"
     }
   },
   "recording": {
@@ -308,8 +314,8 @@
       {
         "id": "unavailable",
         "observation": {
-          "sender": ["67a8e862c3ba", "eb882796a820", "78b49c8df1cc"],
-          "payloads": ["200c85aa119b", "ad49fec56c14", "74dba677d335"],
+          "sender": ["94cc9c5a329b", "5b296b205440", "cf9290001484"],
+          "payloads": ["80d0ff3c81e8", "d64700b9de3b", "fb450de97b86"],
           "settlements": {
             "unavailable": "ef9013648cfb"
           },
@@ -321,20 +327,20 @@
         "id": "invalid",
         "observation": {
           "sender": [
-            "67a8e862c3ba",
-            "eb882796a820",
-            "78b49c8df1cc",
-            "8631a8317157",
-            "632a4405f3fe",
-            "6e017fb85c11"
+            "94cc9c5a329b",
+            "5b296b205440",
+            "cf9290001484",
+            "284ce622e74a",
+            "4b4f2d7405b8",
+            "4e6543b26313"
           ],
           "payloads": [
-            "200c85aa119b",
-            "ad49fec56c14",
-            "74dba677d335",
-            "8bee98be77d2",
-            "768c9c0dbef7",
-            "be3553f1a790"
+            "80d0ff3c81e8",
+            "d64700b9de3b",
+            "fb450de97b86",
+            "ee6fc162c326",
+            "ca8f7f7c9891",
+            "412402e093cc"
           ],
           "settlements": {
             "unavailable": "ef9013648cfb",

mobile/rpc-foundation/goldens/diff-review-branch-file-diff.json

@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "6c71b0f217a464dffbc6f5736605b840edac74ebaf0664edc0ab85984bb64328",
   "platform": "darwin",
@@ -40,13 +40,14 @@
       },
       "snapshot": "unloaded"
     },
-    "67cae2e16a3b": {
+    "551c785629a1": {
       "name": "git.branchDiff#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchDiff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"compare\":{\"baseRef\":\"origin/main\",\"baseOid\":\"base-oid\",\"headOid\":\"head-oid\",\"mergeBase\":\"merge-base\"}}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchDiff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"compare\":{\"baseRef\":\"origin/main\",\"baseOid\":\"base-oid\",\"headOid\":\"head-oid\",\"mergeBase\":\"merge-base\"}}}"
     },
-    "ce89618d90b4": {
+    "714ef7b515d2": {
       "name": "git.branchDiff#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -92,8 +93,8 @@
       {
         "id": "branch",
         "observation": {
-          "sender": ["ce89618d90b4"],
-          "payloads": ["67cae2e16a3b"],
+          "sender": ["714ef7b515d2"],
+          "payloads": ["551c785629a1"],
           "settlements": {
             "branch": "365c17523d76"
           },
@@ -104,8 +105,8 @@
       {
         "id": "no-compare",
         "observation": {
-          "sender": ["ce89618d90b4"],
-          "payloads": ["67cae2e16a3b"],
+          "sender": ["714ef7b515d2"],
+          "payloads": ["551c785629a1"],
           "settlements": {
             "branch": "365c17523d76",
             "no-compare": "38fb361f406c"

mobile/rpc-foundation/goldens/diff-review-notes-refused-before-compare.json

@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "3e7fa054f77587b9ac24b6732a9926273b0f2ff35a266e633d0ccd1dada932cc",
   "platform": "darwin",
@@ -13,51 +13,19 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "231aaf164318": {
+    "1069be6ec9cc": {
       "name": "git.branchCompare#1",
-      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}",
-      "sent": 5
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}"
     },
-    "2432ad799433": {
-      "name": "repo.list#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "repo.list"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "repos": [
-              {
-                "id": "repo-9",
-                "worktreeBaseRef": "origin/main"
-              }
-            ]
-          }
-        }
-      }
+    "168d1f64ca9b": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
     },
-    "26accd69bc48": {
+    "2673423361c6": {
       "name": "repo.list#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -81,116 +49,9 @@
         "startedAt": 0
       }
     },
-    "3ec8052ccdb3": {
-      "name": "worktree.show#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.show"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "worktree": {
-              "baseRef": "origin/main",
-              "linkedPR": 12
-            }
-          }
-        }
-      }
-    },
-    "3feccf790548": {
-      "name": "git.status#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "branch": "feature",
-            "entries": [
-              {
-                "added": 3,
-                "area": "unstaged",
-                "path": "src/app.ts",
-                "removed": 1,
-                "status": "modified"
-              }
-            ],
-            "head": "head-sha-1",
-            "upstreamStatus": {
-              "ahead": 1,
-              "behind": 0,
-              "hasUpstream": true
-            }
-          }
-        }
-      }
-    },
-    "40b17d95f271": {
-      "name": "git.status#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 1
-    },
-    "67fead2b3d30": {
-      "name": "repo.list#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}",
-      "sent": 4
-    },
-    "6f43dceb9058": {
-      "name": "worktree.show#2",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 4
-    },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "c0edcb195574": {
-      "name": "worktree.show#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 4
-    },
-    "c70359272e10": {
+    "2cded5d9016b": {
       "name": "worktree.show#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -214,8 +75,9 @@
         "startedAt": 0
       }
     },
-    "da3aebbee6f2": {
+    "4a2489a297d0": {
       "name": "git.branchCompare#1",
+      "ordinal": 9,
       "args": [
         {
           "name": "method",
@@ -264,23 +126,62 @@
         }
       }
     },
-    "e39817462870": {
-      "branchCompare": "unloaded",
-      "diff": "unloaded",
-      "snapshot": "unloaded"
+    "4a899e079b42": {
+      "name": "repo.list#1",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
     },
-    "eae2ae6e9c42": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "Error",
-        "message": "notes unavailable",
-        "isRpcDeliveryUnknown": false
+    "80f12d7d71e7": {
+      "name": "worktree.show#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
+    },
+    "8f95d359947c": {
+      "name": "repo.list#1",
+      "ordinal": 4,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "repos": [
+              {
+                "id": "repo-9",
+                "worktreeBaseRef": "origin/main"
+              }
+            ]
+          }
+        }
       }
     },
-    "ed34044b22f4": {
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "b7fd51d232e7": {
       "name": "worktree.show#2",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
@@ -312,6 +213,112 @@
           "ok": false
         }
       }
+    },
+    "bbb1719b8559": {
+      "name": "worktree.show#2",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
+    },
+    "d0e28a73dae6": {
+      "name": "git.status#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "branch": "feature",
+            "entries": [
+              {
+                "added": 3,
+                "area": "unstaged",
+                "path": "src/app.ts",
+                "removed": 1,
+                "status": "modified"
+              }
+            ],
+            "head": "head-sha-1",
+            "upstreamStatus": {
+              "ahead": 1,
+              "behind": 0,
+              "hasUpstream": true
+            }
+          }
+        }
+      }
+    },
+    "d7e7bd22e9f6": {
+      "name": "worktree.show#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.show"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "worktree": {
+              "baseRef": "origin/main",
+              "linkedPR": 12
+            }
+          }
+        }
+      }
+    },
+    "e39817462870": {
+      "branchCompare": "unloaded",
+      "diff": "unloaded",
+      "snapshot": "unloaded"
+    },
+    "eae2ae6e9c42": {
+      "status": "rejected",
+      "startedAt": 0,
+      "settledAt": 0,
+      "error": {
+        "category": "Error",
+        "message": "notes unavailable",
+        "isRpcDeliveryUnknown": false
+      }
     }
   },
   "recording": {
@@ -320,8 +327,8 @@
       {
         "id": "notes-refused",
         "observation": {
-          "sender": ["3feccf790548", "c70359272e10", "26accd69bc48", "ed34044b22f4"],
-          "payloads": ["40b17d95f271", "c0edcb195574", "67fead2b3d30", "6f43dceb9058"],
+          "sender": ["d0e28a73dae6", "2cded5d9016b", "2673423361c6", "b7fd51d232e7"],
+          "payloads": ["168d1f64ca9b", "80f12d7d71e7", "4a899e079b42", "bbb1719b8559"],
           "settlements": {
             "snapshot": "9270aeb7d9c6"
           },
@@ -333,18 +340,18 @@
         "id": "settled",
         "observation": {
           "sender": [
-            "3feccf790548",
-            "3ec8052ccdb3",
-            "2432ad799433",
-            "ed34044b22f4",
-            "da3aebbee6f2"
+            "d0e28a73dae6",
+            "d7e7bd22e9f6",
+            "8f95d359947c",
+            "b7fd51d232e7",
+            "4a2489a297d0"
           ],
           "payloads": [
-            "40b17d95f271",
-            "c0edcb195574",
-            "67fead2b3d30",
-            "6f43dceb9058",
-            "231aaf164318"
+            "168d1f64ca9b",
+            "80f12d7d71e7",
+            "4a899e079b42",
+            "bbb1719b8559",
+            "1069be6ec9cc"
           ],
           "settlements": {
             "snapshot": "eae2ae6e9c42"

mobile/rpc-foundation/goldens/diff-review-refused-file-diff.json

@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "d1b04fe2945a2799ac8465d8fd9e45ab790ae29b401a0cf4fef68ebc5fa3cc76",
   "platform": "darwin",
@@ -22,6 +22,11 @@
         "kind": "too-large"
       }
     },
+    "18072d796980": {
+      "name": "git.diff#3",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}"
+    },
     "2ecd0366533c": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -31,15 +36,15 @@
         "kind": "deleted"
       }
     },
-    "2eee9b17f40e": {
-      "name": "git.diff#3",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}",
-      "sent": 3
+    "33908d1938b7": {
+      "name": "git.diff#2",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}"
     },
-    "414ef6b1967c": {
+    "481bd3924019": {
       "name": "git.diff#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}"
     },
     "5768cc374e1d": {
       "branchCompare": "unloaded",
@@ -59,85 +64,9 @@
         "isRpcDeliveryUnknown": false
       }
     },
-    "a58da3417608": {
-      "name": "git.diff#3",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.diff"
-        },
-        {
-          "name": "params",
-          "value": {
-            "filePath": "src/app.ts",
-            "staged": false,
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "internal",
-            "message": ""
-          },
-          "id": "frame-3",
-          "ok": false
-        }
-      }
-    },
-    "b5ca1f0a42b7": {
-      "name": "git.diff#2",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}",
-      "sent": 2
-    },
-    "c40409188ab0": {
-      "name": "git.diff#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.diff"
-        },
-        {
-          "name": "params",
-          "value": {
-            "filePath": "src/app.ts",
-            "staged": false,
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "internal",
-            "message": "boom"
-          },
-          "id": "frame-2",
-          "ok": false
-        }
-      }
-    },
-    "dde75a860803": {
+    "a71fa2bf76b8": {
       "name": "git.diff#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -172,6 +101,80 @@
         }
       }
     },
+    "abf08f796be3": {
+      "name": "git.diff#2",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.diff"
+        },
+        {
+          "name": "params",
+          "value": {
+            "filePath": "src/app.ts",
+            "staged": false,
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "internal",
+            "message": "boom"
+          },
+          "id": "frame-2",
+          "ok": false
+        }
+      }
+    },
+    "b9d9c7cacbea": {
+      "name": "git.diff#3",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.diff"
+        },
+        {
+          "name": "params",
+          "value": {
+            "filePath": "src/app.ts",
+            "staged": false,
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "internal",
+            "message": ""
+          },
+          "id": "frame-3",
+          "ok": false
+        }
+      }
+    },
     "f10ae0495f82": {
       "branchCompare": "unloaded",
       "diff": {
@@ -187,8 +190,8 @@
       {
         "id": "diff-too-large",
         "observation": {
-          "sender": ["dde75a860803"],
-          "payloads": ["414ef6b1967c"],
+          "sender": ["a71fa2bf76b8"],
+          "payloads": ["481bd3924019"],
           "settlements": {
             "diff-too-large": "0698901154de"
           },
@@ -199,8 +202,8 @@
       {
         "id": "deleted",
         "observation": {
-          "sender": ["dde75a860803", "c40409188ab0"],
-          "payloads": ["414ef6b1967c", "b5ca1f0a42b7"],
+          "sender": ["a71fa2bf76b8", "abf08f796be3"],
+          "payloads": ["481bd3924019", "33908d1938b7"],
           "settlements": {
             "diff-too-large": "0698901154de",
             "deleted": "2ecd0366533c"
@@ -212,8 +215,8 @@
       {
         "id": "refused",
         "observation": {
-          "sender": ["dde75a860803", "c40409188ab0", "a58da3417608"],
-          "payloads": ["414ef6b1967c", "b5ca1f0a42b7", "2eee9b17f40e"],
+          "sender": ["a71fa2bf76b8", "abf08f796be3", "b9d9c7cacbea"],
+          "payloads": ["481bd3924019", "33908d1938b7", "18072d796980"],
           "settlements": {
             "diff-too-large": "0698901154de",
             "deleted": "2ecd0366533c",

mobile/rpc-foundation/goldens/diff-review-snapshot.json

@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "fa0a81462196458fdded5b7c00aa4e73975c2111afdd8dac115871490a481da2",
   "platform": "darwin",
@@ -13,13 +13,145 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "231aaf164318": {
+    "1069be6ec9cc": {
       "name": "git.branchCompare#1",
-      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}",
-      "sent": 5
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"git.branchCompare\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"baseRef\":\"origin/main\"}}"
     },
-    "2432ad799433": {
+    "11e9ea6be860": {
+      "name": "git.status#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "168d1f64ca9b": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
+    },
+    "1cb6dd8e325b": {
+      "name": "worktree.show#2",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.show"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-4",
+          "ok": true,
+          "result": {
+            "worktree": {
+              "diffComments": [],
+              "mobileDiffReview": {
+                "files": []
+              }
+            }
+          }
+        }
+      }
+    },
+    "4a2489a297d0": {
+      "name": "git.branchCompare#1",
+      "ordinal": 9,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.branchCompare"
+        },
+        {
+          "name": "params",
+          "value": {
+            "baseRef": "origin/main",
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-5",
+          "ok": true,
+          "result": {
+            "entries": [
+              {
+                "added": 1,
+                "path": "src/old.ts",
+                "removed": 0,
+                "status": "modified"
+              }
+            ],
+            "summary": {
+              "baseOid": "base-oid",
+              "baseRef": "origin/main",
+              "changedFiles": 1,
+              "compareRef": "feature",
+              "headOid": "head-oid",
+              "mergeBase": "merge-base",
+              "status": "ready"
+            }
+          }
+        }
+      }
+    },
+    "4a899e079b42": {
       "name": "repo.list#1",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
+    "80f12d7d71e7": {
+      "name": "worktree.show#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
+    },
+    "8f95d359947c": {
+      "name": "repo.list#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -56,44 +188,18 @@
         }
       }
     },
-    "3ec8052ccdb3": {
-      "name": "worktree.show#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.show"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "worktree": {
-              "baseRef": "origin/main",
-              "linkedPR": 12
-            }
-          }
-        }
-      }
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
     },
-    "3feccf790548": {
+    "bbb1719b8559": {
+      "name": "worktree.show#2",
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
+    },
+    "d0e28a73dae6": {
       "name": "git.status#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -140,13 +246,9 @@
         }
       }
     },
-    "40b17d95f271": {
-      "name": "git.status#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 1
-    },
-    "4cb3f61eba79": {
-      "name": "worktree.show#2",
+    "d7e7bd22e9f6": {
+      "name": "worktree.show#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -170,108 +272,12 @@
         "startedAt": 0,
         "settledAt": 0,
         "value": {
-          "id": "frame-4",
+          "id": "frame-2",
           "ok": true,
           "result": {
             "worktree": {
-              "diffComments": [],
-              "mobileDiffReview": {
-                "files": []
-              }
-            }
-          }
-        }
-      }
-    },
-    "67fead2b3d30": {
-      "name": "repo.list#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}",
-      "sent": 4
-    },
-    "6f43dceb9058": {
-      "name": "worktree.show#2",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 4
-    },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "b8b93d3f8005": {
-      "name": "git.status#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "c0edcb195574": {
-      "name": "worktree.show#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 4
-    },
-    "da3aebbee6f2": {
-      "name": "git.branchCompare#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.branchCompare"
-        },
-        {
-          "name": "params",
-          "value": {
-            "baseRef": "origin/main",
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-5",
-          "ok": true,
-          "result": {
-            "entries": [
-              {
-                "added": 1,
-                "path": "src/old.ts",
-                "removed": 0,
-                "status": "modified"
-              }
-            ],
-            "summary": {
-              "baseOid": "base-oid",
               "baseRef": "origin/main",
-              "changedFiles": 1,
-              "compareRef": "feature",
-              "headOid": "head-oid",
-              "mergeBase": "merge-base",
-              "status": "ready"
+              "linkedPR": 12
             }
           }
         }
@@ -546,8 +552,8 @@
       {
         "id": "pending",
         "observation": {
-          "sender": ["b8b93d3f8005"],
-          "payloads": ["40b17d95f271"],
+          "sender": ["11e9ea6be860"],
+          "payloads": ["168d1f64ca9b"],
           "settlements": {
             "snapshot": "9270aeb7d9c6"
           },
@@ -559,18 +565,18 @@
         "id": "snapshot",
         "observation": {
           "sender": [
-            "3feccf790548",
-            "3ec8052ccdb3",
-            "2432ad799433",
-            "4cb3f61eba79",
-            "da3aebbee6f2"
+            "d0e28a73dae6",
+            "d7e7bd22e9f6",
+            "8f95d359947c",
+            "1cb6dd8e325b",
+            "4a2489a297d0"
           ],
           "payloads": [
-            "40b17d95f271",
-            "c0edcb195574",
-            "67fead2b3d30",
-            "6f43dceb9058",
-            "231aaf164318"
+            "168d1f64ca9b",
+            "80f12d7d71e7",
+            "4a899e079b42",
+            "bbb1719b8559",
+            "1069be6ec9cc"
           ],
           "settlements": {
             "snapshot": "f880a1519497"

mobile/rpc-foundation/goldens/diff-review-status-unavailable.json

@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "182f37fbe6ae7c0694b50d603ecd4a03bc9a8c7c9738ebb775b47eb5f3b9660f",
   "platform": "darwin",
@@ -22,21 +22,14 @@
         "message": "Update Orca desktop to review changes on mobile."
       }
     },
-    "40b17d95f271": {
+    "168d1f64ca9b": {
       "name": "git.status#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}"
     },
-    "55c07df45014": {
-      "branchCompare": "unloaded",
-      "diff": "unloaded",
-      "snapshot": {
-        "kind": "unavailable",
-        "message": "Update Orca desktop to review changes on mobile."
-      }
-    },
-    "93b9682c496c": {
+    "45d1ea7c0b42": {
       "name": "git.status#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -68,6 +61,14 @@
           "ok": false
         }
       }
+    },
+    "55c07df45014": {
+      "branchCompare": "unloaded",
+      "diff": "unloaded",
+      "snapshot": {
+        "kind": "unavailable",
+        "message": "Update Orca desktop to review changes on mobile."
+      }
     }
   },
   "recording": {
@@ -76,8 +77,8 @@
       {
         "id": "unavailable",
         "observation": {
-          "sender": ["93b9682c496c"],
-          "payloads": ["40b17d95f271"],
+          "sender": ["45d1ea7c0b42"],
+          "payloads": ["168d1f64ca9b"],
           "settlements": {
             "unavailable": "14804a5e414f"
           },

mobile/rpc-foundation/goldens/diff-review-worktree-file-diff.json

@@ -3,9 +3,9 @@
   "family": "session.diff-review",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a8016eb61915cf80a3bdeb622ee67d35be8b4b9862a75e4ef2e8f4ff8e93e7f2",
   "scenarioSha256": "538b68485a2268d311fcc7e13ff1a3e446ba4aa010bc18633af8e938a6688257",
   "platform": "darwin",
@@ -13,18 +13,91 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "2eee9b17f40e": {
+    "168eeea61142": {
       "name": "git.diff#3",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}",
-      "sent": 3
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.diff"
+        },
+        {
+          "name": "params",
+          "value": {
+            "filePath": "src/app.ts",
+            "staged": false,
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "kind": "unknown"
+          }
+        }
+      }
     },
-    "3a70a3afc2d9": {
-      "name": "git.diff#2",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":true}}",
-      "sent": 2
+    "18072d796980": {
+      "name": "git.diff#3",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}"
     },
-    "411c5ed8537e": {
+    "481bd3924019": {
+      "name": "git.diff#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}"
+    },
+    "50bd7426ef76": {
+      "name": "git.diff#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.diff"
+        },
+        {
+          "name": "params",
+          "value": {
+            "filePath": "src/app.ts",
+            "staged": false,
+            "worktree": "id:repo-9::/w"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "kind": "binary"
+          }
+        }
+      }
+    },
+    "5135c435b058": {
       "name": "git.diff#2",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -59,11 +132,6 @@
         }
       }
     },
-    "414ef6b1967c": {
-      "name": "git.diff#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":false}}",
-      "sent": 1
-    },
     "55227363ca22": {
       "status": "rejected",
       "startedAt": 0,
@@ -74,41 +142,6 @@
         "isRpcDeliveryUnknown": false
       }
     },
-    "66c8c0206a53": {
-      "name": "git.diff#3",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.diff"
-        },
-        {
-          "name": "params",
-          "value": {
-            "filePath": "src/app.ts",
-            "staged": false,
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "kind": "unknown"
-          }
-        }
-      }
-    },
     "717bd1fbc163": {
       "branchCompare": "unloaded",
       "diff": {
@@ -137,40 +170,10 @@
         "kind": "too-large"
       }
     },
-    "9d975272847c": {
-      "name": "git.diff#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "git.diff"
-        },
-        {
-          "name": "params",
-          "value": {
-            "filePath": "src/app.ts",
-            "staged": false,
-            "worktree": "id:repo-9::/w"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "kind": "binary"
-          }
-        }
-      }
+    "ea98fa53e2cc": {
+      "name": "git.diff#2",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:repo-9::/w\",\"filePath\":\"src/app.ts\",\"staged\":true}}"
     },
     "f68945ffc2ea": {
       "branchCompare": "unloaded",
@@ -187,8 +190,8 @@
       {
         "id": "binary",
         "observation": {
-          "sender": ["9d975272847c"],
-          "payloads": ["414ef6b1967c"],
+          "sender": ["50bd7426ef76"],
+          "payloads": ["481bd3924019"],
           "settlements": {
             "binary": "84090dfad90d"
           },
@@ -199,8 +202,8 @@
       {
         "id": "too-large",
         "observation": {
-          "sender": ["9d975272847c", "411c5ed8537e"],
-          "payloads": ["414ef6b1967c", "3a70a3afc2d9"],
+          "sender": ["50bd7426ef76", "5135c435b058"],
+          "payloads": ["481bd3924019", "ea98fa53e2cc"],
           "settlements": {
             "binary": "84090dfad90d",
             "too-large": "8675e0f40158"
@@ -212,8 +215,8 @@
       {
         "id": "invalid",
         "observation": {
-          "sender": ["9d975272847c", "411c5ed8537e", "66c8c0206a53"],
-          "payloads": ["414ef6b1967c", "3a70a3afc2d9", "2eee9b17f40e"],
+          "sender": ["50bd7426ef76", "5135c435b058", "168eeea61142"],
+          "payloads": ["481bd3924019", "ea98fa53e2cc", "18072d796980"],
           "settlements": {
             "binary": "84090dfad90d",
             "too-large": "8675e0f40158",

mobile/rpc-foundation/goldens/file-tap-open-refused.json

@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "a927e85c3ae58cd3b017955fe28aeffec6a5471b51d782f116639a3aaf4af77d",
   "platform": "darwin",
@@ -13,8 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "18cda90904c3": {
+    "0358eb8770a0": {
       "name": "files.resolveTerminalPath#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -58,23 +59,19 @@
         }
       }
     },
-    "1d18c66a85d5": {
-      "name": "open-feedback",
-      "value": {},
-      "sent": 1
-    },
-    "52c3c247865d": {
+    "47a3b40d1640": {
       "name": "files.open#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.open\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"src/app.ts\"}}",
-      "sent": 2
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.open\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"src/app.ts\"}}"
     },
-    "9120b59f16ec": {
+    "561f3fedeb78": {
       "name": "files.resolveTerminalPath#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}"
     },
-    "9a73d7a9fdc6": {
+    "591c78d805ec": {
       "name": "files.open#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -108,6 +105,11 @@
         }
       }
     },
+    "c0978ed13409": {
+      "name": "open-feedback",
+      "ordinal": 3,
+      "value": {}
+    },
     "c7ce9c8dc60e": {
       "activeSessionTabId": "tab-source",
       "failed": 1,
@@ -130,13 +132,13 @@
       {
         "id": "open-refused",
         "observation": {
-          "sender": ["18cda90904c3", "9a73d7a9fdc6"],
-          "payloads": ["9120b59f16ec", "52c3c247865d"],
+          "sender": ["0358eb8770a0", "591c78d805ec"],
+          "payloads": ["561f3fedeb78", "47a3b40d1640"],
           "settlements": {
             "tap": "eb79a9b3682a"
           },
           "state": "c7ce9c8dc60e",
-          "effects": ["1d18c66a85d5"]
+          "effects": ["c0978ed13409"]
         }
       }
     ]

mobile/rpc-foundation/goldens/file-tap-opens-worktree-file.json

@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "297ea4075333e178ca20247eb0abf6600efb44fe2b33f5142d1c1cabffb5a2d3",
   "platform": "darwin",
@@ -13,8 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "18cda90904c3": {
+    "0358eb8770a0": {
       "name": "files.resolveTerminalPath#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -58,39 +59,9 @@
         }
       }
     },
-    "1d18c66a85d5": {
-      "name": "open-feedback",
-      "value": {},
-      "sent": 1
-    },
-    "4301fd620304": {
-      "name": "fetch-session-tabs",
-      "value": {},
-      "sent": 2
-    },
-    "52c3c247865d": {
-      "name": "files.open#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.open\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"src/app.ts\"}}",
-      "sent": 2
-    },
-    "9120b59f16ec": {
-      "name": "files.resolveTerminalPath#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}",
-      "sent": 1
-    },
-    "b765beef262e": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": [
-        {
-          "id": "tab-opened",
-          "relativePath": "src/app.ts"
-        }
-      ]
-    },
-    "d9a357a79330": {
+    "071afa86c223": {
       "name": "files.open#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -123,6 +94,37 @@
         }
       }
     },
+    "47a3b40d1640": {
+      "name": "files.open#1",
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.open\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"src/app.ts\"}}"
+    },
+    "561f3fedeb78": {
+      "name": "files.resolveTerminalPath#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}"
+    },
+    "7a53e88025f0": {
+      "name": "fetch-session-tabs",
+      "ordinal": 6,
+      "value": {}
+    },
+    "b765beef262e": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": [
+        {
+          "id": "tab-opened",
+          "relativePath": "src/app.ts"
+        }
+      ]
+    },
+    "c0978ed13409": {
+      "name": "open-feedback",
+      "ordinal": 3,
+      "value": {}
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -146,27 +148,27 @@
       {
         "id": "switched",
         "observation": {
-          "sender": ["18cda90904c3", "d9a357a79330"],
-          "payloads": ["9120b59f16ec", "52c3c247865d"],
+          "sender": ["0358eb8770a0", "071afa86c223"],
+          "payloads": ["561f3fedeb78", "47a3b40d1640"],
           "settlements": {
             "tap": "eb79a9b3682a",
             "list": "b765beef262e"
           },
           "state": "f8a009b4a36e",
-          "effects": ["1d18c66a85d5", "4301fd620304"]
+          "effects": ["c0978ed13409", "7a53e88025f0"]
         }
       },
       {
         "id": "settled",
         "observation": {
-          "sender": ["18cda90904c3", "d9a357a79330"],
-          "payloads": ["9120b59f16ec", "52c3c247865d"],
+          "sender": ["0358eb8770a0", "071afa86c223"],
+          "payloads": ["561f3fedeb78", "47a3b40d1640"],
           "settlements": {
             "tap": "eb79a9b3682a",
             "list": "b765beef262e"
           },
           "state": "f8a009b4a36e",
-          "effects": ["1d18c66a85d5", "4301fd620304"]
+          "effects": ["c0978ed13409", "7a53e88025f0"]
         }
       }
     ]

mobile/rpc-foundation/goldens/file-tap-previews-absolute-artifact.json

@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "f1844c2608ce90250fddfc78c0b35bb1bf3647598a5ab2914eca0d8cb4403a38",
   "platform": "darwin",
@@ -13,13 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "1d18c66a85d5": {
-      "name": "open-feedback",
-      "value": {},
-      "sent": 1
-    },
-    "403de322e21f": {
+    "220e44211af6": {
       "name": "files.resolveTerminalPath#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -68,13 +64,14 @@
         "$rpc": "null"
       }
     },
-    "9120b59f16ec": {
+    "561f3fedeb78": {
       "name": "files.resolveTerminalPath#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}"
     },
-    "e8e7c23384dc": {
+    "a4f3b56d5a81": {
       "name": "push-preview-route",
+      "ordinal": 4,
       "value": {
         "params": {
           "absolutePath": "/logs/run.txt",
@@ -89,8 +86,12 @@
           "worktreeName": "workspace"
         },
         "pathname": "/h/[hostId]/files/preview/[worktreeId]"
-      },
-      "sent": 1
+      }
+    },
+    "c0978ed13409": {
+      "name": "open-feedback",
+      "ordinal": 3,
+      "value": {}
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -107,13 +108,13 @@
       {
         "id": "previewed",
         "observation": {
-          "sender": ["403de322e21f"],
-          "payloads": ["9120b59f16ec"],
+          "sender": ["220e44211af6"],
+          "payloads": ["561f3fedeb78"],
           "settlements": {
             "tap": "eb79a9b3682a"
           },
           "state": "53fb9b1f36f9",
-          "effects": ["1d18c66a85d5", "e8e7c23384dc"]
+          "effects": ["c0978ed13409", "a4f3b56d5a81"]
         }
       }
     ]

mobile/rpc-foundation/goldens/file-tap-resolve-miss.json

@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "0f76b96408081737b3d630ee837dbb80bcce6670b6acc4f1f7c033a69bd40533",
   "platform": "darwin",
@@ -13,13 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "9120b59f16ec": {
-      "name": "files.resolveTerminalPath#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}",
-      "sent": 1
-    },
-    "b03e10f6707b": {
+    "3445711170ff": {
       "name": "files.resolveTerminalPath#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -56,6 +52,11 @@
         }
       }
     },
+    "561f3fedeb78": {
+      "name": "files.resolveTerminalPath#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}"
+    },
     "c7ce9c8dc60e": {
       "activeSessionTabId": "tab-source",
       "failed": 1,
@@ -78,8 +79,8 @@
       {
         "id": "missed",
         "observation": {
-          "sender": ["b03e10f6707b"],
-          "payloads": ["9120b59f16ec"],
+          "sender": ["3445711170ff"],
+          "payloads": ["561f3fedeb78"],
           "settlements": {
             "tap": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/file-tap-resolve-refused.json

@@ -3,9 +3,9 @@
   "family": "files.terminal-path-tap",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "e20a76ecd5e820dc4797fb25307810af68b5ced996dba2b9599464a21b5cbe1b",
   "scenarioSha256": "1ada35966dfb65afbb9b3dc8139961b8f042e2d53241b9608a080d0e655a5987",
   "platform": "darwin",
@@ -13,8 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "8a3fab4d308f": {
+    "279749a84cb2": {
       "name": "files.resolveTerminalPath#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -51,10 +52,10 @@
         }
       }
     },
-    "9120b59f16ec": {
+    "561f3fedeb78": {
       "name": "files.resolveTerminalPath#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"src/app.ts\",\"crossWorkspace\":true,\"terminal\":\"terminal-1\",\"cwd\":\"/repo\"}}"
     },
     "c7ce9c8dc60e": {
       "activeSessionTabId": "tab-source",
@@ -78,8 +79,8 @@
       {
         "id": "refused",
         "observation": {
-          "sender": ["8a3fab4d308f"],
-          "payloads": ["9120b59f16ec"],
+          "sender": ["279749a84cb2"],
+          "payloads": ["561f3fedeb78"],
           "settlements": {
             "tap": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/files-explorer-legacy-fallback.json

@@ -3,44 +3,19 @@
   "family": "files.explorer-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
-  "adapterSha256": "160421b989563424531fc893a115b95b399d1524ebaf1c91caa8b2862b52eb07",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
+  "adapterSha256": "7a42a348f4407b94cf75ac77a4b6b783b7d28103b1ae1d111d2708dab0dd4a0c",
   "scenarioSha256": "ec02d3f76085619fad35231e12654ec6e926e423c6799fd0df53708743000612",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "195987bc4ef2": {
-      "name": "files.readDir#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.readDir"
-        },
-        {
-          "name": "params",
-          "value": {
-            "relativePath": "",
-            "worktree": "id:wt-files"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "30859af566b0": {
+    "33bb136847f8": {
       "name": "files.readDir#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -74,8 +49,9 @@
         }
       }
     },
-    "80bd28a48dda": {
+    "4366cea5194d": {
       "name": "files.list#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -120,10 +96,42 @@
         }
       }
     },
-    "87ae27687a19": {
+    "59851eb4cbf7": {
       "name": "files.readDir#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readDir\",\"params\":{\"worktree\":\"id:wt-files\",\"relativePath\":\"\"}}",
-      "sent": 1
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.readDir"
+        },
+        {
+          "name": "params",
+          "value": {
+            "relativePath": "",
+            "worktree": "id:wt-files"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "75aaf142eb3b": {
+      "name": "files.list#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:wt-files\"}}"
+    },
+    "858aa6e98236": {
+      "name": "files.readDir#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readDir\",\"params\":{\"worktree\":\"id:wt-files\",\"relativePath\":\"\"}}"
     },
     "b85511fb8929": {
       "crash": {
@@ -141,11 +149,6 @@
       "rows": ["dir:src", "file:README.md"],
       "text": ["Files", "orca-files", " - Showing first 5000"]
     },
-    "c3a91710450a": {
-      "name": "files.list#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:wt-files\"}}",
-      "sent": 2
-    },
     "e91880eefe86": {
       "crash": {
         "$rpc": "null"
@@ -177,8 +180,8 @@
       {
         "id": "loading",
         "observation": {
-          "sender": ["195987bc4ef2"],
-          "payloads": ["87ae27687a19"],
+          "sender": ["59851eb4cbf7"],
+          "payloads": ["858aa6e98236"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -189,8 +192,8 @@
       {
         "id": "legacy-listed",
         "observation": {
-          "sender": ["30859af566b0", "80bd28a48dda"],
-          "payloads": ["87ae27687a19", "c3a91710450a"],
+          "sender": ["33bb136847f8", "4366cea5194d"],
+          "payloads": ["858aa6e98236", "75aaf142eb3b"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/files-explorer-readdir.json

@@ -3,18 +3,35 @@
   "family": "files.explorer-screen",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
-  "adapterSha256": "160421b989563424531fc893a115b95b399d1524ebaf1c91caa8b2862b52eb07",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
+  "adapterSha256": "7a42a348f4407b94cf75ac77a4b6b783b7d28103b1ae1d111d2708dab0dd4a0c",
   "scenarioSha256": "0b87a230cf1c4219e415c840a088502c8bda7cd2fb525bde1a83a5903d6fd96b",
   "platform": "darwin",
   "scenarioVersion": 1,
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "195987bc4ef2": {
+    "1fac8f3b8f44": {
+      "crash": {
+        "$rpc": "null"
+      },
+      "elements": {
+        "ChevronLeft": 1,
+        "FlatList": 1,
+        "Pressable": 1,
+        "SafeAreaView": 1,
+        "Text": 2,
+        "View": 3
+      },
+      "labels": ["Back to session"],
+      "rows": ["dir:src", "file:README.md"],
+      "text": ["Files", "orca-files"]
+    },
+    "59851eb4cbf7": {
       "name": "files.readDir#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -39,24 +56,38 @@
         "startedAt": 0
       }
     },
-    "1fac8f3b8f44": {
+    "858aa6e98236": {
+      "name": "files.readDir#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readDir\",\"params\":{\"worktree\":\"id:wt-files\",\"relativePath\":\"\"}}"
+    },
+    "e91880eefe86": {
       "crash": {
         "$rpc": "null"
       },
       "elements": {
+        "ActivityIndicator": 1,
         "ChevronLeft": 1,
-        "FlatList": 1,
         "Pressable": 1,
         "SafeAreaView": 1,
         "Text": 2,
-        "View": 3
+        "View": 4
       },
       "labels": ["Back to session"],
-      "rows": ["dir:src", "file:README.md"],
+      "rows": [],
       "text": ["Files", "orca-files"]
     },
-    "23a7ef6123a7": {
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "fbc738d75fe6": {
       "name": "files.readDir#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -95,35 +126,6 @@
           ]
         }
       }
-    },
-    "87ae27687a19": {
-      "name": "files.readDir#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readDir\",\"params\":{\"worktree\":\"id:wt-files\",\"relativePath\":\"\"}}",
-      "sent": 1
-    },
-    "e91880eefe86": {
-      "crash": {
-        "$rpc": "null"
-      },
-      "elements": {
-        "ActivityIndicator": 1,
-        "ChevronLeft": 1,
-        "Pressable": 1,
-        "SafeAreaView": 1,
-        "Text": 2,
-        "View": 4
-      },
-      "labels": ["Back to session"],
-      "rows": [],
-      "text": ["Files", "orca-files"]
-    },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
     }
   },
   "recording": {
@@ -132,8 +134,8 @@
       {
         "id": "loading",
         "observation": {
-          "sender": ["195987bc4ef2"],
-          "payloads": ["87ae27687a19"],
+          "sender": ["59851eb4cbf7"],
+          "payloads": ["858aa6e98236"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -144,8 +146,8 @@
       {
         "id": "listed",
         "observation": {
-          "sender": ["23a7ef6123a7"],
-          "payloads": ["87ae27687a19"],
+          "sender": ["fbc738d75fe6"],
+          "payloads": ["858aa6e98236"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },

mobile/rpc-foundation/goldens/files-ownership-local.json

@@ -3,9 +3,9 @@
   "family": "files.mutation-ownership",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "8d24f52eb4194c3bc5d9f0dcabade6d7a09c066f79f911657647ed21dbecb3b1",
   "platform": "darwin",
@@ -13,21 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "548f05412e41": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "expectedExecutionHostId": "local"
-      }
-    },
-    "852980e2efc0": {
-      "name": "status.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 1
-    },
-    "8bdc2aec524d": {
+    "4e53935c13ac": {
       "name": "worktree.show#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -61,8 +49,32 @@
         }
       }
     },
-    "a56852d6836b": {
+    "548f05412e41": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "expectedExecutionHostId": "local"
+      }
+    },
+    "bab8756fa040": {
+      "ownership": {
+        "expectedExecutionHostId": "local"
+      }
+    },
+    "c924e7a5a7da": {
+      "name": "worktree.show#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:workspace-1\"}}"
+    },
+    "d08f74d65ee6": {
       "name": "status.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
+    "e81d3a627ac2": {
+      "name": "status.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -93,16 +105,6 @@
           }
         }
       }
-    },
-    "bab8756fa040": {
-      "ownership": {
-        "expectedExecutionHostId": "local"
-      }
-    },
-    "e7e6fb5e264b": {
-      "name": "worktree.show#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:workspace-1\"}}",
-      "sent": 2
     }
   },
   "recording": {
@@ -111,8 +113,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["a56852d6836b", "8bdc2aec524d"],
-          "payloads": ["852980e2efc0", "e7e6fb5e264b"],
+          "sender": ["e81d3a627ac2", "4e53935c13ac"],
+          "payloads": ["d08f74d65ee6", "c924e7a5a7da"],
           "settlements": {
             "capture": "548f05412e41"
           },

mobile/rpc-foundation/goldens/files-ownership-ssh.json

@@ -3,9 +3,9 @@
   "family": "files.mutation-ownership",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "4cd0be3a1c338b4b68211c717fd10738653c553fdb3b072db6706ff8175a8bd1",
   "platform": "darwin",
@@ -13,6 +13,11 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
+    "088efd8ff3f7": {
+      "name": "ssh.getState#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.getState\",\"params\":{\"targetId\":\"target-1\"}}"
+    },
     "29bfbe94cca9": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -23,16 +28,78 @@
         "expectedSshTargetId": "target-1"
       }
     },
-    "2f24cdd633b5": {
-      "name": "ssh.getState#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.getState\",\"params\":{\"targetId\":\"target-1\"}}",
-      "sent": 3
+    "3cf4416a7928": {
+      "name": "worktree.show#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.show"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 15000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "worktree": {
+              "hostId": "ssh:target-1"
+            }
+          }
+        }
+      }
     },
     "518ec57c381a": {
       "ownership": "uncaptured"
     },
-    "6116946241ca": {
+    "83e4ac78046a": {
+      "name": "status.get#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "status.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "undefined"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "timeoutMs": 15000
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "b6e8ae2b152e": {
       "name": "ssh.getState#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
@@ -72,52 +139,26 @@
         }
       }
     },
-    "6ef43f81f7e3": {
-      "name": "worktree.show#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.show"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "timeoutMs": 15000
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "worktree": {
-              "hostId": "ssh:target-1"
-            }
-          }
-        }
+    "bd84dadd27c7": {
+      "ownership": {
+        "expectedExecutionHostId": "ssh:target-1",
+        "expectedSshConnectionGeneration": 3,
+        "expectedSshTargetId": "target-1"
       }
     },
-    "852980e2efc0": {
-      "name": "status.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 1
+    "c924e7a5a7da": {
+      "name": "worktree.show#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:workspace-1\"}}"
     },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "a56852d6836b": {
+    "d08f74d65ee6": {
       "name": "status.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
+    "e81d3a627ac2": {
+      "name": "status.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -148,43 +189,6 @@
           }
         }
       }
-    },
-    "bc119660f0c1": {
-      "name": "status.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "status.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "undefined"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "timeoutMs": 15000
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "bd84dadd27c7": {
-      "ownership": {
-        "expectedExecutionHostId": "ssh:target-1",
-        "expectedSshConnectionGeneration": 3,
-        "expectedSshTargetId": "target-1"
-      }
-    },
-    "e7e6fb5e264b": {
-      "name": "worktree.show#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:workspace-1\"}}",
-      "sent": 2
     }
   },
   "recording": {
@@ -193,8 +197,8 @@
       {
         "id": "status-pending",
         "observation": {
-          "sender": ["bc119660f0c1"],
-          "payloads": ["852980e2efc0"],
+          "sender": ["83e4ac78046a"],
+          "payloads": ["d08f74d65ee6"],
           "settlements": {
             "capture": "9270aeb7d9c6"
           },
@@ -205,8 +209,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["a56852d6836b", "6ef43f81f7e3", "6116946241ca"],
-          "payloads": ["852980e2efc0", "e7e6fb5e264b", "2f24cdd633b5"],
+          "sender": ["e81d3a627ac2", "3cf4416a7928", "b6e8ae2b152e"],
+          "payloads": ["d08f74d65ee6", "c924e7a5a7da", "088efd8ff3f7"],
           "settlements": {
             "capture": "29bfbe94cca9"
           },

mobile/rpc-foundation/goldens/files-preview-artifact-direct.json

@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "dd8b7a0916a84c7d763a163759c02210ae99f8fbccfccaa98796b8610c5da97c",
   "platform": "darwin",
@@ -13,8 +13,35 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "194fabd9b9d8": {
+    "500d95d47092": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "byteLength": 5,
+        "content": "hello",
+        "kind": "text",
+        "status": "ready",
+        "truncated": false
+      }
+    },
+    "5beb3ae90517": {
       "name": "files.readTerminalArtifact#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\"}}"
+    },
+    "784ea351e5b2": {
+      "preview": {
+        "byteLength": 5,
+        "content": "hello",
+        "kind": "text",
+        "status": "ready",
+        "truncated": false
+      }
+    },
+    "b3fa0f7828ce": {
+      "name": "files.readTerminalArtifact#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -49,32 +76,6 @@
           }
         }
       }
-    },
-    "500d95d47092": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "byteLength": 5,
-        "content": "hello",
-        "kind": "text",
-        "status": "ready",
-        "truncated": false
-      }
-    },
-    "784ea351e5b2": {
-      "preview": {
-        "byteLength": 5,
-        "content": "hello",
-        "kind": "text",
-        "status": "ready",
-        "truncated": false
-      }
-    },
-    "a3bce9470bbb": {
-      "name": "files.readTerminalArtifact#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\"}}",
-      "sent": 1
     }
   },
   "recording": {
@@ -83,8 +84,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["194fabd9b9d8"],
-          "payloads": ["a3bce9470bbb"],
+          "sender": ["b3fa0f7828ce"],
+          "payloads": ["5beb3ae90517"],
           "settlements": {
             "load": "500d95d47092"
           },

mobile/rpc-foundation/goldens/files-preview-artifact-image.json

@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "d15c1f4e0f95b5c49a8f889d2d37458225293d7306c8439690d972d2df4c29c0",
   "platform": "darwin",
@@ -13,8 +13,21 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "25b0318e985e": {
+    "7659b8b575da": {
+      "preview": {
+        "dataUri": "data:image/png;base64,aGk=",
+        "kind": "image",
+        "status": "ready"
+      }
+    },
+    "b5608d3d00c8": {
       "name": "files.readTerminalArtifactPreview#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifactPreview\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/shot.png\",\"grantId\":\"grant-1\"}}"
+    },
+    "ce511c0ab8ac": {
+      "name": "files.readTerminalArtifactPreview#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -51,18 +64,6 @@
         }
       }
     },
-    "6df57490419a": {
-      "name": "files.readTerminalArtifactPreview#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifactPreview\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/shot.png\",\"grantId\":\"grant-1\"}}",
-      "sent": 1
-    },
-    "7659b8b575da": {
-      "preview": {
-        "dataUri": "data:image/png;base64,aGk=",
-        "kind": "image",
-        "status": "ready"
-      }
-    },
     "eee847a9d90d": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -80,8 +81,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["25b0318e985e"],
-          "payloads": ["6df57490419a"],
+          "sender": ["ce511c0ab8ac"],
+          "payloads": ["b5608d3d00c8"],
           "settlements": {
             "load": "eee847a9d90d"
           },

mobile/rpc-foundation/goldens/files-preview-grant-refresh.json

@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "055f3b45442c1736f10ee98c493e2ece1885fdb68d925ee627e2ba20853537e0",
   "platform": "darwin",
@@ -13,13 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "044dee71a9cd": {
-      "name": "files.resolveTerminalPath#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"run.txt\",\"cwd\":\"/logs\",\"terminal\":\"terminal-1\"}}",
-      "sent": 2
-    },
-    "25b0d1737c71": {
+    "0ea42bf424ad": {
       "name": "files.readTerminalArtifact#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -54,8 +50,9 @@
         }
       }
     },
-    "3c5492779d85": {
+    "29e625f367a7": {
       "name": "files.resolveTerminalPath#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -96,6 +93,11 @@
         }
       }
     },
+    "3fa46af4bb15": {
+      "name": "files.resolveTerminalPath#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.resolveTerminalPath\",\"params\":{\"worktree\":\"id:workspace-1\",\"pathText\":\"run.txt\",\"cwd\":\"/logs\",\"terminal\":\"terminal-1\"}}"
+    },
     "500d95d47092": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -108,13 +110,31 @@
         "truncated": false
       }
     },
-    "5824e53bc730": {
-      "name": "files.readTerminalArtifact#2",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-2\"}}",
-      "sent": 3
+    "5beb3ae90517": {
+      "name": "files.readTerminalArtifact#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\"}}"
     },
-    "5f446c109a9a": {
+    "645c5754be42": {
+      "preview": "unloaded"
+    },
+    "679de887534f": {
       "name": "files.readTerminalArtifact#2",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-2\"}}"
+    },
+    "784ea351e5b2": {
+      "preview": {
+        "byteLength": 5,
+        "content": "hello",
+        "kind": "text",
+        "status": "ready",
+        "truncated": false
+      }
+    },
+    "7e162e008509": {
+      "name": "files.readTerminalArtifact#2",
+      "ordinal": 6,
       "args": [
         {
           "name": "method",
@@ -150,42 +170,13 @@
         }
       }
     },
-    "63abc54b3e87": {
-      "name": "artifact-source-refreshed",
-      "value": {
-        "absolutePath": "/logs/run.txt",
-        "cwd": "/logs",
-        "grantId": "grant-2",
-        "pathText": "run.txt",
-        "source": "terminalArtifact",
-        "terminalHandle": "terminal-1",
-        "worktreeId": "workspace-1"
-      },
-      "sent": 2
-    },
-    "645c5754be42": {
-      "preview": "unloaded"
-    },
-    "784ea351e5b2": {
-      "preview": {
-        "byteLength": 5,
-        "content": "hello",
-        "kind": "text",
-        "status": "ready",
-        "truncated": false
-      }
-    },
     "9270aeb7d9c6": {
       "status": "pending",
       "startedAt": 0
     },
-    "a3bce9470bbb": {
-      "name": "files.readTerminalArtifact#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\"}}",
-      "sent": 1
-    },
-    "e81d5596c201": {
+    "d9e395f8cbf2": {
       "name": "files.readTerminalArtifact#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -210,6 +201,19 @@
         "status": "pending",
         "startedAt": 0
       }
+    },
+    "ddb7adf79b98": {
+      "name": "artifact-source-refreshed",
+      "ordinal": 5,
+      "value": {
+        "absolutePath": "/logs/run.txt",
+        "cwd": "/logs",
+        "grantId": "grant-2",
+        "pathText": "run.txt",
+        "source": "terminalArtifact",
+        "terminalHandle": "terminal-1",
+        "worktreeId": "workspace-1"
+      }
     }
   },
   "recording": {
@@ -218,8 +222,8 @@
       {
         "id": "read-pending",
         "observation": {
-          "sender": ["e81d5596c201"],
-          "payloads": ["a3bce9470bbb"],
+          "sender": ["d9e395f8cbf2"],
+          "payloads": ["5beb3ae90517"],
           "settlements": {
             "load": "9270aeb7d9c6"
           },
@@ -230,13 +234,13 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["25b0d1737c71", "3c5492779d85", "5f446c109a9a"],
-          "payloads": ["a3bce9470bbb", "044dee71a9cd", "5824e53bc730"],
+          "sender": ["0ea42bf424ad", "29e625f367a7", "7e162e008509"],
+          "payloads": ["5beb3ae90517", "3fa46af4bb15", "679de887534f"],
           "settlements": {
             "load": "500d95d47092"
           },
           "state": "784ea351e5b2",
-          "effects": ["63abc54b3e87"]
+          "effects": ["ddb7adf79b98"]
         }
       }
     ]

mobile/rpc-foundation/goldens/files-preview-worktree-image.json

@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "0ffaffb472b663e08a42317d799a2a000211dda5b127fb21cc64f04f73800130",
   "platform": "darwin",
@@ -13,10 +13,10 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "146931cb2534": {
+    "70f782fa6ef2": {
       "name": "files.readPreview#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readPreview\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/logo.png\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readPreview\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/logo.png\"}}"
     },
     "7659b8b575da": {
       "preview": {
@@ -25,18 +25,9 @@
         "status": "ready"
       }
     },
-    "eee847a9d90d": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "dataUri": "data:image/png;base64,aGk=",
-        "kind": "image",
-        "status": "ready"
-      }
-    },
-    "f6564bdb4e19": {
+    "a568af21f540": {
       "name": "files.readPreview#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -71,6 +62,16 @@
           }
         }
       }
+    },
+    "eee847a9d90d": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "dataUri": "data:image/png;base64,aGk=",
+        "kind": "image",
+        "status": "ready"
+      }
     }
   },
   "recording": {
@@ -79,8 +80,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["f6564bdb4e19"],
-          "payloads": ["146931cb2534"],
+          "sender": ["a568af21f540"],
+          "payloads": ["70f782fa6ef2"],
           "settlements": {
             "load": "eee847a9d90d"
           },

mobile/rpc-foundation/goldens/files-preview-worktree.json

@@ -3,9 +3,9 @@
   "family": "files.preview-load",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "bcba4a7d9d929078c5ed80fc7e1acd45859d0b4c559767a919b0396dc6a70a3e",
   "platform": "darwin",
@@ -13,34 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "3d04ed6e70c6": {
-      "name": "files.read#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.read\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/readme.md\"}}",
-      "sent": 1
-    },
-    "3f8bf3069e3d": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "byteLength": 8,
-        "content": "# readme",
-        "kind": "markdown",
-        "status": "ready",
-        "truncated": false
-      }
-    },
-    "47ef2e397e18": {
-      "preview": {
-        "byteLength": 8,
-        "content": "# readme",
-        "kind": "markdown",
-        "status": "ready",
-        "truncated": false
-      }
-    },
-    "9babe9503a83": {
+    "1cf4496bc8c0": {
       "name": "files.read#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -74,6 +49,32 @@
           }
         }
       }
+    },
+    "3f8bf3069e3d": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "byteLength": 8,
+        "content": "# readme",
+        "kind": "markdown",
+        "status": "ready",
+        "truncated": false
+      }
+    },
+    "47ef2e397e18": {
+      "preview": {
+        "byteLength": 8,
+        "content": "# readme",
+        "kind": "markdown",
+        "status": "ready",
+        "truncated": false
+      }
+    },
+    "8423ff93fda2": {
+      "name": "files.read#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.read\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/readme.md\"}}"
     }
   },
   "recording": {
@@ -82,8 +83,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["9babe9503a83"],
-          "payloads": ["3d04ed6e70c6"],
+          "sender": ["1cf4496bc8c0"],
+          "payloads": ["8423ff93fda2"],
           "settlements": {
             "load": "3f8bf3069e3d"
           },

mobile/rpc-foundation/goldens/files-save-blind.json

@@ -3,9 +3,9 @@
   "family": "files.preview-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "8b5c3e87d989966d7b252f19a537040cd5078ba9355a824e7e49af3424390a3e",
   "platform": "darwin",
@@ -13,6 +13,11 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
+    "300dad960cb6": {
+      "name": "files.writeTerminalArtifact#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.writeTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\",\"content\":\"next\"}}"
+    },
     "54a6055a16b5": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -21,8 +26,9 @@
         "status": "saved"
       }
     },
-    "936b6553a1e7": {
+    "7c239dddee09": {
       "name": "files.writeTerminalArtifact#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -57,11 +63,6 @@
         }
       }
     },
-    "940260ab6fb3": {
-      "name": "files.writeTerminalArtifact#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.writeTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\",\"content\":\"next\"}}",
-      "sent": 1
-    },
     "b3f873eb7d0c": {
       "saved": {
         "status": "saved"
@@ -74,8 +75,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["936b6553a1e7"],
-          "payloads": ["940260ab6fb3"],
+          "sender": ["7c239dddee09"],
+          "payloads": ["300dad960cb6"],
           "settlements": {
             "save": "54a6055a16b5"
           },

mobile/rpc-foundation/goldens/files-save-verified.json

@@ -3,9 +3,9 @@
   "family": "files.preview-save",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "6e124d16173074d851d58593b20b25889ed13a3d8021c08fbed53b85a7d3196e",
   "platform": "darwin",
@@ -13,74 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "54a6055a16b5": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "status": "saved"
-      }
-    },
-    "7875007ef392": {
-      "name": "files.writeTerminalArtifact#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.writeTerminalArtifact"
-        },
-        {
-          "name": "params",
-          "value": {
-            "absolutePath": "/logs/run.txt",
-            "content": "next",
-            "grantId": "grant-1",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "ok": true
-          }
-        }
-      }
-    },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "935100df69e4": {
-      "saved": "unsaved"
-    },
-    "a3bce9470bbb": {
-      "name": "files.readTerminalArtifact#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\"}}",
-      "sent": 1
-    },
-    "b3f873eb7d0c": {
-      "saved": {
-        "status": "saved"
-      }
-    },
-    "d76588bfa9bd": {
-      "name": "files.writeTerminalArtifact#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.writeTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\",\"content\":\"next\"}}",
-      "sent": 2
-    },
-    "e391aec81b96": {
+    "24ffb7059792": {
       "name": "files.readTerminalArtifact#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -116,8 +51,76 @@
         }
       }
     },
-    "e81d5596c201": {
+    "54a6055a16b5": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "status": "saved"
+      }
+    },
+    "5beb3ae90517": {
       "name": "files.readTerminalArtifact#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.readTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\"}}"
+    },
+    "74f3d3f1e1a0": {
+      "name": "files.writeTerminalArtifact#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.writeTerminalArtifact\",\"params\":{\"worktree\":\"id:workspace-1\",\"absolutePath\":\"/logs/run.txt\",\"grantId\":\"grant-1\",\"content\":\"next\"}}"
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "935100df69e4": {
+      "saved": "unsaved"
+    },
+    "b3f873eb7d0c": {
+      "saved": {
+        "status": "saved"
+      }
+    },
+    "cce1b55470fd": {
+      "name": "files.writeTerminalArtifact#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.writeTerminalArtifact"
+        },
+        {
+          "name": "params",
+          "value": {
+            "absolutePath": "/logs/run.txt",
+            "content": "next",
+            "grantId": "grant-1",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "ok": true
+          }
+        }
+      }
+    },
+    "d9e395f8cbf2": {
+      "name": "files.readTerminalArtifact#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -150,8 +153,8 @@
       {
         "id": "verify-pending",
         "observation": {
-          "sender": ["e81d5596c201"],
-          "payloads": ["a3bce9470bbb"],
+          "sender": ["d9e395f8cbf2"],
+          "payloads": ["5beb3ae90517"],
           "settlements": {
             "save": "9270aeb7d9c6"
           },
@@ -162,8 +165,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["e391aec81b96", "7875007ef392"],
-          "payloads": ["a3bce9470bbb", "d76588bfa9bd"],
+          "sender": ["24ffb7059792", "cce1b55470fd"],
+          "payloads": ["5beb3ae90517", "74f3d3f1e1a0"],
           "settlements": {
             "save": "54a6055a16b5"
           },

mobile/rpc-foundation/goldens/files-tab-doc-shapes.json

@@ -3,9 +3,9 @@
   "family": "files.tab-doc",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b93fc8b6f1ece041acaa8cc5699852085e67d7e2f39db13145e483f854ea3309",
   "scenarioSha256": "b636221f719dae19a3af6772b687b0bcb300c9910645d23e98c309578ec1c5c5",
   "platform": "darwin",
@@ -13,107 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "323bf6059754": {
-      "name": "files.readPreview#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.readPreview"
-        },
-        {
-          "name": "params",
-          "value": {
-            "relativePath": "docs/logo.png",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "content": "aGk=",
-            "isImage": true,
-            "mimeType": "image/png"
-          }
-        }
-      }
-    },
-    "3be6ef0e9bd8": {
-      "name": "files.readPreview#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.readPreview\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/logo.png\"}}",
-      "sent": 2
-    },
-    "3d04ed6e70c6": {
-      "name": "files.read#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.read\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/readme.md\"}}",
-      "sent": 1
-    },
-    "9babe9503a83": {
-      "name": "files.read#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.read"
-        },
-        {
-          "name": "params",
-          "value": {
-            "relativePath": "docs/readme.md",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "byteLength": 8,
-            "content": "# readme",
-            "truncated": false
-          }
-        }
-      }
-    },
-    "b185e249da6e": {
-      "name": "git.diff#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:workspace-1\",\"filePath\":\"docs/readme.md\",\"staged\":true}}",
-      "sent": 3
-    },
-    "b5c68b76c498": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "byteLength": 8,
-        "content": "# readme",
-        "kind": "file",
-        "status": "ready",
-        "truncated": false
-      }
-    },
-    "c8fbe8972330": {
+    "096b0c48dd10": {
       "name": "git.diff#1",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
@@ -149,6 +51,107 @@
         }
       }
     },
+    "1cf4496bc8c0": {
+      "name": "files.read#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.read"
+        },
+        {
+          "name": "params",
+          "value": {
+            "relativePath": "docs/readme.md",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "byteLength": 8,
+            "content": "# readme",
+            "truncated": false
+          }
+        }
+      }
+    },
+    "1f1a0d8f6723": {
+      "name": "files.readPreview#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.readPreview\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/logo.png\"}}"
+    },
+    "8423ff93fda2": {
+      "name": "files.read#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.read\",\"params\":{\"worktree\":\"id:workspace-1\",\"relativePath\":\"docs/readme.md\"}}"
+    },
+    "96b863d005b1": {
+      "name": "files.readPreview#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.readPreview"
+        },
+        {
+          "name": "params",
+          "value": {
+            "relativePath": "docs/logo.png",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "content": "aGk=",
+            "isImage": true,
+            "mimeType": "image/png"
+          }
+        }
+      }
+    },
+    "b5c68b76c498": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "byteLength": 8,
+        "content": "# readme",
+        "kind": "file",
+        "status": "ready",
+        "truncated": false
+      }
+    },
+    "ca069263339b": {
+      "name": "git.diff#1",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.diff\",\"params\":{\"worktree\":\"id:workspace-1\",\"filePath\":\"docs/readme.md\",\"staged\":true}}"
+    },
     "ed33ecdb4e8e": {
       "diff": {
         "kind": "diff",
@@ -219,8 +222,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["9babe9503a83", "323bf6059754", "c8fbe8972330"],
-          "payloads": ["3d04ed6e70c6", "3be6ef0e9bd8", "b185e249da6e"],
+          "sender": ["1cf4496bc8c0", "96b863d005b1", "096b0c48dd10"],
+          "payloads": ["8423ff93fda2", "1f1a0d8f6723", "ca069263339b"],
           "settlements": {
             "text": "b5c68b76c498",
             "image": "eee847a9d90d",

mobile/rpc-foundation/goldens/home-host-accounts.json

@@ -3,9 +3,9 @@
   "family": "home.host-accounts",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "c632fdbc4b730777ecb09f08bec14cca0586042b01ed99d40d0228806c7def4a",
   "scenarioSha256": "366426641e25542fcc6fcd351ece6a1ee897c8b3974c08eb7557eadfa4d3b06f",
   "platform": "darwin",
@@ -13,56 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "2525c654127c": {
-      "host-1": {
-        "claude": {
-          "accounts": [
-            {
-              "email": "claude@example.test",
-              "id": "claude-1",
-              "updatedAt": 1700000000000
-            }
-          ],
-          "activeAccountId": "claude-1"
-        },
-        "codex": {
-          "accounts": [],
-          "activeAccountId": {
-            "$rpc": "null"
-          }
-        },
-        "rateLimits": {
-          "claude": {
-            "$rpc": "null"
-          },
-          "claudeTarget": {
-            "runtime": "host",
-            "wslDistro": {
-              "$rpc": "null"
-            }
-          },
-          "codex": {
-            "$rpc": "null"
-          },
-          "codexTarget": {
-            "runtime": "host",
-            "wslDistro": {
-              "$rpc": "null"
-            }
-          },
-          "inactiveClaudeAccounts": [],
-          "inactiveCodexAccounts": []
-        }
-      }
-    },
-    "44136fa355b3": {},
-    "6432de87fc3e": {
-      "name": "accounts.list#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"accounts.list\"}",
-      "sent": 1
-    },
-    "ae89fde72803": {
+    "16b4c187b90c": {
       "name": "accounts.list#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -119,33 +72,57 @@
         }
       }
     },
-    "d54161165272": {
-      "name": "accounts.list#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "accounts.list"
+    "2525c654127c": {
+      "host-1": {
+        "claude": {
+          "accounts": [
+            {
+              "email": "claude@example.test",
+              "id": "claude-1",
+              "updatedAt": 1700000000000
+            }
+          ],
+          "activeAccountId": "claude-1"
         },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "undefined"
+        "codex": {
+          "accounts": [],
+          "activeAccountId": {
+            "$rpc": "null"
           }
         },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
+        "rateLimits": {
+          "claude": {
+            "$rpc": "null"
+          },
+          "claudeTarget": {
+            "runtime": "host",
+            "wslDistro": {
+              "$rpc": "null"
+            }
+          },
+          "codex": {
+            "$rpc": "null"
+          },
+          "codexTarget": {
+            "runtime": "host",
+            "wslDistro": {
+              "$rpc": "null"
+            }
+          },
+          "inactiveClaudeAccounts": [],
+          "inactiveCodexAccounts": []
         }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
       }
     },
-    "e14c03c3141f": {
+    "3bf8cb601ec3": {
+      "name": "accounts.list#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"accounts.list\"}"
+    },
+    "44136fa355b3": {},
+    "78574a24b32d": {
       "name": "accounts",
+      "ordinal": 3,
       "value": {
         "host-1": {
           "claude": {
@@ -187,8 +164,33 @@
             "inactiveCodexAccounts": []
           }
         }
-      },
-      "sent": 1
+      }
+    },
+    "884d6f264bfd": {
+      "name": "accounts.list#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "accounts.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "undefined"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -205,8 +207,8 @@
       {
         "id": "accounts-pending",
         "observation": {
-          "sender": ["d54161165272"],
-          "payloads": ["6432de87fc3e"],
+          "sender": ["884d6f264bfd"],
+          "payloads": ["3bf8cb601ec3"],
           "settlements": {
             "load": "eb79a9b3682a"
           },
@@ -217,13 +219,13 @@
       {
         "id": "accounts-published",
         "observation": {
-          "sender": ["ae89fde72803"],
-          "payloads": ["6432de87fc3e"],
+          "sender": ["16b4c187b90c"],
+          "payloads": ["3bf8cb601ec3"],
           "settlements": {
             "load": "eb79a9b3682a"
           },
           "state": "2525c654127c",
-          "effects": ["e14c03c3141f"]
+          "effects": ["78574a24b32d"]
         }
       }
     ]

mobile/rpc-foundation/goldens/home-host-stats.json

@@ -3,9 +3,9 @@
   "family": "home.host-stats",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a9e0780298a1443664e7ae02056168aa34d67556c9c056d51a82c7b4a73ad35b",
   "scenarioSha256": "bd5f4e5f24a29d96c4c98950691c6571918332f71ebb1f29ee97a9abc857ac29",
   "platform": "darwin",
@@ -13,8 +13,20 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "0ebcc6f6a4cb": {
+    "44136fa355b3": {},
+    "94616379becc": {
+      "name": "stats",
+      "ordinal": 3,
+      "value": {
+        "host-1": {
+          "activeWorktrees": 1,
+          "totalWorktrees": 3
+        }
+      }
+    },
+    "9698bf4d8a23": {
       "name": "stats.summary#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -47,25 +59,15 @@
         }
       }
     },
-    "44136fa355b3": {},
-    "7836888bb6c0": {
-      "name": "stats",
-      "value": {
-        "host-1": {
-          "activeWorktrees": 1,
-          "totalWorktrees": 3
-        }
-      },
-      "sent": 1
-    },
     "9a84a7559023": {
       "host-1": {
         "activeWorktrees": 1,
         "totalWorktrees": 3
       }
     },
-    "a392ac528c2b": {
+    "cf7f6575cf73": {
       "name": "stats.summary#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -89,10 +91,10 @@
         "startedAt": 0
       }
     },
-    "dcf607ac617e": {
+    "d66672644411": {
       "name": "stats.summary#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"stats.summary\"}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"stats.summary\"}"
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -109,8 +111,8 @@
       {
         "id": "stats-pending",
         "observation": {
-          "sender": ["a392ac528c2b"],
-          "payloads": ["dcf607ac617e"],
+          "sender": ["cf7f6575cf73"],
+          "payloads": ["d66672644411"],
           "settlements": {
             "load": "eb79a9b3682a"
           },
@@ -121,13 +123,13 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["0ebcc6f6a4cb"],
-          "payloads": ["dcf607ac617e"],
+          "sender": ["9698bf4d8a23"],
+          "payloads": ["d66672644411"],
           "settlements": {
             "load": "eb79a9b3682a"
           },
           "state": "9a84a7559023",
-          "effects": ["7836888bb6c0"]
+          "effects": ["94616379becc"]
         }
       }
     ]

mobile/rpc-foundation/goldens/host-view-settings-sync.json

@@ -3,9 +3,9 @@
   "family": "host.view-settings",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "a9e0780298a1443664e7ae02056168aa34d67556c9c056d51a82c7b4a73ad35b",
   "scenarioSha256": "1ee6031227fa3efd5b36841afa60f7b2264eacdd9c6126e5851d5acb39ffaadd",
   "platform": "darwin",
@@ -13,48 +13,19 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "045d8ec6a888": {
+    "0078bce46c03": {
       "name": "ui.set#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"ui.set\",\"params\":{\"sortBy\":\"name\"}}",
-      "sent": 2
+      "ordinal": 14,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"ui.set\",\"params\":{\"sortBy\":\"name\"}}"
     },
-    "1207e1b06040": {
-      "name": "workspaceStatuses",
-      "value": [],
-      "sent": 1
+    "49b07092d960": {
+      "name": "sortMode",
+      "ordinal": 9,
+      "value": "name"
     },
-    "5fbdd64c75bc": {
-      "name": "ui.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "ui.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "6816213c2ede": {
-      "name": "collapsedGroups",
-      "value": [],
-      "sent": 1
-    },
-    "78f2fbcd0185": {
+    "4c8dbecc905b": {
       "name": "ui.set#1",
+      "ordinal": 13,
       "args": [
         {
           "name": "method",
@@ -86,12 +57,24 @@
         }
       }
     },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
+    "502a83a190c2": {
+      "name": "workspaceStatuses",
+      "ordinal": 10,
+      "value": []
     },
-    "a424515cabc9": {
+    "582477c8e0af": {
       "name": "ui.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"ui.get\"}"
+    },
+    "641f71cd84d7": {
+      "name": "collapsedGroups",
+      "ordinal": 6,
+      "value": []
+    },
+    "651e8014c9ff": {
+      "name": "ui.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -127,10 +110,75 @@
         }
       }
     },
-    "a8115697f295": {
+    "77222aa7cc3b": {
+      "name": "filters",
+      "ordinal": 7,
+      "value": {
+        "alwaysShowDefaultBranch": true,
+        "filterRepoIds": [],
+        "hideDefaultBranch": false,
+        "hideSleeping": true
+      }
+    },
+    "840c5f323f3d": {
+      "name": "groupMode",
+      "ordinal": 3,
+      "value": "repo"
+    },
+    "8935c6303d20": {
+      "name": "filters",
+      "ordinal": 12,
+      "value": {
+        "alwaysShowDefaultBranch": true,
+        "filterRepoIds": [],
+        "hideDefaultBranch": false,
+        "hideSleeping": true
+      }
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "985caf5772e9": {
+      "name": "ui.get#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "ui.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "a8806d0780bb": {
       "name": "sortMode",
-      "value": "name",
-      "sent": 1
+      "ordinal": 4,
+      "value": "name"
+    },
+    "b6d257a61780": {
+      "name": "groupMode",
+      "ordinal": 8,
+      "value": "repo"
+    },
+    "b7731124942f": {
+      "name": "collapsedGroups",
+      "ordinal": 11,
+      "value": []
     },
     "ba2035345a68": {
       "collapsed": [],
@@ -156,26 +204,6 @@
       "sortMode": "recent",
       "statuses": []
     },
-    "c178812d69e7": {
-      "name": "ui.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"ui.get\"}",
-      "sent": 1
-    },
-    "d88f3b1774b1": {
-      "name": "filters",
-      "value": {
-        "alwaysShowDefaultBranch": true,
-        "filterRepoIds": [],
-        "hideDefaultBranch": false,
-        "hideSleeping": true
-      },
-      "sent": 1
-    },
-    "e0a092c9ae88": {
-      "name": "groupMode",
-      "value": "repo",
-      "sent": 1
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -183,6 +211,11 @@
       "value": {
         "$rpc": "undefined"
       }
+    },
+    "fa699d780625": {
+      "name": "workspaceStatuses",
+      "ordinal": 5,
+      "value": []
     }
   },
   "recording": {
@@ -191,8 +224,8 @@
       {
         "id": "ui-pending",
         "observation": {
-          "sender": ["5fbdd64c75bc"],
-          "payloads": ["c178812d69e7"],
+          "sender": ["985caf5772e9"],
+          "payloads": ["582477c8e0af"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "sync": "9270aeb7d9c6"
@@ -204,8 +237,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["a424515cabc9", "78f2fbcd0185"],
-          "payloads": ["c178812d69e7", "045d8ec6a888"],
+          "sender": ["651e8014c9ff", "4c8dbecc905b"],
+          "payloads": ["582477c8e0af", "0078bce46c03"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "sync": "eb79a9b3682a",
@@ -213,16 +246,16 @@
           },
           "state": "ba2035345a68",
           "effects": [
-            "e0a092c9ae88",
-            "a8115697f295",
-            "1207e1b06040",
-            "6816213c2ede",
-            "d88f3b1774b1",
-            "e0a092c9ae88",
-            "a8115697f295",
-            "1207e1b06040",
-            "6816213c2ede",
-            "d88f3b1774b1"
+            "840c5f323f3d",
+            "a8806d0780bb",
+            "fa699d780625",
+            "641f71cd84d7",
+            "77222aa7cc3b",
+            "b6d257a61780",
+            "49b07092d960",
+            "502a83a190c2",
+            "b7731124942f",
+            "8935c6303d20"
           ]
         }
       }

mobile/rpc-foundation/goldens/host-worktree-actions-pin-open-delete.json

@@ -3,9 +3,9 @@
   "family": "host.worktree-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "92c29bd78ca0c0d5917e9386fc447bb9a1698b1d1ffaba0db7546eaac60da639",
   "scenarioSha256": "720add498c79425ca8efc9764fd5d8307fe33bc891842604cfc899f770b79811",
   "platform": "darwin",
@@ -13,8 +13,64 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "04938673cbf5": {
+    "047f5e4dfc2b": {
+      "name": "optimisticActiveWorktreeIdentity",
+      "ordinal": 6,
+      "value": "|wt-1"
+    },
+    "04adcc2c4239": {
+      "name": "lastKnownWorktrees",
+      "ordinal": 10,
+      "value": []
+    },
+    "0eb00a9a894a": {
+      "name": "worktree.rm#1",
+      "ordinal": 12,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.rm\",\"params\":{\"worktree\":\"id:wt-1\",\"force\":true}}"
+    },
+    "14ce9f03298e": {
+      "name": "pinnedIds",
+      "ordinal": 3,
+      "value": ["wt-1"]
+    },
+    "1c5bb0f1882e": {
+      "name": "worktree.set#1",
+      "ordinal": 4,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.set"
+        },
+        {
+          "name": "params",
+          "value": {
+            "isPinned": true,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "ok": true
+          }
+        }
+      }
+    },
+    "40f6e6f5e2cd": {
       "name": "worktree.activate#1",
+      "ordinal": 7,
       "args": [
         {
           "name": "method",
@@ -48,127 +104,10 @@
         }
       }
     },
-    "088a989c038b": {
-      "name": "worktrees",
-      "value": [
-        {
-          "branch": "feature/pin",
-          "displayName": "marlin",
-          "hasAttachedPty": false,
-          "isPinned": true,
-          "linkedPR": {
-            "$rpc": "null"
-          },
-          "liveTerminalCount": 0,
-          "path": "/repos/marlin/wt-1",
-          "preview": "",
-          "repo": "marlin",
-          "repoId": "repo-1",
-          "unread": false,
-          "worktreeId": "wt-1"
-        }
-      ],
-      "sent": 0
-    },
-    "2b635c2a4fbb": {
-      "name": "worktree.rm#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.rm"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": true,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "ok": true
-          }
-        }
-      }
-    },
-    "2c2ff4eed497": {
-      "name": "worktree.set#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.set\",\"params\":{\"worktree\":\"id:wt-1\",\"isPinned\":true}}",
-      "sent": 1
-    },
-    "3e27f9568029": {
-      "name": "lastKnownWorktrees",
-      "value": [
-        {
-          "branch": "feature/pin",
-          "displayName": "marlin",
-          "hasAttachedPty": false,
-          "isPinned": true,
-          "linkedPR": {
-            "$rpc": "null"
-          },
-          "liveTerminalCount": 0,
-          "path": "/repos/marlin/wt-1",
-          "preview": "",
-          "repo": "marlin",
-          "repoId": "repo-1",
-          "unread": false,
-          "worktreeId": "wt-1"
-        }
-      ],
-      "sent": 0
-    },
-    "43444aeb669c": {
+    "47602c8e53e9": {
       "name": "worktree.activate#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}",
-      "sent": 2
-    },
-    "56b6d4fb8c56": {
-      "name": "worktree.set#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.set"
-        },
-        {
-          "name": "params",
-          "value": {
-            "isPinned": true,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "ok": true
-          }
-        }
-      }
+      "ordinal": 8,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
     },
     "6e959a9dd70e": {
       "confirmRemoveHost": false,
@@ -178,20 +117,20 @@
       "routeActionState": {},
       "worktrees": []
     },
-    "71246d169f18": {
-      "name": "worktrees",
-      "value": [],
-      "sent": 2
-    },
-    "8839215bd1a5": {
-      "name": "lastKnownWorktrees",
-      "value": [],
-      "sent": 2
-    },
     "9270aeb7d9c6": {
       "status": "pending",
       "startedAt": 0
     },
+    "989153283864": {
+      "name": "worktrees",
+      "ordinal": 9,
+      "value": []
+    },
+    "9a2d39ba928f": {
+      "name": "worktree.set#1",
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.set\",\"params\":{\"worktree\":\"id:wt-1\",\"isPinned\":true}}"
+    },
     "9a9b0d6699b2": {
       "confirmRemoveHost": false,
       "lastKnownWorktrees": [
@@ -236,23 +175,9 @@
         }
       ]
     },
-    "a970c9a870bb": {
-      "name": "pinnedIds",
-      "value": ["wt-1"],
-      "sent": 0
-    },
-    "ba712c70aeb2": {
-      "name": "worktree.rm#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.rm\",\"params\":{\"worktree\":\"id:wt-1\",\"force\":true}}",
-      "sent": 3
-    },
-    "bb44ad78848e": {
-      "name": "optimisticActiveWorktreeIdentity",
-      "value": "|wt-1",
-      "sent": 1
-    },
-    "bf2b36bda2d2": {
+    "ab935dad4cfb": {
       "name": "worktree.set#1",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -277,8 +202,96 @@
         "startedAt": 0
       }
     },
-    "e3e3c397a66a": {
+    "ca91c555e48e": {
+      "name": "worktrees",
+      "ordinal": 1,
+      "value": [
+        {
+          "branch": "feature/pin",
+          "displayName": "marlin",
+          "hasAttachedPty": false,
+          "isPinned": true,
+          "linkedPR": {
+            "$rpc": "null"
+          },
+          "liveTerminalCount": 0,
+          "path": "/repos/marlin/wt-1",
+          "preview": "",
+          "repo": "marlin",
+          "repoId": "repo-1",
+          "unread": false,
+          "worktreeId": "wt-1"
+        }
+      ]
+    },
+    "da6c9e1a507d": {
+      "name": "lastKnownWorktrees",
+      "ordinal": 2,
+      "value": [
+        {
+          "branch": "feature/pin",
+          "displayName": "marlin",
+          "hasAttachedPty": false,
+          "isPinned": true,
+          "linkedPR": {
+            "$rpc": "null"
+          },
+          "liveTerminalCount": 0,
+          "path": "/repos/marlin/wt-1",
+          "preview": "",
+          "repo": "marlin",
+          "repoId": "repo-1",
+          "unread": false,
+          "worktreeId": "wt-1"
+        }
+      ]
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "ec185de41563": {
       "name": "worktree.rm#1",
+      "ordinal": 11,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.rm"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": true,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "ok": true
+          }
+        }
+      }
+    },
+    "f2dc0532d090": {
+      "name": "worktree.rm#1",
+      "ordinal": 11,
       "args": [
         {
           "name": "method",
@@ -302,14 +315,6 @@
         "status": "pending",
         "startedAt": 0
       }
-    },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
     }
   },
   "recording": {
@@ -318,21 +323,21 @@
       {
         "id": "pin-optimistic",
         "observation": {
-          "sender": ["bf2b36bda2d2"],
-          "payloads": ["2c2ff4eed497"],
+          "sender": ["ab935dad4cfb"],
+          "payloads": ["9a2d39ba928f"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "toggle-pin": "eb79a9b3682a"
           },
           "state": "9a9b0d6699b2",
-          "effects": ["088a989c038b", "3e27f9568029", "a970c9a870bb"]
+          "effects": ["ca91c555e48e", "da6c9e1a507d", "14ce9f03298e"]
         }
       },
       {
         "id": "delete-optimistic",
         "observation": {
-          "sender": ["56b6d4fb8c56", "04938673cbf5", "e3e3c397a66a"],
-          "payloads": ["2c2ff4eed497", "43444aeb669c", "ba712c70aeb2"],
+          "sender": ["1c5bb0f1882e", "40f6e6f5e2cd", "f2dc0532d090"],
+          "payloads": ["9a2d39ba928f", "47602c8e53e9", "0eb00a9a894a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "toggle-pin": "eb79a9b3682a",
@@ -341,20 +346,20 @@
           },
           "state": "6e959a9dd70e",
           "effects": [
-            "088a989c038b",
-            "3e27f9568029",
-            "a970c9a870bb",
-            "bb44ad78848e",
-            "71246d169f18",
-            "8839215bd1a5"
+            "ca91c555e48e",
+            "da6c9e1a507d",
+            "14ce9f03298e",
+            "047f5e4dfc2b",
+            "989153283864",
+            "04adcc2c4239"
           ]
         }
       },
       {
         "id": "settled",
         "observation": {
-          "sender": ["56b6d4fb8c56", "04938673cbf5", "2b635c2a4fbb"],
-          "payloads": ["2c2ff4eed497", "43444aeb669c", "ba712c70aeb2"],
+          "sender": ["1c5bb0f1882e", "40f6e6f5e2cd", "ec185de41563"],
+          "payloads": ["9a2d39ba928f", "47602c8e53e9", "0eb00a9a894a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "toggle-pin": "eb79a9b3682a",
@@ -363,12 +368,12 @@
           },
           "state": "6e959a9dd70e",
           "effects": [
-            "088a989c038b",
-            "3e27f9568029",
-            "a970c9a870bb",
-            "bb44ad78848e",
-            "71246d169f18",
-            "8839215bd1a5"
+            "ca91c555e48e",
+            "da6c9e1a507d",
+            "14ce9f03298e",
+            "047f5e4dfc2b",
+            "989153283864",
+            "04adcc2c4239"
           ]
         }
       }

mobile/rpc-foundation/goldens/host-worktree-delete-refused.json

@@ -3,9 +3,9 @@
   "family": "host.worktree-actions",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "92c29bd78ca0c0d5917e9386fc447bb9a1698b1d1ffaba0db7546eaac60da639",
   "scenarioSha256": "5dd5e7eabaabba1e471b13958f59891c3b28f553087c96315598c83a14ded7e7",
   "platform": "darwin",
@@ -13,8 +13,77 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "3eaa2fc6fe33": {
+    "145530c614fb": {
+      "name": "worktree.rm#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.rm"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": true,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "worktree_busy",
+            "message": "Worktree is busy"
+          },
+          "id": "frame-1",
+          "ok": false
+        }
+      }
+    },
+    "192bfc4c6eac": {
+      "name": "worktree.rm#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.rm\",\"params\":{\"worktree\":\"id:wt-1\",\"force\":true}}"
+    },
+    "4da755eea670": {
+      "name": "worktree.rm#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.rm"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": true,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "50378a292ce7": {
       "name": "worktrees",
+      "ordinal": 5,
       "value": [
         {
           "branch": "feature/pin",
@@ -32,23 +101,34 @@
           "unread": false,
           "worktreeId": "wt-1"
         }
-      ],
-      "sent": 1
+      ]
     },
-    "4390dbd60885": {
+    "753a3ae9bdd7": {
       "name": "lastKnownWorktrees",
-      "value": [],
-      "sent": 0
+      "ordinal": 6,
+      "value": [
+        {
+          "branch": "feature/pin",
+          "displayName": "marlin",
+          "hasAttachedPty": false,
+          "isPinned": false,
+          "linkedPR": {
+            "$rpc": "null"
+          },
+          "liveTerminalCount": 0,
+          "path": "/repos/marlin/wt-1",
+          "preview": "",
+          "repo": "marlin",
+          "repoId": "repo-1",
+          "unread": false,
+          "worktreeId": "wt-1"
+        }
+      ]
     },
-    "6f5a073918ed": {
-      "name": "worktree.rm#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.rm\",\"params\":{\"worktree\":\"id:wt-1\",\"force\":true}}",
-      "sent": 1
-    },
-    "77c8169fffce": {
-      "name": "worktrees",
-      "value": [],
-      "sent": 0
+    "7a68c6ea2c44": {
+      "name": "lastKnownWorktrees",
+      "ordinal": 2,
+      "value": []
     },
     "8056533b940f": {
       "confirmRemoveHost": false,
@@ -60,32 +140,15 @@
       "routeActionState": {},
       "worktrees": []
     },
+    "8f27c443230b": {
+      "name": "worktrees",
+      "ordinal": 1,
+      "value": []
+    },
     "9270aeb7d9c6": {
       "status": "pending",
       "startedAt": 0
     },
-    "ad493faf0d61": {
-      "name": "lastKnownWorktrees",
-      "value": [
-        {
-          "branch": "feature/pin",
-          "displayName": "marlin",
-          "hasAttachedPty": false,
-          "isPinned": false,
-          "linkedPR": {
-            "$rpc": "null"
-          },
-          "liveTerminalCount": 0,
-          "path": "/repos/marlin/wt-1",
-          "preview": "",
-          "repo": "marlin",
-          "repoId": "repo-1",
-          "unread": false,
-          "worktreeId": "wt-1"
-        }
-      ],
-      "sent": 1
-    },
     "bcb66b345fcd": {
       "confirmRemoveHost": false,
       "lastKnownWorktrees": [
@@ -130,67 +193,6 @@
         }
       ]
     },
-    "e3e3c397a66a": {
-      "name": "worktree.rm#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.rm"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": true,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "e97d1f006b72": {
-      "name": "worktree.rm#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.rm"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": true,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "worktree_busy",
-            "message": "Worktree is busy"
-          },
-          "id": "frame-1",
-          "ok": false
-        }
-      }
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -206,27 +208,27 @@
       {
         "id": "delete-optimistic",
         "observation": {
-          "sender": ["e3e3c397a66a"],
-          "payloads": ["6f5a073918ed"],
+          "sender": ["4da755eea670"],
+          "payloads": ["192bfc4c6eac"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "delete": "9270aeb7d9c6"
           },
           "state": "8056533b940f",
-          "effects": ["77c8169fffce", "4390dbd60885"]
+          "effects": ["8f27c443230b", "7a68c6ea2c44"]
         }
       },
       {
         "id": "restored",
         "observation": {
-          "sender": ["e97d1f006b72"],
-          "payloads": ["6f5a073918ed"],
+          "sender": ["145530c614fb"],
+          "payloads": ["192bfc4c6eac"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "delete": "eb79a9b3682a"
           },
           "state": "bcb66b345fcd",
-          "effects": ["77c8169fffce", "4390dbd60885", "3eaa2fc6fe33", "ad493faf0d61"]
+          "effects": ["8f27c443230b", "7a68c6ea2c44", "50378a292ce7", "753a3ae9bdd7"]
         }
       }
     ]

mobile/rpc-foundation/goldens/host-worktree-refresh-stream.json

@@ -3,9 +3,9 @@
   "family": "host-worktree-refresh",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "6ac11f1ab42fea3b718d9714e512a4e8a344aea66ae170fbe9ef2b5ae82dbe0a",
   "platform": "darwin",
@@ -13,35 +13,86 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "1e5c2d0839f0": {
-      "fetchRepoMetadata": 3,
-      "fetchWorktrees": 4,
-      "running": true
+    "121f5eaa52a4": {
+      "name": "fetchWorktrees",
+      "ordinal": 7,
+      "value": {
+        "options": {
+          "$rpc": "undefined"
+        }
+      }
     },
-    "32ad88ec13e3": {
+    "18399efbe63d": {
       "name": "fetchRepoMetadata",
+      "ordinal": 3,
       "value": {
         "options": {
           "force": true,
           "queueIfInFlight": true
         }
-      },
-      "sent": 0
+      }
     },
-    "519cd29a30fa": {
-      "name": "runtime.clientEvents.subscribe#2",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}",
-      "sent": 0
-    },
-    "5f7bd3b1a756": {
+    "1d8fe76c29c7": {
       "name": "runtime.clientEvents.unsubscribe#1",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}",
-      "sent": 0
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}"
     },
-    "61f865a194bf": {
+    "1e1067bda316": {
+      "name": "fetchWorktrees",
+      "ordinal": 5,
+      "value": {
+        "options": {
+          "$rpc": "undefined"
+        }
+      }
+    },
+    "1e5c2d0839f0": {
+      "fetchRepoMetadata": 3,
+      "fetchWorktrees": 4,
+      "running": true
+    },
+    "306fcb72ddc5": {
+      "name": "fetchRepoMetadata",
+      "ordinal": 8,
+      "value": {
+        "options": {
+          "force": true,
+          "queueIfInFlight": true
+        }
+      }
+    },
+    "3582e201880e": {
       "name": "runtime.clientEvents.unsubscribe#2",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-2\"}}",
-      "sent": 0
+      "ordinal": 13,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-2\"}}"
+    },
+    "4a27571a011a": {
+      "name": "fetchWorktrees",
+      "ordinal": 2,
+      "value": {
+        "options": {
+          "$rpc": "undefined"
+        }
+      }
+    },
+    "4e7ae49574b8": {
+      "name": "fetchWorktrees",
+      "ordinal": 4,
+      "value": {
+        "options": {
+          "$rpc": "undefined"
+        }
+      }
+    },
+    "5073e6d40272": {
+      "name": "fetchRepoMetadata",
+      "ordinal": 12,
+      "value": {
+        "options": {
+          "force": true,
+          "queueIfInFlight": true
+        }
+      }
     },
     "6d9fd24a7491": {
       "fetchRepoMetadata": 1,
@@ -53,33 +104,33 @@
       "fetchWorktrees": 1,
       "running": true
     },
-    "8f638d83589d": {
+    "8fa922dbb034": {
       "name": "fetchWorktrees",
+      "ordinal": 11,
       "value": {
         "options": {
           "$rpc": "undefined"
         }
-      },
-      "sent": 0
+      }
     },
     "91e9a84a208f": {
       "fetchRepoMetadata": 4,
       "fetchWorktrees": 5,
       "running": false
     },
-    "bdc95c0ab9bc": {
-      "name": "runtime.clientEvents.subscribe#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}",
-      "sent": 0
-    },
-    "cfd2555aae81": {
+    "96ebe4a1b522": {
       "name": "fetchRepoMetadata",
+      "ordinal": 6,
       "value": {
         "options": {
           "$rpc": "undefined"
         }
-      },
-      "sent": 0
+      }
+    },
+    "b6a25eca1497": {
+      "name": "runtime.clientEvents.subscribe#2",
+      "ordinal": 9,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}"
     },
     "e54e98a537b8": {
       "fetchRepoMetadata": 2,
@@ -99,6 +150,11 @@
       "fetchWorktrees": 5,
       "running": true
     },
+    "eef1ee3c2773": {
+      "name": "runtime.clientEvents.subscribe#1",
+      "ordinal": 1,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}"
+    },
     "f2af146a9f12": {
       "status": "fulfilled",
       "startedAt": 3000,
@@ -115,53 +171,53 @@
         "id": "started",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc"],
+          "payloads": ["eef1ee3c2773"],
           "settlements": {
             "start": "eb79a9b3682a"
           },
           "state": "8297145c6199",
-          "effects": ["8f638d83589d", "32ad88ec13e3"]
+          "effects": ["4a27571a011a", "18399efbe63d"]
         }
       },
       {
         "id": "ready",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc"],
+          "payloads": ["eef1ee3c2773"],
           "settlements": {
             "start": "eb79a9b3682a"
           },
           "state": "8297145c6199",
-          "effects": ["8f638d83589d", "32ad88ec13e3"]
+          "effects": ["4a27571a011a", "18399efbe63d"]
         }
       },
       {
         "id": "worktrees-changed",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc"],
+          "payloads": ["eef1ee3c2773"],
           "settlements": {
             "start": "eb79a9b3682a"
           },
           "state": "6d9fd24a7491",
-          "effects": ["8f638d83589d", "32ad88ec13e3", "8f638d83589d"]
+          "effects": ["4a27571a011a", "18399efbe63d", "4e7ae49574b8"]
         }
       },
       {
         "id": "polled",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc"],
+          "payloads": ["eef1ee3c2773"],
           "settlements": {
             "start": "eb79a9b3682a"
           },
           "state": "e54e98a537b8",
           "effects": [
-            "8f638d83589d",
-            "32ad88ec13e3",
-            "8f638d83589d",
-            "8f638d83589d",
-            "cfd2555aae81"
+            "4a27571a011a",
+            "18399efbe63d",
+            "4e7ae49574b8",
+            "1e1067bda316",
+            "96ebe4a1b522"
           ]
         }
       },
@@ -169,19 +225,19 @@
         "id": "repos-changed",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc"],
+          "payloads": ["eef1ee3c2773"],
           "settlements": {
             "start": "eb79a9b3682a"
           },
           "state": "1e5c2d0839f0",
           "effects": [
-            "8f638d83589d",
-            "32ad88ec13e3",
-            "8f638d83589d",
-            "8f638d83589d",
-            "cfd2555aae81",
-            "8f638d83589d",
-            "32ad88ec13e3"
+            "4a27571a011a",
+            "18399efbe63d",
+            "4e7ae49574b8",
+            "1e1067bda316",
+            "96ebe4a1b522",
+            "121f5eaa52a4",
+            "306fcb72ddc5"
           ]
         }
       },
@@ -189,20 +245,20 @@
         "id": "re-subscribed",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc", "519cd29a30fa", "5f7bd3b1a756"],
+          "payloads": ["eef1ee3c2773", "b6a25eca1497", "1d8fe76c29c7"],
           "settlements": {
             "start": "eb79a9b3682a",
             "cutover": "f2af146a9f12"
           },
           "state": "1e5c2d0839f0",
           "effects": [
-            "8f638d83589d",
-            "32ad88ec13e3",
-            "8f638d83589d",
-            "8f638d83589d",
-            "cfd2555aae81",
-            "8f638d83589d",
-            "32ad88ec13e3"
+            "4a27571a011a",
+            "18399efbe63d",
+            "4e7ae49574b8",
+            "1e1067bda316",
+            "96ebe4a1b522",
+            "121f5eaa52a4",
+            "306fcb72ddc5"
           ]
         }
       },
@@ -210,22 +266,22 @@
         "id": "replayed",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc", "519cd29a30fa", "5f7bd3b1a756"],
+          "payloads": ["eef1ee3c2773", "b6a25eca1497", "1d8fe76c29c7"],
           "settlements": {
             "start": "eb79a9b3682a",
             "cutover": "f2af146a9f12"
           },
           "state": "edb34b7fcc08",
           "effects": [
-            "8f638d83589d",
-            "32ad88ec13e3",
-            "8f638d83589d",
-            "8f638d83589d",
-            "cfd2555aae81",
-            "8f638d83589d",
-            "32ad88ec13e3",
-            "8f638d83589d",
-            "32ad88ec13e3"
+            "4a27571a011a",
+            "18399efbe63d",
+            "4e7ae49574b8",
+            "1e1067bda316",
+            "96ebe4a1b522",
+            "121f5eaa52a4",
+            "306fcb72ddc5",
+            "8fa922dbb034",
+            "5073e6d40272"
           ]
         }
       },
@@ -233,7 +289,7 @@
         "id": "stopped",
         "observation": {
           "sender": [],
-          "payloads": ["bdc95c0ab9bc", "519cd29a30fa", "5f7bd3b1a756", "61f865a194bf"],
+          "payloads": ["eef1ee3c2773", "b6a25eca1497", "1d8fe76c29c7", "3582e201880e"],
           "settlements": {
             "start": "eb79a9b3682a",
             "cutover": "f2af146a9f12",
@@ -241,15 +297,15 @@
           },
           "state": "91e9a84a208f",
           "effects": [
-            "8f638d83589d",
-            "32ad88ec13e3",
-            "8f638d83589d",
-            "8f638d83589d",
-            "cfd2555aae81",
-            "8f638d83589d",
-            "32ad88ec13e3",
-            "8f638d83589d",
-            "32ad88ec13e3"
+            "4a27571a011a",
+            "18399efbe63d",
+            "4e7ae49574b8",
+            "1e1067bda316",
+            "96ebe4a1b522",
+            "121f5eaa52a4",
+            "306fcb72ddc5",
+            "8fa922dbb034",
+            "5073e6d40272"
           ]
         }
       }

mobile/rpc-foundation/goldens/interruptions-inventory-lifecycle.json

@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "d6c57a5153d915f0a0c0fd9e305cac70b41b7eb8be226fc865227ebf1821e5d1",
   "platform": "darwin",
@@ -13,11 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "602e35a92eec": {
-      "files": []
-    },
-    "b5b30ad54c76": {
+    "13ef648b37c5": {
       "name": "files.list#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -47,13 +45,9 @@
         }
       }
     },
-    "bb65fa195d1c": {
-      "name": "files.list#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}",
-      "sent": 2
-    },
-    "c0821dc354d7": {
+    "32c9018052ba": {
       "name": "files.searchPaths#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -88,8 +82,62 @@
         }
       }
     },
-    "ccb16672d904": {
+    "4d27427720e9": {
       "name": "files.list#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 120,
+        "settledAt": 30120,
+        "error": {
+          "category": "Error",
+          "message": "Request timed out: files.list",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "602e35a92eec": {
+      "files": []
+    },
+    "8db0d1234c94": {
+      "name": "files.searchPaths#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}"
+    },
+    "c9b9d7a9b388": {
+      "name": "files.list#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}"
+    },
+    "d2ad71e601c4": {
+      "status": "fulfilled",
+      "startedAt": 120,
+      "settledAt": 120,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "d831c788243a": {
+      "name": "files.list#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -124,19 +172,6 @@
         }
       }
     },
-    "cd59dd2431e0": {
-      "name": "files.searchPaths#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}",
-      "sent": 1
-    },
-    "d2ad71e601c4": {
-      "status": "fulfilled",
-      "startedAt": 120,
-      "settledAt": 120,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -144,37 +179,6 @@
       "value": {
         "$rpc": "undefined"
       }
-    },
-    "ee88659ed950": {
-      "name": "files.list#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.list"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "rejected",
-        "startedAt": 120,
-        "settledAt": 30120,
-        "error": {
-          "category": "Error",
-          "message": "Request timed out: files.list",
-          "isRpcDeliveryUnknown": true
-        }
-      }
     }
   },
   "recording": {
@@ -183,8 +187,8 @@
       {
         "id": "inventory-lifecycle.timeout:interrupted",
         "observation": {
-          "sender": ["c0821dc354d7", "ee88659ed950"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "4d27427720e9"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a"
@@ -196,8 +200,8 @@
       {
         "id": "inventory-lifecycle.timeout:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "ee88659ed950"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "4d27427720e9"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a"
@@ -209,8 +213,8 @@
       {
         "id": "inventory-lifecycle.disconnect:interrupted",
         "observation": {
-          "sender": ["c0821dc354d7", "b5b30ad54c76"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "13ef648b37c5"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -223,8 +227,8 @@
       {
         "id": "inventory-lifecycle.disconnect:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "b5b30ad54c76"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "13ef648b37c5"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -237,8 +241,8 @@
       {
         "id": "inventory-lifecycle.cutover:interrupted",
         "observation": {
-          "sender": ["c0821dc354d7", "ccb16672d904"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "d831c788243a"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -251,8 +255,8 @@
       {
         "id": "inventory-lifecycle.cutover:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "ccb16672d904"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "d831c788243a"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",

mobile/rpc-foundation/goldens/interruptions-settings-bot-overrides-fulfilled.json

@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "2d5c6dea28aa1a7bb9e4aa14a4c8441527d9ad401ad30161f05ea1f8da836bb2",
   "platform": "darwin",
@@ -13,8 +13,41 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "06eff8247d02": {
+    "1a10a74b4157": {
       "name": "settings.get#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 30000,
+        "error": {
+          "category": "Error",
+          "message": "Request timed out: settings.get",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "1e38f5df2fc6": {
+      "name": "settings.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -49,70 +82,10 @@
         }
       }
     },
-    "090c88478661": {
-      "name": "settings.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "settings.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
     "4f53cda18c2b": [],
-    "5c52bc3f9e55": {
-      "name": "settings.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}",
-      "sent": 1
-    },
-    "7fc945a92540": {
-      "name": "settings.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "settings.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "rejected",
-        "startedAt": 0,
-        "settledAt": 30000,
-        "error": {
-          "category": "Error",
-          "message": "Request timed out: settings.get",
-          "isRpcDeliveryUnknown": true
-        }
-      }
-    },
-    "af6903aed166": {
+    "b6a74921f3bd": {
       "name": "settings.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -142,6 +115,37 @@
         }
       }
     },
+    "c8c77ac17e0a": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "e3973bb12da1": {
+      "name": "settings.get#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -157,8 +161,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.prelude:settings-pending",
         "observation": {
-          "sender": ["090c88478661"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["e3973bb12da1"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -169,8 +173,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.timeout:interrupted",
         "observation": {
-          "sender": ["7fc945a92540"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["1a10a74b4157"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -181,8 +185,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.timeout:settled",
         "observation": {
-          "sender": ["7fc945a92540"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["1a10a74b4157"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -193,8 +197,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.disconnect:interrupted",
         "observation": {
-          "sender": ["af6903aed166"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b6a74921f3bd"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "disconnect": "eb79a9b3682a"
@@ -206,8 +210,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.disconnect:settled",
         "observation": {
-          "sender": ["af6903aed166"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b6a74921f3bd"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "disconnect": "eb79a9b3682a"
@@ -219,8 +223,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.cutover:interrupted",
         "observation": {
-          "sender": ["06eff8247d02"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["1e38f5df2fc6"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "cutover": "eb79a9b3682a"
@@ -232,8 +236,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.cutover:settled",
         "observation": {
-          "sender": ["06eff8247d02"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["1e38f5df2fc6"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "cutover": "eb79a9b3682a"

mobile/rpc-foundation/goldens/inventory-lifecycle.json

@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "3471f5bcd6923c7b8ba3a737bb45b5239689deb78c00e85a828f38a6d6d68a05",
   "platform": "darwin",
@@ -13,8 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "64847315695c": {
+    "2f1953cc0315": {
       "name": "files.list#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -50,13 +51,9 @@
         }
       }
     },
-    "bb65fa195d1c": {
-      "name": "files.list#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}",
-      "sent": 2
-    },
-    "c0821dc354d7": {
+    "32c9018052ba": {
       "name": "files.searchPaths#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -91,10 +88,15 @@
         }
       }
     },
-    "cd59dd2431e0": {
+    "8db0d1234c94": {
       "name": "files.searchPaths#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}"
+    },
+    "c9b9d7a9b388": {
+      "name": "files.list#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}"
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -114,8 +116,8 @@
       {
         "id": "settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a"

mobile/rpc-foundation/goldens/inventory-repeat-query.json

@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "73a468d5c7a51c2dbb7af2642f0050d05d861fce29295460c48d7c51f86bf57f",
   "platform": "darwin",
@@ -16,8 +16,22 @@
     "003a57e2bf31": {
       "files": ["alpha.ts"]
     },
-    "07ed03809186": {
+    "0a86b05a780d": {
+      "status": "fulfilled",
+      "startedAt": 360,
+      "settledAt": 360,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "188d6b5d1ede": {
       "name": "files.searchPaths#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"alpha\",\"limit\":16}}"
+    },
+    "337fb337ee51": {
+      "name": "files.searchPaths#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -55,32 +69,12 @@
         }
       }
     },
-    "0a86b05a780d": {
-      "status": "fulfilled",
-      "startedAt": 360,
-      "settledAt": 360,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "0d4bc47af85a": {
-      "name": "files.searchPaths#3",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"gamma\",\"limit\":16}}",
-      "sent": 3
-    },
     "3642acfe438f": {
       "files": ["beta.ts"]
     },
-    "3b6419fbab75": {
-      "status": "fulfilled",
-      "startedAt": 240,
-      "settledAt": 240,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "6908b2a7adc8": {
+    "38ed199b1d68": {
       "name": "files.searchPaths#3",
+      "ordinal": 5,
       "args": [
         {
           "name": "method",
@@ -106,52 +100,17 @@
         "startedAt": 360
       }
     },
-    "76d5760bc8ba": {
-      "name": "files.searchPaths#2",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"beta\",\"limit\":16}}",
-      "sent": 2
-    },
-    "7e0cf12e6220": {
-      "name": "files.searchPaths#3",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.searchPaths"
-        },
-        {
-          "name": "params",
-          "value": {
-            "limit": 16,
-            "query": "gamma",
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 360,
-        "settledAt": 360,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "files": [
-              {
-                "relativePath": "gamma.ts"
-              }
-            ]
-          }
-        }
+    "3b6419fbab75": {
+      "status": "fulfilled",
+      "startedAt": 240,
+      "settledAt": 240,
+      "value": {
+        "$rpc": "undefined"
       }
     },
-    "a7201fe6aca9": {
+    "ba8fb347c202": {
       "name": "files.searchPaths#2",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -189,10 +148,10 @@
         }
       }
     },
-    "cf1cd4765877": {
-      "name": "files.searchPaths#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"alpha\",\"limit\":16}}",
-      "sent": 1
+    "cd952847d0a9": {
+      "name": "files.searchPaths#3",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"gamma\",\"limit\":16}}"
     },
     "d2ad71e601c4": {
       "status": "fulfilled",
@@ -202,6 +161,46 @@
         "$rpc": "undefined"
       }
     },
+    "e31cf55b5026": {
+      "name": "files.searchPaths#3",
+      "ordinal": 5,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.searchPaths"
+        },
+        {
+          "name": "params",
+          "value": {
+            "limit": 16,
+            "query": "gamma",
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 360,
+        "settledAt": 360,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "files": [
+              {
+                "relativePath": "gamma.ts"
+              }
+            ]
+          }
+        }
+      }
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -209,6 +208,11 @@
       "value": {
         "$rpc": "undefined"
       }
+    },
+    "ee0e86e2b5aa": {
+      "name": "files.searchPaths#2",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"beta\",\"limit\":16}}"
     }
   },
   "recording": {
@@ -217,8 +221,8 @@
       {
         "id": "cached-alpha",
         "observation": {
-          "sender": ["07ed03809186", "a7201fe6aca9", "6908b2a7adc8"],
-          "payloads": ["cf1cd4765877", "76d5760bc8ba", "0d4bc47af85a"],
+          "sender": ["337fb337ee51", "ba8fb347c202", "38ed199b1d68"],
+          "payloads": ["188d6b5d1ede", "ee0e86e2b5aa", "cd952847d0a9"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "alpha": "eb79a9b3682a",
@@ -233,8 +237,8 @@
       {
         "id": "stale-search-ignored",
         "observation": {
-          "sender": ["07ed03809186", "a7201fe6aca9", "7e0cf12e6220"],
-          "payloads": ["cf1cd4765877", "76d5760bc8ba", "0d4bc47af85a"],
+          "sender": ["337fb337ee51", "ba8fb347c202", "e31cf55b5026"],
+          "payloads": ["188d6b5d1ede", "ee0e86e2b5aa", "cd952847d0a9"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "alpha": "eb79a9b3682a",
@@ -249,8 +253,8 @@
       {
         "id": "cached-beta-cancels-debounce",
         "observation": {
-          "sender": ["07ed03809186", "a7201fe6aca9", "7e0cf12e6220"],
-          "payloads": ["cf1cd4765877", "76d5760bc8ba", "0d4bc47af85a"],
+          "sender": ["337fb337ee51", "ba8fb347c202", "e31cf55b5026"],
+          "payloads": ["188d6b5d1ede", "ee0e86e2b5aa", "cd952847d0a9"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "alpha": "eb79a9b3682a",

mobile/rpc-foundation/goldens/lifecycle-inventory-lifecycle.json

@@ -3,9 +3,9 @@
   "family": "legacy-inventory",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "262eaad263a45aa13ec5b27c12b59946b12c202474229fff7a5727dba6d702ca",
   "scenarioSha256": "46bbafcc57fe2e3aee41a14bc26a0375b7b56e58030705fe4c28841a272b2560",
   "platform": "darwin",
@@ -13,38 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "356af7179c37": {
-      "name": "files.searchPaths#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.searchPaths"
-        },
-        {
-          "name": "params",
-          "value": {
-            "limit": 16,
-            "query": "old",
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 120
-      }
-    },
-    "602e35a92eec": {
-      "files": []
-    },
-    "64847315695c": {
+    "2f1953cc0315": {
       "name": "files.list#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -80,38 +51,9 @@
         }
       }
     },
-    "b2434f1de9f6": {
-      "name": "files.list#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "files.list"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:A"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 120
-      }
-    },
-    "bb65fa195d1c": {
-      "name": "files.list#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}",
-      "sent": 2
-    },
-    "c0821dc354d7": {
+    "32c9018052ba": {
       "name": "files.searchPaths#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -146,10 +88,46 @@
         }
       }
     },
-    "cd59dd2431e0": {
+    "602e35a92eec": {
+      "files": []
+    },
+    "8db0d1234c94": {
       "name": "files.searchPaths#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"files.searchPaths\",\"params\":{\"worktree\":\"id:A\",\"query\":\"old\",\"limit\":16}}"
+    },
+    "bf6281c52e28": {
+      "name": "files.searchPaths#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.searchPaths"
+        },
+        {
+          "name": "params",
+          "value": {
+            "limit": 16,
+            "query": "old",
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 120
+      }
+    },
+    "c9b9d7a9b388": {
+      "name": "files.list#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"files.list\",\"params\":{\"worktree\":\"id:A\"}}"
     },
     "d2ad71e601c4": {
       "status": "fulfilled",
@@ -159,6 +137,32 @@
         "$rpc": "undefined"
       }
     },
+    "ea94d4508bba": {
+      "name": "files.list#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "files.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:A"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 120
+      }
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -177,8 +181,8 @@
       {
         "id": "inventory-lifecycle.reset-before-1:lifecycle-boundary",
         "observation": {
-          "sender": ["356af7179c37"],
-          "payloads": ["cd59dd2431e0"],
+          "sender": ["bf6281c52e28"],
+          "payloads": ["8db0d1234c94"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -191,8 +195,8 @@
       {
         "id": "inventory-lifecycle.reset-before-1:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -205,8 +209,8 @@
       {
         "id": "inventory-lifecycle.reset-after-1:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "b2434f1de9f6"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "ea94d4508bba"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -219,8 +223,8 @@
       {
         "id": "inventory-lifecycle.reset-after-1:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -233,8 +237,8 @@
       {
         "id": "inventory-lifecycle.reset-before-2:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "b2434f1de9f6"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "ea94d4508bba"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -247,8 +251,8 @@
       {
         "id": "inventory-lifecycle.reset-before-2:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -261,8 +265,8 @@
       {
         "id": "inventory-lifecycle.reset-after-2:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -275,8 +279,8 @@
       {
         "id": "inventory-lifecycle.reset-after-2:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -289,8 +293,8 @@
       {
         "id": "inventory-lifecycle.unmount-before-1:lifecycle-boundary",
         "observation": {
-          "sender": ["356af7179c37"],
-          "payloads": ["cd59dd2431e0"],
+          "sender": ["bf6281c52e28"],
+          "payloads": ["8db0d1234c94"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -303,8 +307,8 @@
       {
         "id": "inventory-lifecycle.unmount-before-1:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -317,8 +321,8 @@
       {
         "id": "inventory-lifecycle.unmount-before-1:remounted",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -332,8 +336,8 @@
       {
         "id": "inventory-lifecycle.unmount-after-1:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "b2434f1de9f6"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "ea94d4508bba"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -346,8 +350,8 @@
       {
         "id": "inventory-lifecycle.unmount-after-1:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -360,8 +364,8 @@
       {
         "id": "inventory-lifecycle.unmount-after-1:remounted",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -375,8 +379,8 @@
       {
         "id": "inventory-lifecycle.unmount-before-2:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "b2434f1de9f6"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "ea94d4508bba"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -389,8 +393,8 @@
       {
         "id": "inventory-lifecycle.unmount-before-2:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -403,8 +407,8 @@
       {
         "id": "inventory-lifecycle.unmount-before-2:remounted",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -418,8 +422,8 @@
       {
         "id": "inventory-lifecycle.unmount-after-2:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -432,8 +436,8 @@
       {
         "id": "inventory-lifecycle.unmount-after-2:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -446,8 +450,8 @@
       {
         "id": "inventory-lifecycle.unmount-after-2:remounted",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -461,8 +465,8 @@
       {
         "id": "inventory-lifecycle.blur-before-1:lifecycle-boundary",
         "observation": {
-          "sender": ["356af7179c37"],
-          "payloads": ["cd59dd2431e0"],
+          "sender": ["bf6281c52e28"],
+          "payloads": ["8db0d1234c94"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -475,8 +479,8 @@
       {
         "id": "inventory-lifecycle.blur-before-1:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -489,8 +493,8 @@
       {
         "id": "inventory-lifecycle.blur-after-1:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "b2434f1de9f6"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "ea94d4508bba"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -503,8 +507,8 @@
       {
         "id": "inventory-lifecycle.blur-after-1:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -517,8 +521,8 @@
       {
         "id": "inventory-lifecycle.blur-before-2:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "b2434f1de9f6"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "ea94d4508bba"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -531,8 +535,8 @@
       {
         "id": "inventory-lifecycle.blur-before-2:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -545,8 +549,8 @@
       {
         "id": "inventory-lifecycle.blur-after-2:lifecycle-boundary",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",
@@ -559,8 +563,8 @@
       {
         "id": "inventory-lifecycle.blur-after-2:settled",
         "observation": {
-          "sender": ["c0821dc354d7", "64847315695c"],
-          "payloads": ["cd59dd2431e0", "bb65fa195d1c"],
+          "sender": ["32c9018052ba", "2f1953cc0315"],
+          "payloads": ["8db0d1234c94", "c9b9d7a9b388"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "old": "eb79a9b3682a",

mobile/rpc-foundation/goldens/lifecycle-settings-bot-overrides-fulfilled.json

@@ -3,9 +3,9 @@
   "family": "settings.bot-overrides",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "fc73116d95985606fe32f22d3f14f434a6d5cd49219416c9fa0f47f971fa6ff0",
   "scenarioSha256": "eb80283956c93849778f23cbabf1dbf83b72744197af4f6f50335b2fc1590d87",
   "platform": "darwin",
@@ -13,8 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "090c88478661": {
-      "name": "settings.get#1",
+    "02740e15d2b5": {
+      "name": "settings.get#2",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -38,44 +39,10 @@
         "startedAt": 0
       }
     },
-    "271aee91b48d": {
-      "name": "settings.get#2",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}",
-      "sent": 2
-    },
     "4f53cda18c2b": [],
-    "5c52bc3f9e55": {
-      "name": "settings.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}",
-      "sent": 1
-    },
-    "7ad8a0996352": {
-      "name": "settings.get#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "settings.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "7ca23c4c946b": {
+    "b0e514c7c334": {
       "name": "settings.get#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -113,7 +80,43 @@
         }
       }
     },
+    "c8c77ac17e0a": {
+      "name": "settings.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "ca63426ad6cf": {
+      "name": "settings.get#2",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
     "d52c8e96e222": ["bot-user"],
+    "e3973bb12da1": {
+      "name": "settings.get#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -129,8 +132,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.prelude:settings-pending",
         "observation": {
-          "sender": ["090c88478661"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["e3973bb12da1"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -141,8 +144,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.reset-before-1:lifecycle-boundary",
         "observation": {
-          "sender": ["090c88478661", "7ad8a0996352"],
-          "payloads": ["5c52bc3f9e55", "271aee91b48d"],
+          "sender": ["e3973bb12da1", "02740e15d2b5"],
+          "payloads": ["c8c77ac17e0a", "ca63426ad6cf"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-reset": "eb79a9b3682a"
@@ -154,8 +157,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.reset-before-1:settled",
         "observation": {
-          "sender": ["7ca23c4c946b", "7ad8a0996352"],
-          "payloads": ["5c52bc3f9e55", "271aee91b48d"],
+          "sender": ["b0e514c7c334", "02740e15d2b5"],
+          "payloads": ["c8c77ac17e0a", "ca63426ad6cf"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-reset": "eb79a9b3682a"
@@ -167,8 +170,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.reset-after-1:lifecycle-boundary",
         "observation": {
-          "sender": ["7ca23c4c946b", "7ad8a0996352"],
-          "payloads": ["5c52bc3f9e55", "271aee91b48d"],
+          "sender": ["b0e514c7c334", "02740e15d2b5"],
+          "payloads": ["c8c77ac17e0a", "ca63426ad6cf"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-reset": "eb79a9b3682a"
@@ -180,8 +183,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.reset-after-1:settled",
         "observation": {
-          "sender": ["7ca23c4c946b", "7ad8a0996352"],
-          "payloads": ["5c52bc3f9e55", "271aee91b48d"],
+          "sender": ["b0e514c7c334", "02740e15d2b5"],
+          "payloads": ["c8c77ac17e0a", "ca63426ad6cf"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-reset": "eb79a9b3682a"
@@ -193,8 +196,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.unmount-before-1:lifecycle-boundary",
         "observation": {
-          "sender": ["090c88478661"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["e3973bb12da1"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-unmount": "eb79a9b3682a"
@@ -206,8 +209,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.unmount-before-1:settled",
         "observation": {
-          "sender": ["7ca23c4c946b"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b0e514c7c334"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-unmount": "eb79a9b3682a"
@@ -219,8 +222,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.unmount-before-1:remounted",
         "observation": {
-          "sender": ["7ca23c4c946b", "7ad8a0996352"],
-          "payloads": ["5c52bc3f9e55", "271aee91b48d"],
+          "sender": ["b0e514c7c334", "02740e15d2b5"],
+          "payloads": ["c8c77ac17e0a", "ca63426ad6cf"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-unmount": "eb79a9b3682a",
@@ -233,8 +236,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.unmount-after-1:lifecycle-boundary",
         "observation": {
-          "sender": ["7ca23c4c946b"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b0e514c7c334"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-unmount": "eb79a9b3682a"
@@ -246,8 +249,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.unmount-after-1:settled",
         "observation": {
-          "sender": ["7ca23c4c946b"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b0e514c7c334"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-unmount": "eb79a9b3682a"
@@ -259,8 +262,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.unmount-after-1:remounted",
         "observation": {
-          "sender": ["7ca23c4c946b", "7ad8a0996352"],
-          "payloads": ["5c52bc3f9e55", "271aee91b48d"],
+          "sender": ["b0e514c7c334", "02740e15d2b5"],
+          "payloads": ["c8c77ac17e0a", "ca63426ad6cf"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-unmount": "eb79a9b3682a",
@@ -273,8 +276,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.blur-before-1:lifecycle-boundary",
         "observation": {
-          "sender": ["090c88478661"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["e3973bb12da1"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-blur": "eb79a9b3682a"
@@ -286,8 +289,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.blur-before-1:settled",
         "observation": {
-          "sender": ["7ca23c4c946b"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b0e514c7c334"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-blur": "eb79a9b3682a"
@@ -299,8 +302,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.blur-after-1:lifecycle-boundary",
         "observation": {
-          "sender": ["7ca23c4c946b"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b0e514c7c334"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-blur": "eb79a9b3682a"
@@ -312,8 +315,8 @@
       {
         "id": "settings-bot-overrides-fulfilled.blur-after-1:settled",
         "observation": {
-          "sender": ["7ca23c4c946b"],
-          "payloads": ["5c52bc3f9e55"],
+          "sender": ["b0e514c7c334"],
+          "payloads": ["c8c77ac17e0a"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "lifecycle-blur": "eb79a9b3682a"

mobile/rpc-foundation/goldens/linear-select-workspace.json

@@ -3,9 +3,9 @@
   "family": "linear.select-workspace-picker",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "b65996c152b632d553a31e07e31ea5c76f998eada42cf0966923d730da21908f",
   "scenarioSha256": "b6eb40d9a91c89179483afec93fbc121b99ef679d3b2433575b26694d0c577d5",
   "platform": "darwin",
@@ -13,8 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "06776b3d9986": {
+    "2a8d45397a3b": {
       "name": "linear.selectWorkspace#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -52,8 +53,27 @@
       "selectedWorkspaceId": "workspace-b",
       "teamCount": 0
     },
-    "4a23506ae3dc": {
+    "5100209812a4": {
+      "name": "linear.context-reloaded",
+      "ordinal": 3,
+      "value": {
+        "contextLoads": 1
+      }
+    },
+    "87e48df4867a": {
       "name": "linear.selectWorkspace#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.selectWorkspace\",\"params\":{\"workspaceId\":\"workspace-b\"}}"
+    },
+    "d2ade472a8ba": {
+      "contextLoads": 1,
+      "error": "",
+      "selectedWorkspaceId": "workspace-b",
+      "teamCount": 0
+    },
+    "dc6af816d203": {
+      "name": "linear.selectWorkspace#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -77,24 +97,6 @@
         "startedAt": 0
       }
     },
-    "c97ff66588a1": {
-      "name": "linear.context-reloaded",
-      "value": {
-        "contextLoads": 1
-      },
-      "sent": 1
-    },
-    "d2ade472a8ba": {
-      "contextLoads": 1,
-      "error": "",
-      "selectedWorkspaceId": "workspace-b",
-      "teamCount": 0
-    },
-    "ea687d1f2a99": {
-      "name": "linear.selectWorkspace#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.selectWorkspace\",\"params\":{\"workspaceId\":\"workspace-b\"}}",
-      "sent": 1
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -110,8 +112,8 @@
       {
         "id": "selected",
         "observation": {
-          "sender": ["4a23506ae3dc"],
-          "payloads": ["ea687d1f2a99"],
+          "sender": ["dc6af816d203"],
+          "payloads": ["87e48df4867a"],
           "settlements": {
             "select-b": "eb79a9b3682a"
           },
@@ -122,13 +124,13 @@
       {
         "id": "switched",
         "observation": {
-          "sender": ["06776b3d9986"],
-          "payloads": ["ea687d1f2a99"],
+          "sender": ["2a8d45397a3b"],
+          "payloads": ["87e48df4867a"],
           "settlements": {
             "select-b": "eb79a9b3682a"
           },
           "state": "d2ade472a8ba",
-          "effects": ["c97ff66588a1"]
+          "effects": ["5100209812a4"]
         }
       }
     ]

mobile/rpc-foundation/goldens/live-worktree-name-stream.json

@@ -3,9 +3,9 @@
   "family": "live-worktree-name",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "8e41c8624b9b6185e447cee3590a851ab88b6b1ee1d632af90e3a771a90310be",
   "scenarioSha256": "056abf42b34537025fed30a4401bd465c93bc21558babb826f21b5c803b487eb",
   "platform": "darwin",
@@ -13,49 +13,35 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "0861c192faf1": {
+    "0c439cbde351": {
       "name": "worktree.show#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-1::/work/feature\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.show"
+        },
+        {
+          "name": "params",
+          "value": {
+            "worktree": "id:repo-1::/work/feature"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
     },
-    "0dcafb9453a6": {
-      "name": "runtime.clientEvents.unsubscribe#2",
-      "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-2\"}}",
-      "sent": 3
-    },
-    "56c66d671d13": {
-      "name": "runtime.clientEvents.subscribe#2",
-      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}",
-      "sent": 2
-    },
-    "592ccd522724": {
-      "crash": {
-        "$rpc": "null"
-      },
-      "name": "Feature Work Renamed",
-      "resolution": "present"
-    },
-    "767a3f460b84": {
-      "name": "worktree.show#3",
-      "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-1::/work/feature\"}}",
-      "sent": 3
-    },
-    "7926694cda85": {
-      "crash": {
-        "$rpc": "null"
-      },
-      "name": "Feature Work",
-      "resolution": "present"
-    },
-    "89ff819afc4f": {
-      "crash": {
-        "$rpc": "null"
-      },
-      "name": "Feature Work Replayed",
-      "resolution": "present"
-    },
-    "94437e18f7e8": {
+    "12087a0dcffa": {
       "name": "worktree.show#1",
+      "ordinal": 2,
       "args": [
         {
           "name": "method",
@@ -90,49 +76,9 @@
         }
       }
     },
-    "a6dad5b3250f": {
-      "name": "worktree.show#2",
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.show"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo-1::/work/feature"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-3",
-          "ok": true,
-          "result": {
-            "worktree": {
-              "displayName": "Feature Work Renamed",
-              "worktreeId": "repo-1::/work/feature"
-            }
-          }
-        }
-      }
-    },
-    "b17f8702145e": {
-      "name": "worktree.show#2",
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-1::/work/feature\"}}",
-      "sent": 2
-    },
-    "b3c977d010c6": {
+    "3eb45ef8bb4e": {
       "name": "worktree.show#3",
+      "ordinal": 8,
       "args": [
         {
           "name": "method",
@@ -167,18 +113,14 @@
         }
       }
     },
-    "bbdf51d110d4": {
-      "name": "runtime.clientEvents.unsubscribe#1",
-      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}",
-      "sent": 2
+    "5821a3facfa3": {
+      "name": "runtime.clientEvents.unsubscribe#2",
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-2\"}}"
     },
-    "bdc95c0ab9bc": {
-      "name": "runtime.clientEvents.subscribe#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}",
-      "sent": 0
-    },
-    "c7ea51c18a03": {
-      "name": "worktree.show#1",
+    "585b33d6e851": {
+      "name": "worktree.show#2",
+      "ordinal": 4,
       "args": [
         {
           "name": "method",
@@ -198,10 +140,62 @@
         }
       ],
       "settlement": {
-        "status": "pending",
-        "startedAt": 0
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-3",
+          "ok": true,
+          "result": {
+            "worktree": {
+              "displayName": "Feature Work Renamed",
+              "worktreeId": "repo-1::/work/feature"
+            }
+          }
+        }
       }
     },
+    "592ccd522724": {
+      "crash": {
+        "$rpc": "null"
+      },
+      "name": "Feature Work Renamed",
+      "resolution": "present"
+    },
+    "7926694cda85": {
+      "crash": {
+        "$rpc": "null"
+      },
+      "name": "Feature Work",
+      "resolution": "present"
+    },
+    "82540afebff7": {
+      "name": "runtime.clientEvents.unsubscribe#1",
+      "ordinal": 7,
+      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}"
+    },
+    "89ff819afc4f": {
+      "crash": {
+        "$rpc": "null"
+      },
+      "name": "Feature Work Replayed",
+      "resolution": "present"
+    },
+    "9aeda3227a99": {
+      "name": "worktree.show#2",
+      "ordinal": 5,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-1::/work/feature\"}}"
+    },
+    "c4d8b2697077": {
+      "name": "runtime.clientEvents.subscribe#2",
+      "ordinal": 6,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}"
+    },
+    "d3fd2d2ea215": {
+      "name": "worktree.show#1",
+      "ordinal": 3,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-1::/work/feature\"}}"
+    },
     "dcfa9a8e959c": {
       "crash": {
         "$rpc": "null"
@@ -216,6 +210,16 @@
       "value": {
         "$rpc": "undefined"
       }
+    },
+    "ec05934b1f89": {
+      "name": "worktree.show#3",
+      "ordinal": 9,
+      "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-1::/work/feature\"}}"
+    },
+    "eef1ee3c2773": {
+      "name": "runtime.clientEvents.subscribe#1",
+      "ordinal": 1,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}"
     }
   },
   "recording": {
@@ -224,8 +228,8 @@
       {
         "id": "subscribed",
         "observation": {
-          "sender": ["c7ea51c18a03"],
-          "payloads": ["bdc95c0ab9bc", "0861c192faf1"],
+          "sender": ["0c439cbde351"],
+          "payloads": ["eef1ee3c2773", "d3fd2d2ea215"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -236,8 +240,8 @@
       {
         "id": "ready",
         "observation": {
-          "sender": ["c7ea51c18a03"],
-          "payloads": ["bdc95c0ab9bc", "0861c192faf1"],
+          "sender": ["0c439cbde351"],
+          "payloads": ["eef1ee3c2773", "d3fd2d2ea215"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -248,8 +252,8 @@
       {
         "id": "named",
         "observation": {
-          "sender": ["94437e18f7e8"],
-          "payloads": ["bdc95c0ab9bc", "0861c192faf1"],
+          "sender": ["12087a0dcffa"],
+          "payloads": ["eef1ee3c2773", "d3fd2d2ea215"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -260,8 +264,8 @@
       {
         "id": "refreshed",
         "observation": {
-          "sender": ["94437e18f7e8", "a6dad5b3250f"],
-          "payloads": ["bdc95c0ab9bc", "0861c192faf1", "b17f8702145e"],
+          "sender": ["12087a0dcffa", "585b33d6e851"],
+          "payloads": ["eef1ee3c2773", "d3fd2d2ea215", "9aeda3227a99"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -272,13 +276,13 @@
       {
         "id": "re-subscribed",
         "observation": {
-          "sender": ["94437e18f7e8", "a6dad5b3250f"],
+          "sender": ["12087a0dcffa", "585b33d6e851"],
           "payloads": [
-            "bdc95c0ab9bc",
-            "0861c192faf1",
-            "b17f8702145e",
-            "56c66d671d13",
-            "bbdf51d110d4"
+            "eef1ee3c2773",
+            "d3fd2d2ea215",
+            "9aeda3227a99",
+            "c4d8b2697077",
+            "82540afebff7"
           ],
           "settlements": {
             "mount": "eb79a9b3682a",
@@ -291,14 +295,14 @@
       {
         "id": "replayed",
         "observation": {
-          "sender": ["94437e18f7e8", "a6dad5b3250f", "b3c977d010c6"],
+          "sender": ["12087a0dcffa", "585b33d6e851", "3eb45ef8bb4e"],
           "payloads": [
-            "bdc95c0ab9bc",
-            "0861c192faf1",
-            "b17f8702145e",
-            "56c66d671d13",
-            "bbdf51d110d4",
-            "767a3f460b84"
+            "eef1ee3c2773",
+            "d3fd2d2ea215",
+            "9aeda3227a99",
+            "c4d8b2697077",
+            "82540afebff7",
+            "ec05934b1f89"
           ],
           "settlements": {
             "mount": "eb79a9b3682a",
@@ -311,15 +315,15 @@
       {
         "id": "unmounted",
         "observation": {
-          "sender": ["94437e18f7e8", "a6dad5b3250f", "b3c977d010c6"],
+          "sender": ["12087a0dcffa", "585b33d6e851", "3eb45ef8bb4e"],
           "payloads": [
-            "bdc95c0ab9bc",
-            "0861c192faf1",
-            "b17f8702145e",
-            "56c66d671d13",
-            "bbdf51d110d4",
-            "767a3f460b84",
-            "0dcafb9453a6"
+            "eef1ee3c2773",
+            "d3fd2d2ea215",
+            "9aeda3227a99",
+            "c4d8b2697077",
+            "82540afebff7",
+            "ec05934b1f89",
+            "5821a3facfa3"
           ],
           "settlements": {
             "mount": "eb79a9b3682a",

mobile/rpc-foundation/goldens/matrix-agentsession.structured-launch-agentsession.createsupport-1.json

@@ -3,9 +3,9 @@
   "family": "agentSession.structured-launch",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "d340697a64a198066b1037a550afb9a0de7507246a545901d2fc0a23407f38d6",
   "scenarioSha256": "211e3780edc0ff5fa0529c0de0e8bc2fd746a19c8a6b4e49900f6c4e56d53f7c",
   "platform": "darwin",
@@ -13,8 +13,124 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "03bae1ffdae6": {
+    "04f63acf891a": {
+      "launched": {
+        "kind": "unsupported",
+        "reason": {
+          "$rpc": "undefined"
+        }
+      }
+    },
+    "0dd78669f08d": {
       "name": "agentSession.createSupport#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "agentSession.createSupport"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "claude",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": ""
+          },
+          "id": "frame-1",
+          "ok": false
+        }
+      }
+    },
+    "1554c780f755": {
+      "name": "agentSession.createSupport#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "agentSession.createSupport"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "claude",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "error": "inner refused",
+            "ok": false
+          }
+        }
+      }
+    },
+    "25ff00540c46": {
+      "name": "agentSession.createSupport#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "agentSession.createSupport"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "claude",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "error": "refused"
+          }
+        }
+      }
+    },
+    "27cc7a2b58c9": {
+      "name": "agentSession.createSupport#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -50,16 +166,23 @@
         }
       }
     },
-    "04f63acf891a": {
-      "launched": {
-        "kind": "unsupported",
-        "reason": {
-          "$rpc": "undefined"
-        }
+    "2c227fd1941f": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "kind": "unsupported"
       }
     },
-    "0972c78c3d52": {
+    "551313dcc738": {
+      "launched": {
+        "kind": "unsupported",
+        "reason": "remote"
+      }
+    },
+    "553200ba8c0f": {
       "name": "agentSession.createSupport#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -86,203 +209,21 @@
         "value": {
           "error": {
             "code": "refused",
-            "message": ""
+            "message": "outer refused"
           },
           "id": "frame-1",
           "ok": false
         }
       }
     },
-    "2c227fd1941f": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "kind": "unsupported"
-      }
-    },
-    "3db129933d79": {
+    "568aa5cfc6b5": {
       "name": "agentSession.createSupport#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"agentSession.createSupport\",\"params\":{\"worktree\":\"id:workspace-1\",\"agent\":\"claude\"}}",
-      "sent": 1
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"agentSession.createSupport\",\"params\":{\"worktree\":\"id:workspace-1\",\"agent\":\"claude\"}}"
     },
-    "551313dcc738": {
-      "launched": {
-        "kind": "unsupported",
-        "reason": "remote"
-      }
-    },
-    "70998d5a1f56": {
-      "name": "agentSession.createSupport#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "agentSession.createSupport"
-        },
-        {
-          "name": "params",
-          "value": {
-            "agent": "claude",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "$rpc": "null"
-          }
-        }
-      }
-    },
-    "99caa4276b06": {
-      "name": "agentSession.createSupport#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "agentSession.createSupport"
-        },
-        {
-          "name": "params",
-          "value": {
-            "agent": "claude",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "method_not_found",
-            "message": "Unknown method"
-          },
-          "id": "frame-1",
-          "ok": false
-        }
-      }
-    },
-    "add0a607a4c6": {
-      "name": "agentSession.createSupport#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "agentSession.createSupport"
-        },
-        {
-          "name": "params",
-          "value": {
-            "agent": "claude",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "error": "refused"
-          }
-        }
-      }
-    },
-    "af6b02a86254": {
-      "name": "agentSession.createSupport#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "agentSession.createSupport"
-        },
-        {
-          "name": "params",
-          "value": {
-            "agent": "claude",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "error": "inner refused",
-            "ok": false
-          }
-        }
-      }
-    },
-    "b5992e9c9c01": {
-      "name": "agentSession.createSupport#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "agentSession.createSupport"
-        },
-        {
-          "name": "params",
-          "value": {
-            "agent": "claude",
-            "worktree": "id:workspace-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true
-        }
-      }
-    },
-    "bef30d717da6": {
+    "57e0653db3e3": {
       "name": "agentSession.createSupport#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -316,8 +257,44 @@
         }
       }
     },
-    "c0c67a317e23": {
+    "8201501565d9": {
       "name": "agentSession.createSupport#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "agentSession.createSupport"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "claude",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "$rpc": "null"
+          }
+        }
+      }
+    },
+    "a4da7b5347e4": {
+      "name": "agentSession.createSupport#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -348,17 +325,41 @@
         }
       }
     },
-    "dd51c5566f19": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "kind": "unsupported",
-        "reason": "remote"
+    "be9e3b9ce2e7": {
+      "name": "agentSession.createSupport#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "agentSession.createSupport"
+        },
+        {
+          "name": "params",
+          "value": {
+            "agent": "claude",
+            "worktree": "id:workspace-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true
+        }
       }
     },
-    "e4a3b2c6a246": {
+    "da841ebfb6b9": {
       "name": "agentSession.createSupport#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -389,24 +390,18 @@
         }
       }
     },
-    "f0bb9de9827c": {
+    "dd51c5566f19": {
       "status": "fulfilled",
       "startedAt": 0,
       "settledAt": 0,
       "value": {
         "kind": "unsupported",
-        "reason": {
-          "$rpc": "undefined"
-        }
+        "reason": "remote"
       }
     },
-    "f40adca316f9": {
-      "launched": {
-        "kind": "unsupported"
-      }
-    },
-    "f698ccf3773d": {
+    "efee3e1e1620": {
       "name": "agentSession.createSupport#1",
+      "ordinal": 1,
       "args": [
         {
           "name": "method",
@@ -432,13 +427,29 @@
         "settledAt": 0,
         "value": {
           "error": {
-            "code": "refused",
-            "message": "outer refused"
+            "code": "method_not_found",
+            "message": "Unknown method"
           },
           "id": "frame-1",
           "ok": false
         }
       }
+    },
+    "f0bb9de9827c": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "kind": "unsupported",
+        "reason": {
+          "$rpc": "undefined"
+        }
+      }
+    },
+    "f40adca316f9": {
+      "launched": {
+        "kind": "unsupported"
+      }
     }
   },
   "recording": {
@@ -447,8 +458,8 @@
       {
         "id": "structured-launch-unsupported.normal:unsupported",
         "observation": {
-          "sender": ["bef30d717da6"],
-          "payloads": ["3db129933d79"],
+          "sender": ["57e0653db3e3"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "dd51c5566f19"
           },
@@ -459,8 +470,8 @@
       {
         "id": "structured-launch-unsupported.result-absent:unsupported",
         "observation": {
-          "sender": ["b5992e9c9c01"],
-          "payloads": ["3db129933d79"],
+          "sender": ["be9e3b9ce2e7"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "f0bb9de9827c"
           },
@@ -471,8 +482,8 @@
       {
         "id": "structured-launch-unsupported.result-null:unsupported",
         "observation": {
-          "sender": ["70998d5a1f56"],
-          "payloads": ["3db129933d79"],
+          "sender": ["8201501565d9"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "f0bb9de9827c"
           },
@@ -483,8 +494,8 @@
       {
         "id": "structured-launch-unsupported.inner-ok-missing:unsupported",
         "observation": {
-          "sender": ["add0a607a4c6"],
-          "payloads": ["3db129933d79"],
+          "sender": ["25ff00540c46"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "f0bb9de9827c"
           },
@@ -495,8 +506,8 @@
       {
         "id": "structured-launch-unsupported.inner-false-string-error:unsupported",
         "observation": {
-          "sender": ["af6b02a86254"],
-          "payloads": ["3db129933d79"],
+          "sender": ["1554c780f755"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "f0bb9de9827c"
           },
@@ -507,8 +518,8 @@
       {
         "id": "structured-launch-unsupported.inner-false-object-error:unsupported",
         "observation": {
-          "sender": ["03bae1ffdae6"],
-          "payloads": ["3db129933d79"],
+          "sender": ["27cc7a2b58c9"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "f0bb9de9827c"
           },
@@ -519,8 +530,8 @@
       {
         "id": "structured-launch-unsupported.outer-refused:unsupported",
         "observation": {
-          "sender": ["f698ccf3773d"],
-          "payloads": ["3db129933d79"],
+          "sender": ["553200ba8c0f"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "2c227fd1941f"
           },
@@ -531,8 +542,8 @@
       {
         "id": "structured-launch-unsupported.outer-refused-no-message:unsupported",
         "observation": {
-          "sender": ["0972c78c3d52"],
-          "payloads": ["3db129933d79"],
+          "sender": ["0dd78669f08d"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "2c227fd1941f"
           },
@@ -543,8 +554,8 @@
       {
         "id": "structured-launch-unsupported.method-not-found:unsupported",
         "observation": {
-          "sender": ["99caa4276b06"],
-          "payloads": ["3db129933d79"],
+          "sender": ["efee3e1e1620"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "2c227fd1941f"
           },
@@ -555,8 +566,8 @@
       {
         "id": "structured-launch-unsupported.transport-rejection:unsupported",
         "observation": {
-          "sender": ["e4a3b2c6a246"],
-          "payloads": ["3db129933d79"],
+          "sender": ["da841ebfb6b9"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "2c227fd1941f"
           },
@@ -567,8 +578,8 @@
       {
         "id": "structured-launch-unsupported.transport-rejection-no-message:unsupported",
         "observation": {
-          "sender": ["c0c67a317e23"],
-          "payloads": ["3db129933d79"],
+          "sender": ["a4da7b5347e4"],
+          "payloads": ["568aa5cfc6b5"],
           "settlements": {
             "claude": "2c227fd1941f"
           },

mobile/rpc-foundation/goldens/matrix-aivault.history-aivault.listsessions-1.json

@@ -3,9 +3,9 @@
   "family": "aiVault.history",
   "namedDeltas": [],
   "runnerVersion": 1,
-  "baseline": "e7206f62a827f4fe0a2badf3eecd2167b8ac4285",
+  "baseline": "9add08bb5943144f5fb0178ab628cdfebe99c22a",
   "lockfileSha256": "788c1234b38a61fc882fca292341fce6690deee9cc6695673b0575cf2c4cf571",
-  "recorderSha256": "b5f4b14e07fc7281b954ff5f16d5803e2dfb1bc2a97dcbe6a0991697a5980c49",
+  "recorderSha256": "d4fa125899cd863c03dbf96657d46b8c7d6c0ccf522b342bc4f164ed1e3becfe",
   "adapterSha256": "7add46922ba5486e56c8acd99a53d083b605f5d98f3cc44ee3cb350ec0406080",
   "scenarioSha256": "efb8d1cd2a2ff0ade4cdc48a1aacec565e33b405bbe95c100b86534cdde49740",
   "platform": "darwin",
@@ -13,238 +13,9 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "1277d47c0e64": {
-      "activeWorktreePath": "/repo/feature",
-      "hostStatusResult": {
-        "$rpc": "null"
-      },
-      "refreshing": false,
-      "scope": "workspace",
-      "screenState": {
-        "kind": "error",
-        "message": "Cannot read properties of undefined (reading 'sessions')"
-      }
-    },
-    "232a27ecb718": {
-      "name": "aiVault.listSessions#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "aiVault.listSessions"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": false,
-            "limit": 500,
-            "scopePaths": ["/repo/feature"]
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "rejected",
-        "startedAt": 0,
-        "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "transport failure",
-          "isRpcDeliveryUnknown": true
-        }
-      }
-    },
-    "23523c413cbd": {
-      "activeWorktreePath": "/repo/feature",
-      "hostStatusResult": {
-        "$rpc": "null"
-      },
-      "refreshing": false,
-      "scope": "workspace",
-      "screenState": {
-        "kind": "error",
-        "message": "Unable to load agent sessions"
-      }
-    },
-    "56c96fec6d08": {
-      "name": "aiVault.listSessions#1",
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}",
-      "sent": 2
-    },
-    "61f76365e23c": {
-      "activeWorktreePath": "/repo/feature",
-      "hostStatusResult": {
-        "$rpc": "null"
-      },
-      "refreshing": false,
-      "scope": "workspace",
-      "screenState": {
-        "kind": "error",
-        "message": "Cannot read properties of null (reading 'sessions')"
-      }
-    },
-    "63954da09bd5": {
-      "name": "aiVault.listSessions#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "aiVault.listSessions"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": false,
-            "limit": 500,
-            "scopePaths": ["/repo/feature"]
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "$rpc": "null"
-          }
-        }
-      }
-    },
-    "698f848e6967": {
-      "activeWorktreePath": "/repo/feature",
-      "hostStatusResult": {
-        "$rpc": "null"
-      },
-      "refreshing": false,
-      "scope": "workspace",
-      "screenState": {
-        "kind": "error",
-        "message": "Unknown method"
-      }
-    },
-    "6e50957443ea": {
-      "name": "status.get#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "status.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-1",
-          "ok": true,
-          "result": {
-            "capabilities": ["aiVault.v1"]
-          }
-        }
-      }
-    },
-    "82e315fc9ae9": {
-      "name": "aiVault.listSessions#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "aiVault.listSessions"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": false,
-            "limit": 500,
-            "scopePaths": ["/repo/feature"]
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "refused",
-            "message": ""
-          },
-          "id": "frame-2",
-          "ok": false
-        }
-      }
-    },
-    "852980e2efc0": {
-      "name": "status.get#1",
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}",
-      "sent": 1
-    },
-    "a07975f2dc20": {
-      "name": "aiVault.listSessions#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "aiVault.listSessions"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": false,
-            "limit": 500,
-            "scopePaths": ["/repo/feature"]
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "error": "refused"
-          }
-        }
-      }
-    },
-    "b439901fb32e": {
+    "03941f1abe9e": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -281,8 +52,9 @@
         }
       }
     },
-    "b4700df437ac": {
+    "04f87f24d8d3": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -304,21 +76,43 @@
         }
       ],
       "settlement": {
-        "status": "fulfilled",
+        "status": "rejected",
         "startedAt": 0,
         "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "method_not_found",
-            "message": "Unknown method"
-          },
-          "id": "frame-2",
-          "ok": false
+        "error": {
+          "category": "Error",
+          "message": "",
+          "isRpcDeliveryUnknown": true
         }
       }
     },
-    "b567072e5440": {
+    "1277d47c0e64": {
+      "activeWorktreePath": "/repo/feature",
+      "hostStatusResult": {
+        "$rpc": "null"
+      },
+      "refreshing": false,
+      "scope": "workspace",
+      "screenState": {
+        "kind": "error",
+        "message": "Cannot read properties of undefined (reading 'sessions')"
+      }
+    },
+    "23523c413cbd": {
+      "activeWorktreePath": "/repo/feature",
+      "hostStatusResult": {
+        "$rpc": "null"
+      },
+      "refreshing": false,
+      "scope": "workspace",
+      "screenState": {
+        "kind": "error",
+        "message": "Unable to load agent sessions"
+      }
+    },
+    "3719c54df702": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -359,8 +153,9 @@
         }
       }
     },
-    "c5357db644f1": {
+    "42c8943b1c10": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -382,30 +177,92 @@
         }
       ],
       "settlement": {
-        "status": "rejected",
+        "status": "fulfilled",
         "startedAt": 0,
         "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "",
-          "isRpcDeliveryUnknown": true
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": "outer refused"
+          },
+          "id": "frame-2",
+          "ok": false
         }
       }
     },
-    "c9c67b3f0119": {
-      "activeWorktreePath": "/repo/feature",
-      "hostStatusResult": {
-        "$rpc": "null"
-      },
-      "refreshing": false,
-      "scope": "workspace",
-      "screenState": {
-        "kind": "error",
-        "message": "outer refused"
+    "4a76a58cbdac": {
+      "name": "status.get#1",
+      "ordinal": 1,
+      "args": [
+        {
+          "name": "method",
+          "value": "status.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-1",
+          "ok": true,
+          "result": {
+            "capabilities": ["aiVault.v1"]
+          }
+        }
       }
     },
-    "cb6df2fa8b89": {
+    "4aab3e54002b": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "aiVault.listSessions"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": false,
+            "limit": 500,
+            "scopePaths": ["/repo/feature"]
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "$rpc": "null"
+          }
+        }
+      }
+    },
+    "5bd663d5906f": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -440,26 +297,7 @@
         }
       }
     },
-    "cd739a80b7a8": {
-      "activeWorktreePath": "/repo/feature",
-      "hostStatusResult": {
-        "capabilities": ["aiVault.v1"]
-      },
-      "refreshing": false,
-      "scope": "workspace",
-      "screenState": {
-        "issues": [],
-        "kind": "ready",
-        "sessions": [
-          {
-            "agent": "claude",
-            "cwd": "/repo/feature",
-            "id": "s1"
-          }
-        ]
-      }
-    },
-    "d86e3b3b7ca7": {
+    "61f76365e23c": {
       "activeWorktreePath": "/repo/feature",
       "hostStatusResult": {
         "$rpc": "null"
@@ -468,11 +306,95 @@
       "scope": "workspace",
       "screenState": {
         "kind": "error",
-        "message": "transport failure"
+        "message": "Cannot read properties of null (reading 'sessions')"
       }
     },
-    "e52e185c004d": {
+    "698f848e6967": {
+      "activeWorktreePath": "/repo/feature",
+      "hostStatusResult": {
+        "$rpc": "null"
+      },
+      "refreshing": false,
+      "scope": "workspace",
+      "screenState": {
+        "kind": "error",
+        "message": "Unknown method"
+      }
+    },
+    "768971aec76e": {
       "name": "aiVault.listSessions#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "aiVault.listSessions"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": false,
+            "limit": 500,
+            "scopePaths": ["/repo/feature"]
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "transport failure",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "7bad42e9328e": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "aiVault.listSessions"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": false,
+            "limit": 500,
+            "scopePaths": ["/repo/feature"]
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "method_not_found",
+            "message": "Unknown method"
+          },
+          "id": "frame-2",
+          "ok": false
+        }
+      }
+    },
+    "82f5db4fce4d": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 3,
       "args": [
         {
           "name": "method",
@@ -500,13 +422,135 @@
         "value": {
           "error": {
             "code": "refused",
-            "message": "outer refused"
+            "message": ""
           },
           "id": "frame-2",
           "ok": false
         }
       }
     },
+    "8af00090aaf6": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "aiVault.listSessions"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": false,
+            "limit": 500,
+            "scopePaths": ["/repo/feature"]
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "error": "refused"
+          }
+        }
+      }
+    },
+    "97bd894604ee": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"aiVault.listSessions\",\"params\":{\"limit\":500,\"force\":false,\"scopePaths\":[\"/repo/feature\"]}}"
+    },
+    "c75783a264f1": {
+      "name": "aiVault.listSessions#1",
+      "ordinal": 3,
+      "args": [
+        {
+          "name": "method",
+          "value": "aiVault.listSessions"
+        },
+        {
+          "name": "params",
+          "value": {
+            "force": false,
+            "limit": 500,
+            "scopePaths": ["/repo/feature"]
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true
+        }
+      }
+    },
+    "c9c67b3f0119": {
+      "activeWorktreePath": "/repo/feature",
+      "hostStatusResult": {
+        "$rpc": "null"
+      },
+      "refreshing": false,
+      "scope": "workspace",
+      "screenState": {
+        "kind": "error",
+        "message": "outer refused"
+      }
+    },
+    "cd739a80b7a8": {
+      "activeWorktreePath": "/repo/feature",
+      "hostStatusResult": {
+        "capabilities": ["aiVault.v1"]
+      },
+      "refreshing": false,
+      "scope": "workspace",
+      "screenState": {
+        "issues": [],
+        "kind": "ready",
+        "sessions": [
+          {
+            "agent": "claude",
+            "cwd": "/repo/feature",
+            "id": "s1"
+          }
+        ]
+      }
+    },
+    "d08f74d65ee6": {
+      "name": "status.get#1",
+      "ordinal": 2,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}"
+    },
+    "d86e3b3b7ca7": {
+      "activeWorktreePath": "/repo/feature",
+      "hostStatusResult": {
+        "$rpc": "null"
+      },
+      "refreshing": false,
+      "scope": "workspace",
+      "screenState": {
+        "kind": "error",
+        "message": "transport failure"
+      }
+    },
     "e8d512f74641": {
       "activeWorktreePath": "/repo/feature",
       "hostStatusResult": {
@@ -543,38 +587,6 @@
           "$rpc": "undefined"
         }
       }
-    },
-    "fe995263cbdb": {
-      "name": "aiVault.listSessions#1",
-      "args": [
-        {
-          "name": "method",
-          "value": "aiVault.listSessions"
-        },
-        {
-          "name": "params",
-          "value": {
-            "force": false,
-            "limit": 500,
-            "scopePaths": ["/repo/feature"]
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true
-        }
-      }
     }
   },
   "recording": {
@@ -583,8 +595,8 @@
       {
         "id": "aivault-history-scan-fulfilled.normal:ready",
         "observation": {
-          "sender": ["6e50957443ea", "b567072e5440"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "3719c54df702"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -595,8 +607,8 @@
       {
         "id": "aivault-history-scan-fulfilled.result-absent:ready",
         "observation": {
-          "sender": ["6e50957443ea", "fe995263cbdb"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "c75783a264f1"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -607,8 +619,8 @@
       {
         "id": "aivault-history-scan-fulfilled.result-null:ready",
         "observation": {
-          "sender": ["6e50957443ea", "63954da09bd5"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "4aab3e54002b"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -619,8 +631,8 @@
       {
         "id": "aivault-history-scan-fulfilled.inner-ok-missing:ready",
         "observation": {
-          "sender": ["6e50957443ea", "a07975f2dc20"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "8af00090aaf6"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -631,8 +643,8 @@
       {
         "id": "aivault-history-scan-fulfilled.inner-false-string-error:ready",
         "observation": {
-          "sender": ["6e50957443ea", "cb6df2fa8b89"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "5bd663d5906f"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -643,8 +655,8 @@
       {
         "id": "aivault-history-scan-fulfilled.inner-false-object-error:ready",
         "observation": {
-          "sender": ["6e50957443ea", "b439901fb32e"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "03941f1abe9e"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -655,8 +667,8 @@
       {
         "id": "aivault-history-scan-fulfilled.outer-refused:ready",
         "observation": {
-          "sender": ["6e50957443ea", "e52e185c004d"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "42c8943b1c10"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -667,8 +679,8 @@
       {
         "id": "aivault-history-scan-fulfilled.outer-refused-no-message:ready",
         "observation": {
-          "sender": ["6e50957443ea", "82e315fc9ae9"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "82f5db4fce4d"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -679,8 +691,8 @@
       {
         "id": "aivault-history-scan-fulfilled.method-not-found:ready",
         "observation": {
-          "sender": ["6e50957443ea", "b4700df437ac"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "7bad42e9328e"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -691,8 +703,8 @@
       {
         "id": "aivault-history-scan-fulfilled.transport-rejection:ready",
         "observation": {
-          "sender": ["6e50957443ea", "232a27ecb718"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "768971aec76e"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -703,8 +715,8 @@
       {
         "id": "aivault-history-scan-fulfilled.transport-rejection-no-message:ready",
         "observation": {
-          "sender": ["6e50957443ea", "c5357db644f1"],
-          "payloads": ["852980e2efc0", "56c96fec6d08"],
+          "sender": ["4a76a58cbdac", "04f87f24d8d3"],
+          "payloads": ["d08f74d65ee6", "97bd894604ee"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },