Fix repeated steering and reliable stop#3903
Conversation
- Resolve the provider runtime’s authoritative active Codex turn - Treat projected steer messages as server dispatch acknowledgement - Avoid stale root turn IDs when interrupting for steering - Cover active-turn lookup and running-thread steer behavior
- Resolve active Codex turns from timed, observable thread reads - Match projected steer acknowledgements to the dispatched message - Add realistic regression coverage for interrupt and steer paths
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ 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 |
ApprovabilityVerdict: Needs human review This PR introduces new interrupt resolution logic that queries the live provider thread with timeout/fallback, and changes steering acknowledgement from detecting any user message change to exact message ID matching. These are significant behavioral changes to core real-time agent interaction features that warrant human review. You can customize Macroscope's approvability policy. Learn more. |
- Fall back to provider response order when start times are absent - Cover both mixed timestamp ordering cases
- Merge upstream/main through Android mobile support - Keep Quicksaver Expo ownership in the mobile config - Preserve repeated steering and live Codex interruption behavior - Extract and test active turn ordering and interrupt fallbacks
- Use the Quicksaver EAS project id for the OTA endpoint
- Capture exact message acknowledgement and interrupt routing contracts - Record Codex live-turn selection and fallback safeguards - Reserve branch-specific web and server development ports
…ng-and-stop # Conflicts: # apps/server/src/provider/Layers/CodexSessionRuntime.test.ts # apps/web/src/components/ChatView.logic.ts # apps/web/src/components/ChatView.tsx
- Match dispatched steering IDs across all projected user messages - Read the session fallback only after live Codex lookup failures - Cover multi-client steering and timeout races with regression tests
- Make timeout tests wait for the live lookup explicitly - Clarify replacement and dispatch snapshot naming - Scan projected messages from the latest entry first
- Record assessment fixes and review outcomes - Update validation counts and branch divergence
- Document conflict-resolution guidance for web and Codex runtime changes - Preserve dispatch-correlation and interruption-resolution coverage
- Enable the global virtual store - Correct prerelease package extensions and refresh the lockfile
- Match exact projected messages independently of snapshot status - Cover ready and missing dispatch session status regressions - Document authoritative exact-id acknowledgement
- Log unexpected live thread lookup defects - Fall back to the latest projected active turn - Cover defect recovery in focused interrupt tests
Summary
Allow users to send consecutive steering prompts while a conversation is running and reliably stop the active Codex turn after any number of steers. Steering dispatches clear as soon as the server projects the exact submitted user message, even when the frozen dispatch snapshot has stale or absent session status, while root interruption resolves the provider's live active turn instead of relying on potentially stale projected state.
Explicit child-turn interruptions continue to target the requested child directly. Root lookup is bounded and failure-tolerant: typed failures, timeouts, and unexpected defects fall back to the cached active turn, while a successful read with no active turn suppresses a stale interrupt.
The workspace configuration also enables pnpm's global virtual store and makes the prerelease
@effect/vitestpackage extension resolvevite-plusconsistently.What Changed
thread/readrequest with turns included, selecting the newest in-progress turn by timestamp and falling back to provider response order when timestamps are absent.@effect/vitestpackage extension, and refresh the lockfile.Why
Running conversations could leave the composer busy after steering because acknowledgement depended on turn or session transitions that do not occur for an in-turn steer. After steering, stop could also target a stale cached turn rather than the provider's actual active turn. Together, these behaviors prevented repeated steering and made interruption unreliable precisely when users needed it most.
The pnpm workspace update keeps dependency resolution stable across worktrees and ensures the patched Effect Vitest package receives the runtime dependency it imports.
Validation
pnpm exec vp test apps/web/src/components/ChatView.logic.test.ts apps/server/src/provider/Layers/CodexInterruptResolution.test.ts apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts(71 tests passed)(cd apps/web && pnpm exec vp test run --passWithNoTests --project unit src/components/ChatView.logic.test.ts)(27 tests passed)pnpm exec vp fmt --check apps/web/src/components/ChatView.logic.ts apps/web/src/components/ChatView.logic.test.ts BRANCH_DETAILS.mdpnpm exec vp lint apps/web/src/components/ChatView.logic.ts apps/web/src/components/ChatView.logic.test.ts5738/13778: two consecutive exact-id steers each re-enabled the composer while the turn remained running, and Stop after two later steers settled the thread without a stale completion reply.pnpm --filter @t3tools/web typecheckremains blocked by existing errors in unrelated web files; neither changed source file appears in the failure list.pnpm exec vp test run apps/server/src/provider/Layers/CodexInterruptResolution.test.ts(13 tests passed)pnpm exec vp fmt --check apps/server/src/provider/Layers/CodexSessionRuntime.ts apps/server/src/provider/Layers/CodexInterruptResolution.test.ts BRANCH_DETAILS.mdpnpm exec vp lint apps/server/src/provider/Layers/CodexSessionRuntime.ts apps/server/src/provider/Layers/CodexInterruptResolution.test.tspnpm --filter t3 typecheckpassed with pre-existing suggestion-level diagnosticsProof
Note
Medium Risk
Changes live interrupt targeting and client dispatch acknowledgement for running turns; mistakes could stop the wrong turn or leave the composer busy, though behavior is covered by new regression tests.
Overview
Fixes repeated in-turn steering and reliable Stop while a conversation stays running.
The web client now records an
expectedUserMessageIdfor each outbound send and treats server acknowledgement as seeing that exact user message in projected thread messages—not a generic “latest user message changed” check. Send/steer paths generate the message id first, then callbeginLocalDispatchwith that id, so the composer can unlock after each steer even when turn/session fields stay frozen on the same running turn.On the server, root Codex
interruptTurnno longer defaults straight to the cached sessionactiveTurnId. When no explicit turn is passed, itthread/reads withincludeTurns, picks the newestinProgressturn (bystartedAt, with provider order when timestamps are missing), applies a 2s timeout, and falls back to the projected turn only when lookup fails. A successful read with no active turn returns without interrupting, avoiding stale stops after steers.Adds
BRANCH_DETAILS.mdand focused tests inChatView.logic.test.tsand newCodexInterruptResolution.test.ts.Reviewed by Cursor Bugbot for commit d7ab3ce. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Fix repeated steering acknowledgement and reliable turn interrupt resolution
resolveCodexInterruptTurnIdto read the live provider thread (includeTurns: true) and select the most recentinProgressturn, bounded by a 2-second timeout, instead of relying on a cachedactiveTurnId.LocalDispatchSnapshotfields are renamed (latestUserMessageId→expectedUserMessageId,latestTurnTurnId→latestTurnId); callers must passprojectedMessagesinstead oflatestUserMessageIdtohasServerAcknowledgedLocalDispatch.Macroscope summarized d7ab3ce.