feat: Sprint 2.1 - Add Zed terminal infrastructure dependencies#14
Merged
feat: Sprint 2.1 - Add Zed terminal infrastructure dependencies#14
Conversation
Architecture blueprint for Sprint 2.1 and 2.2: - Zed dependencies strategy (git deps, v0.220.3) - Settings/theme migration to Zed systems - TerminalPane component design - Build sequence with 7 phases Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Sprint 2.1 Phase 1: Add Zed crates as git dependencies (v0.220.3): - settings: Zed settings system (GPL-3.0) - theme: Zed theme system (GPL-3.0) - terminal: Core terminal emulation with alacritty_terminal (GPL-3.0) - ui: Pre-built GPUI components (GPL-3.0) - collections, util: Zed utilities (Apache-2.0) License updated to GPL-3.0-or-later due to Zed dependencies. All 58 tests passing, clippy clean. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Sprint 2.1 Phase 2-3 implementation: - Add settings_adapter.rs to register TerminalSettings with Zed's SettingsStore for terminal configuration management - Add theme_adapter.rs to initialize Zed's theme system and provide theme access utilities - Update main.rs to initialize Zed systems in correct order: settings::init() → settings_adapter::init() → theme_adapter::init() - Migrate workspace.rs from custom Theme global to Zed's ActiveTheme trait pattern using cx.theme() - Mark legacy settings/theme modules as deprecated with dead_code allow This prepares the foundation for terminal pane integration in Sprint 2.2. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add TerminalPane component wrapping Zed's Terminal crate - Add TerminalTab for managing individual terminal sessions - Integrate TerminalPane into WorkspaceView replacing placeholder - Wire up terminal spawning with workspace root as working directory - Handle terminal events (title changes, close, wakeup, bell) - Add basic terminal content rendering from TerminalContent cells - Add keystroke-to-terminal input conversion using Zed's key mappings - Support multiple terminal tabs with tab bar and new tab button Sprint 2.2 deliverables complete: - src/terminal/pane.rs (~360 lines) - src/terminal/tab.rs (~67 lines) - Updated src/terminal/mod.rs - Integrated into src/ui/workspace.rs Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Fix import line formatting (cargo fmt) - Mark Sprint 2.1 and 2.2 as complete in design doc - Update success criteria and build sequence Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
randlee
added a commit
that referenced
this pull request
Jan 26, 2026
- PR #14 merged (was pending) - 63 tests passing (was 60) - Added per-workspace terminal persistence details - CI passing on all platforms (macOS, Linux, Windows) - Updated Session 5 effort to ~8 hours Co-Authored-By: Claude Opus 4.5 <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
Sprint 2.1 Phase 1: Add Zed crates as git dependencies (v0.220.3) for terminal integration.
Dependencies Added
settings- Zed settings system (GPL-3.0)theme- Zed theme system (GPL-3.0)terminal- Core terminal emulation with alacritty_terminal (GPL-3.0)ui- Pre-built GPUI components (GPL-3.0)collections,util- Zed utilities (Apache-2.0)License Change
Updated from
MIT OR Apache-2.0toGPL-3.0-or-laterdue to Zed dependencies as documented indocs/architecture/zed-reuse-strategy.md.Design Document
Full architecture at
docs/sprints/phase-2-sprint-2-design.mdTest plan
cargo checkpassescargo buildsucceedscargo test- 58/58 tests passingcargo clippy -- -D warnings- no warningscargo fmt -- --check- properly formatted🤖 Generated with Claude Code