Skip to content

fix(orchestration): exclude rolled-back work from bounded recovery - #8464

Open
saphid wants to merge 385 commits into
pingdotgg:t3code/codex-turn-mappingfrom
saphid:codex/fix-v2-recovery-scan
Open

fix(orchestration): exclude rolled-back work from bounded recovery#8464
saphid wants to merge 385 commits into
pingdotgg:t3code/codex-turn-mappingfrom
saphid:codex/fix-v2-recovery-scan

Conversation

@saphid

@saphid saphid commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Runtime recovery skips unfinished command, tool and subagent items owned by rolled-back runs. Orphaned items whose run is missing remain recovery candidates. Both SQL and memory selection use the existing bounded recovery API.

Head cdbc6f812 is rebuilt on V2 3aa47e294 with the shared test-only prerequisite #10865. Merge #10865 first; this topic changes three recovery files. The regression includes 1,000 settled shells and one recovery candidate.

Validation: 31 focused projection, recovery and turn-control tests pass across four files. Scoped server typecheck and targeted formatting, lint and diff checks pass. New-head CI is pending. No live database was accessed. SQL retains pending/running outbox recovery; the memory store has no persisted outbox and makes no outbox-parity claim.

Independent review remains unavailable: the direct Claude Opus 5 high launcher exited 1 with expired OAuth before inference. No Claude review occurred.

Targets Orchestrator V2 in #2829. Updated with GPT-6 in Codex/T3.

@coderabbitai

coderabbitai Bot commented Aug 28, 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: 95edbe02-5ef5-4aa8-bf6b-fc452c4cc56d

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

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

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Aug 28, 2026
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from 2d623ac to 37f40d9 Compare August 28, 2026 03:30
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 97c9bf7 to 1f46bcf Compare August 28, 2026 12:45
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from a5eeff5 to 112c206 Compare August 28, 2026 22:53
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 1f46bcf to 3177138 Compare August 28, 2026 23:03
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from a44ab73 to a110e68 Compare August 28, 2026 23:30
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 3177138 to 9be8e77 Compare August 28, 2026 23:47
Comment thread apps/server/src/orchestration-v2/ProjectionStore.ts Outdated
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from a110e68 to 81c6ac9 Compare August 29, 2026 00:13
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 9be8e77 to 8109404 Compare August 29, 2026 00:26
Comment thread apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.ts Outdated
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from 6733253 to 886b8db Compare August 29, 2026 02:40
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 8109404 to 658f2b8 Compare August 29, 2026 02:59
Comment thread apps/server/src/orchestration-v2/ProjectionStore.ts Outdated
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from 886b8db to a7452f6 Compare August 29, 2026 03:08
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 658f2b8 to ba89ee9 Compare August 29, 2026 03:21
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from a26d9ad to d6ed793 Compare August 29, 2026 06:34
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from ba89ee9 to 8efbd88 Compare August 29, 2026 21:48
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from 490318a to 373612e Compare August 30, 2026 00:13
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 8efbd88 to a81d00a Compare August 30, 2026 00:56
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch 8 times, most recently from 877b9de to b82facd Compare September 5, 2026 04:52
- Re-route steering that races completion into idempotent follow-up dispatches
- Preserve scheduled-task attribution and provider ownership history across clients
Port main's pull-request discovery, active thread ordering, async question dismissal, settlement fixes, provider-session import, attachment context, and provider correctness changes into orchestration v2.

Keep the branch's intentional composer and subagent behavior while adopting main's web and mobile fixes. Prevent headless setup terminals from hanging on the color probe, and move the v2 migration block to 050-061 after main claimed 048-049.
Restore the failed-before-start timer guard, align two server fixtures with the reconciled behavior, and remove dead files, exports, and dependencies surfaced by Knip.

Drop the temporary branch push trigger now that the PR is mergeable, so each update runs the pull-request workflow once.
Keep main's batch machine-update banner and update action while preserving the v2 runtime-based environment lock used by draft load balancing.
Adopt TypeScript 7 and Effect rc.112 across orchestration v2, including the TaggedError API migration and updated Effect-aware tests. Restore main's composer-aware scroll-to-end clearance while retaining selected-model settings sync, preview recording transfer, image galleries, desktop context menus, and layout hit targets. Regenerate the lockfile on the upgraded dependency baseline.
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from efd9994 to 6102d00 Compare September 8, 2026 06:23
juliusmarminge and others added 6 commits September 8, 2026 14:26
Advertise bounded socket snapshots and authoritative dispatch validation, omit raw command output and inline file bodies at the wire boundary, and preserve compact status metadata across web and mobile. Add transport-budget coverage for snapshots, resume, commands, legacy import, and projection maintenance.
Restore pinned-thread shelf classification, server-owned unread state, hidden-subagent-safe project ordering, guarded jump hints, draft upload cleanup, and active-provider archive guards across the current and legacy sidebars.

Bring the surrounding current-main sidebar work forward as well: canonical project favicons, stable row layout, thread file drops, account-aware mobile provider badges, and deferred desktop keyring loading.
@saphid
saphid force-pushed the codex/fix-v2-recovery-scan branch from 97d295f to cdbc6f8 Compare September 9, 2026 01:17
@macroscopeapp
macroscopeapp Bot dismissed their stale review September 9, 2026 01:17

Dismissing prior approval to re-evaluate cdbc6f8

@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from 8187b17 to ada72ce Compare September 9, 2026 06:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants