micro-models-agent 0.2.91 → 0.3.0

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

@@ -0,0 +1,18 @@
+import type { LLMProvider, ChatMessage } from '../llm/provider.js';
+import type { ToolRegistry } from '../tools/registry.js';
+import type { ToolExecutor } from './tool-executor.js';
+import type { OutputRenderer } from '../ui/renderer.js';
+/**
+ * Управляет эскалацией ошибок инструментов: отслеживание,
+ * вызов specialist'а, переключение стратегии и блокировка.
+ */
+export declare class ErrorEscalator {
+    consecutiveToolErrors: Map<string, number>;
+    totalToolErrors: number;
+    specialistSpawnedFor: string | null;
+    errorStrategy: 'normal' | 'subagent-hint' | 'force-subagent';
+    resetForTool(toolName: string): void;
+    reset(): void;
+    handleToolError(toolName: string, toolOutput: string, toolArgs: Record<string, unknown>, toolId: string, messages: ChatMessage[], createdFiles: string[], enrichedPrompt: string, renderer: OutputRenderer | undefined, quiet: boolean, provider: LLMProvider, registry: ToolRegistry, toolExecutor: ToolExecutor, modeConfig: any, llmCfg: any): Promise<'continue' | 'block'>;
+}
+//# sourceMappingURL=error-escalation.d.ts.map

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

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

package/dist/agent/error-escalation.js

