You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
ACP can resolve session/prompt before the final assistant deltas have drained to session/update, which lets clients observe end_turn with an empty or truncated visible reply.
This change serializes ACP sessionUpdate sends and reconciles the returned assistant message before end_turn. Any text/reasoning suffix that was not already streamed is replayed once, and late duplicate deltas are skipped or trimmed against the delivered character count.
How did you verify your code works?
bun test test/acp/event-subscription.test.ts --timeout 30000 from packages/opencode (15 pass)
bun run typecheck from packages/opencode
bun run lint packages/opencode/src/acp/agent.ts packages/opencode/test/acp/event-subscription.test.ts (0 errors; existing warnings only)
git diff --check
Screenshots / recordings
Not applicable; ACP transport ordering fix covered by unit tests.
The following comment was made by an LLM, it may be inaccurate:
Potential Duplicate Found
PR #25683: fix(acp): drain message events before returning end_turn #25683
Why it's related:
This PR addresses a very similar issue in the ACP subsystem—handling message event draining before the end_turn signal. Both PRs are focused on reconciling/draining assistant message deltas to ensure clients don't see truncated or empty replies when end_turn occurs. The current PR (29120) appears to be an evolution or refinement of the approach taken in PR #25683, with more robust reconciliation logic (replaying text/reasoning suffixes and handling duplicate deltas).
You should verify whether #25683 was closed/merged without fully resolving the issue, or if #29120 represents a new approach to the same problem.
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
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.
Issue for this PR
Closes #17505
Type of change
What does this PR do?
ACP can resolve
session/promptbefore the final assistant deltas have drained tosession/update, which lets clients observeend_turnwith an empty or truncated visible reply.This change serializes ACP
sessionUpdatesends and reconciles the returned assistant message beforeend_turn. Any text/reasoning suffix that was not already streamed is replayed once, and late duplicate deltas are skipped or trimmed against the delivered character count.How did you verify your code works?
bun test test/acp/event-subscription.test.ts --timeout 30000frompackages/opencode(15 pass)bun run typecheckfrompackages/opencodebun run lint packages/opencode/src/acp/agent.ts packages/opencode/test/acp/event-subscription.test.ts(0 errors; existing warnings only)git diff --checkScreenshots / recordings
Not applicable; ACP transport ordering fix covered by unit tests.
Checklist