orquesta-cli 0.2.18 → 0.2.20

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

@@ -6,36 +6,74 @@ 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) {
+function extractTopLevelJsonObjects(s) {
+    const objects = [];
+    let depth = 0;
+    let startIdx = -1;
+    let inString = false;
+    let escaped = false;
+    for (let i = 0; i < s.length; i++) {
+        const ch = s[i];
+        if (inString) {
+            if (escaped)
+                escaped = false;
+            else if (ch === '\\')
+                escaped = true;
+            else if (ch === '"')
+                inString = false;
+            continue;
+        }
+        if (ch === '"') {
+            inString = true;
+            continue;
+        }
+        if (ch === '{') {
+            if (depth === 0)
+                startIdx = i;
+            depth++;
+        }
+        else if (ch === '}') {
+            if (depth > 0) {
+                depth--;
+                if (depth === 0 && startIdx !== -1) {
+                    objects.push(s.slice(startIdx, i + 1));
+                    startIdx = -1;
+                }
+            }
+        }
+    }
+    return objects;
+}
+function coerceSyntheticToolCalls(content) {
     const trimmed = content.trim();
     if (!trimmed || !trimmed.includes('"tool"'))
-        return null;
+        return [];
     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;
+    const calls = [];
+    for (const objStr of extractTopLevelJsonObjects(cleaned)) {
+        let parsed;
+        try {
+            parsed = JSON.parse(objStr);
+        }
+        catch {
+            continue;
+        }
+        if (!parsed || typeof parsed !== 'object')
+            continue;
+        const obj = parsed;
+        if (typeof obj.tool !== 'string' || !obj.tool)
+            continue;
+        const args = obj.arguments && typeof obj.arguments === 'object' ? obj.arguments : {};
+        calls.push({
+            id: `call_synth_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+            type: 'function',
+            function: { name: obj.tool, arguments: JSON.stringify(args) },
+        });
     }
-    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) },
-    };
+    return calls;
 }
 function buildPerRequestHeaders() {
     const headers = {
@@ -533,12 +571,12 @@ export class LLMClient {
             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];
+                const coerced = coerceSyntheticToolCalls(assistantMessage.content);
+                if (coerced.length > 0) {
+                    assistantMessage.tool_calls = coerced;
                     assistantMessage.content = '';
-                    logger.flow('Recovered synthetic tool call from plain-text content', {
-                        tool: coerced.function.name,
+                    logger.flow('Recovered synthetic tool call(s) from plain-text content', {
+                        tools: coerced.map(c => c.function.name).join(', '),
                     });
                 }
             }

package/dist/tools/llm/simple/final-response-tool.js

@@ -51,9 +51,81 @@ Example:
         },
     },
 };
+function extractTopLevelJsonObjects(s) {
+    const objects = [];
+    let depth = 0;
+    let startIdx = -1;
+    let inString = false;
+    let escaped = false;
+    for (let i = 0; i < s.length; i++) {
+        const ch = s[i];
+        if (inString) {
+            if (escaped)
+                escaped = false;
+            else if (ch === '\\')
+                escaped = true;
+            else if (ch === '"')
+                inString = false;
+            continue;
+        }
+        if (ch === '"') {
+            inString = true;
+            continue;
+        }
+        if (ch === '{') {
+            if (depth === 0)
+                startIdx = i;
+            depth++;
+        }
+        else if (ch === '}') {
+            if (depth > 0) {
+                depth--;
+                if (depth === 0 && startIdx !== -1) {
+                    objects.push(s.slice(startIdx, i + 1));
+                    startIdx = -1;
+                }
+            }
+        }
+    }
+    return objects;
+}
+function unwrapNestedFinalResponse(message, depth = 0) {
+    if (depth > 5)
+        return message;
+    const trimmed = message.trim();
+    if (!trimmed.includes('"tool"') || !trimmed.includes('final_response'))
+        return message;
+    const cleaned = trimmed
+        .replace(/^```(?:json)?\s*\n?/i, '')
+        .replace(/\n?```\s*$/i, '')
+        .trim();
+    for (const objStr of extractTopLevelJsonObjects(cleaned)) {
+        let parsed;
+        try {
+            parsed = JSON.parse(objStr);
+        }
+        catch {
+            continue;
+        }
+        if (!parsed || typeof parsed !== 'object')
+            continue;
+        const obj = parsed;
+        if (obj.tool === 'final_response' && obj.arguments && typeof obj.arguments.message === 'string') {
+            return unwrapNestedFinalResponse(obj.arguments.message, depth + 1);
+        }
+    }
+    return message;
+}
 async function executeFinalResponse(args) {
     logger.enter('executeFinalResponse', args);
-    const message = args['message'];
+    let message = args['message'];
+    if (typeof message === 'string') {
+        const unwrapped = unwrapNestedFinalResponse(message);
+        if (unwrapped !== message) {
+            logger.flow('final_response: unwrapped nested synthetic tool-call JSON from message');
+            message = unwrapped;
+        }
+    }
     if (!message || typeof message !== 'string') {
         logger.warn('Missing or invalid message');
         return {

package/package.json

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