diff --git a/crates/agent/src/tools/read_file_tool.rs b/crates/agent/src/tools/read_file_tool.rs index d88199add66..e02c2fa71a7 100644 --- a/crates/agent/src/tools/read_file_tool.rs +++ b/crates/agent/src/tools/read_file_tool.rs @@ -1,3 +1,4 @@ +use super::deserialize_maybe_stringified; use action_log::ActionLog; use agent_client_protocol::v2::schema as acp; use anyhow::{Context as _, Result, anyhow}; @@ -228,10 +229,10 @@ pub struct ReadFileToolInput { /// pub path: String, /// Optional line number to start reading on (1-based index) - #[serde(default)] + #[serde(default, deserialize_with = "deserialize_maybe_stringified")] pub start_line: Option, /// Optional line number to end reading on (1-based index, inclusive) - #[serde(default)] + #[serde(default, deserialize_with = "deserialize_maybe_stringified")] pub end_line: Option, } @@ -981,6 +982,73 @@ mod test { ); } + #[gpui::test] + async fn test_read_file_line_range_input_formats(cx: &mut TestAppContext) { + init_test(cx); + + let fs = FakeFs::new(cx.executor()); + fs.insert_tree( + path!("/root"), + json!({ + "multiline.txt": "Line 1\nLine 2\nLine 3" + }), + ) + .await; + let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await; + let action_log = cx.new(|_| ActionLog::new(project.clone())); + let tool = Arc::new(ReadFileTool::new(project, action_log, true)); + + let run = |input: serde_json::Value, cx: &mut TestAppContext| { + cx.update(|cx| { + tool.clone() + .run(ToolInput::ready(input), ToolCallEventStream::test().0, cx) + }) + }; + + // Numeric bounds read the requested range. + let line_range = " 2\tLine 2\n 3\tLine 3"; + let result = run( + json!({ "path": "root/multiline.txt", "start_line": 2, "end_line": 3 }), + cx, + ) + .await; + assert_eq!(result.unwrap(), line_range.into()); + + // Quoted numeric bounds read the same range. + let result = run( + json!({ "path": "root/multiline.txt", "start_line": "2", "end_line": "3" }), + cx, + ) + .await; + assert_eq!(result.unwrap(), line_range.into()); + + // Omitted bounds read the whole file. + let whole_file = " 1\tLine 1\n 2\tLine 2\n 3\tLine 3"; + let result = run(json!({ "path": "root/multiline.txt" }), cx).await; + assert_eq!(result.unwrap(), whole_file.into()); + + // Null bounds read the whole file, same as omitted. + let result = run( + json!({ "path": "root/multiline.txt", "start_line": null, "end_line": null }), + cx, + ) + .await; + assert_eq!(result.unwrap(), whole_file.into()); + + // Strings that are not valid line numbers are rejected. + for invalid_line in ["abc", "-1", "1.5", ""] { + let result = run( + json!({ "path": "root/multiline.txt", "start_line": invalid_line }), + cx, + ) + .await; + assert!( + result.is_err(), + "start_line {invalid_line:?} should be rejected" + ); + } + } + #[gpui::test] async fn test_read_file_line_range_edge_cases(cx: &mut TestAppContext) { init_test(cx);