orquesta-cli 0.2.118 → 0.2.119

package/dist/tools/llm/simple/powershell-tool.js

@@ -4,7 +4,8 @@ import { logger } from '../../../utils/logger.js';
 import { isNativeWindows, findNativePowerShellPath, isDangerousPowerShellCommand, } from '../../../utils/platform-utils.js';
 import { filterSafeEnv } from '../../../utils/env-filter.js';
 import { configManager } from '../../../core/config/config-manager.js';
-async function executePowerShell(command, cwd, timeout = 30000, explicitEnv) {
+const DEFAULT_POWERSHELL_TIMEOUT = 120000;
+async function executePowerShell(command, cwd, timeout = DEFAULT_POWERSHELL_TIMEOUT, explicitEnv) {
     return new Promise((resolve, reject) => {
         const psPath = findNativePowerShellPath();
         const userSafeVars = configManager.getSafeEnvVars();
@@ -15,32 +16,55 @@ async function executePowerShell(command, cwd, timeout = 30000, explicitEnv) {
         let stdout = '';
         let stderr = '';
         let killed = false;
+        let settled = false;
+        const finish = (code) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            clearTimeout(hardTimer);
+            resolve({
+                stdout: stdout.trim(),
+                stderr: stderr.trim(),
+                exitCode: code ?? (killed ? 124 : 0),
+                timedOut: killed,
+            });
+        };
         child.stdout?.on('data', (data) => {
             stdout += data.toString();
         });
         child.stderr?.on('data', (data) => {
             stderr += data.toString();
         });
-        child.on('close', (code) => {
-            if (!killed) {
-                resolve({
-                    stdout: stdout.trim(),
-                    stderr: stderr.trim(),
-                    exitCode: code ?? 0,
-                });
-            }
-        });
+        child.on('close', (code) => finish(code));
         child.on('error', (error) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            clearTimeout(hardTimer);
             reject(error);
         });
         const timer = setTimeout(() => {
             killed = true;
-            child.kill('SIGTERM');
-            reject(new Error(`Command timed out after ${timeout}ms`));
+            try {
+                child.kill('SIGTERM');
+            }
+            catch { }
+            setTimeout(() => { try {
+                child.kill('SIGKILL');
+            }
+            catch { } }, 2000).unref?.();
         }, timeout);
-        child.on('close', () => {
-            clearTimeout(timer);
-        });
+        const hardTimer = setTimeout(() => {
+            killed = true;
+            try {
+                child.kill('SIGKILL');
+            }
+            catch { }
+            finish(124);
+        }, timeout + 5000);
+        hardTimer.unref?.();
     });
 }
 const POWERSHELL_TOOL_DEFINITION = {
@@ -51,7 +75,7 @@ const POWERSHELL_TOOL_DEFINITION = {
 
 IMPORTANT:
 - Do NOT use for file reading/writing - use read_file, create_file, edit_file instead
-- Commands have a 30 second timeout by default
+- Commands have a 120 second timeout by default
 - Dangerous commands (Remove-Item -Recurse -Force C:\\, Stop-Computer, etc.) are blocked
 - Output is truncated if too long
 - PowerShell 7 (pwsh) is used if available, otherwise PowerShell 5.1`,
@@ -78,7 +102,7 @@ Examples:
                 },
                 timeout: {
                     type: 'number',
-                    description: 'Timeout in milliseconds (optional, default: 30000)',
+                    description: 'Timeout in milliseconds (optional, default: 120000)',
                 },
                 env: {
                     type: 'object',
@@ -98,7 +122,7 @@ export const powershellTool = {
     async execute(args) {
         const command = args['command'];
         const cwd = args['cwd'];
-        const timeout = args['timeout'] || 30000;
+        const timeout = args['timeout'] || DEFAULT_POWERSHELL_TIMEOUT;
         const env = args['env'];
         logger.enter('powershellTool.execute', { command, cwd, timeout, envKeys: env ? Object.keys(env) : [] });
         if (!isNativeWindows()) {
@@ -149,6 +173,16 @@ export const powershellTool = {
             if (output.length > MAX_OUTPUT_LENGTH) {
                 output = output.slice(0, MAX_OUTPUT_LENGTH) + '\n\n... [output truncated]';
             }
+            if (execResult.timedOut) {
+                const secs = Math.round(timeout / 1000);
+                const partial = output ? `\n\nPartial output before timeout:\n${output}` : '';
+                logger.exit('powershellTool.execute', { timedOut: true, outputLength: output.length });
+                return {
+                    success: false,
+                    error: `Command timed out after ${secs}s. For long-running commands, pass a larger \`timeout\` ` +
+                        `(in ms) or run it in the background.${partial}`,
+                };
+            }
             if (execResult.exitCode !== 0) {
                 output += `\n\n[Exit code: ${execResult.exitCode}]`;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orquesta-cli",
-  "version": "0.2.118",
+  "version": "0.2.119",
   "description": "Orquesta CLI - AI-powered coding assistant with team collaboration",
   "type": "module",
   "main": "dist/index.js",