Skip to content

Bump ZED_COMMIT to merge of upstream Zed (task 001996) - #2403

Merged
lukemarsden merged 3 commits into
mainfrom
feature/001996-merge-latest-zed
May 11, 2026
Merged

Bump ZED_COMMIT to merge of upstream Zed (task 001996)#2403
lukemarsden merged 3 commits into
mainfrom
feature/001996-merge-latest-zed

Conversation

@lukemarsden

Copy link
Copy Markdown
Collaborator

Summary

Bumps ZED_COMMIT in sandbox-versions.txt to point at the new merge of upstream Zed (zed-industries/zed 8bdd78e023, 127 commits / 3 days) on the Helix fork.

Changes

  • sandbox-versions.txt: ZED_COMMIT fe8f4f4e3f0fb7c0cb51e9c8028ca0c13a8252cba767007e53304b077eaee5d1872a5631e2ada207

The new Zed commit is the head of helixml/zed feature/001996-merge-latest-zed (paired Zed PR). It includes the upstream merge, a BaseView::Terminal match-arm fix in the Helix UI state query, a Phase 13 race fix in the cancellation handler (turn_cancelled now wins the race against message_completed), and the porting-guide update.

Validation

  • Zed E2E (zed-agent + claude, all 14 phases) green
  • All Helix Critical Fixes verified
  • See paired Zed PR for the full conflict-resolution trail

🔗 Open in Helix

📋 Spec:

🚀 Built with Helix

Spec-Ref: helix-specs@27b162cf9:001996_merge-latest-zed
…latest-zed

Spec-Ref: helix-specs@a2a7263fc:001996_merge-latest-zed
Spec-Ref: helix-specs@a2a7263fc:001996_merge-latest-zed
@lukemarsden
lukemarsden merged commit be6aa05 into main May 11, 2026
1 check passed
@lukemarsden
lukemarsden deleted the feature/001996-merge-latest-zed branch May 11, 2026 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant