Add timeout support to bash tool

- Add optional timeout parameter (1-600 seconds, default 120)
- Kill processes that exceed timeout limit
- Return error message when timeout occurs
- Matches Taiga's bash tool timeout behavior
- Add comprehensive tests for timeout functionality

Author: Keno

src/tools/bash.jl

@@ -21,6 +21,12 @@ function tool_schema(::BashTool)
                 "command" => Dict(
                     "type" => "string",
                     "description" => "The bash command to execute"
+                ),
+                "timeout" => Dict(
+                    "type" => "integer",
+                    "description" => "Maximum execution time in seconds (default: 120)",
+                    "minimum" => 1,
+                    "maximum" => 600
                 )
             ),
             "required" => ["command"]
@@ -30,11 +36,17 @@ end
 
 function execute(tool::BashTool, params::Dict)
     command = get(params, "command", nothing)
+    timeout_seconds = get(params, "timeout", 120)  # Default 120 seconds like Taiga
 
     if command === nothing
         return create_content_response("Error: No command provided", is_error=true)
     end
 
+    # Validate timeout
+    if timeout_seconds < 1 || timeout_seconds > 600
+        return create_content_response("Error: Timeout must be between 1 and 600 seconds", is_error=true)
+    end
+    
     try
         # Use Cmd with ignorestatus to capture all output regardless of exit code
         cmd = Cmd(`sh -c $command`, ignorestatus=true, dir=tool.working_dir)
@@ -48,8 +60,34 @@ function execute(tool::BashTool, params::Dict)
         stdout_buf = IOBuffer()
         stderr_buf = IOBuffer()
 
-        # Run the command and capture outputs
-        proc = run(pipeline(cmd, stdout=stdout_buf, stderr=stderr_buf))
+        # Start the process without waiting for it to complete
+        process = open(pipeline(cmd, stdout=stdout_buf, stderr=stderr_buf))
+        
+        # Wait for completion with timeout
+        timed_out = false
+        start_time = time()
+        
+        while process_running(process)
+            if time() - start_time > timeout_seconds
+                timed_out = true
+                # Kill the process
+                kill(process)
+                break
+            end
+            sleep(0.1)  # Check every 100ms
+        end
+        
+        # Wait for process to fully terminate if we killed it
+        if timed_out
+            wait(process)
+            return create_content_response(
+                "Error: Command timed out after $timeout_seconds seconds", 
+                is_error=true
+            )
+        end
+        
+        # Get the process result
+        proc = process
 
         # Get the outputs
         stdout_str = String(take!(stdout_buf))

test/runtests.jl

@@ -4,6 +4,7 @@ using JSON
 
 @testset "ClaudeMCPTools.jl" begin
     include("test_bash.jl")
+    include("test_bash_timeout.jl")
     include("test_str_replace_editor.jl")
     include("test_view_range.jl")
     include("test_server.jl")

test/test_bash_timeout.jl

@@ -0,0 +1,61 @@
+@testset "Bash tool timeout" begin
+    tool = BashTool()
+    
+    @testset "Quick command completes normally" begin
+        # Command that completes quickly
+        result = execute(tool, Dict(
+            "command" => "echo 'Hello'",
+            "timeout" => 5
+        ))
+        @test !result["isError"]
+        @test occursin("Hello", result["content"][1]["text"])
+    end
+    
+    @testset "Long-running command times out" begin
+        # Command that would run for 10 seconds but timeout is 2 seconds
+        result = execute(tool, Dict(
+            "command" => "sleep 10 && echo 'Should not see this'",
+            "timeout" => 2
+        ))
+        @test result["isError"]
+        @test occursin("timed out after 2 seconds", result["content"][1]["text"])
+    end
+    
+    @testset "Default timeout (120 seconds)" begin
+        # Test that default timeout is applied
+        result = execute(tool, Dict(
+            "command" => "echo 'Testing default timeout'"
+        ))
+        @test !result["isError"]
+        @test occursin("Testing default timeout", result["content"][1]["text"])
+    end
+    
+    @testset "Invalid timeout values" begin
+        # Timeout too small
+        result = execute(tool, Dict(
+            "command" => "echo 'test'",
+            "timeout" => 0
+        ))
+        @test result["isError"]
+        @test occursin("Timeout must be between 1 and 600 seconds", result["content"][1]["text"])
+        
+        # Timeout too large
+        result = execute(tool, Dict(
+            "command" => "echo 'test'",
+            "timeout" => 700
+        ))
+        @test result["isError"]
+        @test occursin("Timeout must be between 1 and 600 seconds", result["content"][1]["text"])
+    end
+    
+    @testset "Command with output before timeout" begin
+        # Command that produces output then sleeps (should capture output before timeout)
+        result = execute(tool, Dict(
+            "command" => "echo 'Started' && sleep 10",
+            "timeout" => 2
+        ))
+        @test result["isError"]
+        @test occursin("timed out", result["content"][1]["text"])
+        # Note: Output might not be captured due to buffering
+    end
+end