fix(orchestrator): preserve task-step elapsed time across restart - #10051
Draft
saphid wants to merge 388 commits into
Draft
fix(orchestrator): preserve task-step elapsed time across restart#10051saphid wants to merge 388 commits into
saphid wants to merge 388 commits into
Conversation
github-actions
Bot
added
vouch:trusted
![macroscopeapp[bot]](https://avatars.githubusercontent.com/in/900172?s=60&v=4){kind=small}
saphid
marked this pull request as ready for review
September 5, 2026 08:52
Contributor
ApprovabilityVerdict: Approved at Macroscope's review found this PR approvable — This is a focused orchestration bug fix that durably carries per-step elapsed times through ingestion and restart, using optional schema fields and a targeted plan lookup. Existing composer rendering is reused, and tests cover restart persistence and repeated labels without introducing deployment, security, billing, or configuration changes. You can add or adjust custom eligibility rules. Learn more. |
Contributor
Bugbot is paused — on-demand spend limit reachedBugbot uses usage-based billing for this team and has hit its on-demand spend limit. A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue. |
Contributor
|
Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies. |
Contributor
Bugbot is paused — on-demand spend limit reachedBugbot uses usage-based billing for this team and has hit its on-demand spend limit. A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue. |
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
2 times, most recently
from
September 8, 2026 03:31
9242b91 to
3d81172
Compare
saphid
force-pushed
the
work/v2-main-sync-20260905
branch
from
September 8, 2026 04:40
61c87ae to
86e4283
Compare
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
- 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
force-pushed
the
t3code/codex-turn-mapping
branch
from
September 8, 2026 06:23
efd9994 to
6102d00
Compare
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
force-pushed
the
work/v2-main-sync-20260905
branch
from
September 9, 2026 03:34
f0b64d0 to
c238f5c
Compare
github-actions
Bot
added
size:L
saphid
changed the title
saphid
marked this pull request as draft
September 9, 2026 03:35
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
from
September 9, 2026 06:39
8187b17 to
ada72ce
Compare
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
5 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.
Completed task steps lose their elapsed times when the V2 ingestor or client restarts. This PR persists server-derived step timing and carries it into the web/desktop task list, keeping repeated labels independent by stable step ID.
Head
4167fee60is based on current V2fdfadf3d0. Timing reads fetch only the matching plan record rather than loading thread history. Optional fields preserve compatibility with existing stored plans. Includes test-only prerequisite #10865; merge that first.Validation: 53 focused tests across provider ingestion, turn control and session presentation pass, including restarted ingestion, repeated labels, and a guard against loading full thread history for timing. The focused tool-output retention prerequisite test passes. Server, web, mobile and contracts typechecks pass; scoped lint and formatting pass. Current-head visual proof remains pending.
This replaces the obsolete broad main/V2 reconciliation. Its main snapshot is already an ancestor of current V2. Mobile pending creation is present there (72 outbox tests pass), and the historical ledger fix is retained separately in #9900. The earlier tested head
61c87ae14contained this timing behavior; the laterf0b64d0c7merge lost it. Both older heads were preserved before rebuilding this PR. No broader new-main merge is included.The direct Claude Opus 5 high review launcher exited 1 on expired OAuth before inference; no independent Claude review occurred.
Implemented and verified with GPT-6 Astra in the Codex harness.
Test-only prerequisite #10880 cancels pending animation-frame callbacks before restoring test globals. Its identical patch passes all 7 editable-file language tests, lint and formatting; this addresses the CI teardown exception. Merge #10865 and #10880 first.