mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-19 06:59:22 +01:00
agent: Accept stringified line numbers in read_file tool (#67072)
## Summary This addresses when agents send strings for `start_line` and `end_line` which cause an error: > string "300", expected u32 The agent can go pathological and blow the context out which causes it to fail the assigned task worst case, but wastes a lot of tokens otherwise. Closes #67071 ## Testing Unit tests have been updated such that testing the string serialized `start_line` and `end_line`, as well as integers, are now both parsed by serde. Agent testing with local models, qwen3.8:27b via ollama, no longer run into the serialization problem. I've been running a dev compiled binary for about a week with this change and have used the agent several times in many projects, including to address another issue with the `terminal` tool leaking instructions to the agent when the `terminal` has been denied (which I'll open separately) and the agent is performing well with the dev binary containing the change to the `read_file` tool. See the attached screenshots for the previous behavior: <img width="1257" height="1748" alt="image" src="https://github.com/user-attachments/assets/0ab948a9-8d8e-40ba-9997-21f6dcccbca3" /> The new behavior: <img width="1610" height="1802" alt="image" src="https://github.com/user-attachments/assets/4a410892-402b-4702-84d3-3268d7e78a33" /> ## Self-review - [X] I've reviewed my diff for quality, security, reliability, and performance. - [X] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [X] Tests cover the new or changed behavior. Release Notes: - Fixed the agent's `read_file` tool failing when models pass `start_line`/`end_line` as strings. --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
This commit is contained in:
committed by
GitHub
parent
482e76524b
commit
6e7c5d3ae8
@@ -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 {
|
||||
/// </example>
|
||||
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<u32>,
|
||||
/// Optional line number to end reading on (1-based index, inclusive)
|
||||
#[serde(default)]
|
||||
#[serde(default, deserialize_with = "deserialize_maybe_stringified")]
|
||||
pub end_line: Option<u32>,
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user