From 5974287b6d2157b43aa42442acc30f389ae5e8c1 Mon Sep 17 00:00:00 2001
From: amitksingh1490 <amitksingh1490@users.noreply.github.com>
Date: Wed, 26 Mar 2025 17:59:52 +0530
Subject: [PATCH] fix: patched files result to return content

---
 .../forge_services/src/tools/patch/apply.rs   |  5 ++--
 .../src/tools/patch/apply_json.rs             |  5 ++--
 ..._test__complex_newline_preservation-3.snap | 21 +++++++++++++++--
 ..._test__complex_newline_preservation-5.snap | 23 +++++++++++++++++--
 ...y__test__complex_newline_preservation.snap | 19 +++++++++++++--
 ...ools__patch__apply__test__empty_block.snap |  6 +++--
 ...h__apply__test__empty_search_new_file.snap |  5 ++--
 ..._apply__test__fuzzy_search_advanced-3.snap | 13 +++++++++--
 ...h__apply__test__fuzzy_search_advanced.snap | 11 +++++++--
 ...__apply__test__fuzzy_search_replace-3.snap | 11 +++++++--
 ...ch__apply__test__fuzzy_search_replace.snap | 11 +++++++--
 ...__patch__apply__test__multiple_blocks.snap |  7 ++++--
 ...atch__apply__test__valid_rust_replace.snap |  5 ++--
 ..._apply__test__whitespace_preservation.snap |  7 ++++--
 14 files changed, 121 insertions(+), 28 deletions(-)

diff --git a/crates/forge_services/src/tools/patch/apply.rs b/crates/forge_services/src/tools/patch/apply.rs
index 59b1411247..f1187d8cf5 100644
--- a/crates/forge_services/src/tools/patch/apply.rs
+++ b/crates/forge_services/src/tools/patch/apply.rs
@@ -192,8 +192,9 @@ impl<T: Infrastructure> ExecutableTool for ApplyPatch<T> {
                 )
             } else {
                 format!(
-                    "<file_content\n  path=\"{}\" status=\"patched_successfully\" />\n",
-                    input.path
+                    "<file_content path=\"{}\">\n{}\n</file_content>\n",
+                    input.path,
+                    modified.trim_end()
                 )
             };
             anyhow::Ok(output)
diff --git a/crates/forge_services/src/tools/patch/apply_json.rs b/crates/forge_services/src/tools/patch/apply_json.rs
index 1156396c78..60c579b827 100644
--- a/crates/forge_services/src/tools/patch/apply_json.rs
+++ b/crates/forge_services/src/tools/patch/apply_json.rs
@@ -236,8 +236,9 @@ fn format_output(path: &str, content: &str, warning: Option<&str>) -> String {
         )
     } else {
         format!(
-            "<file_content\n  path=\"{}\" status=\"patched_successfully\" />\n",
-            path
+            "<file_content path=\"{}\">\n{}\n</file_content>\n",
+            path,
+            content.trim_end()
         )
     }
 }
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-3.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-3.snap
index a7c11d0eb1..f0a0ff42d4 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-3.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-3.snap
@@ -2,5 +2,22 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+
+
+// Header comment
+
+
+function test() {
+    // Inside comment
+
+    let y = 2;
+
+
+    console.log(y);
+}
+
+
+
+// Updated footer
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-5.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-5.snap
index a7c11d0eb1..1d2b712332 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-5.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-5.snap
@@ -2,5 +2,24 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+
+
+
+// New header
+
+
+
+function test() {
+    // Inside comment
+
+    let y = 2;
+
+
+    console.log(y);
+}
+
+
+
+// Updated footer
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation.snap
index a7c11d0eb1..86a8a70170 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation.snap
@@ -2,5 +2,20 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+
+
+// Header comment
+
+
+function test() {
+    // Inside comment
+
+    let y = 2;
+
+
+    console.log(y);
+}
+
+// Footer comment
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_block.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_block.snap
index a7c11d0eb1..6bfb5b4116 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_block.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_block.snap
@@ -2,5 +2,7 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+    First Line    
+    Last Line
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_search_new_file.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_search_new_file.snap
index a7c11d0eb1..a224fa079e 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_search_new_file.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_search_new_file.snap
@@ -2,5 +2,6 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+New content
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced-3.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced-3.snap
index a7c11d0eb1..48228bc6e6 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced-3.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced-3.snap
@@ -2,5 +2,14 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+class UserManager {
+  async findUser(id, options = {}) {
+    const user = await this.db.findOne({ userId: id, ...options });
+    if (!user) {
+      throw new UserNotFoundError(id);
+    }
+    return this.sanitizeUser(user);
+  }
+}
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced.snap
index a7c11d0eb1..c10e82b95e 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced.snap
@@ -2,5 +2,12 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+class UserManager {
+  async findUser(id, options = {}) {
+    const user = await this.db.findOne({ userId: id, ...options });
+    if (!user) throw new Error('User not found');
+    return user;
+  }
+}
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace-3.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace-3.snap
index a7c11d0eb1..55e4a2a89d 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace-3.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace-3.snap
@@ -2,5 +2,12 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+function computeTotal(items, tax = 0) {
+  let total = 0.0;
+  for (const item of items) {
+    total += item.price * item.quantity;
+  }
+  return total;
+}
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace.snap
index a7c11d0eb1..d293917c0a 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace.snap
@@ -2,5 +2,12 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+function calculateTotal(items) {
+  let total = 0;
+  for (const item of items) {
+    total += item.price * item.quantity;
+  }
+  return total;
+}
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__multiple_blocks.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__multiple_blocks.snap
index a7c11d0eb1..0b4b46e60c 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__multiple_blocks.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__multiple_blocks.snap
@@ -2,5 +2,8 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+    New First    
+  Middle Line  
+    New Last
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__valid_rust_replace.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__valid_rust_replace.snap
index ad2d27a01e..f2cef3967c 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__valid_rust_replace.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__valid_rust_replace.snap
@@ -2,5 +2,6 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.rs" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.rs">
+fn main() { let x = 42; let y = x * 2; }
+</file_content>
diff --git a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__whitespace_preservation.snap b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__whitespace_preservation.snap
index a7c11d0eb1..5b20b000cc 100644
--- a/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__whitespace_preservation.snap
+++ b/crates/forge_services/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__whitespace_preservation.snap
@@ -2,5 +2,8 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content
-  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
+<file_content path="[TEMP_DIR]/test.txt">
+    Hi World    
+  Test Line  
+   Goodbye World
+</file_content>