fix(cursor): harden ACP session resume and provider recovery#9
Merged
Conversation
2 tasks
Gate session/load replay before prompting, recover orphaned provider sessions on startup, sync active turn state from lifecycle events, and reset assistant segments in-place when item.started replays within the same turn. Co-authored-by: Cursor <cursoragent@cursor.com>
justingray0
force-pushed
the
fix/cursor-acp-resume
branch
from
June 29, 2026 22:37
8b674d5 to
a9a6d39
Compare
This was referenced Jun 29, 2026
justingray0
added a commit
that referenced
this pull request
Jul 4, 2026
…utput, cancel delivery Applies pingdotgg#3669 on top of the fork's #9 resume/recovery hardening. Fixes: session/cancel sent as JSON-RPC notification (not request), runtime-unique ACP segment item ids so resumed sessions render below the latest user message, agent_thought_chunk parsed as expandable reasoning rows, and a turn-completion drain race. Supersedes the reverted #10 turn-scoping. Co-authored-by: Cursor <cursoragent@cursor.com> Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.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
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
session/loadreplay before allowing new prompts so resumed sessions do not race ahead of replayed history.activeTurnIdin sync with turn lifecycle events.item.startedreplays within the same turn, and unstick sessions when stop races a dead provider.Test plan
vp test apps/server/src/provider/Layers/ProviderSessionRecovery.test.tsvp test apps/server/src/orchestration/Layers/ProviderCommandReactor.test.tsvp test apps/server/src/provider/acp/AcpRuntimeModel.test.tsvp test apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts(resume reset case)Made with Cursor