Skip to content

Fix issues on builtin filesystem tools #2125

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
dgageot merged 7 commits into from
Mar 16, 2026
Merged

Fix issues on builtin filesystem tools #2125

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce3f638
filesystem: avoid duplicate string(content) allocation in handleReadFile
dgageot Mar 16, 2026
8b3e7d9
filesystem: avoid triple string(content) allocation in handleReadMult…
dgageot Mar 16, 2026
7528035
filesystem: use errors.Is(err, fs.ErrNotExist) instead of os.IsNotExist
dgageot Mar 16, 2026
370923b
filesystem: simplify shouldIgnorePath return
dgageot Mar 16, 2026
77cbdba
filesystem: remove dead not-found check in readImageFile
dgageot Mar 16, 2026
091ab58
filesystem: promote no-op isPathAllowed to package-level var
dgageot Mar 16, 2026
ea4271f
filesystem: fix review issues in previous commits
dgageot Mar 16, 2026
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
41 changes: 18 additions & 23 deletions pkg/tools/builtin/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"io/fs"
"log/slog"
Expand Down Expand Up @@ -51,6 +52,9 @@ var (
_ tools.Instructable = (*FilesystemTool)(nil)
)

// allowAllPaths is a no-op path filter that permits every path.
func allowAllPaths(_ string) error { return nil }

type FileSystemOpt func(*FilesystemTool)

func WithPostEditCommands(postEditCommands []PostEditConfig) FileSystemOpt {
Expand Down Expand Up @@ -375,23 +379,15 @@ func (t *FilesystemTool) shouldIgnorePath(path string) bool {
// Lazily initialize the gitignore matcher on first use
t.initGitignoreMatcher()

if t.repoMatcher != nil && t.repoMatcher.ShouldIgnore(path) {
return true
}

return false
return t.repoMatcher != nil && t.repoMatcher.ShouldIgnore(path)
}

// Handler implementations

func (t *FilesystemTool) handleDirectoryTree(ctx context.Context, args DirectoryTreeArgs) (*tools.ToolCallResult, error) {
resolvedPath := t.resolvePath(args.Path)

isPathAllowed := func(_ string) error {
return nil
}

tree, err := fsx.DirectoryTree(ctx, resolvedPath, isPathAllowed, t.shouldIgnorePath, maxFiles)
tree, err := fsx.DirectoryTree(ctx, resolvedPath, allowAllPaths, t.shouldIgnorePath, maxFiles)
if err != nil {
return tools.ResultError(fmt.Sprintf("Error building directory tree: %s", err)), nil
}
Expand Down Expand Up @@ -512,7 +508,7 @@ func (t *FilesystemTool) handleReadFile(_ context.Context, args ReadFileArgs) (*
info, err := os.Stat(resolvedPath)
if err != nil {
var errMsg string
if os.IsNotExist(err) {
if errors.Is(err, fs.ErrNotExist) {
errMsg = "not found"
} else {
errMsg = err.Error()
Expand Down Expand Up @@ -543,24 +539,22 @@ func (t *FilesystemTool) handleReadFile(_ context.Context, args ReadFileArgs) (*
}, nil
}

text := string(content)

return &tools.ToolCallResult{
Output: string(content),
Output: text,
Meta: ReadFileMeta{
LineCount: strings.Count(string(content), "\n") + 1,
LineCount: strings.Count(text, "\n") + 1,
},
}, nil
}

// readImageFile reads an image file and returns it as base64-encoded image content.
// The caller must ensure the file exists (e.g. via os.Stat) before calling this method.
func (t *FilesystemTool) readImageFile(resolvedPath, originalPath string) (*tools.ToolCallResult, error) {
data, err := os.ReadFile(resolvedPath)
if err != nil {
var errMsg string
if os.IsNotExist(err) {
errMsg = "not found"
} else {
errMsg = err.Error()
}
errMsg := err.Error()
return &tools.ToolCallResult{
Output: errMsg,
IsError: true,
Expand Down Expand Up @@ -627,7 +621,7 @@ func (t *FilesystemTool) handleReadMultipleFiles(ctx context.Context, args ReadM
content, err := os.ReadFile(resolvedPath)
if err != nil {
errMsg := err.Error()
if os.IsNotExist(err) {
if errors.Is(err, fs.ErrNotExist) {
errMsg = "not found"
}
contents = append(contents, PathContent{
Expand All @@ -639,12 +633,13 @@ func (t *FilesystemTool) handleReadMultipleFiles(ctx context.Context, args ReadM
continue
}

text := string(content)
contents = append(contents, PathContent{
Path: path,
Content: string(content),
Content: text,
})
entry.Content = string(content)
entry.LineCount = strings.Count(string(content), "\n") + 1
entry.Content = text
entry.LineCount = strings.Count(text, "\n") + 1
meta.Files = append(meta.Files, entry)
}

Expand Down
Loading