orquesta-cli 0.2.15 → 0.2.16

package/dist/core/llm/llm-client.js

@@ -6,6 +6,37 @@ import { LLMError, TokenLimitError, RateLimitError, ContextLengthError, } from '
 import { logger, isLLMLogEnabled } from '../../utils/logger.js';
 import { usageTracker } from '../usage-tracker.js';
 import { getForcedTier, getBatutaSessionId, setLastBatutaRoute } from '../routing-state.js';
+function coerceSyntheticToolCall(content) {
+    const trimmed = content.trim();
+    if (!trimmed || !trimmed.includes('"tool"'))
+        return null;
+    const cleaned = trimmed
+        .replace(/^```(?:json)?\s*\n?/i, '')
+        .replace(/\n?```\s*$/i, '')
+        .trim();
+    const start = cleaned.indexOf('{');
+    const end = cleaned.lastIndexOf('}');
+    if (start === -1 || end === -1 || end <= start)
+        return null;
+    let parsed;
+    try {
+        parsed = JSON.parse(cleaned.slice(start, end + 1));
+    }
+    catch {
+        return null;
+    }
+    if (!parsed || typeof parsed !== 'object')
+        return null;
+    const obj = parsed;
+    if (typeof obj.tool !== 'string' || !obj.tool)
+        return null;
+    const args = obj.arguments && typeof obj.arguments === 'object' ? obj.arguments : {};
+    return {
+        id: `call_synth_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+        type: 'function',
+        function: { name: obj.tool, arguments: JSON.stringify(args) },
+    };
+}
 function buildPerRequestHeaders() {
     const headers = {
         'X-Batuta-Session-ID': getBatutaSessionId(),
@@ -500,6 +531,17 @@ export class LLMClient {
                 throw new Error('Cannot find choice in response.');
             }
             const assistantMessage = choice.message;
+            if ((!assistantMessage.tool_calls || assistantMessage.tool_calls.length === 0) &&
+                typeof assistantMessage.content === 'string') {
+                const coerced = coerceSyntheticToolCall(assistantMessage.content);
+                if (coerced) {
+                    assistantMessage.tool_calls = [coerced];
+                    assistantMessage.content = '';
+                    logger.flow('Recovered synthetic tool call from plain-text content', {
+                        tool: coerced.function.name,
+                    });
+                }
+            }
             workingMessages.push(assistantMessage);
             if (assistantMessage.tool_calls && assistantMessage.tool_calls.length > 0) {
                 if (assistantMessage.tool_calls.length > 1) {

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

@@ -23,25 +23,26 @@ async function executeBash(command, cwd, timeout = 30000, explicitEnv) {
             stderr += data.toString();
         });
         child.on('close', (code) => {
-            if (!killed) {
-                resolve({
-                    stdout: stdout.trim(),
-                    stderr: stderr.trim(),
-                    exitCode: code ?? 0,
-                });
-            }
+            clearTimeout(timer);
+            resolve({
+                stdout: stdout.trim(),
+                stderr: stderr.trim(),
+                exitCode: code ?? (killed ? 124 : 0),
+                timedOut: killed,
+            });
         });
         child.on('error', (error) => {
+            clearTimeout(timer);
             reject(error);
         });
         const timer = setTimeout(() => {
             killed = true;
             child.kill('SIGTERM');
-            reject(new Error(`Command timed out after ${timeout}ms`));
+            setTimeout(() => { try {
+                child.kill('SIGKILL');
+            }
+            catch { } }, 2000).unref?.();
         }, timeout);
-        child.on('close', () => {
-            clearTimeout(timer);
-        });
     });
 }
 const BASH_TOOL_DEFINITION = {
@@ -149,6 +150,14 @@ export const bashTool = {
             if (output.length > MAX_OUTPUT_LENGTH) {
                 output = output.slice(0, MAX_OUTPUT_LENGTH) + '\n\n... [output truncated]';
             }
+            if (execResult.timedOut) {
+                const partial = output ? `\n\nPartial output before timeout:\n${output}` : ' (no output captured)';
+                logger.exit('bashTool.execute', { timedOut: true, outputLength: output.length });
+                return {
+                    success: false,
+                    error: `Command timed out after ${timeout}ms.${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.15",
+  "version": "0.2.16",
   "description": "Orquesta CLI - AI-powered coding assistant with team collaboration",
   "type": "module",
   "main": "dist/index.js",