@@ -0,0 +1,122 @@
+import { generateToolCallId } from '../tools/id-gen.js';
+import { logInfo, logError } from '../logger.js';
+import { loadConfig, getSpecialistConfig } from '../config/config.js';
+import { buildSpecialistTask, buildSubagentContext, isTrivialError, runIsolatedLoop } from '../tools/subagent.js';
+import { SubagentRenderer } from '../ui/subagent-renderer.js';
+import { truncateOutput } from './tool-executor.js';
+/**
+ * Запускает specialist'а для решения повторяющейся ошибки.
+ */
+async function spawnSpecialist(p) {
+    if (!p.quiet) {
+        p.renderer?.writeBracketTag('specialist', `solving '${p.errorOutput.slice(0, 60).replace(/\n/g, ' ')}' error...`);
+    }
+    const task = buildSpecialistTask(p.toolName, p.toolArgs, p.errorOutput, p.enrichedPrompt, p.errorCount);
+    const ctx = buildSubagentContext(process.cwd());
+    const sub = new SubagentRenderer();
+    try {
+        logInfo('LOOP', `spawning specialist for ${p.toolName} (attempt #${p.errorCount})`);
+        const r = await runIsolatedLoop(p.provider, p.registry, task, ctx, process.cwd(), p.quiet, sub, p.toolExecutor, p.modeConfig.subagentMode, p.llmCfg.toolModel, p.specialistCfg.maxSteps);
+        for (let i = p.messages.length - 1; i >= 0; i--) {
+            if (p.messages[i].role === 'tool' && p.messages[i].tool_call_id === p.toolId) {
+                const text = r.errors.length > 0
+                    ? `[Specialist attempted to fix "${p.toolName}" but failed:\n${r.errors.join('\n')}\n${r.summary}]\nTry a different approach.`
+                    : `[Specialist resolved "${p.toolName}" error.\n${r.summary}]\nContinue with the task.`;
+                p.messages[i].content = truncateOutput(p.toolName, text, 0);
+                break;
+            }
+        }
+        for (const f of r.createdFiles) {
+            if (!p.createdFiles.includes(f))
+                p.createdFiles.push(f);
+        }
+        const buf = sub.getBuffer();
+        if (!p.quiet && p.renderer?.writeToolBuffer)
+            p.renderer.writeToolBuffer({ lines: buf.lines, toolCalls: buf.toolCalls });
+        logInfo('LOOP', `specialist done | files: ${r.createdFiles.length} | turns: ${r.turns} | errors: ${r.errors.length}`);
+        return true;
+    }
+    catch (e) {
+        logError('LOOP', `specialist error: ${e.message}`);
+        if (!p.quiet)
+            p.renderer?.writeError(`  [specialist failed: ${e.message}]`);
+        return false;
+    }
+}
+/**
+ * Управляет эскалацией ошибок инструментов: отслеживание,
+ * вызов specialist'а, переключение стратегии и блокировка.
+ */
+export class ErrorEscalator {
+    consecutiveToolErrors = new Map();
+    totalToolErrors = 0;
+    specialistSpawnedFor = null;
+    errorStrategy = 'normal';
+    resetForTool(toolName) {
+        for (const [key] of this.consecutiveToolErrors) {
+            if (key.startsWith(toolName + '::'))
+                this.consecutiveToolErrors.delete(key);
+        }
+        this.specialistSpawnedFor = null;
+    }
+    reset() {
+        this.consecutiveToolErrors.clear();
+        this.totalToolErrors = 0;
+        this.specialistSpawnedFor = null;
+        this.errorStrategy = 'normal';
+    }
+    async handleToolError(toolName, toolOutput, toolArgs, toolId, messages, createdFiles, enrichedPrompt, renderer, quiet, provider, registry, toolExecutor, modeConfig, llmCfg) {
+        this.totalToolErrors++;
+        const errKey = `${toolName}::${toolOutput.slice(0, 100).replace(/[A-Z]:\\[^\s"']+/gi, '<PATH>').replace(/\/[^\s"']+/g, '<PATH>')}`;
+        const prevCount = this.consecutiveToolErrors.get(errKey) ?? 0;
+        this.consecutiveToolErrors.set(errKey, prevCount + 1);
+        const errorCount = prevCount + 1;
+        const config = loadConfig();
+        const specialistCfg = getSpecialistConfig(config);
+        if (specialistCfg.enabled &&
+            errorCount === specialistCfg.triggerThreshold &&
+            this.specialistSpawnedFor !== errKey &&
+            !isTrivialError(toolName, toolOutput) &&
+            toolOutput.length >= specialistCfg.minErrorLength) {
+            this.specialistSpawnedFor = errKey;
+            const spawned = await spawnSpecialist({
+                provider, registry, toolExecutor, modeConfig, llmCfg, specialistCfg,
+                quiet, renderer, messages, toolId, createdFiles,
+                toolName, toolArgs,
+                errorOutput: toolOutput, errorCount, enrichedPrompt,
+            });
+            if (spawned)
+                return 'continue';
+        }
+        if (errorCount > specialistCfg.triggerThreshold) {
+            let webHint = '';
+            if (toolName === 'web_browse' && String(toolArgs?.action) === 'evaluate') {
+                webHint = ' For web scraping: use web_browse(action:"discover") to find real CSS selectors, or web_browse(action:"get_links") to see all links, or web_browse(action:"extract", format:"html") to inspect the page structure.';
+            }
+            else if (toolName === 'web_browse' && String(toolArgs?.action) === 'navigate' && toolOutput.includes('Status: 40')) {
+                webHint = ' Page returned HTTP error. Try navigating to the site homepage first, then use web_browse(action:"get_links") or web_browse(action:"discover") to explore available categories and sections instead of guessing URLs.';
+            }
+            const msg = errorCount === specialistCfg.triggerThreshold + 1
+                ? `[System: Tool "${toolName}" failed with the SAME error ${errorCount} times. Read the error message carefully. The input is likely wrong — try a completely different approach, or use subagent for a fresh context.]${webHint}`
+                : `[System: Tool "${toolName}" failed ${errorCount} times with the same error. STOP. Do NOT retry the same call. Use subagent(task="...") for a fresh context, or tell the user you're stuck.]${webHint}`;
+            messages.push({ role: 'user', content: msg });
+            if (!quiet)
+                renderer?.writeWarning(`  [error escalation: ${toolName} failed ${errorCount} times]`);
+        }
+        if (this.totalToolErrors >= 5 && this.errorStrategy === 'normal') {
+            this.errorStrategy = 'subagent-hint';
+            messages.push({ role: 'user', content: `[System: ${this.totalToolErrors} tool errors. Use subagent(task="...") for a fresh context.]` });
+            if (!quiet)
+                renderer?.writeWarning(`  [strategy: subagent-hint after ${this.totalToolErrors} errors]`);
+        }
+        if (errorCount >= 4) {
+            const blockId = generateToolCallId();
+            messages.push({ role: 'tool', content: `BLOCKED: Tool "${toolName}" failed ${errorCount} times. Temporarily blocked.`, tool_call_id: blockId });
+            if (!quiet)
+                renderer?.writeWarning(`  [blocked ${toolName}: too many repeated errors]`);
+            return 'block';
+        }
+        return 'block';
+    }
+}
+//# sourceMappingURL=error-escalation.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -2,7 +2,7 @@ import type { LLMProvider, ChatMessage } from '../llm/provider.js';
 import { ToolRegistry } from '../tools/registry.js';
 import { ContextManager } from './context.js';
 import type { OutputRenderer } from '../ui/renderer.js';
