Skip to content

edit tool: Support stringified mode parameter - #55498

Merged
bennetbo merged 1 commit into
mainfrom
edit-tool-handle-double-encoded-enum
May 2, 2026
Merged

bennetbo merged 1 commit into
mainfrom
edit-tool-handle-double-encoded-enum

Conversation

@agu-z

@agu-z agu-z commented May 2, 2026 •

Copy link
Copy Markdown
Contributor

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • Fixed an issue where agent failed to apply edits in some cases

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 2, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label May 2, 2026
@agu-z
agu-z requested a review from bennetbo May 2, 2026 15:40
@agu-z
agu-z marked this pull request as ready for review May 2, 2026 15:46
@agu-z
agu-z force-pushed the edit-tool-handle-double-encoded-enum branch from a3b42be to 3deb4e3 Compare May 2, 2026 15:47
@bennetbo
bennetbo added this pull request to the merge queue May 2, 2026
@bennetbo

bennetbo commented May 2, 2026

Copy link
Copy Markdown
Member

/cherry-pick preview

@bennetbo

bennetbo commented May 2, 2026

Copy link
Copy Markdown
Member

/cherry-pick stable

Merged via the queue into main with commit db5a9be May 2, 2026
31 checks passed
@bennetbo
bennetbo deleted the edit-tool-handle-double-encoded-enum branch May 2, 2026 16:14
zed-zippy Bot added a commit that referenced this pull request May 2, 2026
… to preview) (#55499)

Cherry-pick of #55498 to preview

----
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:

- Fixed an issue where agent failed to apply edits in some cases

Co-authored-by: Agus Zubiaga <agus@zed.dev>
zed-zippy Bot added a commit that referenced this pull request May 2, 2026
… to stable) (#55500)

Cherry-pick of #55498 to stable

----
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:

- Fixed an issue where agent failed to apply edits in some cases

Co-authored-by: Agus Zubiaga <agus@zed.dev>
aviddiviner added a commit to aviddiviner/zed that referenced this pull request May 4, 2026
Upstream changes:
- edit tool: Support stringified `mode` parameter (zed-industries#55498)
  Fixes models that double-encode JSON tool parameters
- Remove StreamingEditFileToolFeatureFlag (now always enabled)
- cloud_llm_client: Add cursor_offset to PredictEditsV3Response
- Version bump to 1.0.1

Conflict resolutions:
- crates/agent/src/thread.rs: Removed feature_flags import entirely
  (we already removed UpdatePlanToolFeatureFlag, upstream removed
  StreamingEditFileToolFeatureFlag — neither is used anymore)
- Cargo.lock: Kept our version (no zed crate)
- crates/edit_prediction/*, crates/zed/Cargo.toml: Kept deleted
  (these crates don't exist in Aleph)
Nkr1shna added a commit to neozed-industries/neo-zed that referenced this pull request May 4, 2026
* edit tool: Support stringified `mode` parameter (zed-industries#55498) (cherry-pick to stable) (zed-industries#55500)

Cherry-pick of zed-industries#55498 to stable

----
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:

- Fixed an issue where agent failed to apply edits in some cases

Co-authored-by: Agus Zubiaga <agus@zed.dev>

* Bump to 1.0.1 for @bennetbo

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
Co-authored-by: Agus Zubiaga <agus@zed.dev>
Nkr1shna added a commit to neozed-industries/neo-zed that referenced this pull request May 4, 2026
* edit tool: Support stringified `mode` parameter (zed-industries#55498) (cherry-pick to stable) (zed-industries#55500)

Cherry-pick of zed-industries#55498 to stable

----
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:

- Fixed an issue where agent failed to apply edits in some cases

Co-authored-by: Agus Zubiaga <agus@zed.dev>

* Bump to 1.0.1 for @bennetbo

---------

Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
Co-authored-by: Agus Zubiaga <agus@zed.dev>
ebaah46 pushed a commit to ebaah46/zed that referenced this pull request May 6, 2026
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:

- N/A
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
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:

- N/A
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
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:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants