Fix number of lines being reported in rewind confirmation dialog

[Adib234]

Summary

Exclude user_added_lines and user_removed_lines from rewind viewer and rewind confirmation dialog. A large number of lines were being reported as removed and user_removed_lines was the culprit.

Details

Related Issues

Fixes #18674

How to Validate

Run a session in auto-edit mode with many edit and write tools called, there shouldn't be a large number of lines added or removed and should match with git diff --numstat main

Pre-Merge Checklist

• Updated relevant documentation and README (if needed)
• Added/updated tests (if needed)
• Noted breaking changes (if any)
• Validated on required platforms/methods:
  • MacOS
    • npm run
    • npx
    • Docker
    • Podman
    • Seatbelt
  • Windows
    • npm run
    • npx
    • Docker
  • Linux
    • npm run
    • npx
    • Docker

[gemini-code-assist]

Summary of Changes

Hello @Adib234, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refines the calculation of added and removed lines within the codebase. By specifically excluding user-generated line changes from the total count, it ensures that the rewind confirmation dialog presents a more accurate and relevant summary of modifications, preventing misleadingly high numbers.

Highlights

• Line Count Correction: The logic for computing added and removed lines in file differences has been updated to exclude user_added_lines and user_removed_lines.
• Rewind Dialog Accuracy: This change directly addresses an issue where the rewind confirmation dialog displayed an inaccurately large number of lines, particularly for removed lines, due to the inclusion of user-specific line counts.
• Test Updates: An existing test case for computeAddedAndRemovedLines in fileDiffUtils.test.ts was adjusted to reflect the new, corrected line calculation.

Changelog

• packages/core/src/utils/fileDiffUtils.test.ts
  • Updated the expected addedLines and removedLines values in the test case for computeAddedAndRemovedLines to align with the revised calculation logic.
• packages/core/src/utils/fileDiffUtils.ts
  • Modified the computeAddedAndRemovedLines function to only sum model_added_lines and model_removed_lines, effectively ignoring user_added_lines and user_removed_lines.

Activity

• The pull request has been opened by Adib234.
• The author has provided a detailed summary, context, validation steps, and a pre-merge checklist.
• No review comments or explicit approvals have been recorded yet.
• All items in the pre-merge checklist are currently unchecked.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-code-assist]

Code Review

This pull request fixes an issue where the number of lines reported in the rewind confirmation dialog was incorrect because it included user-made changes. The change correctly adjusts the computeAddedAndRemovedLines function to only consider model-added and model-removed lines, and updates the corresponding test case. My review includes one suggestion to improve code clarity by renaming the modified function to better reflect its new, more specific behavior.

[github-actions]

Size Change: -29 B (0%)

Total Size: 23.9 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	23.9 MB	-29 B (0%)
./bundle/sandbox-macos-permissive-closed.sb	1.03 kB	0 B
./bundle/sandbox-macos-permissive-open.sb	890 B	0 B
./bundle/sandbox-macos-permissive-proxied.sb	1.31 kB	0 B
./bundle/sandbox-macos-restrictive-closed.sb	3.29 kB	0 B
./bundle/sandbox-macos-restrictive-open.sb	3.36 kB	0 B
./bundle/sandbox-macos-restrictive-proxied.sb	3.56 kB	0 B

_{compressed-size-action}

[Adib234]

/patch

[github-actions]

✅ Patch workflow(s) dispatched successfully!

📋 Details:

• Channels: stable,preview
• Commit: 80057c520832de181ed5becdea4725714fb4069f
• Workflows Created: 2

🔗 Track Progress:

• View patch workflows
• This workflow run