-import type { AgentMode } from '../config/types.js';
+import type { AgentMode, RuntimeFlags } from '../config/types.js';
 /**
  * Результат выполнения цикла агента.
  * Содержит всю историю сообщений и опциональный pending-вопрос
@@ -41,5 +41,6 @@ export declare function runAgentLoop(provider: LLMProvider, registry: ToolRegist
     quiet?: boolean;
     showThinking?: boolean;
     mode?: AgentMode;
+    flags?: RuntimeFlags;
 }): Promise<AgentLoopResult>;
 //# sourceMappingURL=loop.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAY9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAiHpD;;;;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;AAmED;;;;;;;;;;;;;;;;;;;;;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;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,GACtE,OAAO,CAAC,eAAe,CAAC,CA+iC1B"}
+{"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;AAa9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGxD,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAgFlE;;;;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;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,YAAY,CAAA;CAAE,GAC5F,OAAO,CAAC,eAAe,CAAC,CA64B1B"}

package/dist/agent/loop.js

@@ -1,6 +1,6 @@
 import { readFileSync, existsSync } from 'node:fs';
-import { join } from 'node:path';
-import { jsonrepair } from 'jsonrepair';
+import { join, isAbsolute, relative } from 'node:path';
+import { parseToolCalls } from '../tools/parse-tool-call.js';
 import { parseFileRefs } from '../file-loader.js';
 import { ContextManager } from './context.js';
 import { autoLearnFromError } from './memory.js';
@@ -11,13 +11,16 @@ import { loadSkill, loadSkillsFromRefs, enforceSkillBudget, preloadSkillsByKeywo
 import { runPreToolUseHooks, runPostToolUseHooks } from '../tools/hooks.js';
 import { isMCPCommand, parseMCPCommand, callMCPTool } from '../tools/mcp.js';
 import { showPlan, getPlanPendingCount, clearPlan, getNextPendingStep, updatePlanStep, extractDirFromStepTitle } from '../tools/plan.js';
+import { generateToolCallId } from '../tools/id-gen.js';
 import { checkFileSyntax } from '../tools/syntax-check.js';
-import { loadConfig, getLLMConfig, getSpecialistConfig, getGroundingConfig } from '../config/config.js';
+import { loadConfig, getLLMConfig, getGroundingConfig } from '../config/config.js';
 import { buildSystemPrompt } from './system-prompt.js';
 import { logInfo, logWarn, logError, logDebug, logToolCall, setStatusWriter, writeStatus } from '../logger.js';
-import { buildSubagentContext, buildSpecialistTask, isTrivialError, runIsolatedLoop, extractAllToolCalls, validateToolCall, doChat } from '../tools/subagent.js';
+import { buildSubagentContext, runIsolatedLoop, doChat } from '../tools/subagent.js';
 import { SubagentRenderer } from '../ui/subagent-renderer.js';
 import { ToolExecutor } from './tool-executor.js';
+import { ErrorEscalator } from './error-escalation.js';
+import { WriteEnforcer } from './write-enforcer.js';
 import { PluginManager } from '../plugins/manager.js';
 import { loadAllPluginsWithInfo } from '../plugins/loader.js';
 import { handleToolAfter as lintHandleToolAfter } from '../plugins/builtin/lint-on-write/index.js';
@@ -46,40 +49,7 @@ import { treeHandler } from '../tools/fs/tree.js';
 import { webSearchHandler } from '../tools/web-search.js';
 import { webFetchHandler } from '../tools/web-fetch.js';
 import { webBrowseHandler } from '../tools/web-browse.js';
-/**
- * Умная обрезка tool-результатов для экономии токенов в контексте.
- *
- * Полные результаты сохраняются в файл сессии, в контексте — только
- * достаточно информации для модели чтобы продолжить работу.
- *
- * Лимиты подобраны эмпирически: достаточно для маленьких моделей
- * понять что произошло, но не занимают весь контекст.
- */
-function truncateToolOutput(toolName, output, exitCode) {
-    // Ошибки обрезаем мягче — модели нужен контекст для диагностики
-    if (exitCode !== 0) {
-        return output.length > 3000 ? output.slice(0, 3000) + '\n...[truncated]' : output;
-    }
-    // Лимиты для успешных операций (в символах)
-    const LIMITS = {
-        read_file: 2000, // модель может ссылаться на строки
-        write_file: 200, // достаточно "Written X bytes"
-        edit_file: 300, // нужно знать что изменилось
-        bash: 1500, // build output, git status
-        list_dir: 1500, // структура обычно компактна
-        glob_search: 1000, // список файлов
-        grep_search: 1500, // результаты поиска
-        tree: 1500, // дерево файлов
-        subagent: 500, // краткое резюме от субагента
-        web_search: 1000, // результаты поиска
-        web_fetch: 1500, // контент страницы
-        web_browse: 2000, // browser interaction results
-    };
-    const limit = LIMITS[toolName] ?? 800;
-    if (output.length <= limit)
-        return output;
-    return output.slice(0, limit) + '\n...[truncated]';
-}
+import { truncateOutput } from './tool-executor.js';
 /**
  * Основной цикл ReAct-агента.
  *
@@ -121,58 +91,6 @@ function extractToolCallFallback(response) {
     }
     return null;
 }
-/**
- * Запускает specialist'а для решения повторяющейся ошибки.
- *
- * Specialist — это изолированный суб-агент со свежим контекстом,
- * который получает задачу "диагностируй и исправь ошибку инструмента X".
- *
- * Алгоритм:
- * 1. Формирует задачу через buildSpecialistTask()
- * 2. Собирает контекст проекта через buildSubagentContext()
- * 3. Запускает runIsolatedLoop() с ограничением maxSteps
- * 4. Заменяет результат ошибки в messages[] на результат specialist'а
- * 5. Трекает созданные specialist'ом файлы
- *
- * @returns true если specialist отработал (основной цикл должен continue),
- *          false если specialist упал (ошибка остаётся в messages)
- */
-async function spawnSpecialist(p) {
-    if (!p.quiet) {
-        p.renderer?.writeBracketTag('specialist', `solving '${p.errorOutput.slice(0, 60).replace(/\n/g, ' ')}' error...`);
-    }
-    const task = buildSpecialistTask(p.toolName, p.toolArgs, p.errorOutput, p.enrichedPrompt, p.errorCount);
-    const ctx = buildSubagentContext(process.cwd());
-    const sub = new SubagentRenderer();
-    try {
-        logInfo('LOOP', `spawning specialist for ${p.toolName} (attempt #${p.errorCount})`);
-        const r = await runIsolatedLoop(p.provider, p.registry, task, ctx, process.cwd(), p.quiet, sub, p.toolExecutor, p.modeConfig.subagentMode, p.llmCfg.toolModel, p.specialistCfg.maxSteps);
-        for (let i = p.messages.length - 1; i >= 0; i--) {
-            if (p.messages[i].role === 'tool' && p.messages[i].tool_call_id === p.toolId) {
-                const text = r.errors.length > 0
-                    ? `[Specialist attempted to fix "${p.toolName}" but failed:\n${r.errors.join('\n')}\n${r.summary}]\nTry a different approach.`
-                    : `[Specialist resolved "${p.toolName}" error.\n${r.summary}]\nContinue with the task.`;
-                p.messages[i].content = truncateToolOutput(p.toolName, text, 0);
-                break;
-            }
-        }
-        for (const f of r.createdFiles) {
-            if (!p.createdFiles.includes(f))
-                p.createdFiles.push(f);
-        }
-        const buf = sub.getBuffer();
-        if (!p.quiet && p.renderer?.writeToolBuffer)
-            p.renderer.writeToolBuffer({ lines: buf.lines, toolCalls: buf.toolCalls });
-        logInfo('LOOP', `specialist done | files: ${r.createdFiles.length} | turns: ${r.turns} | errors: ${r.errors.length}`);
-        return true;
-    }
-    catch (e) {
-        logError('LOOP', `specialist error: ${e.message}`);
-        if (!p.quiet)
-            p.renderer?.writeError(`  [specialist failed: ${e.message}]`);
-        return false;
-    }
-}
 /**
  * Запускает основной цикл ReAct-агента.
  *
@@ -315,7 +233,7 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
     const pluginSections = await pluginManager.getPromptSections();
     // Сборка system prompt (включает инструкции, информацию о проекте, скилы, память, плагины)
     const sysStart = performance.now();
-    const systemPrompt = buildSystemPrompt(loadedSkills.length > 0 ? loadedSkills : undefined, options?.mode, pluginSections);
+    const systemPrompt = buildSystemPrompt(loadedSkills.length > 0 ? loadedSkills : undefined, options?.mode, pluginSections, options?.flags);
     const sysElapsed = ((performance.now() - sysStart) / 1000).toFixed(1);
     writeStatus(`Done (${sysElapsed}s)`);
     setStatusWriter(null);
@@ -332,15 +250,6 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
     let aborted = false;
     let continuationNudges = 0; // счётчик подсказок "продолжай работать"
     let consecutiveMissingGrounding = 0; // счётчик пропущенных grounding-маркеров подряд
-    let directWriteStreak = 0; // количество прямых write_file без subagent
-    /** Трекер повторяющихся tool errors: { normalizedError → count } */
-    const consecutiveToolErrors = new Map();
-    /** Общий счётчик ошибок за сессию */
-    let totalToolErrors = 0;
-    /** Стратегия обработки ошибок: 'normal' | 'subagent-hint' | 'force-subagent' */
-    let errorStrategy = 'normal';
-    /** Флаг: specialist уже был запущен для текущей ошибки (чтобы не дублировать) */
-    let specialistSpawnedFor = null;
     /** Счётчик бесполезных действий (list_dir, glob_search, todo list без результата) */
     let uselessActionCount = 0;
     /** История последних чтений файлов для.detect повторных чтений */
