Adopt upstream #3669: Cursor ACP thread rendering, thought output, cancel delivery#13
Merged
Merged
Conversation
…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
Adopts upstream pingdotgg#3669 on top of the fork's #9 resume/recovery hardening. This is step 3 of migrating off our fork-only #10 turn-scoping (reverted in #12) to the upstream fix, which addresses the same resumed-session ordering bug at the source and bundles three more Cursor fixes:
session/cancelis sent as a spec notification (noid), not a JSON-RPC request the CLI silently dropped.agent_thought_chunkparsed into channel-aware segments, surfaced as expandable thinking rows (reuses the Codex affordance).turn.completed.Applied on top of #9
Fork-only #9 work is preserved and coexists:
isSessionLoadReplayActive/ session-load gating,ProviderSessionRecovery.ts,activeTurnIdsync. pingdotgg#3669'sAcpAssistantSegmentStaterestructure (activeItemId→active: {itemId, channel, text}) and #9's replay gating occupy different regions and merged cleanly.Verification
pnpm typecheck: pass (full monorepo, exit 0) — confirms fix(cursor): harden ACP session resume and provider recovery #9 ↔ Fix Cursor ACP thread rendering, thought output, and cancel delivery pingdotgg/t3code#3669 are semantically compatible.AcpJsonRpcConnection,AcpRuntimeModel,AcpCoreRuntimeEvents,CursorAdapter): 47 passed.AcpSessionRuntime > ignores session/update replay notifications during session/loadtimes out (120s) identically onmainbefore this change. It's an upstream test (from fix(grok): Harden ACP resume with replay-idle load readiness pingdotgg/t3code#3156) that hangs in this local environment; the other 14 mock-agent tests in the file pass. Tracked separately.Follow-up
Re-add the real-Cursor resume E2E (
cursorResume.integration.test.ts, reverted with #10) adapted to the runtimeTag approach, as a stronger regression guard than the mock-agent scenarios.Co-authored-by: Cursor cursoragent@cursor.com
Co-Authored-By: Claude Opus 4.8 noreply@anthropic.com