@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vite-plus/test";
 import { hydratePartialDiff } from "@pierre/diffs";
+import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";
 import {
   reviewPatchHunks,
   reviewSelectedLinesPatch,
@@ -219,6 +220,11 @@ describe("optimistic working changes", () => {
     });
     expect(edits(next.staged)).toEqual(["+extra"]);
     expect(edits(next.unstaged)).toEqual(["-beta", "+BETA"]);
+    for (const scope of [next.staged, next.unstaged]) {
+      for (const patch of scope.hunksByPath.get("file.txt")!) {
+        expect(parsePatchFiles(patch, undefined, true)[0]?.files).toHaveLength(1);
+      }
+    }
     expect(next.unstaged.files[0]?.additionLines).toEqual([
       "alpha\n",
       "BETA\n",
 
@@ -98,7 +98,7 @@ function optimisticFile(
               .join(""),
       )
       .join("");
-    return `${header}${hunk.hunkSpecs}\n${body}`;
+    return `${header}${hunk.hunkSpecs?.trimEnd()}\n${body}`;
   });
   const patch = header + hunks.map((hunk) => hunk.slice(header.length)).join("");
   const file = parsePatchFiles(patch, `optimistic:${Hash.string(patch)}`)[0]?.files[0];
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ function optimisticFile(`
`98`	`98`	`.join(""),`
`99`	`99`	`)`
`100`	`100`	`.join("");`
`101`		- return `${header}${hunk.hunkSpecs}\n${body}`;
	`101`	+ return `${header}${hunk.hunkSpecs?.trimEnd()}\n${body}`;
`102`	`102`	`});`
`103`	`103`	`const patch = header + hunks.map((hunk) => hunk.slice(header.length)).join("");`
`104`	`104`	const file = parsePatchFiles(patch, `optimistic:${Hash.string(patch)}`)[0]?.files[0];