Merge pull request #1264 from rumpl/agent/remove-search-files

Remove search_files tool from filesystem builtin

Author: dgageot

e2e/testdata/cassettes/TestExec_Anthropic_ToolCall.yaml

@@ -12,8 +12,6 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/bmatcuk/doublestar/v4"
-
 	"github.com/docker/cagent/pkg/fsx"
 	"github.com/docker/cagent/pkg/tools"
 )
@@ -25,7 +23,6 @@ const (
 	ToolNameWriteFile          = "write_file"
 	ToolNameDirectoryTree      = "directory_tree"
 	ToolNameListDirectory      = "list_directory"
-	ToolNameSearchFiles        = "search_files"
 	ToolNameSearchFilesContent = "search_files_content"
 )
 
@@ -114,12 +111,6 @@ type ReadMultipleFilesMeta struct {
 	Files []ReadFileMeta `json:"files"`
 }
 
-type SearchFilesArgs struct {
-	Path            string   `json:"path" jsonschema:"The starting directory path"`
-	Pattern         string   `json:"pattern" jsonschema:"The glob pattern to match file names against"`
-	ExcludePatterns []string `json:"excludePatterns,omitempty" jsonschema:"Patterns to exclude from search"`
-}
-
 type SearchFilesContentArgs struct {
 	Path            string   `json:"path" jsonschema:"The starting directory path"`
 	Query           string   `json:"query" jsonschema:"The text or regex pattern to search for"`
@@ -243,18 +234,6 @@ func (t *FilesystemTool) Tools(context.Context) ([]tools.Tool, error) {
 				Title:        "Read Multiple Files",
 			},
 		},
-		{
-			Name:         ToolNameSearchFiles,
-			Category:     "filesystem",
-			Description:  "Recursively search for files and directories matching a pattern. Prints the full paths of matching files and the total number of files found. The pattern syntax is the same as Go's filepath.Match.",
-			Parameters:   tools.MustSchemaFor[SearchFilesArgs](),
-			OutputSchema: tools.MustSchemaFor[string](),
-			Handler:      NewHandler(t.handleSearchFiles),
-			Annotations: tools.ToolAnnotations{
-				ReadOnlyHint: true,
-				Title:        "Search Files",
-			},
-		},
 		{
 			Name:         ToolNameSearchFilesContent,
 			Category:     "filesystem",
@@ -543,55 +522,6 @@ func (t *FilesystemTool) handleReadMultipleFiles(ctx context.Context, args ReadM
 	}, nil
 }
 
