feat: add configurable timeout for exec tool

- Add TimeoutSeconds field to ExecConfig struct
- Support environment variable PICOCLAW_TOOLS_EXEC_TIMEOUT_SECONDS
- Default value: 60 seconds (unchanged behavior when set to 0)
- Document the new config option in config.example.json

Closes #906
This commit is contained in:
Qee 2026-03-01 14:45:26 +08:00
parent 2c8416e658
commit da8a341c57
3 changed files with 9 additions and 1 deletions

View file

@ -224,6 +224,7 @@
"exec_timeout_minutes": 5
},
"exec": {
"timeout_seconds": 0,
"enable_deny_patterns": false,
"custom_deny_patterns": []
},

View file

@ -466,6 +466,7 @@ type CronToolsConfig struct {
}
type ExecConfig struct {
TimeoutSeconds int `json:"timeout_seconds" env:"PICOCLAW_TOOLS_EXEC_TIMEOUT_SECONDS"` // 0 means use default (60s)
EnableDenyPatterns bool `json:"enable_deny_patterns" env:"PICOCLAW_TOOLS_EXEC_ENABLE_DENY_PATTERNS"`
CustomDenyPatterns []string `json:"custom_deny_patterns" env:"PICOCLAW_TOOLS_EXEC_CUSTOM_DENY_PATTERNS"`
}

View file

@ -75,6 +75,7 @@ func NewExecTool(workingDir string, restrict bool) *ExecTool {
func NewExecToolWithConfig(workingDir string, restrict bool, config *config.Config) *ExecTool {
denyPatterns := make([]*regexp.Regexp, 0)
timeout := 60 * time.Second // default timeout
if config != nil {
execConfig := config.Tools.Exec
@ -96,13 +97,18 @@ func NewExecToolWithConfig(workingDir string, restrict bool, config *config.Conf
// If deny patterns are disabled, we won't add any patterns, allowing all commands.
fmt.Println("Warning: deny patterns are disabled. All commands will be allowed.")
}
// Apply configured timeout if set (0 means use default)
if execConfig.TimeoutSeconds > 0 {
timeout = time.Duration(execConfig.TimeoutSeconds) * time.Second
}
} else {
denyPatterns = append(denyPatterns, defaultDenyPatterns...)
}
return &ExecTool{
workingDir: workingDir,
timeout: 60 * time.Second,
timeout: timeout,
denyPatterns: denyPatterns,
allowPatterns: nil,
restrictToWorkspace: restrict,