Skip to content

fix: restore relative and absolute path printing in fs_write after slash command refactor #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaynabors merged 1 commit into from
Jun 23, 2025
Merged

fix: restore relative and absolute path printing in fs_write after slash command refactor #296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions crates/chat-cli/src/cli/chat/tools/fs_write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,11 @@ impl FsWrite {
match self {
FsWrite::Create { path, .. } => {
let file_text = self.canonical_create_command_text();
let relative_path = format_path(cwd, path);
let prev = if ctx.fs.exists(path) {
let file = ctx.fs.read_to_string_sync(path)?;
stylize_output_if_able(ctx, path, &file)
let path = sanitize_path_tool_arg(ctx, path);
let relative_path = format_path(cwd, &path);
let prev = if ctx.fs.exists(&path) {
let file = ctx.fs.read_to_string_sync(&path)?;
stylize_output_if_able(ctx, &path, &file)
} else {
Default::default()
};
Expand All @@ -188,8 +189,9 @@ impl FsWrite {
insert_line,
new_str,
} => {
let relative_path = format_path(cwd, path);
let file = ctx.fs.read_to_string_sync(&relative_path)?;
let path = sanitize_path_tool_arg(ctx, path);
let relative_path = format_path(cwd, &path);
let file = ctx.fs.read_to_string_sync(&path)?;

// Diff the old with the new by adding extra context around the line being inserted
// at.
Expand All @@ -207,8 +209,9 @@ impl FsWrite {
Ok(())
},
FsWrite::StrReplace { path, old_str, new_str } => {
let relative_path = format_path(cwd, path);
let file = ctx.fs.read_to_string_sync(&relative_path)?;
let path = sanitize_path_tool_arg(ctx, path);
let relative_path = format_path(cwd, &path);
let file = ctx.fs.read_to_string_sync(&path)?;
let (start_line, _) = match line_number_at(&file, old_str) {
Some((start_line, end_line)) => (start_line, end_line),
_ => (0, 0),
Expand All @@ -220,8 +223,9 @@ impl FsWrite {
Ok(())
},
FsWrite::Append { path, new_str } => {
let relative_path = format_path(cwd, path);
let start_line = ctx.fs.read_to_string_sync(&relative_path)?.lines().count() + 1;
let path = sanitize_path_tool_arg(ctx, path);
let relative_path = format_path(cwd, &path);
let start_line = ctx.fs.read_to_string_sync(&path)?.lines().count() + 1;
let file = stylize_output_if_able(ctx, &relative_path, new_str);
print_diff(output, &Default::default(), &file, start_line)?;
Ok(())
Expand Down
Loading