Skip to content

Fix number of lines being reported in rewind confirmation dialog #18675

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

Merged
Adib234 merged 2 commits into from
Feb 9, 2026
Merged

Fix number of lines being reported in rewind confirmation dialog #18675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c544841
complete
Adib234 Feb 9, 2026
3c645f3
change function name
Adib234 Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/cli/src/ui/utils/rewindFileOps.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
debug: vi.fn(),
},
getFileDiffFromResultDisplay: vi.fn(),
computeAddedAndRemovedLines: vi.fn(),
computeModelAddedAndRemovedLines: vi.fn(),
};
});

Expand All @@ -68,7 +68,7 @@ describe('rewindFileOps', () => {
});

it('calculates stats for single turn correctly', async () => {
const { getFileDiffFromResultDisplay, computeAddedAndRemovedLines } =
const { getFileDiffFromResultDisplay, computeModelAddedAndRemovedLines } =
await import('@google/gemini-cli-core');
vi.mocked(getFileDiffFromResultDisplay).mockReturnValue({
filePath: 'test.ts',
Expand All @@ -88,7 +88,7 @@ describe('rewindFileOps', () => {
},
fileDiff: 'diff',
});
vi.mocked(computeAddedAndRemovedLines).mockReturnValue({
vi.mocked(computeModelAddedAndRemovedLines).mockReturnValue({
addedLines: 3,
removedLines: 3,
});
Expand Down Expand Up @@ -124,7 +124,7 @@ describe('rewindFileOps', () => {

describe('calculateRewindImpact', () => {
it('calculates cumulative stats across multiple turns', async () => {
const { getFileDiffFromResultDisplay, computeAddedAndRemovedLines } =
const { getFileDiffFromResultDisplay, computeModelAddedAndRemovedLines } =
await import('@google/gemini-cli-core');
vi.mocked(getFileDiffFromResultDisplay)
.mockReturnValueOnce({
Expand Down Expand Up @@ -164,7 +164,7 @@ describe('rewindFileOps', () => {
fileDiff: 'diff2',
});

vi.mocked(computeAddedAndRemovedLines)
vi.mocked(computeModelAddedAndRemovedLines)
.mockReturnValueOnce({ addedLines: 5, removedLines: 3 })
.mockReturnValueOnce({ addedLines: 4, removedLines: 0 });

Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/ui/utils/rewindFileOps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
coreEvents,
debugLogger,
getFileDiffFromResultDisplay,
computeAddedAndRemovedLines,
computeModelAddedAndRemovedLines,
} from '@google/gemini-cli-core';

export interface FileChangeDetail {
Expand Down Expand Up @@ -61,7 +61,7 @@ export function calculateTurnStats(
if (fileDiff) {
hasEdits = true;
const stats = fileDiff.diffStat;
const calculations = computeAddedAndRemovedLines(stats);
const calculations = computeModelAddedAndRemovedLines(stats);
addedLines += calculations.addedLines;
removedLines += calculations.removedLines;

Expand Down Expand Up @@ -112,7 +112,7 @@ export function calculateRewindImpact(
if (fileDiff) {
hasEdits = true;
const stats = fileDiff.diffStat;
const calculations = computeAddedAndRemovedLines(stats);
const calculations = computeModelAddedAndRemovedLines(stats);
addedLines += calculations.addedLines;
removedLines += calculations.removedLines;
files.add(fileDiff.fileName);
Expand Down
12 changes: 6 additions & 6 deletions packages/core/src/utils/fileDiffUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { describe, it, expect } from 'vitest';
import {
getFileDiffFromResultDisplay,
computeAddedAndRemovedLines,
computeModelAddedAndRemovedLines,
} from './fileDiffUtils.js';
import type { FileDiff, ToolResultDisplay } from '../tools/tools.js';

Expand Down Expand Up @@ -57,7 +57,7 @@ describe('fileDiffUtils', () => {

describe('computeAddedAndRemovedLines', () => {
it('returns 0 added and 0 removed if stats is undefined', () => {
expect(computeAddedAndRemovedLines(undefined)).toEqual({
expect(computeModelAddedAndRemovedLines(undefined)).toEqual({
addedLines: 0,
removedLines: 0,
});
Expand All @@ -75,10 +75,10 @@ describe('fileDiffUtils', () => {
user_removed_chars: 10,
};

const result = computeAddedAndRemovedLines(stats);
const result = computeModelAddedAndRemovedLines(stats);
expect(result).toEqual({
addedLines: 12, // 10 + 2
removedLines: 6, // 5 + 1
addedLines: 10,
removedLines: 5,
});
});

Expand All @@ -94,7 +94,7 @@ describe('fileDiffUtils', () => {
user_removed_chars: 0,
};

const result = computeAddedAndRemovedLines(stats);
const result = computeModelAddedAndRemovedLines(stats);
expect(result).toEqual({
addedLines: 0,
removedLines: 0,
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/utils/fileDiffUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function getFileDiffFromResultDisplay(
return undefined;
}

export function computeAddedAndRemovedLines(
export function computeModelAddedAndRemovedLines(
stats: FileDiff['diffStat'] | undefined,
): {
addedLines: number;
Expand All @@ -44,7 +44,7 @@ export function computeAddedAndRemovedLines(
};
}
return {
addedLines: stats.model_added_lines + stats.user_added_lines,
removedLines: stats.model_removed_lines + stats.user_removed_lines,
addedLines: stats.model_added_lines,
removedLines: stats.model_removed_lines,
Comment thread
Adib234 marked this conversation as resolved.
};
}
Loading