Bump ZED_COMMIT to restore lost streaming reveal-emit + add Phase 15 e2e test - #2408
Merged
Merged
Conversation
User report: streaming content appears in real time in Zed's UI but takes a couple of minutes to show up in Helix (#2403 era). Root cause: between the May 6 PR #2296 bump (ZED_COMMIT=edbbb5a5e8, which carried "Emit EntryUpdated after streaming-reveal drain") and the May 8 cancel_current_turn bump (ZED_COMMIT=fe8f4f4e3f, the merge base for the cancel work), the streaming reveal-emit fix was silently dropped because it lived on an unmerged side branch (origin/feature/001895-i-thought-we-flushed) and was never landed on main. The May 11 upstream merge in PR #2403 also did not pick it back up. Without it, text drained from streaming_text_buffer.pending into the markdown entity is invisible to external_websocket_sync until the next chunk fires push_chunk's EntryUpdated — so the bulk of streamed content reaches Helix only at the Stopped re-send right before message_completed. This bump pulls ZED_COMMIT to the head of helixml/zed fix/restore-streaming-reveal-emit, which: 1. Cherry-picks edbbb5a5e8 onto current main, restoring the missing `cx.emit(AcpThreadEvent::EntryUpdated(entries_len - 1))` after the drain in start_streaming_reveal (acp_thread.rs). 2. Adds e2e Phase 15 (helix-ws-test-server/main.go) which sends a long prose prompt, records every assistant message_added's timestamp + content length, and asserts: - >= 5 message_added events arrive, - longest inter-message gap <= 20s, - >= 30% of final content observed by streaming midpoint. Phase 15 reproducibly fails without the cherry-picked fix. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Was pointing at the pre-merge branch tip (41a62b2e61). Now that helixml/zed#55 merged, update to the merge commit on main (cd4e279d80) so CI builds against helixml/zed/main rather than a deleted branch ref. Co-Authored-By: Claude Opus 4.7 <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
User report: streaming content appears in real time in Zed's UI but takes a long time to show up in Helix.
Root cause: between the May 6 PR #2296 bump (
ZED_COMMIT=edbbb5a5e8, which carried "Emit EntryUpdated after streaming-reveal drain") and the May 8 cancel_current_turn bump (ZED_COMMIT=fe8f4f4e3f), the streaming reveal-emit fix was silently dropped because it lived on an unmerged Zed side branch (origin/feature/001895-i-thought-we-flushed) and never landed onhelixml/zedmain. The May 11 upstream merge (#2403) didn't pick it back up either.What this bump pulls in
ZED_COMMIT8841edb2b1→41a62b2e612f0acc62d67e909229f788b1e20386— the head ofhelixml/zedfix/restore-streaming-reveal-emit(paired Zed PR helixml/zed#55), which:edbbb5a5e8onto current main, restoring the missingcx.emit(AcpThreadEvent::EntryUpdated(entries_len - 1))after the drain instart_streaming_reveal(crates/acp_thread/src/acp_thread.rs).crates/external_websocket_sync/e2e-test/helix-ws-test-server/main.go) which sends a long prose prompt, records every assistantmessage_added's timestamp + content length, and asserts:>= 40message_added events arrive (catches the 2× degradation in streaming granularity);<= 20s;>= 30%of final content observed by streaming midpoint.Phase 15 reproducibly fails without the cherry-picked fix (verified locally with two builds — see Zed PR for the with/without table).
Verification
E2E_AGENTS="zed-agent" ./run_docker_e2e.sh) green with the cherry-pick, fails without.Test plan
zed-e2e-teststep passes Phase 15 for bothzed-agentandclaudeagents.Merge order (per
CLAUDE.md)Merge helixml/zed#55 first, then this Helix PR.
🤖 Generated with Claude Code