Add timeout_seconds parameter to invoke_expression

Author: yotsuda

PowerShell.MCP.Proxy/Models/JsonRpcModels.cs

@@ -25,9 +25,13 @@ public class InvokeExpressionParams : PowerShellMcpParams
 
     [JsonPropertyName("pipeline")]
     public string Pipeline { get; set; } = string.Empty;
+
+    [JsonPropertyName("timeout_seconds")]
+    public int TimeoutSeconds { get; set; } = 170;
 }
 
 
+
 public class StartPowerShellConsoleParams : PowerShellMcpParams
 {
     [JsonPropertyName("name")]

PowerShell.MCP.Proxy/Services/IPowerShellService.cs

@@ -9,7 +9,7 @@ public interface IPowerShellService
     Task<GetStatusResponse?> GetStatusAsync(CancellationToken cancellationToken = default);
     Task<GetStatusResponse?> GetStatusFromPipeAsync(string pipeName, CancellationToken cancellationToken = default);
     Task<string> ConsumeOutputFromPipeAsync(string pipeName, CancellationToken cancellationToken = default);
-    Task<string> InvokeExpressionAsync(string command, CancellationToken cancellationToken = default);
-    Task<string> InvokeExpressionToPipeAsync(string pipeName, string command, CancellationToken cancellationToken = default);
+    Task<string> InvokeExpressionAsync(string command, int timeoutSeconds = 170, CancellationToken cancellationToken = default);
+    Task<string> InvokeExpressionToPipeAsync(string pipeName, string command, int timeoutSeconds = 170, CancellationToken cancellationToken = default);
     Task<string> StartNewConsoleAsync(CancellationToken cancellationToken = default);
 }

PowerShell.MCP.Proxy/Services/PowerShellService.cs

@@ -95,11 +95,12 @@ public async Task<string> ConsumeOutputFromPipeAsync(string pipeName, Cancellati
         return await _namedPipeClient.SendRequestToAsync(pipeName, jsonRequest);
     }
 
