micro-models-agent 0.19.2 → 0.20.1

package/dist/main.js

@@ -2548,14 +2548,19 @@ Available commands:`,
 
 Use this knowledge to answer the user's question.`,
     "exec.stuck": "Stuck on step {stepId}. Current: {description}. No progress for {iterations} iterations.",
-    "exec.stuck_recovery": "[Stuck detected: {iterations} iterations without progress. Stop repeating the same approach. Try a fundamentally different strategy: use a different tool (e.g., 'browser' tool for JavaScript-heavy websites instead of 'web_browse'), break the task into smaller parts, or explain to the user what went wrong and ask for guidance.]",
+    "exec.stuck_recovery": '[STUCK: {iterations} iterations on step {stepId} — "{description}". You MUST change approach NOW. Concrete actions: (1) Check what this step needs — are dependencies installed? (2) Use plan show to see the plan. (3) If commands fail — create files directly via write_file. (4) After completing the step, call plan update step={stepId} status=done. Do NOT work on other steps until this one is finished.]',
     "exec.tool_errors": "Tool {tool} failed {count} times. Suggest alternative approach.",
-    "exec.tool_errors_recovery": "[Tool {tool} failed {count} times. Stop using this tool and try a different approach or explain the issue to the user.]",
-    "exec.repetitive_tool": "[You called {tool} {count} times in a row with the same arguments and result. Stop repeating — try a different approach: create files, change arguments, or explain the problem to the user.]",
-    "exec.consecutive_failures_recovery": "[{count} consecutive tool calls failed. You are going in circles — stop trying commands that keep failing. Explain the problem to the user, or try a completely different approach: write files directly, use a different tool, or break the task into smaller parts.]",
-    "exec.task_reminder": "[Remember the original task: {task}. Do not switch to unrelated tasks. If you cannot complete the original task, explain why to the user and ask for guidance.]",
-    "exec.plan_warning": '[⚠ Warning: you are working on step {step} - "{description}". Your {tool} call touches files not mentioned in the current step. Focus on the current step or update the plan via plan update.]',
-    "exec.off_track": `[⚠ Outside plan: step {stepId} is "{description}", but you're using {tool} on a different path. Explain or return.]`,
+    "exec.tool_errors_recovery": "[Tool {tool} failed {count} consecutive times. DO NOT use it again. Try a different approach: (1) create files directly via write_file, (2) use a different tool for the same task, (3) if nothing works — explain the problem and skip this step via plan update step=N status=skipped with a note why.]",
+    "exec.repetitive_tool": "[REPETITION: you called {tool} {count} times with identical arguments and result. This is pointless. IMMEDIATELY change approach: create files directly, change arguments, or if it's a process — check its status via process_log.]",
+    "exec.consecutive_failures_recovery": "[{count} CONSECUTIVE TOOLS FAILED. Stop running commands. Here is what to do: (1) Create files directly via write_file instead of terminal commands. (2) Check if dependencies are installed (npm install). (3) Use list_dir to see what's in the project. (4) Do not attempt build/tests until all files are created.]",
+    "exec.task_reminder": "[ORIGINAL TASK: {task}. You MUST work on this task only. Do not create files for other tasks. If you cannot complete it — explain why and request help.]",
+    "exec.plan_warning": '[⚠ PLAN: you are on step {step} — "{description}", but calling {tool} with files outside this step. This is FORBIDDEN — work STRICTLY on the current step. First complete it and call plan update step={step} status=done, only then move to the next.]',
+    "exec.plan_blocked": "[⛔ BLOCKED: {max} consecutive calls outside the current step. You are violating the plan. Return to step {step} and complete it. Other steps are blocked until this one is done.]",
+    "exec.off_track": `[⚠ OFF PLAN: step {stepId} is "{description}", but you're using {tool} on a different path. Return to the current step immediately.]`,
+    "exec.step_gate_deps": '[⚠ Step {step} "{description}": dependencies are not installed. First run the install command (npm install, pip install, etc.). Verify the lock file or dependency directory exists.]',
+    "exec.step_gate_empty": "[⚠ Step {step}: files exist but appear empty: {files}. Add real code to these files before advancing to the next step.]",
+    "exec.step_gate_ok": '[✓] Step {step} completed and verified. MOVING to step {nextStep}: "{nextDesc}". Work ONLY on this step.',
+    "exec.step_gate_last": "[✓] Step {step} completed — that was the final step. Verify everything together and provide the final answer.]",
     "exec.audit_pass": "[✓] Task complete: {done}/{total} steps done, {files} files verified",
     "exec.audit_fail": "[✗] Task incomplete: {done}/{total} steps done, {files} files missing",
     "exec.audit_fail_typecheck": "[✗] Task incomplete: {done}/{total} steps done, {missing} files missing, typecheck error: {typeError}",