@@ -360,6 +269,8 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
         fileInfoHandler, globSearchHandler, grepSearchHandler, treeHandler,
         webSearchHandler, webFetchHandler, webBrowseHandler,
     ]);
+    const errorEscalator = new ErrorEscalator();
+    const writeEnforcer = new WriteEnforcer();
     // Reset abort signal for this run
     if (renderer?.abortSignal === undefined) {
         // Renderer doesn't support abort — fine
@@ -460,7 +371,7 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
                     }
                 }
                 renderer?.writeInfo(`  Auto-loaded ${loadedSkills.filter(s => newSkillNames.includes(s.name)).length} skill(s): ${newSkillNames.join(', ')}`);
-                messages[0] = { role: 'system', content: buildSystemPrompt(loadedSkills, options?.mode, pluginSections) };
+                messages[0] = { role: 'system', content: buildSystemPrompt(loadedSkills, options?.mode, pluginSections, options?.flags) };
                 // Не удаляем ответ ассистента — skills загружаются для следующих шагов цикла.
                 // Модель увидит обновлённый system prompt на следующей итерации и сможет
                 // использовать загруженные скилы без retry (экономит ~один LLM-запрос).
@@ -509,42 +420,7 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
         }
         consecutiveEmpty = 0;
         messages.push({ role: 'assistant', content: response });
