micro-models-agent 0.6.0 → 0.6.2

package/dist/agent/error-escalation.d.ts

@@ -8,6 +8,7 @@ import type { OutputRenderer } from "../ui/renderer.js";
  */
 export declare class ErrorEscalator {
     consecutiveToolErrors: Map<string, number>;
+    lastToolArgs: Map<string, string>;
     totalToolErrors: number;
     specialistSpawnedFor: string | null;
     errorStrategy: "normal" | "subagent-hint" | "force-subagent";

package/dist/agent/error-escalation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-escalation.d.ts","sourceRoot":"","sources":["../../src/agent/error-escalation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAgGxD;;;GAGG;AACH,qBAAa,cAAc;IACzB,qBAAqB,sBAA6B;IAClD,eAAe,SAAK;IACpB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3C,aAAa,EAAE,QAAQ,GAAG,eAAe,GAAG,gBAAgB,CAAY;IAExE,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQpC,KAAK,IAAI,IAAI;IAOP,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,WAAW,EAAE,EACvB,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,cAAc,GAAG,SAAS,EACpC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,YAAY,EACtB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,GAAG,EACf,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC;CAkGjC"}
+{"version":3,"file":"error-escalation.d.ts","sourceRoot":"","sources":["../../src/agent/error-escalation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAgGxD;;;GAGG;AACH,qBAAa,cAAc;IACzB,qBAAqB,sBAA6B;IAClD,YAAY,sBAA6B;IACzC,eAAe,SAAK;IACpB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3C,aAAa,EAAE,QAAQ,GAAG,eAAe,GAAG,gBAAgB,CAAY;IAExE,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAWpC,KAAK,IAAI,IAAI;IAQP,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,WAAW,EAAE,EACvB,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,cAAc,GAAG,SAAS,EACpC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,YAAY,EACtB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,GAAG,EACf,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC;CA2GjC"}

package/dist/agent/error-escalation.js

@@ -55,6 +55,7 @@ async function spawnSpecialist(p) {
  */
 export class ErrorEscalator {
     consecutiveToolErrors = new Map();
+    lastToolArgs = new Map();
     totalToolErrors = 0;
     specialistSpawnedFor = null;
     errorStrategy = "normal";
@@ -63,10 +64,15 @@ export class ErrorEscalator {
             if (key.startsWith(toolName + "::"))
                 this.consecutiveToolErrors.delete(key);
         }
+        for (const [key] of this.lastToolArgs) {
+            if (key.startsWith(toolName + "::"))
+                this.lastToolArgs.delete(key);
+        }
         this.specialistSpawnedFor = null;
     }
     reset() {
         this.consecutiveToolErrors.clear();
+        this.lastToolArgs.clear();
         this.totalToolErrors = 0;
         this.specialistSpawnedFor = null;
         this.errorStrategy = "normal";
@@ -77,6 +83,13 @@ export class ErrorEscalator {
             .slice(0, 100)
             .replace(/[A-Z]:\\[^\s"']+/gi, "<PATH>")
             .replace(/\/[^\s"']+/g, "<PATH>")}`;
+        // Если аргументы изменились — сбрасываем счётчик ошибок для этого ключа
+        const argsStr = JSON.stringify(toolArgs);
+        const prevArgs = this.lastToolArgs.get(errKey);
+        if (prevArgs !== undefined && prevArgs !== argsStr) {
+            this.consecutiveToolErrors.delete(errKey);
+        }
+        this.lastToolArgs.set(errKey, argsStr);
         const prevCount = this.consecutiveToolErrors.get(errKey) ?? 0;
         this.consecutiveToolErrors.set(errKey, prevCount + 1);
         const errorCount = prevCount + 1;
@@ -138,15 +151,15 @@ export class ErrorEscalator {
             if (!quiet)
                 renderer?.writeWarning(`  [strategy: subagent-hint after ${this.totalToolErrors} errors]`);
         }
-        if (errorCount >= 4) {
+        if (errorCount >= 6) {
             const blockId = generateToolCallId();
             messages.push({
                 role: "tool",
-                content: `BLOCKED: Tool "${toolName}" failed ${errorCount} times. Temporarily blocked.`,
+                content: `BLOCKED: Tool "${toolName}" failed ${errorCount} times with the same error. Use subagent for a fresh context or try a different approach.`,
                 tool_call_id: blockId,
             });
             if (!quiet)
-                renderer?.writeWarning(`  [blocked ${toolName}: too many repeated errors]`);
+                renderer?.writeWarning(`  [blocked ${toolName}: ${errorCount} consecutive errors]`);
             return "block";
         }
         return "block";

package/dist/agent/error-escalation.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-escalation.js","sourceRoot":"","sources":["../../src/agent/error-escalation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"error-escalation.js","sourceRoot":"","sources":["../../src/agent/error-escalation.ts"],"names":[],"mappings":"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"}

package/dist/agent/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAgC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAcxD,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAqFlE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC5D;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,cAAc,EAC/B,gBAAgB,CAAC,EAAE,WAAW,EAAE,EAChC,QAAQ,CAAC,EAAE,cAAc,EACzB,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;IACR,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB,GACA,OAAO,CAAC,eAAe,CAAC,CAqsC1B"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQpD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAgC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAcxD,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAqFlE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC5D;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,cAAc,EAC/B,gBAAgB,CAAC,EAAE,WAAW,EAAE,EAChC,QAAQ,CAAC,EAAE,cAAc,EACzB,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;IACR,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB,GACA,OAAO,CAAC,eAAe,CAAC,CAiqC1B"}

package/dist/agent/loop.js

@@ -1,6 +1,7 @@
-import { readFileSync, existsSync } from "node:fs";
+import { readFileSync } from "node:fs";
 import { join, isAbsolute, relative } from "node:path";
 import { parseToolCalls } from "../tools/parse-tool-call.js";
+import { AdapterPipeline, } from "../tools/adapters/index.js";
 import { parseFileRefs } from "../file-loader.js";
 import { ContextManager } from "./context.js";
 import { ModeRegistry } from "./modes/registry.js";
@@ -225,6 +226,8 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
     let consecutiveInvalidCalls = 0; // счётчик невалидных tool call подряд
     /** Счётчик бесполезных действий (list_dir, glob_search, todo list без результата) */
     let uselessActionCount = 0;
+    /** Сколько шагов подряд модель не вызывает инструменты */
+    let consecutiveNoToolSteps = 0;
     /** История последних чтений файлов для.detect повторных чтений */
     const recentReadFiles = [];
     /** История последних grep-запросов для detect повторных поисков */
@@ -263,6 +266,9 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
     ]);
     const errorEscalator = new ErrorEscalator();
     const writeEnforcer = new WriteEnforcer();
+    const adapterPipeline = new AdapterPipeline();
+    /** Отслеживание созданных/изменённых файлов за всю сессию */
+    const createdFiles = [];
     // Reset abort signal for this run
     if (renderer?.abortSignal === undefined) {
         // Renderer doesn't support abort — fine
@@ -281,7 +287,6 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
             break;
         }
         let skillsAutoLoaded = false;
-        const createdFiles = []; // отслеживание созданных/изменённых файлов
         logDebug("LOOP", `step ${step + 1}/${maxSteps} starting, ${messages.length} messages`);
         // Инкрементальный подсчёт — считаем только новые сообщения (быстрее в ~100x на больших историях)
         if (step === 0) {
@@ -426,6 +431,36 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
         consecutiveEmpty = 0;
         messages.push({ role: "assistant", content: response });
         const { validCalls, invalidCalls } = parseToolCalls(response);
+        // ─── Adapter pipeline: чиним кривые вызовы маленьких моделей ──
+        const adapterLogs = [];
+        const adaptedCalls = [];
+        const adapterCtx = {
+            cwd: process.cwd(),
+            config,
+            responseText: response,
+            existingFiles: createdFiles,
+        };
+        for (const call of validCalls) {
+            const result = await adapterPipeline.process(call, adapterCtx);
+            if ("blocked" in result) {
+                invalidCalls.push(result.blocked);
+                if (!quiet)
+                    renderer?.writeError(`  [adapter blocked: ${result.blocked}]`);
+            }
+            else {
+                adaptedCalls.push(result.call);
+                adapterLogs.push(...result.logs);
+            }
+        }
+        // Заменяем validCalls на адаптированные
+        validCalls.length = 0;
+        validCalls.push(...adaptedCalls);
+        // Показываем логи адаптеров
+        if (adapterLogs.length > 0 && !quiet) {
+            for (const log of adapterLogs) {
+                renderer?.writeDim(`  ${log}`);
+            }
+        }
         if (validCalls.length === 0) {
             if (invalidCalls.length > 0) {
                 // If the response has substantial text outside tool_call tags,
@@ -469,141 +504,122 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
                     continue;
                 }
             }
-            if (!skillsAutoLoaded) {
-                const textOutside = response
-                    .replace(/<tool_call>[\s\S]*?<\/tool_call>/g, "")
-                    .trim();
-                const looksLikeDone = /done|готово|создан|выполн|completed|finished/i.test(textOutside);
-                // Проверка: план с незавершёнными шагами — не даём агенту остановиться
-                const pendingSteps = getPlanPendingCount();
-                if (pendingSteps > 0 && looksLikeDone) {
-                    const planText = showPlan();
-                    const pendingLines = planText
-                        .split("\n")
-                        .filter((l) => l.includes("○") || l.includes("►"));
-                    const nextStep = pendingLines[0] || "";
-                    const nextStepMatch = nextStep.match(/\d+\.\s*(.+)/);
-                    const nextStepTitle = nextStepMatch ? nextStepMatch[1].trim() : "";
+            // ─── Определение завершения: только по поведению, не по тексту ──────
+            // Смотрим: были ли хоть какие-то вызовы инструментов за сессию.
+            // Сообщения с role:tool — это результаты выполненных инструментов
+            // (кроме invalid — они с tool_call_id вида "invalid-...").
+            const hasDoneAnyWork = messages.some((m) => m.role === "tool" &&
+                m.tool_call_id &&
+                !m.tool_call_id.startsWith("invalid-"));
+            const planStatus = showPlan();
+            const hasActivePlan = !planStatus.startsWith("No active plan");
+            const pendingSteps = getPlanPendingCount();
+            // === 1. Незавершённый план ===
+            if (hasActivePlan && pendingSteps > 0) {
+                const planText = planStatus;
+                const pendingLines = planText
+                    .split("\n")
+                    .filter((l) => l.includes("○") || l.includes("►"));
+                const nextStep = pendingLines[0] || "";
+                const nextStepMatch = nextStep.match(/\d+\.\s*(.+)/);
+                const nextStepTitle = nextStepMatch ? nextStepMatch[1].trim() : "";
+                if (!quiet) {
+                    renderer?.writeWarning(`  [plan has ${pendingSteps} incomplete steps — pushing agent to continue]`);
+                }
+                const nudge = nextStepTitle
+                    ? `Plan is NOT complete! ${pendingSteps} step(s) remaining.\nNext step: ${nextStepTitle}\nUse subagent to execute this step, then mark done: plan({action:"done", step:N})`
+                    : `Plan is NOT complete! ${pendingSteps} step(s) remaining:\n${pendingLines.join("\n")}\n\nContinue with the next step using subagent.`;
+                messages.push({ role: "user", content: nudge });
+                continuationNudges = 0;
+                continue;
+            }
+            // === 2. План завершён — аудит файлов ===
+            // Проверка по createdFiles: если план выполнен, но ни одного файла
+            // не создано — скорее всего модель галлюцинирует выполнение шагов.
+            if (hasActivePlan && pendingSteps === 0) {
+                if (createdFiles.length === 0) {
                     if (!quiet) {
-                        renderer?.writeWarning(`  [plan has ${pendingSteps} incomplete steps — pushing agent to continue]`);
+                        renderer?.writeWarning(`  [plan complete but no files created]`);
                     }
-                    const nudge = nextStepTitle
-                        ? `Plan is NOT complete! ${pendingSteps} step(s) remaining.\nNext step: ${nextStepTitle}\nUse subagent to execute this step, then mark done: plan({action:"done", step:N})`
-                        : `Plan is NOT complete! ${pendingSteps} step(s) remaining:\n${pendingLines.join("\n")}\n\nContinue with the next step using subagent.`;
-                    messages.push({ role: "user", content: nudge });
+                    messages.push({
+                        role: "user",
+                        content: `Plan claims all steps done, but no files were created via write_file or subagent. Either execute the steps properly or explain why files aren't needed.`,
+                    });
                     continuationNudges = 0;
                     continue;
                 }
-                // Phase 4.1: Аудит файлов при завершении плана
-                if (pendingSteps === 0 && looksLikeDone) {
-                    const plan = showPlan();
-                    if (!plan.startsWith("No active plan")) {
-                        // Извлекаем заголовки шагов и проверяем наличие файлов
-                        const stepLines = plan
-                            .split("\n")
-                            .filter((l) => l.match(/\d+\.\s/));
-                        const missingFiles = [];
-                        for (const line of stepLines) {
-                            const titleMatch = line.match(/\d+\.\s*(.+)/);
-                            if (!titleMatch)
-                                continue;
-                            const title = titleMatch[1].trim();
-                            // Извлекаем имя файла из заголовка (паттерн: "Create file.ext" или "file.ext")
-                            const fileMatch = title.match(/(?:Create|Создать|Add|Добавить)\s+(\S+\.(?:ts|tsx|js|jsx|json|html|css|md|yaml|yml))/i) ||
-                                title.match(/(\w+\.(?:ts|tsx|js|jsx|json|html|css|md|yaml|yml))/i);
-                            if (fileMatch) {
-                                const fileName = fileMatch[1];
-                                if (!existsSync(fileName) &&
-                                    !createdFiles.some((f) => f.endsWith(fileName))) {
-                                    missingFiles.push(fileName);
-                                }
-                            }
-                        }
-                        if (missingFiles.length > 0) {
-                            if (!quiet) {
-                                renderer?.writeWarning(`  [plan complete but missing files: ${missingFiles.join(", ")}]`);
-                            }
-                            messages.push({
-                                role: "user",
-                                content: `Plan claims all steps done, but these files are missing: ${missingFiles.join(", ")}. Create them before finishing.`,
-                            });
-                            continuationNudges = 0;
-                            continue;
-                        }
-                    }
+                // Файлы созданы — выходим
+                return { messages };
+            }
+            // === 3. Нет активного плана ===
+            // Stuck detection (без изменений)
+            const isUselessAction = validCalls.some((c) => c.parsed.name === "list_dir" ||
+                c.parsed.name === "tree" ||
+                (c.parsed.name === "todo" && c.parsed.arguments?.action === "list") ||
+                (c.parsed.name === "question" && !c.parsed.arguments?.question));
+            let isRepeatedRead = false;
+            let isRepeatedSearch = false;
+            let isRepeatedQuestion = false;
+            let isRepeatedBash = false;
+            for (const c of validCalls) {
+                if (c.parsed.name === "read_file") {
+                    const filePath = String(c.parsed.arguments?.path || "");
+                    if (recentReadFiles.includes(filePath))
+                        isRepeatedRead = true;
+                    recentReadFiles.push(filePath);
+                    if (recentReadFiles.length > 5)
+                        recentReadFiles.shift();
                 }
-                // Stuck detection: если модель делает бесполезные действия
-                const isUselessAction = validCalls.some((c) => c.parsed.name === "list_dir" ||
-                    c.parsed.name === "tree" ||
-                    (c.parsed.name === "todo" &&
-                        c.parsed.arguments?.action === "list") ||
-                    (c.parsed.name === "question" && !c.parsed.arguments?.question));
-                // Phase 5.1: Расширенное detect — повторные чтения, поиски, вопросы и bash
-                let isRepeatedRead = false;
-                let isRepeatedSearch = false;
-                let isRepeatedQuestion = false;
-                let isRepeatedBash = false;
-                for (const c of validCalls) {
-                    if (c.parsed.name === "read_file") {
-                        const filePath = String(c.parsed.arguments?.path || "");
-                        if (recentReadFiles.includes(filePath)) {
-                            isRepeatedRead = true;
-                        }
-                        recentReadFiles.push(filePath);
-                        if (recentReadFiles.length > 5)
-                            recentReadFiles.shift();
-                    }
-                    if (c.parsed.name === "grep_search") {
-                        const pattern = String(c.parsed.arguments?.pattern || "");
-                        if (recentGrepPatterns.includes(pattern)) {
-                            isRepeatedSearch = true;
-                        }
-                        recentGrepPatterns.push(pattern);
-                        if (recentGrepPatterns.length > 5)
-                            recentGrepPatterns.shift();
-                    }
-                    if (c.parsed.name === "question") {
-                        const questionText = String(c.parsed.arguments?.question || "");
-                        if (recentQuestions.includes(questionText)) {
-                            isRepeatedQuestion = true;
-                        }
-                        recentQuestions.push(questionText);
-                        if (recentQuestions.length > 3)
-                            recentQuestions.shift();
-                    }
-                    if (c.parsed.name === "bash") {
-                        const cmdText = String(c.parsed.arguments?.cmd || "");
-                        const normalized = cmdText.trim().replace(/\s+/g, " ");
-                        if (recentBashCommands.includes(normalized)) {
-                            isRepeatedBash = true;
-                        }
-                        recentBashCommands.push(normalized);
-                        if (recentBashCommands.length > 5)
-                            recentBashCommands.shift();
-                    }
+                if (c.parsed.name === "grep_search") {
+                    const pattern = String(c.parsed.arguments?.pattern || "");
+                    if (recentGrepPatterns.includes(pattern))
+                        isRepeatedSearch = true;
+                    recentGrepPatterns.push(pattern);
+                    if (recentGrepPatterns.length > 5)
+                        recentGrepPatterns.shift();
                 }
-                const isStuckAction = isUselessAction ||
-                    isRepeatedRead ||
-                    isRepeatedSearch ||
-                    isRepeatedQuestion ||
-                    isRepeatedBash;
-                if (isStuckAction) {
-                    uselessActionCount++;
-                    if (uselessActionCount >= 3) {
-                        if (!quiet) {
-                            renderer?.writeWarning(`  [agent stuck: ${uselessActionCount} useless actions]`);
-                        }
-                        clearPlan();
-                        messages.push({
-                            role: "user",
-                            content: `[System: You are stuck in a loop. STOP calling the same tool. The user already answered your question — use their answer and proceed with the task. Do NOT ask the same question again.]`,
-                        });
-                        uselessActionCount = 0;
-                        continuationNudges = 0;
-                        continue;
+                if (c.parsed.name === "question") {
+                    const questionText = String(c.parsed.arguments?.question || "");
+                    if (recentQuestions.includes(questionText))
+                        isRepeatedQuestion = true;
+                    recentQuestions.push(questionText);
+                    if (recentQuestions.length > 3)
+                        recentQuestions.shift();
+                }
+                if (c.parsed.name === "bash") {
+                    const cmdText = String(c.parsed.arguments?.cmd || "");
+                    const normalized = cmdText.trim().replace(/\s+/g, " ");
+                    if (recentBashCommands.includes(normalized))
+                        isRepeatedBash = true;
+                    recentBashCommands.push(normalized);
+                    if (recentBashCommands.length > 5)
+                        recentBashCommands.shift();
+                }
+            }
+            const isStuckAction = isUselessAction ||
+                isRepeatedRead ||
+                isRepeatedSearch ||
+                isRepeatedQuestion ||
+                isRepeatedBash;
+            if (isStuckAction) {
+                uselessActionCount++;
+                if (uselessActionCount >= 3) {
+                    if (!quiet) {
+                        renderer?.writeWarning(`  [agent stuck: ${uselessActionCount} useless actions]`);
                     }
+                    clearPlan();
+                    messages.push({
+                        role: "user",
+                        content: `[System: You are stuck in a loop. STOP calling the same tool. The user already answered your question — use their answer and proceed with the task. Do NOT ask the same question again.]`,
+                    });
+                    uselessActionCount = 0;
+                    continuationNudges = 0;
+                    continue;
                 }
-                else if (validCalls.some((c) => c.parsed.name === "subagent" ||
+            }
+            else {
+                consecutiveNoToolSteps = 0;
+                if (validCalls.some((c) => c.parsed.name === "subagent" ||
                     c.parsed.name === "write_file" ||
                     c.parsed.name === "bash")) {
                     uselessActionCount = 0;
@@ -612,21 +628,44 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
                     recentQuestions.length = 0;
                     recentBashCommands.length = 0;
                 }
-                // Если модель claim-ит done но есть созданные файлы — напоминаем о полноте
-                if (createdFiles.length > 0 && looksLikeDone) {
+            }
+            // === 4. Выход: решение по поведению, а не по тексту ===
+            // 4a. Модель ничего не делала — поведенческий контроль
+            if (!hasDoneAnyWork) {
+                if (step > 0)
+                    consecutiveNoToolSteps++;
+                if (consecutiveNoToolSteps >= 2) {
+                    if (!quiet) {
+                        renderer?.writeWarning(`  [idle: ${consecutiveNoToolSteps} steps without any tool calls]`);
+                    }
+                    const idleSteps = consecutiveNoToolSteps;
+                    consecutiveNoToolSteps = 0;
                     messages.push({
                         role: "user",
-                        content: `Files created: ${createdFiles.join(", ")}. Before finishing — verify all files are complete and connected to each other. If any file is missing or not imported, continue working.`,
+                        content: `[System: ты уже ${idleSteps} шага подряд не вызываешь инструменты. Если задача требует создания/изменения файлов — вызови write_file или edit_file. Если задача уже выполнена — напиши результат пользователю.]`,
                     });
                     continuationNudges = 0;
                     continue;
                 }
+                // Первый ответ (step === 0) без инструментов — обычный диалог
                 return { messages };
             }
-            continue;
+            // 4b. Модель что-то делала — проверяем созданные файлы перед выходом
+            if (createdFiles.length > 0) {
+                messages.push({
+                    role: "user",
+                    content: `Files created: ${createdFiles.join(", ")}. Before finishing — verify all files are complete and connected to each other. If any file is missing or not imported, continue working.`,
+                });
+                continuationNudges = 0;
+                continue;
+            }
+            // 4c. Модель работала, но не создавала файлы (читала, искала и т.д.)
+            return { messages };
         }
-        // ─── Grounding check ────────────────────────────────
-        // Проверка наличия маркера @grounding[файл: path] перед tool_call
+        // ─── Grounding check (ослаблен, агент больше не блокирует) ──
+        // Раньше grounding strict mode гонял модель по retry-циклу.
+        // Теперь grounding-fixer адаптер сам добавляет маркеры —
+        // grounding check только предупреждает, никогда не блокирует.
         if (validCalls.length > 0) {
             const groundingCfg = getGroundingConfig(config);
             if (groundingCfg.enabled) {
@@ -635,76 +674,12 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
                 const pathCalls = validCalls.filter((c) => c.parsed.arguments?.path);
                 if (pathCalls.length > groundPaths.length) {
                     consecutiveMissingGrounding++;
-                    const maxMissing = groundingCfg.maxMissingGrounding ?? 3;
-                    const maxRetries = groundingCfg.maxConsecutiveGroundingErrors ?? 5;
-                    if (consecutiveMissingGrounding >= maxMissing) {
-                        // CRITICAL — сброс счётчика + учёт retry
-                        consecutiveMissingGrounding = 0;
-                        groundingRetryCount++;
-                        if (groundingRetryCount > maxRetries) {
-                            // Полный bypass — выполняем tool_call без маркера
-                            if (!quiet)
-                                renderer?.writeWarning(`  [grounding: exceeded limit, bypassing]`);
-                            groundingRetryCount = 0;
-                            messages.push({
-                                role: "user",
-                                content: `[Note: Grounding check disabled after repeated failures. Proceeding without marker. To re-enable, reset the agent.]`,
-                            });
-                            // fall through — tool call будет выполнен
-                        }
-                        else {
-                            if (!quiet)
-                                renderer?.writeError(`  [grounding: ${groundingRetryCount}/${maxRetries} retries]`);
-                            messages.push({
-                                role: "user",
-                                content: `[CRITICAL: Output @grounding[файл: <path>] BEFORE each <tool_call>.\nExample:\n@grounding[файл: package.json]\n<tool_call>{"name":"read_file","arguments":{"path":"package.json"}}</tool_call>]`,
-                            });
-                            continue;
-                        }
-                    }
-                    else if (groundingCfg.strictMode) {
-                        if (!quiet)
-                            renderer?.writeError(`  [grounding: strict mode, retrying]`);
-                        messages.push({
-                            role: "user",
-                            content: `[Grounding Error: Missing @grounding[файл: path] marker. Output the marker BEFORE each <tool_call>. Example:\n@grounding[файл: package.json]\n<tool_call>{"name":"read_file","arguments":{"path":"package.json"}}</tool_call>]`,
-                        });
-                        continue;
-                    }
-                    else {
-                        if (!quiet)
-                            renderer?.writeDim(`  [grounding: missing marker, reminder ${consecutiveMissingGrounding}/${maxMissing}]`);
-                        messages.push({
-                            role: "user",
-                            content: `[Reminder: Include @grounding[файл: path] marker before each <tool_call> to prevent path hallucinations. Example:\n@grounding[файл: package.json]\n<tool_call>{"name":"read_file","arguments":{"path":"package.json"}}</tool_call>]`,
-                        });
-                        continue;
-                    }
+                    if (!quiet)
+                        renderer?.writeDim(`  [grounding: ${consecutiveMissingGrounding} call(s) without marker — adapter handled]`);
                 }
                 else {
                     consecutiveMissingGrounding = 0;
                     groundingRetryCount = 0;
-                    // Проверка соответствия пути в маркере и в аргументах tool_call
-                    for (let i = 0; i < pathCalls.length && i < groundPaths.length; i++) {
-                        const callPath = String(pathCalls[i].parsed.arguments.path || "")
-                            .replace(/\\/g, "/")
-                            .replace(/^\.\//, "");
-                        const groundPath = groundPaths[i]
-                            .replace(/\\/g, "/")
-                            .replace(/^\.\//, "");
-                        if (callPath &&
-                            groundPath &&
-                            !callPath.endsWith(groundPath) &&
-                            !groundPath.endsWith(callPath)) {
-                            if (!quiet)
-                                renderer?.writeWarning(`  [grounding: path mismatch — marker says "${groundPath}", tool says "${callPath}"]`);
-                            messages.push({
-                                role: "user",
-                                content: `[Warning: Grounding marker path "${groundPath}" doesn't match tool call path "${callPath}". Fix the marker to match the actual path.]`,
-                            });
-                            break;
-                        }
-                    }
                 }
             }
         }
@@ -1033,6 +1008,8 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
                     }
                 }
             }
+            // Любой выполненный tool call сбрасывает счётчик бездействия
+            consecutiveNoToolSteps = 0;
             messages.push({
                 role: "tool",
                 content: truncateOutput(parsed.name, toolOutput, toolExitCode),