From ceb25c8350dd21a56a1431643faf8739d026b869 Mon Sep 17 00:00:00 2001
From: Taylor Mullen <ntaylormullen@google.com>
Date: Sun, 25 May 2025 13:37:37 -0700
Subject: [PATCH] refactor: Decouple new_string correction from old_string

- Previously, `new_string` was assumed to be over-escaped if `old_string` was.
- This change introduces an explicit check (`newStringPotentiallyEscaped`) to determine if `new_string` itself needs correction.
- If `new_string` is potentially escaped, its corrected using an LLM call; otherwise, the original `new_string` is used.
- This avoids unnecessary corrections to `new_string` when only `old_string` was problematic.

Part of https://github.com/google-gemini/gemini-cli/issues/484
---
 packages/server/src/utils/editCorrector.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/utils/editCorrector.ts b/packages/server/src/utils/editCorrector.ts
index 5b96eb20..c8a8e1a9 100644
--- a/packages/server/src/utils/editCorrector.ts
+++ b/packages/server/src/utils/editCorrector.ts
@@ -78,7 +78,14 @@ export async function ensureCorrectEdit(
 
     if (occurrences === 1) {
       finalOldString = unescapedOldStringAttempt;
-      finalNewString = unescapeStringForGeminiBug(originalParams.new_string);
+      if (newStringPotentiallyEscaped) {
+        finalNewString = await correctNewString(
+          client,
+          originalParams.old_string, // original old
+          unescapedOldStringAttempt, // corrected old
+          originalParams.new_string, // original new (which is potentially escaped)
+        );
+      }
     } else if (occurrences === 0) {
       const llmCorrectedOldString = await correctOldStringMismatch(
         client,