-        // ─── Парсинг tool calls ─────────────────────────────
-        // Извлекаем JSON из тегов <tool_call>...</tool_call> и валидируем
-        const allJsonRaw = extractAllToolCalls(response);
-        const validCalls = [];
-        const invalidCalls = [];
-        for (const jsonRaw of allJsonRaw) {
-            let p = null;
-            try {
-                p = JSON.parse(jsonrepair(jsonRaw));
-            }
-            catch {
-                try {
-                    p = JSON.parse(jsonRaw);
-                }
-                catch { /* continue */ }
-            }
-            if (p) {
-                const v = validateToolCall(p);
-                if (v.valid) {
-                    validCalls.push({ parsed: p, cmd: v.cmd });
-                }
-                else if (v.error) {
-                    invalidCalls.push(v.error);
-                }
-            }
-        }
-        // ─── Fallback: regex-извлечение при невалидном JSON ───
-        if (validCalls.length === 0) {
-            const fallback = extractToolCallFallback(response);
-            if (fallback) {
-                validCalls.push({ parsed: { name: 'bash', arguments: { cmd: fallback.cmd } }, cmd: fallback.cmd });
-                if (!quiet) {
-                    renderer?.writeBracketTag('fallback', 'regex extracted command');
-                }
-            }
-        }
+        const { validCalls, invalidCalls } = parseToolCalls(response);
         if (validCalls.length === 0) {
             if (invalidCalls.length > 0) {
                 // If the response has substantial text outside tool_call tags,
@@ -764,81 +640,9 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
         // ─── Enforce: лимиты на запись файлов ────────────────
         // Отслеживание повторных чтений одного файла для консолидации
         let lastReadFile = null;
-        // Блокировка прямых write_file когда есть план с 3+ шагами — force subagent
-        const planSteps = showPlan();
-        const hasMultiStepPlan = planEnforcement && !planSteps.startsWith('No active plan') && (planSteps.match(/\n/g) || []).length >= 3;
-        if (hasMultiStepPlan) {
-            const directWrites = validCalls.filter(c => c.parsed.name === 'write_file' || c.parsed.name === 'edit_file');
-            const hasSubagent = validCalls.some(c => c.parsed.name === 'subagent');
-            const hasBash = validCalls.some(c => c.parsed.name === 'bash');
-            if (directWrites.length > 0 && !hasSubagent) {
-                // Block direct writes — model must use subagent
-                for (const wc of directWrites) {
-                    const idx = validCalls.indexOf(wc);
-                    if (idx !== -1)
-                        validCalls.splice(idx, 1);
-                    const blockId = `call-${Date.now()}-${step}-${Math.random().toString(36).slice(2, 6)}`;
-                    messages.push({
-                        role: 'tool',
-                        content: `BLOCKED: Multi-step plan active. Use subagent for each step. Example: subagent({task:"Create file X", existingFiles:"Y.ts"}). After subagent completes, mark step done: plan({action:"done", step:N})`,
-                        tool_call_id: blockId,
-                    });
-                }
-                if (!quiet) {
-                    renderer?.writeWarning(`  [blocked ${directWrites.length} direct writes — use subagent for multi-step plans]`);
-                }
-            }
-            // Allow bash for verification (tsc --noEmit, npm run build) — don't block these
-        }
-        // ESCALATION: block write_file when creating N+ files without subagent (no plan case)
-        if (directWriteStreakMax < Infinity && !hasMultiStepPlan) {
-            const hasWrite = validCalls.some(c => c.parsed.name === 'write_file');
-            const hasSubagentNow = validCalls.some(c => c.parsed.name === 'subagent');
-            if (hasSubagentNow) {
-                directWriteStreak = 0;
-            }
-            else if (hasWrite) {
-                const writeCount = validCalls.filter(c => c.parsed.name === 'write_file').length;
-                directWriteStreak += writeCount;
-                if (directWriteStreak >= directWriteStreakMax) {
-                    const directWrites = validCalls.filter(c => c.parsed.name === 'write_file');
-                    for (const wc of directWrites) {
-                        const idx = validCalls.indexOf(wc);
-                        if (idx !== -1)
-                            validCalls.splice(idx, 1);
-                    }
-                    if (directWrites.length > 0) {
-                        const blockId = `call-${Date.now()}-${step}-${Math.random().toString(36).slice(2, 6)}`;
-                        messages.push({
-                            role: 'tool',
-                            content: `BLOCKED: You're creating file #${directWriteStreak} without subagent. For 3+ new files, use subagent for each one. Example: subagent("Create file X. Context: Y already exists.")`,
-                            tool_call_id: blockId,
-                        });
-                    }
-                    if (!quiet) {
-                        renderer?.writeWarning(`  [blocked ${directWrites.length} writes: ${directWriteStreak} files without subagent — use subagent for multi-file projects]`);
-                    }
-                }
-            }
-        }
-        // Блокировка нескольких записей файлов за один ответ — максимум одна
-        const writeCalls = validCalls.filter(c => c.parsed.name === 'write_file' || c.parsed.name === 'edit_file');
-        if (writeCalls.length > 1) {
-            // Keep only the first write call, block the rest
-            const blocked = writeCalls.slice(1);
-            validCalls.splice(validCalls.indexOf(blocked[0]), blocked.length);
-            for (const bc of blocked) {
-                const blockId = `call-${Date.now()}-${step}-${Math.random().toString(36).slice(2, 6)}`;
-                messages.push({
-                    role: 'tool',
-                    content: `BLOCKED: Only one file write per response is allowed. You wrote ${writeCalls.length} files at once. Complete the first file, then write the next one.`,
-                    tool_call_id: blockId,
-                });
-            }
-            if (!quiet) {
-                renderer?.writeWarning(`  [blocked ${blocked.length} extra file writes — one at a time]`);
-            }
-        }
+        writeEnforcer.enforcePlan(validCalls, messages, planEnforcement, quiet, renderer);
+        writeEnforcer.enforceWriteStreak(validCalls, messages, directWriteStreakMax, quiet, renderer);
+        writeEnforcer.enforceSingleWrite(validCalls, messages, quiet, renderer);
         // ─── Исполнение tool calls ──────────────────────────
         for (const call of validCalls) {
             const { parsed, cmd } = call;
@@ -846,7 +650,7 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
             const preview = isBash
                 ? (cmd.length > 200 ? cmd.slice(0, 200) + '...' : cmd)
                 : JSON.stringify(parsed.arguments);
-            const toolId = `call-${Date.now()}-${step}-${Math.random().toString(36).slice(2, 6)}`;
+            const toolId = generateToolCallId();
             logToolCall(parsed.name, preview);
             if (!quiet) {
                 renderer?.writeToolHeader(parsed.name);
@@ -1051,7 +855,6 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
                         ? cmd.match(/-Path\s+['"]?([^'"]+\.(?:ts|tsx|js|jsx|json))['"]?/i)?.[1]?.replace(/\\/g, '/')
                         : String(parsed.arguments.path ?? '');
                     if (rawPath && /\.(ts|tsx|js|jsx|json)$/.test(rawPath)) {
-                        const { isAbsolute, relative } = await import('node:path');
                         const filePath = isAbsolute(rawPath) ? relative(process.cwd(), rawPath).replace(/\\/g, '/') : rawPath;
                         const syntaxResult = checkFileSyntax(filePath, process.cwd());
                         if (syntaxResult !== 'OK') {
@@ -1120,72 +923,17 @@ export async function runAgentLoop(provider, registry, prompt, contextManager, p
             }
             messages.push({
                 role: 'tool',
-                content: truncateToolOutput(parsed.name, toolOutput, toolExitCode),
+                content: truncateOutput(parsed.name, toolOutput, toolExitCode),
                 tool_call_id: toolId,
             });
             // ─── Error escalation + specialist auto-delegation ──────────
             if (toolExitCode !== 0 && toolOutput) {
-                totalToolErrors++;
-                const errKey = `${parsed.name}::${toolOutput.slice(0, 100).replace(/[A-Z]:\\[^\s"']+/gi, '<PATH>').replace(/\/[^\s"']+/g, '<PATH>')}`;
-                const prevCount = consecutiveToolErrors.get(errKey) ?? 0;
-                consecutiveToolErrors.set(errKey, prevCount + 1);
-                const errorCount = prevCount + 1;
-                // ── Specialist: авто-делегация при повторяющихся ошибках ──
-                const specialistCfg = getSpecialistConfig(config);
-                if (specialistCfg.enabled &&
-                    errorCount === specialistCfg.triggerThreshold &&
-                    specialistSpawnedFor !== errKey &&
-                    !isTrivialError(parsed.name, toolOutput) &&
-                    toolOutput.length >= specialistCfg.minErrorLength) {
-                    specialistSpawnedFor = errKey;
-                    const spawned = await spawnSpecialist({
-                        provider, registry, toolExecutor, modeConfig, llmCfg, specialistCfg,
-                        quiet, renderer, messages, toolId, createdFiles,
-                        toolName: parsed.name, toolArgs: parsed.arguments,
-                        errorOutput: toolOutput, errorCount, enrichedPrompt,
-                    });
-                    if (spawned)
-                        continue;
-                }
-                // ── Escalation: hint / strategy switch / block ──
-                if (errorCount > specialistCfg.triggerThreshold) {
-                    // Веб-специфичные подсказки
-                    let webHint = '';
-                    if (parsed.name === 'web_browse' && String(parsed.arguments?.action) === 'evaluate') {
-                        webHint = ' For web scraping: use web_browse(action:"discover") to find real CSS selectors, or web_browse(action:"get_links") to see all links, or web_browse(action:"extract", format:"html") to inspect the page structure.';
-                    }
-                    else if (parsed.name === 'web_browse' && String(parsed.arguments?.action) === 'navigate' && toolOutput.includes('Status: 40')) {
-                        webHint = ' Page returned HTTP error. Try navigating to the site homepage first, then use web_browse(action:"get_links") or web_browse(action:"discover") to explore available categories and sections instead of guessing URLs.';
-                    }
-                    const msg = errorCount === specialistCfg.triggerThreshold + 1
-                        ? `[System: Tool "${parsed.name}" failed with the SAME error ${errorCount} times. Read the error message carefully. The input is likely wrong — try a completely different approach, or use subagent for a fresh context.]${webHint}`
-                        : `[System: Tool "${parsed.name}" failed ${errorCount} times with the same error. STOP. Do NOT retry the same call. Use subagent(task="...") for a fresh context, or tell the user you're stuck.]${webHint}`;
-                    messages.push({ role: 'user', content: msg });
-                    if (!quiet)
-                        renderer?.writeWarning(`  [error escalation: ${parsed.name} failed ${errorCount} times]`);
-                }
-                if (totalToolErrors >= 5 && errorStrategy === 'normal') {
-                    errorStrategy = 'subagent-hint';
-                    messages.push({ role: 'user', content: `[System: ${totalToolErrors} tool errors. Use subagent(task="...") for a fresh context.]` });
-                    if (!quiet)
-                        renderer?.writeWarning(`  [strategy: subagent-hint after ${totalToolErrors} errors]`);
-                }
-                if (errorCount >= 4) {
-                    const blockId = `call-${Date.now()}-${step}-${Math.random().toString(36).slice(2, 6)}`;
-                    messages.push({ role: 'tool', content: `BLOCKED: Tool "${parsed.name}" failed ${errorCount} times. Temporarily blocked.`, tool_call_id: blockId });
-                    const idx = validCalls.indexOf(call);
-                    if (idx !== -1)
-                        validCalls.splice(idx, 1);
-                    if (!quiet)
-                        renderer?.writeWarning(`  [blocked ${parsed.name}: too many repeated errors]`);
-                }
+                const action = await errorEscalator.handleToolError(parsed.name, toolOutput, parsed.arguments, toolId, messages, createdFiles, enrichedPrompt, renderer, quiet, provider, registry, toolExecutor, modeConfig, llmCfg);
+                if (action === 'continue')
+                    continue;
             }
             else {
-                for (const [key] of consecutiveToolErrors) {
-                    if (key.startsWith(parsed.name + '::'))
-                        consecutiveToolErrors.delete(key);
-                }
-                specialistSpawnedFor = null;
+                errorEscalator.resetForTool(parsed.name);
             }
             // НЕ добавляем "Continue." после каждого tool-вызова — это нарушает
             // структуру диалога. Bounded nudge (строка 418) уже покрывает