orquesta-cli 0.2.118 → 0.2.120

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/dist/utils/json-stream-logger.js

@@ -4,6 +4,33 @@ import { dirname, join } from 'path';
 import chalk from 'chalk';
 import { PROJECTS_DIR, cwdToProjectSegment } from '../constants.js';
 const FLUSH_INTERVAL_MS = 1000;
+function safeStringify(value, space) {
+    const seen = new WeakSet();
+    return JSON.stringify(value, function (_key, val) {
+        if (val instanceof Error) {
+            return { name: val.name, message: val.message, stack: val.stack };
+        }
+        if (typeof val === 'bigint') {
+            return val.toString();
+        }
+        if (typeof val === 'function') {
+            return undefined;
+        }
+        if (typeof val === 'object' && val !== null) {
+            const ctor = val.constructor?.name;
+            if (ctor === 'TLSSocket' || ctor === 'Socket' || ctor === 'ClientRequest' ||
+                ctor === 'IncomingMessage' || ctor === 'HTTPParser' || ctor === 'Agent' ||
+                ctor === 'Server' || ctor === 'ReadStream' || ctor === 'WriteStream') {
+                return `[${ctor}]`;
+            }
+            if (seen.has(val)) {
+                return '[Circular]';
+            }
+            seen.add(val);
+        }
+        return val;
+    }, space);
+}
 function getLogCategory(type) {
     switch (type) {
         case 'user_input':
@@ -241,20 +268,21 @@ export class JsonStreamLogger {
         if (!this.writeStream || this.buffer.length === 0) {
             return;
         }
-        try {
-            for (const entry of this.buffer) {
+        const entries = this.buffer;
+        this.buffer = [];
+        for (const entry of entries) {
+            try {
                 if (!this.isFirstEntry) {
                     this.writeStream.write(',\n');
                 }
                 this.isFirstEntry = false;
-                const json = JSON.stringify(entry, null, 2);
+                const json = safeStringify(entry, 2);
                 const indentedJson = json.split('\n').map(line => '  ' + line).join('\n');
                 this.writeStream.write(indentedJson);
             }
-            this.buffer = [];
-        }
-        catch (error) {
-            console.error(chalk.red('Failed to write to JSON stream:'), error);
+            catch (error) {
+                console.error(chalk.red('Failed to write to JSON stream:'), error);
+            }
         }
     }
     async initializeErrorStream() {
@@ -292,20 +320,21 @@ export class JsonStreamLogger {
         if (!this.errorWriteStream || this.errorBuffer.length === 0) {
             return;
         }
-        try {
-            for (const entry of this.errorBuffer) {
+        const entries = this.errorBuffer;
+        this.errorBuffer = [];
+        for (const entry of entries) {
+            try {
                 if (!this.isFirstErrorEntry) {
                     this.errorWriteStream.write(',\n');
                 }
                 this.isFirstErrorEntry = false;
-                const json = JSON.stringify(entry, null, 2);
+                const json = safeStringify(entry, 2);
                 const indentedJson = json.split('\n').map(line => '  ' + line).join('\n');
                 this.errorWriteStream.write(indentedJson);
             }
-            this.errorBuffer = [];
-        }
-        catch (error) {
-            console.error(chalk.red('Failed to write to error JSON stream:'), error);
+            catch (error) {
+                console.error(chalk.red('Failed to write to error JSON stream:'), error);
+            }
         }
     }
     flushCategories() {
@@ -313,20 +342,21 @@ export class JsonStreamLogger {
             if (!streamInfo.stream || !streamInfo.stream.writable || streamInfo.buffer.length === 0) {
                 continue;
             }
-            try {
-                for (const entry of streamInfo.buffer) {
+            const entries = streamInfo.buffer;
+            streamInfo.buffer = [];
+            for (const entry of entries) {
+                try {
                     if (!streamInfo.isFirstEntry) {
                         streamInfo.stream.write(',\n');
                     }
                     streamInfo.isFirstEntry = false;
-                    const json = JSON.stringify(entry, null, 2);
+                    const json = safeStringify(entry, 2);
                     const indentedJson = json.split('\n').map(line => '  ' + line).join('\n');
                     streamInfo.stream.write(indentedJson);
                 }
-                streamInfo.buffer = [];
-            }
-            catch (error) {
-                console.error(chalk.red(`Failed to write to category stream:`), error);
+                catch (error) {
+                    console.error(chalk.red(`Failed to write to category stream:`), error);
+                }
             }
         }
     }
@@ -371,8 +401,8 @@ export class JsonStreamLogger {
         }
         else if (typeof error === 'object' && error !== null) {
             try {
-                errorMessage = JSON.stringify(error, null, 2);
-                errorDetails = error;
+                errorMessage = safeStringify(error, 2);
+                errorDetails = JSON.parse(errorMessage);
             }
             catch {
                 errorMessage = String(error);

package/package.json

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