agent: Do not fail if buffer has changed on disk - #55606
Merged
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
benbrandt
approved these changes
May 4, 2026
ebaah46
pushed a commit
to ebaah46/zed
that referenced
this pull request
May 6, 2026
Previously, we would always return an error if the LLM attempted to edit a file that had been modified on disk or by the user in the meantime. However, this often led to unnecessary failures and slowdowns. So, instead of failing every time, we now attempt to resolve a match. If we don't find one, we return an error to inform the LLM that the file has been modified since the last read. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - agent: Do not fail edit tool if file has unsaved changes
This was referenced May 13, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
Previously, we would always return an error if the LLM attempted to edit a file that had been modified on disk or by the user in the meantime. However, this often led to unnecessary failures and slowdowns. So, instead of failing every time, we now attempt to resolve a match. If we don't find one, we return an error to inform the LLM that the file has been modified since the last read. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - agent: Do not fail edit tool if file has unsaved changes
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
Previously, we would always return an error if the LLM attempted to edit a file that had been modified on disk or by the user in the meantime. However, this often led to unnecessary failures and slowdowns. So, instead of failing every time, we now attempt to resolve a match. If we don't find one, we return an error to inform the LLM that the file has been modified since the last read. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - agent: Do not fail edit tool if file has unsaved changes
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.
Previously, we would always return an error if the LLM attempted to edit a file that had been modified on disk or by the user in the meantime. However, this often led to unnecessary failures and slowdowns. So, instead of failing every time, we now attempt to resolve a match. If we don't find one, we return an error to inform the LLM that the file has been modified since the last read.
Self-Review Checklist:
Release Notes: