Kirill Bulatov
f7f3b90dca
Closes https://github.com/zed-industries/zed/issues/62435 Part of https://github.com/zed-industries/zed/issues/60548 Before: https://github.com/user-attachments/assets/6b5147da-44cb-40c7-9da5-c50145e2ab4e After: https://github.com/user-attachments/assets/c58423cc-ea99-40d9-ad18-23b31dfb8e5d Previously, `TerminalPanel::load` awaited full deserialization of serialized terminals (each awaiting directory environment capture via a login shell) before the panel was registered in the dock. Until then, `terminal_panel::Toggle{Focus}` was a silent no-op: the workspace finds no panel in any dock, the keystroke is eaten, and nothing happens. When it got eventually restored, it would close whatever panel in the dock was open manually instead, wrecking the workflow. Repro: 1. Add `case "$ZSH_EXECUTION_STRING" in *--printenv*) sleep 10;; esac` to `~/.zshrc`. 2. Open a project, open at least one terminal in the panel, quit Zed (Cmd+Q). 3. Relaunch via Dock/Spotlight (not the `zed` CLI, which skips env capture via `cli_environment`). 4. Press the terminal shortcut within 10s: nothing happens; after ~10s the panel appears and the shortcut works. * `Register terminal panel before restoring serialized terminals` — the panel is now created and registered immediately, and restoration runs in panel-owned tasks (cancelled on panel drop, nothing detached). Terminal-adding paths were initially queued behind restoration (later replaced by grafting, see below); the default shell spawns only if the panel ends up active and empty after restore. * `Stop replaying serialized dock state over manual panel changes` — fixes a related race: `Dock::add_panel` replayed the serialized dock state (active panel, visibility, zoom) on every panel insertion, so a late-loading panel would re-activate the serialized panel over one the user had switched to in the meantime (e.g. the terminal panel yanking the dock away from the agent panel), or re-open a dock the user had closed. Serialized state is now applied at most once and is discarded as soon as the user changes the dock state manually. The new tests fail without this change and pass with it. * `Show restoration progress in the terminal panel and allow spawning terminals during it` — while terminals restore, the panel shows a spinner with "Restoring terminals…" instead of a blank pane, and logs the restored count and elapsed time. Supersedes the queuing from the first commit: new terminals spawn immediately, and any that land mid-restore are grafted into the restored layout instead of being lost. Serialization is paused during restoration, so quitting mid-restore can no longer persist a partial tab list and silently drop terminals. Release Notes: - Fixed the terminal panel not opening at all under certain circumstances, made panels no longer switching back to the serialized one when opened during startup.
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).
Other platforms are not yet available:
- Web (tracking discussion)
Developing Zed
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
Zed source code is licensed primarily under GPL-3.0-or-later, with Apache-2.0 components where marked.
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Sponsorship
Zed is developed by Zed Industries, Inc., a for-profit company.
If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.