git.iko.soy/crush
on main help sign in
fix(grep): do not go outside cwd, add timeout (#2188)

* fix(grep): do not go outside cwd, add timeout Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> * fix: timeout config Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> --------- Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>

commit5b2a0bf38e8dd67707e3d433e59de5740aedfc97 authorCarlos Alexandro Becker <caarlos0@users.noreply.github.com> dateWed 11 Feb 2026, 16:10 (8 months ago) parent9940e83
5 files changed+21−7
compare with main
unifiedsplit
internal/agent/agentic_fetch_tool.go+1−1 internal/agent/common_test.go+1−1 internal/agent/coordinator.go+1−1 internal/agent/tools/grep.go+6−3 internal/config/config.go+12−1
internal/agent/agentic_fetch_tool.go+1−1
@@ -167,7 +167,7 @@ func (c *coordinator) agenticFetchTool(_ context.Context, client *http.Client) (
167167 webFetchTool,
168168 webSearchTool,
169169 tools.NewGlobTool(tmpDir),
170− tools.NewGrepTool(tmpDir),
170+ tools.NewGrepTool(tmpDir, c.cfg.Tools.Grep),
171171 tools.NewSourcegraphTool(client),
172172 tools.NewViewTool(c.lspManager, c.permissions, c.filetracker, tmpDir),
173173 }
internal/agent/common_test.go+1−1
@@ -208,7 +208,7 @@ func coderAgent(r *vcr.Recorder, env fakeEnv, large, small fantasy.LanguageModel
208208 tools.NewMultiEditTool(nil, env.permissions, env.history, *env.filetracker, env.workingDir),
209209 tools.NewFetchTool(env.permissions, env.workingDir, r.GetDefaultClient()),
210210 tools.NewGlobTool(env.workingDir),
211− tools.NewGrepTool(env.workingDir),
211+ tools.NewGrepTool(env.workingDir, cfg.Tools.Grep),
212212 tools.NewLsTool(env.permissions, env.workingDir, cfg.Tools.Ls),
213213 tools.NewSourcegraphTool(r.GetDefaultClient()),
214214 tools.NewViewTool(nil, env.permissions, *env.filetracker, env.workingDir),
internal/agent/coordinator.go+1−1
@@ -426,7 +426,7 @@ func (c *coordinator) buildTools(ctx context.Context, agent config.Agent) ([]fan
426426 tools.NewMultiEditTool(c.lspManager, c.permissions, c.history, c.filetracker, c.cfg.WorkingDir()),
427427 tools.NewFetchTool(c.permissions, c.cfg.WorkingDir(), nil),
428428 tools.NewGlobTool(c.cfg.WorkingDir()),
429− tools.NewGrepTool(c.cfg.WorkingDir()),
429+ tools.NewGrepTool(c.cfg.WorkingDir(), c.cfg.Tools.Grep),
430430 tools.NewLsTool(c.permissions, c.cfg.WorkingDir(), c.cfg.Tools.Ls),
431431 tools.NewSourcegraphTool(nil),
432432 tools.NewTodosTool(c.sessions),
internal/agent/tools/grep.go+6−3
@@ -18,6 +18,7 @@ import (
1818 "time"
1919
2020 "charm.land/fantasy"
21+ "github.com/charmbracelet/crush/internal/config"
2122 "github.com/charmbracelet/crush/internal/csync"
2223 "github.com/charmbracelet/crush/internal/fsext"
2324)
@@ -100,7 +101,7 @@ func escapeRegexPattern(pattern string) string {
100101 return escaped
101102}
102103
103−func NewGrepTool(workingDir string) fantasy.AgentTool {
104+func NewGrepTool(workingDir string, config config.ToolGrep) fantasy.AgentTool {
104105 return fantasy.NewAgentTool(
105106 GrepToolName,
106107 string(grepDescription),
@@ -109,7 +110,6 @@ func NewGrepTool(workingDir string) fantasy.AgentTool {
109110 return fantasy.NewTextErrorResponse("pattern is required"), nil
110111 }
111112
112− // If literal_text is true, escape the pattern
113113 searchPattern := params.Pattern
114114 if params.LiteralText {
115115 searchPattern = escapeRegexPattern(params.Pattern)
@@ -120,7 +120,10 @@ func NewGrepTool(workingDir string) fantasy.AgentTool {
120120 searchPath = workingDir
121121 }
122122
123− matches, truncated, err := searchFiles(ctx, searchPattern, searchPath, params.Include, 100)
123+ searchCtx, cancel := context.WithTimeout(ctx, config.GetTimeout())
124+ defer cancel()
125+
126+ matches, truncated, err := searchFiles(searchCtx, searchPattern, searchPath, params.Include, 100)
124127 if err != nil {
125128 return fantasy.NewTextErrorResponse(fmt.Sprintf("error searching files: %v", err)), nil
126129 }
internal/config/config.go+12−1
@@ -350,7 +350,8 @@ type Agent struct {
350350}
351351
352352type Tools struct {
353− Ls ToolLs `json:"ls,omitzero"`
353+ Ls ToolLs `json:"ls,omitzero"`
354+ Grep ToolGrep `json:"grep,omitzero"`
354355}
355356
356357type ToolLs struct {
@@ -358,10 +359,20 @@ type ToolLs struct {
358359 MaxItems *int `json:"max_items,omitempty" jsonschema:"description=Maximum number of items to return for the ls tool,default=1000,example=100"`
359360}
360361
362+// Limits returns the user-defined max-depth and max-items, or their defaults.
361363func (t ToolLs) Limits() (depth, items int) {
362364 return ptrValOr(t.MaxDepth, 0), ptrValOr(t.MaxItems, 0)
363365}
364366
367+type ToolGrep struct {
368+ Timeout *time.Duration `json:"timeout,omitempty" jsonschema:"description=Timeout for the grep tool call,default=5s,example=10s"`
369+}
370+
371+// GetTimeout returns the user-defined timeout or the default.
372+func (t ToolGrep) GetTimeout() time.Duration {
373+ return ptrValOr(t.Timeout, 5*time.Second)
374+}
375+
365376// Config holds the configuration for crush.
366377type Config struct {
367378 Schema string `json:"$schema,omitempty"`