@@ -3040,14 +3045,19 @@ var init_ru = __esm(() => {
 
 Используйте эти знания для ответа на вопрос пользователя.`,
     "exec.stuck": "Застряли на шаге {stepId}. Текущий: {description}. Нет прогресса {iterations} итераций.",
-    "exec.stuck_recovery": "[Обнаружено застревание: {iterations} итераций без прогресса. Прекратите повторять тот же подход. Попробуйте принципиально другую стратегию: используйте другой инструмент (например, 'browser' для сайтов с JavaScript вместо 'web_browse'), разбейте задачу на подзадачи или объясните пользователю что пошло не так и спросите совета.]",
+    "exec.stuck_recovery": '[ЗАСТРЕВАНИЕ: {iterations} итераций на шаге {stepId} — "{description}". ВЫ ДОЛЖНЫ сменить подход прямо сейчас. Конкретные действия: (1) Проверьте что нужно для этого шага — установлены ли зависимости? (2) Используйте plan show чтобы увидеть план. (3) Если команды не работают — создайте файлы напрямую через write_file. (4) После завершения шага вызовите plan update step={stepId} status=done. НЕ переходите к другим шагам пока этот не завершён.]',
     "exec.tool_errors": "Инструмент {tool} сбоил {count} раз. Предложите другой подход.",
-    "exec.tool_errors_recovery": "[Инструмент {tool} сбоил {count} раз. Прекратите использовать этот инструмент и попробуйте другой подход или объясните проблему пользователю.]",
-    "exec.repetitive_tool": "[Вы вызвали {tool} {count} раз подряд с одинаковыми аргументами и результатом. Прекратите повторять — попробуйте другой подход: создайте файлы, измените аргументы или объясните пользователю проблему.]",
-    "exec.consecutive_failures_recovery": "[{count} последовательных вызовов тулов завершились ошибкой. Вы ходите по кругу — прекратите пытаться выполнить команды, которые постоянно падают. Объясните проблему пользователю или попробуйте совершенно другой подход: напишите файлы напрямую, используйте другой инструмент или разбейте задачу на части.]",
-    "exec.task_reminder": "[Напоминание о задаче: {task}. Не переключайтесь на посторонние задачи. Если не можете выполнить задачу — объясните почему и спросите совета.]",
-    "exec.plan_warning": '[⚠ Внимание: вы работаете над шагом {step} — "{description}". Ваш вызов {tool} касается файлов, не упомянутых в текущем шаге. Сосредоточьтесь на текущем шаге или обновите план через plan update.]',
-    "exec.off_track": '[⚠ Вне плана: шаг {stepId} — "{description}", но вы используете {tool} для другого пути. Объясните или вернитесь.]',
+    "exec.tool_errors_recovery": "[Инструмент {tool} сбоил {count} раз подряд. НЕ ИСПОЛЬЗУЙТЕ его снова. Используйте другой подход: (1) создайте нужные файлы напрямую через write_file, (2) используйте другой инструмент для той же задачи, (3) если ничего не работает — объясните проблему и переходите к следующему шагу плана через plan update step=N status=skipped с пометкой почему.]",
+    "exec.repetitive_tool": "[ПОВТОРЕНИЕ: вы вызвали {tool} {count} раз с одинаковыми аргументами и результатом. Это бессмысленно. НЕМЕДЛЕННО смените подход: создайте файлы напрямую, измените аргументы или, если это процесс — проверьте его статус через process_log.]",
+    "exec.consecutive_failures_recovery": "[{count} ИНСТРУМЕНТОВ ПОДРЯД УПАЛИ. Хватит пытаться запускать команды. Вот что делать: (1) Создавайте файлы напрямую через write_file вместо команд терминала. (2) Проверьте, установлены ли зависимости (npm install). (3) Используйте list_dir чтобы увидеть что есть в проекте. (4) Не пытайтесь запустить сборку/тесты пока не созданы все файлы.]",
+    "exec.task_reminder": "[ИСХОДНАЯ ЗАДАЧА: {task}. ВЫ ДОЛЖНЫ работать только над этой задачей. Не создавайте файлы для других задач. Если не можете выполнить — объясните почему и запросите помощь.]",
+    "exec.plan_warning": '[⚠ ПЛАН: вы на шаге {step} — "{description}", но вызываете {tool} для файлов вне этого шага. Это ЗАПРЕЩЕНО — работайте СТРОГО над текущим шагом. Сначала завершите его и вызовите plan update step={step} status=done, только потом переходите к следующему.]',
+    "exec.plan_blocked": "[⛔ ЗАБЛОКИРОВАНО: {max} вызова подряд вне текущего шага. Вы нарушаете план. Вернитесь к шагу {step} и завершите его. Другие шаги будут заблокированы пока текущий не выполнен.]",
+    "exec.off_track": '[⚠ ВНЕ ПЛАНА: шаг {stepId} — "{description}", но вы используете {tool} для другого пути. Вернитесь к текущему шагу немедленно.]',
+    "exec.step_gate_deps": '[⚠ Шаг {step} "{description}": зависимости не установлены. Сначала выполните команду установки (npm install, pip install и т.д.). Проверьте что lock-файл или директория зависимостей существует.]',
+    "exec.step_gate_empty": "[⚠ Шаг {step}: файлы существуют, но выглядят пустыми: {files}. Добавьте реальный код в эти файлы перед тем как переходить к следующему шагу.]",
+    "exec.step_gate_ok": '[✓] Шаг {step} завершён и проверен. ПЕРЕХОДИМ к шагу {nextStep}: "{nextDesc}". Работайте ТОЛЬКО над этим шагом.',
+    "exec.step_gate_last": "[✓] Шаг {step} завершён — это был последний шаг. Проверьте всё вместе и предоставьте финальный ответ.]",
     "exec.audit_pass": "[✓] Задача выполнена: {done}/{total} шагов, {files} файлов проверено",
     "exec.audit_fail": "[✗] Задача не выполнена: {done}/{total} шагов, {files} файлов отсутствует",
     "exec.audit_fail_typecheck": "[✗] Задача не выполнена: {done}/{total} шагов, {missing} файлов отсутствует, ошибка typecheck: {typeError}",
@@ -12823,11 +12833,18 @@ class StuckDetector {
     if (!this.hasRepetitiveToolCalls())
       return "";
     const last = this.recentToolCalls[this.recentToolCalls.length - 1];
-    return t("exec.repetitive_tool", { tool: last.name, count: this.repetitionThreshold });
+    return t("exec.repetitive_tool", {
+      tool: last.name,
+      count: this.repetitionThreshold
+    });
   }
   getStuckReason() {
     if (this.isStuck()) {
-      return t("exec.stuck", { stepId: String(this.currentStepId), description: this.currentStepDescription, iterations: this.iterationsOnCurrentStep });
+      return t("exec.stuck", {
+        stepId: String(this.currentStepId ?? "?"),
+        description: this.currentStepDescription,
+        iterations: this.iterationsOnCurrentStep
+      });
     }
     const errorTool = Array.from(this.toolErrors.entries()).find(([_, c]) => c >= this.errorThreshold);
     if (errorTool) {
@@ -12837,14 +12854,23 @@ class StuckDetector {
   }
   getRecoveryMessage() {
     if (this.isStuck()) {
-      return t("exec.stuck_recovery", { iterations: this.iterationsOnCurrentStep });
+      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) {
-      return t("exec.tool_errors_recovery", { tool: errorTool[0], count: errorTool[1] });
+      return t("exec.tool_errors_recovery", {
+        tool: errorTool[0],
+        count: errorTool[1]
+      });
     }
     if (this.hasConsecutiveFailures()) {
-      return t("exec.consecutive_failures_recovery", { count: this.consecutiveFailures });
+      return t("exec.consecutive_failures_recovery", {
+        count: this.consecutiveFailures
+      });
     }
     if (this.hasRepetitiveToolCalls()) {
       return this.getRepetitiveToolMessage();
@@ -12859,7 +12885,11 @@ class StuckDetector {
     const pathInCall = (toolArgStr.match(/\b[\w./-]+\.[a-z]+/gi) || []).map((p) => p.toLowerCase());
     const overlaps = pathInCall.some((p) => pathInStep.some((s) => p.includes(s) || s.includes(p)));
     if (!overlaps && pathInStep.length > 0 && pathInCall.length > 0) {
-      return t("exec.off_track", { stepId: String(this.currentStepId), description: this.currentStepDescription, tool: toolName });
+      return t("exec.off_track", {
+        stepId: String(this.currentStepId),
+        description: this.currentStepDescription,
+        tool: toolName
+      });
     }
     return null;
   }
@@ -12948,8 +12978,53 @@ var init_auditor = __esm(() => {
   init_i18n();
 });
 
+// src/modules/execution/plan-persister.ts
+import { readFileSync as readFileSync14, writeFileSync as writeFileSync9, mkdirSync as mkdirSync11, existsSync as existsSync25 } from "fs";
+import { join as join18 } from "path";
+
+class PlanPersister {
+  filePath;
+  constructor(baseDir) {
+    const mmaDir = join18(baseDir, ".mma");
+    if (!existsSync25(mmaDir)) {
+      mkdirSync11(mmaDir, { recursive: true });
+    }
+    this.filePath = join18(mmaDir, "plan.json");
+  }
+  save(plan) {
+    const file = {
+      title: plan.title,
+      steps: plan.steps,
+      createdAt: plan.createdAt,
+      updatedAt: new Date().toISOString()
+    };
+    writeFileSync9(this.filePath, JSON.stringify(file, null, 2), "utf-8");
+  }
+  load() {
+    if (!existsSync25(this.filePath))
+      return null;
+    try {
+      const raw = readFileSync14(this.filePath, "utf-8");
+      const file = JSON.parse(raw);
+      return {
+        title: file.title,
+        steps: file.steps,
+        createdAt: file.createdAt
+      };
+    } catch {
+      return null;
+    }
+  }
+  clear() {
+    if (existsSync25(this.filePath)) {
+      writeFileSync9(this.filePath, "", "utf-8");
+    }
+  }
+}
+var init_plan_persister = () => {};
+
 // src/modules/execution/module.ts
-import { existsSync as existsSync25 } from "fs";
+import { existsSync as existsSync26, readFileSync as readFileSync15 } from "fs";
 import { resolve as resolve14 } from "path";
 
 class ExecutionModule {
@@ -12958,16 +13033,32 @@ class ExecutionModule {
   verifier;
   stuckDetector;
   auditor;
+  persister;
   baseDir;
   lastRecoveryIteration = -STUCK_RECOVERY_COOLDOWN;
+  consecutivePlanWarnings = 0;
+  lastStepId = -1;
   constructor(baseDir, stuckThreshold = 8) {
     this.baseDir = baseDir;
     this.verifier = new StepVerifier(baseDir);
     this.stuckDetector = new StuckDetector(stuckThreshold);
     this.auditor = new Auditor(baseDir);
+    this.persister = new PlanPersister(baseDir);
   }
   setPlan(plan) {
     this.tracker = new PlanTracker(plan);
+    this.persister.save(plan);
+  }
+  restorePlan() {
+    const plan = this.persister.load();
+    if (!plan)
+      return false;
+    this.tracker = new PlanTracker(plan);
+    while (this.tracker.getCurrentStep()?.status === "done" || this.tracker.getCurrentStep()?.status === "skipped") {
+      if (!this.tracker.advance())
+        break;
+    }
+    return true;
   }
   getTracker() {
     return this.tracker;
@@ -13055,6 +13146,7 @@ ${display}`,
             this.tracker.updateStepStatus(Number(args.step), args.status || "done");
             if (args.note)
               this.tracker.addNote(Number(args.step), String(args.note));
+            this.persister.save(this.tracker.getPlan());
             const progress = this.tracker.getProgressString();
             const display = this.tracker.toPromptBlock();
             return {
@@ -13066,6 +13158,7 @@ ${progress}`,
           }
           if (action === "abort") {
             this.tracker = null;
+            this.persister.clear();
             return { success: true, output: t("plan.aborted") };
           }
           if (!this.tracker) {
@@ -13160,10 +13253,16 @@ Sub-tasks: ${note}`
       onBeforeThink: (ctx) => {
         const step = this.tracker?.getCurrentStep();
         if (this.tracker && step) {
+          if (step.id !== this.lastStepId) {
+            this.consecutivePlanWarnings = 0;
+            this.lastStepId = step.id;
+          }
           this.stuckDetector.setCurrentStep(step.id, step.description);
           this.stuckDetector.recordIteration(step.id);
         } else {
           this.stuckDetector.reset();
+          this.consecutivePlanWarnings = 0;
+          this.lastStepId = -1;
         }
         const stuckReason = this.stuckDetector.getStuckReason();
         if (stuckReason) {
@@ -13190,6 +13289,16 @@ Sub-tasks: ${note}`
             role: "user",
             content: `<system-summary>${warning}</system-summary>`
           });
+          this.consecutivePlanWarnings++;
+          if (this.consecutivePlanWarnings >= MAX_PLAN_WARNINGS_BEFORE_BLOCK) {
+            ctx.contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>${t("exec.plan_blocked", { step: String(this.tracker?.getCurrentStep()?.id ?? "?"), max: MAX_PLAN_WARNINGS_BEFORE_BLOCK })}</system-summary>`
+            });
+            return false;
+          }
+        } else {
+          this.consecutivePlanWarnings = 0;
         }
         return true;
       },
