diff --git a/pkg/config/config.go b/pkg/config/config.go
index 7a0ec323c..8a5bd883f 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -594,6 +594,7 @@ type ExecConfig struct {
 	EnableDenyPatterns  bool     `                                 env:"PICOCLAW_TOOLS_EXEC_ENABLE_DENY_PATTERNS"  json:"enable_deny_patterns"`
 	CustomDenyPatterns  []string `                                 env:"PICOCLAW_TOOLS_EXEC_CUSTOM_DENY_PATTERNS"  json:"custom_deny_patterns"`
 	CustomAllowPatterns []string `                                 env:"PICOCLAW_TOOLS_EXEC_CUSTOM_ALLOW_PATTERNS" json:"custom_allow_patterns"`
+	TimeoutSeconds      int      `                                 env:"PICOCLAW_TOOLS_EXEC_TIMEOUT_SECONDS"       json:"timeout_seconds"`       // 0 means use default (60s)
 }
 
 type SkillsToolsConfig struct {
diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
index e87d7aa0a..c4c04d41a 100644
--- a/pkg/config/defaults.go
+++ b/pkg/config/defaults.go
@@ -386,6 +386,7 @@ func DefaultConfig() *Config {
 					Enabled: true,
 				},
 				EnableDenyPatterns: true,
+				TimeoutSeconds:     60,
 			},
 			Skills: SkillsToolsConfig{
 				ToolConfig: ToolConfig{
diff --git a/pkg/tools/shell.go b/pkg/tools/shell.go
index a0c83eb1e..2ea58b259 100644
--- a/pkg/tools/shell.go
+++ b/pkg/tools/shell.go
@@ -131,9 +131,14 @@ func NewExecToolWithConfig(workingDir string, restrict bool, config *config.Conf
 		denyPatterns = append(denyPatterns, defaultDenyPatterns...)
 	}
 
+	timeout := 60 * time.Second
+	if config != nil && config.Tools.Exec.TimeoutSeconds > 0 {
+		timeout = time.Duration(config.Tools.Exec.TimeoutSeconds) * time.Second
+	}
+
 	return &ExecTool{
 		workingDir:          workingDir,
-		timeout:             60 * time.Second,
+		timeout:             timeout,
 		denyPatterns:        denyPatterns,
 		allowPatterns:       nil,
 		customAllowPatterns: customAllowPatterns,