merge: sync upstream through 08c715ed93 (v0.0.39 prepare) - #458
Merged
Conversation
Fold the release version bump onto fork/dev so the tree matches current upstream/main.
patroza
marked this pull request as ready for review
September 7, 2026 06:58
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>
3 tasks
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
1 participant
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/mainthrough08c715ed93(chore(release): prepare v0.0.39) intofork/dev.This is the one commit that landed on upstream while #457 was merging. Version bump only (
apps/desktop,apps/server,apps/web,packages/contracts→0.0.39). No Blacksmith;origin/mainstays branch-protected.Land with
gh pr merge --merge, never squash.Test plan
vp check+vpr typecheckon pushpnpm pr:ready