orquesta-cli 0.2.4 → 0.2.6

package/dist/core/config/config-manager.js

@@ -322,11 +322,22 @@ export class ConfigManager {
                 added++;
             }
         }
-        if (!config.currentEndpoint && config.endpoints.length > 0) {
-            config.currentEndpoint = config.endpoints[0].id;
-            const firstModel = config.endpoints[0].models.find((m) => m.enabled);
-            if (firstModel) {
-                config.currentModel = firstModel.id;
+        const currentExists = !!config.currentEndpoint && config.endpoints.some((e) => e.id === config.currentEndpoint);
+        if (!currentExists && config.endpoints.length > 0) {
+            const fallback = config.endpoints.find((e) => e.provider === 'batuta' || e.id === 'batuta-proxy') ||
+                config.endpoints[0];
+            config.currentEndpoint = fallback.id;
+            const enabledModel = fallback.models.find((m) => m.enabled) || fallback.models[0];
+            if (enabledModel)
+                config.currentModel = enabledModel.id;
+        }
+        else if (currentExists) {
+            const ep = config.endpoints.find((e) => e.id === config.currentEndpoint);
+            const modelExists = ep.models.some((m) => m.id === config.currentModel);
+            if (!modelExists) {
+                const enabledModel = ep.models.find((m) => m.enabled) || ep.models[0];
+                if (enabledModel)
+                    config.currentModel = enabledModel.id;
             }
         }
         await this.saveConfig();

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

@@ -424,6 +424,8 @@ export class LLMClient {
         let finalResponseFailures = 0;
         const MAX_NO_TOOL_CALL_RETRIES = 3;
         const MAX_FINAL_RESPONSE_FAILURES = 3;
+        const recentToolSignatures = [];
+        const LOOP_WINDOW = 5;
         while (true) {
             if (this.isInterrupted) {
                 logger.flow('Interrupt detected - stopping tool loop');
@@ -503,6 +505,17 @@ export class LLMClient {
                 for (const toolCall of assistantMessage.tool_calls) {
                     const toolName = toolCall.function.name;
                     let toolArgs;
+                    const sig = `${toolName}::${toolCall.function.arguments}`;
+                    recentToolSignatures.push(sig);
+                    if (recentToolSignatures.length > LOOP_WINDOW)
+                        recentToolSignatures.shift();
+                    if (recentToolSignatures.length === LOOP_WINDOW && recentToolSignatures.every(s => s === sig)) {
+                        const preview = sig.length > 240 ? sig.slice(0, 240) + '…' : sig;
+                        logger.error('Tool-call loop detected — aborting', new Error(`LOOP_DETECTED: ${preview}`));
+                        throw new Error(`LOOP_DETECTED: tool '${toolName}' called ${LOOP_WINDOW} times in a row with identical arguments. ` +
+                            `Common causes: upstream returned a non-progress message (e.g. Claude Max session cap), tool result not being threaded back into context, or a stuck plan. ` +
+                            `Aborting to protect the session. Last signature: ${preview}`);
+                    }
                     try {
                         toolArgs = JSON.parse(toolCall.function.arguments);
                     }

package/package.json

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