-func (t *FilesystemTool) handleSearchFiles(_ context.Context, args SearchFilesArgs) (*tools.ToolCallResult, error) {
-	resolvedPath := t.resolvePath(args.Path)
-
-	var matches []string
-
-	err := filepath.WalkDir(resolvedPath, func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return nil // Skip errors and continue
-		}
-
-		// Check VCS ignore rules
-		if t.shouldIgnorePath(path) {
-			if d.IsDir() {
-				return fs.SkipDir
-			}
-			return nil
-		}
-
-		// Check exclude patterns against relative path from search root
-		relPath, err := filepath.Rel(resolvedPath, path)
-		if err != nil {
-			return nil
-		}
-
-		for _, exclude := range args.ExcludePatterns {
-			if matchExcludePattern(exclude, relPath) {
-				if d.IsDir() {
-					return fs.SkipDir
-				}
-				return nil
-			}
-		}
-		if match(args.Pattern, filepath.Base(path)) && !d.IsDir() {
-			matches = append(matches, path)
-		}
-
-		return nil
-	})
-	if err != nil {
-		return tools.ResultError(fmt.Sprintf("Error searching files: %s", err)), nil
-	}
-
-	if len(matches) == 0 {
-		return tools.ResultSuccess("No files found"), nil
-	}
-
-	return tools.ResultSuccess(fmt.Sprintf("%d files found:\n%s", len(matches), strings.Join(matches, "\n"))), nil
-}
-
 func (t *FilesystemTool) handleSearchFilesContent(_ context.Context, args SearchFilesContentArgs) (*tools.ToolCallResult, error) {
 	resolvedPath := t.resolvePath(args.Path)
 
@@ -744,8 +674,3 @@ func matchExcludePattern(pattern, relPath string) bool {
 
 	return false
 }
-
-func match(pattern, name string) bool {
-	matched, _ := doublestar.Match(pattern, name)
-	return matched || strings.Contains(strings.ToLower(name), strings.ToLower(pattern))
-}

e2e/testdata/cassettes/TestExec_Gemini_ToolCall.yaml

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -222,98 +221,6 @@ func TestFilesystemTool_EditFile(t *testing.T) {
 	assert.Contains(t, result.Output, "old text not found")
 }
 
-func TestFilesystemTool_SearchFiles(t *testing.T) {
-	t.Parallel()
-	tmpDir := t.TempDir()
-
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "Dockerfile"), []byte("FROM scratch"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("test"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.log"), []byte("log"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "data.txt"), []byte("data"), 0o644))
-
-	subDir := filepath.Join(tmpDir, "subdir")
-	require.NoError(t, os.Mkdir(subDir, 0o755))
-	require.NoError(t, os.WriteFile(filepath.Join(subDir, "test_sub.txt"), []byte("sub"), 0o644))
-
-	tool := NewFilesystemTool(tmpDir)
-	tests := []struct {
-		name            string
-		pattern         string
-		excludePatterns []string
-		wantCount       int
-		wantContains    []string
-		wantNotContains []string
-	}{
-		{
-			name:            "no files found",
-			pattern:         "asdf",
-			wantCount:       0,
-			wantContains:    []string{"No files found"},
-			wantNotContains: nil,
-		},
-		{
-			name:            "all files found",
-			pattern:         "*",
-			wantCount:       0,
-			wantContains:    []string{"5 files found:\n"},
-			wantNotContains: nil,
-		},
-		{
-			name:            "all files found with dot",
-			pattern:         "*.*",
-			wantCount:       0,
-			wantContains:    []string{"4 files found:\n"},
-			wantNotContains: nil,
-		},
-		{
-			name:            "dockerfile pattern",
-			pattern:         "Dockerfile*",
-			wantCount:       1,
-			wantContains:    []string{"1 files found:\n", "Dockerfile"},
-			wantNotContains: nil,
-		},
-		{
-			name:            "test pattern finds all",
-			pattern:         "test",
-			wantCount:       3,
-			wantContains:    []string{"3 files found:\n"},
-			wantNotContains: nil,
-		},
-		{
-			name:            "test pattern with log exclusion",
-			pattern:         "test",
-			excludePatterns: []string{"*.log"},
-			wantCount:       2,
-			wantContains:    []string{"test.txt"},
-			wantNotContains: []string{"test.log"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-			result, err := tool.handleSearchFiles(t.Context(), SearchFilesArgs{
-				Path:            ".",
-				Pattern:         tt.pattern,
-				ExcludePatterns: tt.excludePatterns,
-			})
-			require.NoError(t, err)
-
-			for _, want := range tt.wantContains {
-				assert.Contains(t, result.Output, want)
-			}
-			for _, notWant := range tt.wantNotContains {
-				assert.NotContains(t, result.Output, notWant)
-			}
-
-			if tt.wantCount > 0 {
-				lines := strings.Split(strings.TrimSpace(result.Output), "\n")
-				assert.Len(t, lines, tt.wantCount+1) // +1 for the header line
-			}
-		})
-	}
-}
-
 func TestFilesystemTool_SearchFilesContent(t *testing.T) {
 	t.Parallel()
 	tmpDir := t.TempDir()
@@ -356,28 +263,6 @@ func TestFilesystemTool_SearchFilesContent(t *testing.T) {
 	assert.Contains(t, result.Output, "Invalid regex pattern")
 }
 
-func TestFilesystemTool_SearchFiles_RecursivePattern(t *testing.T) {
-	t.Parallel()
-	tmpDir := t.TempDir()
-
-	require.NoError(t, os.Mkdir(filepath.Join(tmpDir, "child"), 0o755))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "first.txt"), []byte("first"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "ignored"), []byte("ignored"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "child", "second.txt"), []byte("second"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "child", "third.txt"), []byte("third"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "child", "ignored"), []byte("ignored"), 0o644))
-
-	tool := NewFilesystemTool(tmpDir)
-	result, err := tool.handleSearchFiles(t.Context(), SearchFilesArgs{
-		Path:    ".",
-		Pattern: "*.txt",
-	})
-	require.NoError(t, err)
-	lines := strings.Split(strings.TrimSpace(result.Output), "\n")
-	assert.Contains(t, result.Output, "3 files found:\n")
-	assert.Len(t, lines, 3+1) // Should find first.txt, second.txt, and third.txt
-}
-
 func TestFilesystemTool_PostEditCommands(t *testing.T) {
 	t.Parallel()
 	tmpDir := t.TempDir()
@@ -530,12 +415,12 @@ func TestFilesystemTool_IgnoreVCS_Default(t *testing.T) {
 	gitDir := filepath.Join(tmpDir, ".git")
 	require.NoError(t, os.Mkdir(gitDir, 0o755))
 	require.NoError(t, os.WriteFile(filepath.Join(gitDir, "config"), []byte("git config"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("test content"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("findme"), 0o644))
 
 	tool := NewFilesystemTool(tmpDir, WithIgnoreVCS(true))
-	result, err := tool.handleSearchFiles(t.Context(), SearchFilesArgs{
-		Path:    ".",
-		Pattern: "*",
+	result, err := tool.handleSearchFilesContent(t.Context(), SearchFilesContentArgs{
+		Path:  ".",
+		Query: "findme",
 	})
 	require.NoError(t, err)
 	assert.Contains(t, result.Output, "test.txt")
@@ -548,13 +433,13 @@ func TestFilesystemTool_IgnoreVCS_Disabled(t *testing.T) {
 
 	gitDir := filepath.Join(tmpDir, ".git")
 	require.NoError(t, os.Mkdir(gitDir, 0o755))
-	require.NoError(t, os.WriteFile(filepath.Join(gitDir, "config"), []byte("git config"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("test content"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(gitDir, "config"), []byte("findme"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("findme"), 0o644))
 
 	tool := NewFilesystemTool(tmpDir, WithIgnoreVCS(false))
-	result, err := tool.handleSearchFiles(t.Context(), SearchFilesArgs{
-		Path:    ".",
-		Pattern: "*",
+	result, err := tool.handleSearchFilesContent(t.Context(), SearchFilesContentArgs{
+		Path:  ".",
+		Query: "findme",
 	})
 	require.NoError(t, err)
 	assert.Contains(t, result.Output, "test.txt")
@@ -577,19 +462,19 @@ temp_*
 `
 	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, ".gitignore"), []byte(gitignoreContent), 0o644))
 
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("test"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "debug.log"), []byte("log"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "important.log"), []byte("important"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "temp_file.txt"), []byte("temp"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("findme"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "debug.log"), []byte("findme"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "important.log"), []byte("findme"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "temp_file.txt"), []byte("findme"), 0o644))
 	require.NoError(t, os.Mkdir(filepath.Join(tmpDir, "node_modules"), 0o755))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "node_modules", "package.json"), []byte("{}"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "node_modules", "package.json"), []byte("findme"), 0o644))
 	require.NoError(t, os.Mkdir(filepath.Join(tmpDir, "build"), 0o755))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "build", "output.js"), []byte("code"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "build", "output.js"), []byte("findme"), 0o644))
 
 	tool := NewFilesystemTool(tmpDir, WithIgnoreVCS(true))
-	result, err := tool.handleSearchFiles(t.Context(), SearchFilesArgs{
-		Path:    ".",
-		Pattern: "*",
+	result, err := tool.handleSearchFilesContent(t.Context(), SearchFilesContentArgs{
+		Path:  ".",
+		Query: "findme",
 	})
 	require.NoError(t, err)
 	assert.Contains(t, result.Output, "test.txt")
@@ -650,17 +535,17 @@ func TestFilesystemTool_SubdirectoryGitignorePatterns(t *testing.T) {
 	subDir := filepath.Join(tmpDir, "subdir")
 	require.NoError(t, os.Mkdir(subDir, 0o755))
 	require.NoError(t, os.WriteFile(filepath.Join(subDir, ".gitignore"), []byte("*.tmp\n"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "root.txt"), []byte("root"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "root.log"), []byte("log"), 0o644)) // ignored by root .gitignore
-	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "root.tmp"), []byte("tmp"), 0o644)) // NOT ignored (subdir .gitignore doesn't apply here)
-	require.NoError(t, os.WriteFile(filepath.Join(subDir, "sub.txt"), []byte("sub"), 0o644))
-	require.NoError(t, os.WriteFile(filepath.Join(subDir, "sub.log"), []byte("log"), 0o644)) // ignored by root .gitignore
-	require.NoError(t, os.WriteFile(filepath.Join(subDir, "sub.tmp"), []byte("tmp"), 0o644)) // ignored by subdir .gitignore
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "root.txt"), []byte("findme"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "root.log"), []byte("findme"), 0o644)) // ignored by root .gitignore
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "root.tmp"), []byte("findme"), 0o644)) // NOT ignored (subdir .gitignore doesn't apply here)
+	require.NoError(t, os.WriteFile(filepath.Join(subDir, "sub.txt"), []byte("findme"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(subDir, "sub.log"), []byte("findme"), 0o644)) // ignored by root .gitignore
+	require.NoError(t, os.WriteFile(filepath.Join(subDir, "sub.tmp"), []byte("findme"), 0o644)) // ignored by subdir .gitignore
 
 	tool := NewFilesystemTool(tmpDir, WithIgnoreVCS(true))
-	result, err := tool.handleSearchFiles(t.Context(), SearchFilesArgs{
-		Path:    ".",
-		Pattern: "*",
+	result, err := tool.handleSearchFilesContent(t.Context(), SearchFilesContentArgs{
+		Path:  ".",
+		Query: "findme",
 	})
 	require.NoError(t, err)
 

e2e/testdata/cassettes/TestExec_Mistral_ToolCall.yaml

@@ -9,7 +9,6 @@ import (
 	"github.com/docker/cagent/pkg/tui/components/tool/listdirectory"
 	"github.com/docker/cagent/pkg/tui/components/tool/readfile"
 	"github.com/docker/cagent/pkg/tui/components/tool/readmultiplefiles"
-	"github.com/docker/cagent/pkg/tui/components/tool/searchfiles"
 	"github.com/docker/cagent/pkg/tui/components/tool/shell"
 	"github.com/docker/cagent/pkg/tui/components/tool/todotool"
 	"github.com/docker/cagent/pkg/tui/components/tool/transfertask"
@@ -74,7 +73,6 @@ func newDefaultRegistry() *Registry {
 		{[]string{builtin.ToolNameReadFile}, readfile.New},
 		{[]string{builtin.ToolNameReadMultipleFiles}, readmultiplefiles.New},
 		{[]string{builtin.ToolNameListDirectory}, listdirectory.New},
-		{[]string{builtin.ToolNameSearchFiles}, searchfiles.New},
 		{[]string{builtin.ToolNameShell}, shell.New},
 		{[]string{builtin.ToolNameFetch, "category:api"}, api.New},
 		{