micro-models-agent 0.28.9 → 0.28.17

package/dist/main.js

@@ -2278,6 +2278,7 @@ var init_en = __esm(() => {
 {str}`,
     "file.moved": "Moved {from} → {to}",
     "file.not_found_short": "Not found: {path}",
+    "file.notfound_resolved": "File not found: {path} (resolved to {resolved})",
     "file.empty": "(empty)",
     "file.no_matches": "No matches",
     "file.truncated": `
@@ -2295,6 +2296,7 @@ var init_en = __esm(() => {
     "error.llm": "LLM error: {message}",
     "error.response_blocked": "Response blocked: {reason}",
     "error.max_iters": "Max iterations ({max}) reached",
+    "error.empty_response": "Model returned an empty response after retries",
     "error.grep_failed": "Grep failed: {message}",
     "error.search_failed": "Search failed: {message}",
     "error.fetch_failed": "Fetch failed: {message}",
@@ -2332,6 +2334,7 @@ var init_en = __esm(() => {
     "tool.failed": "Tool {name} failed: {error}",
     "tool.unknown": "Unknown tool: {name}",
     "tool.blocked": "Blocked by plugin: {plugin}",
+    "tool.blocked_reason": "Blocked by plugin: {plugin}. Reason: {reason}",
     "tool.using": "[{label}]",
     "tool.friendly.write_file": "Writing file",
     "tool.friendly.read_file": "Reading file",
@@ -2344,6 +2347,7 @@ var init_en = __esm(() => {
     "tool.friendly.glob": "Searching files",
     "tool.friendly.grep": "Searching content",
     "tool.friendly.bash": "Running command",
+    "bash.echo_write_blocked": "Writing files via echo/printf is unreliable in Windows cmd.exe (quotes and multi-line break). Use the write_file tool instead (target: {path}).",
     "tool.friendly.load_skill": "Loading skill",
     "tool.friendly.plan": "Planning",
     "tool.friendly.todo": "Updating tasks",
@@ -2433,6 +2437,13 @@ Command: {command}`,
     "plan.step_not_found": "Step not found",
     "plan.show_header": "Plan status:",
     "plan.show_empty": "(plan has no steps)",
+    "plan.list_header": "Plans:",
+    "plan.list_empty": "No plans",
+    "plan.switch_no_id": "Provide a plan id to switch to",
+    "plan.not_found": "Plan not found: {id}",
+    "plan.switched": "Switched to plan {id}: {title}",
+    "plan.replanned": "Plan re-planned: {kept} completed steps kept, {steps} new steps added",
+    "plan.replan_no_steps": "Provide new steps for re-planning",
     "todo.added": "Added {count} todo(s): {items}",
     "todo.marked_done": "Marked {count} item(s) as done",
     "todo.no_active": "No active todos",
@@ -2706,12 +2717,14 @@ Use this knowledge to answer the user's question.`,
     "exec.plan_warning": 'Current plan step {step} is "{description}", but {tool} is being called for files outside this step. Complete the current step first, then call plan update step={step} status=done before moving to the next step.',
     "exec.plan_blocked": "{max} consecutive calls outside the current step. Finish step {step} before proceeding — other steps should wait until this one is complete.",
     "exec.off_track": 'Step {stepId} — "{description}" — but you are using {tool} on a different path. Return to the current step.',
-    "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_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. If this step is NOT actually needed (no external dependencies), skip it: plan update step={step} status=skipped note="deps not needed".]',
+    "exec.step_gate_deps_force": '[⚠ Step {step}: dependencies still not installed (no lock file) — 2nd warning. If this step is NOT needed, IMMEDIATELY call: plan update step={step} status=skipped note="deps not needed". If it IS needed, run the install command right now. Do NOT make other tool calls before updating the plan.]',
     "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_tests": "[✗] Task incomplete: {done}/{total} steps done, tests FAILING: {failed} failed / {passed} passed — {detail}",
     "exec.audit_fail_typecheck": "[✗] Task incomplete: {done}/{total} steps done, {missing} files missing, typecheck error: {typeError}",
     "exec.audit_incomplete": "[⚠ Final audit incomplete: {summary}. Task is NOT finished — continue working. Remaining steps: {steps}]",
     "exec.mass_edit_warning": "⚠️ Plan affects {count} files — review the full list before proceeding.",
@@ -2843,6 +2856,7 @@ var init_ru = __esm(() => {
     "error.llm": "Ошибка LLM: {message}",
     "error.response_blocked": "Ответ заблокирован: {reason}",
     "error.max_iters": "Достигнут максимум итераций ({max})",
+    "error.empty_response": "Модель вернула пустой ответ после повторных попыток",
     "error.grep_failed": "Ошибка grep: {message}",
     "error.search_failed": "Ошибка поиска: {message}",
     "error.fetch_failed": "Ошибка загрузки: {message}",
@@ -2880,6 +2894,7 @@ var init_ru = __esm(() => {
     "tool.failed": "Инструмент {name} упал: {error}",
     "tool.unknown": "Неизвестный инструмент: {name}",
     "tool.blocked": "Заблокировано плагином: {plugin}",
+    "tool.blocked_reason": "Заблокировано плагином: {plugin}. Причина: {reason}",
     "tool.using": "[{label}]",
     "tool.friendly.write_file": "Запись файла",
     "tool.friendly.read_file": "Чтение файла",
@@ -2981,6 +2996,13 @@ var init_ru = __esm(() => {
     "plan.step_not_found": "Шаг не найден",
     "plan.show_header": "Статус плана:",
     "plan.show_empty": "(в плане нет шагов)",
+    "plan.list_header": "Планы:",
+    "plan.list_empty": "Нет планов",
+    "plan.switch_no_id": "Укажите id плана для переключения",
+    "plan.not_found": "План не найден: {id}",
+    "plan.switched": "Переключено на план {id}: {title}",
+    "plan.replanned": "План перепланирован: {kept} выполненных шагов сохранено, {steps} новых шагов добавлено",
+    "plan.replan_no_steps": "Укажите новые шаги для перепланирования",
     "todo.added": "Добавлено {count} задач: {items}",
     "todo.marked_done": "Отмечено выполненными: {count}",
     "todo.no_active": "Нет активных задач",
@@ -3254,12 +3276,14 @@ var init_ru = __esm(() => {
     "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_deps": '[⚠ Шаг {step} "{description}": зависимости не установлены. Сначала выполните команду установки (npm install, pip install и т.д.). Проверьте что lock-файл или директория зависимостей существует. Если этот шаг на самом деле не нужен (внешних зависимостей нет) — пропусти его: plan update step={step} status=skipped note="зависимости не нужны".]',
+    "exec.step_gate_deps_force": '[⚠ Шаг {step}: зависимости всё ещё не установлены (нет lock-файла) — второе предупреждение. Если этот шаг НЕ нужен — НЕМЕДЛЕННО вызови: plan update step={step} status=skipped note="зависимости не нужны". Если нужен — выполни установку прямо сейчас. Не делай других вызовов инструментов до обновления плана.]',
     "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_tests": "[✗] Задача не выполнена: {done}/{total} шагов, тесты ПАДАЮТ: {failed} failed / {passed} passed — {detail}",
     "exec.audit_fail_typecheck": "[✗] Задача не выполнена: {done}/{total} шагов, {missing} файлов отсутствует, ошибка typecheck: {typeError}",
     "exec.audit_incomplete": "[⚠ Финальная проверка не пройдена: {summary}. Задача НЕ завершена — продолжайте работу. Оставшиеся шаги: {steps}]",
     "exec.mass_edit_warning": "⚠️ План затрагивает {count} файлов — проверьте полный список перед продолжением.",
@@ -3352,7 +3376,9 @@ var init_ru = __esm(() => {
     "ctx.quality": "качество: {percent}%",
     "ctx.delta_pos": "контекст +{tokens}",
     "ctx.delta_neg": "контекст -{tokens} ↓",
-    "ctx.delta_zero": "контекст ±0"
+    "ctx.delta_zero": "контекст ±0",
+    "file.notfound_resolved": "Файл не найден: {path} (резолвится в {resolved})",
+    "bash.echo_write_blocked": "Запись файлов через echo/printf ненадёжна в Windows cmd.exe (кавычки и многострочность ломаются). Используй инструмент write_file вместо этого (цель: {path})."
   };
 });
 
@@ -3932,6 +3958,132 @@ var init_data_sanitizer = __esm(() => {
   ];
 });
 
+// src/logger/file-log.ts
+import {
+  appendFileSync,
+  mkdirSync as mkdirSync3,
+  existsSync as existsSync5,
+  readdirSync as readdirSync3,
+  renameSync,
+  statSync,
+  unlinkSync as unlinkSync2
+} from "node:fs";
+import { join as join5 } from "node:path";
+
+class FileLogWriter {
+  logDir = null;
+  sessionLogPath = null;
+  setLogDir(dir) {
+    this.logDir = dir;
+    if (!existsSync5(dir)) {
+      mkdirSync3(dir, { recursive: true });
+    }
+  }
+  initSessionLog(sessionId) {
+    if (!this.logDir)
+      return;
+    if (!existsSync5(this.logDir)) {
+      mkdirSync3(this.logDir, { recursive: true });
+    }
+    this.sessionLogPath = join5(this.logDir, `${sessionId}.log`);
+    this.cleanupOldLogs();
+  }
+  closeSessionLog() {
+    this.sessionLogPath = null;
+  }
+  getLogPath() {
+    if (this.sessionLogPath)
+      return this.sessionLogPath;
+    if (!this.logDir)
+      return "";
+    const date = new Date().toISOString().slice(0, 10);
+    return join5(this.logDir, `${date}.log`);
+  }
+  rotateIfNeeded(filePath) {
+    if (!existsSync5(filePath))
+      return;
+    const size = statSync(filePath).size;
+    if (size < MAX_LOG_SIZE)
+      return;
+    let idx = 1;
+    while (existsSync5(`${filePath}.${idx}`))
+      idx++;
+    renameSync(filePath, `${filePath}.${idx}`);
+  }
+  log(level, tag, message) {
+    const fp = this.getLogPath();
+    if (!fp)
+      return;
+    if (this.logDir && !existsSync5(this.logDir)) {
+      mkdirSync3(this.logDir, { recursive: true });
+    }
+    this.rotateIfNeeded(fp);
+    const line = `[${new Date().toISOString()}] [${level}] [${tag}] ${message}
+`;
+    try {
+      appendFileSync(fp, line, "utf-8");
+    } catch {}
+  }
+  logLLMRequest(model, messagesCount, promptPreview, caller) {
+    const tag = caller ? `LLM/${caller}` : "LLM";
+    this.log("INFO", tag, `→ ${model} | ${messagesCount} messages | "${promptPreview.slice(0, 100)}"`);
+  }
+  logLLMResponse(model, responseLength, genTimeMs, error, caller) {
+    const tag = caller ? `LLM/${caller}` : "LLM";
+    if (error) {
+      this.log("ERROR", tag, `← ${model} | ${responseLength} chars | ${genTimeMs}ms | ERROR: ${error}`);
+    } else {
+      this.log("INFO", tag, `← ${model} | ${responseLength} chars | ${genTimeMs}ms`);
+    }
+  }
+  logToolCall(tool, preview, result) {
+    const previewTrimmed = preview.length > 200 ? preview.slice(0, 200) + "..." : preview;
+    if (result !== undefined) {
+      const resultTrimmed = result.length > 200 ? result.slice(0, 200) + "..." : result;
+      this.log("INFO", "TOOL", `${tool} | ${previewTrimmed} → ${resultTrimmed}`);
+    } else {
+      this.log("INFO", "TOOL", `${tool} | ${previewTrimmed}`);
+    }
+  }
+  logToolOutput(tool, output, exitCode) {
+    const trimmed = output.length > TOOL_OUTPUT_LIMIT ? output.slice(0, TOOL_OUTPUT_LIMIT) + `
+... (truncated ${output.length - TOOL_OUTPUT_LIMIT} chars)` : output;
+    this.log("DEBUG", "TOOL_OUTPUT", `${tool} exit:${exitCode}
+${trimmed}`);
+  }
+  logREPL(tag, content) {
+    const trimmed = content.length > 400 ? content.slice(0, 400) + "..." : content;
+    this.log("INFO", `REPL/${tag}`, trimmed);
+  }
+  cleanupOldLogs(maxDays = DEFAULT_MAX_DAYS, maxFiles = MAX_LOG_FILES) {
+    if (!this.logDir || !existsSync5(this.logDir))
+      return;
+    const now = Date.now();
+    const list = () => readdirSync3(this.logDir).filter((f) => f.endsWith(".log") || /\.log\.\d+$/.test(f)).map((f) => ({
+      name: f,
+      path: join5(this.logDir, f),
+      mtime: statSync(join5(this.logDir, f)).mtimeMs
+    })).sort((a, b) => b.mtime - a.mtime);
+    for (const f of list()) {
+      if (now - f.mtime > maxDays * 24 * 60 * 60 * 1000) {
+        try {
+          unlinkSync2(f.path);
+        } catch {}
+      }
+    }
+    const remaining = list();
+    for (let i = maxFiles;i < remaining.length; i++) {
+      try {
+        unlinkSync2(remaining[i].path);
+      } catch {}
+    }
+  }
+}
+var MAX_LOG_SIZE, MAX_LOG_FILES = 30, DEFAULT_MAX_DAYS = 30, TOOL_OUTPUT_LIMIT = 2000;
+var init_file_log = __esm(() => {
+  MAX_LOG_SIZE = 5 * 1024 * 1024;
+});
+
 // node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS((exports, module) => {
   var p = process || {};
@@ -4003,8 +4155,8 @@ var require_picocolors = __commonJS((exports, module) => {
 });
 
 // src/logger/app-logger.ts
-import { appendFileSync, mkdirSync as mkdirSync3, existsSync as existsSync5 } from "fs";
-import { join as join5 } from "path";
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync4, existsSync as existsSync6 } from "fs";
+import { join as join6 } from "path";
 function isColorEnabled() {
   return !process.env.NO_COLOR && !process.env.CI && process.stdout.isTTY === true;
 }
@@ -4014,28 +4166,58 @@ class Logger {
   prefix;
   logDir = null;
   sessionDir = null;
+  fileLog;
   constructor(level = "info", prefix = "") {
     this.level = level;
     this.prefix = prefix;
+    this.fileLog = new FileLogWriter;
   }
   setLevel(level) {
     this.level = level;
   }
   setLogDir(dir) {
     this.logDir = dir;
-    if (!existsSync5(dir)) {
-      mkdirSync3(dir, { recursive: true });
+    if (!existsSync6(dir)) {
+      mkdirSync4(dir, { recursive: true });
     }
+    this.fileLog.setLogDir(dir);
   }
   setSessionDir(dir) {
     this.sessionDir = dir;
-    if (!existsSync5(dir)) {
-      mkdirSync3(dir, { recursive: true });
+    if (!existsSync6(dir)) {
+      mkdirSync4(dir, { recursive: true });
     }
   }
   clearSessionDir() {
     this.sessionDir = null;
   }
+  initSessionLog(sessionId) {
+    this.fileLog.initSessionLog(sessionId);
+  }
+  closeSessionLog() {
+    this.fileLog.closeSessionLog();
+  }
+  getLogPath() {
+    return this.fileLog.getLogPath();
+  }
+  cleanupOldLogs(maxDays, maxFiles) {
+    this.fileLog.cleanupOldLogs(maxDays, maxFiles);
+  }
+  logLLMRequest(model, messagesCount, promptPreview, caller) {
+    this.fileLog.logLLMRequest(model, messagesCount, promptPreview, caller);
+  }
+  logLLMResponse(model, responseLength, genTimeMs, error, caller) {
+    this.fileLog.logLLMResponse(model, responseLength, genTimeMs, error, caller);
+  }
+  logToolCall(tool, preview, result) {
+    this.fileLog.logToolCall(tool, preview, result);
+  }
+  logToolOutput(tool, output, exitCode) {
+    this.fileLog.logToolOutput(tool, output, exitCode);
+  }
+  logREPL(tag, content) {
+    this.fileLog.logREPL(tag, content);
+  }
   child(prefix) {
     const childLogger = new Logger(this.level, this.prefix ? `${this.prefix}:${prefix}` : prefix);
     if (this.logDir)
@@ -4066,10 +4248,11 @@ class Logger {
     const metaStr = sanitizedMeta ? ` ${JSON.stringify(sanitizedMeta)}` : "";
     const line = `[${level.toUpperCase()}]${prefix} ${ts} — ${sanitizedMsg}${metaStr}`;
     console.log(isColorEnabled() ? LEVEL_COLORS[level](line) : line);
+    this.fileLog.log(level.toUpperCase(), this.prefix || "MMA", `${ts} — ${sanitizedMsg}${metaStr}`);
     const logTarget = this.sessionDir ?? this.logDir;
     if (logTarget) {
       try {
-        appendFileSync(join5(logTarget, "app.jsonl"), JSON.stringify({
+        appendFileSync2(join6(logTarget, "app.jsonl"), JSON.stringify({
           level,
           ts,
           prefix: this.prefix,
@@ -4097,6 +4280,7 @@ class Logger {
 var import_picocolors, LEVELS, LEVEL_COLORS;
 var init_app_logger = __esm(() => {
   init_data_sanitizer();
+  init_file_log();
   import_picocolors = __toESM(require_picocolors(), 1);
   LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
   LEVEL_COLORS = {
@@ -5125,11 +5309,18 @@ class ToolExecutor {
     if (ctx)
       this.ctx = ctx;
     try {
-      return await this.execute({ id: `redirect_${Date.now()}`, name, arguments: args });
+      return await this.execute({
+        id: `redirect_${Date.now()}`,
+        name,
+        arguments: args
+      });
     } finally {
       this.ctx = prevCtx;
     }
   }
+  hasTool(name) {
+    return this.registry.has(name);
+  }
   async execute(call, signal) {
     const tool = this.registry.get(call.name);
     if (!tool) {
@@ -5143,12 +5334,12 @@ class ToolExecutor {
       if (plugin.onBeforeTool) {
         try {
           const proceed = await plugin.onBeforeTool(this.ctx, call);
-          if (!proceed) {
+          if (proceed === false || typeof proceed === "string") {
+            const pluginName = plugin.name || plugin.constructor?.name || "unknown";
+            const reason = typeof proceed === "string" ? proceed : undefined;
             return {
               success: false,
-              output: t("tool.blocked", {
-                plugin: plugin.constructor?.name || "unknown"
-              }),
+              output: reason ? t("tool.blocked_reason", { plugin: pluginName, reason }) : t("tool.blocked", { plugin: pluginName }),
               toolCallId: call.id
             };
           }
@@ -5209,6 +5400,8 @@ class ToolExecutor {
         }
       }
     }
+    this.ctx.logger.logToolCall(call.name, JSON.stringify(call.arguments)?.slice(0, 200) ?? "", result.success ? "OK" : `FAIL: ${result.output?.slice(0, 200)}`);
+    this.ctx.logger.logToolOutput(call.name, result.output ?? "", result.success ? 0 : 1);
     this.ctx.logger.debug(`Tool ${call.name}: ${result.success ? "OK" : "FAIL"}`);
     return result;
   }
@@ -5417,8 +5610,8 @@ __export(exports_audit_notifier, {
   DEFAULT_AUDIT_NOTIFIER_CONFIG: () => DEFAULT_AUDIT_NOTIFIER_CONFIG,
   AuditNotifier: () => AuditNotifier
 });
-import { writeFileSync as writeFileSync4, appendFileSync as appendFileSync2, existsSync as existsSync6, mkdirSync as mkdirSync4 } from "fs";
-import { join as join6, dirname as dirname2 } from "path";
+import { writeFileSync as writeFileSync4, appendFileSync as appendFileSync3, existsSync as existsSync7, mkdirSync as mkdirSync5 } from "fs";
+import { join as join7, dirname as dirname2 } from "path";
 import { homedir as homedir2 } from "os";
 import { readFileSync as readFileSync4 } from "fs";
 
@@ -5446,7 +5639,7 @@ class AuditNotifier {
   ensureLogDirectory() {
     if (this.config.filePath) {
       const dir = dirname2(this.config.filePath);
-      mkdirSync4(dir, { recursive: true });
+      mkdirSync5(dir, { recursive: true });
     }
   }
   shouldNotify(eventType) {
@@ -5512,7 +5705,7 @@ class AuditNotifier {
       return;
     try {
       const line = JSON.stringify(notification);
-      appendFileSync2(this.config.filePath, line + `
+      appendFileSync3(this.config.filePath, line + `
 `, "utf8");
     } catch (error) {
       console.error("[AuditNotifier] Failed to write to file:", error);
@@ -5568,7 +5761,7 @@ class AuditNotifier {
     this.isProcessing = false;
   }
   readNotifications(limit = 100) {
-    if (!this.config.filePath || !existsSync6(this.config.filePath)) {
+    if (!this.config.filePath || !existsSync7(this.config.filePath)) {
       return [];
     }
     try {
@@ -5625,7 +5818,7 @@ var init_audit_notifier = __esm(() => {
   };
   DEFAULT_AUDIT_NOTIFIER_CONFIG = {
     enabled: false,
-    filePath: join6(homedir2(), ".mma", "logs", "audit-notifications.jsonl"),
+    filePath: join7(homedir2(), ".mma", "logs", "audit-notifications.jsonl"),
     webhookTimeout: 5000,
     minSeverity: "medium",
     eventTypes: [
@@ -5642,26 +5835,26 @@ var init_audit_notifier = __esm(() => {
 });
 
 // src/modules/security/audit-log.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, appendFileSync as appendFileSync3 } from "fs";
-import { resolve as resolve2, join as join7 } from "path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync6, appendFileSync as appendFileSync4 } from "fs";
+import { resolve as resolve2, join as join8 } from "path";
 import { homedir as homedir3 } from "os";
 function getAuditDir() {
   return _sessionAuditDir ?? _globalAuditDir;
 }
 function setAuditSessionDir(dir) {
   _sessionAuditDir = dir;
-  if (!existsSync7(dir)) {
-    mkdirSync5(dir, { recursive: true, mode: 448 });
+  if (!existsSync8(dir)) {
+    mkdirSync6(dir, { recursive: true, mode: 448 });
   }
 }
 function logAudit(entry) {
   const dir = getAuditDir();
-  if (!existsSync7(dir)) {
-    mkdirSync5(dir, { recursive: true, mode: 448 });
+  if (!existsSync8(dir)) {
+    mkdirSync6(dir, { recursive: true, mode: 448 });
   }
   try {
     const logEntry = JSON.stringify(entry);
-    appendFileSync3(join7(dir, "audit.jsonl"), logEntry + `
+    appendFileSync4(join8(dir, "audit.jsonl"), logEntry + `
 `, "utf8");
   } catch {}
   try {
@@ -5726,12 +5919,12 @@ var init_audit_log = __esm(() => {
 
 // src/tools/path-utils.ts
 import { resolve as resolve3, normalize as normalize2, dirname as dirname3, basename, sep } from "path";
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync9 } from "fs";
 function safeResolvePath(baseDir, userPath) {
   const norm = normalize2(userPath);
   const stripped = norm.replace(/^[/\\]/, "");
   const resolved = resolve3(baseDir, stripped);
-  if (existsSync8(resolved) || existsSync8(dirname3(resolved)))
+  if (existsSync9(resolved) || existsSync9(dirname3(resolved)))
     return resolved;
   const baseNorm = normalize2(baseDir);
   let cur = baseNorm;
@@ -5748,11 +5941,11 @@ function safeResolvePath(baseDir, userPath) {
       if (afterChar && afterChar !== "\\" && afterChar !== "/") {
         const fixed = stripped.slice(0, afterIdx) + sep + stripped.slice(afterIdx);
         const fixedResolved = resolve3(baseDir, normalize2(fixed));
-        if (existsSync8(fixedResolved) || existsSync8(dirname3(fixedResolved))) {
+        if (existsSync9(fixedResolved) || existsSync9(dirname3(fixedResolved))) {
           return fixedResolved;
         }
         const fromParent = resolve3(dirname3(cur), normalize2(fixed));
-        if (existsSync8(fromParent) || existsSync8(dirname3(fromParent))) {
+        if (existsSync9(fromParent) || existsSync9(dirname3(fromParent))) {
           return fromParent;
         }
       }
@@ -5768,7 +5961,7 @@ var init_path_utils = () => {};
 var MAX_PREVIEW_LINES = 15;
 
 // src/tools/read-file.ts
-import { readFileSync as readFileSync5, existsSync as existsSync9 } from "fs";
+import { readFileSync as readFileSync5, existsSync as existsSync10 } from "fs";
 import { extname } from "path";
 var DEFAULT_LIMIT, readFileTool;
 var init_read_file = __esm(() => {
@@ -5812,8 +6005,12 @@ var init_read_file = __esm(() => {
           })
         };
       }
-      if (!existsSync9(resolved)) {
-        return { success: false, output: t("file.notfound", { path }) };
+      if (!existsSync10(resolved)) {
+        const output = resolved !== path ? t("file.notfound_resolved", {
+          path,
+          resolved
+        }) : t("file.notfound", { path });
+        return { success: false, output };
       }
       const content = readFileSync5(resolved, "utf-8");
       const lines = content.split(`
@@ -5863,7 +6060,7 @@ function scanContent(content, filePath, config) {
   if (matches.length > 0) {
     return {
       allowed: false,
-      reason: `Content contains dangerous patterns: ${matches.slice(0, 3).join(", ")}`,
+      reason: `Content contains dangerous patterns in ${filePath}: ${matches.slice(0, 3).join(", ")}`,
       matches
     };
   }
@@ -5881,32 +6078,27 @@ var init_content_scanner = __esm(() => {
     /require\('net'\).createServer/gi,
     /require\('fs'\).writeFileSync/gi,
     /require\('fs'\).unlinkSync/gi,
-    /process\.exit\(/gi,
-    /setInterval\(/gi,
-    /setTimeout\(/gi,
     /while\(true\)/gi,
     /for\(;;\)/gi,
     /rm -rf/gi,
     /dd if=/gi,
     /chmod 777/gi,
     /wget.*\|.*sh/gi,
-    /curl.*\|.*sh/gi,
-    /\$\{/gi,
-    /`[^`]+`/gi
+    /curl.*\|.*sh/gi
   ];
 });
 
 // src/modules/security/session-isolation.ts
-import { join as join8, resolve as resolve5 } from "path";
+import { join as join9, resolve as resolve5 } from "path";
 import { homedir as homedir4 } from "os";
-import { mkdirSync as mkdirSync6, existsSync as existsSync10 } from "fs";
+import { mkdirSync as mkdirSync7, existsSync as existsSync11 } from "fs";
 function createSessionContext(sessionId, projectDir, isolationConfig, securityOverrides) {
   const config = { ...DEFAULT_SESSION_ISOLATION, ...isolationConfig };
-  const baseDir = config.baseDir || join8(homedir4(), ".mma", "sessions", sessionId);
-  const tempDir = join8(baseDir, "temp");
-  if (config.isolateTempFiles && !existsSync10(tempDir)) {
+  const baseDir = config.baseDir || join9(homedir4(), ".mma", "sessions", sessionId);
+  const tempDir = join9(baseDir, "temp");
+  if (config.isolateTempFiles && !existsSync11(tempDir)) {
     try {
-      mkdirSync6(tempDir, { recursive: true, mode: 448 });
+      mkdirSync7(tempDir, { recursive: true, mode: 448 });
     } catch {}
   }
   return {
@@ -6136,7 +6328,7 @@ var init_diff = __esm(() => {
 });
 
 // src/tools/write-file.ts
-import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync7, existsSync as existsSync11, readFileSync as readFileSync6 } from "fs";
+import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync8, existsSync as existsSync12, readFileSync as readFileSync6 } from "fs";
 import { dirname as dirname4 } from "path";
 var writeFileTool;
 var init_write_file = __esm(() => {
@@ -6183,19 +6375,21 @@ var init_write_file = __esm(() => {
         };
       }
       const content = String(args.content);
-      const scanResult = scanContent(content, path, ctx.config.security?.contentScan);
-      if (!scanResult.allowed) {
-        logSecurityBlock(ctx.sessionId, "file_write", scanResult.reason || "Content contains dangerous patterns", path);
-        return {
-          success: false,
-          output: `[SECURITY BLOCKED] ${scanResult.reason}`
-        };
+      if (securityConfig?.enabled && securityConfig?.contentScan?.enabled) {
+        const scanResult = scanContent(content, path, securityConfig.contentScan);
+        if (!scanResult.allowed) {
+          logSecurityBlock(ctx.sessionId, "file_write", scanResult.reason || "Content contains dangerous patterns", path);
+          return {
+            success: false,
+            output: `[SECURITY BLOCKED] ${scanResult.reason}`
+          };
+        }
       }
       const dir = dirname4(resolved);
-      if (!existsSync11(dir)) {
-        mkdirSync7(dir, { recursive: true });
+      if (!existsSync12(dir)) {
+        mkdirSync8(dir, { recursive: true });
       }
-      const fileExists = existsSync11(resolved);
+      const fileExists = existsSync12(resolved);
       let oldContent = "";
       if (fileExists) {
         oldContent = readFileSync6(resolved, "utf-8");
@@ -6266,13 +6460,15 @@ var init_edit_file = __esm(() => {
         };
       }
       const updated = content.replace(oldStr, newStr);
-      const scanResult = scanContent(updated, path, ctx.config.security?.contentScan);
-      if (!scanResult.allowed) {
-        logSecurityBlock(ctx.sessionId, "file_write", scanResult.reason || "Content contains dangerous patterns", path);
-        return {
-          success: false,
-          output: `[SECURITY BLOCKED] ${scanResult.reason}`
-        };
+      if (securityConfig?.enabled && securityConfig?.contentScan?.enabled) {
+        const scanResult = scanContent(updated, path, securityConfig.contentScan);
+        if (!scanResult.allowed) {
+          logSecurityBlock(ctx.sessionId, "file_write", scanResult.reason || "Content contains dangerous patterns", path);
+          return {
+            success: false,
+            output: `[SECURITY BLOCKED] ${scanResult.reason}`
+          };
+        }
       }
       writeFileSync6(resolved, updated, "utf-8");
       const diff = generateDiff(content, updated);
@@ -6397,7 +6593,7 @@ var init_grep_tool = __esm(() => {
 });
 
 // src/tools/list-dir.ts
-import { readdirSync as readdirSync3, statSync, existsSync as existsSync12 } from "fs";
+import { readdirSync as readdirSync4, statSync as statSync2, existsSync as existsSync13 } from "fs";
 import { resolve as resolve8 } from "path";
 var listDirTool;
 var init_list_dir = __esm(() => {
@@ -6427,13 +6623,13 @@ var init_list_dir = __esm(() => {
           })
         };
       }
-      if (!existsSync12(resolved)) {
+      if (!existsSync13(resolved)) {
         return { success: false, output: t("file.dir_notfound", { path }) };
       }
-      const entries = readdirSync3(resolved);
+      const entries = readdirSync4(resolved);
       const lines = entries.map((e) => {
         const full = resolve8(resolved, e);
-        return statSync(full).isDirectory() ? `${e}/` : e;
+        return statSync2(full).isDirectory() ? `${e}/` : e;
       });
       if (lines.length === 0) {
         return { success: true, output: t("file.empty") };
@@ -6447,7 +6643,7 @@ var init_list_dir = __esm(() => {
 });
 
 // src/tools/create-dir.ts
-import { mkdirSync as mkdirSync8, existsSync as existsSync13 } from "fs";
+import { mkdirSync as mkdirSync9, existsSync as existsSync14 } from "fs";
 var createDirTool;
 var init_create_dir = __esm(() => {
   init_i18n();
@@ -6489,8 +6685,8 @@ var init_create_dir = __esm(() => {
           })
         };
       }
-      if (!existsSync13(resolved)) {
-        mkdirSync8(resolved, { recursive: true });
+      if (!existsSync14(resolved)) {
+        mkdirSync9(resolved, { recursive: true });
       }
       ctx.fileOperationsCount = currentCount + 1;
       logFileWrite(ctx.sessionId, path, true, "Directory created");
@@ -6500,7 +6696,7 @@ var init_create_dir = __esm(() => {
 });
 
 // src/tools/delete-file.ts
-import { unlinkSync as unlinkSync2, existsSync as existsSync14, statSync as statSync2, readFileSync as readFileSync8 } from "fs";
+import { unlinkSync as unlinkSync3, existsSync as existsSync15, statSync as statSync3, readFileSync as readFileSync8 } from "fs";
 var deleteFileTool;
 var init_delete_file = __esm(() => {
   init_i18n();
@@ -6543,14 +6739,14 @@ var init_delete_file = __esm(() => {
           })
         };
       }
-      if (!existsSync14(resolved)) {
+      if (!existsSync15(resolved)) {
         return { success: false, output: t("file.notfound", { path }) };
       }
-      if (statSync2(resolved).isDirectory()) {
+      if (statSync3(resolved).isDirectory()) {
         return { success: false, output: t("file.is_directory", { path }) };
       }
       const content = readFileSync8(resolved, "utf-8");
-      unlinkSync2(resolved);
+      unlinkSync3(resolved);
       const diff = generateDeleteDiff(content);
       ctx.fileOperationsCount = currentCount + 1;
       logFileDelete(ctx.sessionId, path, true);
@@ -6560,7 +6756,7 @@ var init_delete_file = __esm(() => {
 });
 
 // src/tools/move-file.ts
-import { renameSync, existsSync as existsSync15, mkdirSync as mkdirSync9 } from "fs";
+import { renameSync as renameSync2, existsSync as existsSync16, mkdirSync as mkdirSync10 } from "fs";
 import { resolve as resolve9, normalize as normalize3, dirname as dirname5 } from "path";
 var moveFileTool;
 var init_move_file = __esm(() => {
@@ -6618,17 +6814,17 @@ var init_move_file = __esm(() => {
           })
         };
       }
-      if (!existsSync15(fromResolved)) {
+      if (!existsSync16(fromResolved)) {
         return {
           success: false,
           output: t("file.not_found_short", { path: fromPath })
         };
       }
       const toDir = dirname5(toResolved);
-      if (!existsSync15(toDir)) {
-        mkdirSync9(toDir, { recursive: true });
+      if (!existsSync16(toDir)) {
+        mkdirSync10(toDir, { recursive: true });
       }
-      renameSync(fromResolved, toResolved);
+      renameSync2(fromResolved, toResolved);
       const diff = generateMoveDiff(fromPath, toPath);
       ctx.fileOperationsCount = currentCount + 1;
       logFileWrite(ctx.sessionId, `${fromPath} -> ${toPath}`, true, "File moved");
@@ -6642,7 +6838,7 @@ var init_move_file = __esm(() => {
 });
 
 // src/tools/file-info.ts
-import { statSync as statSync3, existsSync as existsSync16 } from "fs";
+import { statSync as statSync4, existsSync as existsSync17 } from "fs";
 var fileInfoTool;
 var init_file_info = __esm(() => {
   init_i18n();
@@ -6671,10 +6867,10 @@ var init_file_info = __esm(() => {
           })
         };
       }
-      if (!existsSync16(resolved)) {
+      if (!existsSync17(resolved)) {
         return { success: false, output: t("file.not_found_short", { path }) };
       }
-      const stat = statSync3(resolved);
+      const stat = statSync4(resolved);
       return {
         success: true,
         output: JSON.stringify({
@@ -6846,17 +7042,60 @@ var init_command_validator = __esm(() => {
 });
 
 // src/modules/processes/registry.ts
-import { spawn } from "child_process";
+import { spawn, spawnSync } from "child_process";
 import { platform } from "os";
+function getOemDecoder() {
+  if (oemDecoder !== undefined)
+    return oemDecoder;
+  oemDecoder = null;
+  try {
+    const cpOut = spawnSync("chcp.com", {
+      encoding: "buffer",
+      timeout: 2000,
+      windowsHide: true
+    }).stdout;
+    const m = cpOut ? cpOut.toString("latin1").match(/(\d+)/) : null;
+    if (m) {
+      try {
+        oemDecoder = new TextDecoder("ibm" + m[1]);
+      } catch {
+        oemDecoder = null;
+      }
+    }
+  } catch {}
+  if (!oemDecoder) {
+    try {
+      oemDecoder = new TextDecoder("ibm866");
+    } catch {
+      oemDecoder = null;
+    }
+  }
+  return oemDecoder;
+}
+function decodeLineToUtf8(buf) {
+  try {
+    return new TextDecoder("utf-8", { fatal: true }).decode(buf);
+  } catch {}
+  const oem = getOemDecoder();
+  if (oem) {
+    try {
+      return oem.decode(buf);
+    } catch {}
+  }
+  return buf.toString("latin1");
+}
 function killTree(child) {
   const pid = child.pid;
   if (!pid)
     return;
   if (platform() === "win32") {
-    spawn("taskkill", ["/pid", String(pid), "/T", "/F"], {
-      windowsHide: true,
-      stdio: "ignore"
-    });
+    try {
+      spawnSync("taskkill", ["/pid", String(pid), "/T", "/F"], {
+        windowsHide: true,
+        stdio: "ignore",
+        timeout: 3000
+      });
+    } catch {}
     return;
   }
   try {
@@ -6904,20 +7143,10 @@ class ProcessRegistry {
     }
     this.children.set(id, child);
     entry.pid = child.pid ?? 0;
-    const decoder = platform() === "win32" ? (() => {
-      try {
-        const cpOut = __require("child_process").execSync("chcp.com", {
-          encoding: "buffer",
-          timeout: 2000,
-          windowsHide: true
-        }).toString("latin1");
-        const m = cpOut.match(/(\d+)/);
-        if (m)
-          return new TextDecoder("ibm" + m[1]);
-      } catch {}
-      return new TextDecoder("ibm866");
-    })() : new TextDecoder("utf-8");
     let buf = "";
+    let byteBuf = Buffer.alloc(0);
+    const isWin = platform() === "win32";
+    const unixDecoder = new TextDecoder("utf-8");
     const pushLine = (line) => {
       if (entry.log.length >= MAX_LOG_LINES) {
         entry.log.shift();
@@ -6925,19 +7154,36 @@ class ProcessRegistry {
       entry.log.push(line);
     };
     const append = (chunk) => {
-      const decoded = decoder.decode(chunk, { stream: true });
-      buf += decoded;
-      const lines = buf.split(/\r?\n/);
-      buf = lines.pop() ?? "";
-      for (const line of lines) {
-        pushLine(line);
+      if (!isWin) {
+        const decoded = unixDecoder.decode(chunk, { stream: true });
+        buf += decoded;
+        const lines = buf.split(/\r?\n/);
+        buf = lines.pop() ?? "";
+        for (const line of lines) {
+          pushLine(line);
+        }
+        return;
+      }
+      byteBuf = byteBuf.length ? Buffer.concat([byteBuf, chunk]) : Buffer.from(chunk);
+      let nl;
+      while ((nl = byteBuf.indexOf(10)) !== -1) {
+        const raw = byteBuf.subarray(0, nl);
+        byteBuf = byteBuf.subarray(nl + 1);
+        pushLine(decodeLineToUtf8(raw).replace(/\r$/, ""));
       }
     };
     const flush = () => {
-      buf += decoder.decode();
-      if (buf) {
-        pushLine(buf);
-        buf = "";
+      if (!isWin) {
+        buf += unixDecoder.decode();
+        if (buf) {
+          pushLine(buf);
+          buf = "";
+        }
+        return;
+      }
+      if (byteBuf.length) {
+        pushLine(decodeLineToUtf8(byteBuf));
+        byteBuf = Buffer.alloc(0);
       }
     };
     const resolveExit = () => {
@@ -7046,7 +7292,7 @@ class ProcessRegistry {
     }
   }
 }
-var MAX_LOG_LINES = 2000, MAX_KEPT_PROCESSES = 20, seq = 0, processRegistry;
+var MAX_LOG_LINES = 2000, MAX_KEPT_PROCESSES = 20, seq = 0, oemDecoder, processRegistry;
 var init_registry = __esm(() => {
   processRegistry = new ProcessRegistry;
 });
@@ -7059,6 +7305,28 @@ var init_processes = __esm(() => {
 
 // src/tools/bash.ts
 import { platform as platform2 } from "os";
+function extractEchoFileWrite(command) {
+  if (!/^\s*(?:echo|printf)\b/i.test(command))
+    return null;
+  const m = command.match(/[>»]{1,2}\s*"?([^"'\s&|]+)"?/i);
+  if (!m)
+    return null;
+  return m[1].replace(/["'']$/g, "");
+}
+function translateSemicolonsForCmd(command) {
+  let out = "";
+  let inQuotes = false;
+  for (let i = 0;i < command.length; i++) {
+    const ch = command[i];
+    if (ch === '"') {
+      inQuotes = !inQuotes;
+      out += ch;
+      continue;
+    }
+    out += ch === ";" && !inQuotes ? "&" : ch;
+  }
+  return out;
+}
 function adaptCommandForWindows(command) {
   if (platform2() !== "win32")
     return command;
@@ -7077,13 +7345,15 @@ function adaptCommandForWindows(command) {
   if (translated && !trimmed.includes("|") && !trimmed.includes(">") && !trimmed.includes("&&") && !trimmed.includes(";")) {
     return trimmed.replace(firstWord, translated);
   }
-  return command;
+  return translateSemicolonsForCmd(command);
 }
 function detectToolCallInBash(command) {
   const match = command.trim().match(/^([\w-]+)\s+(.+)$/s);
   if (!match)
     return null;
   const tool = match[1];
+  if (NEVER_TOOL_CALLS.has(tool))
+    return null;
   const rest = match[2].trim();
   if (!/^[a-z][a-z0-9_]+$/.test(tool))
     return null;
@@ -7110,7 +7380,60 @@ function parseToolArgs(raw) {
   }
   return args;
 }
-var BASH_GRACE_MS = 5000, SPAWN_SETTLE_MS = 100, bashGraceMs, UNIX_TO_WIN_HINTS, UNIX_TO_WIN_TRANSLATE, bashTool;
+function detectTestResults(output) {
+  if (!output)
+    return null;
+  const jest = output.match(/Tests:\s+(\d+)\s+passed,\s*(\d+)\s+failed/i);
+  if (jest) {
+    return { framework: "jest", passed: +jest[1], failed: +jest[2] };
+  }
+  const mochaPass = output.match(/(\d+)\s+passing/i);
+  const mochaFail = output.match(/(\d+)\s+failing/i);
+  if (mochaPass || mochaFail) {
+    return {
+      framework: "mocha",
+      passed: mochaPass ? +mochaPass[1] : 0,
+      failed: mochaFail ? +mochaFail[1] : 0
+    };
+  }
+  const pytest = output.match(/(\d+)\s+passed[^\n]*?(?:,\s*(\d+)\s+failed)?/i);
+  if (pytest && /pytest|passed|failed/i.test(output) && /(=====|short test summary|tests\s+ok)/i.test(output) === false && /pytest|collect/i.test(output)) {
+    return {
+      framework: "pytest",
+      passed: +pytest[1],
+      failed: pytest[2] ? +pytest[2] : 0
+    };
+  }
+  const failMarkers = output.match(/\(fail\)/g)?.length ?? 0;
+  const passMarkers = output.match(/\(pass\)/g)?.length ?? 0;
+  const xMarkers = output.match(/\s×\s/g)?.length ?? 0;
+  const summaryMatch = output.match(/^\s*(\d+)\s+pass[^\n]*$/m);
+  const failSummary = output.match(/^\s*(\d+)\s+fail[^\n]*$/m);
+  const ran = output.match(/(?:Ran|ran)\s+\d+\s+tests/i);
+  if (failMarkers > 0 || passMarkers > 0 || xMarkers > 0 || ran) {
+    const failed = Math.max(failMarkers + xMarkers, failSummary ? +failSummary[1] : 0);
+    const passed = Math.max(passMarkers, summaryMatch ? +summaryMatch[1] : 0);
+    return {
+      framework: ran ? "bun/vitest" : "vitest",
+      passed,
+      failed,
+      summary: summaryMatch?.[0] ?? failSummary?.[0]
+    };
+  }
+  return null;
+}
+function emptyCliRunHint(command, output, code) {
+  if (code !== 0 || output.trim())
+    return null;
+  if (/[>|]/.test(command))
+    return null;
+  if (/\b(bun test|vitest|pytest|jest|mocha|--test)\b/i.test(command))
+    return null;
+  if (!CLI_FILE_RUN_RE.test(command))
+    return null;
+  return "the command exited 0 but printed NOTHING to stdout. If this should run a CLI program, the file probably has no entry point: read it with read_file and check the code actually calls its main function with command-line arguments (e.g. main(process.argv[2])) and prints results with console.log.";
+}
+var BASH_GRACE_MS = 5000, SPAWN_SETTLE_MS = 100, bashGraceMs, UNIX_TO_WIN_HINTS, UNIX_TO_WIN_TRANSLATE, NEVER_TOOL_CALLS, CLI_FILE_RUN_RE, bashTool;
 var init_bash = __esm(() => {
   init_command_validator();
   init_audit_log();
@@ -7137,17 +7460,48 @@ var init_bash = __esm(() => {
     which: 'Use "where" instead.',
     echo: "echo works on Windows, but avoid pipes (|).",
     "Get-Content": "Use the read_file tool instead.",
-    "Select-Object": "Use the read_file tool with offset/limit instead."
+    "Select-Object": "Use the read_file tool with offset/limit instead.",
+    "Write-Host": "PowerShell cmdlet — this shell is cmd.exe. Print with plain echo instead.",
+    "Select-String": "Use the grep tool instead.",
+    "Out-File": "Write files with the write_file tool instead.",
+    "Set-Content": "Write files with the write_file tool instead.",
+    "Get-ChildItem": "Use the list_dir tool instead.",
+    "Remove-Item": "Use the delete_file tool instead."
   };
   UNIX_TO_WIN_TRANSLATE = {
-    ls: "Get-ChildItem",
-    pwd: "Get-Location",
-    cat: "Get-Content",
-    wc: "@(Get-Content).Count"
+    ls: "dir",
+    pwd: "cd",
+    cat: "type"
   };
+  NEVER_TOOL_CALLS = new Set([
+    "echo",
+    "cat",
+    "type",
+    "printf",
+    "touch",
+    "mkdir",
+    "cp",
+    "mv",
+    "rm",
+    "ls",
+    "dir",
+    "cd",
+    "pwd",
+    "grep",
+    "find",
+    "head",
+    "tail",
+    "wc",
+    "chmod",
+    "sed",
+    "awk"
+  ]);
+  CLI_FILE_RUN_RE = /\b(bun|node|deno|python|python3|tsx|ts-node|php|ruby|go\s+run)\S*\s+(run\s+)?["']?[\w./\\-]+\.(ts|js|tsx|jsx|mjs|cjs|py)\b/;
   bashTool = {
     name: "bash",
-    description: "Execute a shell command and return its output. Use for running tests, build, git, and shell operations. Commands that are still running after a few seconds are automatically moved to the background and return a process id — manage them with process_list, process_log, process_kill. Set background=true to return a process id immediately for commands you know are long-running (dev servers, watchers).",
+    description: `Execute a shell command and return its output. Use for running tests, build, git, and shell operations. Commands that are still running after a few seconds are automatically moved to the background and return a process id — manage them with process_list, process_log, process_kill. Set background=true to return a process id immediately for commands you know are long-running (dev servers, watchers).
+
+Windows notes: the shell is cmd.exe — PowerShell cmdlets (Write-Host, Get-Content, Select-String, Out-File) and bash heredocs (cat << EOF) do NOT work there. Use the read_file/write_file tools instead of cat/echo redirection. Sequential commands: use && (a leading ; is auto-converted to &).`,
     tags: ["shell", "code"],
     parameters: {
       type: "object",
@@ -7167,7 +7521,7 @@ var init_bash = __esm(() => {
     handler: async (ctx, args) => {
       const originalCommand = String(args.command);
       const toolCall = detectToolCallInBash(originalCommand);
-      if (toolCall && toolCall.tool !== "bash" && ctx.toolExecutor) {
+      if (toolCall && toolCall.tool !== "bash" && ctx.toolExecutor && ctx.toolExecutor.hasTool(toolCall.tool)) {
         const redirected = await ctx.toolExecutor.executeByName(toolCall.tool, parseToolArgs(toolCall.args), ctx);
         return {
           success: redirected.success,
@@ -7176,6 +7530,15 @@ ${redirected.output}`
         };
       }
       const command = adaptCommandForWindows(originalCommand);
+      if (platform2() === "win32") {
+        const echoWrite = extractEchoFileWrite(originalCommand);
+        if (echoWrite) {
+          return {
+            success: false,
+            output: t("bash.echo_write_blocked", { path: echoWrite })
+          };
+        }
+      }
       const workdir = args.workdir ? String(args.workdir) : ctx.baseDir;
       const appConfig = ctx.config || {};
       const fullSecurityConfig = ctx.sessionContext ? getSessionSecurityConfig(appConfig, ctx.sessionContext) : appConfig.security || DEFAULT_SECURITY_CONFIG;
@@ -7211,6 +7574,22 @@ Hint: check the "workdir" path exists and the command is valid for this OS.`
           let output2 = entry.log.join(`
 `);
           processRegistry.remove(entry.id);
+          const cliHint = emptyCliRunHint(command, output2, code);
+          if (cliHint) {
+            output2 = `(exit code 0, no output)
+
+Hint: ${cliHint}`;
+          }
+          const testRun = detectTestResults(output2);
+          if (testRun && testRun.failed > 0) {
+            output2 = `[test-runner] ${testRun.framework}: ${testRun.failed} test(s) FAILING, ${testRun.passed} passing — do NOT mark verification steps as done while tests fail. Investigate the failures, fix the code, then re-run the tests.
+
+` + output2;
+          } else if (testRun && testRun.failed === 0 && testRun.passed > 0) {
+            output2 = `[test-runner] ${testRun.framework}: all ${testRun.passed} test(s) passing.
+
+${output2}`;
+          }
           if (!output2 && code !== 0) {
             output2 = `(exit code ${code})`;
           }
@@ -7228,7 +7607,14 @@ Hint: "${firstWord}" may not work on Windows. ${hint}`;
           }
           const lines = output2.split(`
 `);
-          if (lines.length > MAX_PREVIEW_LINES) {
+          if (testRun && testRun.failed > 0) {
+            const TEST_TAIL_LINES = 400;
+            const kept = lines.slice(-TEST_TAIL_LINES);
+            const skipped = lines.length - kept.length;
+            output2 = (skipped > 0 ? `[... ${skipped} earlier lines omitted — failing tests below]
+` : "") + kept.join(`
+`);
+          } else if (lines.length > MAX_PREVIEW_LINES) {
             output2 = lines.slice(0, MAX_PREVIEW_LINES).join(`
 `) + `
 ... (${lines.length - MAX_PREVIEW_LINES} more lines)`;
@@ -7453,6 +7839,7 @@ class SessionLogger {
     const dir = this.session.getSessionDirectory(meta.id);
     if (this.logger) {
       this.logger.setSessionDir(dir);
+      this.logger.initSessionLog(meta.id);
     }
     setAuditSessionDir(dir);
   }
@@ -8726,6 +9113,9 @@ class StuckDetector {
   escalationThreshold = 3;
   fileRewriteCount = new Map;
   fileRewriteThreshold = 3;
+  lastBashCommand = "";
+  lastBashOutput = "";
+  emptyBashRunCount = 0;
   constructor(threshold = 6, errorThreshold = 3) {
     this.threshold = threshold;
     this.errorThreshold = errorThreshold;
@@ -8754,6 +9144,22 @@ class StuckDetector {
   getLastErrorOutput() {
     return this.lastErrorOutput;
   }
+  recordBashOutput(command, output) {
+    const trimmed = output.trim();
+    if (command === this.lastBashCommand && !trimmed) {
+      this.emptyBashRunCount++;
+    } else {
+      this.emptyBashRunCount = 0;
+    }
+    this.lastBashCommand = command;
+    this.lastBashOutput = output;
+  }
+  getLastBashCommand() {
+    return this.lastBashCommand;
+  }
+  getLastBashOutput() {
+    return this.lastBashOutput;
+  }
   getLastFailedTool() {
     return this.lastFailedTool;
   }
@@ -8784,15 +9190,26 @@ class StuckDetector {
     if (this.recentToolCalls.length < this.repetitionThreshold)
       return false;
     const last = this.recentToolCalls[this.recentToolCalls.length - 1];
-    let count = 1;
+    let consecutiveCount = 1;
     for (let i = this.recentToolCalls.length - 2;i >= 0; i--) {
       if (this.recentToolCalls[i].name === last.name && this.recentToolCalls[i].argsKey === last.argsKey) {
-        count++;
+        consecutiveCount++;
       } else {
         break;
       }
     }
-    return count >= this.repetitionThreshold;
+    if (consecutiveCount >= this.repetitionThreshold)
+      return true;
+    const counts = new Map;
+    for (const call of this.recentToolCalls) {
+      const key = `${call.name}::${call.argsKey}`;
+      counts.set(key, (counts.get(key) || 0) + 1);
+    }
+    for (const count of counts.values()) {
+      if (count >= this.repetitionThreshold)
+        return true;
+    }
+    return false;
   }
   hasConsecutiveFailures() {
     return this.consecutiveFailures >= this.errorThreshold;
@@ -8838,6 +9255,10 @@ class StuckDetector {
   getActionableHints() {
     const hints = [];
     const error = this.lastErrorOutput;
+    const isScriptRun = /(^|[\s&])(bun|node|tsx|ts-node|deno|python|python3)\S*\s+[^|&]+\s+[^\s]+$/.test(this.lastBashCommand);
+    if (isScriptRun && !this.lastBashOutput.trim() && this.emptyBashRunCount >= 2) {
+      hints.push(`The command "${this.lastBashCommand}" ran ${this.emptyBashRunCount} times with EMPTY output. The program likely has no entry point — read the file with read_file and check that it actually calls its main function with process.argv / CLI arguments and prints results (console.log). Then run it again.`);
+    }
     if (!error)
       return hints;
     if (/Cannot read properties of undefined|is not a function|is not a constructor/i.test(error)) {
@@ -8867,6 +9288,18 @@ class StuckDetector {
       const file = this.getExcessiveRewriteFile();
       hints.push(`File ${file} has been rewritten ${this.getFileRewriteCount(file)} times without success. Stop rewriting and try a fundamentally different approach.`);
     }
+    if (/Write-Host|Get-Content|Select-String|Out-File|Set-Content/i.test(error)) {
+      hints.push("That looks like a PowerShell cmdlet — the shell here is cmd.exe. Use echo/type for output or the read_file/write_file tools instead.");
+    }
+    if (/Bun\.\w+ is not a function|Bun\.\w+ is not defined|Bun\.\w+ is not a constructor/i.test(error)) {
+      hints.push("That Bun API does not exist. Verify the API name in the Bun docs — common ones are Bun.file, Bun.write, Bun.spawn, Bun.serve. For file checks use fs.existsSync from node:fs.");
+    }
+    if (/error TS\d+|typecheck failed|syntax check failed/i.test(error)) {
+      hints.push("The file still has a type/syntax error (see the error line in the output). Read the file with read_file around the reported line, fix the actual error, then re-run — rewriting the whole file blindly usually makes it worse.");
+    }
+    if (/unexpected.*<<|Непредвиденное появление/i.test(error)) {
+      hints.push("Heredoc (<< EOF) is a bash feature — this shell is cmd.exe and does not support it. Write the file with write_file instead.");
+    }
     return hints;
   }
   getToolAlternative() {
@@ -8969,6 +9402,9 @@ class StuckDetector {
     this.recentToolCalls = [];
     this.fileRewriteCount.clear();
     this.escalationCount = 0;
+    this.lastBashCommand = "";
+    this.lastBashOutput = "";
+    this.emptyBashRunCount = 0;
   }
   resetStepState(stepId) {
     this.currentStepId = stepId;
@@ -8979,7 +9415,9 @@ class StuckDetector {
     this.lastErrorOutput = "";
     this.recentToolCalls = [];
     this.fileRewriteCount.clear();
-    this.escalationCount = 0;
+    this.lastBashCommand = "";
+    this.lastBashOutput = "";
+    this.emptyBashRunCount = 0;
   }
 }
 var init_stuck_detector = __esm(() => {
@@ -9263,7 +9701,7 @@ var init_moe_executor = __esm(() => {
 });
 
 // src/modules/execution/verifier.ts
-import { existsSync as existsSync17 } from "fs";
+import { existsSync as existsSync18 } from "fs";
 import { resolve as resolve10, extname as extname2 } from "path";
 import { spawn as spawn2 } from "child_process";
 
@@ -9274,7 +9712,7 @@ class StepVerifier {
   }
   async checkFileExists(path) {
     const resolved = resolve10(this.baseDir, path);
-    const exists = existsSync17(resolved);
+    const exists = existsSync18(resolved);
     return {
       passed: exists,
       message: exists ? t("verify.file_exists", { path }) : t("verify.file_not_found", { path })
@@ -9290,7 +9728,7 @@ class StepVerifier {
   }
   async runTypeCheck() {
     const tsconfigPath = resolve10(this.baseDir, "tsconfig.json");
-    if (!existsSync17(tsconfigPath)) {
+    if (!existsSync18(tsconfigPath)) {
       return { passed: true, message: "No tsconfig.json found — skipping type check" };
     }
     try {
@@ -9303,7 +9741,7 @@ class StepVerifier {
   }
   async runTests() {
     const pkgPath = resolve10(this.baseDir, "package.json");
-    if (!existsSync17(pkgPath)) {
+    if (!existsSync18(pkgPath)) {
       return { passed: true, message: "No package.json found — skipping tests" };
     }
     try {
@@ -9553,8 +9991,8 @@ var init_agent_moe = __esm(() => {
 });
 
 // src/modules/memory/search.ts
-import { readFileSync as readFileSync9, existsSync as existsSync18 } from "fs";
-import { join as join9 } from "path";
+import { readFileSync as readFileSync9, existsSync as existsSync19 } from "fs";
+import { join as join10 } from "path";
 
 class MemorySearch {
   memoryDir;
@@ -9565,8 +10003,8 @@ class MemorySearch {
     const results = [];
     const lowerQuery = query.toLowerCase();
     for (const name of MEMORY_FILES) {
-      const path = join9(this.memoryDir, `${name}.md`);
-      if (!existsSync18(path))
+      const path = join10(this.memoryDir, `${name}.md`);
+      if (!existsSync19(path))
         continue;
       const content = readFileSync9(path, "utf-8");
       const lines = content.split(`
@@ -9577,8 +10015,8 @@ class MemorySearch {
         }
       }
     }
-    const prefsPath = join9(this.memoryDir, "preferences.json");
-    if (existsSync18(prefsPath)) {
+    const prefsPath = join10(this.memoryDir, "preferences.json");
+    if (existsSync19(prefsPath)) {
       try {
         const prefs = JSON.parse(readFileSync9(prefsPath, "utf-8"));
         for (const [key, value] of Object.entries(prefs)) {
@@ -9598,8 +10036,8 @@ var init_search = __esm(() => {
 });
 
 // src/modules/memory/store.ts
-import { readFileSync as readFileSync10, writeFileSync as writeFileSync7, appendFileSync as appendFileSync4, existsSync as existsSync19, mkdirSync as mkdirSync10 } from "fs";
-import { join as join10 } from "path";
+import { readFileSync as readFileSync10, writeFileSync as writeFileSync7, appendFileSync as appendFileSync5, existsSync as existsSync20, mkdirSync as mkdirSync11 } from "fs";
+import { join as join11 } from "path";
 
 class MemoryStore {
   memoryDir;
@@ -9607,8 +10045,8 @@ class MemoryStore {
     this.memoryDir = memoryDir;
     this.ensureDir();
     for (const name of MEMORY_FILES2) {
-      const path = join10(this.memoryDir, `${name}.md`);
-      if (!existsSync19(path)) {
+      const path = join11(this.memoryDir, `${name}.md`);
+      if (!existsSync20(path)) {
         writeFileSync7(path, `# ${name.charAt(0).toUpperCase() + name.slice(1)}
 
 `, "utf-8");
@@ -9616,33 +10054,33 @@ class MemoryStore {
     }
   }
   ensureDir() {
-    if (!existsSync19(this.memoryDir)) {
-      mkdirSync10(this.memoryDir, { recursive: true });
+    if (!existsSync20(this.memoryDir)) {
+      mkdirSync11(this.memoryDir, { recursive: true });
     }
   }
   read(name) {
-    const path = join10(this.memoryDir, `${name}.md`);
-    if (!existsSync19(path))
+    const path = join11(this.memoryDir, `${name}.md`);
+    if (!existsSync20(path))
       return "";
     return readFileSync10(path, "utf-8");
   }
   append(name, entry) {
-    const path = join10(this.memoryDir, `${name}.md`);
+    const path = join11(this.memoryDir, `${name}.md`);
     const timestamp = new Date().toISOString().replace("T", " ").slice(0, 19);
     const formatted = `- **${timestamp}** — ${entry}
 `;
-    appendFileSync4(path, formatted, "utf-8");
+    appendFileSync5(path, formatted, "utf-8");
   }
   search(query) {
     const searchModule = new MemorySearch(this.memoryDir);
     return searchModule.query(query);
   }
   prefsPath() {
-    return join10(this.memoryDir, "preferences.json");
+    return join11(this.memoryDir, "preferences.json");
   }
   getPreferences() {
     const path = this.prefsPath();
-    if (!existsSync19(path))
+    if (!existsSync20(path))
       return {};
     try {
       return JSON.parse(readFileSync10(path, "utf-8"));
@@ -9677,7 +10115,7 @@ var init_store = __esm(() => {
 });
 
 // src/core/agent.ts
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 function isToolCallJson(text) {
   const trimmed = text.trim();
   if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
@@ -9716,12 +10154,14 @@ class Agent {
     if (dynamic.length > 0) {
       builder.addBlocks(dynamic);
     }
-    const pluginBlocks = (this.deps.pluginManager.runOnBuildPrompt?.() ?? []).filter((s) => Boolean(s && s.trim() !== "")).map((content) => ({
-      content,
-      priority: "low",
-      essential: false,
-      estimatedTokens: this.deps.llmProvider.countTokens(content)
-    }));
+    const pluginBlocks = (this.deps.pluginManager.runOnBuildPrompt?.() ?? []).flatMap((content) => content && content.trim() !== "" ? [
+      {
+        content,
+        priority: "low",
+        essential: false,
+        estimatedTokens: this.deps.llmProvider.countTokens(content)
+      }
+    ] : []);
     if (pluginBlocks.length > 0) {
       builder.addBlocks(pluginBlocks);
     }
@@ -9732,6 +10172,18 @@ class Agent {
     const tokenCount = this.deps.llmProvider.countTokens(prompt);
     return { text: prompt, tokenCount, excluded };
   }
+  resolveUsageTokens(apiPromptTokens, apiCompletionTokens, estimatedPromptTokens, completionChars) {
+    if (apiPromptTokens > 0 || apiCompletionTokens > 0) {
+      return {
+        prompt: apiPromptTokens,
+        completion: apiCompletionTokens,
+        total: apiPromptTokens + apiCompletionTokens
+      };
+    }
+    const prompt = Math.max(1, estimatedPromptTokens);
+    const completion = Math.max(0, Math.ceil(completionChars / 4));
+    return { prompt, completion, total: prompt + completion };
+  }
   refreshSystemPrompt() {
     const { prompt } = this.buildSystemPrompt();
     const current = this.deps.contextManager.getActiveHistory().find((m) => m.role === "system");
@@ -9830,11 +10282,20 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
     let lastToolSignature = "";
     let apiPromptTokens = 0;
     let apiCompletionTokens = 0;
+    let apiCompletionChars = 0;
     const MAX_HALLUCINATION_RETRIES = 3;
     let consecutiveToolFailures = 0;
     const MAX_CONSECUTIVE_TOOL_FAILURES = 5;
     let auditRetries = 0;
     const MAX_AUDIT_RETRIES = 3;
+    let emptyResponseRetries = 0;
+    const MAX_EMPTY_RESPONSE_RETRIES = 2;
+    let emptyResponseExhausted = false;
+    let repeatedToolCount = 0;
+    const MAX_REPEATED_TOOL_CALLS = 2;
+    const allToolsForBudget = toolExecutor.getToolDefinitions(this.deps.toolTags);
+    const toolTokenEstimate = allToolsForBudget.reduce((sum, t2) => sum + Math.ceil((t2.description.length + JSON.stringify(t2.parameters).length) / 4), 0);
+    contextManager.setToolTokens(toolTokenEstimate);
     while (iteration < config.maxToolIterations && !this.shutdownRequested) {
       iteration++;
       contextManager.noteIteration();
@@ -9868,8 +10329,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       }
       this.refreshSystemPrompt();
       const history = contextManager.getActiveHistory();
-      const allTools = toolExecutor.getToolDefinitions(this.deps.toolTags);
-      slog.logToolDefs(allTools.length, allTools.map((t2) => t2.name), iteration);
+      slog.logToolDefs(allToolsForBudget.length, allToolsForBudget.map((t2) => t2.name), iteration);
       let textContent = "";
       let reasoningContent = "";
       const toolCalls = [];
@@ -9877,8 +10337,10 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       let emittedReasoning = false;
       const textChunks = [];
       this.emitPhase(iteration, "thinking", onPhase);
+      const llmStart = Date.now();
+      logger.logLLMRequest(config.model, history.length, input, "agent");
       try {
-        for await (const chunk of llmProvider.chat(history, allTools, this.abortController?.signal)) {
+        for await (const chunk of llmProvider.chat(history, allToolsForBudget, this.abortController?.signal)) {
           if (this.shutdownRequested)
             break;
           if (chunk.type === "text" && chunk.content) {
@@ -9924,6 +10386,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           logger.info("LLM call aborted (interrupt)");
           break;
         }
+        logger.logLLMResponse(config.model, textContent.length, Date.now() - llmStart, err.message, "agent");
         logger.error(`LLM call failed: ${err.message}`);
         slog.logError(err.message);
         pluginManager.runOnError({ iteration, logger }, err);
@@ -9936,6 +10399,8 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       } finally {
         this.emitPhase(iteration, "done", onPhase);
       }
+      apiCompletionChars += (textContent || reasoningContent).length;
+      logger.logLLMResponse(config.model, (textContent || reasoningContent).length, Date.now() - llmStart, undefined, "agent");
       if (this.shutdownRequested) {
         break;
       }
@@ -9959,8 +10424,15 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       if (this.deps.exitOnComplete && sawToolCall) {
         const signature = toolCalls.map((tc) => `${tc.name}:${JSON.stringify(tc.arguments)}`).join("|");
         if (signature && signature === lastToolSignature) {
-          logger.debug("Exit-on-complete: repeated identical tool call, stopping");
-          break;
+          repeatedToolCount++;
+          if (repeatedToolCount >= MAX_REPEATED_TOOL_CALLS) {
+            logger.debug("Exit-on-complete: repeated identical tool call, stopping");
+            break;
+          }
+          contextManager.addMessage({
+            role: "user",
+            content: `<system-summary>You just called the same tool with identical arguments. If the task is done, answer with a final text response NOW. If the command failed, try a different approach.</system-summary>`
+          });
         }
         lastToolSignature = signature;
       }
@@ -10070,7 +10542,7 @@ ${taskReminder}</system-summary>`
           if (sessionManager) {
             const activeSession = sessionManager.getActiveMeta();
             if (activeSession) {
-              const memDir = join11(baseDir, ".mma", "memory");
+              const memDir = join12(baseDir, ".mma", "memory");
               const memStore = new MemoryStore(memDir);
               memStore.appendRule("errors", `${consecutiveToolFailures} consecutive tool failures`, "Multiple tools failing suggests environment or configuration issue", "Check dependencies, verify file paths, try write_file directly instead of shell commands");
             }
@@ -10134,8 +10606,9 @@ ${warnLine}
         }
       }
       if (hallucinationResult.status === "retry") {
-        if (this.deps.exitOnComplete) {
+        if (this.deps.exitOnComplete && textContent?.trim()) {
           logger.debug("Exit-on-complete: stopping on first response");
+          lastText = textContent;
           break;
         }
         if (hallucinationRetries >= MAX_HALLUCINATION_RETRIES) {
@@ -10165,7 +10638,9 @@ ${warnLine}
       }
       if (textContent) {
         contextManager.addMessage({ role: "assistant", content: textContent });
-        slog.saveAssistantMessage(textContent);
+        if (config.session.autoSave) {
+          slog.saveAssistantMessage(textContent);
+        }
         slog.logAssistant(textContent, reasoningContent, undefined, iteration);
       }
       lastText = textContent;
@@ -10178,6 +10653,19 @@ ${warnLine}
         }
       }
       if (!sawToolCall) {
+        if (!textContent?.trim()) {
+          if (emptyResponseRetries < MAX_EMPTY_RESPONSE_RETRIES) {
+            emptyResponseRetries++;
+            logger.warn(`Empty response on iteration ${iteration} (retry ${emptyResponseRetries}/${MAX_EMPTY_RESPONSE_RETRIES})`);
+            contextManager.addMessage({
+              role: "user",
+              content: `<system-summary>Your previous response was empty. Answer the user's task now with a final text response or call a tool. Do not reply with reasoning only.</system-summary>`
+            });
+            continue;
+          }
+          emptyResponseExhausted = true;
+          logger.warn(`Empty response retries exhausted after ${MAX_EMPTY_RESPONSE_RETRIES} attempts`);
+        }
         if (this.deps.finalAudit) {
           const audit = await this.deps.finalAudit();
           if (audit && !audit.passed) {
@@ -10204,6 +10692,7 @@ ${warnLine}
     }
     const tokensUsed = contextManager.getEstimatedTokens();
     const budget = contextManager.getBudget();
+    const usageTokens = this.resolveUsageTokens(apiPromptTokens, apiCompletionTokens, tokensUsed, apiCompletionChars);
     if (iteration >= config.maxToolIterations) {
       return {
         success: false,
@@ -10212,22 +10701,23 @@ ${warnLine}
         iterationCount: iteration,
         contextUsed: tokensUsed,
         contextLimit: budget.history,
-        promptTokens: apiPromptTokens,
-        completionTokens: apiCompletionTokens,
-        totalTokens: apiPromptTokens + apiCompletionTokens,
+        promptTokens: usageTokens.prompt,
+        completionTokens: usageTokens.completion,
+        totalTokens: usageTokens.total,
         compactionCount: contextManager.getCompactionCount(),
         contextQuality: contextManager.getQuality()
       };
     }
     return {
-      success: true,
+      success: emptyResponseExhausted ? false : true,
       text: lastText,
+      error: emptyResponseExhausted ? t("error.empty_response") : undefined,
       iterationCount: iteration,
       contextUsed: tokensUsed,
       contextLimit: budget.history,
-      promptTokens: apiPromptTokens,
-      completionTokens: apiCompletionTokens,
-      totalTokens: apiPromptTokens + apiCompletionTokens,
+      promptTokens: usageTokens.prompt,
+      completionTokens: usageTokens.completion,
+      totalTokens: usageTokens.total,
       compactionCount: contextManager.getCompactionCount(),
       contextQuality: contextManager.getQuality()
     };
@@ -10279,6 +10769,7 @@ ${warnLine}
     if (killed > 0) {
       logger.info(`Killed ${killed} background process(es) on shutdown`);
     }
+    logger.closeSessionLog();
     pluginManager.runOnSessionEnd({
       logger,
       sessionManager: sessionManager?.getActiveMeta()
@@ -10349,8 +10840,10 @@ class ContextManager {
   fileFacts = [];
   decisionFacts = [];
   errorFacts = [];
+  static MAX_FACTS = 20;
   tokenCounter;
   pendingImageParts = [];
+  toolTokens = 0;
   onCompact = null;
   constructor(contextWindow, contextBudget, tokenCounter) {
     this.contextWindow = contextWindow;
@@ -10505,10 +10998,16 @@ ${lines.join(`
       content: `<system-summary>${this.compactedBlock}</system-summary>`
     };
     const firstSystem = this.messages.find((m) => m.role === "system");
+    const freshRecent = recentTurns.filter((m) => {
+      if (m.role !== "user")
+        return true;
+      const text = getMessageText(m.content);
+      return !text.startsWith("<system-summary>");
+    });
     this.messages = [
       ...firstSystem ? [firstSystem] : [],
       summary,
-      ...recentTurns
+      ...freshRecent
     ];
     this.iterationsSinceCompaction = 0;
     if (this.onCompact) {
@@ -10521,19 +11020,22 @@ ${lines.join(`
       /Файл (?:создан|обновлён|записан|удалён|перемещён):? ([\w./\\-]+\.[a-z]+)/gi,
       /file (?:created|updated|written|deleted|moved):? ([\w./\\-]+\.[a-z]+)/gi
     ];
+    const newFiles = [];
+    const newDecisions = [];
+    const newErrors = [];
     for (const msg of turns) {
       const content = getMessageText(msg.content);
       if (msg.role === "tool") {
         for (const pattern of filePatterns) {
           for (const match of content.matchAll(pattern)) {
-            this.fileFacts.push(match[1]);
+            newFiles.push(match[1]);
           }
         }
         if (content.includes("Plan:") && content.includes("[")) {
           const planLine = content.split(`
 `).find((line) => line.includes("Plan:"));
           if (planLine)
-            this.decisionFacts.push(planLine.trim());
+            newDecisions.push(planLine.trim());
         }
       }
       if (msg.role === "assistant") {
@@ -10541,16 +11043,20 @@ ${lines.join(`
           const line = content.split(`
 `).find((l) => l.includes("decided:") || l.includes("decision:"));
           if (line)
-            this.decisionFacts.push(line.trim().slice(0, 200));
+            newDecisions.push(line.trim().slice(0, 200));
         }
       }
       if (content.includes("Error:") || content.includes("failed") || content.includes("Ошибка:") || content.includes("не удалось")) {
         const line = content.split(`
 `).find((l) => l.includes("Error:") || l.includes("failed") || l.includes("Ошибка:") || l.includes("не удалось"));
         if (line)
-          this.errorFacts.push(line.trim().slice(0, 250));
+          newErrors.push(line.trim().slice(0, 250));
       }
     }
+    const dedup = (arr) => [...new Set(arr)];
+    this.fileFacts = dedup([...this.fileFacts, ...newFiles]).slice(-ContextManager.MAX_FACTS);
+    this.decisionFacts = dedup([...this.decisionFacts, ...newDecisions]).slice(-ContextManager.MAX_FACTS);
+    this.errorFacts = dedup([...this.errorFacts, ...newErrors]).slice(-ContextManager.MAX_FACTS);
   }
   updateSystemPrompt(content) {
     const idx = this.messages.findIndex((m) => m.role === "system");
@@ -10571,7 +11077,10 @@ ${lines.join(`
     this.peakTokens = 0;
   }
   getEstimatedTokens() {
-    return this.messages.reduce((sum, m) => sum + this.estimateMessageTokens(m), 0);
+    return this.messages.reduce((sum, m) => sum + this.estimateMessageTokens(m), 0) + this.toolTokens;
+  }
+  setToolTokens(tokens) {
+    this.toolTokens = tokens;
   }
   resize(contextWindow, contextBudget, tokenCounter) {
     this.contextWindow = contextWindow;
@@ -10668,15 +11177,83 @@ var init_confidence = __esm(() => {
   init_i18n();
 });
 
+// src/modules/hallucination/js-identifiers.ts
+function isJsMemberAccess(candidate) {
+  const lower = candidate.toLowerCase();
+  const m = lower.match(/^([\w-]+)\./);
+  return m !== null && JS_GLOBALS.has(m[1]);
+}
+var JS_GLOBALS;
+var init_js_identifiers = __esm(() => {
+  JS_GLOBALS = new Set([
+    "process",
+    "console",
+    "math",
+    "json",
+    "global",
+    "globalthis",
+    "window",
+    "document",
+    "buffer",
+    "module",
+    "require",
+    "exports",
+    "url",
+    "promise",
+    "array",
+    "object",
+    "string",
+    "number",
+    "boolean",
+    "symbol",
+    "date",
+    "regexp",
+    "error",
+    "map",
+    "set",
+    "weakmap",
+    "weakset",
+    "proxy",
+    "reflect",
+    "intl",
+    "crypto",
+    "performance",
+    "fetch",
+    "navigator",
+    "location",
+    "settimeout",
+    "setinterval",
+    "cleartimeout",
+    "clearinterval",
+    "queuemicrotask",
+    "structuredclone",
+    "textencoder",
+    "textdecoder",
+    "atomics",
+    "sharedarraybuffer",
+    "dataview",
+    "arraybuffer",
+    "bigint",
+    "infinity",
+    "nan",
+    "undefined",
+    "bun",
+    "deno",
+    "node"
+  ]);
+});
+
 // src/modules/hallucination/factual.ts
-import { existsSync as existsSync20, readdirSync as readdirSync4 } from "fs";
-import { resolve as resolve11, isAbsolute, join as join12 } from "path";
+import { existsSync as existsSync21, readdirSync as readdirSync5 } from "fs";
+import { resolve as resolve11, isAbsolute, join as join13 } from "path";
 function looksLikeFilePath(s) {
   const lower = s.toLowerCase();
   if (TECH_NAMES.has(lower))
     return false;
   if (!s.includes("/") && !s.includes("\\") && !s.match(/^\w+\.[a-z]{2,4}$/i))
     return false;
+  if (isJsMemberAccess(s))
+    return false;
   const ext = s.split(".").pop()?.toLowerCase() || "";
   return !NON_FILE_EXTENSIONS.has(ext);
 }
@@ -10714,14 +11291,14 @@ class FactualCheck {
   }
   pathExists(fp) {
     if (isAbsolute(fp))
-      return existsSync20(fp);
+      return existsSync21(fp);
     if (!fp.includes("/") && !fp.includes("\\")) {
       return this.bareNameExists(fp);
     }
-    return existsSync20(resolve11(this.baseDir, fp));
+    return existsSync21(resolve11(this.baseDir, fp));
   }
   bareNameExists(name) {
-    if (existsSync20(resolve11(this.baseDir, name)))
+    if (existsSync21(resolve11(this.baseDir, name)))
       return true;
     if (this.indexHas(name))
       return true;
@@ -10754,14 +11331,14 @@ class FactualCheck {
       return count;
     let entries;
     try {
-      entries = readdirSync4(dir, { withFileTypes: true });
+      entries = readdirSync5(dir, { withFileTypes: true });
     } catch {
       return count;
     }
     for (const entry of entries) {
       if (count >= FactualCheck.MAX_INDEXED_FILES)
         break;
-      const full = join12(dir, entry.name);
+      const full = join13(dir, entry.name);
       if (entry.isDirectory()) {
         if (!IGNORED_DIRS.has(entry.name)) {
           count = this.scanDir(full, index, count);
@@ -10786,6 +11363,7 @@ class FactualCheck {
 var IGNORED_DIRS, NON_FILE_EXTENSIONS, TECH_NAMES;
 var init_factual = __esm(() => {
   init_i18n();
+  init_js_identifiers();
   IGNORED_DIRS = new Set([
     "node_modules",
     ".git",
@@ -12388,7 +12966,7 @@ ${JSON.stringify(result, null, 2)}`
 
 // src/tools/search-history.ts
 import * as fs from "fs";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 import { homedir as homedir5 } from "os";
 function searchFile(filePath, query, maxResults, results) {
   if (!fs.existsSync(filePath))
@@ -12432,7 +13010,7 @@ var init_search_history = __esm(() => {
       const query = String(args.query || "").toLowerCase();
       const maxResults = Number(args.maxResults) || 5;
       const sessionId = args.sessionId ? String(args.sessionId) : null;
-      const sessionDir = join13(homedir5(), ".mma", "sessions");
+      const sessionDir = join14(homedir5(), ".mma", "sessions");
       const results = [];
       try {
         if (!fs.existsSync(sessionDir)) {
@@ -12447,7 +13025,7 @@ var init_search_history = __esm(() => {
             continue;
           if (sessionId && entry.name !== sessionId)
             continue;
-          const historyFile = join13(sessionDir, entry.name, "history.jsonl");
+          const historyFile = join14(sessionDir, entry.name, "history.jsonl");
           searchFile(historyFile, query, maxResults, results);
           if (results.length >= maxResults)
             break;
@@ -12475,7 +13053,7 @@ var init_search_history = __esm(() => {
 
 // src/tools/remember.ts
 import { homedir as homedir6 } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 var CATEGORIES, rememberTool;
 var init_remember = __esm(() => {
   init_i18n();
@@ -12513,7 +13091,7 @@ var init_remember = __esm(() => {
       if (!CATEGORIES.includes(category)) {
         return { success: false, output: t("tool.invalid_params") };
       }
-      const memoryDir = join14(homedir6(), ".mma", "memory");
+      const memoryDir = join15(homedir6(), ".mma", "memory");
       const store = new MemoryStore(memoryDir);
       try {
         if (category === "preferences") {
@@ -12546,7 +13124,7 @@ var init_remember = __esm(() => {
 
 // src/tools/recall.ts
 import { homedir as homedir7 } from "os";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 function formatAll(store) {
   const parts = [];
   const prefs = store.getPreferences();
@@ -12629,7 +13207,7 @@ var init_recall = __esm(() => {
     handler: async (_ctx, args) => {
       const query = args.query ? String(args.query) : "";
       const category = args.category ? String(args.category) : "";
-      const memoryDir = join15(homedir7(), ".mma", "memory");
+      const memoryDir = join16(homedir7(), ".mma", "memory");
       const store = new MemoryStore(memoryDir);
       try {
         if (!query && !category) {
@@ -12825,15 +13403,15 @@ function buildIndexInjectionScript() {
 
 // src/modules/browser/cookie-store.ts
 import { readFile, writeFile, mkdir } from "fs/promises";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 class CookieStore {
   filePath;
   constructor(cookieDir) {
-    this.filePath = join16(cookieDir, "cookies.json");
+    this.filePath = join17(cookieDir, "cookies.json");
   }
   async save(cookies) {
-    await mkdir(join16(this.filePath, ".."), { recursive: true });
+    await mkdir(join17(this.filePath, ".."), { recursive: true });
     await writeFile(this.filePath, JSON.stringify(cookies, null, 2), "utf-8");
   }
   async load() {
@@ -12851,7 +13429,9 @@ class CookieStore {
 var init_cookie_store = () => {};
 
 // src/modules/browser/session.ts
-import { chromium } from "playwright";
+import {
+  chromium
+} from "playwright";
 
 class BrowserActionTracker {
   history = [];
@@ -12866,7 +13446,10 @@ class BrowserActionTracker {
     const recent = this.history.slice(-this.threshold);
     const allSame = recent.every((h) => h.action === recent[0].action && h.url === recent[0].url && JSON.stringify(h.args) === JSON.stringify(recent[0].args));
     if (allSame) {
-      return t("browser.repeated_action", { action, threshold: this.threshold });
+      return t("browser.repeated_action", {
+        action,
+        threshold: this.threshold
+      });
     }
     return null;
   }
@@ -12881,7 +13464,12 @@ class BrowserSession {
   page = null;
   config;
   cookieStore;
-  state = { isOpen: false, url: null, title: null, elementCount: 0 };
+  state = {
+    isOpen: false,
+    url: null,
+    title: null,
+    elementCount: 0
+  };
   actionTracker = new BrowserActionTracker(3);
   constructor(config) {
     this.config = config;
@@ -12925,7 +13513,10 @@ class BrowserSession {
           result = await this.wait(Number(args.ms || 1000));
           break;
         default:
-          return { success: false, output: t("browser.unknown_action", { action }) };
+          return {
+            success: false,
+            output: t("browser.unknown_action", { action })
+          };
       }
       if (action !== "open") {
         const warning = this.actionTracker.record(action, args, this.page?.url() || "");
@@ -12937,7 +13528,10 @@ class BrowserSession {
       }
       return result;
     } catch (err) {
-      return { success: false, output: t("browser.error", { message: err.message }) };
+      return {
+        success: false,
+        output: t("browser.error", { message: err.message })
+      };
     }
   }
   async ensurePage() {
@@ -12951,7 +13545,10 @@ class BrowserSession {
       return;
     this.browser = await chromium.launch({ headless: this.config.headless });
     this.context = await this.browser.newContext({
-      viewport: { width: this.config.viewportWidth, height: this.config.viewportHeight }
+      viewport: {
+        width: this.config.viewportWidth,
+        height: this.config.viewportHeight
+      }
     });
     const savedCookies = await this.cookieStore.load();
     if (savedCookies.length > 0) {
@@ -12990,17 +13587,24 @@ class BrowserSession {
   async open(url) {
     if (!url)
       return { success: false, output: t("browser.url_required") };
-    if (!url.startsWith("http://") && !url.startsWith("https://")) {
-      url = "https://" + url;
+    if (!url.startsWith("http://") && !url.startsWith("https://") && !url.startsWith("file://")) {
+      const isLocalhost = /^(localhost|127\.0\.0\.1|0\.0\.0\.0)(:\d+)?$/i.test(url);
+      url = isLocalhost ? "http://" + url : "https://" + url;
     }
     await this.launch();
     if (!this.page)
       return { success: false, output: t("browser.create_page_failed") };
     this.actionTracker.reset();
     try {
-      await this.page.goto(url, { waitUntil: "domcontentloaded", timeout: this.config.navigationTimeout });
+      await this.page.goto(url, {
+        waitUntil: "domcontentloaded",
+        timeout: this.config.navigationTimeout
+      });
     } catch (err) {
-      return { success: false, output: t("browser.nav_failed", { message: err.message }) };
+      return {
+        success: false,
+        output: t("browser.nav_failed", { message: err.message })
+      };
     }
     const snapshot = await this.takeSnapshot();
     await this.saveCookies();
@@ -13024,7 +13628,10 @@ class BrowserSession {
       await this.saveCookies();
       return { success: true, output: snapshot };
     } catch (err2) {
-      return { success: false, output: t("browser.click_failed", { message: err2.message }) };
+      return {
+        success: false,
+        output: t("browser.click_failed", { message: err2.message })
+      };
     }
   }
   async type(target, text) {
@@ -13045,7 +13652,10 @@ class BrowserSession {
       const snapshot = await this.takeSnapshot();
       return { success: true, output: snapshot };
     } catch (err2) {
-      return { success: false, output: t("browser.type_failed", { message: err2.message }) };
+      return {
+        success: false,
+        output: t("browser.type_failed", { message: err2.message })
+      };
     }
   }
   async scroll(direction) {
@@ -13064,7 +13674,10 @@ class BrowserSession {
       const snapshot = await this.takeSnapshot();
       return { success: true, output: snapshot };
     } catch (err2) {
-      return { success: false, output: t("browser.scroll_failed", { message: err2.message }) };
+      return {
+        success: false,
+        output: t("browser.scroll_failed", { message: err2.message })
+      };
     }
   }
   async back() {
@@ -13073,7 +13686,10 @@ class BrowserSession {
       return err;
     if (!this.page)
       return { success: false, output: "No page" };
-    await this.page.goBack({ waitUntil: "domcontentloaded", timeout: this.config.navigationTimeout }).catch(() => {});
+    await this.page.goBack({
+      waitUntil: "domcontentloaded",
+      timeout: this.config.navigationTimeout
+    }).catch(() => {});
     await new Promise((r) => setTimeout(r, 300));
     const snapshot = await this.takeSnapshot();
     return { success: true, output: snapshot };
@@ -13084,7 +13700,10 @@ class BrowserSession {
       return err;
     if (!this.page)
       return { success: false, output: "No page" };
-    await this.page.goForward({ waitUntil: "domcontentloaded", timeout: this.config.navigationTimeout }).catch(() => {});
+    await this.page.goForward({
+      waitUntil: "domcontentloaded",
+      timeout: this.config.navigationTimeout
+    }).catch(() => {});
     await new Promise((r) => setTimeout(r, 300));
     const snapshot = await this.takeSnapshot();
     return { success: true, output: snapshot };
@@ -13153,10 +13772,10 @@ var init_types = __esm(() => {
 });
 
 // src/tools/browser.ts
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 function getSession(ctx) {
   if (!session) {
-    const cookieDir = join17(ctx.baseDir, ".mma", "browser");
+    const cookieDir = join18(ctx.baseDir, ".mma", "browser");
     session = new BrowserSession({
       ...DEFAULT_BROWSER_CONFIG,
       headless: ctx.config.browser?.headless ?? true,
@@ -13285,9 +13904,9 @@ async function readClipboardImage() {
 async function readClipboardFallback() {
   const { platform: platform3 } = await import("os");
   const { execSync } = await import("child_process");
-  const { readFileSync: readFileSync13, unlinkSync: unlinkSync3 } = await import("fs");
-  const { join: join18 } = await import("path");
-  const tmpPath = join18(process.env.TEMP || process.env.TMP || "/tmp", `mma-clip-${Date.now()}.png`);
+  const { readFileSync: readFileSync13, unlinkSync: unlinkSync4 } = await import("fs");
+  const { join: join19 } = await import("path");
+  const tmpPath = join19(process.env.TEMP || process.env.TMP || "/tmp", `mma-clip-${Date.now()}.png`);
   try {
     if (platform3() === "linux") {
       execSync(`xclip -selection clipboard -t image/png -o > "${tmpPath}" 2>/dev/null`, { timeout: 5000 });
@@ -13295,11 +13914,11 @@ async function readClipboardFallback() {
       return null;
     }
     const buf = readFileSync13(tmpPath);
-    unlinkSync3(tmpPath);
+    unlinkSync4(tmpPath);
     return buf.length > 0 ? buf : null;
   } catch {
     try {
-      unlinkSync3(tmpPath);
+      unlinkSync4(tmpPath);
     } catch {}
     return null;
   }
@@ -13365,7 +13984,7 @@ var init_image_utils = __esm(() => {
 });
 
 // src/tools/attach-image.ts
-import { existsSync as existsSync22 } from "fs";
+import { existsSync as existsSync23 } from "fs";
 import { resolve as resolve12 } from "path";
 var attachImageTool;
 var init_attach_image = __esm(() => {
@@ -13408,7 +14027,7 @@ var init_attach_image = __esm(() => {
           dataUrl = result.dataUrl;
         } else {
           const absPath = resolve12(ctx.baseDir, source);
-          if (!existsSync22(absPath)) {
+          if (!existsSync23(absPath)) {
             return {
               success: false,
               output: t("image.not_found", { path: source })
@@ -13564,17 +14183,17 @@ class ModuleRegistry {
 }
 
 // src/modules/plugins/loader.ts
-import { readdirSync as readdirSync6, existsSync as existsSync23, statSync as statSync4 } from "fs";
-import { join as join18 } from "path";
+import { readdirSync as readdirSync7, existsSync as existsSync24, statSync as statSync5 } from "fs";
+import { join as join19 } from "path";
 
 class PluginLoader {
   loadFromDir(dirPath, pluginManager, logger) {
-    if (!existsSync23(dirPath))
+    if (!existsSync24(dirPath))
       return;
-    const entries = readdirSync6(dirPath);
+    const entries = readdirSync7(dirPath);
     for (const entry of entries) {
-      const fullPath = join18(dirPath, entry);
-      if (!statSync4(fullPath).isFile())
+      const fullPath = join19(dirPath, entry);
+      if (!statSync5(fullPath).isFile())
         continue;
       if (!entry.endsWith(".ts") && !entry.endsWith(".js"))
         continue;
@@ -13597,9 +14216,16 @@ var init_loader = __esm(() => {
 
 // src/modules/plugins/builtin/lint-on-write.ts
 import { spawn as spawn4, execSync } from "child_process";
-import { existsSync as existsSync24, readFileSync as readFileSync13 } from "fs";
-import { resolve as resolve13, extname as extname4, join as join19 } from "path";
+import { existsSync as existsSync25, readFileSync as readFileSync13 } from "fs";
+import { resolve as resolve13, extname as extname4, join as join20 } from "path";
 import { platform as platform3 } from "os";
+function contentHash(content) {
+  let h = 5381;
+  for (let i = 0;i < content.length; i++) {
+    h = (h << 5) + h + content.charCodeAt(i) | 0;
+  }
+  return String(h);
+}
 function getWinDecoder() {
   if (_winDecoder === undefined) {
     if (platform3() !== "win32") {
@@ -13637,7 +14263,7 @@ class LintOnWritePlugin {
     if (!path)
       return;
     const fullPath = resolve13(ctx.baseDir, path);
-    if (!existsSync24(fullPath))
+    if (!existsSync25(fullPath))
       return;
     const ext = extname4(fullPath);
     const syntaxError = await this.checkSyntax(fullPath, ext, ctx.baseDir);
@@ -13652,20 +14278,30 @@ class LintOnWritePlugin {
   }
   async checkSyntax(filePath, ext, baseDir) {
     if (ext === ".ts" || ext === ".tsx") {
+      let content = "";
       try {
-        await runAsync(`npx tsc --noEmit --skipLibCheck "${filePath}"`, baseDir, 1e4);
+        content = readFileSync13(filePath, "utf-8");
+      } catch {
+        return null;
+      }
+      const hash = contentHash(content);
+      const cached = syntaxCache.get(filePath);
+      if (cached && cached.hash === hash) {
+        return cached.error;
+      }
+      try {
+        await runAsync(`bun build --no-bundle --target=bun "${filePath}"`, baseDir, 1e4);
+        syntaxCache.set(filePath, { hash, error: null });
         return null;
       } catch (err) {
         if (err.status === 127 || err.message.includes("not found") || err.message.includes("ENOENT")) {
           return null;
         }
         const stderr = err.stderr?.toString() || err.stdout?.toString() || "";
-        if (stderr.includes("error TS")) {
-          const firstError = stderr.split(`
-`).find((line) => line.includes("error TS")) || "TypeScript syntax error";
-          return firstError.trim();
-        }
-        return null;
+        const firstError = stderr.split(`
+`).find((line) => line.trim()) || "TypeScript syntax error";
+        syntaxCache.set(filePath, { hash, error: firstError.trim() });
+        return firstError.trim();
       }
     }
     if (ext === ".js" || ext === ".jsx") {
@@ -13683,8 +14319,8 @@ class LintOnWritePlugin {
   }
   async runProjectLint(ctx, result) {
     try {
-      const packageJsonPath = join19(ctx.baseDir, "package.json");
-      if (!existsSync24(packageJsonPath)) {
+      const packageJsonPath = join20(ctx.baseDir, "package.json");
+      if (!existsSync25(packageJsonPath)) {
         return;
       }
       const packageJson = JSON.parse(readFileSync13(packageJsonPath, "utf-8"));
@@ -13703,8 +14339,8 @@ class LintOnWritePlugin {
     }
   }
   async runProjectTypeCheck(ctx, result) {
-    const tsconfigPath = join19(ctx.baseDir, "tsconfig.json");
-    if (!existsSync24(tsconfigPath)) {
+    const tsconfigPath = join20(ctx.baseDir, "tsconfig.json");
+    if (!existsSync25(tsconfigPath)) {
       return;
     }
     const now = Date.now();
@@ -13785,8 +14421,9 @@ function runAsync(command, cwd, timeoutMs) {
     });
   });
 }
-var TYPE_CHECK_DEBOUNCE_MS = 2000, _winDecoder, plugin;
+var TYPE_CHECK_DEBOUNCE_MS = 2000, syntaxCache, _winDecoder, plugin;
 var init_lint_on_write = __esm(() => {
+  syntaxCache = new Map;
   plugin = new LintOnWritePlugin;
 });
 
@@ -13847,6 +14484,25 @@ class PlanCreator {
       baseDir
     };
   }
+  static replan(plan, newSteps, title) {
+    const kept = plan.steps.filter((s) => s.status === "done" || s.status === "skipped");
+    const baseTitle = plan.title.replace(/^\[\d+[^]]*\]\s*/, "");
+    const newTitle = title || baseTitle;
+    const totalSteps = kept.length + newSteps.length;
+    const added = newSteps.map((desc, i) => ({
+      id: kept.length + i + 1,
+      description: desc,
+      status: "pending"
+    }));
+    return {
+      id: plan.id,
+      title: `[${totalSteps}] ${newTitle}`,
+      steps: [...kept, ...added],
+      createdAt: plan.createdAt,
+      baseDir: plan.baseDir,
+      name: plan.name
+    };
+  }
   static toPromptBlock(plan, currentStepIndex) {
     const date = plan.createdAt.slice(0, 10);
     const lines = [
@@ -13919,15 +14575,89 @@ class PlanTracker {
     const bar = "█".repeat(filled) + "░".repeat(barWidth - filled);
     return `[${this.plan.id}] ${this.plan.title}  ${done}/${total}  ${bar}  ${pct}%`;
   }
-  toPromptBlock() {
-    return PlanCreator.toPromptBlock(this.plan, this.currentStepIndex);
+  toPromptBlock() {
+    return PlanCreator.toPromptBlock(this.plan, this.currentStepIndex);
+  }
+}
+var init_tracker = () => {};
+
+// src/modules/execution/auditor.ts
+import { existsSync as existsSync26, readdirSync as readdirSync8 } from "fs";
+import { resolve as resolve14, join as join21 } from "path";
+function findTestFile(dir, depth = 0) {
+  if (depth > 5)
+    return null;
+  let entries;
+  try {
+    entries = readdirSync8(dir, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  for (const e of entries) {
+    const full = join21(dir, e.name);
+    if (e.isDirectory()) {
+      if (SKIP_DIRS.has(e.name))
+        continue;
+      const found = findTestFile(full, depth + 1);
+      if (found)
+        return found;
+    } else if (TEST_EXT_RE.test(e.name)) {
+      return full;
+    }
+  }
+  return null;
+}
+function hasTestStep(plan) {
+  return plan.steps.some((s) => TEST_STEP_RE.test(s.description));
+}
+function extractFailingNames(output, limit = 5) {
+  const names = [];
+  for (const m of output.matchAll(/\(fail\)\s*([^\n]+)/g)) {
+    const name = m[1].trim();
+    if (name && !names.includes(name))
+      names.push(name);
+    if (names.length >= limit)
+      break;
+  }
+  return names;
+}
+async function runTests(baseDir) {
+  const entry = processRegistry.start("bun test", baseDir);
+  const exited = await processRegistry.waitForExit(entry.id, 90000);
+  const output = entry.log.join(`
+`);
+  processRegistry.remove(entry.id);
+  if (!exited) {
+    return {
+      checked: true,
+      passed: true,
+      failed: 0,
+      passedCount: 0,
+      detail: "test run timed out after 90s — result unknown",
+      command: "bun test"
+    };
+  }
+  const run = detectTestResults(output);
+  if (!run) {
+    return {
+      checked: true,
+      passed: entry.exitCode === 0,
+      failed: entry.exitCode === 0 ? 0 : -1,
+      passedCount: 0,
+      detail: output.slice(0, 200).trim(),
+      command: "bun test"
+    };
   }
+  const names = extractFailingNames(output);
+  return {
+    checked: true,
+    passed: run.failed === 0,
+    failed: run.failed,
+    passedCount: run.passed,
+    detail: names.length ? names.join("; ") : run.summary || `${run.failed} failed / ${run.passed} passed`,
+    command: "bun test"
+  };
 }
-var init_tracker = () => {};
-
-// src/modules/execution/auditor.ts
-import { existsSync as existsSync25 } from "fs";
-import { resolve as resolve14 } from "path";
 
 class Auditor {
   baseDir;
@@ -13937,29 +14667,58 @@ class Auditor {
   async audit(plan) {
     const allStepText = plan.steps.map((s) => s.description.replace(/\([^)]*\)/g, " ")).join(" ");
     const fileMatches = allStepText.match(/\b[\w./-]+\.[a-z]+/gi) || [];
-    const uniqueFiles = [...new Set(fileMatches)];
+    const uniqueFiles = [
+      ...new Set(fileMatches.filter((f) => !isJsMemberAccess(f)))
+    ];
     const missingFiles = [];
     const existingFiles = [];
     for (const filePath of uniqueFiles) {
       const resolved = resolve14(this.baseDir, filePath);
-      if (existsSync25(resolved)) {
+      if (existsSync26(resolved)) {
         existingFiles.push(filePath);
       } else {
         missingFiles.push(filePath);
       }
     }
+    let testRun = null;
+    if (hasTestStep(plan) && findTestFile(this.baseDir)) {
+      try {
+        testRun = await runTests(this.baseDir);
+      } catch {
+        testRun = null;
+      }
+    }
     const doneSteps = plan.steps.filter((s) => s.status === "done").length;
     const totalSteps = plan.steps.length;
     let massEditWarning = null;
     if (uniqueFiles.length > MASS_EDIT_THRESHOLD) {
-      massEditWarning = t("exec.mass_edit_warning", { count: String(uniqueFiles.length) });
+      massEditWarning = t("exec.mass_edit_warning", {
+        count: String(uniqueFiles.length)
+      });
     }
-    const passed = missingFiles.length === 0;
+    const testsFailing = testRun !== null && testRun.failed > 0;
+    const passed = missingFiles.length === 0 && !testsFailing;
     let summary;
-    if (passed) {
-      summary = t("exec.audit_pass", { done: doneSteps, total: totalSteps, files: existingFiles.length });
+    if (missingFiles.length > 0) {
+      summary = t("exec.audit_fail", {
+        done: doneSteps,
+        total: totalSteps,
+        files: missingFiles.length
+      });
+    } else if (testsFailing) {
+      summary = t("exec.audit_fail_tests", {
+        done: doneSteps,
+        total: totalSteps,
+        failed: String(testRun.failed),
+        passed: String(testRun.passedCount),
+        detail: testRun.detail
+      });
     } else {
-      summary = t("exec.audit_fail", { done: doneSteps, total: totalSteps, files: missingFiles.length });
+      summary = t("exec.audit_pass", {
+        done: doneSteps,
+        total: totalSteps,
+        files: existingFiles.length
+      });
     }
     return {
       passed,
@@ -13967,63 +14726,183 @@ class Auditor {
       createdFiles: existingFiles,
       modifiedFiles: [],
       summary,
-      massEditWarning
+      massEditWarning,
+      testRun
     };
   }
 }
-var MASS_EDIT_THRESHOLD = 10;
+var MASS_EDIT_THRESHOLD = 10, SKIP_DIRS, TEST_EXT_RE, TEST_STEP_RE;
 var init_auditor = __esm(() => {
   init_i18n();
+  init_js_identifiers();
+  init_bash();
+  init_processes();
+  SKIP_DIRS = new Set([
+    "node_modules",
+    ".git",
+    ".mma",
+    "dist",
+    "build",
+    "coverage",
+    ".next",
+    ".nuxt",
+    "vendor"
+  ]);
+  TEST_EXT_RE = /\.(test|spec)\.[jt]sx?$/i;
+  TEST_STEP_RE = /\b(test(ing|s)?|тест(ы|ирование|ировать)?|провер\w*\s+тест|запустить\s+тест)\b|bun test|npm test|vitest|pytest|go test|jest|mocha/i;
 });
 
-// src/modules/execution/plan-persister.ts
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync8, mkdirSync as mkdirSync11, existsSync as existsSync26 } from "fs";
-import { join as join20 } from "path";
-
-class PlanPersister {
-  filePath;
-  constructor(baseDir) {
-    const mmaDir = join20(baseDir, ".mma");
-    if (!existsSync26(mmaDir)) {
-      mkdirSync11(mmaDir, { recursive: true });
-    }
-    this.filePath = join20(mmaDir, "plan.json");
-  }
-  save(plan) {
-    const file = {
-      id: plan.id,
-      title: plan.title,
-      steps: plan.steps,
-      createdAt: plan.createdAt,
-      updatedAt: new Date().toISOString(),
-      baseDir: plan.baseDir
-    };
-    writeFileSync8(this.filePath, JSON.stringify(file, null, 2), "utf-8");
-  }
-  load() {
-    if (!existsSync26(this.filePath))
+// src/modules/execution/plan-store.ts
+import { readFileSync as readFileSync14, writeFileSync as writeFileSync8, mkdirSync as mkdirSync12, existsSync as existsSync27, readdirSync as readdirSync9, rmSync } from "fs";
+import { join as join22 } from "path";
+function readPlanFile(path, fallbackBaseDir) {
+  try {
+    const raw = readFileSync14(path, "utf-8");
+    if (!raw.trim())
       return null;
-    try {
-      const raw = readFileSync14(this.filePath, "utf-8");
-      const file = JSON.parse(raw);
-      return {
-        id: file.id || "plan_legacy",
-        title: file.title,
-        steps: file.steps,
-        createdAt: file.createdAt,
-        baseDir: file.baseDir || process.cwd()
-      };
-    } catch {
+    const parsed = JSON.parse(raw);
+    if (!parsed || !Array.isArray(parsed.steps))
       return null;
-    }
+    return {
+      id: parsed.id || "plan_legacy",
+      title: parsed.title || "Legacy plan",
+      steps: parsed.steps,
+      createdAt: parsed.createdAt || new Date().toISOString(),
+      baseDir: parsed.baseDir || fallbackBaseDir,
+      name: parsed.name
+    };
+  } catch {
+    return null;
   }
-  clear() {
-    if (existsSync26(this.filePath)) {
-      writeFileSync8(this.filePath, "", "utf-8");
+}
+function writePlanFile(path, plan) {
+  writeFileSync8(path, JSON.stringify(plan, null, 2), "utf-8");
+}
+function listDir(dir, baseDir) {
+  if (!existsSync27(dir))
+    return [];
+  const files = readdirSync9(dir).filter((f) => f.endsWith(".json"));
+  return files.map((f) => readPlanFile(join22(dir, f), baseDir)).filter((p) => p !== null);
+}
+function toMeta(plan, status) {
+  return {
+    id: plan.id,
+    name: plan.name,
+    title: plan.title,
+    status,
+    createdAt: plan.createdAt,
+    stepCount: plan.steps.length,
+    doneCount: plan.steps.filter((s) => s.status === "done" || s.status === "skipped").length
+  };
+}
+
+class PlanStore {
+  baseDir;
+  plansDir;
+  draftsDir;
+  archiveDir;
+  legacyPath;
+  constructor(baseDir) {
+    const mmaDir = join22(baseDir, ".mma");
+    if (!existsSync27(mmaDir))
+      mkdirSync12(mmaDir, { recursive: true });
+    this.baseDir = baseDir;
+    this.plansDir = join22(mmaDir, "plans");
+    this.draftsDir = join22(this.plansDir, "drafts");
+    this.archiveDir = join22(this.plansDir, "archive");
+    this.legacyPath = join22(mmaDir, LEGACY_FILE);
+    for (const dir of [this.plansDir, this.draftsDir, this.archiveDir]) {
+      if (!existsSync27(dir))
+        mkdirSync12(dir, { recursive: true });
+    }
+  }
+  activePath() {
+    return join22(this.plansDir, "active.json");
+  }
+  saveActive(plan) {
+    writePlanFile(this.activePath(), plan);
+  }
+  loadActive() {
+    const activePath = this.activePath();
+    if (existsSync27(activePath)) {
+      const plan = readPlanFile(activePath, this.baseDir);
+      if (plan)
+        return plan;
+    }
+    if (existsSync27(this.legacyPath)) {
+      const legacy = readPlanFile(this.legacyPath, this.baseDir);
+      if (legacy) {
+        this.saveActive(legacy);
+        try {
+          rmSync(this.legacyPath, { force: true });
+        } catch {}
+        return legacy;
+      }
     }
+    return null;
+  }
+  clearActive() {
+    const p = this.activePath();
+    if (existsSync27(p))
+      rmSync(p, { force: true });
+  }
+  saveDraft(plan) {
+    writePlanFile(join22(this.draftsDir, `${plan.id}.json`), plan);
+  }
+  loadDraft(id) {
+    const p = join22(this.draftsDir, `${id}.json`);
+    return existsSync27(p) ? readPlanFile(p, this.baseDir) : null;
+  }
+  removeDraft(id) {
+    const p = join22(this.draftsDir, `${id}.json`);
+    if (existsSync27(p))
+      rmSync(p, { force: true });
+  }
+  listDrafts() {
+    return listDir(this.draftsDir, this.baseDir);
+  }
+  archivePlan(plan) {
+    writePlanFile(join22(this.archiveDir, `${plan.id}.json`), plan);
+    this.removeDraft(plan.id);
+    const active = this.loadActive();
+    if (active && active.id === plan.id) {
+      this.clearActive();
+    }
+  }
+  listArchived() {
+    return listDir(this.archiveDir, this.baseDir);
+  }
+  removeArchived(id) {
+    const p = join22(this.archiveDir, `${id}.json`);
+    if (existsSync27(p))
+      rmSync(p, { force: true });
+  }
+  listAll() {
+    const metas = [];
+    const active = this.loadActive();
+    if (active)
+      metas.push(toMeta(active, "active"));
+    for (const p of this.listDrafts())
+      metas.push(toMeta(p, "draft"));
+    for (const p of this.listArchived())
+      metas.push(toMeta(p, "archived"));
+    return metas;
+  }
+  find(id) {
+    const active = this.loadActive();
+    if (active && active.id === id)
+      return { plan: active, status: "active" };
+    const draft = this.loadDraft(id);
+    if (draft)
+      return { plan: draft, status: "draft" };
+    const archived = this.listArchived().find((p) => p.id === id);
+    if (archived)
+      return { plan: archived, status: "archived" };
+    return null;
   }
 }
-var init_plan_persister = () => {};
+var LEGACY_FILE = "plan.json";
+var init_plan_store = () => {};
 
 // src/modules/execution/plan-coverage.ts
 function extractFilePaths(text) {
@@ -14089,7 +14968,7 @@ var init_plan_coverage = __esm(() => {
 });
 
 // src/modules/execution/module.ts
-import { existsSync as existsSync27, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync28, readFileSync as readFileSync15 } from "fs";
 import { resolve as resolve15 } from "path";
 
 class ExecutionModule {
@@ -14098,26 +14977,29 @@ class ExecutionModule {
   verifier;
   stuckDetector;
   auditor;
-  persister;
+  store;
   baseDir;
   lastRecoveryIteration = -STUCK_RECOVERY_COOLDOWN;
   consecutivePlanWarnings = 0;
   lastStepId = -1;
+  depsGateHints = new Map;
   _auditSkipsRemaining = 0;
+  stuckNotified = false;
+  pendingMessages = [];
   constructor(baseDir, stuckThreshold = 6) {
     this.baseDir = baseDir;
     this.verifier = new StepVerifier(baseDir);
     this.stuckDetector = new StuckDetector(stuckThreshold);
     this.auditor = new Auditor(baseDir);
-    this.persister = new PlanPersister(baseDir);
+    this.store = new PlanStore(baseDir);
   }
   setPlan(plan) {
     this.tracker = new PlanTracker(plan);
-    this.persister.save(plan);
+    this.store.saveActive(plan);
     this._auditSkipsRemaining = 0;
   }
   restorePlan() {
-    const plan = this.persister.load();
+    const plan = this.store.loadActive();
     if (!plan)
       return false;
     this.tracker = new PlanTracker(plan);
@@ -14128,6 +15010,9 @@ class ExecutionModule {
   getTracker() {
     return this.tracker;
   }
+  getStore() {
+    return this.store;
+  }
   getStuckDetector() {
     return this.stuckDetector;
   }
@@ -14140,7 +15025,7 @@ class ExecutionModule {
     }
     const plan = this.tracker.getPlan();
     const audit = await this.auditor.audit(plan);
-    const pendingSteps = plan.steps.filter((s) => s.status !== "done" && s.status !== "skipped").map((s) => `${s.id}. ${s.description}`);
+    const pendingSteps = plan.steps.flatMap((s) => s.status !== "done" && s.status !== "skipped" ? [`${s.id}. ${s.description}`] : []);
     const done = plan.steps.filter((s) => s.status === "done").length;
     const passed = audit.passed && pendingSteps.length === 0;
     return {
@@ -14166,7 +15051,16 @@ class ExecutionModule {
     return [
       {
         name: "plan",
-        description: `Create, update, show, or abort a multi-step plan. Use "create" at the start of complex tasks. Use "update" after completing each step to track progress. Use "show" to re-print the current plan checklist.
+        description: `Create, update, show, abort, list, switch, or re-plan multi-step plans.
+
+Actions:
+- create: Start a new plan. Previous active plan is auto-preserved: incomplete → draft, complete → archive.
+- update: Mark step status (done/failed/skipped), or rebuild plan with new steps.
+- show: Print current plan checklist.
+- abort: Archive current plan and clear 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.
 
 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")
@@ -14180,24 +15074,102 @@ Write CONCRETE steps with exact file paths and commands:
           properties: {
             action: {
               type: "string",
-              enum: ["create", "update", "show", "abort"]
+              enum: [
+                "create",
+                "update",
+                "show",
+                "abort",
+                "list",
+                "switch",
+                "re-plan"
+              ]
             },
             title: { type: "string" },
             steps: { type: "array", items: { type: "string" } },
             step: { type: "number" },
             status: { type: "string", enum: ["done", "failed", "skipped"] },
-            note: { type: "string" }
+            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 = this.store.listAll();
+            if (metas.length === 0) {
+              return { success: true, output: t("plan.list_empty") };
+            }
+            const lines = metas.map((m) => {
+              const icon = m.status === "active" ? "[*]" : m.status === "draft" ? "[ ]" : "[-]";
+              const namePart = m.name ? ` (${m.name})` : "";
+              return `${icon} ${m.id}${namePart} — ${m.title}  ${m.doneCount}/${m.stepCount}`;
+            });
+            return {
+              success: true,
+              output: `${t("plan.list_header")}
+${lines.join(`
+`)}`
+            };
+          }
+          if (action === "switch") {
+            const planId = String(args.id || "");
+            if (!planId) {
+              return { success: false, output: t("plan.switch_no_id") };
+            }
+            const found = this.store.find(planId);
+            if (!found) {
+              return {
+                success: false,
+                output: t("plan.not_found", { id: planId })
+              };
+            }
+            this.preserveActive();
+            if (found.status === "draft") {
+              this.store.removeDraft(found.plan.id);
+            } else if (found.status === "archived") {
+              this.store.removeArchived(found.plan.id);
+            }
+            this.setPlan(found.plan);
+            const display = PlanCreator.toPromptBlock(found.plan, 0);
+            return {
+              success: true,
+              output: t("plan.switched", {
+                id: found.plan.id,
+                title: found.plan.title
+              }),
+              display
+            };
+          }
+          if (action === "re-plan") {
+            if (!this.tracker) {
+              return { success: false, output: t("plan.no_active") };
+            }
+            const newSteps = Array.isArray(args.steps) ? args.steps.map(String) : [];
+            if (newSteps.length === 0) {
+              return { success: false, output: t("plan.replan_no_steps") };
+            }
+            const oldPlan = this.tracker.getPlan();
+            const replanned = PlanCreator.replan(oldPlan, newSteps, args.title ? String(args.title) : undefined);
+            const keptCount = replanned.steps.length - newSteps.length;
+            this.setPlan(replanned);
+            const display = PlanCreator.toPromptBlock(replanned, keptCount);
+            return {
+              success: true,
+              output: t("plan.replanned", {
+                kept: String(keptCount),
+                steps: String(newSteps.length)
+              }),
+              display
+            };
+          }
           if (action === "create") {
             const title = String(args.title || "Task Plan");
             const steps = Array.isArray(args.steps) ? args.steps.map(String) : [];
             if (steps.length === 0) {
               return { success: false, output: t("plan.no_steps") };
             }
+            this.preserveActive();
             const plan = PlanCreator.createPlan(title, steps, this.baseDir);
             this.setPlan(plan);
             const display = PlanCreator.toPromptBlock(plan, 0);
@@ -14242,7 +15214,7 @@ ${display}`,
             if (args.note)
               this.tracker.addNote(Number(args.step), String(args.note));
             this.tracker.syncCurrentStep();
-            this.persister.save(this.tracker.getPlan());
+            this.store.saveActive(this.tracker.getPlan());
             const progress = this.tracker.getProgressString();
             const display = this.tracker.toPromptBlock();
             _ctx.sessionLog?.plan("step-update", `${t("plan.step_status", { step: String(args.step), status: String(args.status || "done") })} | ${progress} | current: step ${this.tracker.getCurrentStepIndex() + 1}`);
@@ -14270,8 +15242,11 @@ ${progress}`,
             };
           }
           if (action === "abort") {
+            if (this.tracker) {
+              this.store.archivePlan(this.tracker.getPlan());
+            }
             this.tracker = null;
-            this.persister.clear();
+            this.store.clearActive();
             return { success: true, output: t("plan.aborted") };
           }
           if (!this.tracker) {
@@ -14320,7 +15295,7 @@ ${progress}`,
             }
             this.tracker.updateStepStatus(currentStep.id, "done");
             this.tracker.syncCurrentStep();
-            this.persister.save(this.tracker.getPlan());
+            this.store.saveActive(this.tracker.getPlan());
             const display = this.tracker.toPromptBlock();
             return {
               success: true,
@@ -14375,36 +15350,55 @@ Sub-tasks: ${note}`
     return {
       name: "execution",
       onBeforeThink: (ctx) => {
-        const step = this.tracker?.getCurrentStep();
-        if (this.tracker && step) {
-          if (step.id !== this.lastStepId) {
-            this.consecutivePlanWarnings = 0;
-            this.lastStepId = step.id;
+        if (ctx.contextManager && this.pendingMessages.length > 0) {
+          for (const m of this.pendingMessages.splice(0)) {
+            ctx.contextManager.addMessage(m);
           }
-          this.stuckDetector.setCurrentStep(step.id, step.description);
-          this.stuckDetector.recordIteration(step.id);
-        } else {
+        }
+        if (this.tracker?.isComplete()) {
           this.stuckDetector.reset();
           this.consecutivePlanWarnings = 0;
           this.lastStepId = -1;
-          const iter = typeof ctx.iteration === "number" ? ctx.iteration : 0;
-          if (iter === 3 && !this.tracker && ctx.contextManager) {
-            ctx.contextManager.addMessage({
-              role: "user",
-              content: `<system-summary>You have made 3 tool calls without creating a plan. For any task that involves creating files, installing packages, or multiple steps — you MUST use plan create BEFORE continuing. Use the plan tool now with concrete steps (exact filenames, commands, deliverables). Do NOT make any more write/edit/bash calls until you have a plan.</system-summary>`
-            });
-          }
-          if (iter >= 6 && !this.tracker && ctx.contextManager) {
-            ctx.contextManager.addMessage({
-              role: "user",
-              content: `<system-summary>STOP. ${iter} iterations without a plan. You MUST call plan create RIGHT NOW. No more tool calls until you create a plan.</system-summary>`
-            });
+          this.stuckNotified = false;
+        } else {
+          const step = this.tracker?.getCurrentStep();
+          if (this.tracker && step) {
+            if (step.id !== this.lastStepId) {
+              this.consecutivePlanWarnings = 0;
+              this.lastStepId = step.id;
+              this.stuckNotified = false;
+            }
+            this.stuckDetector.setCurrentStep(step.id, step.description);
+            this.stuckDetector.recordIteration(step.id);
+          } else {
+            this.stuckDetector.reset();
+            this.consecutivePlanWarnings = 0;
+            this.lastStepId = -1;
+            this.stuckNotified = false;
+            const iter = typeof ctx.iteration === "number" ? ctx.iteration : 0;
+            if (iter === 3 && !this.tracker && ctx.contextManager) {
+              ctx.contextManager.addMessage({
+                role: "user",
+                content: `<system-summary>You have made 3 tool calls without creating a plan. For any task that involves creating files, installing packages, or multiple steps — you MUST use plan create BEFORE continuing. Use the plan tool now with concrete steps (exact filenames, commands, deliverables). Do NOT make any more write/edit/bash calls until you have a plan.</system-summary>`
+              });
+            }
+            if (iter >= 6 && !this.tracker && ctx.contextManager) {
+              ctx.contextManager.addMessage({
+                role: "user",
+                content: `<system-summary>STOP. ${iter} iterations without a plan. You MUST call plan create RIGHT NOW. No more tool calls until you create a plan.</system-summary>`
+              });
+            }
           }
         }
         const stuckReason = this.stuckDetector.getStuckReason();
         if (stuckReason) {
-          ctx.logger?.warn(stuckReason);
-          ctx.sessionLog?.plan("stuck-warning", stuckReason, typeof ctx.iteration === "number" ? ctx.iteration : undefined);
+          const logIt = this.stuckDetector.isStuck() ? !this.stuckNotified : true;
+          if (logIt) {
+            ctx.logger?.warn(stuckReason);
+            ctx.sessionLog?.plan("stuck-warning", stuckReason, typeof ctx.iteration === "number" ? ctx.iteration : undefined);
+            if (this.stuckDetector.isStuck())
+              this.stuckNotified = true;
+          }
         }
         if (this.stuckDetector.isStuck() || this.stuckDetector.hasRepetitiveToolCalls()) {
           const currentIter = typeof ctx.iteration === "number" ? ctx.iteration : 0;
@@ -14447,29 +15441,32 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
               ctx.onMeta(escalation);
             }
             if (this.stuckDetector.getIterationsOnCurrentStep() >= FORCE_SKIP_THRESHOLD && ctx.contextManager) {
-              const step2 = this.tracker?.getCurrentStep();
+              const step = this.tracker?.getCurrentStep();
               ctx.contextManager.addMessage({
                 role: "user",
-                content: `<system-summary>STOP. Step ${step2?.id ?? "?"} ("${step2?.description ?? ""}") took ${this.stuckDetector.getIterationsOnCurrentStep()} iterations with no progress. DO NOT continue this step. Immediately call: plan update step=${step2?.id ?? "?"} status=done (if code works despite warnings) OR plan update step=${step2?.id ?? "?"} status=skipped note="reason". Do NOT make any other tool calls before updating the plan.</system-summary>`
+                content: `<system-summary>STOP. Step ${step?.id ?? "?"} ("${step?.description ?? ""}") took ${this.stuckDetector.getIterationsOnCurrentStep()} iterations with no progress. DO NOT continue this step. Immediately call: plan update step=${step?.id ?? "?"} status=done (if code works despite warnings) OR plan update step=${step?.id ?? "?"} status=skipped note="reason". Do NOT make any other tool calls before updating the plan.</system-summary>`
               });
             }
           }
         }
       },
-      onBeforeTool: (ctx, call) => {
+      onBeforeTool: (_ctx, call) => {
         const warning = this.checkPlanAlignment(call);
-        if (warning && ctx.contextManager) {
-          ctx.contextManager.addMessage({
+        if (warning) {
+          this.pendingMessages.push({
             role: "user",
             content: `<system-summary>${warning}</system-summary>`
           });
           this.consecutivePlanWarnings++;
           if (this.consecutivePlanWarnings >= MAX_PLAN_WARNINGS_BEFORE_BLOCK) {
-            ctx.contextManager.addMessage({
+            this.pendingMessages.push({
               role: "user",
               content: `<system-summary>${t("exec.plan_blocked", { step: String(this.tracker?.getCurrentStep()?.id ?? "?"), max: MAX_PLAN_WARNINGS_BEFORE_BLOCK })}</system-summary>`
             });
-            return false;
+            return t("exec.plan_blocked", {
+              step: String(this.tracker?.getCurrentStep()?.id ?? "?"),
+              max: MAX_PLAN_WARNINGS_BEFORE_BLOCK
+            });
           }
         } else {
           this.consecutivePlanWarnings = 0;
@@ -14484,16 +15481,23 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
         }
       },
       onAfterTool: (ctx, call, result) => {
+        if (call.name === "bash") {
+          this.stuckDetector.recordBashOutput(String(call.arguments?.command ?? ""), String(result.output ?? ""));
+        }
+        const toolText = String(result.output ?? "");
+        if (/error TS\d+|\[Project typecheck failed\]|\[Syntax check failed\]/.test(toolText)) {
+          this.stuckDetector.recordToolError(call.name, toolText.slice(0, 300));
+        }
         if (!result.success) {
           this.stuckDetector.recordToolError(call.name, result.output);
           const actionableHints = this.stuckDetector.getActionableHints();
           const alternative = this.stuckDetector.getToolAlternative();
-          if ((actionableHints.length > 0 || alternative) && ctx.contextManager) {
+          if (actionableHints.length > 0 || alternative) {
             const parts = [...actionableHints];
             if (alternative) {
               parts.push(`Tool "${call.name}" crashed. Try "${alternative}" instead.`);
             }
-            ctx.contextManager.addMessage({
+            this.pendingMessages.push({
               role: "user",
               content: `<system-summary>${t("exec.hints", { hints: parts.map((h) => `- ${h}`).join(`
 `) })}</system-summary>`
@@ -14501,10 +15505,21 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
           }
         } else {
           this.stuckDetector.recordToolSuccess();
-          if (call.name === "bash" && result.success && ctx.contextManager) {
+          if (call.name === "bash" && result.success) {
             const cmd = String(call.arguments?.command ?? "");
-            if (/node|tsx|ts-node|python|npm\s+(start|test|run)/.test(cmd)) {
-              ctx.contextManager.addMessage({
+            const testRun = detectTestResults(String(result.output ?? ""));
+            if (testRun && testRun.failed > 0) {
+              this.pendingMessages.push({
+                role: "user",
+                content: `<system-summary>${testRun.framework} reported ${testRun.failed} FAILING test(s) (${testRun.passed} passing). Do NOT mark the current step as done — fix the failing tests (read the failure output, correct the code) and re-run them until all pass.</system-summary>`
+              });
+            } else if (testRun && testRun.failed === 0 && testRun.passed > 0) {
+              this.pendingMessages.push({
+                role: "user",
+                content: `<system-summary>${testRun.framework}: all ${testRun.passed} test(s) passed for "${cmd}". You may mark the current step as done via plan update step=N status=done.</system-summary>`
+              });
+            } else if (/node|tsx|ts-node|python|npm\s+(start|test|run)/.test(cmd)) {
+              this.pendingMessages.push({
                 role: "user",
                 content: `<system-summary>The command "${cmd}" completed successfully. If this was testing your code, mark the current step as done via plan update step=N status=done.</system-summary>`
               });
@@ -14531,6 +15546,16 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
       }
     };
   }
+  preserveActive() {
+    if (!this.tracker)
+      return;
+    const plan = this.tracker.getPlan();
+    if (plan.steps.every((s) => s.status === "done" || s.status === "skipped")) {
+      this.store.archivePlan(plan);
+    } else {
+      this.store.saveDraft(plan);
+    }
+  }
   checkPlanAlignment(call) {
     if (!this.tracker)
       return null;
@@ -14557,7 +15582,20 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
     const callPaths = (argStr.match(/\b[\w./\\-]+\.[a-z]+/gi) || []).map((p) => p.toLowerCase());
     if (callPaths.length === 0)
       return null;
-    const offPath = callPaths.some((p) => !stepPaths.some((s) => p.includes(s) || s.includes(p)));
+    const plan = this.tracker.getPlan();
+    const finishedPaths = new Set;
+    for (const s of plan.steps) {
+      if (s.status === "done" || s.status === "skipped") {
+        const ps = s.description.match(/\b[\w./\\-]+\.[a-z]+/gi)?.map((p) => p.toLowerCase()) ?? [];
+        ps.forEach((p) => finishedPaths.add(p));
+      }
+    }
+    const offPath = callPaths.some((p) => {
+      if (finishedPaths.has(p) || [...finishedPaths].some((s) => s.includes(p))) {
+        return false;
+      }
+      return !stepPaths.some((s) => p.includes(s) || s.includes(p));
+    });
     if (!offPath)
       return null;
     return t("exec.plan_warning", {
@@ -14586,12 +15624,19 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
         "poetry.lock",
         "requirements.txt"
       ];
-      const hasLockFile = lockFiles.some((f) => existsSync27(resolve15(this.baseDir, f)));
+      const hasLockFile = lockFiles.some((f) => existsSync28(resolve15(this.baseDir, f)));
       if (!hasLockFile) {
         if (contextManager) {
+          const hints = this.depsGateHints.get(step.id) || 0;
+          this.depsGateHints.set(step.id, hints + 1);
+          const force = hints >= 1;
+          const content = force ? t("exec.step_gate_deps_force", { step: String(step.id) }) : t("exec.step_gate_deps", {
+            step: String(step.id),
+            description: step.description
+          });
           contextManager.addMessage({
             role: "user",
-            content: `<system-summary>${t("exec.step_gate_deps", { step: String(step.id), description: step.description })}</system-summary>`
+            content: `<system-summary>${content}</system-summary>`
           });
         }
         return;
@@ -14599,7 +15644,7 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
     }
     if (stepPaths.length === 0)
       return;
-    const allExist = stepPaths.every((p) => existsSync27(resolve15(this.baseDir, p)));
+    const allExist = stepPaths.every((p) => existsSync28(resolve15(this.baseDir, p)));
     if (!allExist)
       return;
     const emptyFiles = [];
@@ -14621,7 +15666,7 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
     this.tracker?.updateStepStatus(step.id, "done");
     const hadNext = this.tracker?.advance() ?? false;
     if (this.tracker) {
-      this.persister.save(this.tracker.getPlan());
+      this.store.saveActive(this.tracker.getPlan());
       sessionLog?.plan("auto-advance", `Step ${step.id} auto-completed | ${this.tracker.getProgressString()} | current: step ${this.tracker.getCurrentStepIndex() + 1}`);
     }
     if (contextManager) {
@@ -14655,13 +15700,20 @@ var init_module = __esm(() => {
   init_verifier();
   init_stuck_detector();
   init_auditor();
-  init_plan_persister();
+  init_plan_store();
   init_plan_coverage();
+  init_bash();
 });
 
 // src/modules/security/session-encryption.ts
-import { readFileSync as readFileSync16, writeFileSync as writeFileSync9, existsSync as existsSync28, readdirSync as readdirSync7, unlinkSync as unlinkSync3 } from "fs";
-import { join as join21 } from "path";
+import {
+  readFileSync as readFileSync16,
+  writeFileSync as writeFileSync9,
+  existsSync as existsSync29,
+  readdirSync as readdirSync10,
+  unlinkSync as unlinkSync4
+} from "fs";
+import { join as join23 } from "path";
 import { homedir as homedir8 } from "os";
 
 class SessionFileEncryptor {
@@ -14670,7 +15722,7 @@ class SessionFileEncryptor {
   constructor(config) {
     this.config = { ...DEFAULT_SESSION_ENCRYPTION, ...config };
     this.encryptor = new ConfigEncryptor({
-      keyPath: config?.keyPath || join21(homedir8(), ".mma", ".session-encryption-key")
+      keyPath: config?.keyPath || join23(homedir8(), ".mma", ".session-encryption-key")
     });
   }
   isEnabled() {
@@ -14694,10 +15746,15 @@ class SessionFileEncryptor {
     return this.encryptFileContent(JSON.stringify(obj));
   }
   decryptJSON(content) {
-    if (!this.config.enabled)
-      return JSON.parse(content);
-    const decrypted = this.decryptFileContent(content);
-    return JSON.parse(decrypted);
+    let plain = content;
+    if (this.config.enabled) {
+      plain = this.decryptFileContent(content);
+    }
+    try {
+      return JSON.parse(plain);
+    } catch {
+      throw new Error("Invalid JSON content in session file — file may be corrupted or encrypted with a different key");
+    }
   }
   encryptJSONL(lines) {
     if (!this.config.enabled)
@@ -14730,25 +15787,34 @@ class SessionFileEncryptor {
     const lines = content.split(`
 `).filter((line) => line.trim());
     const decryptedLines = this.decryptJSONL(lines);
-    return decryptedLines.map((line) => JSON.parse(line));
+    return decryptedLines.flatMap((line) => {
+      try {
+        return [JSON.parse(line)];
+      } catch {
+        return [];
+      }
+    });
   }
   appendToSessionJSONL(filePath, obj) {
     const encryptedLine = this.encryptFileContent(JSON.stringify(obj));
     writeFileSync9(filePath, encryptedLine + `
-`, { flag: "a", encoding: "utf8" });
+`, {
+      flag: "a",
+      encoding: "utf8"
+    });
   }
   encryptSessionDirectory(sessionDir) {
     if (!this.config.enabled)
       return;
-    const files = readdirSync7(sessionDir);
+    const files = readdirSync10(sessionDir);
     for (const file of files) {
-      const filePath = join21(sessionDir, file);
-      if (existsSync28(filePath) && !file.endsWith(".enc")) {
+      const filePath = join23(sessionDir, file);
+      if (existsSync29(filePath) && !file.endsWith(".enc")) {
         try {
           const content = readFileSync16(filePath, "utf8");
           const encrypted = this.encryptFileContent(content);
           writeFileSync9(filePath + ".enc", encrypted, "utf8");
-          unlinkSync3(filePath);
+          unlinkSync4(filePath);
         } catch {}
       }
     }
@@ -14756,16 +15822,16 @@ class SessionFileEncryptor {
   decryptSessionDirectory(sessionDir) {
     if (!this.config.enabled)
       return;
-    const files = readdirSync7(sessionDir);
+    const files = readdirSync10(sessionDir);
     for (const file of files) {
       if (file.endsWith(".enc")) {
-        const encFilePath = join21(sessionDir, file);
+        const encFilePath = join23(sessionDir, file);
         const decFilePath = encFilePath.slice(0, -4);
         try {
           const content = readFileSync16(encFilePath, "utf8");
           const decrypted = this.decryptFileContent(content);
           writeFileSync9(decFilePath, decrypted, "utf8");
-          unlinkSync3(encFilePath);
+          unlinkSync4(encFilePath);
         } catch {}
       }
     }
@@ -14784,15 +15850,15 @@ var init_session_encryption = __esm(() => {
 
 // src/modules/session/store.ts
 import {
-  existsSync as existsSync29,
-  mkdirSync as mkdirSync12,
-  readdirSync as readdirSync8,
+  existsSync as existsSync30,
+  mkdirSync as mkdirSync13,
+  readdirSync as readdirSync11,
   readFileSync as readFileSync17,
-  rmSync,
+  rmSync as rmSync2,
   writeFileSync as writeFileSync10,
-  appendFileSync as appendFileSync5
+  appendFileSync as appendFileSync6
 } from "fs";
-import { join as join22 } from "path";
+import { join as join24 } from "path";
 import { gzipSync } from "zlib";
 
 class SessionStore {
@@ -14806,7 +15872,7 @@ class SessionStore {
     }
   }
   getSessionDir(id) {
-    return join22(this.baseDir, id);
+    return join24(this.baseDir, id);
   }
   updateEncryption(config) {
     if (config?.enabled) {
@@ -14819,27 +15885,27 @@ class SessionStore {
     return this.encryptor?.isEnabled() ?? false;
   }
   init() {
-    mkdirSync12(this.baseDir, { recursive: true });
+    mkdirSync13(this.baseDir, { recursive: true });
   }
   sessionDir(id) {
-    return join22(this.baseDir, id);
+    return join24(this.baseDir, id);
   }
   metaPath(id) {
-    return join22(this.sessionDir(id), "meta.json");
+    return join24(this.sessionDir(id), "meta.json");
   }
   historyPath(id) {
-    return join22(this.sessionDir(id), "history.jsonl");
+    return join24(this.sessionDir(id), "history.jsonl");
   }
   sessionLogPath(id) {
-    return join22(this.sessionDir(id), "session.jsonl");
+    return join24(this.sessionDir(id), "session.jsonl");
   }
   sessionExists(id) {
-    return existsSync29(this.metaPath(id));
+    return existsSync30(this.metaPath(id));
   }
   saveMeta(id, meta) {
     this._metaCache.set(id, meta);
     const dir = this.sessionDir(id);
-    mkdirSync12(dir, { recursive: true });
+    mkdirSync13(dir, { recursive: true });
     const content = JSON.stringify(meta, null, 2);
     if (this.encryptor) {
       writeFileSync10(this.metaPath(id), this.encryptor.encryptFileContent(content), "utf-8");
@@ -14852,7 +15918,7 @@ class SessionStore {
     if (cached)
       return cached;
     const path = this.metaPath(id);
-    if (!existsSync29(path))
+    if (!existsSync30(path))
       return null;
     try {
       const raw = readFileSync17(path, "utf-8");
@@ -14866,13 +15932,13 @@ class SessionStore {
   }
   appendMessage(id, msg) {
     const dir = this.sessionDir(id);
-    mkdirSync12(dir, { recursive: true });
+    mkdirSync13(dir, { recursive: true });
     const line = JSON.stringify(msg);
     if (this.encryptor?.isEnabled()) {
-      appendFileSync5(this.historyPath(id), this.encryptor.encryptFileContent(line) + `
+      appendFileSync6(this.historyPath(id), this.encryptor.encryptFileContent(line) + `
 `, "utf-8");
     } else {
-      appendFileSync5(this.historyPath(id), line + `
+      appendFileSync6(this.historyPath(id), line + `
 `, "utf-8");
     }
     const meta = this.loadMeta(id);
@@ -14884,7 +15950,7 @@ class SessionStore {
   }
   loadHistory(id) {
     const path = this.historyPath(id);
-    if (!existsSync29(path))
+    if (!existsSync30(path))
       return [];
     try {
       const raw = readFileSync17(path, "utf-8");
@@ -14913,19 +15979,19 @@ class SessionStore {
   }
   appendSessionLog(id, entry) {
     const dir = this.sessionDir(id);
-    mkdirSync12(dir, { recursive: true });
+    mkdirSync13(dir, { recursive: true });
     const line = JSON.stringify(entry);
     if (this.encryptor?.isEnabled()) {
-      appendFileSync5(this.sessionLogPath(id), this.encryptor.encryptFileContent(line) + `
+      appendFileSync6(this.sessionLogPath(id), this.encryptor.encryptFileContent(line) + `
 `, "utf-8");
     } else {
-      appendFileSync5(this.sessionLogPath(id), line + `
+      appendFileSync6(this.sessionLogPath(id), line + `
 `, "utf-8");
     }
   }
   loadSessionLog(id) {
     const path = this.sessionLogPath(id);
-    if (!existsSync29(path))
+    if (!existsSync30(path))
       return [];
     try {
       const raw = readFileSync17(path, "utf-8");
@@ -14953,9 +16019,9 @@ class SessionStore {
     }
   }
   listSessions() {
-    if (!existsSync29(this.baseDir))
+    if (!existsSync30(this.baseDir))
       return [];
-    const entries = readdirSync8(this.baseDir, { withFileTypes: true });
+    const entries = readdirSync11(this.baseDir, { withFileTypes: true });
     const sessions = [];
     for (const entry of entries) {
       if (entry.isDirectory()) {
@@ -14970,8 +16036,8 @@ class SessionStore {
   deleteSession(id) {
     this._metaCache.delete(id);
     const dir = this.sessionDir(id);
-    if (existsSync29(dir)) {
-      rmSync(dir, { recursive: true, force: true });
+    if (existsSync30(dir)) {
+      rmSync2(dir, { recursive: true, force: true });
     }
   }
   rotateOldSessions() {
@@ -14982,12 +16048,12 @@ class SessionStore {
       const updatedAt = new Date(session2.updatedAt);
       if (updatedAt < thirtyDaysAgo) {
         const historyPath = this.historyPath(session2.id);
-        if (existsSync29(historyPath)) {
+        if (existsSync30(historyPath)) {
           const content = readFileSync17(historyPath, "utf-8");
           const compressed = gzipSync(content);
-          const gzPath = join22(this.baseDir, `${session2.id}.jsonl.gz`);
+          const gzPath = join24(this.baseDir, `${session2.id}.jsonl.gz`);
           writeFileSync10(gzPath, compressed);
-          rmSync(historyPath);
+          rmSync2(historyPath);
         }
       }
     }
@@ -15195,8 +16261,8 @@ class ProfileCompressor {
 }
 
 // src/modules/user-profile/profile.ts
-import { readFileSync as readFileSync18, writeFileSync as writeFileSync11, existsSync as existsSync30, mkdirSync as mkdirSync13 } from "fs";
-import { join as join23 } from "path";
+import { readFileSync as readFileSync18, writeFileSync as writeFileSync11, existsSync as existsSync31, mkdirSync as mkdirSync14 } from "fs";
+import { join as join25 } from "path";
 import { homedir as homedir9, hostname, platform as platform4, type } from "os";
 import { env } from "process";
 
@@ -15220,14 +16286,14 @@ class UserProfile {
     return this.info;
   }
   save() {
-    if (!existsSync30(this.profileDir)) {
-      mkdirSync13(this.profileDir, { recursive: true });
+    if (!existsSync31(this.profileDir)) {
+      mkdirSync14(this.profileDir, { recursive: true });
     }
-    writeFileSync11(join23(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
+    writeFileSync11(join25(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
   }
   load() {
-    const path = join23(this.profileDir, "profile.json");
-    if (!existsSync30(path))
+    const path = join25(this.profileDir, "profile.json");
+    if (!existsSync31(path))
       return null;
     try {
       const data = JSON.parse(readFileSync18(path, "utf-8"));
@@ -15265,22 +16331,22 @@ class UserProfile {
 var init_profile = () => {};
 
 // src/modules/skills/loader.ts
-import { readdirSync as readdirSync9, readFileSync as readFileSync19, existsSync as existsSync31, statSync as statSync5 } from "fs";
-import { join as join24 } from "path";
+import { readdirSync as readdirSync12, readFileSync as readFileSync19, existsSync as existsSync32, statSync as statSync6 } from "fs";
+import { join as join26 } from "path";
 
 class SkillsLoader {
   loadFromDir(dirPath) {
-    if (!existsSync31(dirPath))
+    if (!existsSync32(dirPath))
       return [];
     const skills = [];
     this.scanDir(dirPath, skills);
     return skills;
   }
   scanDir(dirPath, skills) {
-    const entries = readdirSync9(dirPath);
+    const entries = readdirSync12(dirPath);
     for (const entry of entries) {
-      const fullPath = join24(dirPath, entry);
-      const stat = statSync5(fullPath);
+      const fullPath = join26(dirPath, entry);
+      const stat = statSync6(fullPath);
       if (stat.isDirectory()) {
         this.scanDir(fullPath, skills);
         continue;
@@ -15752,7 +16818,7 @@ var DEFAULT_TIMEOUT = 15000;
 var init_client2 = () => {};
 
 // src/modules/lsp/module.ts
-import { existsSync as existsSync32 } from "fs";
+import { existsSync as existsSync33 } from "fs";
 import { resolve as resolve17 } from "path";
 
 class LspModule {
@@ -15778,7 +16844,7 @@ class LspModule {
         if (!filePath)
           return;
         const fullPath = resolve17(_ctx.baseDir, filePath);
-        if (!existsSync32(fullPath))
+        if (!existsSync33(fullPath))
           return;
         const serverConfig = getServerForFile(fullPath, self.config);
         if (!serverConfig)
@@ -15836,8 +16902,8 @@ var init_lsp = __esm(() => {
 });
 
 // src/modules/indexer/walker.ts
-import { readdirSync as readdirSync10, readFileSync as readFileSync20, statSync as statSync6, existsSync as existsSync33, watch } from "fs";
-import { join as join25, relative, extname as extname5 } from "path";
+import { readdirSync as readdirSync13, readFileSync as readFileSync20, statSync as statSync7, existsSync as existsSync34, watch } from "fs";
+import { join as join27, relative, extname as extname5 } from "path";
 
 class Indexer {
   baseDir;
@@ -15864,20 +16930,20 @@ class Indexer {
     let totalSize = 0;
     let count = 0;
     const walkDir = (dir) => {
-      if (!existsSync33(dir))
+      if (!existsSync34(dir))
         return;
       let entries;
       try {
-        entries = readdirSync10(dir);
+        entries = readdirSync13(dir);
       } catch {
         return;
       }
       for (const entry of entries) {
         if (count >= this.MAX_FILES)
           return;
-        const fullPath = join25(dir, entry);
+        const fullPath = join27(dir, entry);
         const relPath = relative(this.baseDir, fullPath);
-        const stat = statSync6(fullPath);
+        const stat = statSync7(fullPath);
         if (stat.isDirectory()) {
           if (!IGNORE_DIRS.has(entry)) {
             walkDir(fullPath);
@@ -15938,19 +17004,19 @@ var init_walker = __esm(() => {
 });
 
 // src/modules/indexer/cache.ts
-import { readFileSync as readFileSync21, writeFileSync as writeFileSync12, existsSync as existsSync34, mkdirSync as mkdirSync14, rmSync as rmSync2 } from "fs";
-import { join as join26 } from "path";
+import { readFileSync as readFileSync21, writeFileSync as writeFileSync12, existsSync as existsSync35, mkdirSync as mkdirSync15, rmSync as rmSync3 } from "fs";
+import { join as join28 } from "path";
 
 class IndexCache {
   cachePath;
   cache = null;
   constructor(cacheDir) {
-    this.cachePath = join26(cacheDir, "index-cache.json");
+    this.cachePath = join28(cacheDir, "index-cache.json");
   }
   load() {
     if (this.cache)
       return this.cache;
-    if (!existsSync34(this.cachePath))
+    if (!existsSync35(this.cachePath))
       return null;
     try {
       this.cache = JSON.parse(readFileSync21(this.cachePath, "utf-8"));
@@ -15961,16 +17027,16 @@ class IndexCache {
   }
   save(result) {
     this.cache = result;
-    const dir = join26(this.cachePath, "..");
-    if (!existsSync34(dir))
-      mkdirSync14(dir, { recursive: true });
+    const dir = join28(this.cachePath, "..");
+    if (!existsSync35(dir))
+      mkdirSync15(dir, { recursive: true });
     writeFileSync12(this.cachePath, JSON.stringify(result), "utf-8");
   }
   invalidate() {
     this.cache = null;
-    if (existsSync34(this.cachePath)) {
+    if (existsSync35(this.cachePath)) {
       try {
-        rmSync2(this.cachePath);
+        rmSync3(this.cachePath);
       } catch {}
     }
   }
@@ -15978,7 +17044,7 @@ class IndexCache {
 var init_cache = () => {};
 
 // src/modules/indexer/module.ts
-import { dirname as dirname8 } from "path";
+import { dirname as dirname7 } from "path";
 
 class IndexerModule {
   name = "indexer";
@@ -16095,7 +17161,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 = dirname8(normalized);
+      const dir = dirname7(normalized);
       const key = dir === "." ? "(root)" : dir;
       counts[key] = (counts[key] || 0) + 1;
     }
@@ -16326,13 +17392,13 @@ var init_mcp = __esm(() => {
 
 // src/modules/memory/module.ts
 import { homedir as homedir10 } from "os";
-import { join as join27 } from "path";
+import { join as join29 } from "path";
 
 class MemoryModule {
   name = "memory";
   store;
   constructor(memoryDir) {
-    const dir = memoryDir || join27(homedir10(), ".mma", "memory");
+    const dir = memoryDir || join29(homedir10(), ".mma", "memory");
     this.store = new MemoryStore(dir);
   }
   getSystemPromptBlock() {
@@ -16376,46 +17442,38 @@ var init_module8 = __esm(() => {
 // src/core/bootstrap.ts
 var exports_bootstrap = {};
 __export(exports_bootstrap, {
+  buildSystemInfo: () => buildSystemInfo,
   bootstrap: () => bootstrap
 });
 import { homedir as homedir11 } from "os";
-import { join as join28, resolve as resolve18 } from "path";
-import { existsSync as existsSync35, readFileSync as readFileSync22, writeFileSync as writeFileSync13 } from "fs";
+import { join as join30, resolve as resolve18 } from "path";
+import { existsSync as existsSync36, readFileSync as readFileSync22, writeFileSync as writeFileSync13 } from "fs";
 function buildSystemInfo(config, baseDir, profileCompressed) {
   const now = new Date().toISOString().replace("T", " ").slice(0, 19);
   const isWin = profileCompressed.toLowerCase().includes("win32");
   const lines = [
-    `You are MMA v2, an AI coding agent for small models (${config.model}).`,
-    `Date: ${now}`,
-    `Workspace: ${baseDir}`,
-    `${profileCompressed}`,
-    `Reply in the user's language. Use tools for: read/write/edit/delete files, search (glob/grep), shell commands (bash), web access (web_search, web_fetch), subagents, browser, MCP.`,
-    `Use tools when needed — explain briefly what you're doing if it's not obvious.`,
-    `If a tool call fails, analyze the error and correct the call — try up to 2 times with different approaches before asking the user for help.`,
-    ``,
-    `Design principles:`,
-    `- YAGNI: Do not add code, files, or abstractions not needed right now.`,
-    `- KISS: Prefer simple, straightforward solutions over clever or complex ones.`,
-    `- DRY: Do not duplicate code, logic, or configuration — reuse existing utilities and patterns.`
+    `You are MMA v2, an AI coding agent for small models (${config.model}). Date: ${now}. Workspace: ${baseDir}. ${profileCompressed}.`,
+    `Reply in the user's language. Use tools for file ops (read/write/edit/delete), search (glob/grep), shell (bash), web, subagents, browser, MCP. Explain briefly if not obvious. On tool failure: analyze, fix the call, retry up to 2x with different approaches, then ask the user.`,
+    `Design: YAGNI (no unneeded code), KISS (simple over clever), DRY (reuse existing utilities).`
   ];
   if (isWin) {
-    lines.push(``, `Windows environment — the shell is PowerShell. Use these rules:`, `- For file listings, prefer the list_dir tool over "dir".`, `- For reading files, prefer the read_file tool over "type".`, `- For deleting files, prefer the delete_file tool over "del".`, `- For creating directories, prefer the create_dir tool over "mkdir".`, `- Do NOT use PowerShell cmdlets (Get-Content, Select-Object, Write-Output) — use dedicated tools instead.`, `- Do not use "head", "tail", "grep", "cat" — they are Unix commands. Use the read_file and grep tools instead.`, `- Use forward slashes (/) or escaped backslashes (\\\\) in file paths.`, `- Your working directory is: ${baseDir}`);
+    lines.push(`Windows (PowerShell): use list_dir/read_file/delete_file/create_dir tools instead of dir/type/del/mkdir. No PowerShell cmdlets (Get-Content, Select-Object, Write-Output), no head/tail/grep/cat. Use forward slashes in paths. CWD: ${baseDir}`);
   }
-  lines.push(``, `Bash tool rules:`, `- Use the "workdir" parameter to run commands in a specific directory. Prefer workdir over "cd dir && cmd" chaining.`, `- Run one command per tool call. Split multi-step shell operations into separate bash calls.`, `- Dev servers, watchers and other long-running processes: pass "background: true" to get a process id immediately. Without it, any command still running after a few seconds is automatically moved to the background — 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.`, ``, `=== PLAN QUALITY RULES — your plan MUST follow these ===`, ``, `- Each step must describe CONCRETE deliverables: exact filenames with paths, exact packages to install, exact CLI commands to run. Avoid vague steps — be specific.`, `- A step like "Настройка проекта" or "Setup the project" is too vague — describe what exactly needs to be configured or set up.`, `- A step like "Создать src/components/Header.tsx с навигацией и логотипом, добавить в src/App.tsx импорт <Header />" is GOOD.`, `- Include file extensions (.tsx, .css, .json) and directory paths. Every step must mention at least one file or command.`, `- The plan must cover EVERYTHING needed: init → deps → framework setup → code → verification.`, `- Number of steps: 5-8 for a typical task. Too few means you're being vague. Too many means you're over-splitting.`);
+  lines.push(`Runtime: Bun is available — run TypeScript directly with "bun <file.ts>" and tests with "bun test" (no tsx/ts-node/npm install needed for that).`);
+  lines.push(`Bash: use "workdir" param instead of "cd dir && cmd". One command per call. Long-running processes: pass "background: true" (id immediately), otherwise auto-backgrounded after a few seconds — check with process_log.`, `DEVELOPMENT RULES (strict): 1) install deps BEFORE writing source (npm/pip/cargo, verify lockfile exists; never import uninstalled packages); 2) framework/toolkit init BEFORE app code; 3) follow plan sequentially, after each step verify deliverables exist with real content, then "plan update step=N status=done"; 4) verify work on disk + command output — don't assume success; 5) no premature work (no files/imports for future steps); 6) stuck after 2+ failures: STOP, try a different approach, write files directly, ask the user.`, `PLAN QUALITY: each step = CONCRETE deliverables (exact file paths with extensions, exact packages, exact commands). Vague steps ("Setup the project") forbidden. Cover init → deps → framework → code → verification. 5-8 steps.`);
   if (config.autoPlan) {
-    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.`);
+    lines.push(`Plan rule (MANDATORY): any task creating files, installing packages, or requiring multiple actions MUST create a plan with the "plan" tool BEFORE starting. Each step = a concrete deliverable.`);
   }
   const hasMCP = config.mcpServers && Object.values(config.mcpServers).some((s) => s.enabled !== false);
   if (hasMCP) {
-    lines.push(``, `MCP servers are available. Use the named MCP tools (prefixed with mcp__) to query external services.`);
+    lines.push(`MCP servers are available — use the named MCP tools (prefixed mcp__) to query external services.`);
   }
   return lines.join(`
 `);
 }
 async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
-  const dir = configDir || join28(homedir11(), ".mma");
-  const projectConfigPath = projectDir ? join28(projectDir, ".mmrc") : join28(process.cwd(), ".mmrc");
+  const dir = configDir || join30(homedir11(), ".mma");
+  const projectConfigPath = projectDir ? join30(projectDir, ".mmrc") : join30(process.cwd(), ".mmrc");
   const config = loadConfig({ configDir: dir, projectConfigPath });
   setLocale(config.locale);
   try {
@@ -16425,7 +17483,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     }
   } catch {}
   const logger = new Logger(config.logLevel);
-  logger.setLogDir(join28(dir, "logs"));
+  logger.setLogDir(join30(dir, "logs"));
   logger.debug("MMA bootstrap", {
     version: config.version,
     model: config.model
@@ -16447,7 +17505,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
       logger.info(`Model ${config.model} loaded in ${loadResult.loadTime}s`);
     }
   }
-  const profile = new UserProfile(join28(dir));
+  const profile = new UserProfile(join30(dir));
   profile.load() || profile.collect();
   profile.save();
   const llmProvider = new OpenAICompatProvider({
@@ -16459,7 +17517,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     rateLimits: config.security?.rateLimits
   });
   const baseDir = projectDir ? resolve18(projectDir) : process.cwd();
-  const projectMapCacheDir = join28(baseDir, ".mma");
+  const projectMapCacheDir = join30(baseDir, ".mma");
   const indexerModule = new IndexerModule({
     baseDir,
     cacheDir: projectMapCacheDir
@@ -16470,26 +17528,27 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     logger.warn(`Project indexing failed: ${err.message}`);
   }
   const skillsLoader = new SkillsLoader;
-  const builtinDir = join28(import.meta.dirname, "skills", "builtin");
-  const globalDir = join28(homedir11(), ".agents", "skills");
-  const projectSkillsDir = join28(baseDir, ".mma", "skills");
+  const builtinDir = join30(import.meta.dirname, "skills", "builtin");
+  const globalDir = join30(homedir11(), ".agents", "skills");
+  const projectSkillsDir = join30(baseDir, ".mma", "skills");
   const availableSkills = skillsLoader.loadFromAllSources(builtinDir, globalDir, projectSkillsDir);
   const skillsBudget = Math.floor(config.contextWindow * config.skills.budget);
   const skillsModule = new SkillsModule(availableSkills, skillsBudget);
   const toolRegistry = new ToolRegistry;
   registerAllTools(toolRegistry, skillsModule);
   const pluginManager = new PluginManager;
+  const systemInfoContent = buildSystemInfo(config, baseDir, profile.compress());
   const systemInfoPrompt = {
-    content: buildSystemInfo(config, baseDir, profile.compress()),
+    content: systemInfoContent,
     priority: "critical",
     essential: true,
-    estimatedTokens: 250
+    estimatedTokens: Math.ceil(systemInfoContent.length / 4)
   };
-  const agentsMdGlobal = join28(dir, "AGENTS.md");
-  if (!existsSync35(agentsMdGlobal)) {
+  const agentsMdGlobal = join30(dir, "AGENTS.md");
+  if (!existsSync36(agentsMdGlobal)) {
     writeFileSync13(agentsMdGlobal, "", "utf-8");
   }
-  const sessionDir = join28(dir, "sessions");
+  const sessionDir = join30(dir, "sessions");
   const sessionStore = new SessionStore(sessionDir);
   sessionStore.init();
   const sessionManager = new SessionManager(sessionStore, {
@@ -16556,7 +17615,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const mcpModule = new MCPModule(config);
   await mcpModule.initialize();
   moduleRegistry.register(mcpModule);
-  const memoryModule = new MemoryModule(join28(dir, "memory"));
+  const memoryModule = new MemoryModule(join30(dir, "memory"));
   moduleRegistry.register(memoryModule);
   if (config.browser.enabled) {
     const browserModule = new BrowserModule;
@@ -16606,8 +17665,8 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   pluginManager.register(plugin);
   pluginManager.register(plugin2);
   const pluginLoader = new PluginLoader;
-  const globalPluginsDir = join28(homedir11(), ".mma", "plugins");
-  const projectPluginsDir = join28(baseDir, ".mma", "plugins");
+  const globalPluginsDir = join30(homedir11(), ".mma", "plugins");
+  const projectPluginsDir = join30(baseDir, ".mma", "plugins");
   pluginLoader.loadFromDir(globalPluginsDir, pluginManager, logger);
   pluginLoader.loadFromDir(projectPluginsDir, pluginManager, logger);
   contextManager.onCompact = (summary) => {
@@ -16625,12 +17684,12 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const skipAgentsMd = noAgentsMd === true;
   if (!skipAgentsMd) {
     const agentsMdCandidates = [
-      join28(baseDir, "AGENTS.md"),
-      join28(baseDir, ".mma", "AGENTS.md"),
-      join28(dir, "AGENTS.md")
+      join30(baseDir, "AGENTS.md"),
+      join30(baseDir, ".mma", "AGENTS.md"),
+      join30(dir, "AGENTS.md")
     ];
     for (const p of agentsMdCandidates) {
-      if (existsSync35(p)) {
+      if (existsSync36(p)) {
         const content = readFileSync22(p, "utf-8").trim();
         if (content) {
           agentsMdBlocks.push({
@@ -16719,7 +17778,7 @@ function ansiRegex({ onlyFirst = false } = {}) {
   return new RegExp(pattern, onlyFirst ? undefined : "g");
 }
 
-// node_modules/string-width/node_modules/strip-ansi/index.js
+// node_modules/strip-ansi/index.js
 function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
@@ -16818,65 +17877,135 @@ var init_get_east_asian_width = __esm(() => {
   init_lookup();
 });
 
-// node_modules/emoji-regex/index.js
-var require_emoji_regex = __commonJS((exports, module) => {
-  module.exports = () => {
-    return /[#*0-9]\uFE0F?\u20E3|[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23ED-\u23EF\u23F1\u23F2\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB\u25FC\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692\u2694-\u2697\u2699\u269B\u269C\u26A0\u26A7\u26AA\u26B0\u26B1\u26BD\u26BE\u26C4\u26C8\u26CF\u26D1\u26E9\u26F0-\u26F5\u26F7\u26F8\u26FA\u2702\u2708\u2709\u270F\u2712\u2714\u2716\u271D\u2721\u2733\u2734\u2744\u2747\u2757\u2763\u27A1\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B55\u3030\u303D\u3297\u3299]\uFE0F?|[\u261D\u270C\u270D](?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?|[\u270A\u270B](?:\uD83C[\uDFFB-\uDFFF])?|[\u23E9-\u23EC\u23F0\u23F3\u25FD\u2693\u26A1\u26AB\u26C5\u26CE\u26D4\u26EA\u26FD\u2705\u2728\u274C\u274E\u2753-\u2755\u2795-\u2797\u27B0\u27BF\u2B50]|\u26D3\uFE0F?(?:\u200D\uD83D\uDCA5)?|\u26F9(?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?(?:\u200D[\u2640\u2642]\uFE0F?)?|\u2764\uFE0F?(?:\u200D(?:\uD83D\uDD25|\uD83E\uDE79))?|\uD83C(?:[\uDC04\uDD70\uDD71\uDD7E\uDD7F\uDE02\uDE37\uDF21\uDF24-\uDF2C\uDF36\uDF7D\uDF96\uDF97\uDF99-\uDF9B\uDF9E\uDF9F\uDFCD\uDFCE\uDFD4-\uDFDF\uDFF5\uDFF7]\uFE0F?|[\uDF85\uDFC2\uDFC7](?:\uD83C[\uDFFB-\uDFFF])?|[\uDFC4\uDFCA](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDFCB\uDFCC](?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDCCF\uDD8E\uDD91-\uDD9A\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF43\uDF45-\uDF4A\uDF4C-\uDF7C\uDF7E-\uDF84\uDF86-\uDF93\uDFA0-\uDFC1\uDFC5\uDFC6\uDFC8\uDFC9\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF8-\uDFFF]|\uDDE6\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF]|\uDDE7\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF]|\uDDE8\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF7\uDDFA-\uDDFF]|\uDDE9\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF]|\uDDEA\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA]|\uDDEB\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7]|\uDDEC\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE]|\uDDED\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA]|\uDDEE\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9]|\uDDEF\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5]|\uDDF0\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF]|\uDDF1\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE]|\uDDF2\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF]|\uDDF3\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF]|\uDDF4\uD83C\uDDF2|\uDDF5\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE]|\uDDF6\uD83C\uDDE6|\uDDF7\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC]|\uDDF8\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF]|\uDDF9\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF]|\uDDFA\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF]|\uDDFB\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA]|\uDDFC\uD83C[\uDDEB\uDDF8]|\uDDFD\uD83C\uDDF0|\uDDFE\uD83C[\uDDEA\uDDF9]|\uDDFF\uD83C[\uDDE6\uDDF2\uDDFC]|\uDF44(?:\u200D\uD83D\uDFEB)?|\uDF4B(?:\u200D\uD83D\uDFE9)?|\uDFC3(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?|\uDFF3\uFE0F?(?:\u200D(?:\u26A7\uFE0F?|\uD83C\uDF08))?|\uDFF4(?:\u200D\u2620\uFE0F?|\uDB40\uDC67\uDB40\uDC62\uDB40(?:\uDC65\uDB40\uDC6E\uDB40\uDC67|\uDC73\uDB40\uDC63\uDB40\uDC74|\uDC77\uDB40\uDC6C\uDB40\uDC73)\uDB40\uDC7F)?)|\uD83D(?:[\uDC3F\uDCFD\uDD49\uDD4A\uDD6F\uDD70\uDD73\uDD76-\uDD79\uDD87\uDD8A-\uDD8D\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA\uDECB\uDECD-\uDECF\uDEE0-\uDEE5\uDEE9\uDEF0\uDEF3]\uFE0F?|[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC](?:\uD83C[\uDFFB-\uDFFF])?|[\uDC6E-\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4\uDEB5](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDD74\uDD90](?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?|[\uDC00-\uDC07\uDC09-\uDC14\uDC16-\uDC25\uDC27-\uDC3A\uDC3C-\uDC3E\uDC40\uDC44\uDC45\uDC51-\uDC65\uDC6A\uDC79-\uDC7B\uDC7D-\uDC80\uDC84\uDC88-\uDC8E\uDC90\uDC92-\uDCA9\uDCAB-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDDA4\uDDFB-\uDE2D\uDE2F-\uDE34\uDE37-\uDE41\uDE43\uDE44\uDE48-\uDE4A\uDE80-\uDEA2\uDEA4-\uDEB3\uDEB7-\uDEBF\uDEC1-\uDEC5\uDED0-\uDED2\uDED5-\uDED8\uDEDC-\uDEDF\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB\uDFF0]|\uDC08(?:\u200D\u2B1B)?|\uDC15(?:\u200D\uD83E\uDDBA)?|\uDC26(?:\u200D(?:\u2B1B|\uD83D\uDD25))?|\uDC3B(?:\u200D\u2744\uFE0F?)?|\uDC41\uFE0F?(?:\u200D\uD83D\uDDE8\uFE0F?)?|\uDC68(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDC68\uDC69]\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?)|[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?)|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFC-\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFC-\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFD-\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFD\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFE])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFE]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?))?|\uDC69(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?[\uDC68\uDC69]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?|\uDC69\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?))|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFC-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFC-\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFC-\uDFFF])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB\uDFFD-\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFD-\uDFFF])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB-\uDFFD\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFD\uDFFF])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFE])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB-\uDFFE]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFE])))?))?|\uDD75(?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?(?:\u200D[\u2640\u2642]\uFE0F?)?|\uDE2E(?:\u200D\uD83D\uDCA8)?|\uDE35(?:\u200D\uD83D\uDCAB)?|\uDE36(?:\u200D\uD83C\uDF2B\uFE0F?)?|\uDE42(?:\u200D[\u2194\u2195]\uFE0F?)?|\uDEB6(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?)|\uD83E(?:[\uDD0C\uDD0F\uDD18-\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5\uDEC3-\uDEC5\uDEF0\uDEF2-\uDEF8](?:\uD83C[\uDFFB-\uDFFF])?|[\uDD26\uDD35\uDD37-\uDD39\uDD3C-\uDD3E\uDDB8\uDDB9\uDDCD\uDDCF\uDDD4\uDDD6-\uDDDD](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDDDE\uDDDF](?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDD0D\uDD0E\uDD10-\uDD17\uDD20-\uDD25\uDD27-\uDD2F\uDD3A\uDD3F-\uDD45\uDD47-\uDD76\uDD78-\uDDB4\uDDB7\uDDBA\uDDBC-\uDDCC\uDDD0\uDDE0-\uDDFF\uDE70-\uDE7C\uDE80-\uDE8A\uDE8E-\uDEC2\uDEC6\uDEC8\uDECD-\uDEDC\uDEDF-\uDEEA\uDEEF]|\uDDCE(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?|\uDDD1(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1|\uDDD1\u200D\uD83E\uDDD2(?:\u200D\uD83E\uDDD2)?|\uDDD2(?:\u200D\uD83E\uDDD2)?))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFC-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFC-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFC-\uDFFF])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB\uDFFD-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFD-\uDFFF])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB-\uDFFD\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFD\uDFFF])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB-\uDFFE]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFE])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFE])))?))?|\uDEF1(?:\uD83C(?:\uDFFB(?:\u200D\uD83E\uDEF2\uD83C[\uDFFC-\uDFFF])?|\uDFFC(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB\uDFFD-\uDFFF])?|\uDFFD(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])?|\uDFFE(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB-\uDFFD\uDFFF])?|\uDFFF(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB-\uDFFE])?))?)/g;
-  };
-});
-
 // node_modules/string-width/index.js
-function stringWidth(string, options = {}) {
-  if (typeof string !== "string" || string.length === 0) {
+function isDoubleWidthNonRgiEmojiSequence(segment) {
+  if (segment.length > 50) {
+    return false;
+  }
+  if (unqualifiedKeycapRegex.test(segment)) {
+    return true;
+  }
+  if (segment.includes("‍")) {
+    const pictographics = segment.match(extendedPictographicRegex);
+    return pictographics !== null && pictographics.length >= 2;
+  }
+  return false;
+}
+function baseVisible(segment) {
+  return segment.replace(leadingNonPrintingRegex, "");
+}
+function isZeroWidthCluster(segment) {
+  return zeroWidthClusterRegex.test(segment);
+}
+function isHangulLeadingJamo(codePoint) {
+  return codePoint >= 4352 && codePoint <= 4447 || codePoint >= 43360 && codePoint <= 43388;
+}
+function isHangulVowelJamo(codePoint) {
+  return codePoint >= 4448 && codePoint <= 4519 || codePoint >= 55216 && codePoint <= 55238;
+}
+function isHangulTrailingJamo(codePoint) {
+  return codePoint >= 4520 && codePoint <= 4607 || codePoint >= 55243 && codePoint <= 55291;
+}
+function isHangulJamo(codePoint) {
+  return isHangulLeadingJamo(codePoint) || isHangulVowelJamo(codePoint) || isHangulTrailingJamo(codePoint);
+}
+function hangulClusterWidth(visibleSegment, eastAsianWidthOptions) {
+  const codePoints = [];
+  for (const character of visibleSegment) {
+    if (zeroWidthClusterRegex.test(character)) {
+      continue;
+    }
+    codePoints.push(character.codePointAt(0));
+  }
+  if (codePoints.length === 0) {
+    return;
+  }
+  let width = 0;
+  for (let index = 0;index < codePoints.length; index++) {
+    const codePoint = codePoints[index];
+    if (!isHangulJamo(codePoint)) {
+      if (width === 0) {
+        return;
+      }
+      for (let remaining = index;remaining < codePoints.length; remaining++) {
+        width += eastAsianWidth(codePoints[remaining], eastAsianWidthOptions);
+      }
+      return width;
+    }
+    if (isHangulLeadingJamo(codePoint) && isHangulVowelJamo(codePoints[index + 1])) {
+      width += 2;
+      index += isHangulTrailingJamo(codePoints[index + 2]) ? 2 : 1;
+      continue;
+    }
+    width += eastAsianWidth(codePoint, eastAsianWidthOptions);
+  }
+  return width;
+}
+function trailingWidth(visibleSegment, eastAsianWidthOptions) {
+  let extra = 0;
+  let first = true;
+  for (const character of visibleSegment) {
+    if (first) {
+      first = false;
+      continue;
+    }
+    if (spacingMarkRegex.test(character) || character >= "＀" && character <= "￯") {
+      extra += eastAsianWidth(character.codePointAt(0), eastAsianWidthOptions);
+    }
+  }
+  return extra;
+}
+function stringWidth(input, options = {}) {
+  if (typeof input !== "string" || input.length === 0) {
     return 0;
   }
   const {
     ambiguousIsNarrow = true,
     countAnsiEscapeCodes = false
   } = options;
-  if (!countAnsiEscapeCodes) {
+  let string = input;
+  if (!countAnsiEscapeCodes && (string.includes("\x1B") || string.includes("›"))) {
     string = stripAnsi(string);
   }
   if (string.length === 0) {
     return 0;
   }
+  if (/^[\u0020-\u007E]*$/.test(string)) {
+    return string.length;
+  }
   let width = 0;
   const eastAsianWidthOptions = { ambiguousAsWide: !ambiguousIsNarrow };
-  for (const { segment: character } of segmenter.segment(string)) {
-    const codePoint = character.codePointAt(0);
-    if (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) {
-      continue;
-    }
-    if (codePoint >= 8203 && codePoint <= 8207 || codePoint === 65279) {
-      continue;
-    }
-    if (codePoint >= 768 && codePoint <= 879 || codePoint >= 6832 && codePoint <= 6911 || codePoint >= 7616 && codePoint <= 7679 || codePoint >= 8400 && codePoint <= 8447 || codePoint >= 65056 && codePoint <= 65071) {
-      continue;
-    }
-    if (codePoint >= 55296 && codePoint <= 57343) {
-      continue;
-    }
-    if (codePoint >= 65024 && codePoint <= 65039) {
+  for (const { segment } of segmenter.segment(string)) {
+    if (isZeroWidthCluster(segment)) {
       continue;
     }
-    if (defaultIgnorableCodePointRegex.test(character)) {
+    if (rgiEmojiRegex.test(segment) || isDoubleWidthNonRgiEmojiSequence(segment)) {
+      width += 2;
       continue;
     }
-    if (import_emoji_regex.default().test(character)) {
-      width += 2;
+    const visibleSegment = baseVisible(segment);
+    const hangulWidth = hangulClusterWidth(visibleSegment, eastAsianWidthOptions);
+    if (hangulWidth !== undefined) {
+      width += hangulWidth;
       continue;
     }
+    const codePoint = visibleSegment.codePointAt(0);
     width += eastAsianWidth(codePoint, eastAsianWidthOptions);
+    width += trailingWidth(visibleSegment, eastAsianWidthOptions);
   }
   return width;
 }
-var import_emoji_regex, segmenter, defaultIgnorableCodePointRegex;
+var segmenter, zeroWidthClusterRegex, leadingNonPrintingRegex, spacingMarkRegex, rgiEmojiRegex, unqualifiedKeycapRegex, extendedPictographicRegex;
 var init_string_width = __esm(() => {
   init_strip_ansi();
   init_get_east_asian_width();
-  import_emoji_regex = __toESM(require_emoji_regex(), 1);
   segmenter = new Intl.Segmenter;
-  defaultIgnorableCodePointRegex = /^\p{Default_Ignorable_Code_Point}$/u;
+  zeroWidthClusterRegex = /^(?:\p{Default_Ignorable_Code_Point}|\p{Control}|\p{Format}|\p{Nonspacing_Mark}|\p{Enclosing_Mark}|\p{Surrogate})+$/v;
+  leadingNonPrintingRegex = /^[\p{Default_Ignorable_Code_Point}\p{Control}\p{Format}\p{Nonspacing_Mark}\p{Enclosing_Mark}\p{Surrogate}]+/v;
+  spacingMarkRegex = /\p{Spacing_Mark}/v;
+  rgiEmojiRegex = /^\p{RGI_Emoji}$/v;
+  unqualifiedKeycapRegex = /^[\d#*]\u20E3$/;
+  extendedPictographicRegex = /\p{Extended_Pictographic}/gu;
 });
 
 // src/ui/table.ts
@@ -17410,12 +18539,12 @@ __export(exports_manifest, {
   getCertMark: () => getCertMark,
   MANIFEST_PATH: () => MANIFEST_PATH
 });
-import { existsSync as existsSync36, readFileSync as readFileSync23, mkdirSync as mkdirSync15, writeFileSync as writeFileSync14 } from "fs";
+import { existsSync as existsSync37, readFileSync as readFileSync23, mkdirSync as mkdirSync16, writeFileSync as writeFileSync14 } from "fs";
 import { homedir as homedir13 } from "os";
-import { join as join30 } from "path";
+import { join as join32 } from "path";
 function readManifest(path = MANIFEST_PATH) {
   try {
-    if (existsSync36(path)) {
+    if (existsSync37(path)) {
       const raw = JSON.parse(readFileSync23(path, "utf-8"));
       return { version: 1, certifications: raw.certifications ?? [] };
     }
@@ -17423,7 +18552,7 @@ function readManifest(path = MANIFEST_PATH) {
   return { version: 1, certifications: [] };
 }
 function saveManifest(m, path = MANIFEST_PATH) {
-  mkdirSync15(join30(homedir13(), ".mma"), { recursive: true });
+  mkdirSync16(join32(homedir13(), ".mma"), { recursive: true });
   writeFileSync14(path, JSON.stringify(m, null, 2), "utf-8");
 }
 function upsertCertification(entry, path = MANIFEST_PATH) {
@@ -17458,7 +18587,7 @@ function getCertMark(model, providerUrl, currentVersion, path = MANIFEST_PATH) {
 }
 var MANIFEST_PATH;
 var init_manifest = __esm(() => {
-  MANIFEST_PATH = join30(homedir13(), ".mma", "certifications.json");
+  MANIFEST_PATH = join32(homedir13(), ".mma", "certifications.json");
 });
 
 // node_modules/yaml/dist/nodes/identity.js
@@ -24581,8 +25710,8 @@ var init_scenarios = __esm(() => {
 });
 
 // src/modules/certification/loader.ts
-import { existsSync as existsSync37, readdirSync as readdirSync11, readFileSync as readFileSync24 } from "fs";
-import { join as join31 } from "path";
+import { existsSync as existsSync38, readdirSync as readdirSync14, readFileSync as readFileSync24 } from "fs";
+import { join as join33 } from "path";
 function validateScenario(s) {
   const errors2 = [];
   const isSkip = s.mode === "skip";
@@ -24631,12 +25760,12 @@ function loadScenarios(userDir) {
     else
       scenarios.push(s);
   }
-  if (userDir && existsSync37(userDir)) {
-    for (const file of readdirSync11(userDir)) {
+  if (userDir && existsSync38(userDir)) {
+    for (const file of readdirSync14(userDir)) {
       if (!file.endsWith(".yaml") && !file.endsWith(".yml"))
         continue;
       try {
-        const raw = readFileSync24(join31(userDir, file), "utf-8");
+        const raw = readFileSync24(join33(userDir, file), "utf-8");
         const data = $parse(raw);
         const parsed = normalizeScenario(data, file);
         const errs = validateScenario(parsed);
@@ -24689,8 +25818,8 @@ var init_loader3 = __esm(() => {
 });
 
 // src/modules/certification/fact-checker.ts
-import { existsSync as existsSync38, readFileSync as readFileSync25, statSync as statSync7 } from "fs";
-import { join as join32 } from "path";
+import { existsSync as existsSync39, readFileSync as readFileSync25, statSync as statSync8 } from "fs";
+import { join as join34 } from "path";
 function checkSandbox(sandboxDir, checks, exitCode, output) {
   const failures = [];
   for (const check of checks) {
@@ -24707,13 +25836,13 @@ function runCheck(sandboxDir, check, exitCode, output) {
     case "outputContains":
       return output.includes(check.text);
     case "fileExists":
-      return isFile(join32(sandboxDir, check.path));
+      return isFile(join34(sandboxDir, check.path));
     case "fileNotExists":
-      return !existsSync38(join32(sandboxDir, check.path));
+      return !existsSync39(join34(sandboxDir, check.path));
     case "dirExists":
-      return isDir(join32(sandboxDir, check.path));
+      return isDir(join34(sandboxDir, check.path));
     case "fileContent": {
-      const abs = join32(sandboxDir, check.path);
+      const abs = join34(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       const content = readFileSync25(abs, "utf-8");
@@ -24724,7 +25853,7 @@ function runCheck(sandboxDir, check, exitCode, output) {
       return false;
     }
     case "fileRegex": {
-      const abs = join32(sandboxDir, check.path);
+      const abs = join34(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       return new RegExp(check.pattern).test(readFileSync25(abs, "utf-8"));
@@ -24735,14 +25864,14 @@ function runCheck(sandboxDir, check, exitCode, output) {
 }
 function isFile(p) {
   try {
-    return existsSync38(p) && statSync7(p).isFile();
+    return existsSync39(p) && statSync8(p).isFile();
   } catch {
     return false;
   }
 }
 function isDir(p) {
   try {
-    return existsSync38(p) && statSync7(p).isDirectory();
+    return existsSync39(p) && statSync8(p).isDirectory();
   } catch {
     return false;
   }
@@ -24773,9 +25902,9 @@ var init_fact_checker = () => {};
 
 // src/modules/certification/runner.ts
 import { spawn as spawn6 } from "child_process";
-import { existsSync as existsSync39, mkdirSync as mkdirSync16, rmSync as rmSync3, cpSync as cpSync2 } from "fs";
+import { existsSync as existsSync40, mkdirSync as mkdirSync17, rmSync as rmSync4, cpSync as cpSync2 } from "fs";
 import { platform as platform5 } from "os";
-import { join as join33, resolve as resolve19, dirname as dirname9 } from "path";
+import { join as join35, resolve as resolve19, dirname as dirname8 } from "path";
 async function runScenario(scenario, opts) {
   if (scenario.mode === "skip") {
     return {
@@ -24787,14 +25916,14 @@ async function runScenario(scenario, opts) {
     };
   }
   const reps = scenario.reps ?? opts.defaultReps;
-  const threshold = scenario.passThreshold ?? opts.defaultThreshold;
+  const threshold = Math.min(scenario.passThreshold ?? opts.defaultThreshold, reps);
   const runner = opts.runner ?? defaultRunner;
   const timeoutMs = opts.timeoutMs ?? 120000;
   const entryPoint = resolveMmaEntry(opts.mmaRoot);
   let passed = 0;
   let firstError;
   for (let i = 1;i <= reps; i++) {
-    const sandbox = join33(opts.sandboxBase, `run-${scenario.id}-${i}`);
+    const sandbox = join35(opts.sandboxBase, `run-${scenario.id}-${i}`);
     let failures = [];
     let exitCode = -1;
     let output = "";
@@ -24852,23 +25981,23 @@ ${res.stderr}`;
   };
 }
 function prepareSandbox(sandbox, scenario, mmaRoot) {
-  rmSync3(sandbox, { recursive: true, force: true });
-  mkdirSync16(sandbox, { recursive: true });
+  rmSync4(sandbox, { recursive: true, force: true });
+  mkdirSync17(sandbox, { recursive: true });
   for (const f of scenario.fixtures ?? []) {
-    const src = join33(mmaRoot, f.source);
-    if (!existsSync39(src)) {
+    const src = join35(mmaRoot, f.source);
+    if (!existsSync40(src)) {
       throw new Error(`fixture missing: ${f.source}`);
     }
-    const dest = join33(sandbox, f.dest);
-    mkdirSync16(dirname9(dest), { recursive: true });
+    const dest = join35(sandbox, f.dest);
+    mkdirSync17(dirname8(dest), { recursive: true });
     cpSync2(src, dest);
   }
 }
 function resolveMmaEntry(mmaRoot) {
-  const dev = join33(mmaRoot, "src", "cli", "main.ts");
-  if (existsSync39(dev))
+  const dev = join35(mmaRoot, "src", "cli", "main.ts");
+  if (existsSync40(dev))
     return dev;
-  return join33(mmaRoot, "dist", "main.js");
+  return join35(mmaRoot, "dist", "main.js");
 }
 function findMmaRoot(fromDir) {
   const candidates = [
@@ -24876,7 +26005,7 @@ function findMmaRoot(fromDir) {
     resolve19(fromDir, "..")
   ];
   for (const c of candidates) {
-    if (existsSync39(join33(c, "package.json")))
+    if (existsSync40(join35(c, "package.json")))
       return c;
   }
   return process.cwd();
@@ -24942,20 +26071,20 @@ __export(exports_cli, {
   certStatus: () => certStatus,
   certList: () => certList
 });
-import { rmSync as rmSync4 } from "fs";
+import { rmSync as rmSync5 } from "fs";
 import { homedir as homedir14 } from "os";
-import { join as join34, dirname as dirname10 } from "path";
+import { join as join36, dirname as dirname9 } from "path";
 import { fileURLToPath } from "url";
-import { existsSync as existsSync40, readFileSync as readFileSync26 } from "fs";
+import { existsSync as existsSync41, readFileSync as readFileSync26 } from "fs";
 function readVersion() {
-  const candidates = [
-    join34(MMA_ROOT, "package.json")
-  ];
+  const candidates = [join36(MMA_ROOT, "package.json")];
   for (const p of candidates) {
-    if (existsSync40(p)) {
-      const raw = JSON.parse(readFileSync26(p, "utf-8"));
-      if (raw.version)
-        return raw.version;
+    if (existsSync41(p)) {
+      try {
+        const raw = JSON.parse(readFileSync26(p, "utf-8"));
+        if (raw.version)
+          return raw.version;
+      } catch {}
     }
   }
   return "0.0.0";
@@ -24988,7 +26117,7 @@ async function certify(opts) {
     return;
   }
   console.log(t("cli.cert_started", { model: opts.name, provider: providerUrl }));
-  const sandboxBase = join34(process.cwd(), ".mma", "certification");
+  const sandboxBase = join36(process.cwd(), ".mma", "certification");
   const results = [];
   const total = selected.length;
   let idx = 0;
@@ -24996,7 +26125,13 @@ async function certify(opts) {
     idx++;
     if (scenario.mode === "skip") {
       console.log(pc2.dim(`[${idx}/${total}] ${scenario.id} ... skipped`));
-      results.push({ id: scenario.id, title: scenario.title, status: "skipped", passed: 0, of: 0 });
+      results.push({
+        id: scenario.id,
+        title: scenario.title,
+        status: "skipped",
+        passed: 0,
+        of: 0
+      });
       continue;
     }
     const res = await runScenario(scenario, {
@@ -25019,7 +26154,7 @@ async function certify(opts) {
   }
   if (opts.clean) {
     try {
-      rmSync4(sandboxBase, { recursive: true, force: true });
+      rmSync5(sandboxBase, { recursive: true, force: true });
     } catch {}
   }
   const suite = summarize(results);
@@ -25094,9 +26229,9 @@ var init_cli = __esm(() => {
   init_loader3();
   init_runner2();
   init_manifest();
-  HERE = dirname10(fileURLToPath(import.meta.url));
+  HERE = dirname9(fileURLToPath(import.meta.url));
   MMA_ROOT = findMmaRoot(HERE);
-  USER_SCENARIO_DIR = join34(homedir14(), ".mma", "certification", "scenarios");
+  USER_SCENARIO_DIR = join36(homedir14(), ".mma", "certification", "scenarios");
 });
 
 // src/cli/repl-commands.ts
@@ -25105,21 +26240,23 @@ __export(exports_repl_commands, {
   registerAllCommands: () => registerAllCommands,
   COMMAND_GROUPS: () => COMMAND_GROUPS
 });
-import { join as join36, dirname as dirname12 } from "path";
+import { join as join38, dirname as dirname11 } from "path";
 import { homedir as homedir16 } from "os";
-import { existsSync as existsSync42, readFileSync as readFileSync28 } from "fs";
+import { existsSync as existsSync43, readFileSync as readFileSync28 } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function readVersion3() {
-  const here = dirname12(fileURLToPath3(import.meta.url));
+  const here = dirname11(fileURLToPath3(import.meta.url));
   const candidates = [
-    join36(here, "..", "..", "package.json"),
-    join36(here, "..", "package.json")
+    join38(here, "..", "..", "package.json"),
+    join38(here, "..", "package.json")
   ];
   for (const p of candidates) {
-    if (existsSync42(p)) {
-      const raw = JSON.parse(readFileSync28(p, "utf8"));
-      if (raw.version)
-        return raw.version;
+    if (existsSync43(p)) {
+      try {
+        const raw = JSON.parse(readFileSync28(p, "utf8"));
+        if (raw.version)
+          return raw.version;
+      } catch {}
     }
   }
   return "0.0.0";
@@ -25180,7 +26317,7 @@ function registerMmaCommands(ctx) {
       }
       try {
         const { loadFileAsDataUrl: loadFileAsDataUrl2, loadUrlAsDataUrl: loadUrlAsDataUrl2, readClipboardImage: readClipboardImage2 } = await Promise.resolve().then(() => (init_image_utils(), exports_image_utils));
-        const { existsSync: existsSync43 } = await import("fs");
+        const { existsSync: existsSync44 } = await import("fs");
         const { resolve: resolve20 } = await import("path");
         let dataUrl;
         let label;
@@ -25200,7 +26337,7 @@ function registerMmaCommands(ctx) {
           label = source;
         } else {
           const absPath = resolve20(process.cwd(), source);
-          if (!existsSync43(absPath)) {
+          if (!existsSync44(absPath)) {
             console.log(pc2.red(t("image.not_found", { path: source })));
             return;
           }
@@ -25279,7 +26416,7 @@ function registerMmaCommands(ctx) {
       console.log(pc2.yellow(t("repl.wizard_running")));
       await ctx.withExclusiveInput(async () => {
         const answers = await runSetup(ctx.rl);
-        const configPath = join36(homedir16(), ".mma", "config.json");
+        const configPath = join38(homedir16(), ".mma", "config.json");
         ctx.config.provider.type = answers.provider;
         ctx.config.provider.baseUrl = answers.apiBase;
         ctx.config.provider.apiKey = answers.apiKey;
@@ -25333,7 +26470,7 @@ Excluded blocks: ${info.excluded.length}`));
           return;
         }
         ctx.config.provider.type = name;
-        const configPath = join36(homedir16(), ".mma", "config.json");
+        const configPath = join38(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
         console.log(pc2.green(t("repl.provider_set", { name })));
@@ -25389,7 +26526,7 @@ Excluded blocks: ${info.excluded.length}`));
           return;
         }
         ctx.config.model = name;
-        const configPath = join36(homedir16(), ".mma", "config.json");
+        const configPath = join38(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
         console.log(pc2.green(t("repl.model_set", { name })));
@@ -25414,7 +26551,7 @@ Excluded blocks: ${info.excluded.length}`));
         return;
       }
       ctx.config.contextWindow = size;
-      const configPath = join36(homedir16(), ".mma", "config.json");
+      const configPath = join38(homedir16(), ".mma", "config.json");
       saveConfig(ctx.config, configPath);
       await ctx.agent.reconfigure(ctx.config);
       console.log(pc2.green(t("cli.context_set", { size })));
@@ -25433,10 +26570,10 @@ Excluded blocks: ${info.excluded.length}`));
       ctx.agent.shutdown();
       const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config2(), exports_config));
       const { homedir: homedir17 } = await import("os");
-      const { join: join37 } = await import("path");
+      const { join: join39 } = await import("path");
       const configDir = ctx.configDir;
       const baseDir = ctx.baseDir;
-      const projectConfigPath = join37(baseDir, ".mmrc");
+      const projectConfigPath = join39(baseDir, ".mmrc");
       const freshConfig = loadConfig2({ configDir, projectConfigPath });
       Object.assign(ctx.config, freshConfig);
       const { bootstrap: bootstrap2 } = await Promise.resolve().then(() => (init_bootstrap(), exports_bootstrap));
@@ -25736,14 +26873,14 @@ init_bootstrap();
 init_config2();
 init_setup();
 init_i18n();
-import { join as join35, dirname as dirname11 } from "path";
+import { join as join37, dirname as dirname10 } from "path";
 import { homedir as homedir15 } from "os";
-import { existsSync as existsSync41, readFileSync as readFileSync27 } from "fs";
+import { existsSync as existsSync42, readFileSync as readFileSync27 } from "fs";
 
 // src/cli/security-commands.ts
 init_bootstrap();
 init_config2();
-import { join as join29 } from "path";
+import { join as join31 } from "path";
 import { homedir as homedir12 } from "os";
 
 // src/modules/security/security-policies.ts
@@ -26273,7 +27410,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 = join29(homedir12(), ".mma", "config.json");
+    const configPath = join31(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const validPresets = ["strict", "balanced", "permissive"];
     if (!validPresets.includes(preset)) {
@@ -26288,7 +27425,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 = join29(homedir12(), ".mma", "config.json");
+    const configPath = join31(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -26300,7 +27437,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 = join29(homedir12(), ".mma", "config.json");
+    const configPath = join31(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -26312,7 +27449,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 = join29(homedir12(), ".mma", "config.json");
+    const configPath = join31(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -26326,7 +27463,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 = join29(homedir12(), ".mma", "config.json");
+    const configPath = join31(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -26360,16 +27497,18 @@ function createSecurityCommand(program2) {
 // src/cli/commands.ts
 import { fileURLToPath as fileURLToPath2 } from "url";
 function readVersion2() {
-  const here = dirname11(fileURLToPath2(import.meta.url));
+  const here = dirname10(fileURLToPath2(import.meta.url));
   const candidates = [
-    join35(here, "..", "..", "package.json"),
-    join35(here, "..", "package.json")
+    join37(here, "..", "..", "package.json"),
+    join37(here, "..", "package.json")
   ];
   for (const p of candidates) {
-    if (existsSync41(p)) {
-      const raw = JSON.parse(readFileSync27(p, "utf8"));
-      if (raw.version)
-        return raw.version;
+    if (existsSync42(p)) {
+      try {
+        const raw = JSON.parse(readFileSync27(p, "utf8"));
+        if (raw.version)
+          return raw.version;
+      } catch {}
     }
   }
   return "0.0.0";
@@ -26379,7 +27518,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 = join35(homedir15(), ".mma", "config.json");
+    const configPath = join37(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = answers.provider;
     config.provider.baseUrl = answers.apiBase;
@@ -26424,7 +27563,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 = join35(homedir15(), ".mma", "config.json");
+    const configPath = join37(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     const keys = key.split(".");
     let obj = config;
@@ -26487,7 +27626,7 @@ function createProgram() {
     console.log(t("cli.model_hint"));
   });
   model.command("use").argument("<name>", "Model name").description(t("cli.set_model")).action(async (name) => {
-    const configPath = join35(homedir15(), ".mma", "config.json");
+    const configPath = join37(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.model = name;
     saveConfig(config, configPath);
@@ -26523,7 +27662,7 @@ function createProgram() {
     await uncertify2(name, config);
   });
   program2.command("context").description(t("cli.manage_context")).argument("<size>", "Context window size in tokens").action(async (size) => {
-    const configPath = join35(homedir15(), ".mma", "config.json");
+    const configPath = join37(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     const contextWindow = parseInt(size, 10);
     if (isNaN(contextWindow) || contextWindow < 1024) {
@@ -26541,7 +27680,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 = join35(homedir15(), ".mma", "config.json");
+    const configPath = join37(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = name;
     saveConfig(config, configPath);
@@ -26593,8 +27732,8 @@ init_bootstrap();
 // src/cli/repl.ts
 init_colors();
 import * as readline2 from "readline";
-import { existsSync as existsSync43, readFileSync as readFileSync29, writeFileSync as writeFileSync15 } from "fs";
-import { join as join37, dirname as dirname13 } from "path";
+import { existsSync as existsSync44, readFileSync as readFileSync29, writeFileSync as writeFileSync15 } from "fs";
+import { join as join39, dirname as dirname12 } from "path";
 import { homedir as homedir17 } from "os";
 import { fileURLToPath as fileURLToPath4 } from "url";
 
@@ -27106,16 +28245,18 @@ init_box();
 init_i18n();
 init_repl_commands();
 function readVersion4() {
-  const here = dirname13(fileURLToPath4(import.meta.url));
+  const here = dirname12(fileURLToPath4(import.meta.url));
   const candidates = [
-    join37(here, "..", "..", "package.json"),
-    join37(here, "..", "package.json")
+    join39(here, "..", "..", "package.json"),
+    join39(here, "..", "package.json")
   ];
   for (const p of candidates) {
-    if (existsSync43(p)) {
-      const raw = JSON.parse(readFileSync29(p, "utf8"));
-      if (raw.version)
-        return raw.version;
+    if (existsSync44(p)) {
+      try {
+        const raw = JSON.parse(readFileSync29(p, "utf8"));
+        if (raw.version)
+          return raw.version;
+      } catch {}
     }
   }
   return "0.0.0";
@@ -27158,16 +28299,18 @@ class Repl {
   sessionManager;
   skillsModule;
   pluginManager;
-  constructor(agent, config, sessionManager, skillsModule, pluginManager, configDir, baseDir, noAgentsMd) {
+  logger;
+  constructor(agent, config, sessionManager, skillsModule, pluginManager, configDir, baseDir, noAgentsMd, logger) {
     this.agent = agent;
     this.config = config;
     this.sessionManager = sessionManager;
     this.skillsModule = skillsModule;
     this.pluginManager = pluginManager;
-    this.configDir = configDir || join37(homedir17(), ".mma");
+    this.logger = logger;
+    this.configDir = configDir || join39(homedir17(), ".mma");
     this.baseDir = baseDir || process.cwd();
     this.noAgentsMd = noAgentsMd === true;
-    this.historyPath = join37(homedir17(), ".mma", "repl-history");
+    this.historyPath = join39(homedir17(), ".mma", "repl-history");
     this.loadHistory();
     this.rl = readline2.createInterface({
       input: process.stdin,
@@ -27188,7 +28331,7 @@ class Repl {
     this.setupListeners();
   }
   loadHistory() {
-    if (existsSync43(this.historyPath)) {
+    if (existsSync44(this.historyPath)) {
       try {
         const raw = readFileSync29(this.historyPath, "utf-8");
         this.history = raw.split(`
@@ -27365,6 +28508,7 @@ ${t("image.clipboard_empty")}`));
         }
         this.pendingClipboardImage = null;
       }
+      this.logger?.logREPL("user", input);
       process.stdout.write(`
 ` + pc2.green(t("repl.agent")));
       const renderer = new Renderer({
@@ -27387,6 +28531,7 @@ ${t("image.clipboard_empty")}`));
       renderer.flush();
       process.stdout.write(`
 `);
+      this.logger?.logREPL(result.success ? "assistant" : "system", result.text?.slice(0, 400) || result.error || "");
       if (!result.success) {
         console.error(pc2.red(`${t("error.prefix")}${result.error}`));
       }
@@ -27519,11 +28664,11 @@ ${t("image.clipboard_empty")}`));
       row(t("repl.agents_label"), pc2.red(t("repl.disabled")));
     } else {
       const agentsMdCandidates = [
-        join37(this.baseDir, "AGENTS.md"),
-        join37(this.baseDir, ".mma", "AGENTS.md"),
-        join37(this.configDir, "AGENTS.md")
+        join39(this.baseDir, "AGENTS.md"),
+        join39(this.baseDir, ".mma", "AGENTS.md"),
+        join39(this.configDir, "AGENTS.md")
       ];
-      const foundAgents = agentsMdCandidates.filter((p) => existsSync43(p));
+      const foundAgents = agentsMdCandidates.filter((p) => existsSync44(p));
       if (foundAgents.length > 0) {
         for (const p of foundAgents) {
           row(t("repl.agents_label"), pc2.dim(p));
@@ -27534,7 +28679,7 @@ ${t("image.clipboard_empty")}`));
     }
     const meta = this.sessionManager?.getActiveMeta();
     if (meta) {
-      const sessionPath = join37(this.configDir, "sessions", meta.id);
+      const sessionPath = join39(this.configDir, "sessions", meta.id);
       row(t("repl.session_label"), `${pc2.cyan(meta.name)} ${pc2.dim(`(${meta.id.slice(0, 12)})`)}  —  ${meta.messageCount} msgs  ${pc2.dim(sessionPath)}`);
     }
     const headerWidth = Math.max(50, Math.min(96, process.stdout.columns || 96));
@@ -27560,8 +28705,8 @@ init_setup();
 init_config2();
 init_i18n();
 init_colors();
-import { existsSync as existsSync44 } from "fs";
-import { join as join38 } from "path";
+import { existsSync as existsSync45 } from "fs";
+import { join as join40 } from "path";
 import { homedir as homedir18 } from "os";
 async function main() {
   const program2 = createProgram();
@@ -27628,15 +28773,15 @@ async function main() {
     }
     agent.shutdown();
   } else {
-    const configPath = join38(homedir18(), ".mma", "config.json");
-    if (!existsSync44(configPath)) {
+    const configPath = join40(homedir18(), ".mma", "config.json");
+    if (!existsSync45(configPath)) {
       console.log(pc2.yellow(`
   ` + t("cli.first_run") + `
 `));
       const answers = await runSetup();
       const config2 = loadConfig({
-        configDir: join38(homedir18(), ".mma"),
-        projectConfigPath: projectDir ? join38(projectDir, ".mmrc") : join38(process.cwd(), ".mmrc")
+        configDir: join40(homedir18(), ".mma"),
+        projectConfigPath: projectDir ? join40(projectDir, ".mmrc") : join40(process.cwd(), ".mmrc")
       });
       config2.provider.type = answers.provider;
       config2.provider.baseUrl = answers.apiBase;
@@ -27685,9 +28830,10 @@ async function main() {
       skillsModule,
       pluginManager,
       configDir,
-      baseDir
+      baseDir,
+      logger
     } = await bootstrap(undefined, projectDir, noAgentsMd, exitOnComplete);
-    const repl = new Repl(agent, config, sessionManager, skillsModule, pluginManager, configDir, baseDir, noAgentsMd);
+    const repl = new Repl(agent, config, sessionManager, skillsModule, pluginManager, configDir, baseDir, noAgentsMd, logger);
     repl.start();
   }
 }