micro-models-agent 0.35.4 → 0.36.0

package/dist/main.js

@@ -2472,6 +2472,10 @@ Command: {command}`,
     "plan.step_already_done": "Step {step} is already done — nothing to do. Plan progress:",
     "plan.order_blocked": 'Cannot mark step {step} done: step {first} ("{desc}") is not finished yet. Complete earlier steps first, or mark step {first} status=skipped if it is not needed.',
     "plan.deliverables_missing": "Cannot mark step {step} done: the files it names do not exist yet: {files}. Create these files first (or mark the step status=skipped if they are not actually needed).",
+    "plan.kinds_mismatch": "kinds array length must match steps",
+    "plan.kinds_invalid": 'Invalid step kind(s): {kinds}. Use "create" or "delete".',
+    "plan.kinds_not_array": 'kinds must be an array of "create" or "delete"',
+    "plan.deliverables_remain": "Cannot mark step {step} done: the files it names still exist: {files}. This step is kind=delete — delete these files first (or set status=skipped if they should stay).",
     "plan.show_header": "Plan status:",
     "plan.show_empty": "(plan has no steps)",
     "plan.list_header": "Plans:",
@@ -2768,6 +2772,7 @@ Use this knowledge to answer the user's question.`,
     "exec.audit_pass": "[✓] Task complete: {done}/{total} steps done, {files} files verified",
     "exec.audit_pending": "[✗] Task incomplete: {done}/{total} steps done — remaining steps are not marked done",
     "exec.audit_fail": "[✗] Task incomplete: {done}/{total} steps done, {files} files missing",
+    "exec.audit_leftovers": "[✗] Task incomplete: {done}/{total} steps done, {files} files from delete-steps still exist",
     "exec.audit_fail_tests": "[✗] Task incomplete: {done}/{total} steps done, tests FAILING: {failed} failed / {passed} passed — {detail}",
     "exec.audit_fail_typecheck": "[✗] Task incomplete: {done}/{total} steps done, {missing} files missing, typecheck error: {typeError}",
     "exec.audit_incomplete": "[⚠ Final audit incomplete: {summary}. Task is NOT finished — continue working. Remaining steps: {steps}]",
@@ -2779,6 +2784,7 @@ Use this knowledge to answer the user's question.`,
 [Hints]
 {hints}`,
     "exec.file_rewrite_warning": "⚠️ File {file} has been rewritten {count} times. Consider a different approach — the current fix strategy is not working.",
+    "exec.forbidden_cmd": 'STOP using "{cmd}" via the bash tool — it is not a native Windows cmd.exe command and has failed repeatedly this session. Use the dedicated tool instead: grep → the grep tool, ls/dir → list_dir, find → glob, rm → delete_file, sed → edit_file, touch → write_file, which → `where`, cp/mv → move_file, diff → read_file. Do NOT call bash for this purpose again.',
     "hall.max_retries_exhausted": "Model returned empty or insufficient responses after multiple retries",
     "hall.short_response": "Response too short or empty",
     "hall.repetitive": "Response too repetitive ({pct}% overlap)",
@@ -3064,6 +3070,10 @@ var init_ru = __esm(() => {
     "plan.step_already_done": "Шаг {step} уже выполнен — ничего делать не нужно. Прогресс плана:",
     "plan.order_blocked": "Нельзя отметить шаг {step} выполненным: шаг {first} («{desc}») ещё не завершён. Сначала завершите предыдущие шаги или отметьте шаг {first} status=skipped, если он не нужен.",
     "plan.deliverables_missing": "Нельзя отметить шаг {step} выполненным: указанные в нём файлы ещё не существуют: {files}. Сначала создайте эти файлы (или отметьте шаг status=skipped, если они на самом деле не нужны).",
+    "plan.kinds_mismatch": "Длина kinds должна совпадать с числом шагов",
+    "plan.kinds_invalid": 'Недопустимый kind шага: {kinds}. Используй "create" или "delete".',
+    "plan.kinds_not_array": 'kinds должен быть массивом значений "create" или "delete"',
+    "plan.deliverables_remain": "Нельзя пометить шаг {step} как выполненный: указанные файлы всё ещё существуют: {files}. Шаг имеет kind=delete — сначала удали их (или поставь status=skipped, если они должны остаться).",
     "plan.show_header": "Статус плана:",
     "plan.show_empty": "(в плане нет шагов)",
     "plan.list_header": "Планы:",
@@ -3360,6 +3370,7 @@ var init_ru = __esm(() => {
     "exec.audit_pass": "[✓] Задача выполнена: {done}/{total} шагов, {files} файлов проверено",
     "exec.audit_pending": "[✗] Задача не выполнена: {done}/{total} шагов — оставшиеся шаги не отмечены выполненными",
     "exec.audit_fail": "[✗] Задача не выполнена: {done}/{total} шагов, {files} файлов отсутствует",
+    "exec.audit_leftovers": "[✗] Задача не выполнена: {done}/{total} шагов, {files} файлов из delete-шагов всё ещё существуют",
     "exec.audit_fail_tests": "[✗] Задача не выполнена: {done}/{total} шагов, тесты ПАДАЮТ: {failed} failed / {passed} passed — {detail}",
     "exec.audit_fail_typecheck": "[✗] Задача не выполнена: {done}/{total} шагов, {missing} файлов отсутствует, ошибка typecheck: {typeError}",
     "exec.audit_incomplete": "[⚠ Финальная проверка не пройдена: {summary}. Задача НЕ завершена — продолжайте работу. Оставшиеся шаги: {steps}]",
@@ -3371,6 +3382,7 @@ var init_ru = __esm(() => {
 [Подсказки]
 {hints}`,
     "exec.file_rewrite_warning": "⚠️ Файл {file} был перезаписан {count} раз. Попробуйте другой подход — текущая стратегия исправлений не работает.",
+    "exec.forbidden_cmd": 'ПРЕКРАТИ использовать "{cmd}" через bash — это не команда Windows cmd.exe, и она уже неоднократно падала в этой сессии. Используй предназначенный тул: grep → тул grep, ls/dir → list_dir, find → glob, rm → delete_file, sed → edit_file, touch → write_file, which → `where`, cp/mv → move_file, diff → read_file. Больше не вызывай bash для этого.',
     "hall.max_retries_exhausted": "Модель вернула пустой или недостаточный ответ после нескольких попыток",
     "hall.short_response": "Слишком короткий или пустой ответ",
     "hall.repetitive": "Слишком повторяющийся ответ ({pct}% совпадение)",
@@ -4902,6 +4914,30 @@ var exports_openai_compat = {};
 __export(exports_openai_compat, {
   OpenAICompatProvider: () => OpenAICompatProvider
 });
