micro-models-agent 0.43.0 → 0.43.2

package/dist/main.js

@@ -2358,7 +2358,9 @@ var init_en = __esm(() => {
     "file.is_directory": "Is a directory, use rmdir: {path}",
     "file.replaced_in": "Replaced in {path}",
     "file.string_not_found": `String not found in file:
-{str}`,
+{str}
+
+Use read_file on {path} to see the current content before editing — the target may differ (whitespace, line endings) or was already replaced.`,
     "file.moved": "Moved {from} → {to}",
     "file.not_found_short": "Not found: {path}",
     "file.notfound_resolved": "File not found: {path} (resolved to {resolved})",
@@ -2540,6 +2542,9 @@ Command: {command}`,
     "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.typecheck_failed": `Cannot mark step {step} done: the last check still reports a compile error:
+{error}
+Fix the error and re-edit the file (a clean write clears the failure), or mark the step status=skipped if it is not needed.`,
     "plan.show_header": "Plan status:",
     "plan.show_empty": "(plan has no steps)",
     "plan.list_header": "Plans:",
@@ -3012,7 +3017,9 @@ var init_ru = __esm(() => {
     "file.is_directory": "Это каталог, используйте rmdir: {path}",
     "file.replaced_in": "Заменено в {path}",
     "file.string_not_found": `Строка не найдена в файле:
-{str}`,
+{str}
+
+Используй read_file для {path}, чтобы увидеть текущее содержимое файла перед редактированием — искомая строка может отличаться (пробелы, переводы строк) или уже была заменена.`,
     "file.moved": "Перемещён {from} → {to}",
     "file.not_found_short": "Не найдено: {path}",
     "file.empty": "(пусто)",
@@ -3192,6 +3199,9 @@ var init_ru = __esm(() => {
     "plan.kinds_invalid": 'Недопустимый kind шага: {kinds}. Используй "create" или "delete".',
     "plan.kinds_not_array": 'kinds должен быть массивом значений "create" или "delete"',
     "plan.deliverables_remain": "Нельзя пометить шаг {step} как выполненный: указанные файлы всё ещё существуют: {files}. Шаг имеет kind=delete — сначала удали их (или поставь status=skipped, если они должны остаться).",
+    "plan.typecheck_failed": `Нельзя отметить шаг {step} выполненным: последняя проверка всё ещё сообщает об ошибке компиляции:
+{error}
+Исправь ошибку и снова отредактируй файл (чистая запись снимает блокировку), либо отметь шаг status=skipped, если он не нужен.`,
     "plan.show_header": "Статус плана:",
     "plan.show_empty": "(в плане нет шагов)",
     "plan.list_header": "Планы:",
@@ -5697,12 +5707,17 @@ class ToolExecutor {
         toolCallId: call.id
       };
     }
-    for (const plugin of this.pluginManager.getAllPlugins()) {
-      if (plugin.onAfterTool) {
-        try {
-          await plugin.onAfterTool(this.ctx, call, result);
-        } catch (e) {
-          this.ctx.logger.warn(`Plugin onAfterTool error: ${e.message}`);
+    if (signal?.aborted) {
+      this.ctx.logger.debug(`Tool ${call.name}: abort, skipping onAfterTool plugins`);
+    } else {
+      const pluginCtx = signal ? { ...this.ctx, signal } : this.ctx;
+      for (const plugin of this.pluginManager.getAllPlugins()) {
+        if (plugin.onAfterTool) {
+          try {
+            await plugin.onAfterTool(pluginCtx, call, result);
+          } catch (e) {
+            this.ctx.logger.warn(`Plugin onAfterTool error: ${e.message}`);
+          }
         }
       }
     }
@@ -6759,7 +6774,7 @@ var init_edit_file = __esm(() => {
       if (!content.includes(oldStr)) {
         return {
           success: false,
-          output: t("file.string_not_found", { str: oldStr })
+          output: t("file.string_not_found", { str: oldStr, path })
         };
       }
       const updated = content.replace(oldStr, newStr);
@@ -11697,6 +11712,8 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           slog.logToolCall(call, iteration);
           const tokensBeforeTool = contextManager.getEstimatedTokens();
           const result = await toolExecutor.execute(call, this.abortController?.signal);
+          if (this.shutdownRequested)
+            break;
           const duration = Date.now() - startTime;
           if (!result.success)
             anyToolFailed = true;
@@ -11775,6 +11792,8 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
             }
           }
         }
+        if (this.shutdownRequested)
+          break;
         if (anyToolFailed) {
           consecutiveToolFailures++;
         } else {
@@ -16808,18 +16827,25 @@ class LintOnWritePlugin {
     const fullPath = resolve18(ctx.baseDir, path);
     if (!existsSync31(fullPath))
       return;
+    const signal = ctx.signal;
+    if (signal?.aborted)
+      return;
     const ext = extname4(fullPath);
-    const syntaxError = await this.checkSyntax(fullPath, ext, ctx.baseDir);
+    const syntaxError = await this.checkSyntax(fullPath, ext, ctx.baseDir, signal);
+    if (signal?.aborted)
+      return;
     if (syntaxError) {
       result.output += `
 
 [Syntax check failed]: ${syntaxError}`;
       return;
     }
-    await this.runProjectLint(ctx, result);
-    await this.runProjectTypeCheck(fullPath, ctx.baseDir, result);
+    await this.runProjectLint(ctx, result, signal);
+    if (signal?.aborted)
+      return;
+    await this.runProjectTypeCheck(fullPath, ctx.baseDir, result, signal);
   }
-  async checkSyntax(filePath, ext, baseDir) {
+  async checkSyntax(filePath, ext, baseDir, signal) {
     if (ext === ".ts" || ext === ".tsx" || ext === ".cts" || ext === ".mts") {
       let content = "";
       try {
@@ -16833,7 +16859,9 @@ class LintOnWritePlugin {
         return cached.error;
       }
       try {
-        await runAsync(`bun build --no-bundle --target=bun "${filePath}"`, baseDir, 1e4);
+        await runAsync(`bun build --no-bundle --target=bun "${filePath}"`, baseDir, 1e4, signal);
+        if (signal?.aborted)
+          return null;
         syntaxCache.set(filePath, { hash, error: null });
         return null;
       } catch (err) {
@@ -16849,7 +16877,7 @@ class LintOnWritePlugin {
     }
     if (ext === ".js" || ext === ".jsx" || ext === ".cjs" || ext === ".mjs") {
       try {
-        await runAsync(`node --check "${filePath}"`, baseDir, 5000);
+        await runAsync(`node --check "${filePath}"`, baseDir, 5000, signal);
         return null;
       } catch (err) {
         const stderr = err.stderr?.toString() || "";
@@ -16860,7 +16888,7 @@ class LintOnWritePlugin {
     }
     return null;
   }
-  async runProjectLint(ctx, result) {
+  async runProjectLint(ctx, result, signal) {
     try {
       const packageJsonPath = join25(ctx.baseDir, "package.json");
       if (!existsSync31(packageJsonPath)) {
@@ -16872,7 +16900,7 @@ class LintOnWritePlugin {
         return;
       }
       ctx.logger.debug(`Running lint: ${lintScript}`);
-      await runAsync(lintScript, ctx.baseDir, 30000);
+      await runAsync(lintScript, ctx.baseDir, 30000, signal);
       ctx.logger.debug("Lint passed");
     } catch (err) {
       const stderr = (err.stderr?.toString?.() || "").trim();
@@ -16886,7 +16914,7 @@ class LintOnWritePlugin {
 [Project lint failed]: ${detail}`;
     }
   }
-  async runProjectTypeCheck(filePath, baseDir, result) {
+  async runProjectTypeCheck(filePath, baseDir, result, signal) {
     const projectRoot = findProjectRoot(filePath, baseDir, ["tsconfig.json", "package.json"]);
     const tsconfigPath = join25(projectRoot, "tsconfig.json");
     if (!existsSync31(tsconfigPath)) {
@@ -16903,7 +16931,7 @@ class LintOnWritePlugin {
       return;
     }
     this._checkTimestamp = now;
-    this._checkPromise = this.runTscCheck(projectRoot);
+    this._checkPromise = this.runTscCheck(projectRoot, signal);
     const error = await this._checkPromise;
     if (error) {
       result.output += `
@@ -16911,9 +16939,9 @@ class LintOnWritePlugin {
 [Project typecheck failed]: ${error}`;
     }
   }
-  async runTscCheck(baseDir) {
+  async runTscCheck(baseDir, signal) {
     try {
-      await runAsync(`npx tsc --noEmit --skipLibCheck`, baseDir, 30000);
+      await runAsync(`npx tsc --noEmit --skipLibCheck`, baseDir, 30000, signal);
       return null;
     } catch (err) {
       if (err.status === 127 || err.message.includes("not found") || err.message.includes("ENOENT")) {
@@ -16929,7 +16957,7 @@ class LintOnWritePlugin {
     }
   }
 }
-function runAsync(command, cwd, timeoutMs) {
+function runAsync(command, cwd, timeoutMs, signal) {
   return new Promise((resolve19, reject) => {
     const child = spawn5(command, {
       cwd,
@@ -16950,15 +16978,27 @@ function runAsync(command, cwd, timeoutMs) {
       child.kill();
       reject(new Error(`Command timed out after ${timeoutMs}ms`));
     }, timeoutMs);
+    const onAbort = () => child.kill();
+    if (signal?.aborted) {
+      child.kill();
+    } else {
+      signal?.addEventListener("abort", onAbort, { once: true });
+    }
     child.on("error", (err) => {
       clearTimeout(timer);
-      reject(err);
+      signal?.removeEventListener("abort", onAbort);
+      if (signal?.aborted) {
+        resolve19({ stdout, stderr });
+      } else {
+        reject(err);
+      }
     });
     child.on("close", (code) => {
       clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
       stdout += decoder.decode();
       stderr += decoder.decode();
-      if (code === 0) {
+      if (signal?.aborted || code === 0) {
         resolve19({ stdout, stderr });
       } else {
         const err = new Error(`Command failed with exit code ${code}`);
@@ -17372,114 +17412,426 @@ var init_plan_coverage = __esm(() => {
   ]);
 });
 
-// src/modules/execution/plan-tool.ts
-function createPlanToolDefinitions(deps) {
-  return [
-    {
-      name: "plan",
-      alwaysOn: true,
-      description: `Create, update, show, abort, list, switch, delete, purge, or re-plan multi-step plans.
-
-Actions:
-- create: Start a new plan. Previous active plan is auto-preserved: incomplete → draft, complete → archive.
-- update: Mark step status (done/failed/skipped), or rebuild plan with new steps.
-- show: Print current plan checklist.
-- abort: Archive the current plan (or the plan given by id) and clear the active slot.
-- list: Show all plans (active, drafts, archived) with progress.
-- switch: Make a different plan active (by plan id).
-- re-plan: Iterative replanning: keep completed steps, replace remaining with new steps.
-- delete: Permanently delete a plan by id (plan delete id=plan_xxx).
-- purge: Delete ALL plans (active, drafts, archived).
+// 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"
+  ]);
+});
 
-Write CONCRETE steps with exact file paths and commands:
-- Specify WHICH files to create with exact paths (e.g. "create src/components/Header.tsx with navigation and logo")
-- Specify WHICH packages to install (e.g. "run npm install react react-dom")
-- 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?)
-- 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",
-              "delete",
-              "purge"
-            ]
-          },
-          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".'
-          },
-          step: { type: "number" },
-          status: { type: "string", enum: ["done", "failed", "skipped"] },
-          note: { type: "string" },
-          id: { type: "string", description: "Plan id (for switch action)" }
-        },
-        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}`;
-          });
-          lines.push("");
-          lines.push(t("plan.list_legend"));
-          return {
-            success: true,
-            output: `${t("plan.list_header")}
-${lines.join(`
-`)}`
-          };
+// src/modules/execution/execution-plugin.ts
+import { platform as platform6 } from "os";
+function normalizeBrokenPath(p) {
+  return p.replace(/\\/g, "/").replace(/^\.\//, "");
+}
+function parseBrokenFile(line) {
+  const trimmed = line.trim();
+  const tsc = /^(.+?)\s*\(\d+,\d+\)\s*:\s*error TS\d+/.exec(trimmed);
+  if (tsc)
+    return normalizeBrokenPath(tsc[1]);
+  const bn = /^(.+?):\d+:\d+\s*:\s*(?:error|SyntaxError)/.exec(trimmed);
+  if (bn)
+    return normalizeBrokenPath(bn[1]);
+  return null;
+}
+function extractBrokenFiles(output) {
+  const out = [];
+  for (const line of output.split(`
+`)) {
+    const marker = /\[(?:Project typecheck failed|Syntax check failed)\]:\s*(.+)$/.exec(line);
+    if (!marker)
+      continue;
+    const errLine = marker[1].trim();
+    out.push({ file: parseBrokenFile(errLine) ?? "", error: errLine.slice(0, 300) });
+  }
+  return out;
+}
+function stepTypecheckGate(failures, stepDescription) {
+  if (failures.size === 0)
+    return null;
+  const projectError = failures.get("");
+  if (projectError)
+    return projectError;
+  const stepTokens = extractFileLikeTokens(stripUrls(stepDescription)).map((p) => normalizeBrokenPath(p).toLowerCase());
+  if (stepTokens.length === 0)
+    return null;
+  for (const [file, err] of failures) {
+    const f = normalizeBrokenPath(file).toLowerCase();
+    if (stepTokens.some((tok) => f.endsWith(tok) || tok.endsWith(f)))
+      return err;
+  }
+  return null;
+}
+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 (action === "switch") {
-          const planId = String(args.id || "");
-          if (!planId) {
-            return { success: false, output: t("plan.switch_no_id") };
+      }
+      if (deps.trackerRef.current?.isComplete()) {
+        deps.stuckDetector.resetStepProgress();
+        deps.state.consecutivePlanWarnings = 0;
+        deps.state.lastStepId = -1;
+        deps.state.stuckNotified = false;
+        deps.state.mutationsWithoutPlan = 0;
+        deps.state.planNudgeSent = 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;
           }
-          const found = deps.store.find(planId);
-          if (!found) {
-            return {
-              success: false,
-              output: t("plan.not_found", { id: planId })
-            };
+          deps.stuckDetector.setCurrentStep(step.id, step.description);
+          deps.stuckDetector.recordIteration(step.id);
+          deps.state.mutationsWithoutPlan = 0;
+          deps.state.planNudgeSent = false;
+        } else {
+          deps.stuckDetector.reset();
+          deps.state.consecutivePlanWarnings = 0;
+          deps.state.lastStepId = -1;
+          deps.state.stuckNotified = false;
+          const mutations = deps.state.mutationsWithoutPlan;
+          if (mutations >= PLAN_NUDGE_THRESHOLD && !deps.state.planNudgeSent && ctx.contextManager) {
+            deps.state.planNudgeSent = true;
+            ctx.contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>${t("exec.plan_nudge", {
+                count: String(mutations)
+              })}</system-summary>`
+            });
           }
-          if (found.status === "active") {
-            return {
-              success: true,
-              output: t("plan.already_active", {
-                id: found.plan.id,
-                title: found.plan.title
-              }),
-              display: deps.trackerRef.current?.toPromptBlock()
-            };
+        }
+      }
+      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 = deps.stuckDetector.getActionableHints();
+            const actionableHintStr = actionableHints.length > 0 ? `
+${t("exec.hints", { hints: actionableHints.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>`
+            });
           }
-          deps.preserveActive();
-          if (found.status === "draft") {
-            deps.store.removeDraft(found.plan.id);
-          } else if (found.status === "archived") {
-            deps.store.removeArchived(found.plan.id);
+          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>`
+            });
           }
-          deps.setPlan(found.plan);
+          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);
+        if (!deps.trackerRef.current && (toolName === "write_file" || toolName === "edit_file" || toolName === "bash" || toolName === "download_file")) {
+          deps.state.mutationsWithoutPlan++;
+        }
+      }
+    },
+    onAfterTool: (ctx, call, result) => {
+      if (call.name === "bash") {
+        deps.stuckDetector.recordBashOutput(String(call.arguments?.command ?? ""), String(result.output ?? ""));
+      }
+      const toolText = String(result.output ?? "");
+      const hasTypeError = /error TS\d+|\[Project typecheck failed\]|\[Syntax check failed\]/.test(toolText);
+      if (hasTypeError) {
+        deps.stuckDetector.recordToolError(call.name, toolText.slice(0, 300));
+      }
+      if (call.name === "write_file" || call.name === "edit_file") {
+        const broken = extractBrokenFiles(toolText);
+        if (broken.length > 0) {
+          for (const b of broken)
+            deps.state.typecheckFailures.set(b.file, b.error);
+        } else if (result.success) {
+          deps.state.typecheckFailures.clear();
+        }
+      }
+      if (!result.success) {
+        if (call.name === "bash" && platform6() === "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>${t("exec.forbidden_cmd", { cmd: forbidden })}</system-summary>`
+              });
+            }
+          }
+        }
+        if (!hasTypeError) {
+          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>${t("exec.hints", { hints: parts.map((h) => `- ${h}`).join(`
+`) })}</system-summary>`
+          });
+        }
+      } 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>${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) {
+            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 if (/node|tsx|ts-node|python|npm\s+(start|test|run)/.test(cmd)) {
+            deps.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) {
+          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)
+              }));
+            }
+          }
+        }
+        deps.advancePlanIfStepComplete(ctx.contextManager, ctx.sessionLog);
+      }
+      deps.maybeSearchError(ctx, call);
+    }
+  };
+}
+var STUCK_RECOVERY_COOLDOWN = 5, MAX_PLAN_WARNINGS_BEFORE_BLOCK = 3, FORCE_SKIP_THRESHOLD = 10, PLAN_NUDGE_THRESHOLD = 2;
+var init_execution_plugin = __esm(() => {
+  init_i18n();
+  init_bash();
+  init_windows_commands();
+  init_js_identifiers();
+});
+
+// src/modules/execution/plan-tool.ts
+function createPlanToolDefinitions(deps) {
+  return [
+    {
+      name: "plan",
+      alwaysOn: true,
+      description: `Create, update, show, abort, list, switch, delete, purge, or re-plan multi-step plans.
+
+Actions:
+- create: Start a new plan. Previous active plan is auto-preserved: incomplete → draft, complete → archive.
+- update: Mark step status (done/failed/skipped), or rebuild plan with new steps.
+- show: Print current plan checklist.
+- abort: Archive the current plan (or the plan given by id) and clear the active slot.
+- list: Show all plans (active, drafts, archived) with progress.
+- switch: Make a different plan active (by plan id).
+- re-plan: Iterative replanning: keep completed steps, replace remaining with new steps.
+- delete: Permanently delete a plan by id (plan delete id=plan_xxx).
+- purge: Delete ALL plans (active, drafts, archived).
+
+Write CONCRETE steps with exact file paths and commands:
+- Specify WHICH files to create with exact paths (e.g. "create src/components/Header.tsx with navigation and logo")
+- Specify WHICH packages to install (e.g. "run npm install react react-dom")
+- 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?)
+- 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",
+              "delete",
+              "purge"
+            ]
+          },
+          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".'
+          },
+          step: { type: "number" },
+          status: { type: "string", enum: ["done", "failed", "skipped"] },
+          note: { type: "string" },
+          id: { type: "string", description: "Plan id (for switch action)" }
+        },
+        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}`;
+          });
+          lines.push("");
+          lines.push(t("plan.list_legend"));
+          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 (found.status === "active") {
+            return {
+              success: true,
+              output: t("plan.already_active", {
+                id: found.plan.id,
+                title: found.plan.title
+              }),
+              display: deps.trackerRef.current?.toPromptBlock()
+            };
+          }
+          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 = deps.trackerRef.current?.toPromptBlock();
           return {
             success: true,
@@ -17678,8 +18030,20 @@ ${progress2}`,
               }
             }
           }
-          tracker.updateStepStatus(stepId, status);
-          if (args.note)
+          if (status === "done") {
+            const blocked = stepTypecheckGate(deps.typecheckFailures, target.description);
+            if (blocked) {
+              return {
+                success: false,
+                output: t("plan.typecheck_failed", {
+                  step: String(stepId),
+                  error: blocked
+                })
+              };
+            }
+          }
+          tracker.updateStepStatus(stepId, status);
+          if (args.note)
             tracker.addNote(Number(args.step), String(args.note));
           tracker.syncCurrentStep();
           deps.store.saveActive(tracker.getPlan());
@@ -17778,430 +18142,170 @@ ${progress}${vacuousNote}`,
           if (!deleted) {
             return {
               success: false,
-              output: t("plan.not_found", { id: planId })
-            };
-          }
-          if (deleted === "active") {
-            deps.trackerRef.current = null;
-            deps.clearCompleted();
-          }
-          return {
-            success: true,
-            output: t("plan.deleted", { id: planId })
-          };
-        }
-        if (action === "purge") {
-          const count = deps.store.purgeAll();
-          deps.trackerRef.current = null;
-          deps.clearCompleted();
-          return {
-            success: true,
-            output: t("plan.purged", { count: String(count) })
-          };
-        }
-        if (!deps.trackerRef.current) {
-          return { success: false, output: t("plan.no_active") };
-        }
-        return {
-          success: false,
-          output: t("plan.unknown_action", { action })
-        };
-      }
-    },
-    {
-      name: "todo",
-      alwaysOn: true,
-      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"]
-      },
-      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 });
-          }
-          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")
-            };
-          }
-          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;
-          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}
-${lines.join(`
-`)}`
-          };
-        }
-        return {
-          success: false,
-          output: t("todo.unknown_action", { action })
-        };
-      }
-    },
-    {
-      name: "verify",
-      alwaysOn: true,
-      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);
-        if (result.noFiles) {
-          return {
-            success: true,
-            output: t("verify.no_files", { step: String(step.id) })
-          };
-        }
-        return {
-          success: result.passed,
-          output: result.passed ? t("verify.passed") : t("verify.failed", {
-            details: result.failed.map((f) => f.message).join("; ")
-          })
-        };
-      }
-    }
-  ];
-}
-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 platform6 } 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;
-        deps.state.mutationsWithoutPlan = 0;
-        deps.state.planNudgeSent = 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;
-          }
-          deps.stuckDetector.setCurrentStep(step.id, step.description);
-          deps.stuckDetector.recordIteration(step.id);
-          deps.state.mutationsWithoutPlan = 0;
-          deps.state.planNudgeSent = false;
-        } else {
-          deps.stuckDetector.reset();
-          deps.state.consecutivePlanWarnings = 0;
-          deps.state.lastStepId = -1;
-          deps.state.stuckNotified = false;
-          const mutations = deps.state.mutationsWithoutPlan;
-          if (mutations >= PLAN_NUDGE_THRESHOLD && !deps.state.planNudgeSent && ctx.contextManager) {
-            deps.state.planNudgeSent = true;
-            ctx.contextManager.addMessage({
-              role: "user",
-              content: `<system-summary>${t("exec.plan_nudge", {
-                count: String(mutations)
-              })}</system-summary>`
-            });
-          }
-        }
-      }
-      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 = deps.stuckDetector.getActionableHints();
-            const actionableHintStr = actionableHints.length > 0 ? `
-${t("exec.hints", { hints: actionableHints.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>`
-            });
-          }
-          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>`
-            });
+              output: t("plan.not_found", { id: planId })
+            };
+          }
+          if (deleted === "active") {
+            deps.trackerRef.current = null;
+            deps.clearCompleted();
           }
+          return {
+            success: true,
+            output: t("plan.deleted", { id: planId })
+          };
         }
-      }
-    },
-    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
-          });
+        if (action === "purge") {
+          const count = deps.store.purgeAll();
+          deps.trackerRef.current = null;
+          deps.clearCompleted();
+          return {
+            success: true,
+            output: t("plan.purged", { count: String(count) })
+          };
         }
-      } 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);
-        if (!deps.trackerRef.current && (toolName === "write_file" || toolName === "edit_file" || toolName === "bash" || toolName === "download_file")) {
-          deps.state.mutationsWithoutPlan++;
+        if (!deps.trackerRef.current) {
+          return { success: false, output: t("plan.no_active") };
         }
+        return {
+          success: false,
+          output: t("plan.unknown_action", { action })
+        };
       }
     },
-    onAfterTool: (ctx, call, result) => {
-      if (call.name === "bash") {
-        deps.stuckDetector.recordBashOutput(String(call.arguments?.command ?? ""), String(result.output ?? ""));
-      }
-      const toolText = String(result.output ?? "");
-      const hasTypeError = /error TS\d+|\[Project typecheck failed\]|\[Syntax check failed\]/.test(toolText);
-      if (hasTypeError) {
-        deps.stuckDetector.recordToolError(call.name, toolText.slice(0, 300));
-      }
-      if (!result.success) {
-        if (call.name === "bash" && platform6() === "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>${t("exec.forbidden_cmd", { cmd: forbidden })}</system-summary>`
-              });
-            }
-          }
+    {
+      name: "todo",
+      alwaysOn: true,
+      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"]
+      },
+      handler: async (_ctx, args) => {
+        if (!deps.trackerRef.current) {
+          return { success: false, output: t("plan.no_active") };
         }
-        if (!hasTypeError) {
-          deps.stuckDetector.recordToolError(call.name, result.output);
+        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") };
         }
-        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.`);
+        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 });
           }
-          deps.pendingMessages.push({
-            role: "user",
-            content: `<system-summary>${t("exec.hints", { hints: parts.map((h) => `- ${h}`).join(`
-`) })}</system-summary>`
-          });
+          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
+          };
         }
-      } 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>${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) {
-            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 if (/node|tsx|ts-node|python|npm\s+(start|test|run)/.test(cmd)) {
-            deps.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 (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 (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)
-              }));
+          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;
+          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 };
         }
-        deps.advancePlanIfStepComplete(ctx.contextManager, ctx.sessionLog);
+        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",
+      alwaysOn: true,
+      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);
+        if (result.noFiles) {
+          return {
+            success: true,
+            output: t("verify.no_files", { step: String(step.id) })
+          };
+        }
+        return {
+          success: result.passed,
+          output: result.passed ? t("verify.passed") : t("verify.failed", {
+            details: result.failed.map((f) => f.message).join("; ")
+          })
+        };
       }
-      deps.maybeSearchError(ctx, call);
     }
-  };
+  ];
 }
-var STUCK_RECOVERY_COOLDOWN = 5, MAX_PLAN_WARNINGS_BEFORE_BLOCK = 3, FORCE_SKIP_THRESHOLD = 10, PLAN_NUDGE_THRESHOLD = 2;
-var init_execution_plugin = __esm(() => {
+var init_plan_tool = __esm(() => {
   init_i18n();
-  init_bash();
-  init_windows_commands();
+  init_plan_coverage();
+  init_execution_plugin();
 });
 
 // src/modules/execution/module.ts
@@ -18233,7 +18337,8 @@ class ExecutionModule {
     stuckNotified: false,
     depsGateHints: new Map,
     mutationsWithoutPlan: 0,
-    planNudgeSent: false
+    planNudgeSent: false,
+    typecheckFailures: new Map
   };
   trackerRef = (() => {
     const self = this;
@@ -18416,6 +18521,7 @@ class ExecutionModule {
       stillExistingDeliverables: (s) => this.stillExistingDeliverables(s),
       parseKinds: (a, st) => this.parseKinds(a, st),
       getTaskText: (c) => this.getTaskText(c),
+      typecheckFailures: this.state.typecheckFailures,
       baseDir: this.baseDir
     });
   }
@@ -21162,8 +21268,6 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     exitOnComplete,
     contextManager,
     activeToolTags,
-    sessionId: sessionManager.getActiveMeta()?.id,
-    sessionContext: sessionManager.getSessionContext() ?? undefined,
     recursionDepth: 0,
     fileOperationsCount: 0,
     sessionHistory: {
@@ -21191,6 +21295,14 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
       }
     }
   };
+  Object.defineProperty(toolCtx, "sessionId", {
+    get: () => sessionManager.getActiveMeta()?.id,
+    configurable: true
+  });
+  Object.defineProperty(toolCtx, "sessionContext", {
+    get: () => sessionManager.getSessionContext() ?? undefined,
+    configurable: true
+  });
   const toolExecutor = new ToolExecutor(toolRegistry, toolCtx, pluginManager);
   toolCtx.llmProvider = llmProvider;
   toolCtx.toolExecutor = toolExecutor;
@@ -21363,6 +21475,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     sessionManager,
     skillsModule,
     pluginManager,
+    toolCtx,
     configDir: dir,
     baseDir,
     noAgentsMd: skipAgentsMd