@@ -13207,7 +13316,7 @@ Sub-tasks: ${note}`
           this.stuckDetector.recordToolSuccess();
         }
         if (this.tracker && result.success && (call.name === "write_file" || call.name === "edit_file")) {
-          this.advancePlanIfStepComplete();
+          this.advancePlanIfStepComplete(ctx.contextManager);
         }
       }
     };
@@ -13249,32 +13358,90 @@ Sub-tasks: ${note}`
       tool: call.name
     });
   }
-  advancePlanIfStepComplete() {
+  advancePlanIfStepComplete(contextManager) {
     const step = this.tracker?.getCurrentStep();
     if (!step)
       return;
+    const stepText = step.description.toLowerCase();
     const stepPaths = step.description.match(/\b[\w./\\-]+\.[a-z]+/gi) || [];
+    const isDepsStep = stepText.includes("install") || stepText.includes("зависим") || stepText.includes("init") || stepText.includes("инициализац");
+    if (isDepsStep) {
+      const lockFiles = [
+        "package-lock.json",
+        "bun.lockb",
+        "yarn.lock",
+        "pnpm-lock.yaml",
+        "node_modules",
+        "go.sum",
+        "Cargo.lock",
+        "Pipfile.lock",
+        "poetry.lock",
+        "requirements.txt"
+      ];
+      const hasLockFile = lockFiles.some((f) => existsSync26(resolve14(this.baseDir, f)));
+      if (!hasLockFile) {
+        if (contextManager) {
+          contextManager.addMessage({
+            role: "user",
+            content: `<system-summary>${t("exec.step_gate_deps", { step: String(step.id), description: step.description })}</system-summary>`
+          });
+        }
+        return;
+      }
+    }
     if (stepPaths.length === 0)
       return;
-    const allExist = stepPaths.every((p) => existsSync25(resolve14(this.baseDir, p)));
-    if (allExist) {
-      this.tracker?.updateStepStatus(step.id, "done");
-      this.tracker?.advance();
+    const allExist = stepPaths.every((p) => existsSync26(resolve14(this.baseDir, p)));
+    if (!allExist)
+      return;
+    const emptyFiles = [];
+    for (const p of stepPaths) {
+      try {
+        const content = readFileSync15(resolve14(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;
+    if (this.tracker) {
+      this.persister.save(this.tracker.getPlan());
+    }
+    if (contextManager) {
+      const nextStep = hadNext ? this.tracker?.getCurrentStep() : null;
+      const nextMsg = nextStep ? t("exec.step_gate_ok", {
+        step: String(step.id),
+        nextStep: String(nextStep.id),
+        nextDesc: nextStep.description
+      }) : t("exec.step_gate_last", { step: String(step.id) });
+      contextManager.addMessage({
+        role: "user",
+        content: `<system-summary>${nextMsg}</system-summary>`
+      });
     }
   }
 }
-var STUCK_RECOVERY_COOLDOWN = 5;
+var STUCK_RECOVERY_COOLDOWN = 5, MAX_PLAN_WARNINGS_BEFORE_BLOCK = 3;
 var init_module = __esm(() => {
   init_i18n();
   init_tracker();
   init_verifier();
   init_stuck_detector();
   init_auditor();
+  init_plan_persister();
 });
 
 // src/modules/security/session-encryption.ts
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync9, existsSync as existsSync26, readdirSync as readdirSync6, unlinkSync as unlinkSync3 } from "fs";
-import { join as join18 } from "path";
+import { readFileSync as readFileSync16, writeFileSync as writeFileSync10, existsSync as existsSync27, readdirSync as readdirSync6, unlinkSync as unlinkSync3 } from "fs";
+import { join as join19 } from "path";
 import { homedir as homedir8 } from "os";
 
 class SessionFileEncryptor {
@@ -13283,7 +13450,7 @@ class SessionFileEncryptor {
   constructor(config) {
     this.config = { ...DEFAULT_SESSION_ENCRYPTION, ...config };
     this.encryptor = new ConfigEncryptor({
-      keyPath: config?.keyPath || join18(homedir8(), ".mma", ".session-encryption-key")
+      keyPath: config?.keyPath || join19(homedir8(), ".mma", ".session-encryption-key")
     });
   }
   isEnabled() {
@@ -13323,23 +13490,23 @@ class SessionFileEncryptor {
     return lines.map((line) => this.decryptFileContent(line));
   }
   readSessionFile(filePath) {
-    const content = readFileSync14(filePath, "utf8");
+    const content = readFileSync16(filePath, "utf8");
     return this.decryptFileContent(content);
   }
   writeSessionFile(filePath, content) {
     const encrypted = this.encryptFileContent(content);
-    writeFileSync9(filePath, encrypted, "utf8");
+    writeFileSync10(filePath, encrypted, "utf8");
   }
   readSessionJSON(filePath) {
-    const content = readFileSync14(filePath, "utf8");
+    const content = readFileSync16(filePath, "utf8");
     return this.decryptJSON(content);
   }
   writeSessionJSON(filePath, obj) {
     const content = this.encryptJSON(obj);
-    writeFileSync9(filePath, content, "utf8");
+    writeFileSync10(filePath, content, "utf8");
   }
   readSessionJSONL(filePath) {
-    const content = readFileSync14(filePath, "utf8");
+    const content = readFileSync16(filePath, "utf8");
     const lines = content.split(`
 `).filter((line) => line.trim());
     const decryptedLines = this.decryptJSONL(lines);
@@ -13347,7 +13514,7 @@ class SessionFileEncryptor {
   }
   appendToSessionJSONL(filePath, obj) {
     const encryptedLine = this.encryptFileContent(JSON.stringify(obj));
-    writeFileSync9(filePath, encryptedLine + `
+    writeFileSync10(filePath, encryptedLine + `
 `, { flag: "a", encoding: "utf8" });
   }
   encryptSessionDirectory(sessionDir) {
@@ -13355,12 +13522,12 @@ class SessionFileEncryptor {
       return;
     const files = readdirSync6(sessionDir);
     for (const file of files) {
-      const filePath = join18(sessionDir, file);
-      if (existsSync26(filePath) && !file.endsWith(".enc")) {
+      const filePath = join19(sessionDir, file);
+      if (existsSync27(filePath) && !file.endsWith(".enc")) {
         try {
-          const content = readFileSync14(filePath, "utf8");
+          const content = readFileSync16(filePath, "utf8");
           const encrypted = this.encryptFileContent(content);
-          writeFileSync9(filePath + ".enc", encrypted, "utf8");
+          writeFileSync10(filePath + ".enc", encrypted, "utf8");
           unlinkSync3(filePath);
         } catch {}
       }
@@ -13372,12 +13539,12 @@ class SessionFileEncryptor {
     const files = readdirSync6(sessionDir);
     for (const file of files) {
       if (file.endsWith(".enc")) {
-        const encFilePath = join18(sessionDir, file);
+        const encFilePath = join19(sessionDir, file);
         const decFilePath = encFilePath.slice(0, -4);
         try {
-          const content = readFileSync14(encFilePath, "utf8");
+          const content = readFileSync16(encFilePath, "utf8");
           const decrypted = this.decryptFileContent(content);
-          writeFileSync9(decFilePath, decrypted, "utf8");
+          writeFileSync10(decFilePath, decrypted, "utf8");
           unlinkSync3(encFilePath);
         } catch {}
       }
@@ -13397,15 +13564,15 @@ var init_session_encryption = __esm(() => {
 
 // src/modules/session/store.ts
 import {
-  existsSync as existsSync27,
-  mkdirSync as mkdirSync11,
+  existsSync as existsSync28,
+  mkdirSync as mkdirSync12,
   readdirSync as readdirSync7,
-  readFileSync as readFileSync15,
+  readFileSync as readFileSync17,
   rmSync,
-  writeFileSync as writeFileSync10,
+  writeFileSync as writeFileSync11,
   appendFileSync as appendFileSync5
 } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 import { gzipSync } from "zlib";
 
 class SessionStore {
@@ -13428,39 +13595,39 @@ class SessionStore {
     return this.encryptor?.isEnabled() ?? false;
   }
   init() {
-    mkdirSync11(this.baseDir, { recursive: true });
+    mkdirSync12(this.baseDir, { recursive: true });
   }
   sessionDir(id) {
-    return join19(this.baseDir, id);
+    return join20(this.baseDir, id);
   }
   metaPath(id) {
-    return join19(this.sessionDir(id), "meta.json");
+    return join20(this.sessionDir(id), "meta.json");
   }
   historyPath(id) {
-    return join19(this.sessionDir(id), "history.jsonl");
+    return join20(this.sessionDir(id), "history.jsonl");
   }
   sessionLogPath(id) {
-    return join19(this.sessionDir(id), "session.jsonl");
+    return join20(this.sessionDir(id), "session.jsonl");
   }
   sessionExists(id) {
-    return existsSync27(this.metaPath(id));
+    return existsSync28(this.metaPath(id));
   }
   saveMeta(id, meta) {
     const dir = this.sessionDir(id);
-    mkdirSync11(dir, { recursive: true });
+    mkdirSync12(dir, { recursive: true });
     const content = JSON.stringify(meta, null, 2);
     if (this.encryptor) {
-      writeFileSync10(this.metaPath(id), this.encryptor.encryptFileContent(content), "utf-8");
+      writeFileSync11(this.metaPath(id), this.encryptor.encryptFileContent(content), "utf-8");
     } else {
-      writeFileSync10(this.metaPath(id), content, "utf-8");
+      writeFileSync11(this.metaPath(id), content, "utf-8");
     }
   }
   loadMeta(id) {
     const path = this.metaPath(id);
-    if (!existsSync27(path))
+    if (!existsSync28(path))
       return null;
     try {
-      const raw = readFileSync15(path, "utf-8");
+      const raw = readFileSync17(path, "utf-8");
       const content = this.encryptor ? this.encryptor.decryptFileContent(raw) : raw;
       return JSON.parse(content);
     } catch {
@@ -13469,7 +13636,7 @@ class SessionStore {
   }
   appendMessage(id, msg) {
     const dir = this.sessionDir(id);
-    mkdirSync11(dir, { recursive: true });
+    mkdirSync12(dir, { recursive: true });
     const line = JSON.stringify(msg);
     if (this.encryptor?.isEnabled()) {
       appendFileSync5(this.historyPath(id), this.encryptor.encryptFileContent(line) + `
@@ -13487,10 +13654,10 @@ class SessionStore {
   }
   loadHistory(id) {
     const path = this.historyPath(id);
-    if (!existsSync27(path))
+    if (!existsSync28(path))
       return [];
     try {
-      const raw = readFileSync15(path, "utf-8");
+      const raw = readFileSync17(path, "utf-8");
       const lines = raw.split(`
 `).filter(Boolean);
       if (this.encryptor?.isEnabled()) {
@@ -13504,7 +13671,7 @@ class SessionStore {
   }
   appendSessionLog(id, entry) {
     const dir = this.sessionDir(id);
-    mkdirSync11(dir, { recursive: true });
+    mkdirSync12(dir, { recursive: true });
     const line = JSON.stringify(entry);
     if (this.encryptor?.isEnabled()) {
       appendFileSync5(this.sessionLogPath(id), this.encryptor.encryptFileContent(line) + `
@@ -13516,10 +13683,10 @@ class SessionStore {
   }
   loadSessionLog(id) {
     const path = this.sessionLogPath(id);
-    if (!existsSync27(path))
+    if (!existsSync28(path))
       return [];
     try {
-      const raw = readFileSync15(path, "utf-8");
+      const raw = readFileSync17(path, "utf-8");
       const lines = raw.split(`
 `).filter(Boolean);
       if (this.encryptor?.isEnabled()) {
@@ -13532,7 +13699,7 @@ class SessionStore {
     }
   }
   listSessions() {
-    if (!existsSync27(this.baseDir))
+    if (!existsSync28(this.baseDir))
       return [];
     const entries = readdirSync7(this.baseDir, { withFileTypes: true });
     const sessions = [];
@@ -13548,7 +13715,7 @@ class SessionStore {
   }
   deleteSession(id) {
     const dir = this.sessionDir(id);
-    if (existsSync27(dir)) {
+    if (existsSync28(dir)) {
       rmSync(dir, { recursive: true, force: true });
     }
   }
@@ -13560,11 +13727,11 @@ class SessionStore {
       const updatedAt = new Date(session2.updatedAt);
       if (updatedAt < thirtyDaysAgo) {
         const historyPath = this.historyPath(session2.id);
-        if (existsSync27(historyPath)) {
-          const content = readFileSync15(historyPath, "utf-8");
+        if (existsSync28(historyPath)) {
+          const content = readFileSync17(historyPath, "utf-8");
           const compressed = gzipSync(content);
-          const gzPath = join19(this.baseDir, `${session2.id}.jsonl.gz`);
-          writeFileSync10(gzPath, compressed);
+          const gzPath = join20(this.baseDir, `${session2.id}.jsonl.gz`);
+          writeFileSync11(gzPath, compressed);
           rmSync(historyPath);
         }
       }
@@ -13770,8 +13937,8 @@ class ProfileCompressor {
 }
 
 // src/modules/user-profile/profile.ts
-import { readFileSync as readFileSync16, writeFileSync as writeFileSync11, existsSync as existsSync28, mkdirSync as mkdirSync12 } from "fs";
-import { join as join20 } from "path";
+import { readFileSync as readFileSync18, writeFileSync as writeFileSync12, existsSync as existsSync29, mkdirSync as mkdirSync13 } from "fs";
+import { join as join21 } from "path";
 import { homedir as homedir9, hostname, platform as platform4, type } from "os";
 import { env } from "process";
 
@@ -13795,17 +13962,17 @@ class UserProfile {
     return this.info;
   }
   save() {
-    if (!existsSync28(this.profileDir)) {
-      mkdirSync12(this.profileDir, { recursive: true });
+    if (!existsSync29(this.profileDir)) {
+      mkdirSync13(this.profileDir, { recursive: true });
     }
-    writeFileSync11(join20(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
+    writeFileSync12(join21(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
   }
   load() {
-    const path = join20(this.profileDir, "profile.json");
-    if (!existsSync28(path))
+    const path = join21(this.profileDir, "profile.json");
+    if (!existsSync29(path))
       return null;
     try {
-      const data = JSON.parse(readFileSync16(path, "utf-8"));
+      const data = JSON.parse(readFileSync18(path, "utf-8"));
       this.info = {
         platform: data.platform,
         os: data.os,
@@ -13840,12 +14007,12 @@ class UserProfile {
 var init_profile = () => {};
 
 // src/modules/skills/loader.ts
-import { readdirSync as readdirSync8, readFileSync as readFileSync17, existsSync as existsSync29, statSync as statSync5 } from "fs";
-import { join as join21 } from "path";
+import { readdirSync as readdirSync8, readFileSync as readFileSync19, existsSync as existsSync30, statSync as statSync5 } from "fs";
+import { join as join22 } from "path";
 
 class SkillsLoader {
   loadFromDir(dirPath) {
-    if (!existsSync29(dirPath))
+    if (!existsSync30(dirPath))
       return [];
     const skills = [];
     this.scanDir(dirPath, skills);
@@ -13854,7 +14021,7 @@ class SkillsLoader {
   scanDir(dirPath, skills) {
     const entries = readdirSync8(dirPath);
     for (const entry of entries) {
-      const fullPath = join21(dirPath, entry);
+      const fullPath = join22(dirPath, entry);
       const stat = statSync5(fullPath);
       if (stat.isDirectory()) {
         this.scanDir(fullPath, skills);
@@ -13862,7 +14029,7 @@ class SkillsLoader {
       }
       if (!entry.endsWith(".md") && !entry.endsWith(".skill.md"))
         continue;
-      const content = readFileSync17(fullPath, "utf-8");
+      const content = readFileSync19(fullPath, "utf-8");
       const parsed = this.parseSkillFile(content, fullPath);
       if (parsed)
         skills.push(parsed);
@@ -14134,8 +14301,8 @@ var init_browser2 = __esm(() => {
 });
 
 // src/modules/indexer/walker.ts
-import { readdirSync as readdirSync9, readFileSync as readFileSync18, statSync as statSync6, existsSync as existsSync30, watch } from "fs";
-import { join as join22, relative, extname as extname5 } from "path";
+import { readdirSync as readdirSync9, readFileSync as readFileSync20, statSync as statSync6, existsSync as existsSync31, watch } from "fs";
+import { join as join23, relative, extname as extname5 } from "path";
 
 class Indexer {
   baseDir;
@@ -14162,7 +14329,7 @@ class Indexer {
     let totalSize = 0;
     let count = 0;
     const walkDir = (dir) => {
-      if (!existsSync30(dir))
+      if (!existsSync31(dir))
         return;
       let entries;
       try {
@@ -14173,7 +14340,7 @@ class Indexer {
       for (const entry of entries) {
         if (count >= this.MAX_FILES)
           return;
-        const fullPath = join22(dir, entry);
+        const fullPath = join23(dir, entry);
         const relPath = relative(this.baseDir, fullPath);
         const stat = statSync6(fullPath);
         if (stat.isDirectory()) {
@@ -14184,7 +14351,7 @@ class Indexer {
           const ext = extname5(entry).toLowerCase();
           const language = LANGUAGES[ext];
           if (language) {
-            const content = readFileSync18(fullPath, "utf-8");
+            const content = readFileSync20(fullPath, "utf-8");
             const exports = this.extractExports(content, language);
             files.push({ path: relPath, language, exports, size: stat.size });
             totalSize += stat.size;
@@ -14236,22 +14403,22 @@ var init_walker = __esm(() => {
 });
 
 // src/modules/indexer/cache.ts
-import { readFileSync as readFileSync19, writeFileSync as writeFileSync12, existsSync as existsSync31, mkdirSync as mkdirSync13, rmSync as rmSync2 } from "fs";
-import { join as join23 } from "path";
+import { readFileSync as readFileSync21, writeFileSync as writeFileSync13, existsSync as existsSync32, mkdirSync as mkdirSync14, rmSync as rmSync2 } from "fs";
+import { join as join24 } from "path";
 
 class IndexCache {
   cachePath;
   cache = null;
   constructor(cacheDir) {
-    this.cachePath = join23(cacheDir, "index-cache.json");
+    this.cachePath = join24(cacheDir, "index-cache.json");
   }
   load() {
     if (this.cache)
       return this.cache;
-    if (!existsSync31(this.cachePath))
+    if (!existsSync32(this.cachePath))
       return null;
     try {
-      this.cache = JSON.parse(readFileSync19(this.cachePath, "utf-8"));
+      this.cache = JSON.parse(readFileSync21(this.cachePath, "utf-8"));
       return this.cache;
     } catch {
       return null;
@@ -14259,14 +14426,14 @@ class IndexCache {
   }
   save(result) {
     this.cache = result;
-    const dir = join23(this.cachePath, "..");
-    if (!existsSync31(dir))
-      mkdirSync13(dir, { recursive: true });
-    writeFileSync12(this.cachePath, JSON.stringify(result), "utf-8");
+    const dir = join24(this.cachePath, "..");
+    if (!existsSync32(dir))
+      mkdirSync14(dir, { recursive: true });
+    writeFileSync13(this.cachePath, JSON.stringify(result), "utf-8");
   }
   invalidate() {
     this.cache = null;
-    if (existsSync31(this.cachePath)) {
+    if (existsSync32(this.cachePath)) {
       try {
         rmSync2(this.cachePath);
       } catch {}
@@ -14276,7 +14443,7 @@ class IndexCache {
 var init_cache = () => {};
 
 // src/modules/indexer/module.ts
-import { dirname as dirname7 } from "path";
+import { dirname as dirname8 } from "path";
 
 class IndexerModule {
   name = "indexer";
@@ -14393,7 +14560,7 @@ ${t("indexer.and_more", { count: result.files.length - 100 })}` : "";
     const counts = {};
     for (const f of result.files) {
       const normalized = f.path.replace(/\\/g, "/");
-      const dir = dirname7(normalized);
+      const dir = dirname8(normalized);
       const key = dir === "." ? "(root)" : dir;
       counts[key] = (counts[key] || 0) + 1;
     }
@@ -14624,13 +14791,13 @@ var init_mcp = __esm(() => {
 
 // src/modules/memory/module.ts
 import { homedir as homedir10 } from "os";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 
 class MemoryModule {
   name = "memory";
   store;
   constructor(memoryDir) {
-    const dir = memoryDir || join24(homedir10(), ".mma", "memory");
+    const dir = memoryDir || join25(homedir10(), ".mma", "memory");
     this.store = new MemoryStore(dir);
   }
   getSystemPromptBlock() {
@@ -14677,8 +14844,8 @@ __export(exports_bootstrap, {
   bootstrap: () => bootstrap
 });
 import { homedir as homedir11 } from "os";
-import { join as join25, resolve as resolve15 } from "path";
-import { existsSync as existsSync32, readFileSync as readFileSync20, writeFileSync as writeFileSync13 } from "fs";
+import { join as join26, resolve as resolve15 } from "path";
+import { existsSync as existsSync33, readFileSync as readFileSync22, writeFileSync as writeFileSync14 } from "fs";
 function buildSystemInfo(config, baseDir, profileCompressed) {
   const now = new Date().toISOString().replace("T", " ").slice(0, 19);
   const isWin = profileCompressed.toLowerCase().includes("win32");
@@ -14700,9 +14867,10 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
   if (isWin) {
     lines.push(``, `Windows environment — use Windows-compatible commands:`, `- Use "dir" instead of "ls". Use "dir /b" for bare listing.`, `- Use "type" or "Get-Content" instead of "cat".`, `- Use "cd" instead of "pwd". Use "echo %cd%" to print working directory.`, `- Use "copy" instead of "cp", "move" instead of "mv", "del" instead of "rm".`, `- Do not use "mkdir -p" — Windows mkdir creates intermediate dirs by default. Use the create_dir tool instead.`, `- Use forward slashes (/) or escaped backslashes (\\\\) in file paths.`, `- Your working directory is: ${baseDir}`);
   }
-  lines.push(``, `Bash tool rules:`, `- Use the "workdir" parameter to run commands in a specific directory. Do NOT chain "cd dir && cmd" — the security module blocks the "&&" operator.`, `- Run one command per tool call. Split multi-step shell operations into separate bash calls.`);
+  lines.push(``, `Bash tool rules:`, `- Use the "workdir" parameter to run commands in a specific directory. Do NOT chain "cd dir && cmd" — the security module blocks the "&&" operator.`, `- Run one command per tool call. Split multi-step shell operations into separate bash calls.`, `- Background processes (dev servers, watchers, long-running npm install): use the "background: true" parameter or the tool will auto-detect and background them. Check output with process_log.`);
+  lines.push(``, `=== DEVELOPMENT RULES — follow these strictly ===`, ``, `1. DEPENDENCIES FIRST: Before writing any source code, ALWAYS install project dependencies (e.g., "npm install", "pip install -r requirements.txt", "cargo build", "go mod tidy"). Verify the package manager's lock file or dependency directory exists. Never write code that imports/uses packages that aren't installed yet.`, `2. TOOLKIT/FWK FIRST: If the task specifies a framework or UI library, initialize and configure it BEFORE writing application code. Run its project init command first, then add components/modules. Never write your own version of what the framework already provides.`, `3. ONE STEP AT A TIME: Follow the plan sequentially. Complete step N before starting step N+1. When a step is done: verify the deliverables exist and have real content (not empty), then call "plan update step=N status=done". Do not redo completed work.`, `4. VERIFY YOUR WORK: After creating/modifying files, verify they exist on disk. After installing dependencies, verify the package manager completed successfully. After any command, check its output for errors. Don't assume operations succeeded.`, `5. NO PREMATURE WORK: Do not create files for future steps. Do not add imports/references to packages or modules that haven't been installed yet. Do not reference files or components that don't exist yet. Build incrementally — one layer at a time.`, `6. WHEN STUCK: If a command fails 2+ times, STOP and try a different approach. Write files directly instead of using commands. Ask the user for help. Never repeat the same failing command more than twice.`);
   if (config.autoPlan) {
-    lines.push(``, `Plan rule: For complex tasks with 3+ steps, you may create a plan using the "plan" tool. For simple questions, just answer directly.`);
+    lines.push(``, `Plan rule (MANDATORY): For ANY task that requires creating files, installing packages, or multiple actions — you MUST create a plan using the "plan" tool BEFORE starting work. Each step must describe a concrete deliverable (specific files to create, packages to install, commands to run). Do not combine unrelated work into one step.`);
   }
   const hasMCP = config.mcpServers && Object.values(config.mcpServers).some((s) => s.enabled !== false);
   if (hasMCP) {
@@ -14712,8 +14880,8 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
 `);
 }
 async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
-  const dir = configDir || join25(homedir11(), ".mma");
-  const projectConfigPath = projectDir ? join25(projectDir, ".mmrc") : join25(process.cwd(), ".mmrc");
+  const dir = configDir || join26(homedir11(), ".mma");
+  const projectConfigPath = projectDir ? join26(projectDir, ".mmrc") : join26(process.cwd(), ".mmrc");
   const config = loadConfig({ configDir: dir, projectConfigPath });
   setLocale(config.locale);
   try {
@@ -14723,7 +14891,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     }
   } catch {}
   const logger = new Logger(config.logLevel);
-  logger.setLogDir(join25(dir, "logs"));
+  logger.setLogDir(join26(dir, "logs"));
   logger.debug("MMA bootstrap", {
     version: config.version,
     model: config.model
@@ -14745,7 +14913,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
       logger.info(`Model ${config.model} loaded in ${loadResult.loadTime}s`);
     }
   }
-  const profile = new UserProfile(join25(dir));
+  const profile = new UserProfile(join26(dir));
   profile.load() || profile.collect();
   profile.save();
   const llmProvider = new OpenAICompatProvider({
@@ -14757,7 +14925,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     rateLimits: config.security?.rateLimits
   });
   const baseDir = projectDir ? resolve15(projectDir) : process.cwd();
-  const projectMapCacheDir = join25(baseDir, ".mma");
+  const projectMapCacheDir = join26(baseDir, ".mma");
   const indexerModule = new IndexerModule({
     baseDir,
     cacheDir: projectMapCacheDir
@@ -14768,9 +14936,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     logger.warn(`Project indexing failed: ${err.message}`);
   }
   const skillsLoader = new SkillsLoader;
-  const builtinDir = join25(import.meta.dirname, "skills", "builtin");
-  const globalDir = join25(homedir11(), ".agents", "skills");
-  const projectSkillsDir = join25(baseDir, ".mma", "skills");
+  const builtinDir = join26(import.meta.dirname, "skills", "builtin");
+  const globalDir = join26(homedir11(), ".agents", "skills");
+  const projectSkillsDir = join26(baseDir, ".mma", "skills");
   const availableSkills = skillsLoader.loadFromAllSources(builtinDir, globalDir, projectSkillsDir);
   const skillsMatcher = new SkillsMatcher;
   const skillsBudget = Math.floor(config.contextWindow * 0.1);
@@ -14784,11 +14952,11 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     essential: true,
     estimatedTokens: 250
   };
-  const agentsMdGlobal = join25(dir, "AGENTS.md");
-  if (!existsSync32(agentsMdGlobal)) {
-    writeFileSync13(agentsMdGlobal, "", "utf-8");
+  const agentsMdGlobal = join26(dir, "AGENTS.md");
+  if (!existsSync33(agentsMdGlobal)) {
+    writeFileSync14(agentsMdGlobal, "", "utf-8");
   }
-  const sessionDir = join25(dir, "sessions");
+  const sessionDir = join26(dir, "sessions");
   const sessionStore = new SessionStore(sessionDir);
   sessionStore.init();
   const sessionManager = new SessionManager(sessionStore, {
@@ -14833,6 +15001,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const hallucinationDetector = new HallucinationDetector;
   const moduleRegistry = new ModuleRegistry;
   const execModule = new ExecutionModule(baseDir, config.stuckThreshold);
+  execModule.restorePlan();
   moduleRegistry.register(execModule);
   const sessionModule = new SessionModule(sessionManager);
   moduleRegistry.register(sessionModule);
@@ -14841,7 +15010,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const mcpModule = new MCPModule(config);
   await mcpModule.initialize();
   moduleRegistry.register(mcpModule);
-  const memoryModule = new MemoryModule(join25(dir, "memory"));
+  const memoryModule = new MemoryModule(join26(dir, "memory"));
   moduleRegistry.register(memoryModule);
   if (config.browser.enabled) {
     const browserModule = new BrowserModule;
@@ -14884,8 +15053,8 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   pluginManager.register(plugin);
   pluginManager.register(plugin2);
   const pluginLoader = new PluginLoader;
-  const globalPluginsDir = join25(homedir11(), ".mma", "plugins");
-  const projectPluginsDir = join25(dir, ".mma", "plugins");
+  const globalPluginsDir = join26(homedir11(), ".mma", "plugins");
+  const projectPluginsDir = join26(dir, ".mma", "plugins");
   pluginLoader.loadFromDir(globalPluginsDir, pluginManager, logger);
   pluginLoader.loadFromDir(projectPluginsDir, pluginManager, logger);
   contextManager.onCompact = (summary) => {
@@ -14903,13 +15072,13 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const skipAgentsMd = noAgentsMd === true;
   if (!skipAgentsMd) {
     const agentsMdCandidates = [
-      join25(baseDir, "AGENTS.md"),
-      join25(baseDir, ".mma", "AGENTS.md"),
-      join25(dir, "AGENTS.md")
+      join26(baseDir, "AGENTS.md"),
+      join26(baseDir, ".mma", "AGENTS.md"),
+      join26(dir, "AGENTS.md")
     ];
     for (const p of agentsMdCandidates) {
-      if (existsSync32(p)) {
-        const content = readFileSync20(p, "utf-8").trim();
+      if (existsSync33(p)) {
+        const content = readFileSync22(p, "utf-8").trim();
         if (content) {
           agentsMdBlocks.push({
             content,
@@ -15742,14 +15911,14 @@ async function runSetup() {
 
 // src/cli/commands.ts
 init_i18n();
-import { join as join27, dirname as dirname8 } from "path";
+import { join as join28, dirname as dirname9 } from "path";
 import { homedir as homedir13 } from "os";
-import { existsSync as existsSync33, readFileSync as readFileSync21 } from "fs";
+import { existsSync as existsSync34, readFileSync as readFileSync23 } from "fs";
 
 // src/cli/security-commands.ts
 init_bootstrap();
 init_config();
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 import { homedir as homedir12 } from "os";
 
 // src/modules/security/security-policies.ts
@@ -16251,7 +16420,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 = join26(homedir12(), ".mma", "config.json");
+    const configPath = join27(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const validPresets = ["strict", "balanced", "permissive"];
     if (!validPresets.includes(preset)) {
@@ -16266,7 +16435,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 = join26(homedir12(), ".mma", "config.json");
+    const configPath = join27(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -16278,7 +16447,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 = join26(homedir12(), ".mma", "config.json");
+    const configPath = join27(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -16290,7 +16459,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 = join26(homedir12(), ".mma", "config.json");
+    const configPath = join27(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -16304,7 +16473,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 = join26(homedir12(), ".mma", "config.json");
+    const configPath = join27(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -16338,14 +16507,14 @@ function createSecurityCommand(program2) {
 // src/cli/commands.ts
 import { fileURLToPath } from "url";
 function readVersion() {
-  const here = dirname8(fileURLToPath(import.meta.url));
+  const here = dirname9(fileURLToPath(import.meta.url));
   const candidates = [
-    join27(here, "..", "..", "package.json"),
-    join27(here, "..", "package.json")
+    join28(here, "..", "..", "package.json"),
+    join28(here, "..", "package.json")
   ];
   for (const p of candidates) {
-    if (existsSync33(p)) {
-      const raw = JSON.parse(readFileSync21(p, "utf8"));
+    if (existsSync34(p)) {
+      const raw = JSON.parse(readFileSync23(p, "utf8"));
       if (raw.version)
         return raw.version;
     }
@@ -16357,7 +16526,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 = join27(homedir13(), ".mma", "config.json");
+    const configPath = join28(homedir13(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = answers.provider;
     config.provider.baseUrl = answers.apiBase;
@@ -16371,7 +16540,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 = join27(homedir13(), ".mma", "config.json");
+    const configPath = join28(homedir13(), ".mma", "config.json");
     const { config } = await bootstrap();
     const keys = key.split(".");
     let obj = config;
@@ -16431,14 +16600,14 @@ 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 = join27(homedir13(), ".mma", "config.json");
+    const configPath = join28(homedir13(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.model = name;
     saveConfig(config, configPath);
     console.log(t("cli.model_set", { name }));
   });
   program2.command("context").description(t("cli.manage_context")).argument("<size>", "Context window size in tokens").action(async (size) => {
-    const configPath = join27(homedir13(), ".mma", "config.json");
+    const configPath = join28(homedir13(), ".mma", "config.json");
     const { config } = await bootstrap();
     const contextWindow = parseInt(size, 10);
     if (isNaN(contextWindow) || contextWindow < 1024) {
@@ -16456,7 +16625,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 = join27(homedir13(), ".mma", "config.json");
+    const configPath = join28(homedir13(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = name;
     saveConfig(config, configPath);
@@ -16508,8 +16677,8 @@ init_bootstrap();
 // src/cli/repl.ts
 init_colors();
 import * as readline3 from "readline";
-import { existsSync as existsSync34, readFileSync as readFileSync22, writeFileSync as writeFileSync14 } from "fs";
-import { join as join28, dirname as dirname9 } from "path";
+import { existsSync as existsSync35, readFileSync as readFileSync24, writeFileSync as writeFileSync15 } from "fs";
+import { join as join29, dirname as dirname10 } from "path";
 import { homedir as homedir14 } from "os";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -16957,14 +17126,14 @@ init_table();
 init_i18n();
 init_config();
 function readVersion2() {
-  const here = dirname9(fileURLToPath2(import.meta.url));
+  const here = dirname10(fileURLToPath2(import.meta.url));
   const candidates = [
-    join28(here, "..", "..", "package.json"),
-    join28(here, "..", "package.json")
+    join29(here, "..", "..", "package.json"),
+    join29(here, "..", "package.json")
   ];
   for (const p of candidates) {
-    if (existsSync34(p)) {
-      const raw = JSON.parse(readFileSync22(p, "utf8"));
+    if (existsSync35(p)) {
+      const raw = JSON.parse(readFileSync24(p, "utf8"));
       if (raw.version)
         return raw.version;
     }
@@ -17028,10 +17197,10 @@ class Repl {
     this.sessionManager = sessionManager;
     this.skillsModule = skillsModule;
     this.pluginManager = pluginManager;
-    this.configDir = configDir || join28(homedir14(), ".mma");
+    this.configDir = configDir || join29(homedir14(), ".mma");
     this.baseDir = baseDir || process.cwd();
     this.noAgentsMd = noAgentsMd === true;
-    this.historyPath = join28(homedir14(), ".mma", "repl-history");
+    this.historyPath = join29(homedir14(), ".mma", "repl-history");
     this.loadHistory();
     this.registerBuiltinCommands();
     this.registerMmaCommands();
@@ -17055,9 +17224,9 @@ class Repl {
     this.setupListeners();
   }
   loadHistory() {
-    if (existsSync34(this.historyPath)) {
+    if (existsSync35(this.historyPath)) {
       try {
-        const raw = readFileSync22(this.historyPath, "utf-8");
+        const raw = readFileSync24(this.historyPath, "utf-8");
         this.history = raw.split(`
 `).filter(Boolean).slice(-this.maxHistory);
       } catch {
@@ -17067,7 +17236,7 @@ class Repl {
   }
   saveHistory() {
     const allHistory = this.history.slice(-this.maxHistory);
-    writeFileSync14(this.historyPath, allHistory.join(`
+    writeFileSync15(this.historyPath, allHistory.join(`
 `), "utf-8");
   }
   registerBuiltinCommands() {
@@ -17120,7 +17289,7 @@ class Repl {
         }
         try {
           const { loadFileAsDataUrl: loadFileAsDataUrl2, loadUrlAsDataUrl: loadUrlAsDataUrl2, readClipboardImage: readClipboardImage2 } = await Promise.resolve().then(() => (init_image_utils(), exports_image_utils));
-          const { existsSync: existsSync35 } = await import("fs");
+          const { existsSync: existsSync36 } = await import("fs");
           const { resolve: resolve16 } = await import("path");
           let dataUrl;
           let label;
@@ -17140,7 +17309,7 @@ class Repl {
             label = source;
           } else {
             const absPath = resolve16(process.cwd(), source);
-            if (!existsSync35(absPath)) {
+            if (!existsSync36(absPath)) {
               console.log(pc.red(t("image.not_found", { path: source })));
               return;
             }
@@ -17217,7 +17386,7 @@ class Repl {
       action: async () => {
         console.log(pc.yellow(t("repl.wizard_running")));
         const answers = await runSetup();
-        const configPath = join28(homedir14(), ".mma", "config.json");
+        const configPath = join29(homedir14(), ".mma", "config.json");
         this.config.provider.type = answers.provider;
         this.config.provider.baseUrl = answers.apiBase;
         this.config.provider.apiKey = answers.apiKey;
@@ -17247,7 +17416,7 @@ class Repl {
             return;
           }
           this.config.provider.type = name;
-          const configPath = join28(homedir14(), ".mma", "config.json");
+          const configPath = join29(homedir14(), ".mma", "config.json");
           saveConfig(this.config, configPath);
           console.log(pc.green(t("repl.provider_set", { name })));
           return;
@@ -17299,7 +17468,7 @@ class Repl {
             return;
           }
           this.config.model = name;
-          const configPath = join28(homedir14(), ".mma", "config.json");
+          const configPath = join29(homedir14(), ".mma", "config.json");
           saveConfig(this.config, configPath);
           console.log(pc.green(t("repl.model_set", { name })));
           return;
@@ -17323,7 +17492,7 @@ class Repl {
           return;
         }
         this.config.contextWindow = size;
-        const configPath = join28(homedir14(), ".mma", "config.json");
+        const configPath = join29(homedir14(), ".mma", "config.json");
         saveConfig(this.config, configPath);
         console.log(pc.green(t("cli.context_set", { size })));
       }
@@ -17341,9 +17510,9 @@ class Repl {
         this.agent.shutdown();
         const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
         const { homedir: homedir15 } = await import("os");
-        const { join: join29 } = await import("path");
-        const configDir = join29(homedir15(), ".mma");
-        const projectConfigPath = join29(process.cwd(), ".mmrc");
+        const { join: join30 } = await import("path");
+        const configDir = join30(homedir15(), ".mma");
+        const projectConfigPath = join30(process.cwd(), ".mmrc");
         const freshConfig = loadConfig2({ configDir, projectConfigPath });
         Object.assign(this.config, freshConfig);
         const { bootstrap: bootstrap2 } = await Promise.resolve().then(() => (init_bootstrap(), exports_bootstrap));
@@ -17877,11 +18046,11 @@ ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
       row(t("repl.agents_label"), pc.red(t("repl.disabled")));
     } else {
       const agentsMdCandidates = [
-        join28(this.baseDir, "AGENTS.md"),
-        join28(this.baseDir, ".mma", "AGENTS.md"),
-        join28(this.configDir, "AGENTS.md")
+        join29(this.baseDir, "AGENTS.md"),
+        join29(this.baseDir, ".mma", "AGENTS.md"),
+        join29(this.configDir, "AGENTS.md")
       ];
-      const foundAgents = agentsMdCandidates.filter((p) => existsSync34(p));
+      const foundAgents = agentsMdCandidates.filter((p) => existsSync35(p));
       if (foundAgents.length > 0) {
         for (const p of foundAgents) {
           row(t("repl.agents_label"), pc.dim(p));
@@ -17892,7 +18061,7 @@ ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
     }
     const meta = this.sessionManager?.getActiveMeta();
     if (meta) {
-      const sessionPath = join28(this.configDir, "sessions", meta.id);
+      const sessionPath = join29(this.configDir, "sessions", meta.id);
       row(t("repl.session_label"), `${pc.cyan(meta.name)} ${pc.dim(`(${meta.id.slice(0, 12)})`)}  —  ${meta.messageCount} msgs  ${pc.dim(sessionPath)}`);
     }
     const headerWidth = Math.max(50, Math.min(96, process.stdout.columns || 96));
@@ -17917,8 +18086,8 @@ ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
 init_config();
 init_i18n();
 init_colors();
-import { existsSync as existsSync35 } from "fs";
-import { join as join29 } from "path";
+import { existsSync as existsSync36 } from "fs";
+import { join as join30 } from "path";
 import { homedir as homedir15 } from "os";
 async function main() {
   const program2 = createProgram();
@@ -17982,8 +18151,8 @@ async function main() {
     }
     agent.shutdown();
   } else {
-    const configPath = join29(homedir15(), ".mma", "config.json");
-    if (!existsSync35(configPath)) {
+    const configPath = join30(homedir15(), ".mma", "config.json");
+    if (!existsSync36(configPath)) {
       console.log(pc.yellow(`
   ` + t("cli.first_run") + `
 `));

package/dist/skills/builtin/builtin/git.md

@@ -0,0 +1,36 @@
+---
+name: git-expert
+description: Git branching, merge conflicts, rebasing, workflow strategies
+keywords: [git, branch, merge, rebase, commit, conflict, workflow]
+mma_version: 2
+---
+
+# Git Expert
+
+## Branching Strategies
+
+- **Feature branches**: `feature/xxx` from `main`, merge via PR
+- **Hotfix**: `hotfix/xxx` from `main`, merge to both `main` and `develop`
+- **Release**: `release/xxx` from `develop`, merge to `main` + `develop`
+
+## Conflict Resolution
+
+1. `git fetch origin` — get latest
+2. `git checkout your-branch`
+3. `git rebase origin/main` — apply your commits on top
+4. Resolve conflicts file by file
+5. `git add <files>` then `git rebase --continue`
+
+## Useful Commands
+
+- `git log --oneline --graph --all` — visualize history
+- `git diff --stat` — summary of changes
+- `git stash pop` — restore stashed changes
+- `git cherry-pick <commit>` — apply specific commit
+
+## Best Practices
+
+- Commit often with clear messages
+- Keep commits atomic (one logical change)
+- Never force push to shared branches
+- Use `git rebase -i` to clean up before PR

package/dist/skills/builtin/builtin/typescript.md

@@ -0,0 +1,35 @@
+---
+name: typescript-expert
+description: TypeScript type system, generics, advanced patterns, compiler API
+keywords: [typescript, types, generics, tsconfig, compiler, interface, type]
+mma_version: 2
+---
+
+# TypeScript Expert
+
+## Key Patterns
+
+- Use `readonly` for immutable properties
+- Prefer `interface` over `type` for object shapes
+- Use `as const` for literal types
+- Prefer `unknown` over `any` for type safety
+
+## Common Pitfalls
+
+- Avoid `any` — use `unknown` + type guards
+- Don't use `enum` — use `const` objects or union types
+- Avoid `namespace` — use ES modules
+
+## Type Guards
+
+```ts
+function isString(val: unknown): val is string {
+  return typeof val === 'string'
+}
+```
+
+## Generics
+
+- Use `extends` for constraints
+- Use `infer` for conditional type extraction
+- Prefer explicit over implicit for complex cases

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "micro-models-agent",
-  "version": "0.19.2",
+  "version": "0.20.1",
   "description": "Micro Models Agent (MMA) — LLM agent harness for small models (Qwen3.5-9B, 32K-64K context)",
   "type": "module",
   "bin": {