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

packages/core/src/utils/fileDiffUtils.test.ts

@@ -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';
 
@@ -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,
       });
@@ -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,
       });
     });
 
@@ -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,

packages/core/src/utils/fileDiffUtils.ts

@@ -31,7 +31,7 @@ export function getFileDiffFromResultDisplay(
   return undefined;
 }
 
-export function computeAddedAndRemovedLines(
+export function computeModelAddedAndRemovedLines(
   stats: FileDiff['diffStat'] | undefined,
 ): {
   addedLines: number;
@@ -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,
   };
 }