-    public async Task<string> InvokeExpressionAsync(string pipeline, CancellationToken cancellationToken = default)
+    public async Task<string> InvokeExpressionAsync(string pipeline, int timeoutSeconds = 170, CancellationToken cancellationToken = default)
     {
         var requestParams = new InvokeExpressionParams
         {
-            Pipeline = pipeline
+            Pipeline = pipeline,
+            TimeoutSeconds = timeoutSeconds
         };
 
         var jsonRequest = JsonSerializer.Serialize(requestParams, PowerShellJsonRpcContext.Default.InvokeExpressionParams);
@@ -114,11 +115,12 @@ public async Task<string> InvokeExpressionAsync(string pipeline, CancellationTok
         return response;
     }
 
-    public async Task<string> InvokeExpressionToPipeAsync(string pipeName, string pipeline, CancellationToken cancellationToken = default)
+    public async Task<string> InvokeExpressionToPipeAsync(string pipeName, string pipeline, int timeoutSeconds = 170, CancellationToken cancellationToken = default)
     {
         var requestParams = new InvokeExpressionParams
         {
-            Pipeline = pipeline
+            Pipeline = pipeline,
+            TimeoutSeconds = timeoutSeconds
         };
 
         var jsonRequest = JsonSerializer.Serialize(requestParams, PowerShellJsonRpcContext.Default.InvokeExpressionParams);

PowerShell.MCP.Proxy/Tools/PowerShellTools.cs

@@ -10,8 +10,6 @@ namespace PowerShell.MCP.Proxy.Tools;
 [McpServerToolType]
 public class PowerShellTools
 {
-    // Error message constant definitions
-    private const string ERROR_CONSOLE_NOT_RUNNING = "The PowerShell 7 console is not running.";
     /// <summary>
     /// Finds a ready pipe. Returns (pipeName, consoleSwitched).
     /// </summary>
@@ -170,15 +168,6 @@ private static string TruncatePipeline(string pipeline, int maxLength = 30)
         return normalized[..(maxLength - 3)] + "...";
     }
 
-    private static string BuildNotExecutedResponse(string message, string jsonContent)
-    {
-        var response = new StringBuilder();
-        response.AppendLine(message);
-        response.AppendLine();
-        response.Append(jsonContent);
-        return response.ToString();
-    }
-
     [McpServerTool]
     [Description("Retrieves the current location and all available drives (providers) from the PowerShell session. Returns current_location and other_drive_locations array. Call this when you need to understand the current PowerShell context, as users may change location during the session. When executing multiple invoke_expression commands in succession, calling once at the beginning is sufficient.")]
     public static async Task<string> GetCurrentLocation(
@@ -281,8 +270,13 @@ public static async Task<string> InvokeExpression(
         IPowerShellService powerShellService,
         [Description("The PowerShell command or pipeline to execute. Both single-line and multi-line commands are supported, including if statements, loops, functions, and try-catch blocks.")]
         string pipeline,
+        [Description("Timeout in seconds (0-170, default: 170). On timeout, execution continues in background and result is cached for retrieval on next MCP tool call. You can work on other tasks in parallel. Use 0 for commands requiring user interaction (e.g., pause, Read-Host).")]
+        int timeout_seconds = 170,
         CancellationToken cancellationToken = default)
     {
+        // Clamp timeout to valid range
+        timeout_seconds = Math.Clamp(timeout_seconds, 0, 170);
+
         // Find a ready pipe
         var (readyPipeName, consoleSwitched) = await FindReadyPipeAsync(powerShellService, cancellationToken);
 
@@ -352,7 +346,7 @@ public static async Task<string> InvokeExpression(
         // Execute the command
         try
         {
-            var result = await powerShellService.InvokeExpressionToPipeAsync(readyPipeName, pipeline, cancellationToken);
+            var result = await powerShellService.InvokeExpressionToPipeAsync(readyPipeName, pipeline, timeout_seconds, cancellationToken);
 
             // Check if pipeline is still running (timeout case)
             const string stillRunningMessage = "⧗ Pipeline is still running";

PowerShell.MCP/Services/NamedPipeServer.cs

@@ -533,10 +533,18 @@ private static string ExecuteTool(string method, JsonElement parameters)
     private static (bool isTimeout, bool shouldCache) ExecuteInvokeExpression(JsonElement parameters)
     {
         var pipeline = parameters.GetProperty("pipeline").GetString() ?? "";
-        return McpServerHost.ExecuteCommand(pipeline);
+        var timeoutSeconds = parameters.TryGetProperty("timeout_seconds", out var timeoutElement)
+            ? timeoutElement.GetInt32()
+            : 170;
+        
+        // Clamp to valid range
+        timeoutSeconds = Math.Clamp(timeoutSeconds, 0, 170);
+        
+        return McpServerHost.ExecuteCommand(pipeline, timeoutSeconds);
     }
 
 
+
     /// <summary>
     /// Receives a message from Named Pipe
     /// </summary>

PowerShell.MCP/Services/PowerShellCommunication.cs

@@ -26,13 +26,14 @@ public static void NotifyResultReady(string result)
     /// <summary>
     /// Waits for result (blocking method)
     /// </summary>
+    /// <param name="timeoutSeconds">Timeout in seconds (1-170)</param>
     /// <returns>Tuple of (isTimeout, shouldCache)</returns>
-    public static (bool isTimeout, bool shouldCache) WaitForResult()
+    public static (bool isTimeout, bool shouldCache) WaitForResult(int timeoutSeconds = 170)
     {
         _resultShouldCache = false;
         _resultReadyEvent.Reset();
 
-        bool signaled = _resultReadyEvent.WaitOne(170 * 1000);
+        bool signaled = _resultReadyEvent.WaitOne(timeoutSeconds * 1000);
 
         if (signaled)
         {
@@ -57,12 +58,14 @@ public static class McpServerHost
     /// <summary>
     /// Command execution (state management is handled by NamedPipeServer)
     /// </summary>
-    public static (bool isTimeout, bool shouldCache) ExecuteCommand(string command)
+    /// <param name="command">PowerShell command to execute</param>
+    /// <param name="timeoutSeconds">Timeout in seconds (1-170)</param>
+    public static (bool isTimeout, bool shouldCache) ExecuteCommand(string command, int timeoutSeconds = 170)
     {
         try
         {
             executeCommand = command;
-            return PowerShellCommunication.WaitForResult();
+            return PowerShellCommunication.WaitForResult(timeoutSeconds);
         }
         catch (Exception)
         {