orquesta-cli 0.2.8 → 0.2.10

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

@@ -425,7 +425,11 @@ export class LLMClient {
         const MAX_NO_TOOL_CALL_RETRIES = 3;
         const MAX_FINAL_RESPONSE_FAILURES = 3;
         const recentToolSignatures = [];
+        const recentNormalizedSignatures = [];
         const LOOP_WINDOW = 5;
+        const SEMANTIC_WINDOW = 8;
+        const SEMANTIC_DISTINCT = 2;
+        const normalizeSig = (s) => s.toLowerCase().replace(/['"`]/g, '').replace(/\d+/g, 'N').replace(/\s+/g, ' ').trim();
         while (true) {
             if (this.isInterrupted) {
                 logger.flow('Interrupt detected - stopping tool loop');
@@ -506,15 +510,28 @@ export class LLMClient {
                     const toolName = toolCall.function.name;
                     let toolArgs;
                     const sig = `${toolName}::${toolCall.function.arguments}`;
+                    const normSig = normalizeSig(sig);
                     recentToolSignatures.push(sig);
+                    recentNormalizedSignatures.push(normSig);
                     if (recentToolSignatures.length > LOOP_WINDOW)
                         recentToolSignatures.shift();
-                    if (recentToolSignatures.length === LOOP_WINDOW && recentToolSignatures.every(s => s === sig)) {
+                    if (recentNormalizedSignatures.length > SEMANTIC_WINDOW)
+                        recentNormalizedSignatures.shift();
+                    const fail = (detail) => {
                         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. ` +
+                        throw new Error(`LOOP_DETECTED: ${detail} ` +
                             `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}`);
+                    };
+                    if (recentToolSignatures.length === LOOP_WINDOW && recentToolSignatures.every(s => s === sig)) {
+                        fail(`tool '${toolName}' called ${LOOP_WINDOW} times in a row with identical arguments.`);
+                    }
+                    if (recentNormalizedSignatures.length === SEMANTIC_WINDOW) {
+                        const distinct = new Set(recentNormalizedSignatures).size;
+                        if (distinct <= SEMANTIC_DISTINCT) {
+                            fail(`the last ${SEMANTIC_WINDOW} tool calls cycled only ${distinct} distinct command(s) without progress (e.g. re-running the same checks).`);
+                        }
                     }
                     try {
                         toolArgs = JSON.parse(toolCall.function.arguments);

package/dist/orchestration/plan-executor.js

@@ -17,11 +17,15 @@ import { formatErrorMessage, buildTodoContext, findActiveTodo, getTodoStats } fr
 import { runParallelGraph, shouldUseParallelOrchestrator } from './parallel-orchestrator.js';
 import { memoryStore } from './memory-store.js';
 import { auditLog } from './audit-log.js';
+function buildEnvironmentContext() {
+    const cwd = process.cwd();
+    return `\n\n## Environment\n\nWorking directory (where ALL your tools execute): \`${cwd}\`\nTools (read_file, list_files, bash, edit_file, …) run on the USER'S machine in this directory.\n- Use paths RELATIVE to this directory ("package.json", "src/foo.ts", "."). They resolve against the working directory automatically.\n- Do NOT prepend the absolute working-directory path to tool arguments, and do NOT invent absolute paths from documentation — the repo is already at the working directory above.\n- Ignore any other "current directory" that may appear elsewhere in your context (e.g. a proxy's /tmp); the directory above is authoritative.\n`;
+}
 function buildSystemPrompt() {
     const isGitRepo = detectGitRepo();
     const projectContext = getProjectContext();
     const base = isGitRepo ? `${PLAN_PROMPT}\n\n${GIT_COMMIT_RULES}` : PLAN_PROMPT;
-    return base + projectContext;
+    return base + buildEnvironmentContext() + projectContext;
 }
 export class PlanExecutor {
     currentLLMClient = null;

package/package.json

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