MartinYe1234
81635e561f
Fixes the agent panel silently reverting all pending subagent file changes when an earlier message is edited and regenerated. `ThreadView::regenerate` decides whether to auto-keep pending edits from earlier prompts (behavior introduced in #43347) by scanning the parent thread's entries for diffs. Subagent edits never appear there — they are only forwarded to the parent's action log via the linked-log mechanism — so the auto-keep step was skipped and `rewind`'s unscoped `reject_all_edits` reverted all of them on disk, without confirmation. The fix treats any earlier subagent tool call as potentially having edits, so they get auto-kept just like direct edits from earlier prompts. Keeping all edits is a no-op when the subagent made none. Edits produced by the prompt being regenerated are still auto-rejected, consistent with existing behavior. Also adds a regression test (`test_regenerate_keeps_pending_subagent_edits`) that reproduces the full flow — subagent edit forwarded through a linked action log, follow-up prompt, regenerate — and fails with the exact reported data loss without the fix. Closes AI-386 Closes https://github.com/zed-industries/zed/issues/58932 Release Notes: - Fixed pending subagent file changes being discarded when editing an earlier message in the agent panel.
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.