Skip to content

Conversation

@daniel-lxs
Copy link
Member

@daniel-lxs daniel-lxs commented Jun 12, 2025

With this PR the output should look like this:

Input: { 
  args: `<file>
    <path>src/components/Button.tsx</path>
    <diff>...</diff>
  </file>
  <file>
    <path>src/components/Input.tsx</path>
    <diff>...</diff>
  </file>`
}
Output: [apply_diff for 'src/components/Button.tsx' and 1 more file]

Important

Fixes apply_diff output in presentAssistantMessage.ts to correctly display multi-file diffs.

  • Behavior:
    • Updates apply_diff case in presentAssistantMessage() to handle multi-file diffs.
    • Extracts first file path from args and counts total files, adjusting output message accordingly.
    • Handles both legacy single-file and new multi-file formats.
  • Misc:
    • Adds logic to return a default message if no path or args are provided.

This description was created by Ellipsis for e7fee62. You can customize this summary. It will automatically update as commits are pushed.

@daniel-lxs daniel-lxs requested review from cte, jr and mrubens as code owners June 12, 2025 20:33
@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. bug Something isn't working labels Jun 12, 2025
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jun 12, 2025
@hannesrudolph hannesrudolph added the Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. label Jun 12, 2025
@mrubens mrubens merged commit 33ce5a2 into main Jun 12, 2025
25 checks passed
@mrubens mrubens deleted the fix/undefined_apply_diff branch June 12, 2025 20:46
@github-project-automation github-project-automation bot moved this from New to Done in Roo Code Roadmap Jun 12, 2025
@github-project-automation github-project-automation bot moved this from Triage to Done in Roo Code Roadmap Jun 12, 2025
cte pushed a commit that referenced this pull request Jun 24, 2025
feat: enhance file handling in `apply_diff` case to support legacy and multi-file formats
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files.

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants