Files
orca/src/main/codex/codex-trust-config-mutation-queue.test.ts
T
Neil 26721bd632 fix(codex): stop blocking the main thread on trust grants (#16441) (#16594)
* fix(codex): stop blocking the main thread on trust grants (#16441)

Codex hook trust was granted by blocking the Electron main thread on
`spawnSync` of a bundled ELECTRON_RUN_AS_NODE entry for the whole
app-server deadline: 15s native, 35s WSL, ~45s on the real-home path
(rebase inspect + repair + grant). Cold start and every Codex pane
launch showed "Not Responding"; the reported event-loop gap was
15,049 ms.

The subprocess only ever existed to donate an event loop to a
deliberately blocked parent — `runCodexHookTrustGrantSession` was
already the real async implementation. Make the callers async and the
fork is unnecessary, so the bridge, the forked entry and its envelope
are deleted along with their build/knip/tsconfig registrations. The CLI
`agent hooks prepare-codex` handler is already async, so it awaits the
in-process session and saves a process spawn per managed-home shell.

`resolveCodexTrustGrantHost` is async too; the WSL identity probe moves
from `execFileSync` to `runProcess`, dropping that file from the
child-process import allowlist. Status reads keep a synchronous
native-only stamp path.

Two invariants that held only because the lane blocked:

- Overlapping capability probes were impossible by construction.
  `GitCapabilityCache`'s dedupe engine is extracted to a shared
  `CapabilityProbeCache` and `CodexAppServerCapabilityCache` now
  inherits it, so concurrent launches against a cold host share one
  app-server session instead of one each.
- Two grants on one `config.toml` could not interleave capture and
  restore. A reentrant per-file lane now serializes the whole install
  sequence (managed, WSL runtime, real-home ensure, legacy sweep) and
  the grant and rebase inside it.

Cold-start work moves off the critical path: retained-home
reconciliation (N sequential sessions) is fire-and-forget behind the
daemon provider, and the startup real-home ensure chains into managed
hook reconciliation instead of blocking app init.

Every preserved semantic is unchanged: never throws, the
ORCA_DISABLE_CODEX_TRUST_RPC kill switch, ledger hits, backfill-pending
and cooldown fallbacks, config rollback on every failure path,
pre-grant self-computed trust removal, the verify-failure taxonomy,
diagnostics and telemetry.

* fix(codex): widen the trust-config lane to every config.toml writer

Review follow-ups on #16441's async trust grant:

- `markCodexProjectTrusted` now runs inside the runtime+system config.toml
  lanes, so a project-trust write can no longer land inside a hook grant's
  capture->restore window and be silently reverted. Its callers await it.
- `install`/`refreshRuntimeUserHooks`/`remove` hold the system config.toml
  lane as well as the runtime one — they promote approvals into
  ~/.codex/config.toml and mirror it back. Lock order is runtime-before-system
  everywhere.
- The real-home ensure chain resumes after a rejection instead of returning
  the same rejected promise to every later pane launch, and resolving the real
  home is now inside the module's never-throws boundary.
- `buildSpawnEnv` awaits inside a cancelable pending-spawn registration, so
  shutdown during the (now long) env build stops the PTY from launching.
  `prepareLocalPtySpawn` generalizes into `awaitCancelableLocalPtySpawn`.
- CapabilityProbeCache drops the test-only `nowMs` passthrough; its probe
  backstop comment now describes what it actually guards.
- Preflight is a plain async function; the trust dispatch in orca-runtime
  collapses into one `markWorkspaceTrustedForAgent`.

* test(codex): exercise the trust-config lane under real concurrency

The async grant makes two pane launches overlap for the first time. These
drive the real modules end to end on real files: a rollback swallowing a
sibling's grant, a markCodexProjectTrusted write landing inside a capture
-> restore window, shared capability-probe dedupe on a cold host, the
host-scoped transient cooldown, and reentrancy from inside an installer.

Each was verified to fail against a deliberately broken implementation
(lane removed, dedupe disabled, cooldown made global, reentrancy pass-
through disabled).

* test(codex): stop hook-service suites spawning the developer's real codex

The forked grant bundle never existed under vitest, so the RPC lane was
unreachable in tests on main. Running it in-process makes these suites
spawn a real `codex app-server` when one is installed: 38 spawns and two
failures in hook-service-runtime-trust-repair on a machine with codex,
green in CI where there is none. Stand in for the missing binary so both
environments exercise the same fallback lane.

* docs(codex): scope the trust-RPC kill switch comment to what it actually gates

The comment read as though the flag forces the fallback lane everywhere. It
gates the managed grant only: the real-home rebase still runs its own
inspect/repair app-server sessions when Orca's insertion shifts a user's hook
positions, and never reads the flag.

Verified by exercise, not by reading — with the flag set, both
inspect-user-hook-trust and repair-user-hook-trust still ran. Pre-existing:
main has no check there either, it just blocked the main thread while doing it.

Widening the flag to cover the rebase is a follow-up; this only stops the
comment promising something the constant does not do.
2026-08-26 16:44:55 -07:00

112 lines
3.8 KiB
TypeScript

import { describe, expect, it } from 'vitest'
import { runExclusivelyForCodexTrustConfig } from './codex-trust-config-mutation-queue'
function deferred(): { promise: Promise<void>; resolve: () => void; reject: (e: unknown) => void } {
let resolve!: () => void
let reject!: (e: unknown) => void
const promise = new Promise<void>((res, rej) => {
resolve = res
reject = rej
})
return { promise, resolve, reject }
}
describe('runExclusivelyForCodexTrustConfig', () => {
// Why: the grant lane runs inside the installer that already owns the file;
// a non-reentrant lane would queue it behind itself and never settle.
it('passes through a nested acquire of a lane the caller already holds', async () => {
const nested = await runExclusivelyForCodexTrustConfig('/a/config.toml', () =>
runExclusivelyForCodexTrustConfig('/a/config.toml', () => Promise.resolve('inner'))
)
expect(nested).toBe('inner')
})
it('still queues an unrelated lane acquired from inside another lane', async () => {
const gate = deferred()
let innerRan = false
const blocking = runExclusivelyForCodexTrustConfig('/b/config.toml', () => gate.promise)
const nested = runExclusivelyForCodexTrustConfig('/a/config.toml', () =>
runExclusivelyForCodexTrustConfig('/b/config.toml', () => {
innerRan = true
return Promise.resolve()
})
)
await Promise.resolve()
expect(innerRan).toBe(false)
gate.resolve()
await blocking
await nested
expect(innerRan).toBe(true)
})
it('runs one mutation at a time per config.toml', async () => {
const order: string[] = []
const first = deferred()
const second = deferred()
const a = runExclusivelyForCodexTrustConfig('/home/.codex/config.toml', async () => {
order.push('a:start')
await first.promise
order.push('a:end')
return 'a'
})
const b = runExclusivelyForCodexTrustConfig('/home/.codex/config.toml', async () => {
order.push('b:start')
await second.promise
order.push('b:end')
return 'b'
})
await Promise.resolve()
expect(order).toEqual(['a:start'])
first.resolve()
await a
second.resolve()
await b
expect(order).toEqual(['a:start', 'a:end', 'b:start', 'b:end'])
})
it('keeps distinct config.toml paths independent', async () => {
const gate = deferred()
let secondRan = false
const blocked = runExclusivelyForCodexTrustConfig('/a/config.toml', () => gate.promise)
await runExclusivelyForCodexTrustConfig('/b/config.toml', async () => {
secondRan = true
})
expect(secondRan).toBe(true)
gate.resolve()
await blocked
})
it('keeps the queue alive after a rejected mutation', async () => {
const failing = runExclusivelyForCodexTrustConfig('/a/config.toml', () =>
Promise.reject(new Error('grant blew up'))
)
await expect(failing).rejects.toThrow('grant blew up')
await expect(
runExclusivelyForCodexTrustConfig('/a/config.toml', () => Promise.resolve('next'))
).resolves.toBe('next')
})
// Why: normalized keys, so a Windows caller passing the other separator or
// case must still land in the same lane as the run it has to wait for.
it('serializes equivalent paths that differ only in normalization', async () => {
const gate = deferred()
let secondStarted = false
const blocked = runExclusivelyForCodexTrustConfig(
String.raw`C:\Users\Alice\.codex\config.toml`,
() => gate.promise
)
const queued = runExclusivelyForCodexTrustConfig('C:/Users/Alice/.codex/config.toml', () => {
secondStarted = true
return Promise.resolve()
})
await Promise.resolve()
expect(secondStarted).toBe(false)
gate.resolve()
await blocked
await queued
expect(secondStarted).toBe(true)
})
})