Feat: Add configurable command tool timeout

Signed-off-by: Hapshanko <adamgaming391100@gmail.com>

Author: adam-elementor

go/adk/pkg/skills/shell.go

@@ -8,10 +8,13 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 )
 
+const commandTimeoutEnv = "KAGENT_COMMAND_TIMEOUT"
+
 const srtSettingsPathEnv = "KAGENT_SRT_SETTINGS_PATH"
 
 type CommandExecutor struct {
@@ -124,12 +127,21 @@ func NewCommandExecutorFromEnv() (*CommandExecutor, error) {
 	return &CommandExecutor{srtArgs: srtArgs}, nil
 }
 
-// ExecuteCommand executes a shell command.
-func (e *CommandExecutor) ExecuteCommand(ctx context.Context, command string, workingDir string) (string, error) {
-	timeout := 30 * time.Second
+func commandTimeout(command string) time.Duration {
+	if v := strings.TrimSpace(os.Getenv(commandTimeoutEnv)); v != "" {
+		if secs, err := strconv.Atoi(v); err == nil && secs > 0 {
+			return time.Duration(secs) * time.Second
+		}
+	}
 	if strings.Contains(command, "python") {
-		timeout = 60 * time.Second
+		return 60 * time.Second
 	}
+	return 30 * time.Second
+}
+
+// ExecuteCommand executes a shell command.
+func (e *CommandExecutor) ExecuteCommand(ctx context.Context, command string, workingDir string) (string, error) {
+	timeout := commandTimeout(command)
 
 	ctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()

go/adk/pkg/skills/shell_test.go

@@ -425,6 +425,33 @@ func TestExecuteCommand_RequiresMountedSRTSettings(t *testing.T) {
 	}
 }
 
+func TestCommandTimeout(t *testing.T) {
+	tests := []struct {
+		name    string
+		envVal  string
+		command string
+		want    time.Duration
+	}{
+		{name: "default for generic command", envVal: "", command: "ls -la", want: 30 * time.Second},
+		{name: "default for python command", envVal: "", command: "python script.py", want: 60 * time.Second},
+		{name: "env override applies to generic", envVal: "300", command: "ls -la", want: 300 * time.Second},
+		{name: "env override applies to python too", envVal: "300", command: "python script.py", want: 300 * time.Second},
+		{name: "invalid env value falls back", envVal: "notanumber", command: "ls -la", want: 30 * time.Second},
+		{name: "zero env value falls back", envVal: "0", command: "ls -la", want: 30 * time.Second},
+		{name: "negative env value falls back", envVal: "-5", command: "ls -la", want: 30 * time.Second},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Setenv(commandTimeoutEnv, tt.envVal)
+			got := commandTimeout(tt.command)
+			if got != tt.want {
+				t.Errorf("commandTimeout(%q) with env=%q = %v, want %v", tt.command, tt.envVal, got, tt.want)
+			}
+		})
+	}
+}
+
 func TestExecuteCommand_Timeout(t *testing.T) {
 	// Skip this test if running in CI or if test timeout is too short
 	// This test requires at least 35 seconds to run properly

go/adk/pkg/tools/skills.go

@@ -65,8 +65,9 @@ For file operations:
 - Use read_file, write_file, and edit_file for interacting with the filesystem.
 
 Timeouts:
-- python scripts: 60s
-- other commands: 30s`
+- python scripts: 60s (default)
+- other commands: 30s (default)
+- Override with KAGENT_COMMAND_TIMEOUT env var (value in seconds)`
 )
 
 type skillsInput struct {

python/packages/kagent-skills/src/kagent/skills/prompts.py

@@ -111,6 +111,7 @@ def get_bash_description() -> str:
 - Use read_file, write_file, and edit_file for interacting with the filesystem.
 
 Timeouts:
-- python scripts: 60s
-- other commands: 30s
+- python scripts: 60s (default)
+- other commands: 30s (default)
+- Override with KAGENT_COMMAND_TIMEOUT env var (value in seconds)
 """

python/packages/kagent-skills/src/kagent/skills/shell.py

@@ -167,12 +167,26 @@ def _get_srt_settings_args() -> list[str]:
     return ["--settings", settings_path_env]
 
 
+_COMMAND_TIMEOUT_ENV = "KAGENT_COMMAND_TIMEOUT"
+
+
 def _get_command_timeout_seconds(command: str) -> float:
-    """Determine appropriate timeout for a command."""
+    """Determine appropriate timeout for a command.
+
+    Respects the KAGENT_COMMAND_TIMEOUT environment variable (value in seconds)
+    which, when set to a positive number, overrides the built-in defaults.
+    """
+    override = os.environ.get(_COMMAND_TIMEOUT_ENV, "").strip()
+    if override:
+        try:
+            val = float(override)
+            if val > 0:
+                return val
+        except ValueError:
+            pass
     if "python " in command or "python3 " in command:
-        return 60.0  # 1 minute for python scripts
-    else:
-        return 30.0  # 30 seconds for other commands
+        return 60.0
+    return 30.0
 
 
 async def execute_command(