Skip to content

Improved diff editing use consistency#1125

Merged
mrubens merged 3 commits intoRooCodeInc:mainfrom
hannesrudolph:change_order_apply_diff
Feb 23, 2025
Merged

Improved diff editing use consistency#1125
mrubens merged 3 commits intoRooCodeInc:mainfrom
hannesrudolph:change_order_apply_diff

Conversation

@hannesrudolph
Copy link
Copy Markdown
Collaborator

@hannesrudolph hannesrudolph commented Feb 23, 2025

…ion apply_diff before write_to_file

Description

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Checklist:

  • My code follows the patterns of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation

Additional context

Related Issues

Reviewers


Important

Reorder tool groups to prioritize apply_diff over write_to_file and update related instructions in capabilities.ts, modes.ts, and rules.ts.

  • Tool Group Reordering:
    • In tool-groups.ts, reorder edit group tools to prioritize apply_diff over write_to_file.
    • Update modes.ts to reflect the new order in tool group comments.
  • Instruction Updates:
    • In capabilities.ts, update example usage to prioritize apply_diff over write_to_file when diffStrategy is true.
    • In rules.ts, adjust instructions to prefer apply_diff over write_to_file for existing file changes.

This description was created by Ellipsis for 24d5280. It will automatically update as commits are pushed.

@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Feb 23, 2025

⚠️ No Changeset found

Latest commit: 6225994

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. Documentation Improvements or additions to documentation labels Feb 23, 2025
@hannesrudolph hannesrudolph changed the title Reorder tool groups and update tool usage instructions to always ment… Update system prompt to always mention apply_diff before write_to_file Feb 23, 2025
@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:S This PR changes 10-29 lines, ignoring generated files. labels Feb 23, 2025
@hannesrudolph hannesrudolph changed the title Update system prompt to always mention apply_diff before write_to_file Improved diff editing use consistency Feb 23, 2025
Copy link
Copy Markdown
Collaborator

@mrubens mrubens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙏

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Feb 23, 2025
@mrubens mrubens merged commit dddac90 into RooCodeInc:main Feb 23, 2025
8 checks passed
mrubens added a commit that referenced this pull request Feb 24, 2025
…y_diff"

This reverts commit dddac90, reversing
changes made to 1c9dcad.
mrubens added a commit that referenced this pull request Feb 24, 2025
Revert "Merge pull request #1125 from hannesrudolph/change_order_appl…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Documentation Improvements or additions to documentation lgtm This PR has been approved by a maintainer size:L This PR changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants