fix(sync): rebase feature/end-turn-tool-contract-upstream onto upstream/main - #47
Closed
cursor[bot] wants to merge 0 commit into
Closed
fix(sync): rebase feature/end-turn-tool-contract-upstream onto upstream/main#47cursor[bot] wants to merge 0 commit into
cursor[bot] wants to merge 0 commit into
Conversation
vKongv
force-pushed
the
main
branch
4 times, most recently
from
July 31, 2026 06:20
7df428a to
0fb1af1
Compare
|
Closing as stale sync-recovery draft. The fix was already force-pushed to the source FEATURE_BRANCH (not meant for merge into integration |
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
Recovers upstream sync failure (issue #45, run 30070707530).
Failed branch:
feature/end-turn-tool-contract-upstreamFailed step:
rebase-feature-branchUpstream SHA:
46c7a4076fc543bdc98de12b81c2c85ef9c864b9Root cause
Rebase conflict in
gateway/run.pyon commitfix(gateway): preserve turn_exit_reason on empty finals. Upstream addedcompression_deferred(NousResearch#69870) in the same result envelope dicts where this branch addsturn_exit_reason.Fix
Rebased
feature/end-turn-tool-contract-upstreamontoupstream/mainand kept both fields in both return envelopes.Tests
265 focused tests + 45 gateway end-turn tests passed.