merge: sync upstream through a7028f1399 (classic-merge) - #457
Merged
Conversation
…ingdotgg#10245) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ead list (pingdotgg#10260) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…gdotgg#10402) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…tgg#10410) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…g#10408) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…tgg#10262) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Updated model version and adjusted budget limits for PRs and runs.
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…dotgg#10463) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ccount (pingdotgg#10462) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
… second one (pingdotgg#10440) Co-authored-by: Claude Code <noreply@anthropic.com>
Classic-merge upstream/main through a7028f1 (Pierre attachment icons, pingdotgg#10475) into fork/dev. origin/main stays branch-protected, so upstream/main is the second parent.
PendingNewTask is now a pending|draft union with environmentId and projectId on the task. Recency/list builders still read message/creation, which only exist on queued tasks.
New active-order and dismiss tests still treated threads as an array. Use CommandReadModel HashMaps, add queuedMessages/pendingTurnStart, and fill Codex resume raw.request plus GitCommandError.failureKind.
github-actions
Bot
added
the
📱 Native Change
toProjectionThread dropped activeOrderKey, so SQL writes vanished on getById. Bump migration tail snapshots to 049 ProjectionThreadsActiveOrderKey.
patroza
marked this pull request as ready for review
September 7, 2026 06:47
This was referenced Sep 7, 2026
patroza
added a commit
that referenced
this pull request
Sep 7, 2026
## Problem After a deploy/restart, `reconcileProviderSessions` resumes interrupted threads by preparing the orchestration session as `starting` with `activeTurnId: null`, then calling `sendTurn`. It previously left the session in that starting state until the provider emitted `turn.started`. Codex resume (`thread/resume`) often does not emit `turn.started` until the replacement turn finishes. Meanwhile `thread.queue.steer` refuses with “still starting a turn”, so queued messages and Send now stay blocked for the whole recovered turn. This showed up after the #457/#458 upgrade: upstream `pingdotgg#10421` made restart resume fire without requiring the directory `activeTurnId` to match the projection turn, so more in-flight threads recover after a service restart. The stuck-in-starting gap was already in fork recovery; the update just made resume kick in. ## Fix After a successful recovery `sendTurn`, dispatch `thread.session.set` with `status: "running"` and `activeTurnId: result.turnId`. Prepare still uses starting/null (short window). Failed `sendTurn` still settles error. ## Test `serverRuntimeStartup.reconcile.test.ts` now asserts both the prepare `starting` sets and the post-`sendTurn` `running` sets with the admitted turn ids. --------- Co-authored-by: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.com>
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
19 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.
Summary
Classic-merge
upstream/mainthrougha7028f1399(fix: use Pierre icons consistently for attachments (#10475)) intofork/dev.origin/mainis branch-protected (PR + required checks), so this merge usesupstream/maindirectly as the second parent rather than a fast-forward of the stalemainmirror.68 incoming commits, including persisted manual thread order, sidebar drag, mobile outbox/drafts, onboarding wizard, async question dismiss, Codex Spark limits, Cursor transport failures, and WSL-era follow-ups already on
fork/dev.3-way weld (25 conflict files). Kept fork extras (queued drain, multi-env selection, HashMap
CommandReadModel, Hermes copy-then-sort/reverse, draft chips,ubuntu-24.04runners) and took upstream thread order, outbox, creditSources,resolve_commitnightly/stable, and Cursor transport-error mapping.release.ymlstaysubuntu-24.04(no Blacksmith); inherited CI/Release/deploy-relay remaindisabled_manually.Follow-up welds on this branch
environmentId/projectId/key(draft|queued union)CommandReadModel+findThreadByIdthreadSorttest uses.slice().reverse()instead of.toReversed()toProjectionThreadkeepsactiveOrderKey; migration tails include 049Land with
gh pr merge --merge, never squash.Test plan
vp check+vpr typecheckon pushpnpm pr:ready