diff --git a/crates/forge_services/src/tools/patch/apply.rs b/crates/forge_services/src/tools/patch/apply.rs
index f1187d8cf5..59b1411247 100644
--- a/crates/forge_services/src/tools/patch/apply.rs
+++ b/crates/forge_services/src/tools/patch/apply.rs
@@ -192,9 +192,8 @@ impl<T: Infrastructure> ExecutableTool for ApplyPatch<T> {
                 )
             } else {
                 format!(
-                    "<file_content path=\"{}\">\n{}\n</file_content>\n",
-                    input.path,
-                    modified.trim_end()
+                    "<file_content\n  path=\"{}\" status=\"patched_successfully\" />\n",
+                    input.path
                 )
             };
             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 60c579b827..1156396c78 100644
--- a/crates/forge_services/src/tools/patch/apply_json.rs
+++ b/crates/forge_services/src/tools/patch/apply_json.rs
@@ -236,9 +236,8 @@ fn format_output(path: &str, content: &str, warning: Option<&str>) -> String {
         )
     } else {
         format!(
-            "<file_content path=\"{}\">\n{}\n</file_content>\n",
-            path,
-            content.trim_end()
+            "<file_content\n  path=\"{}\" status=\"patched_successfully\" />\n",
+            path
         )
     }
 }
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 f0a0ff42d4..a7c11d0eb1 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,22 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.txt">
-
-
-// Header comment
-
-
-function test() {
-    // Inside comment
-
-    let y = 2;
-
-
-    console.log(y);
-}
-
-
-
-// Updated footer
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 1d2b712332..a7c11d0eb1 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,24 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.txt">
-
-
-
-// New header
-
-
-
-function test() {
-    // Inside comment
-
-    let y = 2;
-
-
-    console.log(y);
-}
-
-
-
-// Updated footer
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 86a8a70170..a7c11d0eb1 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,20 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.txt">
-
-
-// Header comment
-
-
-function test() {
-    // Inside comment
-
-    let y = 2;
-
-
-    console.log(y);
-}
-
-// Footer comment
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 6bfb5b4116..a7c11d0eb1 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,7 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.txt">
-    First Line    
-    Last Line
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 a224fa079e..a7c11d0eb1 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,6 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.txt">
-New content
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 48228bc6e6..a7c11d0eb1 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,14 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<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>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 c10e82b95e..a7c11d0eb1 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,12 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<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>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 55e4a2a89d..a7c11d0eb1 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,12 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<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>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 d293917c0a..a7c11d0eb1 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,12 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<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>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 0b4b46e60c..a7c11d0eb1 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,8 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.txt">
-    New First    
-  Middle Line  
-    New Last
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />
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 f2cef3967c..ad2d27a01e 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,6 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.rs">
-fn main() { let x = 42; let y = x * 2; }
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.rs" status="patched_successfully" />
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 5b20b000cc..a7c11d0eb1 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,8 +2,5 @@
 source: crates/forge_services/src/tools/patch/apply.rs
 expression: "TempDir::normalize(&result)"
 ---
-<file_content path="[TEMP_DIR]/test.txt">
-    Hi World    
-  Test Line  
-   Goodbye World
-</file_content>
+<file_content
+  path="[TEMP_DIR]/test.txt" status="patched_successfully" />