Merged
Conversation
18a9cd0 to
0fea763
Compare
0fea763 to
62c1580
Compare
danilo-leal
approved these changes
Apr 8, 2026
lukemarsden
added a commit
to helixml/zed
that referenced
this pull request
Apr 9, 2026
Merge upstream zed-industries/zed main branch (7544515) into Helix fork. Notable upstream changes: - Agent V2 feature flag removal (zed-industries#52792) - Sidebar/MultiWorkspace rework (zed-industries#53096, zed-industries#53032, zed-industries#53267) - Agent panel git worktree/branch pickers (zed-industries#52979) - Language model crate refactor (zed-industries#53270) - Notification panel removal (zed-industries#50204) - Subagent permission requests (zed-industries#53428) - Worktree archival on thread archive (zed-industries#53215) - Agent layout onboarding (zed-industries#52940) - AuthRequired status for context servers (zed-industries#53396) Conflict resolutions: - crates/zed/Cargo.toml: kept external_websocket_sync feature + upstream track-project-leak - crates/agent_ui/Cargo.toml: kept external_websocket_sync feature + upstream audio feature - crates/agent_ui/src/agent_panel.rs: preserved all cfg-gated WebSocket blocks, migrated should_render_onboarding to should_render_new_user_onboarding, added upstream agent_layout_onboarding - crates/agent/src/tools/context_server_registry.rs: added AuthRequired to match arm, preserved pending_tool_loads tracking - crates/workspace/src/workspace.rs: added new upstream re-exports - crates/title_bar/src/title_bar.rs: preserved Helix connection status indicator, dropped always-hidden onboarding banner (upstream removed it too) - crates/recent_projects/src/dev_container_suggest.rs: kept suggest_dev_container check + upstream cli_auto_open - .github/workflows, assets/keymaps, assets/settings, editor, multi_workspace: took upstream Spec-Ref: helix-specs@e637a591b:001723_merge-latest-zed
lukemarsden
added a commit
to helixml/zed
that referenced
this pull request
Apr 9, 2026
- HeadlessConnection: add missing agent_id() method, fix new_session() signature to take PathList instead of &Path - Remove dead text_thread_history imports and TextThreadStore creation (upstream removed assistant_text_thread crate in zed-industries#52757) - Remove dead History enum (unused after upstream changes) - Remove AgentV2FeatureFlag reference (upstream removed flag in zed-industries#52792, feature is now always-on) Spec-Ref: helix-specs@de2777e8a:001723_merge-latest-zed
lukemarsden
added a commit
to helixml/zed
that referenced
this pull request
Apr 9, 2026
Document upstream changes discovered during the 509-commit merge: - assistant_text_thread crate removal (zed-industries#52757) - AgentV2FeatureFlag removal (zed-industries#52792) - selected_agent_type → selected_agent rename - ContextServerStatus::AuthRequired variant addition - AcpServerView vs ConversationView ConnectedServerState differences - Add 5 new rebase checklist items (35-39) for patterns to watch - Update commit history with merge commits Spec-Ref: helix-specs@f6b4bdf0e:001723_merge-latest-zed
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
2 participants
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.
It's happening.
Self-Review Checklist:
Release Notes: