perf: make read operation output consistent across tools (#1790)

Author: laststylebender14

crates/forge_domain/src/line_numbers.rs

@@ -13,7 +13,7 @@ impl<T: AsRef<str>> LineNumbers for T {
         self.as_ref()
             .lines()
             .enumerate()
-            .map(|(i, line)| format!("{}: {}", start + i, line))
+            .map(|(i, line)| format!("{}:{}", start + i, line))
             .collect::<Vec<_>>()
             .join("\n")
     }
@@ -26,21 +26,21 @@ mod tests {
     #[test]
     fn test_numbered_default_start() {
         let text = "first line\nsecond line\nthird line";
-        let expected = "1: first line\n2: second line\n3: third line";
+        let expected = "1:first line\n2:second line\n3:third line";
         assert_eq!(text.numbered(), expected);
     }
 
     #[test]
     fn test_numbered_from_custom_start() {
         let text = "alpha\nbeta\ngamma";
-        let expected = "5: alpha\n6: beta\n7: gamma";
+        let expected = "5:alpha\n6:beta\n7:gamma";
         assert_eq!(text.numbered_from(5), expected);
     }
 
     #[test]
     fn test_numbered_single_line() {
         let text = "single line";
-        let expected = "1: single line";
+        let expected = "1:single line";
         assert_eq!(text.numbered(), expected);
     }
 
@@ -54,7 +54,7 @@ mod tests {
     #[test]
     fn test_numbered_with_empty_lines() {
         let text = "line1\n\nline3";
-        let expected = "1: line1\n2: \n3: line3";
+        let expected = "1:line1\n2:\n3:line3";
         assert_eq!(text.numbered(), expected);
     }
 }

crates/forge_domain/src/snapshots/forge_domain__tool_usage__tests__tool_usage.snap

@@ -7,7 +7,7 @@ expression: prompt
 <tool>{"name":"write","description":"Use it to create a new file at a specified path with the provided content.\n Always provide absolute paths for file locations. The tool\n automatically handles the creation of any missing intermediary directories\n in the specified path.\n IMPORTANT: DO NOT attempt to use this tool to move or rename files, use the\n shell tool instead.","arguments":{"content":{"description":"The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified.","type":"string","is_required":true},"overwrite":{"description":"If set to true, existing files will be overwritten. If not set and the file exists, an error will be returned with the content of the existing file.","type":"boolean","is_required":false},"path":{"description":"The path of the file to write to (absolute path required)","type":"string","is_required":true}}}</tool>
 <tool>{"name":"search","description":"Recursively searches directories for files by content (regex) and/or name\n (glob pattern). Provides context-rich results with line numbers for content\n matches. Two modes: content search (when regex provided) or file finder\n (when regex omitted). Uses case-insensitive Rust regex syntax. Requires\n absolute paths. Avoids binary files and excluded directories. Best for code\n exploration, API usage discovery, configuration settings, or finding\n patterns across projects. For large pages, returns the first 200\n lines and stores the complete content in a temporary file for\n subsequent access.","arguments":{"file_pattern":{"description":"Glob pattern to filter files (e.g., '*.ts' for TypeScript files). If not provided, it will search all files (*).","type":"string","is_required":false},"max_search_lines":{"description":"Maximum number of lines to return in the search results.","type":"integer","is_required":false},"path":{"description":"The absolute path of the directory or file to search in. If it's a directory, it will be searched recursively. If it's a file path, only that specific file will be searched.","type":"string","is_required":true},"regex":{"description":"The regular expression pattern to search for in file contents. Uses Rust regex syntax. If not provided, only file name matching will be performed.","type":"string","is_required":false},"start_index":{"description":"Starting index for the search results (1-based).","type":"integer","is_required":false}}}</tool>
 <tool>{"name":"remove","description":"Request to remove a file at the specified path. Use this when you need to\n delete an existing file. The path must be absolute. This operation cannot\n be undone, so use it carefully.","arguments":{"path":{"description":"The path of the file to remove (absolute path required)","type":"string","is_required":true}}}</tool>
-<tool>{"name":"patch","description":"Modifies files with targeted line operations on matched patterns. Supports\n prepend, append, replace, replace_all, swap operations. Ideal for precise\n changes to configs, code, or docs while preserving context. Not suitable for\n complex refactoring or modifying all pattern occurrences - use `write`\n instead for complete rewrites and `undo` for undoing the last operation.\n Fails if search pattern isn\\'t found.\\\\n\\\\nUsage Guidelines:\\\\n-When editing\n text from Read tool output, ensure you preserve new lines and the exact\n indentation (tabs/spaces) as it appears AFTER the line number prefix. The\n line number prefix format is: line number + \\':\\' + one space. Everything\n after that space is the actual file content to match. Never include any part\n of the line number prefix in the search or content","arguments":{"content":{"description":"The text to replace it with (must be different from search)","type":"string","is_required":true},"operation":{"description":"The operation to perform on the matched text. Possible options are: - 'prepend': Add content before the matched text - 'append': Add content after the matched text - 'replace': Use only for specific, targeted replacements where you need to modify just the first match. - 'replace_all': Should be used for renaming variables, functions, types, or any widespread replacements across the file. This is the recommended choice for consistent refactoring operations as it ensures all occurrences are updated. - 'swap': Replace the matched text with another text (search for the second text and swap them)","type":"string","is_required":true},"path":{"description":"The path to the file to modify","type":"string","is_required":true},"search":{"description":"The text to replace. When skipped the patch operation applies to the entire content. `Append` adds the new content to the end, `Prepend` adds it to the beginning, and `Replace` fully overwrites the original content. `Swap` requires a search target, so without one, it makes no changes.","type":"string","is_required":false}}}</tool>
+<tool>{"name":"patch","description":"Modifies files with targeted line operations on matched patterns. Supports\n prepend, append, replace, replace_all, swap operations. Ideal for precise\n changes to configs, code, or docs while preserving context. Not suitable for\n complex refactoring or modifying all pattern occurrences - use `write`\n instead for complete rewrites and `undo` for undoing the last operation.\n Fails if search pattern isn\\'t found.\\\\n\\\\nUsage Guidelines:\\\\n-When editing\n text from Read tool output, ensure you preserve new lines and the exact\n indentation (tabs/spaces) as it appears AFTER the line number prefix. The\n line number prefix format is: line number + \\':\\'. Everything\n after that is the actual file content to match. Never include any part\n of the line number prefix in the search or content","arguments":{"content":{"description":"The text to replace it with (must be different from search)","type":"string","is_required":true},"operation":{"description":"The operation to perform on the matched text. Possible options are: - 'prepend': Add content before the matched text - 'append': Add content after the matched text - 'replace': Use only for specific, targeted replacements where you need to modify just the first match. - 'replace_all': Should be used for renaming variables, functions, types, or any widespread replacements across the file. This is the recommended choice for consistent refactoring operations as it ensures all occurrences are updated. - 'swap': Replace the matched text with another text (search for the second text and swap them)","type":"string","is_required":true},"path":{"description":"The path to the file to modify","type":"string","is_required":true},"search":{"description":"The text to replace. When skipped the patch operation applies to the entire content. `Append` adds the new content to the end, `Prepend` adds it to the beginning, and `Replace` fully overwrites the original content. `Swap` requires a search target, so without one, it makes no changes.","type":"string","is_required":false}}}</tool>
 <tool>{"name":"undo","description":"Reverts the most recent file operation (create/modify/delete) on a specific\n file. Use this tool when you need to recover from incorrect file changes or\n if a revert is requested by the user.","arguments":{"path":{"description":"The absolute path of the file to revert to its previous state.","type":"string","is_required":true}}}</tool>
 <tool>{"name":"shell","description":"Executes shell commands with safety measures using restricted bash (rbash).\n Prevents potentially harmful operations like absolute path execution and\n directory changes. Use for file system interaction, running utilities,\n installing packages, or executing build commands. For operations requiring\n unrestricted access, advise users to run forge CLI with \\'-u\\' flag. Returns\n complete output including stdout, stderr, and exit code for diagnostic\n purposes.","arguments":{"command":{"description":"The shell command to execute.","type":"string","is_required":true},"cwd":{"description":"The working directory where the command should be executed.","type":"string","is_required":true},"env":{"description":"Environment variable names to pass to command execution (e.g., [\"PATH\", \"HOME\", \"USER\"]). The system automatically reads the specified values and applies them during command execution.","type":"array","is_required":false},"keep_ansi":{"description":"Whether to preserve ANSI escape codes in the output. If true, ANSI escape codes will be preserved in the output. If false (default), ANSI escape codes will be stripped from the output.","type":"boolean","is_required":false}}}</tool>
 <tool>{"name":"fetch","description":"Input type for the net fetch tool","arguments":{"raw":{"description":"Get raw content without any markdown conversion (default: false)","type":"boolean","is_required":false},"url":{"description":"URL to fetch","type":"string","is_required":true}}}</tool>

crates/forge_domain/src/snapshots/forge_domain__tools__tests__tool_definition_json.snap

@@ -122,7 +122,7 @@ expression: tools
 }
 {
   "title": "FSPatch",
-  "description": "Modifies files with targeted line operations on matched patterns. Supports prepend, append, replace, replace_all, swap operations. Ideal for precise changes to configs, code, or docs while preserving context. Not suitable for complex refactoring or modifying all pattern occurrences - use `write` instead for complete rewrites and `undo` for undoing the last operation. Fails if search pattern isn't found.\\n\\nUsage Guidelines:\\n-When editing text from Read tool output, ensure you preserve new lines and the exact indentation (tabs/spaces) as it appears AFTER the line number prefix. The line number prefix format is: line number + ':' + one space. Everything after that space is the actual file content to match. Never include any part of the line number prefix in the search or content",
+  "description": "Modifies files with targeted line operations on matched patterns. Supports prepend, append, replace, replace_all, swap operations. Ideal for precise changes to configs, code, or docs while preserving context. Not suitable for complex refactoring or modifying all pattern occurrences - use `write` instead for complete rewrites and `undo` for undoing the last operation. Fails if search pattern isn't found.\\n\\nUsage Guidelines:\\n-When editing text from Read tool output, ensure you preserve new lines and the exact indentation (tabs/spaces) as it appears AFTER the line number prefix. The line number prefix format is: line number + ':'. Everything after that is the actual file content to match. Never include any part of the line number prefix in the search or content",
   "type": "object",
   "required": [
     "content",

crates/forge_domain/src/tools.rs

@@ -239,8 +239,8 @@ impl JsonSchema for PatchOperation {
 /// Fails if search pattern isn't found.\n\nUsage Guidelines:\n-When editing
 /// text from Read tool output, ensure you preserve new lines and the exact
 /// indentation (tabs/spaces) as it appears AFTER the line number prefix. The
-/// line number prefix format is: line number + ':' + one space. Everything
-/// after that space is the actual file content to match. Never include any part
+/// line number prefix format is: line number + ':'. Everything
+/// after that is the actual file content to match. Never include any part
 /// of the line number prefix in the search or content
 #[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema, ToolDescription, PartialEq)]
 pub struct FSPatch {

crates/forge_services/src/attachment.rs

@@ -816,7 +816,7 @@ pub mod tests {
         assert_eq!(
             attachments[0].content,
             AttachmentContent::FileContent {
-                content: "2: Line 2".to_string(),
+                content: "2:Line 2".to_string(),
                 start_line: 2,
                 end_line: 2,
                 total_lines: 5,
@@ -845,7 +845,7 @@ pub mod tests {
         assert_eq!(
             attachments[0].content,
             AttachmentContent::FileContent {
-                content: "2: Line 2\n3: Line 3\n4: Line 4".to_string(),
+                content: "2:Line 2\n3:Line 3\n4:Line 4".to_string(),
                 start_line: 2,
                 end_line: 4,
                 total_lines: 6,
@@ -870,7 +870,7 @@ pub mod tests {
         assert_eq!(
             attachments[0].content,
             AttachmentContent::FileContent {
-                content: "1: First\n2: Second".to_string(),
+                content: "1:First\n2:Second".to_string(),
                 start_line: 1,
                 end_line: 2,
                 total_lines: 4,
@@ -895,7 +895,7 @@ pub mod tests {
         assert_eq!(
             attachments[0].content,
             AttachmentContent::FileContent {
-                content: "3: Gamma\n4: Delta\n5: Epsilon".to_string(),
+                content: "3:Gamma\n4:Delta\n5:Epsilon".to_string(),
                 start_line: 3,
                 end_line: 5,
                 total_lines: 5,
@@ -920,7 +920,7 @@ pub mod tests {
         assert_eq!(
             attachments[0].content,
             AttachmentContent::FileContent {
-                content: "1: Only line".to_string(),
+                content: "1:Only line".to_string(),
                 start_line: 1,
                 end_line: 1,
                 total_lines: 1,
@@ -948,7 +948,7 @@ pub mod tests {
         assert_eq!(
             attachments[0].content,
             AttachmentContent::FileContent {
-                content: "1: A1\n2: A2".to_string(),
+                content: "1:A1\n2:A2".to_string(),
                 start_line: 1,
                 end_line: 2,
                 total_lines: 3,
@@ -957,7 +957,7 @@ pub mod tests {
         assert_eq!(
             attachments[1].content,
             AttachmentContent::FileContent {
-                content: "3: B3\n4: B4".to_string(),
+                content: "3:B3\n4:B4".to_string(),
                 start_line: 3,
                 end_line: 4,
                 total_lines: 4,
@@ -985,7 +985,7 @@ pub mod tests {
         assert_eq!(
             attachments[0].content,
             AttachmentContent::FileContent {
-                content: "3: Meta3\n4: Meta4\n5: Meta5".to_string(),
+                content: "3:Meta3\n4:Meta4\n5:Meta5".to_string(),
                 start_line: 3,
                 end_line: 5,
                 total_lines: 7,
@@ -1017,7 +1017,7 @@ pub mod tests {
         assert_eq!(
             attachments_full[0].content,
             AttachmentContent::FileContent {
-                content: "1: Full1\n2: Full2\n3: Full3\n4: Full4\n5: Full5".to_string(),
+                content: "1:Full1\n2:Full2\n3:Full3\n4:Full4\n5:Full5".to_string(),
                 start_line: 1,
                 end_line: 5,
                 total_lines: 5,
@@ -1028,7 +1028,7 @@ pub mod tests {
         assert_eq!(
             attachments_range[0].content,
             AttachmentContent::FileContent {
-                content: "2: Full2\n3: Full3\n4: Full4".to_string(),
+                content: "2:Full2\n3:Full3\n4:Full4".to_string(),
                 start_line: 2,
                 end_line: 4,
                 total_lines: 5,
@@ -1039,7 +1039,7 @@ pub mod tests {
         assert_eq!(
             attachments_range_start[0].content,
             AttachmentContent::FileContent {
-                content: "2: Full2\n3: Full3\n4: Full4\n5: Full5".to_string(),
+                content: "2:Full2\n3:Full3\n4:Full4\n5:Full5".to_string(),
                 start_line: 2,
                 end_line: 5,
                 total_lines: 5,