chore: avoid sending file content back to LLM while creating file (tailcallhq#950)

ssddOnTop · tusharmath · web-flow · commit 14d930fa3e6d · 2025-06-13T13:16:41.000-07:00
Co-authored-by: Tushar Mathur &lt;tusharmath@gmail.com&gt;
diff --git a/crates/forge_app/src/execution_result.rs b/crates/forge_app/src/execution_result.rs
@@ -54,9 +54,9 @@ impl ExecutionResult {
                     let diff =
                         console::strip_ansi_codes(&DiffFormat::format(&before, &input.content))
                             .to_string();
-                    Element::new("file_diff").cdata(diff)
+                    Element::new("file_overwritten").append(Element::new("file_diff").cdata(diff))
                 } else {
-                    Element::new("file_content").cdata(&input.content)
+                    Element::new("file_created")
                 };
 
                 elm = elm
diff --git a/crates/forge_app/src/snapshots/forge_app__execution_result__tests__fs_create_basic.snap b/crates/forge_app/src/snapshots/forge_app__execution_result__tests__fs_create_basic.snap
@@ -2,8 +2,8 @@
 source: crates/forge_app/src/execution_result.rs
 expression: to_value(actual)
 ---
-<file_content
+<file_created
   path="/home/user/new_file.txt"
   total_lines="1"
-><![CDATA[Hello, world!]]>
-</file_content>
+>
+</file_created>
diff --git a/crates/forge_app/src/snapshots/forge_app__execution_result__tests__fs_create_overwrite.snap b/crates/forge_app/src/snapshots/forge_app__execution_result__tests__fs_create_overwrite.snap
@@ -2,10 +2,11 @@
 source: crates/forge_app/src/execution_result.rs
 expression: to_value(actual)
 ---
-<file_diff
+<file_overwritten
   path="/home/user/existing_file.txt"
   total_lines="1"
-><![CDATA[1        |-Old content
+>
+<file_diff><![CDATA[1        |-Old content
     1    |+New content for the file
-]]>
-</file_diff>
+]]></file_diff>
+</file_overwritten>
diff --git a/crates/forge_app/src/snapshots/forge_app__execution_result__tests__fs_create_with_warning.snap b/crates/forge_app/src/snapshots/forge_app__execution_result__tests__fs_create_with_warning.snap
@@ -2,9 +2,9 @@
 source: crates/forge_app/src/execution_result.rs
 expression: to_value(actual)
 ---
-<file_content
+<file_created
   path="/home/user/file_with_warning.txt"
   total_lines="1"
-><![CDATA[Content with warning]]>
+>
 <warning>File created in non-standard location</warning>
-</file_content>
+</file_created>
diff --git a/crates/forge_fs/src/error.rs b/crates/forge_fs/src/error.rs
@@ -11,6 +11,9 @@ pub enum Error {
     #[error("Start position {start} is beyond the file size of {total} characters")]
     StartBeyondFileSize { start: u64, total: u64 },
 
+    #[error("Start position {start} and end position {end} must be 1-based (inclusive)")]
+    IndexStartingWithZero { start: u64, end: u64 },
+
     #[error("Start position {start} is greater than end position {end}")]
     StartGreaterThanEnd { start: u64, end: u64 },
 
diff --git a/crates/forge_fs/src/read_range.rs b/crates/forge_fs/src/read_range.rs
@@ -26,9 +26,6 @@ impl crate::ForgeFS {
         let path_ref = path.as_ref();
 
         // Basic validation
-        if start_line == 0 || end_line == 0 {
-            return Err(Error::StartBeyondFileSize { start: start_line, total: 0 }.into());
-        }
         if start_line > end_line {
             return Err(Error::StartGreaterThanEnd { start: start_line, end: end_line }.into());
         }
@@ -38,6 +35,10 @@ impl crate::ForgeFS {
             .await
             .with_context(|| format!("Failed to open file {}", path_ref.display()))?;
 
+        if start_line == 0 || end_line == 0 {
+            return Err(Error::IndexStartingWithZero { start: start_line, end: end_line }.into());
+        }
+
         let (is_text, file_type) = Self::is_binary(&mut file).await?;
         if !is_text {
             return Err(Error::BinaryFileNotSupported(file_type).into());
@@ -47,7 +48,10 @@ impl crate::ForgeFS {
         let content = tokio::fs::read_to_string(path_ref)
             .await
             .with_context(|| format!("Failed to read file content from {}", path_ref.display()))?;
-
+        if start_line < 2 && content.is_empty() {
+            // If the file is empty, return empty content
+            return Ok((String::new(), FileInfo::new(start_line, end_line, 0)));
+        }
         // Split into lines
         let lines: Vec<&str> = content.lines().collect();
         let total_lines = lines.len() as u64;
diff --git a/crates/forge_services/src/tools_v2/fs_create.rs b/crates/forge_services/src/tools_v2/fs_create.rs
@@ -57,7 +57,7 @@ impl<F: Infrastructure> FsCreateService for ForgeFsCreate<F> {
         }
 
         // record the file content before they're modified
-        let old_content = if file_exists {
+        let old_content = if file_exists && overwrite {
             Some(self.0.file_read_service().read_utf8(path).await?)
         } else {
             None

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ impl<F: Infrastructure> FsCreateService for ForgeFsCreate<F> {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// record the file content before they're modified`
`60`		`- let old_content = if file_exists {`
	`60`	`+ let old_content = if file_exists && overwrite {`
`61`	`61`	`Some(self.0.file_read_service().read_utf8(path).await?)`
`62`	`62`	`} else {`
`63`	`63`	`None`