fix(codex): early child completion no longer gets lost - #5723
Conversation
📝 WalkthroughWalkthroughCodexSessionRuntime now retains child-agent lifecycle settlements that arrive before registration. It replays current settlements after registration, preserves interruptions, handles restarts and terminal errors, filters foreign child events, and adds integration coverage for these scenarios. ChangesCodex child lifecycle
Estimated code review effort: 4 (Complex) | ~45 minutes Sequence Diagram(s)sequenceDiagram
participant ChildAgent
participant CodexSessionRuntime
participant ProviderEvent
ChildAgent->>CodexSessionRuntime: send registration or lifecycle notification
CodexSessionRuntime->>CodexSessionRuntime: retain or replay child settlement
CodexSessionRuntime->>ProviderEvent: emit filtered child status or completion
Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
@coderabbitai review |
✅ Action performedReview finished.
|
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@apps/server/src/provider/Layers/CodexSessionRuntime.ts`:
- Around line 1413-1439: Update the unregistered-child notification handling
around toCollabChildSettlement to explicitly process terminal error
notifications with willRetry false, creating a collabAgent/statusChanged
settlement whose status.type is systemError. Remove the corresponding
foreignThreadId from collabChildLiveTurnsRef and prevent stale active state from
being replayed during registration. Add an integration case covering
turn/started, a non-retryable terminal error, and subsequent child registration.
🪄 Autofix
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro Plus
Run ID: 7493a612-8aa7-4590-87e0-3672c96723e4
📒 Files selected for processing (2)
apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.tsapps/server/src/provider/Layers/CodexSessionRuntime.ts
ApprovabilityVerdict: Needs human review This PR adds substantial new state management and event replay mechanisms for multi-agent coordination, beyond a simple bug fix. The changes introduce lifecycle state buffering and replay logic that affect core runtime behavior of the collab system, warranting careful human review. You can customize Macroscope's approvability policy. Learn more. |
What Changed
Why
Codex can emit a child thread's completion or idle notification before either explicit registration signal reaches T3. The runtime correctly suppresses that foreign child traffic from the parent timeline, but previously discarded it, so the later registration event could leave the child displayed as running indefinitely.
This change buffers only compact lifecycle state and never treats an unknown foreign thread as an agent. It complements #5718 while keeping the runtime ordering fix separate from adapter liveness mapping.
Validation
pnpm exec vp test run apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts apps/server/src/provider/Layers/CodexCollabWire.test.ts apps/server/src/provider/Layers/CodexSessionRuntime.test.ts— 38 tests passedvp lintandvp fmt --checkpassed for both changed filespnpm --filter t3 typecheckpassedAll added fixture identifiers, paths, and content are deterministic mock data.
Checklist
Model: GPT-5.6 Sol; harness: Codex in T3 Code.
Note
Fix early child completion getting lost before registration in
makeCodexSessionRuntimetoCollabChildSettlementhelper inCodexSessionRuntime.tsto map child notifications to compact synthetic settlement events.errorwithwillRetry=false) are now treated as child-scoped events, suppressed from the parent timeline, and used to update lifecycle state.CodexCollabRuntime.integration.test.tscovering preregistration replay, duplicate registration, stale settlement avoidance, and related edge cases.Macroscope summarized c73f5a8.
Note
Medium Risk
Touches Codex collab notification ordering and synthetic agent liveness in
CodexSessionRuntime, where subtle race bugs could mis-report child status; scope is focused and heavily covered by new integration tests.Overview
Fixes collab child agents staying running when Codex sends completion, idle, error, or close on a child thread before
thread/startedorsubAgentActivityregisters it. Foreign child traffic is still kept off the parent timeline; the runtime now keeps only a compact latest lifecycle state per unknown foreign thread (viatoCollabChildSettlementandcollabChildLifecycleStatesRef) and replays the matching syntheticcollabAgent/*event right after explicit registration.Newer active / turn/started lifecycle wins over a buffered completion; duplicate registration re-emits the latest settlement instead of leaving the UI on “running”; pre-registration idle is ignored when it would look like a finished run without a live turn; interrupted activity and terminal error paths update the buffered state. Integration tests add a shared mock script helper and cover pre-registration completion, error, idle, duplicate registration, restart, interaction, interruption, and superseded completion ordering.
Reviewed by Cursor Bugbot for commit c73f5a8. Bugbot is set up for automated code reviews on this repo. Configure here.
Summary by CodeRabbit