Skip to content

Fix repeated steering and reliable stop#3903

Open
Quicksaver wants to merge 44 commits into
pingdotgg:mainfrom
Quicksaver:fix/repeated-steering-and-stop
Open

Fix repeated steering and reliable stop#3903
Quicksaver wants to merge 44 commits into
pingdotgg:mainfrom
Quicksaver:fix/repeated-steering-and-stop

Conversation

@Quicksaver

@Quicksaver Quicksaver commented Jul 12, 2026

Copy link
Copy Markdown

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/vitest package extension resolve vite-plus consistently.

What Changed

  • Track the expected user-message id for each local dispatch and acknowledge only that exact projected message, independently of the frozen dispatch snapshot's session status.
  • Wire generated message ids through new-thread, follow-up, and in-turn steering send paths so the composer can re-enable after an acknowledged steer without waiting for a turn or session transition.
  • Resolve root Codex interruptions from a live thread/read request with turns included, selecting the newest in-progress turn by timestamp and falling back to provider response order when timestamps are absent.
  • Honor explicitly requested child turn ids directly without performing root active-turn lookup or fallback.
  • Bound active-turn lookup time, log typed failures and unexpected defects, and fall back to the cached session turn only when the lookup fails.
  • Suppress stale interrupts when a successful live lookup reports no active turn.
  • Add focused regression coverage for consecutive steering, exact-message acknowledgement, timestamp and response-order turn selection, timeout/failure/defect fallback, and successful empty live reads.
  • Enable pnpm's global virtual store, correct the prerelease @effect/vitest package 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.md
  • pnpm exec vp lint apps/web/src/components/ChatView.logic.ts apps/web/src/components/ChatView.logic.test.ts
  • Playwright on isolated ports 5738/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 typecheck remains 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.md
  • pnpm exec vp lint apps/server/src/provider/Layers/CodexSessionRuntime.ts apps/server/src/provider/Layers/CodexInterruptResolution.test.ts
  • pnpm --filter t3 typecheck passed with pre-existing suggestion-level diagnostics

Proof

  • Automated regression coverage in the changed web and server test suites.

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 expectedUserMessageId for 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 call beginLocalDispatch with 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 interruptTurn no longer defaults straight to the cached session activeTurnId. When no explicit turn is passed, it thread/reads with includeTurns, picks the newest inProgress turn (by startedAt, 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.md and focused tests in ChatView.logic.test.ts and new CodexInterruptResolution.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

  • Replaces the heuristic "any latest user message change" acknowledgement logic with exact user message id correlation: a local dispatch is now acknowledged only when the projected messages contain the specific message id generated at send time.
  • Adds resolveCodexInterruptTurnId to read the live provider thread (includeTurns: true) and select the most recent inProgress turn, bounded by a 2-second timeout, instead of relying on a cached activeTurnId.
  • On timeout, failure, or defect, the interrupt falls back to the session's projected active turn id; on a successful read with no active turn, the interrupt is skipped rather than reviving a stale id.
  • Behavioral Change: LocalDispatchSnapshot fields are renamed (latestUserMessageIdexpectedUserMessageId, latestTurnTurnIdlatestTurnId); callers must pass projectedMessages instead of latestUserMessageId to hasServerAcknowledgedLocalDispatch.

Macroscope summarized d7ab3ce.

- 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
@coderabbitai

coderabbitai Bot commented Jul 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: d5042be8-c92c-4c75-93fe-8bd15b61a351

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jul 12, 2026
Comment thread apps/server/src/provider/Layers/CodexSessionRuntime.ts
@macroscopeapp

macroscopeapp Bot commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: 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
Comment thread apps/mobile/app.config.ts
- Use the Quicksaver EAS project id for the OTA endpoint
Comment thread apps/mobile/app.config.ts Outdated
- 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
Comment thread apps/web/src/components/ChatView.logic.ts
Comment thread apps/server/src/provider/Layers/CodexSessionRuntime.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant