Skip to content

agent: Improve edit file tool card #29448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 13 commits into from
Apr 30, 2025
Merged

agent: Improve edit file tool card #29448

merged 13 commits into from
Apr 30, 2025

Conversation

danilo-leal
Copy link
Contributor

@danilo-leal danilo-leal commented Apr 25, 2025 •
edited
Loading

  • Disable soft-wrapping
  • Make it foldable only after a certain number of lines
  • Display tool status errors
  • Fix horizontal scroll now that we've disabled soft-wrap
  • Don't render unnecessary extra lines (will be added later, on a follow-up PR)

Release Notes:

  • N/A

danilo-leal and others added 3 commits April 25, 2025 17:31
@danilo-leal @agu-z @mgsloan
Disable soft-wrapping
ce9f747 
Co-Authored-By: Agus Zubiaga <hi@aguz.me>
Co-Authored-By: Michael Sloan <mgsloan@gmail.com>
@danilo-leal @agu-z @mgsloan
Display error
0dfc0ab 
Co-Authored-By: Agus Zubiaga <hi@aguz.me>
Co-Authored-By: Michael Sloan <mgsloan@gmail.com>
@danilo-leal @mgsloan @agu-z
Make preview folding line-dependable
9190964 
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 25, 2025
danilo-leal and others added 10 commits April 25, 2025 18:07
@danilo-leal @mgsloan @agu-z
Enable horizontal scrolling
1277d40 
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
@danilo-leal @mgsloan @agu-z
Remove unnecessary method disable_scrolling from the editor
b6a46fa 
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
@danilo-leal @mgsloan @agu-z
Clean up
ba78642 
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
@danilo-leal @mgsloan @agu-z
Oopsies, fix editor scrolling
fe67654 
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
@danilo-leal @mgsloan @agu-z
Remove vertical scroll
21736a3 
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Co-authored-by: Agus Zubiaga <hi@aguz.me>
@danilo-leal
Merge remote-tracking branch 'origin/main' into ag-edit-file-error-di…
469ffc6 
…splay
@danilo-leal
Merge remote-tracking branch 'origin/main' into ag-edit-file-error-di…
8c81d0d 
…splay
@danilo-leal
Attempt at fixing set_forbid_vertical_scroll and horizontal scroll
911d73a
@danilo-leal
Merge remote-tracking branch 'origin/main' into ag-edit-file-error-di…
eefadf9 
…splay
@danilo-leal
Fix error display disclosure
e61882d
@danilo-leal danilo-leal merged commit 128b7d2 into main Apr 30, 2025
19 checks passed
@danilo-leal danilo-leal deleted the ag-edit-file-error-display branch April 30, 2025 14:21
mikayla-maki pushed a commit that referenced this pull request Apr 30, 2025
@danilo-leal @agu-z
@mgsloan @mikayla-maki
agent: Improve edit file tool card (#29448)
24ebf24 
⚠️ Work in progress until all of the to-dos are knocked out:

- [x] Disable soft-wrapping
- [x] Make it foldable only after a certain number of lines
- [x] Display tool status errors
- [x] Fix horizontal scroll now that we've disabled soft-wrap
- [ ] Don't render unnecessary extra lines (will be added later, on a
follow-up PR)

Release Notes:

- N/A

---------

Co-authored-by: Agus Zubiaga <hi@aguz.me>
Co-authored-by: Michael Sloan <mgsloan@gmail.com>
@MrSubidubi MrSubidubi mentioned this pull request May 1, 2025
Merged
danilo-leal pushed a commit that referenced this pull request May 1, 2025
@MrSubidubi
agent: Do not render unnecessary lines in edit file tool card (#29766)
92b9ecd 
This PR prevents any unnecessary lines from being rendered in the edit
file tool card in the case of small diffs.

I think this (hopefully) addresses the last remaining task from
#29448.

| `main` | This PR |
| --- | --- |
| <img width="634" alt="main"
src="https://github.com/user-attachments/assets/7c06394e-957a-4d36-a484-5974687041e9"
/> | <img width="634" alt="PR"
src="https://github.com/user-attachments/assets/84206d5a-a93a-4a42-99ca-7cdebb0d91bb"
/> |

(The last empty line in the second image is an empty line present in the
file itself)

---

n the second commit I also preemtively disabled vertical overscrolling
for full mode editors which are sized by content. This is basically the
same fix as in #28471.
Strictly speaking, this is not needed for the fix here, but I thought it
might be nice to have for the future to prevent any issues from occuring
due to overscroll.

Release Notes:

- agent: Improved rendering of small diffs for the edit file tool card.
JosephTLyons pushed a commit that referenced this pull request May 2, 2025
@MrSubidubi @JosephTLyons
agent: Do not render unnecessary lines in edit file tool card (#29766)
cde6c2f 
This PR prevents any unnecessary lines from being rendered in the edit
file tool card in the case of small diffs.

I think this (hopefully) addresses the last remaining task from
#29448.

| `main` | This PR |
| --- | --- |
| <img width="634" alt="main"
src="https://github.com/user-attachments/assets/7c06394e-957a-4d36-a484-5974687041e9"
/> | <img width="634" alt="PR"
src="https://github.com/user-attachments/assets/84206d5a-a93a-4a42-99ca-7cdebb0d91bb"
/> |

(The last empty line in the second image is an empty line present in the
file itself)

---

n the second commit I also preemtively disabled vertical overscrolling
for full mode editors which are sized by content. This is basically the
same fix as in #28471.
Strictly speaking, this is not needed for the fix here, but I thought it
might be nice to have for the future to prevent any issues from occuring
due to overscroll.

Release Notes:

- agent: Improved rendering of small diffs for the edit file tool card.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@danilo-leal