+function buildRequestBody(opts) {
+  const body = {
+    model: opts.model,
+    messages: opts.messages,
+    stream: opts.stream
+  };
+  if (opts.maxTokens !== undefined)
+    body.max_tokens = opts.maxTokens;
+  if (opts.reasoningEffort) {
+    body.reasoning_effort = opts.reasoningEffort;
+  }
+  if (opts.tools && opts.tools.length > 0) {
+    body.tools = opts.tools.map((t2) => ({
+      type: "function",
+      function: {
+        name: t2.name,
+        description: t2.description,
+        parameters: t2.parameters
+      }
+    }));
+    body.tool_choice = "auto";
+  }
+  return body;
+}
 
 class OpenAICompatProvider {
   model;
@@ -4949,26 +4985,14 @@ class OpenAICompatProvider {
     }
   }
   async* doStream(messages, tools, signal, options) {
-    const body = {
+    const body = buildRequestBody({
       model: this.model,
       messages,
+      tools,
       stream: true,
-      max_tokens: options?.maxTokens ?? this.config.maxCompletionTokens ?? 4096
-    };
-    if (options?.reasoningEffort) {
-      body.reasoning_effort = options.reasoningEffort;
-    }
-    if (tools && tools.length > 0) {
-      body.tools = tools.map((t2) => ({
-        type: "function",
-        function: {
-          name: t2.name,
-          description: t2.description,
-          parameters: t2.parameters
-        }
-      }));
-      body.tool_choice = "auto";
-    }
+      maxTokens: options?.maxTokens ?? this.config.maxCompletionTokens ?? 4096,
+      reasoningEffort: options?.reasoningEffort
+    });
     const headers = {
       "Content-Type": "application/json"
     };
@@ -5094,26 +5118,14 @@ class OpenAICompatProvider {
     }
   }
   async doNonStreaming(messages, tools, signal, options) {
-    const body = {
+    const body = buildRequestBody({
       model: this.model,
       messages,
+      tools,
       stream: false,
-      max_tokens: options?.maxTokens ?? this.config.maxCompletionTokens ?? 4096
-    };
-    if (options?.reasoningEffort) {
-      body.reasoning_effort = options.reasoningEffort;
-    }
-    if (tools && tools.length > 0) {
-      body.tools = tools.map((t2) => ({
-        type: "function",
-        function: {
-          name: t2.name,
-          description: t2.description,
-          parameters: t2.parameters
-        }
-      }));
-      body.tool_choice = "auto";
-    }
+      maxTokens: options?.maxTokens ?? this.config.maxCompletionTokens ?? 4096,
+      reasoningEffort: options?.reasoningEffort
+    });
     const headers = {
       "Content-Type": "application/json"
     };
@@ -9374,13 +9386,14 @@ class StuckDetector {
     if (desc.includes("deploy") || desc.includes("publish")) {
       hints.push("Verify credentials and network access before deploying.");
     }
-    if (this.hasRepetitiveToolCalls()) {
+    const primary = this.getPrimaryReason();
+    if (this.hasRepetitiveToolCalls() && primary !== "repetitive") {
       hints.push("You are calling the same tool repeatedly with the same arguments. Try a different approach.");
     }
-    if (this.hasConsecutiveFailures()) {
+    if (this.hasConsecutiveFailures() && primary !== "consecutive") {
       hints.push("Multiple different tools are failing. Check if the environment is set up correctly.");
     }
-    if (this.hasReadOnlyLoop()) {
+    if (this.hasReadOnlyLoop() && primary !== "read-only") {
       hints.push("You have made many read-only tool calls (read_file/glob/grep/browser) without writing anything. Stop exploring — make the edit/write the task needs, or use the plan tool to decide next steps.");
     }
     return hints;
@@ -9506,35 +9519,50 @@ class StuckDetector {
     return "";
   }
   getRecoveryMessage() {
-    if (this.isStuck()) {
+    const reason = this.getPrimaryReason();
+    if (reason === "stuck") {
       return t("exec.stuck_recovery", {
         iterations: this.iterationsOnCurrentStep,
         stepId: String(this.currentStepId ?? "?"),
         description: this.currentStepDescription
       });
     }
-    const errorTool = Array.from(this.toolErrors.entries()).find(([_, c]) => c >= this.errorThreshold);
-    if (errorTool) {
+    if (reason === "tool-errors") {
+      const errorTool = Array.from(this.toolErrors.entries()).find(([_, c]) => c >= this.errorThreshold);
       return t("exec.tool_errors_recovery", {
         tool: errorTool[0],
         count: errorTool[1]
       });
     }
-    if (this.hasConsecutiveFailures()) {
+    if (reason === "consecutive") {
       return t("exec.consecutive_failures_recovery", {
         count: this.consecutiveFailures
       });
     }
-    if (this.hasRepetitiveToolCalls()) {
+    if (reason === "repetitive") {
       return this.getRepetitiveToolMessage();
     }
-    if (this.hasReadOnlyLoop()) {
+    if (reason === "read-only") {
       return t("exec.read_only_loop_recovery", {
         count: String(this.readOnlyStreak)
       });
     }
     return "";
   }
+  getPrimaryReason() {
+    if (this.isStuck())
+      return "stuck";
+    const errorTool = Array.from(this.toolErrors.entries()).find(([_, c]) => c >= this.errorThreshold);
+    if (errorTool)
+      return "tool-errors";
+    if (this.hasConsecutiveFailures())
+      return "consecutive";
+    if (this.hasRepetitiveToolCalls())
+      return "repetitive";
+    if (this.hasReadOnlyLoop())
+      return "read-only";
+    return null;
+  }
   reset() {
     this.currentStepId = null;
     this.iterationsOnCurrentStep = 0;
@@ -10382,7 +10410,11 @@ class Agent {
 ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
   }
   emitPhase(iteration, phase, onPhase) {
-    this.deps.pluginManager.runOnPhase?.({ iteration, logger: this.deps.logger }, phase);
+    this.deps.pluginManager.runOnPhase?.({
+      iteration,
+      logger: this.deps.logger,
+      contextManager: this.deps.contextManager
+    }, phase);
     onPhase?.(phase);
   }
   async run(input, onChunk, onMeta, onTool, onPhase) {
@@ -10412,7 +10444,8 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       }
       pluginManager.runOnSessionStart({
         logger,
-        sessionManager: sessionManager?.getActiveMeta()
+        sessionManager: sessionManager?.getActiveMeta(),
+        contextManager
       });
       if (config.session?.baselineCheck !== false) {
         const verifier = new StepVerifier(baseDir);
@@ -10545,7 +10578,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           if (chunk.type === "reasoning" && chunk.content) {
             reasoningContent += chunk.content;
             if (config.showReasoning) {
-              const metaOut = pluginManager.runOnMeta({ iteration, logger }, chunk.content);
+              const metaOut = pluginManager.runOnMeta({ iteration, logger, contextManager }, chunk.content);
               if (metaOut) {
                 onMeta?.(pc2.dim(metaOut));
               }
@@ -10579,7 +10612,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
         logger.logLLMResponse(config.model, textContent.length, Date.now() - llmStart, err.message, "agent");
         logger.error(`LLM call failed: ${err.message}`);
         slog.logError(err.message);
-        pluginManager.runOnError({ iteration, logger }, err);
+        pluginManager.runOnError({ iteration, logger, contextManager }, err);
         return {
           success: false,
           text: lastText,
@@ -10598,7 +10631,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       const showText = textChunks.length > 0 && (!sawToolCall || toolComments && !isToolCallJson(textContent));
       if (showText) {
         for (const chunk of textChunks) {
-          const textOut = pluginManager.runOnText({ iteration, logger }, chunk);
+          const textOut = pluginManager.runOnText({ iteration, logger, contextManager }, chunk);
           onChunk?.(textOut);
         }
       }
@@ -10610,7 +10643,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       } else if (reasoningContent) {
         llmResponse = { type: "reasoning", content: reasoningContent };
       }
-      pluginManager.runOnAfterThink({ iteration, logger }, llmResponse);
+      pluginManager.runOnAfterThink({ iteration, logger, contextManager }, llmResponse);
       if (this.deps.exitOnComplete && sawToolCall) {
         const signature = toolCalls.map((tc) => `${tc.name}:${JSON.stringify(tc.arguments)}`).join("|");
         if (signature && signature === lastToolSignature) {
@@ -10651,7 +10684,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
             toolName: call.name,
             args: call.arguments
           });
-          pluginManager.runOnToolStart({ iteration, logger }, { id: call.id, name: call.name, arguments: call.arguments });
+          pluginManager.runOnToolStart({ iteration, logger, contextManager }, { id: call.id, name: call.name, arguments: call.arguments });
           onTool?.({ type: "start", tool: call.name, args: call.arguments });
           slog.logToolCall(call, iteration);
           const tokensBeforeTool = contextManager.getEstimatedTokens();
@@ -10667,13 +10700,13 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
               hallucinationDetector.getConsistencyCheck().trackDeletedFile(filePath);
             }
           }
-          pluginManager.runOnToolEnd({ iteration, logger }, { id: call.id, name: call.name, arguments: call.arguments }, result, duration);
+          pluginManager.runOnToolEnd({ iteration, logger, contextManager }, { id: call.id, name: call.name, arguments: call.arguments }, result, duration);
           if (result.display) {
             onMeta?.(`
 ` + result.display + `
 `);
           } else {
-            const metaOut = pluginManager.runOnMeta({ iteration, logger }, result.output);
+            const metaOut = pluginManager.runOnMeta({ iteration, logger, contextManager }, result.output);
             onMeta?.(`
 ` + pc2.dim(metaOut) + `
 `);
@@ -10994,7 +11027,8 @@ ${warnLine}
     logger.closeSessionLog();
     pluginManager.runOnSessionEnd({
       logger,
-      sessionManager: sessionManager?.getActiveMeta()
+      sessionManager: sessionManager?.getActiveMeta(),
+      contextManager
     });
   }
 }
@@ -11009,6 +11043,105 @@ var init_agent = __esm(() => {
   init_verifier();
 });
 
+// src/modules/context/fact-extractor.ts
+class FactExtractor {
+  fileFacts = [];
+  deletedFacts = [];
+  decisionFacts = [];
+  errorFacts = [];
+  static MAX_FACTS = 20;
+  get errorCount() {
+    return this.errorFacts.length;
+  }
+  extract(turns) {
+    const DRIVE = "(?:[a-zA-Z]:[\\\\/])?";
+    const createdPatterns = [
+      new RegExp(`(?:Created|Updated|Written|Moved|Replaced in) ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi"),
+      new RegExp(`Файл (?:создан|обновлён|записан|перемещён):? ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi"),
+      new RegExp(`file (?:created|updated|written|moved):? ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi")
+    ];
+    const deletedPatterns = [
+      new RegExp(`Deleted ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi"),
+      new RegExp(`(?:Удалён|Файл удалён):? ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi")
+    ];
+    const newFiles = [];
+    const newDeleted = [];
+    const newDecisions = [];
+    const newErrors = [];
+    const lastEvent = new Map;
+    for (const msg of turns) {
+      const content = getMessageText(msg.content);
+      if (msg.role === "user" && (content.startsWith("<system-summary>") || content.includes("[Compressed:"))) {
+        continue;
+      }
+      if (msg.role === "tool") {
+        for (const pattern of createdPatterns) {
+          for (const match of content.matchAll(pattern)) {
+            newFiles.push(match[1]);
+            lastEvent.set(match[1], "file");
+          }
+        }
+        for (const pattern of deletedPatterns) {
+          for (const match of content.matchAll(pattern)) {
+            newDeleted.push(match[1]);
+            lastEvent.set(match[1], "deleted");
+          }
+        }
+        if (content.includes("Plan:") && content.includes("[")) {
+          const planLine = content.split(`
+`).find((line) => line.includes("Plan:"));
+          if (planLine)
+            newDecisions.push(planLine.trim());
+        }
+      }
+      if (msg.role === "assistant") {
+        if (content.includes("decided:") || content.includes("decision:")) {
+          const line = content.split(`
+`).find((l) => l.includes("decided:") || l.includes("decision:"));
+          if (line)
+            newDecisions.push(line.trim().slice(0, 200));
+        }
+      }
+      if (content.includes("Error:") || content.includes("failed") || content.includes("Ошибка:") || content.includes("не удалось")) {
+        const line = content.split(`
+`).find((l) => l.includes("Error:") || l.includes("failed") || l.includes("Ошибка:") || l.includes("не удалось"));
+        if (line)
+          newErrors.push(line.trim().slice(0, 250));
+      }
+    }
+    const dedup = (arr) => [...new Set(arr)];
+    const finalFiles = dedup(newFiles.filter((p) => lastEvent.get(p) === "file"));
+    const finalDeleted = dedup(newDeleted.filter((p) => lastEvent.get(p) === "deleted"));
+    this.fileFacts = dedup([...this.fileFacts, ...finalFiles].filter((p) => !finalDeleted.includes(p))).slice(-FactExtractor.MAX_FACTS);
+    this.deletedFacts = dedup([...this.deletedFacts, ...finalDeleted].filter((p) => !finalFiles.includes(p))).slice(-FactExtractor.MAX_FACTS);
+    this.decisionFacts = dedup([...this.decisionFacts, ...newDecisions]).slice(-FactExtractor.MAX_FACTS);
+    this.errorFacts = dedup([...this.errorFacts, ...newErrors]).slice(-FactExtractor.MAX_FACTS);
+  }
+  filesLine() {
+    const deletedSet = new Set(this.deletedFacts);
+    const liveFiles = this.fileFacts.filter((p) => !deletedSet.has(p));
+    if (liveFiles.length === 0)
+      return null;
+    return `[Files: ${liveFiles.slice(-15).join("; ")}]`;
+  }
+  deletedLine() {
+    if (this.deletedFacts.length === 0)
+      return null;
+    return `[Deleted: ${this.deletedFacts.slice(-10).join("; ")}]`;
+  }
+  decisionsLine() {
+    if (this.decisionFacts.length === 0)
+      return null;
+    return `[Decisions: ${this.decisionFacts.slice(-5).join("; ")}]`;
+  }
+  errorsLine() {
+    if (this.errorFacts.length === 0)
+      return null;
+    return `[Errors: ${this.errorFacts.slice(-3).join("; ")}]`;
+  }
+}
+var init_fact_extractor = () => {};
+
 // src/modules/context/manager.ts
 function summarizeArgs(args) {
   if (!args)
@@ -11027,6 +11160,18 @@ function truncate(s, max) {
     return s;
   return s.slice(0, max - 3) + "...";
 }
+function looksLikeErrorPaste(text) {
+  if (/(?:^|\s)ERROR|Error:|error TS\d+|Transform failed|\[plugin:|SyntaxError|Cannot find|Uncaught|exception/i.test(text)) {
+    return true;
+  }
+  if (/(?:^|\n)\s*\d+\s*\|/.test(text))
+    return true;
+  if (/[\w./\\-]+\.[a-z]{1,6}:\d+:\d+/.test(text))
+    return true;
+  if (/(?:^|\n)\s*at\s+\S+/.test(text))
+    return true;
+  return false;
+}
 function extractTriedAndFailed(messages) {
   const failures = new Map;
   for (const msg of messages) {
@@ -11058,11 +11203,10 @@ class ContextManager {
   peakTokens = 0;
   budget;
   compactionThreshold;
-  fileFacts = [];
-  decisionFacts = [];
-  errorFacts = [];
+  facts = new FactExtractor;
   lastUserTask = "";
-  static MAX_FACTS = 20;
+  sessionMission = "";
+  lastUserFeedback = "";
   tokenCounter;
   pendingImageParts = [];
   toolTokens = 0;
@@ -11101,6 +11245,7 @@ class ContextManager {
   resetUserTurn() {
     this.iterationsSinceCompaction = 0;
     this.lastUserTask = "";
+    this.lastUserFeedback = "";
   }
   getQuality() {
     const usedTokens = this.getEstimatedTokens();
@@ -11108,16 +11253,22 @@ class ContextManager {
     const COMPACTION_PENALTY_FLOOR = 0.5;
     const compactionLoss = Math.max(COMPACTION_PENALTY_FLOOR, 1 - this.compactionCount * 0.15);
     const msgCount = this.messages.length || 1;
-    const errorDensity = Math.max(0, 1 - Math.min(1, this.errorFacts.length / msgCount));
+    const errorDensity = Math.max(0, 1 - Math.min(1, this.facts.errorCount / msgCount));
     const freshness = Math.max(0, 1 - this.iterationsSinceCompaction / COMPACTION_INTERVAL);
     const score = tokenLoad * 0.4 + compactionLoss * 0.25 + errorDensity * 0.2 + freshness * 0.15;
     return Math.round(Math.min(100, Math.max(0, score * 100)));
   }
   addMessage(msg) {
-    if (msg.role === "user" && !this.lastUserTask) {
+    if (msg.role === "user") {
       const text = typeof msg.content === "string" ? msg.content : getMessageText(msg.content);
       if (text.trim() && !text.startsWith("<system-summary>") && !text.includes("[Compressed:")) {
-        this.lastUserTask = text.trim();
+        if (looksLikeErrorPaste(text) && (this.lastUserTask || this.sessionMission)) {
+          this.lastUserFeedback = text.trim().slice(0, 400);
+        } else if (!this.lastUserTask && !this.lastUserFeedback) {
+          this.lastUserTask = text.trim();
+          if (!this.sessionMission)
+            this.sessionMission = text.trim();
+        }
       }
     }
     if (msg.role === "user" && this.pendingImageParts.length > 0) {
@@ -11206,22 +11357,27 @@ class ContextManager {
     const cutoff = this.messages.length - KEEP_LAST_N * 2;
     const oldTurns = this.messages.slice(0, cutoff);
     const recentTurns = this.messages.slice(cutoff);
-    this.extractFacts(oldTurns);
+    this.facts.extract(oldTurns);
     const parts = [];
     parts.push(`[Compressed: ${oldTurns.length} old turns removed]`);
-    if (this.lastUserTask) {
-      const task = this.lastUserTask.slice(0, 400);
+    const task = (this.lastUserTask || this.sessionMission).slice(0, 400);
+    if (task)
       parts.push(`[Task: ${task}]`);
-    }
-    if (this.fileFacts.length > 0) {
-      parts.push(`[Files: ${this.fileFacts.slice(-15).join("; ")}]`);
-    }
-    if (this.decisionFacts.length > 0) {
-      parts.push(`[Decisions: ${this.decisionFacts.slice(-5).join("; ")}]`);
-    }
-    if (this.errorFacts.length > 0) {
-      parts.push(`[Errors: ${this.errorFacts.slice(-3).join("; ")}]`);
-    }
+    if (this.lastUserFeedback && !task.startsWith(this.lastUserFeedback)) {
+      parts.push(`[User feedback: ${this.lastUserFeedback}]`);
+    }
+    const filesLine = this.facts.filesLine();
+    if (filesLine)
+      parts.push(filesLine);
+    const deletedLine = this.facts.deletedLine();
+    if (deletedLine)
+      parts.push(deletedLine);
+    const decisionsLine = this.facts.decisionsLine();
+    if (decisionsLine)
+      parts.push(decisionsLine);
+    const errorsLine = this.facts.errorsLine();
+    if (errorsLine)
+      parts.push(errorsLine);
     const triedAndFailed = extractTriedAndFailed(oldTurns);
     if (triedAndFailed.length > 0) {
       const lines = triedAndFailed.map((t2) => `- ${t2.tool}(${t2.args}): ${t2.error} (failed ${t2.count}x)`);
@@ -11251,55 +11407,6 @@ ${lines.join(`
       this.onCompact(summary);
     }
   }
-  extractFacts(turns) {
-    const DRIVE = "(?:[a-zA-Z]:[\\\\/])?";
-    const filePatterns = [
-      new RegExp(`(?:Created|Updated|Written|Deleted|Moved) ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi"),
-      new RegExp(`Replaced in ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi"),
-      new RegExp(`Файл (?:создан|обновлён|записан|удалён|перемещён):? ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi"),
-      new RegExp(`file (?:created|updated|written|deleted|moved):? ${DRIVE}([\\w./\\\\-]+\\.[a-z]+)`, "gi")
-    ];
-    const newFiles = [];
-    const newDecisions = [];
-    const newErrors = [];
-    for (const msg of turns) {
-      const content = getMessageText(msg.content);
-      if (msg.role === "user" && (content.startsWith("<system-summary>") || content.includes("[Compressed:"))) {
-        continue;
-      }
-      if (msg.role === "tool") {
-        for (const pattern of filePatterns) {
-          for (const match of content.matchAll(pattern)) {
-            newFiles.push(match[1]);
-          }
-        }
-        if (content.includes("Plan:") && content.includes("[")) {
-          const planLine = content.split(`
-`).find((line) => line.includes("Plan:"));
-          if (planLine)
-            newDecisions.push(planLine.trim());
-        }
-      }
-      if (msg.role === "assistant") {
-        if (content.includes("decided:") || content.includes("decision:")) {
-          const line = content.split(`
-`).find((l) => l.includes("decided:") || l.includes("decision:"));
-          if (line)
-            newDecisions.push(line.trim().slice(0, 200));
-        }
-      }
-      if (content.includes("Error:") || content.includes("failed") || content.includes("Ошибка:") || content.includes("не удалось")) {
-        const line = content.split(`
-`).find((l) => l.includes("Error:") || l.includes("failed") || l.includes("Ошибка:") || l.includes("не удалось"));
-        if (line)
-          newErrors.push(line.trim().slice(0, 250));
-      }
-    }
-    const dedup = (arr) => [...new Set(arr)];
-    this.fileFacts = dedup([...this.fileFacts, ...newFiles]).slice(-ContextManager.MAX_FACTS);
-    this.decisionFacts = dedup([...this.decisionFacts, ...newDecisions]).slice(-ContextManager.MAX_FACTS);
-    this.errorFacts = dedup([...this.errorFacts, ...newErrors]).slice(-ContextManager.MAX_FACTS);
-  }
   updateSystemPrompt(content) {
     const idx = this.messages.findIndex((m) => m.role === "system");
     if (idx >= 0) {
@@ -11318,6 +11425,8 @@ ${lines.join(`
     this.compactionCount = 0;
     this.peakTokens = 0;
     this.lastUserTask = "";
+    this.lastUserFeedback = "";
+    this.sessionMission = "";
   }
   getEstimatedTokens() {
     return this.messages.reduce((sum, m) => sum + this.estimateMessageTokens(m), 0) + this.toolTokens;
@@ -11334,7 +11443,9 @@ ${lines.join(`
   }
 }
 var COMPACTION_INTERVAL = 15, KEEP_LAST_N = 6;
-var init_manager = () => {};
+var init_manager = __esm(() => {
+  init_fact_extractor();
+});
 
 // src/modules/hallucination/consistency.ts
 class ConsistencyCheck {
@@ -11445,6 +11556,10 @@ function isFilePathLike(s) {
       return false;
     return FILE_EXTENSIONS.has(ext);
   }
+  const last = s.split(/[\\/]/).pop() ?? "";
+  const lastDot = last.lastIndexOf(".");
+  if (lastDot <= 0)
+    return false;
   return true;
 }
 function extractFileLikeTokens(text) {
@@ -15708,7 +15823,7 @@ class PlanCreator {
     const hasActionWord = actionWords.some((w) => task.toLowerCase().includes(w));
     return hasActionWord && words.length > 8;
   }
-  static createPlan(title, stepDescriptions, baseDir) {
+  static createPlan(title, stepDescriptions, baseDir, kinds) {
     const stepCount = stepDescriptions.length;
     return {
       id: generatePlanId(),
@@ -15716,7 +15831,8 @@ class PlanCreator {
       steps: stepDescriptions.map((desc, i) => ({
         id: i + 1,
         description: desc,
-        status: "pending"
+        status: "pending",
+        kind: kinds?.[i] ?? "create"
       })),
       createdAt: new Date().toISOString(),
       baseDir
@@ -15730,7 +15846,8 @@ class PlanCreator {
     const added = newSteps.map((desc, i) => ({
       id: kept.length + i + 1,
       description: desc,
-      status: "pending"
+      status: "pending",
+      kind: "create"
     }));
     return {
       id: plan.id,
@@ -15822,42 +15939,9 @@ class PlanTracker {
 }
 var init_tracker = () => {};
 
-// src/modules/execution/auditor.ts
-import { existsSync as existsSync28, readdirSync as readdirSync8 } from "fs";
-import { resolve as resolve17, join as join23, basename as basename2 } from "path";
-function findExistingFile(baseDir, filePath) {
-  const direct = resolve17(baseDir, filePath);
-  if (existsSync28(direct))
-    return direct;
-  const name = basename2(filePath).toLowerCase();
-  const suffix = filePath.replace(/\\/g, "/").toLowerCase();
-  let found = null;
-  const walk = (dir, depth) => {
-    if (found || depth > RESOLVE_MAX_DEPTH)
-      return;
-    let entries;
-    try {
-      entries = readdirSync8(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const e of entries) {
-      if (found)
-        return;
-      const full = join23(dir, e.name);
-      if (e.isDirectory()) {
-        if (SKIP_DIRS.has(e.name))
-          continue;
-        walk(full, depth + 1);
-      } else if (e.name.toLowerCase() === name || full.replace(/\\/g, "/").toLowerCase().endsWith("/" + suffix)) {
-        found = full;
-        return;
-      }
-    }
-  };
-  walk(baseDir, 0);
-  return found;
-}
+// src/modules/execution/audit-runners.ts
+import { readdirSync as readdirSync8 } from "fs";
+import { join as join23 } from "path";
 function findTestFile(dir, depth = 0) {
   if (depth > 5)
     return null;
@@ -15932,6 +16016,76 @@ async function runTests(baseDir) {
     command: "bun test"
   };
 }
+function parseTypecheckErrors(output) {
+  const line = output.split(`
+`).find((l) => /error TS\d+/.test(l));
+  return line ? line.trim().slice(0, 300) : null;
+}
+async function runTypecheck(baseDir) {
+  const entry = processRegistry.start("npx --no-install tsc --noEmit --skipLibCheck", baseDir);
+  const exited = await processRegistry.waitForExit(entry.id, 90000);
+  const output = entry.log.join(`
+`);
+  processRegistry.remove(entry.id);
+  if (!exited)
+    return null;
+  return parseTypecheckErrors(output);
+}
+var SKIP_DIRS, TEST_EXT_RE, TEST_STEP_RE;
+var init_audit_runners = __esm(() => {
+  init_bash();
+  init_processes();
+  SKIP_DIRS = new Set([
+    "node_modules",
+    ".git",
+    ".mma",
+    "dist",
+    "build",
+    "coverage",
+    ".next",
+    ".nuxt",
+    "vendor"
+  ]);
+  TEST_EXT_RE = /\.(test|spec)\.[jt]sx?$/i;
+  TEST_STEP_RE = /\b(test(ing|s)?|тест(ы|ирование|ировать)?|провер\w*\s+тест|запустить\s+тест)\b|bun test|npm test|vitest|pytest|go test|jest|mocha/i;
+});
+
+// src/modules/execution/auditor.ts
+import { existsSync as existsSync28, readdirSync as readdirSync9 } from "fs";
+import { resolve as resolve17, join as join24, basename as basename2 } from "path";
+function findExistingFile(baseDir, filePath) {
+  const direct = resolve17(baseDir, filePath);
+  if (existsSync28(direct))
+    return direct;
+  const name = basename2(filePath).toLowerCase();
+  const suffix = filePath.replace(/\\/g, "/").toLowerCase();
+  let found = null;
+  const walk = (dir, depth) => {
+    if (found || depth > RESOLVE_MAX_DEPTH)
+      return;
+    let entries;
+    try {
+      entries = readdirSync9(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const e of entries) {
+      if (found)
+        return;
+      const full = join24(dir, e.name);
+      if (e.isDirectory()) {
+        if (SKIP_DIRS.has(e.name))
+          continue;
+        walk(full, depth + 1);
+      } else if (e.name.toLowerCase() === name || full.replace(/\\/g, "/").toLowerCase().endsWith("/" + suffix)) {
+        found = full;
+        return;
+      }
+    }
+  };
+  walk(baseDir, 0);
+  return found;
+}
 
 class Auditor {
   baseDir;
@@ -15939,18 +16093,27 @@ class Auditor {
     this.baseDir = baseDir;
   }
   async audit(plan) {
-    const allStepText = plan.steps.filter((s) => s.status === "done").map((s) => s.description.replace(/\([^)]*\)/g, " ")).join(" ");
-    const uniqueFiles = extractFileLikeTokens(stripUrls(allStepText));
+    const doneCreate = plan.steps.filter((s) => s.status === "done" && s.kind !== "delete");
+    const doneDelete = plan.steps.filter((s) => s.status === "done" && s.kind === "delete");
+    const createText = doneCreate.map((s) => s.description.replace(/\([^)]*\)/g, " ")).join(" ");
+    const deleteText = doneDelete.map((s) => s.description.replace(/\([^)]*\)/g, " ")).join(" ");
+    const createFiles = extractFileLikeTokens(stripUrls(createText));
+    const deleteFiles = extractFileLikeTokens(stripUrls(deleteText));
     const missingFiles = [];
     const existingFiles = [];
-    for (const filePath of uniqueFiles) {
-      const resolved = findExistingFile(this.baseDir, filePath);
-      if (resolved) {
+    const leftoverFiles = [];
+    for (const filePath of createFiles) {
+      if (findExistingFile(this.baseDir, filePath)) {
         existingFiles.push(filePath);
       } else {
         missingFiles.push(filePath);
       }
     }
+    for (const filePath of deleteFiles) {
+      if (findExistingFile(this.baseDir, filePath)) {
+        leftoverFiles.push(filePath);
+      }
+    }
     let testRun = null;
     if (hasTestStep(plan) && findTestFile(this.baseDir)) {
       try {
@@ -15959,17 +16122,27 @@ class Auditor {
         testRun = null;
       }
     }
+    let typecheckError = null;
+    if (missingFiles.length === 0 && leftoverFiles.length === 0 && existsSync28(join24(this.baseDir, "tsconfig.json"))) {
+      try {
+        typecheckError = await runTypecheck(this.baseDir);
+      } catch {
+        typecheckError = null;
+      }
+    }
     const doneSteps = plan.steps.filter((s) => s.status === "done").length;
     const terminalSteps = plan.steps.filter((s) => s.status === "done" || s.status === "skipped").length;
     const totalSteps = plan.steps.length;
+    const auditedFiles = [...new Set([...createFiles, ...deleteFiles])];
     let massEditWarning = null;
-    if (uniqueFiles.length > MASS_EDIT_THRESHOLD) {
+    if (auditedFiles.length > MASS_EDIT_THRESHOLD) {
       massEditWarning = t("exec.mass_edit_warning", {
-        count: String(uniqueFiles.length)
+        count: String(auditedFiles.length)
       });
     }
     const testsFailing = testRun !== null && testRun.failed > 0;
-    const passed = missingFiles.length === 0 && !testsFailing;
+    const typecheckFailing = typecheckError !== null;
+    const passed = missingFiles.length === 0 && leftoverFiles.length === 0 && !testsFailing && !typecheckFailing;
     const stepsPending = terminalSteps < totalSteps;
     let summary;
     if (missingFiles.length > 0) {
@@ -15978,6 +16151,12 @@ class Auditor {
         total: totalSteps,
         files: missingFiles.length
       });
+    } else if (leftoverFiles.length > 0) {
+      summary = t("exec.audit_leftovers", {
+        done: doneSteps,
+        total: totalSteps,
+        files: leftoverFiles.length
+      });
     } else if (testsFailing) {
       summary = t("exec.audit_fail_tests", {
         done: doneSteps,
@@ -15986,6 +16165,13 @@ class Auditor {
         passed: String(testRun.passedCount),
         detail: testRun.detail
       });
+    } else if (typecheckFailing) {
+      summary = t("exec.audit_fail_typecheck", {
+        done: doneSteps,
+        total: totalSteps,
+        missing: String(missingFiles.length),
+        typeError: typecheckError
+      });
     } else if (stepsPending) {
       summary = t("exec.audit_pending", {
         done: doneSteps,
@@ -16001,38 +16187,27 @@ class Auditor {
     return {
       passed,
       missingFiles,
+      leftoverFiles,
       createdFiles: existingFiles,
       modifiedFiles: [],
       summary,
       massEditWarning,
-      testRun
+      testRun,
+      typecheckError
     };
   }
 }
-var MASS_EDIT_THRESHOLD = 10, SKIP_DIRS, TEST_EXT_RE, TEST_STEP_RE, RESOLVE_MAX_DEPTH = 8;
+var MASS_EDIT_THRESHOLD = 10, RESOLVE_MAX_DEPTH = 8;
 var init_auditor = __esm(() => {
   init_i18n();
   init_js_identifiers();
-  init_bash();
-  init_processes();
-  SKIP_DIRS = new Set([
-    "node_modules",
-    ".git",
-    ".mma",
-    "dist",
-    "build",
-    "coverage",
-    ".next",
-    ".nuxt",
-    "vendor"
-  ]);
-  TEST_EXT_RE = /\.(test|spec)\.[jt]sx?$/i;
-  TEST_STEP_RE = /\b(test(ing|s)?|тест(ы|ирование|ировать)?|провер\w*\s+тест|запустить\s+тест)\b|bun test|npm test|vitest|pytest|go test|jest|mocha/i;
+  init_audit_runners();
+  init_audit_runners();
 });
 
 // src/modules/execution/plan-store.ts
-import { readFileSync as readFileSync16, writeFileSync as writeFileSync10, mkdirSync as mkdirSync14, existsSync as existsSync29, readdirSync as readdirSync9, rmSync } from "fs";
-import { join as join24 } from "path";
+import { readFileSync as readFileSync16, writeFileSync as writeFileSync10, mkdirSync as mkdirSync14, existsSync as existsSync29, readdirSync as readdirSync10, rmSync } from "fs";
+import { join as join25 } from "path";
 function readPlanFile(path, fallbackBaseDir) {
   try {
     const raw = readFileSync16(path, "utf-8");
@@ -16059,8 +16234,8 @@ function writePlanFile(path, plan) {
 function listDir(dir, baseDir) {
   if (!existsSync29(dir))
     return [];
-  const files = readdirSync9(dir).filter((f) => f.endsWith(".json"));
-  return files.map((f) => readPlanFile(join24(dir, f), baseDir)).filter((p) => p !== null);
+  const files = readdirSync10(dir).filter((f) => f.endsWith(".json"));
+  return files.map((f) => readPlanFile(join25(dir, f), baseDir)).filter((p) => p !== null);
 }
 function toMeta(plan, status) {
   return {
@@ -16081,21 +16256,21 @@ class PlanStore {
   archiveDir;
   legacyPath;
   constructor(baseDir) {
-    const mmaDir = join24(baseDir, ".mma");
+    const mmaDir = join25(baseDir, ".mma");
     if (!existsSync29(mmaDir))
       mkdirSync14(mmaDir, { recursive: true });
     this.baseDir = baseDir;
-    this.plansDir = join24(mmaDir, "plans");
-    this.draftsDir = join24(this.plansDir, "drafts");
-    this.archiveDir = join24(this.plansDir, "archive");
-    this.legacyPath = join24(mmaDir, LEGACY_FILE);
+    this.plansDir = join25(mmaDir, "plans");
+    this.draftsDir = join25(this.plansDir, "drafts");
+    this.archiveDir = join25(this.plansDir, "archive");
+    this.legacyPath = join25(mmaDir, LEGACY_FILE);
     for (const dir of [this.plansDir, this.draftsDir, this.archiveDir]) {
       if (!existsSync29(dir))
         mkdirSync14(dir, { recursive: true });
     }
   }
   activePath() {
-    return join24(this.plansDir, "active.json");
+    return join25(this.plansDir, "active.json");
   }
   saveActive(plan) {
     writePlanFile(this.activePath(), plan);
@@ -16125,14 +16300,14 @@ class PlanStore {
       rmSync(p, { force: true });
   }
   saveDraft(plan) {
-    writePlanFile(join24(this.draftsDir, `${plan.id}.json`), plan);
+    writePlanFile(join25(this.draftsDir, `${plan.id}.json`), plan);
   }
   loadDraft(id) {
-    const p = join24(this.draftsDir, `${id}.json`);
+    const p = join25(this.draftsDir, `${id}.json`);
     return existsSync29(p) ? readPlanFile(p, this.baseDir) : null;
   }
   removeDraft(id) {
-    const p = join24(this.draftsDir, `${id}.json`);
+    const p = join25(this.draftsDir, `${id}.json`);
     if (existsSync29(p))
       rmSync(p, { force: true });
   }
@@ -16140,7 +16315,7 @@ class PlanStore {
     return listDir(this.draftsDir, this.baseDir);
   }
   archivePlan(plan) {
-    writePlanFile(join24(this.archiveDir, `${plan.id}.json`), plan);
+    writePlanFile(join25(this.archiveDir, `${plan.id}.json`), plan);
     this.removeDraft(plan.id);
     const active = this.loadActive();
     if (active && active.id === plan.id) {
@@ -16151,7 +16326,7 @@ class PlanStore {
     return listDir(this.archiveDir, this.baseDir);
   }
   removeArchived(id) {
-    const p = join24(this.archiveDir, `${id}.json`);
+    const p = join25(this.archiveDir, `${id}.json`);
     if (existsSync29(p))
       rmSync(p, { force: true });
   }
@@ -16245,91 +16420,12 @@ var init_plan_coverage = __esm(() => {
   ]);
 });
 
-// src/modules/execution/module.ts
-import { existsSync as existsSync30, readFileSync as readFileSync17 } from "fs";
-import { resolve as resolve18 } from "path";
-
-class ExecutionModule {
-  name = "execution";
-  tracker = null;
-  verifier;
-  stuckDetector;
-  auditor;
-  store;
-  baseDir;
-  lastRecoveryIteration = -STUCK_RECOVERY_COOLDOWN;
-  consecutivePlanWarnings = 0;
-  lastStepId = -1;
-  depsGateHints = new Map;
-  _auditSkipsRemaining = 0;
-  stuckNotified = false;
-  pendingMessages = [];
-  constructor(baseDir, stuckThreshold = 6) {
-    this.baseDir = baseDir;
-    this.verifier = new StepVerifier(baseDir);
-    this.stuckDetector = new StuckDetector(stuckThreshold);
-    this.auditor = new Auditor(baseDir);
-    this.store = new PlanStore(baseDir);
-  }
-  setPlan(plan) {
-    this.tracker = new PlanTracker(plan);
-    this.store.saveActive(plan);
-    this._auditSkipsRemaining = 0;
-  }
-  restorePlan() {
-    const plan = this.store.loadActive();
-    if (!plan)
-      return false;
-    this.tracker = new PlanTracker(plan);
-    this.tracker.syncCurrentStep();
-    this._auditSkipsRemaining = 1;
-    return true;
-  }
-  getTracker() {
-    return this.tracker;
-  }
-  getStore() {
-    return this.store;
-  }
-  getStuckDetector() {
-    return this.stuckDetector;
-  }
-  async runFinalAudit() {
-    if (!this.tracker)
-      return null;
-    if (this._auditSkipsRemaining > 0) {
-      this._auditSkipsRemaining--;
-      return null;
-    }
-    const plan = this.tracker.getPlan();
-    const audit = await this.auditor.audit(plan);
-    const pendingSteps = plan.steps.flatMap((s) => s.status !== "done" && s.status !== "skipped" ? [`${s.id}. ${s.description}`] : []);
-    const done = plan.steps.filter((s) => s.status === "done").length;
-    const passed = audit.passed && pendingSteps.length === 0;
-    return {
-      passed,
-      done,
-      total: plan.steps.length,
-      pendingSteps,
-      missingFiles: audit.missingFiles,
-      summary: audit.summary
-    };
-  }
-  getSystemPromptBlock() {
-    if (!this.tracker)
-      return null;
-    return {
-      content: this.tracker.toPromptBlock(),
-      priority: "critical",
-      essential: true,
-      estimatedTokens: 200
-    };
-  }
-  getToolDefinitions() {
-    return [
-      {
-        name: "plan",
-        description: `Create, update, show, abort, list, switch, or re-plan multi-step plans.
+// src/modules/execution/plan-tool.ts
+function createPlanToolDefinitions(deps) {
+  return [
+    {
+      name: "plan",
+      description: `Create, update, show, abort, list, switch, or re-plan multi-step plans.
 
 Actions:
 - create: Start a new plan. Previous active plan is auto-preserved: incomplete → draft, complete → archive.
@@ -16346,198 +16442,222 @@ Write CONCRETE steps with exact file paths and commands:
 - Specify WHICH CLI commands to run with exact arguments
 - Each step should include at least one file extension (.ts, .tsx, .json, etc.) or a command verb (install, create, build, run, add, init)
 - Good: "Создать src/components/Header.tsx с навигацией и логотипом"
-- Bad: "Настройка проекта" (too vague — what exactly needs to be configured?)`,
-        parameters: {
-          type: "object",
-          properties: {
-            action: {
-              type: "string",
-              enum: [
-                "create",
-                "update",
-                "show",
-                "abort",
-                "list",
-                "switch",
-                "re-plan"
-              ]
-            },
-            title: { type: "string" },
-            steps: { type: "array", items: { type: "string" } },
-            step: { type: "number" },
-            status: { type: "string", enum: ["done", "failed", "skipped"] },
-            note: { type: "string" },
-            id: { type: "string", description: "Plan id (for switch action)" }
+- Bad: "Настройка проекта" (too vague — what exactly needs to be configured?)
+- For steps that REMOVE files, pass kinds: ["delete"] aligned with steps (the done-gate verifies those files are gone instead of demanding they exist).`,
+      parameters: {
+        type: "object",
+        properties: {
+          action: {
+            type: "string",
+            enum: [
+              "create",
+              "update",
+              "show",
+              "abort",
+              "list",
+              "switch",
+              "re-plan"
+            ]
+          },
+          title: { type: "string" },
+          steps: { type: "array", items: { type: "string" } },
+          kinds: {
+            type: "array",
+            items: { type: "string", enum: ["create", "delete"] },
+            description: 'Optional per-step intent, aligned 1:1 with steps. Pass "delete" for steps whose purpose is REMOVING files — the done-gate then requires those files to be GONE (not present). Defaults to "create".'
           },
-          required: ["action"]
+          step: { type: "number" },
+          status: { type: "string", enum: ["done", "failed", "skipped"] },
+          note: { type: "string" },
+          id: { type: "string", description: "Plan id (for switch action)" }
         },
-        handler: async (_ctx, args) => {
-          const action = String(args.action);
-          if (action === "list") {
-            const metas = this.store.listAll();
-            if (metas.length === 0) {
-              return { success: true, output: t("plan.list_empty") };
-            }
-            const lines = metas.map((m) => {
-              const icon = m.status === "active" ? "[*]" : m.status === "draft" ? "[ ]" : "[-]";
-              const namePart = m.name ? ` (${m.name})` : "";
-              return `${icon} ${m.id}${namePart} — ${m.title}  ${m.doneCount}/${m.stepCount}`;
-            });
-            return {
-              success: true,
-              output: `${t("plan.list_header")}
+        required: ["action"]
+      },
+      handler: async (_ctx, args) => {
+        const action = String(args.action);
+        if (action === "list") {
+          const metas = deps.store.listAll();
+          if (metas.length === 0) {
+            return { success: true, output: t("plan.list_empty") };
+          }
+          const lines = metas.map((m) => {
+            const icon = m.status === "active" ? "[*]" : m.status === "draft" ? "[ ]" : "[-]";
+            const namePart = m.name ? ` (${m.name})` : "";
+            return `${icon} ${m.id}${namePart} — ${m.title}  ${m.doneCount}/${m.stepCount}`;
+          });
+          return {
+            success: true,
+            output: `${t("plan.list_header")}
 ${lines.join(`
 `)}`
+          };
+        }
+        if (action === "switch") {
+          const planId = String(args.id || "");
+          if (!planId) {
+            return { success: false, output: t("plan.switch_no_id") };
+          }
+          const found = deps.store.find(planId);
+          if (!found) {
+            return {
+              success: false,
+              output: t("plan.not_found", { id: planId })
             };
           }
-          if (action === "switch") {
-            const planId = String(args.id || "");
-            if (!planId) {
-              return { success: false, output: t("plan.switch_no_id") };
+          deps.preserveActive();
+          if (found.status === "draft") {
+            deps.store.removeDraft(found.plan.id);
+          } else if (found.status === "archived") {
+            deps.store.removeArchived(found.plan.id);
+          }
+          deps.setPlan(found.plan);
+          const display = PlanCreator.toPromptBlock(found.plan, 0);
+          return {
+            success: true,
+            output: t("plan.switched", {
+              id: found.plan.id,
+              title: found.plan.title
+            }),
+            display
+          };
+        }
+        if (action === "re-plan") {
+          if (!deps.trackerRef.current) {
+            return { success: false, output: t("plan.no_active") };
+          }
+          const newSteps = Array.isArray(args.steps) ? args.steps.map(String) : [];
+          if (newSteps.length === 0) {
+            return { success: false, output: t("plan.replan_no_steps") };
+          }
+          const tracker = deps.trackerRef.current;
+          const oldPlan = tracker.getPlan();
+          const replanned = PlanCreator.replan(oldPlan, newSteps, args.title ? String(args.title) : undefined);
+          const keptCount = replanned.steps.length - newSteps.length;
+          deps.setPlan(replanned);
+          const display = PlanCreator.toPromptBlock(replanned, keptCount);
+          return {
+            success: true,
+            output: t("plan.replanned", {
+              kept: String(keptCount),
+              steps: String(newSteps.length)
+            }),
+            display
+          };
+        }
+        if (action === "create") {
+          const title = String(args.title || "Task Plan");
+          const steps = Array.isArray(args.steps) ? args.steps.map(String) : [];
+          if (steps.length === 0) {
+            return { success: false, output: t("plan.no_steps") };
+          }
+          const parsed = deps.parseKinds(args, steps);
+          if (parsed.error) {
+            return { success: false, output: parsed.error };
+          }
+          deps.preserveActive();
+          const plan = PlanCreator.createPlan(title, steps, deps.baseDir, parsed.kinds ?? []);
+          deps.setPlan(plan);
+          const display = PlanCreator.toPromptBlock(plan, 0);
+          let output = t("plan.created", {
+            title,
+            steps: String(steps.length)
+          });
+          let displayOut = display;
+          const taskText = deps.getTaskText(_ctx);
+          if (taskText) {
+            const { missing } = checkPlanCoverage(taskText, steps);
+            if (missing.length > 0) {
+              const warn = t("plan.coverage_warning", {
+                missing: missing.join(", ")
+              });
+              output += `
+⚠️ ${warn}`;
+              displayOut = `${display}
+⚠️ ${warn}`;
             }
-            const found = this.store.find(planId);
+          }
+          return {
+            success: true,
+            output,
+            display: displayOut
+          };
+        }
+        if (action === "show") {
+          const planId = args.id ? String(args.id) : "";
+          if (planId && planId !== deps.trackerRef.current?.getPlan()?.id) {
+            const found = deps.store.find(planId);
             if (!found) {
               return {
                 success: false,
                 output: t("plan.not_found", { id: planId })
               };
             }
-            this.preserveActive();
-            if (found.status === "draft") {
-              this.store.removeDraft(found.plan.id);
-            } else if (found.status === "archived") {
-              this.store.removeArchived(found.plan.id);
-            }
-            this.setPlan(found.plan);
-            const display = PlanCreator.toPromptBlock(found.plan, 0);
+            const display2 = PlanCreator.toPromptBlock(found.plan, 0);
             return {
               success: true,
-              output: t("plan.switched", {
-                id: found.plan.id,
-                title: found.plan.title
-              }),
-              display
+              output: `${t("plan.show_header")}
+${display2}`,
+              display: display2
             };
           }
-          if (action === "re-plan") {
-            if (!this.tracker) {
-              return { success: false, output: t("plan.no_active") };
-            }
-            const newSteps = Array.isArray(args.steps) ? args.steps.map(String) : [];
-            if (newSteps.length === 0) {
-              return { success: false, output: t("plan.replan_no_steps") };
-            }
-            const oldPlan = this.tracker.getPlan();
-            const replanned = PlanCreator.replan(oldPlan, newSteps, args.title ? String(args.title) : undefined);
-            const keptCount = replanned.steps.length - newSteps.length;
-            this.setPlan(replanned);
-            const display = PlanCreator.toPromptBlock(replanned, keptCount);
-            return {
-              success: true,
-              output: t("plan.replanned", {
-                kept: String(keptCount),
-                steps: String(newSteps.length)
-              }),
-              display
-            };
+          if (!deps.trackerRef.current) {
+            return { success: false, output: t("plan.no_active") };
           }
-          if (action === "create") {
-            const title = String(args.title || "Task Plan");
-            const steps = Array.isArray(args.steps) ? args.steps.map(String) : [];
-            if (steps.length === 0) {
-              return { success: false, output: t("plan.no_steps") };
-            }
-            this.preserveActive();
-            const plan = PlanCreator.createPlan(title, steps, this.baseDir);
-            this.setPlan(plan);
-            const display = PlanCreator.toPromptBlock(plan, 0);
-            let output = t("plan.created", {
-              title,
-              steps: String(steps.length)
-            });
-            let displayOut = display;
-            const taskText = this.getTaskText(_ctx);
-            if (taskText) {
-              const { missing } = checkPlanCoverage(taskText, steps);
-              if (missing.length > 0) {
-                const warn = t("plan.coverage_warning", {
-                  missing: missing.join(", ")
-                });
-                output += `
-⚠️ ${warn}`;
-                displayOut = `${display}
-⚠️ ${warn}`;
-              }
-            }
-            return {
-              success: true,
-              output,
-              display: displayOut
-            };
+          const display = deps.trackerRef.current.toPromptBlock();
+          return {
+            success: true,
+            output: `${t("plan.show_header")}
+${display}`,
+            display
+          };
+        }
+        if (action === "update" && args.step && deps.trackerRef.current) {
+          const tracker = deps.trackerRef.current;
+          const stepId = Number(args.step);
+          const target = tracker.getStep(stepId);
+          if (!target) {
+            return { success: false, output: t("plan.step_not_found") };
           }
-          if (action === "show") {
-            const planId = args.id ? String(args.id) : "";
-            if (planId && planId !== this.tracker?.getPlan()?.id) {
-              const found = this.store.find(planId);
-              if (!found) {
-                return {
-                  success: false,
-                  output: t("plan.not_found", { id: planId })
-                };
-              }
-              const display2 = PlanCreator.toPromptBlock(found.plan, 0);
-              return {
-                success: true,
-                output: `${t("plan.show_header")}
-${display2}`,
-                display: display2
-              };
-            }
-            if (!this.tracker) {
-              return { success: false, output: t("plan.no_active") };
-            }
-            const display = this.tracker.toPromptBlock();
+          const status = String(args.status || "done");
+          if (status === "done" && target.status === "done") {
+            const progress2 = tracker.getProgressString();
+            const display2 = tracker.toPromptBlock();
             return {
               success: true,
-              output: `${t("plan.show_header")}
-${display}`,
-              display
+              output: `${t("plan.step_already_done", {
+                step: String(stepId)
+              })}
+${progress2}`,
+              display: display2
             };
           }
-          if (action === "update" && args.step && this.tracker) {
-            const stepId = Number(args.step);
-            const target = this.tracker.getStep(stepId);
-            if (!target) {
-              return { success: false, output: t("plan.step_not_found") };
-            }
-            const status = String(args.status || "done");
-            if (status === "done" && target.status === "done") {
-              const progress2 = this.tracker.getProgressString();
-              const display2 = this.tracker.toPromptBlock();
+          if (status === "done") {
+            const blockers = tracker.getPlan().steps.filter((s) => s.id < stepId && s.status !== "done" && s.status !== "skipped");
+            if (blockers.length > 0) {
               return {
-                success: true,
-                output: `${t("plan.step_already_done", {
-                  step: String(stepId)
-                })}
-${progress2}`,
-                display: display2
+                success: false,
+                output: t("plan.order_blocked", {
+                  step: String(stepId),
+                  first: String(blockers[0].id),
+                  desc: blockers[0].description
+                })
               };
             }
-            if (status === "done") {
-              const blockers = this.tracker.getPlan().steps.filter((s) => s.id < stepId && s.status !== "done" && s.status !== "skipped");
-              if (blockers.length > 0) {
+          }
+          if (status === "done") {
+            if (target.kind === "delete") {
+              const leftovers = deps.stillExistingDeliverables(target);
+              if (leftovers.length > 0) {
                 return {
                   success: false,
-                  output: t("plan.order_blocked", {
+                  output: t("plan.deliverables_remain", {
                     step: String(stepId),
-                    first: String(blockers[0].id),
-                    desc: blockers[0].description
+                    files: leftovers.join(", ")
                   })
                 };
               }
-            }
-            if (status === "done") {
-              const missing = this.missingStepDeliverables(target);
+            } else {
+              const missing = deps.missingStepDeliverables(target);
               if (missing.length > 0) {
                 return {
                   success: false,
@@ -16548,373 +16668,559 @@ ${progress2}`,
                 };
               }
             }
-            this.tracker.updateStepStatus(stepId, status);
-            if (args.note)
-              this.tracker.addNote(Number(args.step), String(args.note));
-            this.tracker.syncCurrentStep();
-            this.store.saveActive(this.tracker.getPlan());
-            const progress = this.tracker.getProgressString();
-            const display = this.tracker.toPromptBlock();
-            _ctx.sessionLog?.plan("step-update", `${t("plan.step_status", { step: String(args.step), status: String(args.status || "done") })} | ${progress} | current: step ${this.tracker.getCurrentStepIndex() + 1}`);
-            return {
-              success: true,
-              output: `${t("plan.step_status", { step: String(args.step), status: String(args.status || "done") })}
-${progress}`,
-              display
-            };
           }
-          if (action === "update" && Array.isArray(args.steps) && args.steps.length > 0 && this.tracker) {
-            const title = String(args.title || this.tracker.getPlan().title);
-            const steps = args.steps.map(String);
-            const plan = PlanCreator.createPlan(title, steps, this.baseDir);
-            this.setPlan(plan);
-            const display = PlanCreator.toPromptBlock(plan, 0);
-            const output = t("plan.updated", {
-              title,
-              steps: String(steps.length)
-            });
-            return {
-              success: true,
-              output,
-              display
-            };
-          }
-          if (action === "abort") {
-            if (this.tracker) {
-              this.store.archivePlan(this.tracker.getPlan());
-            }
-            this.tracker = null;
-            this.store.clearActive();
-            return { success: true, output: t("plan.aborted") };
-          }
-          if (!this.tracker) {
-            return { success: false, output: t("plan.no_active") };
+          tracker.updateStepStatus(stepId, status);
+          if (args.note)
+            tracker.addNote(Number(args.step), String(args.note));
+          tracker.syncCurrentStep();
+          deps.store.saveActive(tracker.getPlan());
+          const progress = tracker.getProgressString();
+          const display = tracker.toPromptBlock();
+          _ctx.sessionLog?.plan("step-update", `${t("plan.step_status", { step: String(args.step), status: String(args.status || "done") })} | ${progress} | current: step ${tracker.getCurrentStepIndex() + 1}`);
+          return {
+            success: true,
+            output: `${t("plan.step_status", { step: String(args.step), status: String(args.status || "done") })}
+${progress}`,
+            display
+          };
+        }
+        if (action === "update" && Array.isArray(args.steps) && args.steps.length > 0 && deps.trackerRef.current) {
+          const tracker = deps.trackerRef.current;
+          const title = String(args.title || tracker.getPlan().title);
+          const steps = args.steps.map(String);
+          const parsed = deps.parseKinds(args, steps);
+          if (parsed.error) {
+            return { success: false, output: parsed.error };
           }
+          const plan = PlanCreator.createPlan(title, steps, deps.baseDir, parsed.kinds ?? []);
+          deps.setPlan(plan);
+          const display = PlanCreator.toPromptBlock(plan, 0);
+          const output = t("plan.updated", {
+            title,
+            steps: String(steps.length)
+          });
           return {
-            success: false,
-            output: t("plan.unknown_action", { action })
+            success: true,
+            output,
+            display
           };
         }
-      },
-      {
-        name: "todo",
-        description: "Manage sub-tasks within current plan step. Use to break down complex steps into smaller tasks.",
-        parameters: {
-          type: "object",
-          properties: {
-            action: { type: "string", enum: ["add", "done", "list"] },
-            items: { type: "array", items: { type: "string" } }
-          },
-          required: ["action"]
+        if (action === "abort") {
+          const tracker = deps.trackerRef.current;
+          if (tracker) {
+            deps.store.archivePlan(tracker.getPlan());
+          }
+          deps.trackerRef.current = null;
+          deps.store.clearActive();
+          return { success: true, output: t("plan.aborted") };
+        }
+        if (!deps.trackerRef.current) {
+          return { success: false, output: t("plan.no_active") };
+        }
+        return {
+          success: false,
+          output: t("plan.unknown_action", { action })
+        };
+      }
+    },
+    {
+      name: "todo",
+      description: "Manage sub-tasks within current plan step. Use to break down complex steps into smaller tasks.",
+      parameters: {
+        type: "object",
+        properties: {
+          action: { type: "string", enum: ["add", "done", "list"] },
+          items: { type: "array", items: { type: "string" } }
         },
-        handler: async (_ctx, args) => {
-          if (!this.tracker) {
-            return { success: false, output: t("plan.no_active") };
+        required: ["action"]
+      },
+      handler: async (_ctx, args) => {
+        if (!deps.trackerRef.current) {
+          return { success: false, output: t("plan.no_active") };
+        }
+        const tracker = deps.trackerRef.current;
+        const action = String(args.action);
+        const currentStep = tracker.getCurrentStep();
+        if (!currentStep) {
+          return { success: false, output: t("plan.step_not_found") };
+        }
+        if (action === "add" && Array.isArray(args.items)) {
+          const items = args.items.map(String);
+          const existing = currentStep.subtasks ?? [];
+          let nextId = existing.reduce((m, s) => Math.max(m, s.id), 0) + 1;
+          for (const item of items) {
+            existing.push({ id: nextId++, text: item, done: false });
           }
-          const action = String(args.action);
-          const currentStep = this.tracker.getCurrentStep();
-          if (!currentStep) {
-            return { success: false, output: t("plan.step_not_found") };
+          currentStep.subtasks = existing;
+          deps.store.saveActive(tracker.getPlan());
+          const display = tracker.toPromptBlock();
+          return {
+            success: true,
+            output: t("todo.added", {
+              count: String(items.length),
+              items: items.join(", ")
+            }),
+            display
+          };
+        }
+        if (action === "done") {
+          const items = Array.isArray(args.items) ? args.items.map(String) : [];
+          if (items.length === 0) {
+            return {
+              success: false,
+              output: t("todo.no_items")
+            };
           }
-          if (action === "add" && Array.isArray(args.items)) {
-            const items = args.items.map(String);
-            const existing = currentStep.subtasks ?? [];
-            let nextId = existing.reduce((m, s) => Math.max(m, s.id), 0) + 1;
-            for (const item of items) {
-              existing.push({ id: nextId++, text: item, done: false });
+          const subs = currentStep.subtasks ?? [];
+          let marked = 0;
+          for (const item of items) {
+            const sub = subs.find((s) => !s.done && s.text.toLowerCase() === item.toLowerCase());
+            if (sub) {
+              sub.done = true;
+              marked++;
             }
-            currentStep.subtasks = existing;
-            this.store.saveActive(this.tracker.getPlan());
-            const display = this.tracker.toPromptBlock();
+          }
+          if (marked === 0) {
             return {
-              success: true,
-              output: t("todo.added", {
-                count: String(items.length),
+              success: false,
+              output: t("todo.subtask_not_found", {
                 items: items.join(", ")
-              }),
-              display
+              })
             };
           }
-          if (action === "done") {
-            const items = Array.isArray(args.items) ? args.items.map(String) : [];
-            if (items.length === 0) {
-              return {
-                success: false,
-                output: t("todo.no_items")
-              };
-            }
-            const subs = currentStep.subtasks ?? [];
-            let marked = 0;
-            for (const item of items) {
-              const sub = subs.find((s) => !s.done && s.text.toLowerCase() === item.toLowerCase());
-              if (sub) {
-                sub.done = true;
-                marked++;
-              }
-            }
-            if (marked === 0) {
-              return {
-                success: false,
-                output: t("todo.subtask_not_found", {
-                  items: items.join(", ")
-                })
-              };
-            }
-            currentStep.subtasks = subs;
-            this.store.saveActive(this.tracker.getPlan());
-            const doneCount = subs.filter((s) => s.done).length;
-            const display = this.tracker.toPromptBlock();
-            let output = t("todo.marked_done", {
-              count: String(marked)
-            });
-            output += ` (${doneCount}/${subs.length})`;
-            if (doneCount === subs.length) {
-              output += `
+          currentStep.subtasks = subs;
+          deps.store.saveActive(tracker.getPlan());
+          const doneCount = subs.filter((s) => s.done).length;
+          const display = tracker.toPromptBlock();
+          let output = t("todo.marked_done", {
+            count: String(marked)
+          });
+          output += ` (${doneCount}/${subs.length})`;
+          if (doneCount === subs.length) {
+            output += `
 All sub-tasks done — call plan update step=${currentStep.id} status=done to complete this step.`;
-            }
-            return { success: true, output, display };
           }
-          if (action === "list") {
-            const subs = currentStep.subtasks ?? [];
-            const lines = subs.length ? subs.map((s) => `${s.done ? "[x]" : "[ ]"} ${s.text}`) : ["(no sub-tasks)"];
-            return {
-              success: true,
-              output: `Step ${currentStep.id}: ${currentStep.description}
+          return { success: true, output, display };
+        }
+        if (action === "list") {
+          const subs = currentStep.subtasks ?? [];
+          const lines = subs.length ? subs.map((s) => `${s.done ? "[x]" : "[ ]"} ${s.text}`) : ["(no sub-tasks)"];
+          return {
+            success: true,
+            output: `Step ${currentStep.id}: ${currentStep.description}
 ${lines.join(`
 `)}`
-            };
-          }
-          return {
-            success: false,
-            output: t("todo.unknown_action", { action })
           };
         }
-      },
-      {
-        name: "verify",
-        description: "Run verification for the current step. Checks files mentioned in the step description.",
-        parameters: {
-          type: "object",
-          properties: {
-            step: { type: "number", description: "Step number to verify" }
-          }
-        },
-        handler: async (_ctx, args) => {
-          if (!this.tracker)
-            return { success: false, output: t("plan.no_active") };
-          const step = args.step ? this.tracker.getStep(Number(args.step)) : this.tracker.getCurrentStep();
-          if (!step)
-            return { success: false, output: t("plan.step_not_found") };
-          const result = await this.verifier.verifyStep(step.description);
-          return {
-            success: result.passed,
-            output: result.passed ? t("verify.passed") : t("verify.failed", {
-              details: result.failed.map((f) => f.message).join("; ")
-            })
-          };
+        return {
+          success: false,
+          output: t("todo.unknown_action", { action })
+        };
+      }
+    },
+    {
+      name: "verify",
+      description: "Run verification for the current step. Checks files mentioned in the step description.",
+      parameters: {
+        type: "object",
+        properties: {
+          step: { type: "number", description: "Step number to verify" }
         }
+      },
+      handler: async (_ctx, args) => {
+        if (!deps.trackerRef.current)
+          return { success: false, output: t("plan.no_active") };
+        const tracker = deps.trackerRef.current;
+        const step = args.step ? tracker.getStep(Number(args.step)) : tracker.getCurrentStep();
+        if (!step)
+          return { success: false, output: t("plan.step_not_found") };
+        const result = await deps.verifier.verifyStep(step.description);
+        return {
+          success: result.passed,
+          output: result.passed ? t("verify.passed") : t("verify.failed", {
+            details: result.failed.map((f) => f.message).join("; ")
+          })
+        };
       }
-    ];
-  }
-  getPlugin() {
-    return {
-      name: "execution",
-      onBeforeThink: (ctx) => {
-        if (ctx.contextManager && this.pendingMessages.length > 0) {
-          for (const m of this.pendingMessages.splice(0)) {
-            ctx.contextManager.addMessage(m);
+    }
+  ];
+}
+var init_plan_tool = __esm(() => {
+  init_i18n();
+  init_plan_coverage();
+});
+
+// src/modules/execution/windows-commands.ts
+function firstWord(command) {
+  const segs = command.trim().split(/[\s;|&]+/);
+  return (segs[0] || "").replace(/[^\w-]/g, "").toLowerCase();
+}
+function forbiddenWindowsCommand(command) {
+  const m = command.match(/^\s*cd\s+\S+\s*&&\s*(\S+)/);
+  if (m)
+    return forbiddenWindowsCommand(m[1]);
+  const word = firstWord(command);
+  if (word && FORBIDDEN_COMMANDS.has(word))
+    return word;
+  return null;
+}
+var FORBIDDEN_COMMANDS;
+var init_windows_commands = __esm(() => {
+  FORBIDDEN_COMMANDS = new Set([
+    "grep",
+    "sed",
+    "ls",
+    "find",
+    "rm",
+    "touch",
+    "which",
+    "diff",
+    "cp",
+    "mv"
+  ]);
+});
+
+// src/modules/execution/execution-plugin.ts
+import { platform as platform4 } from "os";
+function createExecutionPlugin(deps) {
+  return {
+    name: "execution",
+    onBeforeThink: (ctx) => {
+      if (ctx.contextManager && deps.pendingMessages.length > 0) {
+        for (const m of deps.pendingMessages.splice(0)) {
+          ctx.contextManager.addMessage(m);
+        }
+      }
+      if (deps.trackerRef.current?.isComplete()) {
+        deps.stuckDetector.resetStepProgress();
+        deps.state.consecutivePlanWarnings = 0;
+        deps.state.lastStepId = -1;
+        deps.state.stuckNotified = false;
+      } else {
+        const step = deps.trackerRef.current?.getCurrentStep();
+        if (deps.trackerRef.current && step) {
+          if (step.id !== deps.state.lastStepId) {
+            deps.state.consecutivePlanWarnings = 0;
+            deps.state.lastStepId = step.id;
+            deps.state.stuckNotified = false;
           }
-        }
-        if (this.tracker?.isComplete()) {
-          this.stuckDetector.resetStepProgress();
-          this.consecutivePlanWarnings = 0;
-          this.lastStepId = -1;
-          this.stuckNotified = false;
+          deps.stuckDetector.setCurrentStep(step.id, step.description);
+          deps.stuckDetector.recordIteration(step.id);
         } else {
-          const step = this.tracker?.getCurrentStep();
-          if (this.tracker && step) {
-            if (step.id !== this.lastStepId) {
-              this.consecutivePlanWarnings = 0;
-              this.lastStepId = step.id;
-              this.stuckNotified = false;
-            }
-            this.stuckDetector.setCurrentStep(step.id, step.description);
-            this.stuckDetector.recordIteration(step.id);
-          } else {
-            this.stuckDetector.reset();
-            this.consecutivePlanWarnings = 0;
-            this.lastStepId = -1;
-            this.stuckNotified = false;
-            const iter = typeof ctx.iteration === "number" ? ctx.iteration : 0;
-            if (iter === 3 && !this.tracker && ctx.contextManager) {
-              ctx.contextManager.addMessage({
-                role: "user",
-                content: `<system-summary>You have made 3 tool calls without creating a plan. For any task that involves creating files, installing packages, or multiple steps — you MUST use plan create BEFORE continuing. Use the plan tool now with concrete steps (exact filenames, commands, deliverables). Do NOT make any more write/edit/bash calls until you have a plan.</system-summary>`
-              });
-            }
-            if (iter >= 6 && !this.tracker && ctx.contextManager) {
-              ctx.contextManager.addMessage({
-                role: "user",
-                content: `<system-summary>STOP. ${iter} iterations without a plan. You MUST call plan create RIGHT NOW. No more tool calls until you create a plan.</system-summary>`
-              });
-            }
+          deps.stuckDetector.reset();
+          deps.state.consecutivePlanWarnings = 0;
+          deps.state.lastStepId = -1;
+          deps.state.stuckNotified = false;
+          const iter = typeof ctx.iteration === "number" ? ctx.iteration : 0;
+          if (iter === 3 && !deps.trackerRef.current && ctx.contextManager) {
+            ctx.contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>You have made 3 tool calls without creating a plan. For any task that involves creating files, installing packages, or multiple steps — you MUST use plan create BEFORE continuing. Use the plan tool now with concrete steps (exact filenames, commands, deliverables). Do NOT make any more write/edit/bash calls until you have a plan.</system-summary>`
+            });
           }
-        }
-        const stuckReason = this.stuckDetector.getStuckReason();
-        if (stuckReason) {
-          const logIt = this.stuckDetector.isStuck() ? !this.stuckNotified : true;
-          if (logIt) {
-            ctx.logger?.warn(stuckReason);
-            ctx.sessionLog?.plan("stuck-warning", stuckReason, typeof ctx.iteration === "number" ? ctx.iteration : undefined);
-            if (this.stuckDetector.isStuck())
-              this.stuckNotified = true;
+          if (iter >= 6 && !deps.trackerRef.current && ctx.contextManager) {
+            ctx.contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>STOP. ${iter} iterations without a plan. You MUST call plan create RIGHT NOW. No more tool calls until you create a plan.</system-summary>`
+            });
           }
         }
-        if (this.stuckDetector.isStuck() || this.stuckDetector.hasRepetitiveToolCalls() || this.stuckDetector.hasReadOnlyLoop()) {
-          const currentIter = typeof ctx.iteration === "number" ? ctx.iteration : 0;
-          if (currentIter - this.lastRecoveryIteration >= STUCK_RECOVERY_COOLDOWN) {
-            const recovery = this.stuckDetector.getRecoveryMessage();
-            if (recovery && ctx.contextManager) {
-              const lastError = this.stuckDetector.getLastErrorOutput();
-              const skillHint = lastError ? `
+      }
+      const stuckReason = deps.stuckDetector.getStuckReason();
+      if (stuckReason) {
+        const logIt = deps.stuckDetector.isStuck() ? !deps.state.stuckNotified : true;
+        if (logIt) {
+          ctx.logger?.warn(stuckReason);
+          ctx.sessionLog?.plan("stuck-warning", stuckReason, typeof ctx.iteration === "number" ? ctx.iteration : undefined);
+          if (deps.stuckDetector.isStuck())
+            deps.state.stuckNotified = true;
+        }
+      }
+      if (deps.stuckDetector.isStuck() || deps.stuckDetector.hasRepetitiveToolCalls() || deps.stuckDetector.hasReadOnlyLoop()) {
+        const currentIter = typeof ctx.iteration === "number" ? ctx.iteration : 0;
+        if (currentIter - deps.state.lastRecoveryIteration >= STUCK_RECOVERY_COOLDOWN) {
+          const recovery = deps.stuckDetector.getRecoveryMessage();
+          if (recovery && ctx.contextManager) {
+            const lastError = deps.stuckDetector.getLastErrorOutput();
+            const skillHint = lastError ? `
 If you have relevant skills available, consider loading one with load_skill for expert guidance.` : "";
-              const actionableHints = this.stuckDetector.getActionableHints();
-              const actionableHintStr = actionableHints.length > 0 ? `
+            const actionableHints = deps.stuckDetector.getActionableHints();
+            const actionableHintStr = actionableHints.length > 0 ? `
 ${t("exec.hints", { hints: actionableHints.map((h) => `- ${h}`).join(`
 `) })}` : "";
-              const alternative = this.stuckDetector.getToolAlternative();
-              const altHint = alternative ? `
-Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}" instead.` : "";
-              ctx.contextManager.addMessage({
-                role: "user",
-                content: `<system-summary>${recovery}${skillHint}${actionableHintStr}${altHint}</system-summary>`
-              });
-            }
-            const hints = this.stuckDetector.getHints();
-            if (hints.length > 0 && ctx.contextManager) {
-              const hintMsg = t("exec.hints", {
-                hints: hints.map((h) => `- ${h}`).join(`
+            const alternative = deps.stuckDetector.getToolAlternative();
+            const altHint = alternative ? `
+Tool "${deps.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}" instead.` : "";
+            ctx.contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>${recovery}${skillHint}${actionableHintStr}${altHint}</system-summary>`
+            });
+          }
+          const hints = deps.stuckDetector.getHints();
+          if (hints.length > 0 && ctx.contextManager) {
+            const hintMsg = t("exec.hints", {
+              hints: hints.map((h) => `- ${h}`).join(`
 `)
-              });
-              ctx.contextManager.addMessage({
-                role: "user",
-                content: `<system-summary>${hintMsg}</system-summary>`
-              });
-            }
-            this.stuckDetector.recordEscalation();
-            this.lastRecoveryIteration = currentIter;
-            if (this.stuckDetector.shouldEscalate() && ctx.onMeta) {
-              const escalation = t("exec.escalation", {
-                stepId: String(this.tracker?.getCurrentStep()?.id ?? "?"),
-                description: this.tracker?.getCurrentStep()?.description ?? ""
-              });
-              ctx.onMeta(escalation);
-            }
-            if (this.stuckDetector.getIterationsOnCurrentStep() >= FORCE_SKIP_THRESHOLD && ctx.contextManager) {
-              const step = this.tracker?.getCurrentStep();
-              ctx.contextManager.addMessage({
+            });
+            ctx.contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>${hintMsg}</system-summary>`
+            });
+          }
+          deps.stuckDetector.recordEscalation();
+          deps.state.lastRecoveryIteration = currentIter;
+          if (deps.stuckDetector.shouldEscalate() && ctx.onMeta) {
+            const escalation = t("exec.escalation", {
+              stepId: String(deps.trackerRef.current?.getCurrentStep()?.id ?? "?"),
+              description: deps.trackerRef.current?.getCurrentStep()?.description ?? ""
+            });
+            ctx.onMeta(escalation);
+          }
+          if (deps.stuckDetector.getIterationsOnCurrentStep() >= FORCE_SKIP_THRESHOLD && ctx.contextManager) {
+            const step = deps.trackerRef.current?.getCurrentStep();
+            ctx.contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>STOP. Step ${step?.id ?? "?"} ("${step?.description ?? ""}") took ${deps.stuckDetector.getIterationsOnCurrentStep()} iterations with no progress. DO NOT continue this step. Immediately call: plan update step=${step?.id ?? "?"} status=done (if code works despite warnings) OR plan update step=${step?.id ?? "?"} status=skipped note="reason". Do NOT make any other tool calls before updating the plan.</system-summary>`
+            });
+          }
+        }
+      }
+    },
+    onBeforeTool: (_ctx, call) => {
+      const warning = deps.checkPlanAlignment(call);
+      if (warning) {
+        deps.pendingMessages.push({
+          role: "user",
+          content: `<system-summary>${warning}</system-summary>`
+        });
+        deps.state.consecutivePlanWarnings++;
+        if (deps.state.consecutivePlanWarnings >= MAX_PLAN_WARNINGS_BEFORE_BLOCK) {
+          deps.pendingMessages.push({
+            role: "user",
+            content: `<system-summary>${t("exec.plan_blocked", { step: String(deps.trackerRef.current?.getCurrentStep()?.id ?? "?"), max: MAX_PLAN_WARNINGS_BEFORE_BLOCK })}</system-summary>`
+          });
+          return t("exec.plan_blocked", {
+            step: String(deps.trackerRef.current?.getCurrentStep()?.id ?? "?"),
+            max: MAX_PLAN_WARNINGS_BEFORE_BLOCK
+          });
+        }
+      } else {
+        deps.state.consecutivePlanWarnings = 0;
+      }
+      return true;
+    },
+    onToolCall: (ctx) => {
+      const toolName = ctx?.toolName;
+      const args = ctx?.args;
+      if (toolName && args) {
+        deps.stuckDetector.recordToolCall(toolName, args);
+      }
+    },
+    onAfterTool: (ctx, call, result) => {
+      if (call.name === "bash") {
+        deps.stuckDetector.recordBashOutput(String(call.arguments?.command ?? ""), String(result.output ?? ""));
+      }
+      const toolText = String(result.output ?? "");
+      if (/error TS\d+|\[Project typecheck failed\]|\[Syntax check failed\]/.test(toolText)) {
+        deps.stuckDetector.recordToolError(call.name, toolText.slice(0, 300));
+      }
+      if (!result.success) {
+        if (call.name === "bash" && platform4() === "win32") {
+          const cmd = String(call.arguments?.command ?? "");
+          const forbidden = forbiddenWindowsCommand(cmd);
+          if (forbidden) {
+            const n = (deps.forbiddenBashFailures.get(forbidden) || 0) + 1;
+            deps.forbiddenBashFailures.set(forbidden, n);
+            if (n === 2) {
+              deps.pendingMessages.push({
                 role: "user",
-                content: `<system-summary>STOP. Step ${step?.id ?? "?"} ("${step?.description ?? ""}") took ${this.stuckDetector.getIterationsOnCurrentStep()} iterations with no progress. DO NOT continue this step. Immediately call: plan update step=${step?.id ?? "?"} status=done (if code works despite warnings) OR plan update step=${step?.id ?? "?"} status=skipped note="reason". Do NOT make any other tool calls before updating the plan.</system-summary>`
+                content: `<system-summary>${t("exec.forbidden_cmd", { cmd: forbidden })}</system-summary>`
               });
             }
           }
         }
-      },
-      onBeforeTool: (_ctx, call) => {
-        const warning = this.checkPlanAlignment(call);
-        if (warning) {
-          this.pendingMessages.push({
+        deps.stuckDetector.recordToolError(call.name, result.output);
+        const actionableHints = deps.stuckDetector.getActionableHints();
+        const alternative = deps.stuckDetector.getToolAlternative();
+        if (actionableHints.length > 0 || alternative) {
+          const parts = [...actionableHints];
+          if (alternative) {
+            parts.push(`Tool "${call.name}" crashed. Try "${alternative}" instead.`);
+          }
+          deps.pendingMessages.push({
             role: "user",
-            content: `<system-summary>${warning}</system-summary>`
+            content: `<system-summary>${t("exec.hints", { hints: parts.map((h) => `- ${h}`).join(`
+`) })}</system-summary>`
           });
-          this.consecutivePlanWarnings++;
-          if (this.consecutivePlanWarnings >= MAX_PLAN_WARNINGS_BEFORE_BLOCK) {
-            this.pendingMessages.push({
+        }
+      } else {
+        deps.stuckDetector.recordToolSuccess();
+        if (call.name === "bash" && result.success) {
+          const cmd = String(call.arguments?.command ?? "");
+          const testRun = detectTestResults(String(result.output ?? ""));
+          if (testRun && testRun.failed > 0) {
+            deps.pendingMessages.push({
               role: "user",
-              content: `<system-summary>${t("exec.plan_blocked", { step: String(this.tracker?.getCurrentStep()?.id ?? "?"), max: MAX_PLAN_WARNINGS_BEFORE_BLOCK })}</system-summary>`
+              content: `<system-summary>${testRun.framework} reported ${testRun.failed} FAILING test(s) (${testRun.passed} passing). Do NOT mark the current step as done — fix the failing tests (read the failure output, correct the code) and re-run them until all pass.</system-summary>`
             });
-            return t("exec.plan_blocked", {
-              step: String(this.tracker?.getCurrentStep()?.id ?? "?"),
-              max: MAX_PLAN_WARNINGS_BEFORE_BLOCK
+          } else if (testRun && testRun.failed === 0 && testRun.passed > 0) {
+            deps.pendingMessages.push({
+              role: "user",
+              content: `<system-summary>${testRun.framework}: all ${testRun.passed} test(s) passed for "${cmd}". You may mark the current step as done via plan update step=N status=done.</system-summary>`
             });
-          }
-        } else {
-          this.consecutivePlanWarnings = 0;
-        }
-        return true;
-      },
-      onToolCall: (ctx) => {
-        const toolName = ctx?.toolName;
-        const args = ctx?.args;
-        if (toolName && args) {
-          this.stuckDetector.recordToolCall(toolName, args);
-        }
-      },
-      onAfterTool: (ctx, call, result) => {
-        if (call.name === "bash") {
-          this.stuckDetector.recordBashOutput(String(call.arguments?.command ?? ""), String(result.output ?? ""));
-        }
-        const toolText = String(result.output ?? "");
-        if (/error TS\d+|\[Project typecheck failed\]|\[Syntax check failed\]/.test(toolText)) {
-          this.stuckDetector.recordToolError(call.name, toolText.slice(0, 300));
-        }
-        if (!result.success) {
-          this.stuckDetector.recordToolError(call.name, result.output);
-          const actionableHints = this.stuckDetector.getActionableHints();
-          const alternative = this.stuckDetector.getToolAlternative();
-          if (actionableHints.length > 0 || alternative) {
-            const parts = [...actionableHints];
-            if (alternative) {
-              parts.push(`Tool "${call.name}" crashed. Try "${alternative}" instead.`);
-            }
-            this.pendingMessages.push({
+          } else if (/node|tsx|ts-node|python|npm\s+(start|test|run)/.test(cmd)) {
+            deps.pendingMessages.push({
               role: "user",
-              content: `<system-summary>${t("exec.hints", { hints: parts.map((h) => `- ${h}`).join(`
-`) })}</system-summary>`
+              content: `<system-summary>The command "${cmd}" completed successfully. If this was testing your code, mark the current step as done via plan update step=N status=done.</system-summary>`
             });
           }
-        } else {
-          this.stuckDetector.recordToolSuccess();
-          if (call.name === "bash" && result.success) {
-            const cmd = String(call.arguments?.command ?? "");
-            const testRun = detectTestResults(String(result.output ?? ""));
-            if (testRun && testRun.failed > 0) {
-              this.pendingMessages.push({
-                role: "user",
-                content: `<system-summary>${testRun.framework} reported ${testRun.failed} FAILING test(s) (${testRun.passed} passing). Do NOT mark the current step as done — fix the failing tests (read the failure output, correct the code) and re-run them until all pass.</system-summary>`
-              });
-            } else if (testRun && testRun.failed === 0 && testRun.passed > 0) {
-              this.pendingMessages.push({
-                role: "user",
-                content: `<system-summary>${testRun.framework}: all ${testRun.passed} test(s) passed for "${cmd}". You may mark the current step as done via plan update step=N status=done.</system-summary>`
-              });
-            } else if (/node|tsx|ts-node|python|npm\s+(start|test|run)/.test(cmd)) {
-              this.pendingMessages.push({
-                role: "user",
-                content: `<system-summary>The command "${cmd}" completed successfully. If this was testing your code, mark the current step as done via plan update step=N status=done.</system-summary>`
-              });
-            }
-          }
         }
-        if (result.success && (call.name === "write_file" || call.name === "edit_file")) {
-          const filePath = call.arguments?.path;
-          if (filePath) {
-            this.stuckDetector.recordFileRewrite(filePath);
-            if (this.stuckDetector.hasExcessiveRewrites()) {
-              const file = this.stuckDetector.getExcessiveRewriteFile();
-              const count = this.stuckDetector.getFileRewriteCount(file);
-              if (ctx.onMeta) {
-                ctx.onMeta(t("exec.file_rewrite_warning", {
-                  file,
-                  count: String(count)
-                }));
-              }
+      }
+      if (result.success && (call.name === "write_file" || call.name === "edit_file")) {
+        const filePath = call.arguments?.path;
+        if (filePath) {
+          deps.stuckDetector.recordFileRewrite(filePath);
+          if (deps.stuckDetector.hasExcessiveRewrites()) {
+            const file = deps.stuckDetector.getExcessiveRewriteFile();
+            const count = deps.stuckDetector.getFileRewriteCount(file);
+            if (ctx.onMeta) {
+              ctx.onMeta(t("exec.file_rewrite_warning", {
+                file,
+                count: String(count)
+              }));
             }
           }
-          this.advancePlanIfStepComplete(ctx.contextManager, ctx.sessionLog);
         }
+        deps.advancePlanIfStepComplete(ctx.contextManager, ctx.sessionLog);
+      }
+    }
+  };
+}
+var STUCK_RECOVERY_COOLDOWN = 5, MAX_PLAN_WARNINGS_BEFORE_BLOCK = 3, FORCE_SKIP_THRESHOLD = 10;
+var init_execution_plugin = __esm(() => {
+  init_i18n();
+  init_bash();
+  init_windows_commands();
+});
+
+// src/modules/execution/module.ts
+import { existsSync as existsSync30, readFileSync as readFileSync17 } from "fs";
+import { resolve as resolve18 } from "path";
+
+class ExecutionModule {
+  name = "execution";
+  tracker = null;
+  verifier;
+  stuckDetector;
+  auditor;
+  store;
+  baseDir;
+  _auditSkipsRemaining = 0;
+  pendingMessages = [];
+  forbiddenBashFailures = new Map;
+  state = {
+    lastRecoveryIteration: -STUCK_RECOVERY_COOLDOWN,
+    consecutivePlanWarnings: 0,
+    lastStepId: -1,
+    stuckNotified: false,
+    depsGateHints: new Map
+  };
+  trackerRef = (() => {
+    const self = this;
+    return {
+      get current() {
+        return self.tracker;
+      },
+      set current(v) {
+        self.tracker = v;
       }
     };
+  })();
+  constructor(baseDir, stuckThreshold = 6) {
+    this.baseDir = baseDir;
+    this.verifier = new StepVerifier(baseDir);
+    this.stuckDetector = new StuckDetector(stuckThreshold);
+    this.auditor = new Auditor(baseDir);
+    this.store = new PlanStore(baseDir);
+  }
+  setPlan(plan) {
+    this.tracker = new PlanTracker(plan);
+    this.store.saveActive(plan);
+    this._auditSkipsRemaining = 0;
+  }
+  restorePlan() {
+    const plan = this.store.loadActive();
+    if (!plan)
+      return false;
+    this.tracker = new PlanTracker(plan);
+    this.tracker.syncCurrentStep();
+    this._auditSkipsRemaining = 1;
+    return true;
+  }
+  getTracker() {
+    return this.tracker;
+  }
+  getStore() {
+    return this.store;
+  }
+  getStuckDetector() {
+    return this.stuckDetector;
+  }
+  async runFinalAudit() {
+    if (!this.tracker)
+      return null;
+    if (this._auditSkipsRemaining > 0) {
+      this._auditSkipsRemaining--;
+      return null;
+    }
+    const plan = this.tracker.getPlan();
+    const audit = await this.auditor.audit(plan);
+    const pendingSteps = plan.steps.flatMap((s) => s.status !== "done" && s.status !== "skipped" ? [`${s.id}. ${s.description}`] : []);
+    const done = plan.steps.filter((s) => s.status === "done").length;
+    const passed = audit.passed && pendingSteps.length === 0;
+    return {
+      passed,
+      done,
+      total: plan.steps.length,
+      pendingSteps,
+      missingFiles: audit.missingFiles,
+      summary: audit.summary
+    };
+  }
+  getSystemPromptBlock() {
+    if (!this.tracker)
+      return null;
+    return {
+      content: this.tracker.toPromptBlock(),
+      priority: "critical",
+      essential: true,
+      estimatedTokens: 200
+    };
+  }
+  getToolDefinitions() {
+    return createPlanToolDefinitions({
+      store: this.store,
+      verifier: this.verifier,
+      trackerRef: this.trackerRef,
+      preserveActive: () => this.preserveActive(),
+      setPlan: (p) => this.setPlan(p),
+      missingStepDeliverables: (s) => this.missingStepDeliverables(s),
+      stillExistingDeliverables: (s) => this.stillExistingDeliverables(s),
+      parseKinds: (a, st) => this.parseKinds(a, st),
+      getTaskText: (c) => this.getTaskText(c),
+      baseDir: this.baseDir
+    });
+  }
+  getPlugin() {
+    return createExecutionPlugin({
+      stuckDetector: this.stuckDetector,
+      trackerRef: this.trackerRef,
+      pendingMessages: this.pendingMessages,
+      forbiddenBashFailures: this.forbiddenBashFailures,
+      state: this.state,
+      checkPlanAlignment: (call) => this.checkPlanAlignment(call),
+      advancePlanIfStepComplete: (cm, sl) => this.advancePlanIfStepComplete(cm, sl)
+    });
   }
   preserveActive() {
     if (!this.tracker)
@@ -16945,19 +17251,18 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
     ];
     if (allowedAlways.includes(call.name))
       return null;
-    const stepPaths = (step.description.match(/\b[\w./\\-]+\.[a-z]+/gi) || []).map((p) => p.toLowerCase());
+    const stepPaths = extractFileLikeTokens(stripUrls(step.description)).map((p) => p.toLowerCase());
     if (stepPaths.length === 0)
       return null;
-    const argStr = JSON.stringify(call.arguments).toLowerCase();
-    const callPaths = (argStr.match(/\b[\w./\\-]+\.[a-z]+/gi) || []).map((p) => p.toLowerCase());
+    const argStr = JSON.stringify(call.arguments);
+    const callPaths = extractFileLikeTokens(stripUrls(argStr)).map((p) => p.toLowerCase());
     if (callPaths.length === 0)
       return null;
     const plan = this.tracker.getPlan();
     const finishedPaths = new Set;
     for (const s of plan.steps) {
       if (s.status === "done" || s.status === "skipped") {
-        const ps = s.description.match(/\b[\w./\\-]+\.[a-z]+/gi)?.map((p) => p.toLowerCase()) ?? [];
-        ps.forEach((p) => finishedPaths.add(p));
+        extractFileLikeTokens(stripUrls(s.description)).map((p) => p.toLowerCase()).forEach((p) => finishedPaths.add(p));
       }
     }
     const offPath = callPaths.some((p) => {
@@ -16979,7 +17284,7 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
     if (!step)
       return;
     const stepText = step.description.toLowerCase();
-    const stepPaths = step.description.match(/\b[\w./\\-]+\.[a-z]+/gi) || [];
+    const stepPaths = extractFileLikeTokens(stripUrls(step.description)) || [];
     const isDepsStep = stepText.includes("install") || stepText.includes("зависим") || stepText.includes("init") || stepText.includes("инициализац");
     if (isDepsStep) {
       const lockFiles = [
@@ -16997,8 +17302,8 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
       const hasLockFile = lockFiles.some((f) => existsSync30(resolve18(this.baseDir, f)));
       if (!hasLockFile) {
         if (contextManager) {
-          const hints = this.depsGateHints.get(step.id) || 0;
-          this.depsGateHints.set(step.id, hints + 1);
+          const hints = this.state.depsGateHints.get(step.id) || 0;
+          this.state.depsGateHints.set(step.id, hints + 1);
           const force = hints >= 1;
           const content = force ? t("exec.step_gate_deps_force", { step: String(step.id) }) : t("exec.step_gate_deps", {
             step: String(step.id),
@@ -17015,23 +17320,27 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
     if (stepPaths.length === 0)
       return;
     const allExist = stepPaths.every((p) => existsSync30(resolve18(this.baseDir, p)));
-    if (!allExist)
-      return;
-    const emptyFiles = [];
-    for (const p of stepPaths) {
-      try {
-        const content = readFileSync17(resolve18(this.baseDir, p), "utf-8");
-        if (content.trim().length < 10) {
-          emptyFiles.push(p);
-        }
-      } catch {}
-    }
-    if (emptyFiles.length > 0 && contextManager) {
-      contextManager.addMessage({
-        role: "user",
-        content: `<system-summary>${t("exec.step_gate_empty", { step: String(step.id), files: emptyFiles.join(", ") })}</system-summary>`
-      });
+    const allGone = stepPaths.every((p) => !existsSync30(resolve18(this.baseDir, p)));
+    const satisfied = step.kind === "delete" ? allGone && !allExist : allExist;
+    if (!satisfied)
       return;
+    if (step.kind !== "delete") {
+      const emptyFiles = [];
+      for (const p of stepPaths) {
+        try {
+          const content = readFileSync17(resolve18(this.baseDir, p), "utf-8");
+          if (content.trim().length < 10) {
+            emptyFiles.push(p);
+          }
+        } catch {}
+      }
+      if (emptyFiles.length > 0 && contextManager) {
+        contextManager.addMessage({
+          role: "user",
+          content: `<system-summary>${t("exec.step_gate_empty", { step: String(step.id), files: emptyFiles.join(", ") })}</system-summary>`
+        });
+        return;
+      }
     }
     this.tracker?.updateStepStatus(step.id, "done");
     const hadNext = this.tracker?.advance() ?? false;
@@ -17058,18 +17367,49 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
       return [];
     return tokens.filter((p) => !findExistingFile(this.baseDir, p));
   }
+  stillExistingDeliverables(step) {
+    const tokens = extractFileLikeTokens(stripUrls(step.description));
+    if (tokens.length === 0)
+      return [];
+    return tokens.filter((p) => findExistingFile(this.baseDir, p));
+  }
+  parseKinds(args, steps) {
+    if (args.kinds === undefined)
+      return { kinds: null, error: null };
+    if (!Array.isArray(args.kinds)) {
+      return { kinds: null, error: t("plan.kinds_not_array") };
+    }
+    const kindsRaw = args.kinds.map(String);
+    if (kindsRaw.length !== steps.length) {
+      return { kinds: null, error: t("plan.kinds_mismatch") };
+    }
+    const invalid = kindsRaw.filter((k) => k !== "create" && k !== "delete");
+    if (invalid.length > 0) {
+      return {
+        kinds: null,
+        error: t("plan.kinds_invalid", {
+          kinds: invalid.join(", ")
+        })
+      };
+    }
+    return { kinds: kindsRaw, error: null };
+  }
   getTaskText(ctx) {
     const manager = ctx?.contextManager;
     if (!manager)
       return "";
     const history = manager.getActiveHistory();
-    const firstUser = history.find((m) => m.role === "user");
+    const firstUser = history.find((m) => {
+      if (m.role !== "user")
+        return false;
+      const text = getMessageText(m.content);
+      return !text.startsWith("<system-summary>") && !text.includes("[Compressed:");
+    });
     if (!firstUser)
       return "";
     return getMessageText(firstUser.content).trim();
   }
 }
-var STUCK_RECOVERY_COOLDOWN = 5, MAX_PLAN_WARNINGS_BEFORE_BLOCK = 3, FORCE_SKIP_THRESHOLD = 10;
 var init_module = __esm(() => {
   init_i18n();
   init_tracker();
@@ -17077,9 +17417,9 @@ var init_module = __esm(() => {
   init_stuck_detector();
   init_auditor();
   init_plan_store();
-  init_plan_coverage();
-  init_bash();
   init_js_identifiers();
+  init_plan_tool();
+  init_execution_plugin();
 });
 
 // src/modules/security/session-encryption.ts
@@ -17087,10 +17427,10 @@ import {
   readFileSync as readFileSync18,
   writeFileSync as writeFileSync11,
   existsSync as existsSync31,
-  readdirSync as readdirSync10,
+  readdirSync as readdirSync11,
   unlinkSync as unlinkSync4
 } from "fs";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 import { homedir as homedir8 } from "os";
 
 class SessionFileEncryptor {
@@ -17099,7 +17439,7 @@ class SessionFileEncryptor {
   constructor(config) {
     this.config = { ...DEFAULT_SESSION_ENCRYPTION, ...config };
     this.encryptor = new ConfigEncryptor({
-      keyPath: config?.keyPath || join25(homedir8(), ".mma", ".session-encryption-key")
+      keyPath: config?.keyPath || join26(homedir8(), ".mma", ".session-encryption-key")
     });
   }
   isEnabled() {
@@ -17183,9 +17523,9 @@ class SessionFileEncryptor {
   encryptSessionDirectory(sessionDir) {
     if (!this.config.enabled)
       return;
-    const files = readdirSync10(sessionDir);
+    const files = readdirSync11(sessionDir);
     for (const file of files) {
-      const filePath = join25(sessionDir, file);
+      const filePath = join26(sessionDir, file);
       if (existsSync31(filePath) && !file.endsWith(".enc")) {
         try {
           const content = readFileSync18(filePath, "utf8");
@@ -17199,10 +17539,10 @@ class SessionFileEncryptor {
   decryptSessionDirectory(sessionDir) {
     if (!this.config.enabled)
       return;
-    const files = readdirSync10(sessionDir);
+    const files = readdirSync11(sessionDir);
     for (const file of files) {
       if (file.endsWith(".enc")) {
-        const encFilePath = join25(sessionDir, file);
+        const encFilePath = join26(sessionDir, file);
         const decFilePath = encFilePath.slice(0, -4);
         try {
           const content = readFileSync18(encFilePath, "utf8");
@@ -17229,13 +17569,13 @@ var init_session_encryption = __esm(() => {
 import {
   existsSync as existsSync32,
   mkdirSync as mkdirSync15,
-  readdirSync as readdirSync11,
+  readdirSync as readdirSync12,
   readFileSync as readFileSync19,
   rmSync as rmSync2,
   writeFileSync as writeFileSync12,
   appendFileSync as appendFileSync6
 } from "fs";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 import { gzipSync } from "zlib";
 
 class SessionStore {
@@ -17249,7 +17589,7 @@ class SessionStore {
     }
   }
   getSessionDir(id) {
-    return join26(this.baseDir, id);
+    return join27(this.baseDir, id);
   }
   updateEncryption(config) {
     if (config?.enabled) {
@@ -17265,16 +17605,16 @@ class SessionStore {
     mkdirSync15(this.baseDir, { recursive: true });
   }
   sessionDir(id) {
-    return join26(this.baseDir, id);
+    return join27(this.baseDir, id);
   }
   metaPath(id) {
-    return join26(this.sessionDir(id), "meta.json");
+    return join27(this.sessionDir(id), "meta.json");
   }
   historyPath(id) {
-    return join26(this.sessionDir(id), "history.jsonl");
+    return join27(this.sessionDir(id), "history.jsonl");
   }
   sessionLogPath(id) {
-    return join26(this.sessionDir(id), "session.jsonl");
+    return join27(this.sessionDir(id), "session.jsonl");
   }
   sessionExists(id) {
     return existsSync32(this.metaPath(id));
@@ -17398,7 +17738,7 @@ class SessionStore {
   listSessions() {
     if (!existsSync32(this.baseDir))
       return [];
-    const entries = readdirSync11(this.baseDir, { withFileTypes: true });
+    const entries = readdirSync12(this.baseDir, { withFileTypes: true });
     const sessions = [];
     for (const entry of entries) {
       if (entry.isDirectory()) {
@@ -17428,7 +17768,7 @@ class SessionStore {
         if (existsSync32(historyPath)) {
           const content = readFileSync19(historyPath, "utf-8");
           const compressed = gzipSync(content);
-          const gzPath = join26(this.baseDir, `${session2.id}.jsonl.gz`);
+          const gzPath = join27(this.baseDir, `${session2.id}.jsonl.gz`);
           writeFileSync12(gzPath, compressed);
           rmSync2(historyPath);
         }
@@ -17639,8 +17979,8 @@ class ProfileCompressor {
 
 // src/modules/user-profile/profile.ts
 import { readFileSync as readFileSync20, writeFileSync as writeFileSync13, existsSync as existsSync33, mkdirSync as mkdirSync16 } from "fs";
-import { join as join27 } from "path";
-import { homedir as homedir9, hostname, platform as platform4, type } from "os";
+import { join as join28 } from "path";
+import { homedir as homedir9, hostname, platform as platform5, type } from "os";
 import { env } from "process";
 
 class UserProfile {
@@ -17652,7 +17992,7 @@ class UserProfile {
   }
   collect() {
     this.info = {
-      platform: platform4(),
+      platform: platform5(),
       os: `${type()} ${hostname()}`,
       hostname: hostname(),
       shell: env.SHELL || env.ComSpec || "unknown",
@@ -17666,10 +18006,10 @@ class UserProfile {
     if (!existsSync33(this.profileDir)) {
       mkdirSync16(this.profileDir, { recursive: true });
     }
-    writeFileSync13(join27(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
+    writeFileSync13(join28(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
   }
   load() {
-    const path = join27(this.profileDir, "profile.json");
+    const path = join28(this.profileDir, "profile.json");
     if (!existsSync33(path))
       return null;
     try {
@@ -17708,8 +18048,8 @@ class UserProfile {
 var init_profile = () => {};
 
 // src/modules/skills/loader.ts
-import { readdirSync as readdirSync12, readFileSync as readFileSync21, existsSync as existsSync34, statSync as statSync6 } from "fs";
-import { join as join28 } from "path";
+import { readdirSync as readdirSync13, readFileSync as readFileSync21, existsSync as existsSync34, statSync as statSync6 } from "fs";
+import { join as join29 } from "path";
 
 class SkillsLoader {
   loadFromDir(dirPath) {
@@ -17720,9 +18060,9 @@ class SkillsLoader {
     return skills;
   }
   scanDir(dirPath, skills) {
-    const entries = readdirSync12(dirPath);
+    const entries = readdirSync13(dirPath);
     for (const entry of entries) {
-      const fullPath = join28(dirPath, entry);
+      const fullPath = join29(dirPath, entry);
       const stat = statSync6(fullPath);
       if (stat.isDirectory()) {
         this.scanDir(fullPath, skills);
@@ -17966,10 +18306,10 @@ var init_browser2 = __esm(() => {
 });
 
 // src/modules/lsp/command.ts
-import { delimiter, join as join29 } from "path";
+import { delimiter, join as join30 } from "path";
 import { existsSync as existsSync35 } from "fs";
-import { platform as platform5 } from "os";
-function resolveSpawnCommand(command, platformName = platform5(), pathEnv = process.env.PATH ?? "") {
+import { platform as platform6 } from "os";
+function resolveSpawnCommand(command, platformName = platform6(), pathEnv = process.env.PATH ?? "") {
   if (platformName !== "win32")
     return command;
   if (command.includes("/") || command.includes("\\") || WIN_EXTS.some((ext) => command.toLowerCase().endsWith(ext))) {
@@ -17978,7 +18318,7 @@ function resolveSpawnCommand(command, platformName = platform5(), pathEnv = proc
   const dirs = pathEnv.split(delimiter).filter(Boolean);
   for (const dir of dirs) {
     for (const ext of WIN_EXTS) {
-      const candidate = join29(dir, `${command}${ext}`);
+      const candidate = join30(dir, `${command}${ext}`);
       if (existsSync35(candidate))
         return `${command}${ext}`;
     }
@@ -18006,7 +18346,7 @@ import {
   execSync as execSync2
 } from "child_process";
 import { resolve as resolve19 } from "path";
-import { platform as platform6 } from "os";
+import { platform as platform7 } from "os";
 
 class LspClient {
   process = null;
@@ -18069,7 +18409,7 @@ class LspClient {
     }
     return new Promise((resolve20, reject) => {
       const args = config.args ?? [];
-      const isWin = platform6() === "win32";
+      const isWin = platform7() === "win32";
       let spawnCommand = resolveSpawnCommand(config.command);
       let spawnArgs = args;
       const spawnOpts = {
@@ -18359,8 +18699,8 @@ var init_lsp = __esm(() => {
 });
 
 // src/modules/indexer/walker.ts
-import { readdirSync as readdirSync13, readFileSync as readFileSync22, statSync as statSync7, existsSync as existsSync37, watch } from "fs";
-import { join as join30, relative as relative2, extname as extname5 } from "path";
+import { readdirSync as readdirSync14, readFileSync as readFileSync22, statSync as statSync7, existsSync as existsSync37, watch } from "fs";
+import { join as join31, relative as relative2, extname as extname5 } from "path";
 
 class Indexer {
   baseDir;
@@ -18391,14 +18731,14 @@ class Indexer {
         return;
       let entries;
       try {
-        entries = readdirSync13(dir);
+        entries = readdirSync14(dir);
       } catch {
         return;
       }
       for (const entry of entries) {
         if (count >= this.MAX_FILES)
           return;
-        const fullPath = join30(dir, entry);
+        const fullPath = join31(dir, entry);
         const relPath = relative2(this.baseDir, fullPath);
         const stat = statSync7(fullPath);
         if (stat.isDirectory()) {
@@ -18462,13 +18802,13 @@ var init_walker = __esm(() => {
 
 // src/modules/indexer/cache.ts
 import { readFileSync as readFileSync23, writeFileSync as writeFileSync14, existsSync as existsSync38, mkdirSync as mkdirSync17, rmSync as rmSync3 } from "fs";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 
 class IndexCache {
   cachePath;
   cache = null;
   constructor(cacheDir) {
-    this.cachePath = join31(cacheDir, "index-cache.json");
+    this.cachePath = join32(cacheDir, "index-cache.json");
   }
   load() {
     if (this.cache)
@@ -18484,7 +18824,7 @@ class IndexCache {
   }
   save(result) {
     this.cache = result;
-    const dir = join31(this.cachePath, "..");
+    const dir = join32(this.cachePath, "..");
     if (!existsSync38(dir))
       mkdirSync17(dir, { recursive: true });
     writeFileSync14(this.cachePath, JSON.stringify(result), "utf-8");
@@ -18502,10 +18842,10 @@ var init_cache = () => {};
 
 // src/modules/indexer/project-profile.ts
 import { readFileSync as readFileSync24, existsSync as existsSync39 } from "fs";
-import { join as join32 } from "path";
+import { join as join33 } from "path";
 function detectManifest(baseDir) {
   for (const manifest of MANIFEST_ORDER) {
-    if (existsSync39(join32(baseDir, manifest)))
+    if (existsSync39(join33(baseDir, manifest)))
       return manifest;
   }
   return null;
@@ -18522,7 +18862,7 @@ function cleanDependency(entry) {
 }
 function readPackageJson(baseDir) {
   try {
-    const raw = JSON.parse(readFileSync24(join32(baseDir, "package.json"), "utf-8"));
+    const raw = JSON.parse(readFileSync24(join33(baseDir, "package.json"), "utf-8"));
     if (!raw || typeof raw !== "object")
       return null;
     const profile = {
@@ -18546,7 +18886,7 @@ function readPackageJson(baseDir) {
 }
 function readPyproject(baseDir) {
   try {
-    const content = readFileSync24(join32(baseDir, "pyproject.toml"), "utf-8");
+    const content = readFileSync24(join33(baseDir, "pyproject.toml"), "utf-8");
     const profile = { runtime: "python", deps: [], devDeps: [], scripts: {} };
     const nameMatch = content.match(/^\s*name\s*=\s*"([^"]+)"/m);
     if (nameMatch)
@@ -18562,7 +18902,7 @@ function readPyproject(baseDir) {
 }
 function readCargo(baseDir) {
   try {
-    const content = readFileSync24(join32(baseDir, "Cargo.toml"), "utf-8");
+    const content = readFileSync24(join33(baseDir, "Cargo.toml"), "utf-8");
     const profile = { runtime: "rust", deps: [], devDeps: [], scripts: {} };
     const nameMatch = content.match(/^\s*name\s*=\s*"([^"]+)"/m);
     if (nameMatch)
@@ -18586,7 +18926,7 @@ function readCargo(baseDir) {
 }
 function readGoMod(baseDir) {
   try {
-    const content = readFileSync24(join32(baseDir, "go.mod"), "utf-8");
+    const content = readFileSync24(join33(baseDir, "go.mod"), "utf-8");
     const profile = { runtime: "go", deps: [], devDeps: [], scripts: {} };
     const moduleMatch = content.match(/^module\s+(\S+)/m);
     if (moduleMatch)
@@ -18604,7 +18944,7 @@ function readGoMod(baseDir) {
 }
 function readRequirements(baseDir) {
   try {
-    const content = readFileSync24(join32(baseDir, "requirements.txt"), "utf-8");
+    const content = readFileSync24(join33(baseDir, "requirements.txt"), "utf-8");
     const profile = { runtime: "python", deps: [], devDeps: [], scripts: {} };
     for (const line of content.split(`
 `)) {
@@ -19058,7 +19398,7 @@ var init_mcp = __esm(() => {
 
 // src/modules/memory/module.ts
 import { homedir as homedir10 } from "os";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 
 class MemoryModule {
   name = "memory";
@@ -19067,7 +19407,7 @@ class MemoryModule {
     if (storeOrDir instanceof MemoryStore) {
       this.store = storeOrDir;
     } else {
-      const dir = storeOrDir || join33(homedir10(), ".mma", "memory");
+      const dir = storeOrDir || join34(homedir10(), ".mma", "memory");
       this.store = new MemoryStore(dir);
     }
   }
@@ -19159,7 +19499,7 @@ __export(exports_bootstrap, {
   bootstrap: () => bootstrap
 });
 import { homedir as homedir11 } from "os";
-import { join as join34, resolve as resolve21 } from "path";
+import { join as join35, resolve as resolve21 } from "path";
 import { existsSync as existsSync40, readFileSync as readFileSync25, writeFileSync as writeFileSync15 } from "fs";
 function buildSystemInfo(config, baseDir, profileCompressed) {
   const now = new Date().toISOString().replace("T", " ").slice(0, 19);
@@ -19186,8 +19526,8 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
 `);
 }
 async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
-  const dir = configDir || join34(homedir11(), ".mma");
-  const projectConfigPath = projectDir ? join34(projectDir, ".mmrc") : join34(process.cwd(), ".mmrc");
+  const dir = configDir || join35(homedir11(), ".mma");
+  const projectConfigPath = projectDir ? join35(projectDir, ".mmrc") : join35(process.cwd(), ".mmrc");
   const config = loadConfig({ configDir: dir, projectConfigPath });
   setLocale(config.locale);
   try {
@@ -19197,7 +19537,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     }
   } catch {}
   const logger = new Logger(config.logLevel);
-  logger.setLogDir(join34(dir, "logs"));
+  logger.setLogDir(join35(dir, "logs"));
   logger.debug("MMA bootstrap", {
     version: config.version,
     model: config.model
@@ -19219,7 +19559,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
       logger.info(`Model ${config.model} loaded in ${loadResult.loadTime}s`);
     }
   }
-  const profile = new UserProfile(join34(dir));
+  const profile = new UserProfile(join35(dir));
   profile.load() || profile.collect();
   profile.save();
   const llmProvider = new OpenAICompatProvider({
@@ -19231,7 +19571,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     rateLimits: config.security?.rateLimits
   });
   const baseDir = projectDir ? resolve21(projectDir) : process.cwd();
-  const projectMapCacheDir = join34(baseDir, ".mma");
+  const projectMapCacheDir = join35(baseDir, ".mma");
   const indexerModule = new IndexerModule({
     baseDir,
     cacheDir: projectMapCacheDir
@@ -19242,9 +19582,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     logger.warn(`Project indexing failed: ${err.message}`);
   }
   const skillsLoader = new SkillsLoader;
-  const builtinDir = join34(import.meta.dirname, "skills", "builtin");
-  const globalDir = join34(homedir11(), ".agents", "skills");
-  const projectSkillsDir = join34(baseDir, ".mma", "skills");
+  const builtinDir = join35(import.meta.dirname, "skills", "builtin");
+  const globalDir = join35(homedir11(), ".agents", "skills");
+  const projectSkillsDir = join35(baseDir, ".mma", "skills");
   const availableSkills = skillsLoader.loadFromAllSources(builtinDir, globalDir, projectSkillsDir);
   const skillsBudget = Math.floor(config.contextWindow * config.skills.budget);
   const skillsModule = new SkillsModule(availableSkills, skillsBudget);
@@ -19258,11 +19598,11 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     essential: true,
     estimatedTokens: Math.ceil(systemInfoContent.length / 4)
   };
-  const agentsMdGlobal = join34(dir, "AGENTS.md");
+  const agentsMdGlobal = join35(dir, "AGENTS.md");
   if (!existsSync40(agentsMdGlobal)) {
     writeFileSync15(agentsMdGlobal, "", "utf-8");
   }
-  const sessionDir = join34(dir, "sessions");
+  const sessionDir = join35(dir, "sessions");
   const sessionStore = new SessionStore(sessionDir);
   sessionStore.init();
   const sessionManager = new SessionManager(sessionStore, {
@@ -19329,7 +19669,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const mcpModule = new MCPModule(config);
   await mcpModule.initialize();
   moduleRegistry.register(mcpModule);
-  const memoryStore = new MemoryStore(join34(dir, "memory"));
+  const memoryStore = new MemoryStore(join35(dir, "memory"));
   const memoryModule = new MemoryModule(memoryStore);
   moduleRegistry.register(memoryModule);
   if (config.browser.enabled) {
@@ -19380,8 +19720,8 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   pluginManager.register(plugin);
   pluginManager.register(plugin2);
   const pluginLoader = new PluginLoader;
-  const globalPluginsDir = join34(homedir11(), ".mma", "plugins");
-  const projectPluginsDir = join34(baseDir, ".mma", "plugins");
+  const globalPluginsDir = join35(homedir11(), ".mma", "plugins");
+  const projectPluginsDir = join35(baseDir, ".mma", "plugins");
   pluginLoader.loadFromDir(globalPluginsDir, pluginManager, logger);
   pluginLoader.loadFromDir(projectPluginsDir, pluginManager, logger);
   contextManager.onCompact = (summary) => {
@@ -19399,9 +19739,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const skipAgentsMd = noAgentsMd === true;
   if (!skipAgentsMd) {
     const agentsMdCandidates = [
-      join34(baseDir, "AGENTS.md"),
-      join34(baseDir, ".mma", "AGENTS.md"),
-      join34(dir, "AGENTS.md")
+      join35(baseDir, "AGENTS.md"),
+      join35(baseDir, ".mma", "AGENTS.md"),
+      join35(dir, "AGENTS.md")
     ];
     for (const p of agentsMdCandidates) {
       if (existsSync40(p)) {
@@ -20261,7 +20601,7 @@ __export(exports_manifest, {
 });
 import { existsSync as existsSync41, readFileSync as readFileSync26, mkdirSync as mkdirSync18, writeFileSync as writeFileSync16 } from "fs";
 import { homedir as homedir13 } from "os";
-import { join as join36 } from "path";
+import { join as join37 } from "path";
 function readManifest(path = MANIFEST_PATH) {
   try {
     if (existsSync41(path)) {
@@ -20272,7 +20612,7 @@ function readManifest(path = MANIFEST_PATH) {
   return { version: 1, certifications: [] };
 }
 function saveManifest(m, path = MANIFEST_PATH) {
-  mkdirSync18(join36(homedir13(), ".mma"), { recursive: true });
+  mkdirSync18(join37(homedir13(), ".mma"), { recursive: true });
   writeFileSync16(path, JSON.stringify(m, null, 2), "utf-8");
 }
 function upsertCertification(entry, path = MANIFEST_PATH) {
@@ -20307,7 +20647,7 @@ function getCertMark(model, providerUrl, currentVersion, path = MANIFEST_PATH) {
 }
 var MANIFEST_PATH;
 var init_manifest = __esm(() => {
-  MANIFEST_PATH = join36(homedir13(), ".mma", "certifications.json");
+  MANIFEST_PATH = join37(homedir13(), ".mma", "certifications.json");
 });
 
 // node_modules/yaml/dist/nodes/identity.js
@@ -27430,8 +27770,8 @@ var init_scenarios = __esm(() => {
 });
 
 // src/modules/certification/loader.ts
-import { existsSync as existsSync42, readdirSync as readdirSync14, readFileSync as readFileSync27 } from "fs";
-import { join as join37 } from "path";
+import { existsSync as existsSync42, readdirSync as readdirSync15, readFileSync as readFileSync27 } from "fs";
+import { join as join38 } from "path";
 function validateScenario(s) {
   const errors2 = [];
   const isSkip = s.mode === "skip";
@@ -27481,11 +27821,11 @@ function loadScenarios(userDir) {
       scenarios.push(s);
   }
   if (userDir && existsSync42(userDir)) {
-    for (const file of readdirSync14(userDir)) {
+    for (const file of readdirSync15(userDir)) {
       if (!file.endsWith(".yaml") && !file.endsWith(".yml"))
         continue;
       try {
-        const raw = readFileSync27(join37(userDir, file), "utf-8");
+        const raw = readFileSync27(join38(userDir, file), "utf-8");
         const data = $parse(raw);
         const parsed = normalizeScenario(data, file);
         const errs = validateScenario(parsed);
@@ -27539,7 +27879,7 @@ var init_loader3 = __esm(() => {
 
 // src/modules/certification/fact-checker.ts
 import { existsSync as existsSync43, readFileSync as readFileSync28, statSync as statSync8 } from "fs";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 function checkSandbox(sandboxDir, checks, exitCode, output) {
   const failures = [];
   for (const check of checks) {
@@ -27556,13 +27896,13 @@ function runCheck(sandboxDir, check, exitCode, output) {
     case "outputContains":
       return output.includes(check.text);
     case "fileExists":
-      return isFile(join38(sandboxDir, check.path));
+      return isFile(join39(sandboxDir, check.path));
     case "fileNotExists":
-      return !existsSync43(join38(sandboxDir, check.path));
+      return !existsSync43(join39(sandboxDir, check.path));
     case "dirExists":
-      return isDir(join38(sandboxDir, check.path));
+      return isDir(join39(sandboxDir, check.path));
     case "fileContent": {
-      const abs = join38(sandboxDir, check.path);
+      const abs = join39(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       const content = readFileSync28(abs, "utf-8");
@@ -27573,7 +27913,7 @@ function runCheck(sandboxDir, check, exitCode, output) {
       return false;
     }
     case "fileRegex": {
-      const abs = join38(sandboxDir, check.path);
+      const abs = join39(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       return new RegExp(check.pattern).test(readFileSync28(abs, "utf-8"));
@@ -27623,8 +27963,8 @@ var init_fact_checker = () => {};
 // src/modules/certification/runner.ts
 import { spawn as spawn7 } from "child_process";
 import { existsSync as existsSync44, mkdirSync as mkdirSync19, rmSync as rmSync4, cpSync as cpSync2 } from "fs";
-import { platform as platform7 } from "os";
-import { join as join39, resolve as resolve22, dirname as dirname12 } from "path";
+import { platform as platform8 } from "os";
+import { join as join40, resolve as resolve22, dirname as dirname12 } from "path";
 async function runScenario(scenario, opts) {
   if (scenario.mode === "skip") {
     return {
@@ -27643,7 +27983,7 @@ async function runScenario(scenario, opts) {
   let passed = 0;
   let firstError;
   for (let i = 1;i <= reps; i++) {
-    const sandbox = join39(opts.sandboxBase, `run-${scenario.id}-${i}`);
+    const sandbox = join40(opts.sandboxBase, `run-${scenario.id}-${i}`);
     let failures = [];
     let exitCode = -1;
     let output = "";
@@ -27704,20 +28044,20 @@ function prepareSandbox(sandbox, scenario, mmaRoot) {
   rmSync4(sandbox, { recursive: true, force: true });
   mkdirSync19(sandbox, { recursive: true });
   for (const f of scenario.fixtures ?? []) {
-    const src = join39(mmaRoot, f.source);
+    const src = join40(mmaRoot, f.source);
     if (!existsSync44(src)) {
       throw new Error(`fixture missing: ${f.source}`);
     }
-    const dest = join39(sandbox, f.dest);
+    const dest = join40(sandbox, f.dest);
     mkdirSync19(dirname12(dest), { recursive: true });
     cpSync2(src, dest);
   }
 }
 function resolveMmaEntry(mmaRoot) {
-  const dev = join39(mmaRoot, "src", "cli", "main.ts");
+  const dev = join40(mmaRoot, "src", "cli", "main.ts");
   if (existsSync44(dev))
     return dev;
-  return join39(mmaRoot, "dist", "main.js");
+  return join40(mmaRoot, "dist", "main.js");
 }
 function findMmaRoot(fromDir) {
   const candidates = [
@@ -27725,7 +28065,7 @@ function findMmaRoot(fromDir) {
     resolve22(fromDir, "..")
   ];
   for (const c of candidates) {
-    if (existsSync44(join39(c, "package.json")))
+    if (existsSync44(join40(c, "package.json")))
       return c;
   }
   return process.cwd();
@@ -27734,7 +28074,7 @@ function killTree2(child) {
   const pid = child.pid;
   if (!pid)
     return;
-  if (platform7() === "win32") {
+  if (platform8() === "win32") {
     spawn7("taskkill", ["/pid", String(pid), "/T", "/F"], {
       windowsHide: true,
       stdio: "ignore"
@@ -27793,11 +28133,11 @@ __export(exports_cli, {
 });
 import { rmSync as rmSync5 } from "fs";
 import { homedir as homedir14 } from "os";
-import { join as join40, dirname as dirname13 } from "path";
+import { join as join41, dirname as dirname13 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { existsSync as existsSync45, readFileSync as readFileSync29 } from "fs";
 function readVersion() {
-  const candidates = [join40(MMA_ROOT, "package.json")];
+  const candidates = [join41(MMA_ROOT, "package.json")];
   for (const p of candidates) {
     if (existsSync45(p)) {
       try {
@@ -27837,7 +28177,7 @@ async function certify(opts) {
     return;
   }
   console.log(t("cli.cert_started", { model: opts.name, provider: providerUrl }));
-  const sandboxBase = join40(process.cwd(), ".mma", "certification");
+  const sandboxBase = join41(process.cwd(), ".mma", "certification");
   const results = [];
   const total = selected.length;
   let idx = 0;
@@ -27951,7 +28291,7 @@ var init_cli = __esm(() => {
   init_manifest();
   HERE = dirname13(fileURLToPath2(import.meta.url));
   MMA_ROOT = findMmaRoot(HERE);
-  USER_SCENARIO_DIR = join40(homedir14(), ".mma", "certification", "scenarios");
+  USER_SCENARIO_DIR = join41(homedir14(), ".mma", "certification", "scenarios");
 });
 
 // src/cli/repl-commands.ts
@@ -27960,15 +28300,15 @@ __export(exports_repl_commands, {
   registerAllCommands: () => registerAllCommands,
   COMMAND_GROUPS: () => COMMAND_GROUPS
 });
-import { join as join42, dirname as dirname15 } from "path";
+import { join as join43, dirname as dirname15 } from "path";
 import { homedir as homedir16 } from "os";
 import { existsSync as existsSync47, readFileSync as readFileSync31 } from "fs";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function readVersion3() {
   const here = dirname15(fileURLToPath4(import.meta.url));
   const candidates = [
-    join42(here, "..", "..", "package.json"),
-    join42(here, "..", "package.json")
+    join43(here, "..", "..", "package.json"),
+    join43(here, "..", "package.json")
   ];
   for (const p of candidates) {
     if (existsSync47(p)) {
@@ -28136,7 +28476,7 @@ function registerMmaCommands(ctx) {
       console.log(pc2.yellow(t("repl.wizard_running")));
       await ctx.withExclusiveInput(async () => {
         const answers = await runSetup(ctx.rl);
-        const configPath = join42(homedir16(), ".mma", "config.json");
+        const configPath = join43(homedir16(), ".mma", "config.json");
         ctx.config.provider.type = answers.provider;
         ctx.config.provider.baseUrl = answers.apiBase;
         ctx.config.provider.apiKey = answers.apiKey;
@@ -28190,7 +28530,7 @@ Excluded blocks: ${info.excluded.length}`));
           return;
         }
         ctx.config.provider.type = name;
-        const configPath = join42(homedir16(), ".mma", "config.json");
+        const configPath = join43(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
         console.log(pc2.green(t("repl.provider_set", { name })));
@@ -28246,7 +28586,7 @@ Excluded blocks: ${info.excluded.length}`));
           return;
         }
         ctx.config.model = name;
-        const configPath = join42(homedir16(), ".mma", "config.json");
+        const configPath = join43(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
         console.log(pc2.green(t("repl.model_set", { name })));
@@ -28271,7 +28611,7 @@ Excluded blocks: ${info.excluded.length}`));
         return;
       }
       ctx.config.contextWindow = size;
-      const configPath = join42(homedir16(), ".mma", "config.json");
+      const configPath = join43(homedir16(), ".mma", "config.json");
       saveConfig(ctx.config, configPath);
       await ctx.agent.reconfigure(ctx.config);
       console.log(pc2.green(t("cli.context_set", { size })));
@@ -28290,10 +28630,10 @@ Excluded blocks: ${info.excluded.length}`));
       ctx.agent.shutdown();
       const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config2(), exports_config));
       const { homedir: homedir17 } = await import("os");
-      const { join: join43 } = await import("path");
+      const { join: join44 } = await import("path");
       const configDir = ctx.configDir;
       const baseDir = ctx.baseDir;
-      const projectConfigPath = join43(baseDir, ".mmrc");
+      const projectConfigPath = join44(baseDir, ".mmrc");
       const freshConfig = loadConfig2({ configDir, projectConfigPath });
       Object.assign(ctx.config, freshConfig);
       const { bootstrap: bootstrap2 } = await Promise.resolve().then(() => (init_bootstrap(), exports_bootstrap));
@@ -28593,14 +28933,14 @@ init_bootstrap();
 init_config2();
 init_setup();
 init_i18n();
-import { join as join41, dirname as dirname14 } from "path";
+import { join as join42, dirname as dirname14 } from "path";
 import { homedir as homedir15 } from "os";
 import { existsSync as existsSync46, readFileSync as readFileSync30 } from "fs";
 
 // src/cli/security-commands.ts
 init_bootstrap();
 init_config2();
-import { join as join35 } from "path";
+import { join as join36 } from "path";
 import { homedir as homedir12 } from "os";
 
 // src/modules/security/security-policies.ts
@@ -29130,7 +29470,7 @@ function createSecurityCommand(program2) {
     }
   });
   securityCmd.command("set-policy").argument("<preset>", t("cli.security.preset")).description(t("cli.security.set_policy")).action(async (preset) => {
-    const configPath = join35(homedir12(), ".mma", "config.json");
+    const configPath = join36(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const validPresets = ["strict", "balanced", "permissive"];
     if (!validPresets.includes(preset)) {
@@ -29145,7 +29485,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.policy_description", { description: policy.description }));
   });
   securityCmd.command("enable-encryption").description(t("cli.security.enable_encryption")).action(async () => {
-    const configPath = join35(homedir12(), ".mma", "config.json");
+    const configPath = join36(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -29157,7 +29497,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.encryption_enabled"));
   });
   securityCmd.command("disable-encryption").description(t("cli.security.disable_encryption")).action(async () => {
-    const configPath = join35(homedir12(), ".mma", "config.json");
+    const configPath = join36(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -29169,7 +29509,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.encryption_disabled"));
   });
   securityCmd.command("enable-audit").description(t("cli.security.enable_audit")).action(async () => {
-    const configPath = join35(homedir12(), ".mma", "config.json");
+    const configPath = join36(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -29183,7 +29523,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.audit_enabled"));
   });
   securityCmd.command("disable-audit").description(t("cli.security.disable_audit")).action(async () => {
-    const configPath = join35(homedir12(), ".mma", "config.json");
+    const configPath = join36(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -29219,8 +29559,8 @@ import { fileURLToPath as fileURLToPath3 } from "url";
 function readVersion2() {
   const here = dirname14(fileURLToPath3(import.meta.url));
   const candidates = [
-    join41(here, "..", "..", "package.json"),
-    join41(here, "..", "package.json")
+    join42(here, "..", "..", "package.json"),
+    join42(here, "..", "package.json")
   ];
   for (const p of candidates) {
     if (existsSync46(p)) {
@@ -29238,7 +29578,7 @@ function createProgram() {
   const program2 = new Command().name("mma").description(t("cli.description")).version(version).option("--no-agents-md", t("cli.no_agents_md")).option("-d, --dir <path>", t("cli.dir")).option("-e, --exit-on-complete", t("cli.exit_on_complete")).option("-j, --json", t("cli.json"));
   program2.command("init").description(t("cli.init")).action(async () => {
     const answers = await runSetup();
-    const configPath = join41(homedir15(), ".mma", "config.json");
+    const configPath = join42(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = answers.provider;
     config.provider.baseUrl = answers.apiBase;
@@ -29283,7 +29623,7 @@ function createProgram() {
   });
   const configCmd = program2.command("config").description(t("cli.manage_config"));
   configCmd.command("set").argument("<key>", t("cli.config_key")).argument("<value>", "Config value").description(t("cli.set_value")).action(async (key, value) => {
-    const configPath = join41(homedir15(), ".mma", "config.json");
+    const configPath = join42(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     const keys = key.split(".");
     let obj = config;
@@ -29346,7 +29686,7 @@ function createProgram() {
     console.log(t("cli.model_hint"));
   });
   model.command("use").argument("<name>", "Model name").description(t("cli.set_model")).action(async (name) => {
-    const configPath = join41(homedir15(), ".mma", "config.json");
+    const configPath = join42(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.model = name;
     saveConfig(config, configPath);
@@ -29382,7 +29722,7 @@ function createProgram() {
     await uncertify2(name, config);
   });
   program2.command("context").description(t("cli.manage_context")).argument("<size>", "Context window size in tokens").action(async (size) => {
-    const configPath = join41(homedir15(), ".mma", "config.json");
+    const configPath = join42(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     const contextWindow = parseInt(size, 10);
     if (isNaN(contextWindow) || contextWindow < 1024) {
@@ -29400,7 +29740,7 @@ function createProgram() {
     console.log(t("cli.base_url"), config.provider.baseUrl);
   });
   provider.command("use").argument("<name>", "Provider name").description(t("cli.set_provider")).action(async (name) => {
-    const configPath = join41(homedir15(), ".mma", "config.json");
+    const configPath = join42(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = name;
     saveConfig(config, configPath);
@@ -30171,7 +30511,7 @@ class LineEditor {
 
 // src/cli/repl.ts
 import { existsSync as existsSync48, readFileSync as readFileSync32, writeFileSync as writeFileSync17 } from "fs";
-import { join as join43, dirname as dirname16 } from "path";
+import { join as join44, dirname as dirname16 } from "path";
 import { homedir as homedir17 } from "os";
 import { fileURLToPath as fileURLToPath5 } from "url";
 
@@ -30677,8 +31017,8 @@ init_repl_commands();
 function readVersion4() {
   const here = dirname16(fileURLToPath5(import.meta.url));
   const candidates = [
-    join43(here, "..", "..", "package.json"),
-    join43(here, "..", "package.json")
+    join44(here, "..", "..", "package.json"),
+    join44(here, "..", "package.json")
   ];
   for (const p of candidates) {
     if (existsSync48(p)) {
@@ -30739,10 +31079,10 @@ class Repl {
     this.skillsModule = skillsModule;
     this.pluginManager = pluginManager;
     this.logger = logger;
-    this.configDir = configDir || join43(homedir17(), ".mma");
+    this.configDir = configDir || join44(homedir17(), ".mma");
     this.baseDir = baseDir || process.cwd();
     this.noAgentsMd = noAgentsMd === true;
-    this.historyPath = join43(homedir17(), ".mma", "repl-history");
+    this.historyPath = join44(homedir17(), ".mma", "repl-history");
     this.loadHistory();
     this.rl = process.stdin.isTTY ? new LineEditor({
       input: process.stdin,
@@ -31134,9 +31474,9 @@ ${t("image.clipboard_empty")}`));
       row(t("repl.agents_label"), pc2.red(t("repl.disabled")));
     } else {
       const agentsMdCandidates = [
-        join43(this.baseDir, "AGENTS.md"),
-        join43(this.baseDir, ".mma", "AGENTS.md"),
-        join43(this.configDir, "AGENTS.md")
+        join44(this.baseDir, "AGENTS.md"),
+        join44(this.baseDir, ".mma", "AGENTS.md"),
+        join44(this.configDir, "AGENTS.md")
       ];
       const foundAgents = agentsMdCandidates.filter((p) => existsSync48(p));
       if (foundAgents.length > 0) {
@@ -31149,7 +31489,7 @@ ${t("image.clipboard_empty")}`));
     }
     const meta = this.sessionManager?.getActiveMeta();
     if (meta) {
-      const sessionPath = join43(this.configDir, "sessions", meta.id);
+      const sessionPath = join44(this.configDir, "sessions", meta.id);
       row(t("repl.session_label"), `${pc2.cyan(meta.name)} ${pc2.dim(`(${meta.id.slice(0, 12)})`)}  —  ${meta.messageCount} msgs  ${pc2.dim(sessionPath)}`);
     }
     const headerWidth = Math.max(50, Math.min(96, process.stdout.columns || 96));
@@ -31191,13 +31531,13 @@ init_config2();
 init_i18n();
 init_colors();
 import { existsSync as existsSync49, readFileSync as readFileSync33 } from "fs";
-import { join as join44, dirname as dirname17 } from "path";
+import { join as join45, dirname as dirname17 } from "path";
 import { homedir as homedir18 } from "os";
 import { fileURLToPath as fileURLToPath6 } from "url";
 
 // src/modules/updater/checker.ts
 init_command();
-import { platform as platform8 } from "os";
+import { platform as platform9 } from "os";
 var defaultRunner2 = async (command, args, options) => {
   const { execFile } = await import("child_process");
   return new Promise((resolve23) => {
@@ -31259,7 +31599,7 @@ class Updater {
   buildInstallCommand(latest) {
     const npmArgs = ["install", "-g", `${this.packageName}@${latest}`];
     const command = resolveSpawnCommand("npm");
-    if (platform8() === "win32" && /\.(cmd|bat)$/i.test(command)) {
+    if (platform9() === "win32" && /\.(cmd|bat)$/i.test(command)) {
       return { command: "cmd.exe", args: ["/c", command, ...npmArgs] };
     }
     return { command, args: npmArgs };
@@ -31355,8 +31695,8 @@ class UpdaterModule {
 function readVersion5() {
   const here = dirname17(fileURLToPath6(import.meta.url));
   const candidates = [
-    join44(here, "..", "..", "package.json"),
-    join44(here, "..", "package.json")
+    join45(here, "..", "..", "package.json"),
+    join45(here, "..", "package.json")
   ];
   for (const p of candidates) {
     if (existsSync49(p)) {
@@ -31432,15 +31772,15 @@ async function main() {
     agent.shutdown();
     process.exit(exitCode);
   } else {
-    const configPath = join44(homedir18(), ".mma", "config.json");
+    const configPath = join45(homedir18(), ".mma", "config.json");
     if (!existsSync49(configPath)) {
       console.log(pc2.yellow(`
   ` + t("cli.first_run") + `
 `));
       const answers = await runSetup();
       const config2 = loadConfig({
-        configDir: join44(homedir18(), ".mma"),
-        projectConfigPath: projectDir ? join44(projectDir, ".mmrc") : join44(process.cwd(), ".mmrc")
+        configDir: join45(homedir18(), ".mma"),
+        projectConfigPath: projectDir ? join45(projectDir, ".mmrc") : join45(process.cwd(), ".mmrc")
       });
       config2.provider.type = answers.provider;
       config2.provider.baseUrl = answers.apiBase;