Revert #10: scope assistant message ids by turn after resume#12
Merged
Merged
Conversation
This reverts commit 7a26a9e.
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
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
Reverts #10 (turn-scoped assistant message ids) in favor of adopting upstream pingdotgg#3669, which fixes the same resumed-session ordering bug at the source (runtime-unique ACP segment item ids) and additionally fixes cancel-as-notification, agent thought rendering, and a turn-completion drain race.
This is step 1 of that migration:
ProviderRuntimeIngestion.tsmainwithupstream/mainNotes
fix/cursor-acp-resumestate) — known-good, compiles.ProviderSessionRecovery.ts, replay gating,activeTurnIdsync) is kept — it has no upstream equivalent.cursorResume.integration.test.ts) removed here will be re-added on top of Fix Cursor ACP thread rendering, thought output, and cancel delivery pingdotgg/t3code#3669 in step 3 as the stronger regression guard.Co-Authored-By: Claude Opus 4.8 noreply@anthropic.com