feat(bridge): forward rx4 Prefill/Nudge and stuck-tool recovery - #86
Open
undivisible wants to merge 3 commits into
Open
feat(bridge): forward rx4 Prefill/Nudge and stuck-tool recovery#86undivisible wants to merge 3 commits into
undivisible wants to merge 3 commits into
Conversation
Forward empty-turn and stuck-tool RecoveryAction onto the trajectory without bumping the rx4 pin. Current-pin signals (user MessageEnd prefill/nudge text, RetryReason stuck_tool, GuardrailStop turn halt) and forthcoming Event JSON shapes (Prefill, Nudge, StuckTool, Spill, FailureNotice) share the same mapper. Co-authored-by: Max Carter 祁明思 <max@tsc.hk>
clippy::redundant_guards rejected the matches! guard on the recovery MessageEnd arm. Co-authored-by: Max Carter 祁明思 <max@tsc.hk>
undivisible
marked this pull request as ready for review
September 7, 2026 04:12
Bugbot couldn't run - usage limit reachedBugbot is counted against Cursor usage for this user or team, and this run hit a usage or spend limit. A user or team admin can review and increase usage limits in the Cursor dashboard. (requestId: serverGenReqId_b75b72c3-5467-466b-912a-28e2d22f95d1) |
|
Tick the box to add this pull request to the merge queue (same as
|
Bump rx4 to 74698cf (rotary should-fixes) and forward Event::Recovery
{action, reason}, Event::ToolSpill, and ProcessStart/ProcessEnd onto
the trajectory. ToolResult.spill is now the typed spill path.
Co-authored-by: Max Carter 祁明思 <max@tsc.hk>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Host forwarding for rotary should-fixes (
tschk/rotary#184at74698cfb8dc4654336f4710fe9d1a9a14a340699).record_rx4_eventnow maps the landed Event variants:Recovery { action: Prefill, reason }prefillRecovery { action: Nudge, reason }nudgeRecovery { action: Retry, reason }retryRecovery { action: Halt, reason }haltToolSpill { status, locator, original_bytes }spillspilled:N/spill_failed:N+ locatorProcessStart { process_id, program }process_startProcessEnd { process_id, exit_code }process_endToolExecutionEndrecords a string-locator spill only whenToolResult.spillis absent, so typedToolSpillis not doubled.rx4 pin
Bumped to
74698cfb8dc4654336f4710fe9d1a9a14a340699(rotary draft PR 184).ToolResultnow includesspill: Option<SpillNotice>;bound_tool_outputis fail-closed and no longer returnsResult.Tests
typed_recovery_spill_and_process_events_become_trajectory_stepsrx4_typed_recovery_spill_and_process_events_are_recordedValidation
cargo fmt --all -- --checkcargo clippy -p apollo-agent --all-targets --all-features -- -D warningsrotary_bridge+rx4_enginemapping tests