micro-models-agent 0.28.0 → 0.28.2

package/dist/main.js

@@ -2210,7 +2210,7 @@ var init_defaults = __esm(() => {
       maxDelay: 30000
     },
     maxToolIterations: 1000,
-    stuckThreshold: 8,
+    stuckThreshold: 6,
     autoPlan: true,
     showReasoning: false,
     logLevel: "info",
@@ -2418,6 +2418,7 @@ Command: {command}`,
     "plan.step_marked": "Step {step} marked as {status}",
     "plan.aborted": "Plan aborted",
     "plan.unknown_action": "Unknown plan action: {action}",
+    "plan.updated": "Plan updated: {title} ({steps} steps)",
     "plan.acknowledged": "Plan {action}: acknowledged",
     "plan.step_status": "Step {step}: {status}",
     "plan.no_active": "No active plan",
@@ -2962,6 +2963,7 @@ var init_ru = __esm(() => {
     "plan.step_marked": "Шаг {step} отмечен как {status}",
     "plan.aborted": "План отменён",
     "plan.unknown_action": "Неизвестное действие плана: {action}",
+    "plan.updated": "План обновлён: {title} ({steps} шагов)",
     "plan.acknowledged": "План {action}: принято",
     "plan.step_status": "Шаг {step}: {status}",
     "plan.no_active": "Нет активного плана",
@@ -3351,7 +3353,10 @@ function flatten(obj, prefix = "") {
     if (typeof val === "string") {
       result[fullKey] = val;
     } else if (typeof val === "object" && val !== null) {
-      result = { ...result, ...flatten(val, fullKey) };
+      result = {
+        ...result,
+        ...flatten(val, fullKey)
+      };
     }
   }
   return result;
@@ -3364,7 +3369,7 @@ function setLocale(locale) {
 function t(key, params) {
   const localeDict = flat[currentLocale];
   const enDict = flat["en"];
-  let template = localeDict?.[key] || enDict?.[key];
+  let template = localeDict?.[key] ?? enDict?.[key] ?? key;
   if (!template)
     return key;
   if (params) {
@@ -3686,7 +3691,13 @@ __export(exports_config, {
   saveConfig: () => saveConfig,
   loadConfig: () => loadConfig
 });
-import { existsSync as existsSync4, readFileSync as readFileSync3, unlinkSync, writeFileSync as writeFileSync3, mkdirSync as mkdirSync2 } from "fs";
+import {
+  existsSync as existsSync4,
+  readFileSync as readFileSync3,
+  unlinkSync,
+  writeFileSync as writeFileSync3,
+  mkdirSync as mkdirSync2
+} from "fs";
 import { join as join4, dirname } from "path";
 function restoreDangerousPatterns(patterns, defaults) {
   const fallback = Array.isArray(defaults) ? defaults : [];
@@ -3760,12 +3771,21 @@ function applyEnvVars(config) {
     result.logLevel = env.MMA_LOG_LEVEL;
   if (env.MMA_LOCALE)
     result.locale = env.MMA_LOCALE;
-  if (env.MMA_CONTEXT_WINDOW)
-    result.contextWindow = parseInt(env.MMA_CONTEXT_WINDOW, 10);
-  if (env.MMA_MAX_TOOL_ITERATIONS)
-    result.maxToolIterations = parseInt(env.MMA_MAX_TOOL_ITERATIONS, 10);
-  if (env.MMA_STUCK_THRESHOLD)
-    result.stuckThreshold = parseInt(env.MMA_STUCK_THRESHOLD, 10);
+  if (env.MMA_CONTEXT_WINDOW) {
+    const v = parseInt(env.MMA_CONTEXT_WINDOW, 10);
+    if (!isNaN(v))
+      result.contextWindow = v;
+  }
+  if (env.MMA_MAX_TOOL_ITERATIONS) {
+    const v = parseInt(env.MMA_MAX_TOOL_ITERATIONS, 10);
+    if (!isNaN(v))
+      result.maxToolIterations = v;
+  }
+  if (env.MMA_STUCK_THRESHOLD) {
+    const v = parseInt(env.MMA_STUCK_THRESHOLD, 10);
+    if (!isNaN(v))
+      result.stuckThreshold = v;
+  }
   if (env.MMA_AUTO_PLAN)
     result.autoPlan = env.MMA_AUTO_PLAN === "true";
   if (env.MMA_MOE_ENABLED)
@@ -3825,7 +3845,9 @@ function saveConfig(config, configPath) {
   mkdirSync2(dir, { recursive: true });
   try {
     const encryptor = new ConfigEncryptor;
-    const encryptedConfig = encryptor.encrypt({ ...config });
+    const encryptedConfig = encryptor.encrypt({
+      ...config
+    });
     writeFileSync3(configPath, JSON.stringify(encryptedConfig, regexReplacer, 2), "utf-8");
   } catch (e) {
     console.warn(t("config.encryption_warning", { error: e.message }));
@@ -3899,14 +3921,88 @@ var init_data_sanitizer = __esm(() => {
   ];
 });
 
+// node_modules/picocolors/picocolors.js
+var require_picocolors = __commonJS((exports, module) => {
+  var p = process || {};
+  var argv = p.argv || [];
+  var env = p.env || {};
+  var isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || (p.stdout || {}).isTTY && env.TERM !== "dumb" || !!env.CI);
+  var formatter = (open, close, replace = open) => (input) => {
+    let string = "" + input, index = string.indexOf(close, open.length);
+    return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
+  };
+  var replaceClose = (string, close, replace, index) => {
+    let result = "", cursor = 0;
+    do {
+      result += string.substring(cursor, index) + replace;
+      cursor = index + close.length;
+      index = string.indexOf(close, cursor);
+    } while (~index);
+    return result + string.substring(cursor);
+  };
+  var createColors = (enabled = isColorSupported) => {
+    let f = enabled ? formatter : () => String;
+    return {
+      isColorSupported: enabled,
+      reset: f("\x1B[0m", "\x1B[0m"),
+      bold: f("\x1B[1m", "\x1B[22m", "\x1B[22m\x1B[1m"),
+      dim: f("\x1B[2m", "\x1B[22m", "\x1B[22m\x1B[2m"),
+      italic: f("\x1B[3m", "\x1B[23m"),
+      underline: f("\x1B[4m", "\x1B[24m"),
+      inverse: f("\x1B[7m", "\x1B[27m"),
+      hidden: f("\x1B[8m", "\x1B[28m"),
+      strikethrough: f("\x1B[9m", "\x1B[29m"),
+      black: f("\x1B[30m", "\x1B[39m"),
+      red: f("\x1B[31m", "\x1B[39m"),
+      green: f("\x1B[32m", "\x1B[39m"),
+      yellow: f("\x1B[33m", "\x1B[39m"),
+      blue: f("\x1B[34m", "\x1B[39m"),
+      magenta: f("\x1B[35m", "\x1B[39m"),
+      cyan: f("\x1B[36m", "\x1B[39m"),
+      white: f("\x1B[37m", "\x1B[39m"),
+      gray: f("\x1B[90m", "\x1B[39m"),
+      bgBlack: f("\x1B[40m", "\x1B[49m"),
+      bgRed: f("\x1B[41m", "\x1B[49m"),
+      bgGreen: f("\x1B[42m", "\x1B[49m"),
+      bgYellow: f("\x1B[43m", "\x1B[49m"),
+      bgBlue: f("\x1B[44m", "\x1B[49m"),
+      bgMagenta: f("\x1B[45m", "\x1B[49m"),
+      bgCyan: f("\x1B[46m", "\x1B[49m"),
+      bgWhite: f("\x1B[47m", "\x1B[49m"),
+      blackBright: f("\x1B[90m", "\x1B[39m"),
+      redBright: f("\x1B[91m", "\x1B[39m"),
+      greenBright: f("\x1B[92m", "\x1B[39m"),
+      yellowBright: f("\x1B[93m", "\x1B[39m"),
+      blueBright: f("\x1B[94m", "\x1B[39m"),
+      magentaBright: f("\x1B[95m", "\x1B[39m"),
+      cyanBright: f("\x1B[96m", "\x1B[39m"),
+      whiteBright: f("\x1B[97m", "\x1B[39m"),
+      bgBlackBright: f("\x1B[100m", "\x1B[49m"),
+      bgRedBright: f("\x1B[101m", "\x1B[49m"),
+      bgGreenBright: f("\x1B[102m", "\x1B[49m"),
+      bgYellowBright: f("\x1B[103m", "\x1B[49m"),
+      bgBlueBright: f("\x1B[104m", "\x1B[49m"),
+      bgMagentaBright: f("\x1B[105m", "\x1B[49m"),
+      bgCyanBright: f("\x1B[106m", "\x1B[49m"),
+      bgWhiteBright: f("\x1B[107m", "\x1B[49m")
+    };
+  };
+  module.exports = createColors();
+  module.exports.createColors = createColors;
+});
+
 // src/logger/app-logger.ts
 import { appendFileSync, mkdirSync as mkdirSync3, existsSync as existsSync5 } from "fs";
 import { join as join5 } from "path";
+function isColorEnabled() {
+  return !process.env.NO_COLOR && !process.env.CI && process.stdout.isTTY === true;
+}
 
 class Logger {
   level;
   prefix;
   logDir = null;
+  sessionDir = null;
   constructor(level = "info", prefix = "") {
     this.level = level;
     this.prefix = prefix;
@@ -3920,10 +4016,21 @@ class Logger {
       mkdirSync3(dir, { recursive: true });
     }
   }
+  setSessionDir(dir) {
+    this.sessionDir = dir;
+    if (!existsSync5(dir)) {
+      mkdirSync3(dir, { recursive: true });
+    }
+  }
+  clearSessionDir() {
+    this.sessionDir = null;
+  }
   child(prefix) {
     const childLogger = new Logger(this.level, this.prefix ? `${this.prefix}:${prefix}` : prefix);
     if (this.logDir)
       childLogger.setLogDir(this.logDir);
+    if (this.sessionDir)
+      childLogger.setSessionDir(this.sessionDir);
     return childLogger;
   }
   debug(msg, meta) {
@@ -3947,10 +4054,17 @@ class Logger {
     const prefix = this.prefix ? ` [${this.prefix}]` : "";
     const metaStr = sanitizedMeta ? ` ${JSON.stringify(sanitizedMeta)}` : "";
     const line = `[${level.toUpperCase()}]${prefix} ${ts} — ${sanitizedMsg}${metaStr}`;
-    console.log(line);
-    if (this.logDir) {
+    console.log(isColorEnabled() ? LEVEL_COLORS[level](line) : line);
+    const logTarget = this.sessionDir ?? this.logDir;
+    if (logTarget) {
       try {
-        appendFileSync(join5(this.logDir, "app.jsonl"), JSON.stringify({ level, ts, prefix: this.prefix, msg: sanitizedMsg, meta: sanitizedMeta ?? null }) + `
+        appendFileSync(join5(logTarget, "app.jsonl"), JSON.stringify({
+          level,
+          ts,
+          prefix: this.prefix,
+          msg: sanitizedMsg,
+          meta: sanitizedMeta ?? null
+        }) + `
 `, "utf-8");
       } catch {}
     }
@@ -3969,10 +4083,17 @@ class Logger {
     return sanitized;
   }
 }
-var LEVELS;
+var import_picocolors, LEVELS, LEVEL_COLORS;
 var init_app_logger = __esm(() => {
   init_data_sanitizer();
+  import_picocolors = __toESM(require_picocolors(), 1);
   LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
+  LEVEL_COLORS = {
+    debug: (s) => import_picocolors.default.dim(s),
+    info: (s) => s,
+    warn: (s) => import_picocolors.default.yellow(s),
+    error: (s) => import_picocolors.default.red(s)
+  };
 });
 
 // node_modules/base64-js/index.js
@@ -4569,7 +4690,18 @@ class OpenAICompatProvider {
     const controller = new AbortController;
     const totalTimeoutMs = 120000;
     const timeoutId = setTimeout(() => controller.abort(), totalTimeoutMs);
-    const abortSignal = signal ? AbortSignal.any([controller.signal, signal]) : controller.signal;
+    const abortSignal = (() => {
+      if (!signal)
+        return controller.signal;
+      try {
+        return AbortSignal.any([controller.signal, signal]);
+      } catch {
+        signal.addEventListener("abort", () => controller.abort(), {
+          once: true
+        });
+        return controller.signal;
+      }
+    })();
     const response = await this.fetchWithRetry(`${this.config.baseUrl}/chat/completions`, {
       method: "POST",
       headers,
@@ -5500,18 +5632,25 @@ 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 } from "path";
+import { resolve as resolve2, join as join7 } from "path";
 import { homedir as homedir3 } from "os";
-function ensureAuditLogDir() {
-  if (!existsSync7(AUDIT_LOG_DIR)) {
-    mkdirSync5(AUDIT_LOG_DIR, { recursive: true, mode: 448 });
+function getAuditDir() {
+  return _sessionAuditDir ?? _globalAuditDir;
+}
+function setAuditSessionDir(dir) {
+  _sessionAuditDir = dir;
+  if (!existsSync7(dir)) {
+    mkdirSync5(dir, { recursive: true, mode: 448 });
   }
 }
 function logAudit(entry) {
-  ensureAuditLogDir();
+  const dir = getAuditDir();
+  if (!existsSync7(dir)) {
+    mkdirSync5(dir, { recursive: true, mode: 448 });
+  }
   try {
     const logEntry = JSON.stringify(entry);
-    appendFileSync3(AUDIT_LOG_PATH, logEntry + `
+    appendFileSync3(join7(dir, "audit.jsonl"), logEntry + `
 `, "utf8");
   } catch {}
   try {
@@ -5568,11 +5707,10 @@ function logSecurityBlock(sessionId, action, reason, details) {
     details
   });
 }
-var AUDIT_LOG_DIR, AUDIT_LOG_PATH;
+var _globalAuditDir, _sessionAuditDir = null;
 var init_audit_log = __esm(() => {
   init_audit_notifier();
-  AUDIT_LOG_DIR = resolve2(homedir3(), ".mma", "logs");
-  AUDIT_LOG_PATH = resolve2(AUDIT_LOG_DIR, "audit.jsonl");
+  _globalAuditDir = resolve2(homedir3(), ".mma", "logs");
 });
 
 // src/tools/path-utils.ts
@@ -5748,13 +5886,13 @@ var init_content_scanner = __esm(() => {
 });
 
 // src/modules/security/session-isolation.ts
-import { join as join7, resolve as resolve5 } from "path";
+import { join as join8, resolve as resolve5 } from "path";
 import { homedir as homedir4 } from "os";
 import { mkdirSync as mkdirSync6, existsSync as existsSync10 } from "fs";
 function createSessionContext(sessionId, projectDir, isolationConfig, securityOverrides) {
   const config = { ...DEFAULT_SESSION_ISOLATION, ...isolationConfig };
-  const baseDir = config.baseDir || join7(homedir4(), ".mma", "sessions", sessionId);
-  const tempDir = join7(baseDir, "temp");
+  const baseDir = config.baseDir || join8(homedir4(), ".mma", "sessions", sessionId);
+  const tempDir = join8(baseDir, "temp");
   if (config.isolateTempFiles && !existsSync10(tempDir)) {
     try {
       mkdirSync6(tempDir, { recursive: true, mode: 448 });
@@ -5793,82 +5931,12 @@ var init_session_isolation = __esm(() => {
   };
 });
 
-// node_modules/picocolors/picocolors.js
-var require_picocolors = __commonJS((exports, module) => {
-  var p = process || {};
-  var argv = p.argv || [];
-  var env = p.env || {};
-  var isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || (p.stdout || {}).isTTY && env.TERM !== "dumb" || !!env.CI);
-  var formatter = (open, close, replace = open) => (input) => {
-    let string = "" + input, index = string.indexOf(close, open.length);
-    return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
-  };
-  var replaceClose = (string, close, replace, index) => {
-    let result = "", cursor = 0;
-    do {
-      result += string.substring(cursor, index) + replace;
-      cursor = index + close.length;
-      index = string.indexOf(close, cursor);
-    } while (~index);
-    return result + string.substring(cursor);
-  };
-  var createColors = (enabled = isColorSupported) => {
-    let f = enabled ? formatter : () => String;
-    return {
-      isColorSupported: enabled,
-      reset: f("\x1B[0m", "\x1B[0m"),
-      bold: f("\x1B[1m", "\x1B[22m", "\x1B[22m\x1B[1m"),
-      dim: f("\x1B[2m", "\x1B[22m", "\x1B[22m\x1B[2m"),
-      italic: f("\x1B[3m", "\x1B[23m"),
-      underline: f("\x1B[4m", "\x1B[24m"),
-      inverse: f("\x1B[7m", "\x1B[27m"),
-      hidden: f("\x1B[8m", "\x1B[28m"),
-      strikethrough: f("\x1B[9m", "\x1B[29m"),
-      black: f("\x1B[30m", "\x1B[39m"),
-      red: f("\x1B[31m", "\x1B[39m"),
-      green: f("\x1B[32m", "\x1B[39m"),
-      yellow: f("\x1B[33m", "\x1B[39m"),
-      blue: f("\x1B[34m", "\x1B[39m"),
-      magenta: f("\x1B[35m", "\x1B[39m"),
-      cyan: f("\x1B[36m", "\x1B[39m"),
-      white: f("\x1B[37m", "\x1B[39m"),
-      gray: f("\x1B[90m", "\x1B[39m"),
-      bgBlack: f("\x1B[40m", "\x1B[49m"),
-      bgRed: f("\x1B[41m", "\x1B[49m"),
-      bgGreen: f("\x1B[42m", "\x1B[49m"),
-      bgYellow: f("\x1B[43m", "\x1B[49m"),
-      bgBlue: f("\x1B[44m", "\x1B[49m"),
-      bgMagenta: f("\x1B[45m", "\x1B[49m"),
-      bgCyan: f("\x1B[46m", "\x1B[49m"),
-      bgWhite: f("\x1B[47m", "\x1B[49m"),
-      blackBright: f("\x1B[90m", "\x1B[39m"),
-      redBright: f("\x1B[91m", "\x1B[39m"),
-      greenBright: f("\x1B[92m", "\x1B[39m"),
-      yellowBright: f("\x1B[93m", "\x1B[39m"),
-      blueBright: f("\x1B[94m", "\x1B[39m"),
-      magentaBright: f("\x1B[95m", "\x1B[39m"),
-      cyanBright: f("\x1B[96m", "\x1B[39m"),
-      whiteBright: f("\x1B[97m", "\x1B[39m"),
-      bgBlackBright: f("\x1B[100m", "\x1B[49m"),
-      bgRedBright: f("\x1B[101m", "\x1B[49m"),
-      bgGreenBright: f("\x1B[102m", "\x1B[49m"),
-      bgYellowBright: f("\x1B[103m", "\x1B[49m"),
-      bgBlueBright: f("\x1B[104m", "\x1B[49m"),
-      bgMagentaBright: f("\x1B[105m", "\x1B[49m"),
-      bgCyanBright: f("\x1B[106m", "\x1B[49m"),
-      bgWhiteBright: f("\x1B[107m", "\x1B[49m")
-    };
-  };
-  module.exports = createColors();
-  module.exports.createColors = createColors;
-});
-
 // src/ui/colors.ts
-var import_picocolors, isTty = () => process.stdout.isTTY === true, enabled, pc;
+var import_picocolors2, isTty = () => process.stdout.isTTY === true, enabled, pc2;
 var init_colors = __esm(() => {
-  import_picocolors = __toESM(require_picocolors(), 1);
+  import_picocolors2 = __toESM(require_picocolors(), 1);
   enabled = isTty() && !process.env.CI && !process.env.NO_COLOR;
-  pc = import_picocolors.createColors(enabled);
+  pc2 = import_picocolors2.createColors(enabled);
 });
 
 // src/ui/diff.ts
@@ -5978,11 +6046,11 @@ function formatLine(line, maxNumWidth) {
   const num = line.type === "remove" ? line.oldNum : line.newNum;
   const numStr = num !== null ? String(num).padStart(maxNumWidth) : " ".repeat(maxNumWidth);
   if (line.type === "remove") {
-    return `${numStr} ${pc.red("-")} ${line.content}`;
+    return `${numStr} ${pc2.red("-")} ${line.content}`;
   } else if (line.type === "add") {
-    return `${numStr} ${pc.green("+")} ${line.content}`;
+    return `${numStr} ${pc2.green("+")} ${line.content}`;
   } else if (line.content === "...") {
-    return pc.dim(`  ${" ".repeat(maxNumWidth)}...`);
+    return pc2.dim(`  ${" ".repeat(maxNumWidth)}...`);
   } else {
     return `  ${numStr}   ${line.content}`;
   }
@@ -5994,19 +6062,18 @@ function generateDiff(oldContent, newContent) {
 `);
   const newLines = newContent.split(`
 `);
-  if (oldLines.length === 1 && oldLines[0] === "" && newLines.length === 1 && newLines[0] === "") {
-    return "";
-  }
   const diff = buildDiff(oldLines, newLines);
   if (diff.length === 0)
     return "";
-  const maxOldNum = Math.max(...diff.filter((l) => l.oldNum !== null).map((l) => l.oldNum));
-  const maxNewNum = Math.max(...diff.filter((l) => l.newNum !== null).map((l) => l.newNum));
+  const oldNums = diff.filter((l) => l.oldNum !== null).map((l) => l.oldNum);
+  const newNums = diff.filter((l) => l.newNum !== null).map((l) => l.newNum);
+  const maxOldNum = oldNums.length > 0 ? Math.max(...oldNums) : 0;
+  const maxNewNum = newNums.length > 0 ? Math.max(...newNums) : 0;
   const maxNumWidth = Math.max(String(maxOldNum).length, String(maxNewNum).length, 3);
   let lines = diff.map((l) => formatLine(l, maxNumWidth));
   if (lines.length > MAX_DIFF_LINES) {
     const truncated = lines.slice(0, MAX_DIFF_LINES);
-    truncated.push(pc.dim(`  ... (${lines.length - MAX_DIFF_LINES} more lines)`));
+    truncated.push(pc2.dim(`  ... (${lines.length - MAX_DIFF_LINES} more lines)`));
     lines = truncated;
   }
   return lines.join(`
@@ -6019,11 +6086,11 @@ function generateNewFileDiff(content) {
   const diffLines = [];
   for (let i = 0;i < lines.length; i++) {
     const numStr = String(i + 1).padStart(maxNumWidth);
-    diffLines.push(`${numStr} ${pc.green("+")} ${lines[i]}`);
+    diffLines.push(`${numStr} ${pc2.green("+")} ${lines[i]}`);
   }
   if (diffLines.length > MAX_DIFF_LINES) {
     const truncated = diffLines.slice(0, MAX_DIFF_LINES);
-    truncated.push(pc.dim(`  ... (${diffLines.length - MAX_DIFF_LINES} more lines)`));
+    truncated.push(pc2.dim(`  ... (${diffLines.length - MAX_DIFF_LINES} more lines)`));
     return truncated.join(`
 `);
   }
@@ -6037,11 +6104,11 @@ function generateDeleteDiff(content) {
   const diffLines = [];
   for (let i = 0;i < lines.length; i++) {
     const numStr = String(i + 1).padStart(maxNumWidth);
-    diffLines.push(`${numStr} ${pc.red("-")} ${lines[i]}`);
+    diffLines.push(`${numStr} ${pc2.red("-")} ${lines[i]}`);
   }
   if (diffLines.length > MAX_DIFF_LINES) {
     const truncated = diffLines.slice(0, MAX_DIFF_LINES);
-    truncated.push(pc.dim(`  ... (${diffLines.length - MAX_DIFF_LINES} more lines)`));
+    truncated.push(pc2.dim(`  ... (${diffLines.length - MAX_DIFF_LINES} more lines)`));
     return truncated.join(`
 `);
   }
@@ -6049,10 +6116,7 @@ function generateDeleteDiff(content) {
 `);
 }
 function generateMoveDiff(fromPath, toPath) {
-  return [
-    pc.red(`  - ${fromPath}`),
-    pc.green(`  + ${toPath}`)
-  ].join(`
+  return [pc2.red(`  - ${fromPath}`), pc2.green(`  + ${toPath}`)].join(`
 `);
 }
 var CONTEXT_LINES = 3, MAX_DIFF_LINES = 100;
@@ -6061,7 +6125,7 @@ var init_diff = __esm(() => {
 });
 
 // src/tools/write-file.ts
-import { writeFileSync as writeFileSync6, mkdirSync as mkdirSync7, existsSync as existsSync11, readFileSync as readFileSync6 } from "fs";
+import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync7, existsSync as existsSync11, readFileSync as readFileSync6 } from "fs";
 import { dirname as dirname4 } from "path";
 var writeFileTool;
 var init_write_file = __esm(() => {
@@ -6125,7 +6189,7 @@ var init_write_file = __esm(() => {
       if (fileExists) {
         oldContent = readFileSync6(resolved, "utf-8");
       }
-      writeFileSync6(resolved, content, "utf-8");
+      writeFileSync5(resolved, content, "utf-8");
       const diff = fileExists ? generateDiff(oldContent, content) : generateNewFileDiff(content);
       ctx.fileOperationsCount = currentCount + 1;
       logFileWrite(ctx.sessionId, path, true, `File ${fileExists ? "updated" : "created"}`);
@@ -6135,7 +6199,7 @@ var init_write_file = __esm(() => {
 });
 
 // src/tools/edit-file.ts
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync7 } from "fs";
+import { readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
 var editFileTool;
 var init_edit_file = __esm(() => {
   init_i18n();
@@ -6199,7 +6263,7 @@ var init_edit_file = __esm(() => {
           output: `[SECURITY BLOCKED] ${scanResult.reason}`
         };
       }
-      writeFileSync7(resolved, updated, "utf-8");
+      writeFileSync6(resolved, updated, "utf-8");
       const diff = generateDiff(content, updated);
       ctx.fileOperationsCount = currentCount + 1;
       logFileWrite(ctx.sessionId, path, true, "File edited");
@@ -6239,7 +6303,7 @@ var init_glob_tool = __esm(() => {
 });
 
 // src/tools/grep-tool.ts
-import { execFileSync, execSync } from "child_process";
+import { execFileSync } from "child_process";
 import { resolve as resolve7 } from "path";
 function truncateLines(output) {
   const lines = output.split(`
@@ -6262,8 +6326,14 @@ var init_grep_tool = __esm(() => {
       type: "object",
       properties: {
         pattern: { type: "string", description: "Regex pattern to search" },
-        include: { type: "string", description: "File pattern to filter (e.g. *.ts)" },
-        path: { type: "string", description: "Directory to search (defaults to baseDir)" }
+        include: {
+          type: "string",
+          description: "File pattern to filter (e.g. *.ts)"
+        },
+        path: {
+          type: "string",
+          description: "Directory to search (defaults to baseDir)"
+        }
       },
       required: ["pattern"]
     },
@@ -6281,22 +6351,34 @@ var init_grep_tool = __esm(() => {
           maxBuffer: 1024 * 1024,
           cwd: ctx.baseDir
         });
-        return { success: true, output: truncateLines(output || t("file.no_matches")) };
+        return {
+          success: true,
+          output: truncateLines(output || t("file.no_matches"))
+        };
       } catch (e) {
         if (e.status === 1)
           return { success: true, output: t("file.no_matches") };
         try {
-          const cmd = `grep -rn "${pattern.replace(/"/g, "\\\"")}" "${searchPath}"`;
-          const output = execSync(cmd, {
+          const grepArgs = ["-rn", pattern, searchPath];
+          if (args.include) {
+            grepArgs.push("--include", String(args.include));
+          }
+          const output = execFileSync("grep", grepArgs, {
             encoding: "utf-8",
             maxBuffer: 1024 * 1024,
             cwd: ctx.baseDir
           });
-          return { success: true, output: truncateLines(output || t("file.no_matches")) };
+          return {
+            success: true,
+            output: truncateLines(output || t("file.no_matches"))
+          };
         } catch (e2) {
           if (e2.status === 1)
             return { success: true, output: t("file.no_matches") };
-          return { success: false, output: t("error.grep_failed", { message: e2.message }) };
+          return {
+            success: false,
+            output: t("error.grep_failed", { message: e2.message })
+          };
         }
       }
     }
@@ -6476,6 +6558,7 @@ var init_move_file = __esm(() => {
   init_audit_log();
   init_session_isolation();
   init_diff();
+  init_path_utils();
   moveFileTool = {
     name: "move_file",
     description: "Move or rename a file or directory.",
@@ -6492,8 +6575,8 @@ var init_move_file = __esm(() => {
       const fromPath = String(args.from);
       const toPath = String(args.to);
       const baseDir = resolve9(ctx.baseDir);
-      const fromResolved = resolve9(baseDir, normalize3(fromPath));
-      const toResolved = resolve9(baseDir, normalize3(toPath));
+      const fromResolved = safeResolvePath(baseDir, normalize3(fromPath));
+      const toResolved = safeResolvePath(baseDir, normalize3(toPath));
       const securityConfig = ctx.sessionContext ? getSessionSecurityConfig(ctx.config, ctx.sessionContext) : ctx.config.security;
       const maxFileOps = securityConfig?.maxFileOperations ?? 100;
       const currentCount = ctx.fileOperationsCount ?? 0;
@@ -6810,7 +6893,19 @@ class ProcessRegistry {
     }
     this.children.set(id, child);
     entry.pid = child.pid ?? 0;
-    const decoder = platform() === "win32" ? new TextDecoder("ibm866") : null;
+    const decoder = platform() === "win32" ? (() => {
+      try {
+        const cpOut = __require("child_process").execSync("chcp.com", {
+          encoding: "utf-8",
+          timeout: 2000,
+          windowsHide: true
+        }).toString();
+        const m = cpOut.match(/(\d+)/);
+        if (m)
+          return new TextDecoder("ibm" + m[1]);
+      } catch {}
+      return null;
+    })() : null;
     let buf = "";
     const pushLine = (line) => {
       if (entry.log.length >= MAX_LOG_LINES) {
@@ -7013,30 +7108,30 @@ var init_bash = __esm(() => {
   init_i18n();
   bashGraceMs = BASH_GRACE_MS;
   UNIX_TO_WIN_HINTS = {
-    ls: 'Use "dir" or the list_dir tool instead.',
-    pwd: 'Use "echo %cd%" or the file_info tool instead.',
-    cat: 'Use "type" or the read_file tool instead.',
-    cp: 'Use "copy" or the move_file tool instead.',
-    mv: 'Use "move" or the move_file tool instead.',
-    rm: 'Use "del" or the delete_file tool instead.',
-    grep: 'Use "findstr" or the grep tool instead.',
-    chmod: "Use icacls or the chmod tool instead.",
-    touch: "Use type nul > file or the write_file tool instead.",
-    find: 'Use "dir /s" or the glob tool instead.',
+    ls: "Use the list_dir tool instead.",
+    pwd: "Use the file_info tool instead.",
+    cat: "Use the read_file tool instead.",
+    cp: "Use the move_file tool instead.",
+    mv: "Use the move_file tool instead.",
+    rm: "Use the delete_file tool instead.",
+    grep: "Use the grep tool instead.",
+    chmod: "Use the chmod tool instead.",
+    touch: "Use the write_file tool instead.",
+    find: "Use the glob tool instead.",
     head: "Use the read_file tool with offset/limit instead.",
     tail: "Use the read_file tool instead.",
     wc: "Use the read_file tool instead.",
     diff: "Use the diff tool instead.",
     which: 'Use "where" instead.',
     echo: "echo works on Windows, but avoid pipes (|).",
-    "Get-Content": 'The shell is cmd.exe, not PowerShell. Use "type" or the read_file tool instead.',
-    "Select-Object": "The shell is cmd.exe, not PowerShell. Use the read_file tool with offset/limit instead."
+    "Get-Content": "Use the read_file tool instead.",
+    "Select-Object": "Use the read_file tool with offset/limit instead."
   };
   UNIX_TO_WIN_TRANSLATE = {
-    ls: "dir",
-    pwd: "echo %cd%",
-    cat: "type",
-    wc: 'find /c /v ""'
+    ls: "Get-ChildItem",
+    pwd: "Get-Location",
+    cat: "Get-Content",
+    wc: "@(Get-Content).Count"
   };
   bashTool = {
     name: "bash",
@@ -7046,8 +7141,14 @@ var init_bash = __esm(() => {
       type: "object",
       properties: {
         command: { type: "string", description: "Shell command to execute" },
-        workdir: { type: "string", description: "Working directory (default: baseDir)" },
-        background: { type: "boolean", description: "Return a process id immediately without waiting (default: commands still running after a few seconds are auto-promoted to the background)" }
+        workdir: {
+          type: "string",
+          description: "Working directory (default: baseDir)"
+        },
+        background: {
+          type: "boolean",
+          description: "Return a process id immediately without waiting (default: commands still running after a few seconds are auto-promoted to the background)"
+        }
       },
       required: ["command"]
     },
@@ -7327,8 +7428,21 @@ var init_prompt_builder = __esm(() => {
 // src/core/session-logger.ts
 class SessionLogger {
   session;
-  constructor(session) {
+  logger;
+  constructor(session, logger) {
     this.session = session;
+    this.logger = logger;
+    this.bindSessionDir();
+  }
+  bindSessionDir() {
+    const meta = this.session?.getActiveMeta();
+    if (!meta)
+      return;
+    const dir = this.session.getSessionDirectory(meta.id);
+    if (this.logger) {
+      this.logger.setSessionDir(dir);
+    }
+    setAuditSessionDir(dir);
   }
   get active() {
     return !!this.session?.getActive();
@@ -7365,7 +7479,13 @@ class SessionLogger {
       ts: new Date().toISOString(),
       type: "assistant",
       content,
-      ...toolCalls ? { tool_calls: toolCalls.map((tc) => ({ id: tc.id, name: tc.name, arguments: tc.arguments })) } : {},
+      ...toolCalls ? {
+        tool_calls: toolCalls.map((tc) => ({
+          id: tc.id,
+          name: tc.name,
+          arguments: tc.arguments
+        }))
+      } : {},
       iteration
     });
   }
@@ -7449,6 +7569,9 @@ class SessionLogger {
     });
   }
 }
+var init_session_logger = __esm(() => {
+  init_audit_log();
+});
 
 // node_modules/jsonrepair/lib/esm/utils/JSONRepairError.js
 var JSONRepairError;
@@ -8591,7 +8714,7 @@ class StuckDetector {
   escalationThreshold = 3;
   fileRewriteCount = new Map;
   fileRewriteThreshold = 3;
-  constructor(threshold = 8, errorThreshold = 3) {
+  constructor(threshold = 6, errorThreshold = 3) {
     this.threshold = threshold;
     this.errorThreshold = errorThreshold;
   }
@@ -8824,22 +8947,6 @@ class StuckDetector {
     }
     return "";
   }
-  checkOffTrack(toolName, call) {
-    if (!this.currentStepDescription)
-      return null;
-    const toolArgStr = JSON.stringify(call.arguments).toLowerCase();
-    const pathInStep = (this.currentStepDescription.match(/\b[\w./-]+\.[a-z]+/gi) || []).map((p) => p.toLowerCase());
-    const pathInCall = (toolArgStr.match(/\b[\w./-]+\.[a-z]+/gi) || []).map((p) => p.toLowerCase());
-    const overlaps = pathInCall.some((p) => pathInStep.some((s) => p.includes(s) || s.includes(p)));
-    if (!overlaps && pathInStep.length > 0 && pathInCall.length > 0) {
-      return t("exec.off_track", {
-        stepId: String(this.currentStepId),
-        description: this.currentStepDescription,
-        tool: toolName
-      });
-    }
-    return null;
-  }
   reset() {
     this.currentStepId = null;
     this.iterationsOnCurrentStep = 0;
@@ -9401,18 +9508,29 @@ async function runWithMoE(deps, input, fallback, opts = {}) {
   ];
   const verification = await verifier.verifyMoEManifest(plan, config, knownTags);
   onPhase?.("thinking");
-  const verifyResult = await orchestrator.verifyAndMerge({
-    plan,
-    results: planResults.results.map((r) => ({
-      subtaskId: r.subtaskId,
-      success: r.success,
-      summary: r.summary,
-      result: r.result,
-      error: r.error
-    })),
-    verifierErrors: verification.errors,
-    verifierWarnings: verification.warnings
-  });
+  let verifyResult;
+  try {
+    verifyResult = await orchestrator.verifyAndMerge({
+      plan,
+      results: planResults.results.map((r) => ({
+        subtaskId: r.subtaskId,
+        success: r.success,
+        summary: r.summary,
+        result: r.result,
+        error: r.error
+      })),
+      verifierErrors: verification.errors,
+      verifierWarnings: verification.warnings
+    });
+  } catch (err) {
+    onPhase?.("done");
+    return {
+      success: false,
+      text: `MoE verifyAndMerge crashed: ${err.message}`,
+      error: err.message,
+      iterationCount: 0
+    };
+  }
   onPhase?.("done");
   const outputLines = [`## MoE Execution Results
 `];
@@ -9442,7 +9560,7 @@ var init_agent_moe = __esm(() => {
 
 // src/modules/memory/search.ts
 import { readFileSync as readFileSync9, existsSync as existsSync18 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 
 class MemorySearch {
   memoryDir;
@@ -9453,7 +9571,7 @@ class MemorySearch {
     const results = [];
     const lowerQuery = query.toLowerCase();
     for (const name of MEMORY_FILES) {
-      const path = join8(this.memoryDir, `${name}.md`);
+      const path = join9(this.memoryDir, `${name}.md`);
       if (!existsSync18(path))
         continue;
       const content = readFileSync9(path, "utf-8");
@@ -9465,7 +9583,7 @@ class MemorySearch {
         }
       }
     }
-    const prefsPath = join8(this.memoryDir, "preferences.json");
+    const prefsPath = join9(this.memoryDir, "preferences.json");
     if (existsSync18(prefsPath)) {
       try {
         const prefs = JSON.parse(readFileSync9(prefsPath, "utf-8"));
@@ -9486,8 +9604,8 @@ var init_search = __esm(() => {
 });
 
 // src/modules/memory/store.ts
-import { readFileSync as readFileSync10, writeFileSync as writeFileSync8, appendFileSync as appendFileSync4, existsSync as existsSync19, mkdirSync as mkdirSync10 } from "fs";
-import { join as join9 } from "path";
+import { readFileSync as readFileSync10, writeFileSync as writeFileSync7, appendFileSync as appendFileSync4, existsSync as existsSync19, mkdirSync as mkdirSync10 } from "fs";
+import { join as join10 } from "path";
 
 class MemoryStore {
   memoryDir;
@@ -9495,9 +9613,9 @@ class MemoryStore {
     this.memoryDir = memoryDir;
     this.ensureDir();
     for (const name of MEMORY_FILES2) {
-      const path = join9(this.memoryDir, `${name}.md`);
+      const path = join10(this.memoryDir, `${name}.md`);
       if (!existsSync19(path)) {
-        writeFileSync8(path, `# ${name.charAt(0).toUpperCase() + name.slice(1)}
+        writeFileSync7(path, `# ${name.charAt(0).toUpperCase() + name.slice(1)}
 
 `, "utf-8");
       }
@@ -9509,13 +9627,13 @@ class MemoryStore {
     }
   }
   read(name) {
-    const path = join9(this.memoryDir, `${name}.md`);
+    const path = join10(this.memoryDir, `${name}.md`);
     if (!existsSync19(path))
       return "";
     return readFileSync10(path, "utf-8");
   }
   append(name, entry) {
-    const path = join9(this.memoryDir, `${name}.md`);
+    const path = join10(this.memoryDir, `${name}.md`);
     const timestamp = new Date().toISOString().replace("T", " ").slice(0, 19);
     const formatted = `- **${timestamp}** — ${entry}
 `;
@@ -9526,7 +9644,7 @@ class MemoryStore {
     return searchModule.query(query);
   }
   prefsPath() {
-    return join9(this.memoryDir, "preferences.json");
+    return join10(this.memoryDir, "preferences.json");
   }
   getPreferences() {
     const path = this.prefsPath();
@@ -9541,14 +9659,14 @@ class MemoryStore {
   setPreference(key, value) {
     const prefs = this.getPreferences();
     prefs[key] = value;
-    writeFileSync8(this.prefsPath(), JSON.stringify(prefs, null, 2), "utf-8");
+    writeFileSync7(this.prefsPath(), JSON.stringify(prefs, null, 2), "utf-8");
   }
   deletePreference(key) {
     const prefs = this.getPreferences();
     if (!(key in prefs))
       return false;
     delete prefs[key];
-    writeFileSync8(this.prefsPath(), JSON.stringify(prefs, null, 2), "utf-8");
+    writeFileSync7(this.prefsPath(), JSON.stringify(prefs, null, 2), "utf-8");
     return true;
   }
   appendRule(category, pattern, cause, solution) {
@@ -9565,7 +9683,7 @@ var init_store = __esm(() => {
 });
 
 // src/core/agent.ts
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 function isToolCallJson(text) {
   const trimmed = text.trim();
   if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
@@ -9655,7 +9773,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       sessionManager,
       baseDir
     } = this.deps;
-    const slog = new SessionLogger(sessionManager);
+    const slog = new SessionLogger(sessionManager, logger);
     if (sessionManager && !sessionManager.getActive()) {
       sessionManager.create();
       logger.debug(`Session started: ${sessionManager.getActive()}`);
@@ -9677,7 +9795,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
         verifier.runTypeCheck().then((tc) => {
           if (!tc.passed) {
             logger.warn(`Baseline typecheck has issues: ${tc.message?.slice(0, 500)}`);
-            onMeta?.(pc.yellow(`
+            onMeta?.(pc2.yellow(`
 ⚠ Baseline typecheck has issues
 `));
           }
@@ -9709,7 +9827,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       sessionManager,
       baseDir
     } = this.deps;
-    const slog = new SessionLogger(sessionManager);
+    const slog = new SessionLogger(sessionManager, logger);
     this.abortController = new AbortController;
     let iteration = 0;
     let lastText = "";
@@ -9782,7 +9900,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
             if (config.showReasoning) {
               const metaOut = pluginManager.runOnMeta({ iteration, logger }, chunk.content);
               if (metaOut) {
-                onMeta?.(pc.dim(metaOut));
+                onMeta?.(pc2.dim(metaOut));
               }
               emittedReasoning = true;
             }
@@ -9900,7 +10018,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           } else {
             const metaOut = pluginManager.runOnMeta({ iteration, logger }, result.output);
             onMeta?.(`
-` + pc.dim(metaOut) + `
+` + pc2.dim(metaOut) + `
 `);
           }
           if (result.diff) {
@@ -9957,7 +10075,7 @@ ${taskReminder}</system-summary>`
           if (sessionManager) {
             const activeSession = sessionManager.getActiveMeta();
             if (activeSession) {
-              const memDir = join10(baseDir, ".mma", "memory");
+              const memDir = join11(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");
             }
@@ -9973,13 +10091,13 @@ ${taskReminder}</system-summary>`
         const ctxPct = Math.min(100, Math.round(ctxTokens / ctxBudget.history * 100));
         const barLen = 10;
         const filled = Math.round(ctxPct / 100 * barLen);
-        const ctxBar = pc.green("█".repeat(filled)) + pc.dim("░".repeat(barLen - filled));
-        const pctColor = ctxPct >= 75 ? pc.yellow : pc.dim;
+        const ctxBar = pc2.green("█".repeat(filled)) + pc2.dim("░".repeat(barLen - filled));
+        const pctColor = ctxPct >= 75 ? pc2.yellow : pc2.dim;
         const compCount = contextManager.getCompactionCount();
         const quality2 = contextManager.getQuality();
-        const qualityColor = quality2 >= 70 ? pc.green : quality2 >= 40 ? pc.yellow : pc.red;
+        const qualityColor = quality2 >= 70 ? pc2.green : quality2 >= 40 ? pc2.yellow : pc2.red;
         onMeta?.(`
-  ${ctxBar}  ${pctColor(`${ctxPct}%`)}  ${pc.dim(`ctx: ${ctxTokens}/${ctxBudget.history}`)}  ${pc.dim(`compactions: ${compCount}`)}  ${qualityColor(`quality: ${quality2}%`)}
+  ${ctxBar}  ${pctColor(`${ctxPct}%`)}  ${pc2.dim(`ctx: ${ctxTokens}/${ctxBudget.history}`)}  ${pc2.dim(`compactions: ${compCount}`)}  ${qualityColor(`quality: ${quality2}%`)}
 `);
         continue;
       }
@@ -10120,6 +10238,7 @@ ${taskReminder}</system-summary>`
     });
     this.deps.llmProvider = newProvider;
     this.deps.toolExecutor.updateProvider(newProvider);
+    this.deps.toolExecutor.ctx.llmProvider = newProvider;
     const newTokenCounter = new TokenCounter2(config.model);
     this.deps.contextManager.resize(config.contextWindow, config.contextBudget, newTokenCounter);
     this.deps.config = config;
@@ -10161,6 +10280,7 @@ var init_agent = __esm(() => {
   init_colors();
   init_prompt_builder();
   init_processes();
+  init_session_logger();
   init_agent_moe();
   init_store();
   init_verifier();
@@ -10342,6 +10462,7 @@ class ContextManager {
     return totalTokens > this.budget.history * this.compactionThreshold;
   }
   compact() {
+    this.iterationsSinceCompaction = 0;
     if (this.messages.length <= KEEP_LAST_N * 2)
       return;
     this.compactionCount++;
@@ -10360,7 +10481,7 @@ class ContextManager {
     if (this.errorFacts.length > 0) {
       parts.push(`[Errors: ${this.errorFacts.slice(-3).join("; ")}]`);
     }
-    const triedAndFailed = extractTriedAndFailed(this.messages);
+    const triedAndFailed = extractTriedAndFailed(oldTurns);
     if (triedAndFailed.length > 0) {
       const lines = triedAndFailed.map((t2) => `- ${t2.tool}(${t2.args}): ${t2.error} (failed ${t2.count}x)`);
       parts.push(`[Already tried & failed — do NOT repeat:]
@@ -10996,6 +11117,8 @@ var init_subagent = __esm(() => {
         const subContextManager = new ContextManager(ctx.config.contextWindow, ctx.config.contextBudget);
         const subPluginManager = new PluginManager;
         const hallucinationDetector = new HallucinationDetector(ctx.baseDir, ctx.llmProvider);
+        const parentScope = ctx.scope;
+        ctx.toolExecutor.setScope(scope || { allowed_files: [], read_only_files: [] });
         const systemPrompt = {
           content: `You are a sub-agent working on a specific task. ${context ? `Context: ${context}` : ""}`,
           priority: "critical",
@@ -11020,21 +11143,24 @@ var init_subagent = __esm(() => {
         const fullTask = context ? `${task}
 
 Context: ${context}` : task;
-        const result = await subAgent.run(fullTask);
-        if (result.success) {
-          return {
+        let scopeRestored = false;
+        try {
+          const result = await subAgent.run(fullTask);
+          return result.success ? {
             success: true,
             output: `Sub-agent completed:
 ${result.text}
 
 Iterations: ${result.iterationCount}`
-          };
-        } else {
-          return {
+          } : {
             success: false,
             output: `Sub-agent failed: ${result.error}
 Partial output: ${result.text}`
           };
+        } finally {
+          if (!scopeRestored) {
+            ctx.toolExecutor.setScope(parentScope || { allowed_files: [], read_only_files: [] });
+          }
         }
       } catch (e) {
         return { success: false, output: `Sub-agent error: ${e.message}` };
@@ -11756,19 +11882,25 @@ class MCPClient {
         env: { ...process.env, ...this.config.env },
         stdio: ["pipe", "pipe", "pipe"]
       });
+      let _resolved = false;
       child.on("error", (err) => {
         this._connected = false;
-        reject(err);
+        if (!_resolved) {
+          _resolved = true;
+          reject(err);
+        }
       });
       child.on("exit", (code) => {
         this._connected = false;
-        if (code !== 0) {
+        if (code !== 0 && !_resolved) {
+          _resolved = true;
           reject(new Error(`MCP server exited with code ${code}`));
         }
       });
       child.on("spawn", () => {
         this._connected = true;
         this.process = child;
+        _resolved = true;
         resolve12();
       });
     });
@@ -12125,7 +12257,7 @@ ${JSON.stringify(result, null, 2)}`
 
 // src/tools/search-history.ts
 import * as fs from "fs";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import { homedir as homedir5 } from "os";
 function searchFile(filePath, query, maxResults, results) {
   if (!fs.existsSync(filePath))
@@ -12154,8 +12286,14 @@ var init_search_history = __esm(() => {
       type: "object",
       properties: {
         query: { type: "string", description: "Search query" },
-        maxResults: { type: "number", description: "Maximum results (default 5)" },
-        sessionId: { type: "string", description: "Optional: limit search to a specific session" }
+        maxResults: {
+          type: "number",
+          description: "Maximum results (default 5)"
+        },
+        sessionId: {
+          type: "string",
+          description: "Optional: limit search to a specific session"
+        }
       },
       required: ["query"]
     },
@@ -12163,11 +12301,14 @@ 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 = join11(homedir5(), ".mma", "sessions");
+      const sessionDir = join12(homedir5(), ".mma", "sessions");
       const results = [];
       try {
         if (!fs.existsSync(sessionDir)) {
-          return { success: true, output: t("tool.no_sessions_dir", { dir: sessionDir }) };
+          return {
+            success: true,
+            output: t("tool.no_sessions_dir", { dir: sessionDir })
+          };
         }
         const entries = fs.readdirSync(sessionDir, { withFileTypes: true });
         for (const entry of entries) {
@@ -12175,7 +12316,7 @@ var init_search_history = __esm(() => {
             continue;
           if (sessionId && entry.name !== sessionId)
             continue;
-          const historyFile = join11(sessionDir, entry.name, "history.jsonl");
+          const historyFile = join12(sessionDir, entry.name, "history.jsonl");
           searchFile(historyFile, query, maxResults, results);
           if (results.length >= maxResults)
             break;
@@ -12183,10 +12324,19 @@ var init_search_history = __esm(() => {
         if (results.length === 0) {
           return { success: true, output: t("tool.no_history", { query }) };
         }
-        return { success: true, output: t("tool.history_results", { query, results: results.join(`
-`) }) };
+        return {
+          success: true,
+          output: t("tool.history_results", {
+            query,
+            results: results.join(`
+`)
+          })
+        };
       } catch (err) {
-        return { success: true, output: t("tool.history_error", { error: String(err) }) };
+        return {
+          success: false,
+          output: t("tool.history_error", { error: String(err) })
+        };
       }
     }
   };
@@ -12194,7 +12344,7 @@ var init_search_history = __esm(() => {
 
 // src/tools/remember.ts
 import { homedir as homedir6 } from "os";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 var CATEGORIES, rememberTool;
 var init_remember = __esm(() => {
   init_i18n();
@@ -12232,7 +12382,7 @@ var init_remember = __esm(() => {
       if (!CATEGORIES.includes(category)) {
         return { success: false, output: t("tool.invalid_params") };
       }
-      const memoryDir = join12(homedir6(), ".mma", "memory");
+      const memoryDir = join13(homedir6(), ".mma", "memory");
       const store = new MemoryStore(memoryDir);
       try {
         if (category === "preferences") {
@@ -12265,7 +12415,7 @@ var init_remember = __esm(() => {
 
 // src/tools/recall.ts
 import { homedir as homedir7 } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 function formatAll(store) {
   const parts = [];
   const prefs = store.getPreferences();
@@ -12348,7 +12498,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 = join13(homedir7(), ".mma", "memory");
+      const memoryDir = join14(homedir7(), ".mma", "memory");
       const store = new MemoryStore(memoryDir);
       try {
         if (!query && !category) {
@@ -12544,15 +12694,15 @@ function buildIndexInjectionScript() {
 
 // src/modules/browser/cookie-store.ts
 import { readFile, writeFile, mkdir } from "fs/promises";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 
 class CookieStore {
   filePath;
   constructor(cookieDir) {
-    this.filePath = join14(cookieDir, "cookies.json");
+    this.filePath = join15(cookieDir, "cookies.json");
   }
   async save(cookies) {
-    await mkdir(join14(this.filePath, ".."), { recursive: true });
+    await mkdir(join15(this.filePath, ".."), { recursive: true });
     await writeFile(this.filePath, JSON.stringify(cookies, null, 2), "utf-8");
   }
   async load() {
@@ -12872,10 +13022,10 @@ var init_types = __esm(() => {
 });
 
 // src/tools/browser.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 function getSession(ctx) {
   if (!session) {
-    const cookieDir = join15(ctx.baseDir, ".mma", "browser");
+    const cookieDir = join16(ctx.baseDir, ".mma", "browser");
     session = new BrowserSession({
       ...DEFAULT_BROWSER_CONFIG,
       headless: ctx.config.browser?.headless ?? true,
@@ -13003,13 +13153,13 @@ async function readClipboardImage() {
 }
 async function readClipboardFallback() {
   const { platform: platform3 } = await import("os");
-  const { execSync: execSync2 } = await import("child_process");
+  const { execSync } = await import("child_process");
   const { readFileSync: readFileSync13, unlinkSync: unlinkSync3 } = await import("fs");
-  const { join: join16 } = await import("path");
-  const tmpPath = join16(process.env.TEMP || process.env.TMP || "/tmp", `mma-clip-${Date.now()}.png`);
+  const { join: join17 } = await import("path");
+  const tmpPath = join17(process.env.TEMP || process.env.TMP || "/tmp", `mma-clip-${Date.now()}.png`);
   try {
     if (platform3() === "linux") {
-      execSync2(`xclip -selection clipboard -t image/png -o > "${tmpPath}" 2>/dev/null`, { timeout: 5000 });
+      execSync(`xclip -selection clipboard -t image/png -o > "${tmpPath}" 2>/dev/null`, { timeout: 5000 });
     } else {
       return null;
     }
@@ -13284,7 +13434,7 @@ class ModuleRegistry {
 
 // src/modules/plugins/loader.ts
 import { readdirSync as readdirSync5, existsSync as existsSync23, statSync as statSync4 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 class PluginLoader {
   loadFromDir(dirPath, pluginManager, logger) {
@@ -13292,7 +13442,7 @@ class PluginLoader {
       return;
     const entries = readdirSync5(dirPath);
     for (const entry of entries) {
-      const fullPath = join16(dirPath, entry);
+      const fullPath = join17(dirPath, entry);
       if (!statSync4(fullPath).isFile())
         continue;
       if (!entry.endsWith(".ts") && !entry.endsWith(".js"))
@@ -13317,11 +13467,13 @@ var init_loader = __esm(() => {
 // src/modules/plugins/builtin/lint-on-write.ts
 import { spawn as spawn4 } from "child_process";
 import { existsSync as existsSync24, readFileSync as readFileSync13 } from "fs";
-import { resolve as resolve13, extname as extname4, join as join17 } from "path";
+import { resolve as resolve13, extname as extname4, join as join18 } from "path";
 
 class LintOnWritePlugin {
   name = "lint-on-write";
   priority = 10;
+  _checkPromise = null;
+  _checkTimestamp = 0;
   async onAfterTool(ctx, call, result) {
     if (call.name !== "write_file" && call.name !== "edit_file") {
       return;
@@ -13379,7 +13531,7 @@ class LintOnWritePlugin {
   }
   async runProjectLint(ctx, result) {
     try {
-      const packageJsonPath = join17(ctx.baseDir, "package.json");
+      const packageJsonPath = join18(ctx.baseDir, "package.json");
       if (!existsSync24(packageJsonPath)) {
         return;
       }
@@ -13399,13 +13551,13 @@ class LintOnWritePlugin {
     }
   }
   async runProjectTypeCheck(ctx, result) {
-    const tsconfigPath = join17(ctx.baseDir, "tsconfig.json");
+    const tsconfigPath = join18(ctx.baseDir, "tsconfig.json");
     if (!existsSync24(tsconfigPath)) {
       return;
     }
     const now = Date.now();
-    if (projectTypeCheckPromise && now - projectTypeCheckTimestamp < TYPE_CHECK_DEBOUNCE_MS) {
-      const error2 = await projectTypeCheckPromise;
+    if (this._checkPromise && now - this._checkTimestamp < TYPE_CHECK_DEBOUNCE_MS) {
+      const error2 = await this._checkPromise;
       if (error2) {
         result.output += `
 
@@ -13413,9 +13565,9 @@ class LintOnWritePlugin {
       }
       return;
     }
-    projectTypeCheckTimestamp = now;
-    projectTypeCheckPromise = this.runTscCheck(ctx.baseDir);
-    const error = await projectTypeCheckPromise;
+    this._checkTimestamp = now;
+    this._checkPromise = this.runTscCheck(ctx.baseDir);
+    const error = await this._checkPromise;
     if (error) {
       result.output += `
 
@@ -13478,7 +13630,7 @@ function runAsync(command, cwd, timeoutMs) {
     });
   });
 }
-var projectTypeCheckPromise = null, projectTypeCheckTimestamp = 0, TYPE_CHECK_DEBOUNCE_MS = 2000, plugin;
+var TYPE_CHECK_DEBOUNCE_MS = 2000, plugin;
 var init_lint_on_write = __esm(() => {
   plugin = new LintOnWritePlugin;
 });
@@ -13530,7 +13682,7 @@ class PlanCreator {
     const stepCount = stepDescriptions.length;
     return {
       id: generatePlanId(),
-      title: `[${stepCount} ст.] ${title}`,
+      title: `[${stepCount}] ${title}`,
       steps: stepDescriptions.map((desc, i) => ({
         id: i + 1,
         description: desc,
@@ -13670,17 +13822,17 @@ var init_auditor = __esm(() => {
 });
 
 // src/modules/execution/plan-persister.ts
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync9, mkdirSync as mkdirSync11, existsSync as existsSync26 } from "fs";
-import { join as join18 } from "path";
+import { readFileSync as readFileSync14, writeFileSync as writeFileSync8, mkdirSync as mkdirSync11, existsSync as existsSync26 } from "fs";
+import { join as join19 } from "path";
 
 class PlanPersister {
   filePath;
   constructor(baseDir) {
-    const mmaDir = join18(baseDir, ".mma");
+    const mmaDir = join19(baseDir, ".mma");
     if (!existsSync26(mmaDir)) {
       mkdirSync11(mmaDir, { recursive: true });
     }
-    this.filePath = join18(mmaDir, "plan.json");
+    this.filePath = join19(mmaDir, "plan.json");
   }
   save(plan) {
     const file = {
@@ -13691,7 +13843,7 @@ class PlanPersister {
       updatedAt: new Date().toISOString(),
       baseDir: plan.baseDir
     };
-    writeFileSync9(this.filePath, JSON.stringify(file, null, 2), "utf-8");
+    writeFileSync8(this.filePath, JSON.stringify(file, null, 2), "utf-8");
   }
   load() {
     if (!existsSync26(this.filePath))
@@ -13712,7 +13864,7 @@ class PlanPersister {
   }
   clear() {
     if (existsSync26(this.filePath)) {
-      writeFileSync9(this.filePath, "", "utf-8");
+      writeFileSync8(this.filePath, "", "utf-8");
     }
   }
 }
@@ -13777,8 +13929,7 @@ var init_plan_coverage = __esm(() => {
     "css",
     "scss",
     "less",
-    "html",
-    "jsx"
+    "html"
   ]);
 });
 
@@ -13797,7 +13948,8 @@ class ExecutionModule {
   lastRecoveryIteration = -STUCK_RECOVERY_COOLDOWN;
   consecutivePlanWarnings = 0;
   lastStepId = -1;
-  constructor(baseDir, stuckThreshold = 8) {
+  _auditSkipsRemaining = 0;
+  constructor(baseDir, stuckThreshold = 6) {
     this.baseDir = baseDir;
     this.verifier = new StepVerifier(baseDir);
     this.stuckDetector = new StuckDetector(stuckThreshold);
@@ -13807,6 +13959,7 @@ class ExecutionModule {
   setPlan(plan) {
     this.tracker = new PlanTracker(plan);
     this.persister.save(plan);
+    this._auditSkipsRemaining = 0;
   }
   restorePlan() {
     const plan = this.persister.load();
@@ -13814,6 +13967,7 @@ class ExecutionModule {
       return false;
     this.tracker = new PlanTracker(plan);
     this.tracker.syncCurrentStep();
+    this._auditSkipsRemaining = 1;
     return true;
   }
   getTracker() {
@@ -13825,6 +13979,10 @@ class ExecutionModule {
   async runFinalAudit() {
     if (!this.tracker)
       return null;
+    if (this._auditSkipsRemaining > 0) {
+      this._auditSkipsRemaining--;
+      return null;
+    }
     const plan = this.tracker.getPlan();
     const audit = await this.auditor.audit(plan);
     const pendingSteps = plan.steps.filter((s) => s.status !== "done" && s.status !== "skipped").map((s) => `${s.id}. ${s.description}`);
@@ -13888,7 +14046,10 @@ Write CONCRETE steps with exact file paths and commands:
             const plan = PlanCreator.createPlan(title, steps, this.baseDir);
             this.setPlan(plan);
             const display = PlanCreator.toPromptBlock(plan, 0);
-            let output = t("plan.created", { title, steps: String(steps.length) });
+            let output = t("plan.created", {
+              title,
+              steps: String(steps.length)
+            });
             let displayOut = display;
             const taskText = this.getTaskText(_ctx);
             if (taskText) {
@@ -13937,6 +14098,22 @@ ${progress}`,
               display
             };
           }
+          if (action === "update" && Array.isArray(args.steps) && args.steps.length > 0 && this.tracker) {
+            const title = String(args.title || this.tracker.getPlan().title);
+            const steps = args.steps.map(String);
+            const plan = PlanCreator.createPlan(title, steps, this.baseDir);
+            this.setPlan(plan);
+            const display = PlanCreator.toPromptBlock(plan, 0);
+            const output = t("plan.updated", {
+              title,
+              steps: String(steps.length)
+            });
+            return {
+              success: true,
+              output,
+              display
+            };
+          }
           if (action === "abort") {
             this.tracker = null;
             this.persister.clear();
@@ -13983,9 +14160,20 @@ ${progress}`,
             };
           }
           if (action === "done") {
+            if (!currentStep) {
+              return { success: false, output: t("plan.step_not_found") };
+            }
+            this.tracker.updateStepStatus(currentStep.id, "done");
+            this.tracker.syncCurrentStep();
+            this.persister.save(this.tracker.getPlan());
+            const display = this.tracker.toPromptBlock();
             return {
               success: true,
-              output: t("todo.marked_done", { count: "1" })
+              output: t("plan.step_status", {
+                step: String(currentStep.id),
+                status: "done"
+              }),
+              display
             };
           }
           if (action === "list") {
@@ -14073,8 +14261,10 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
             }
             const hints = this.stuckDetector.getHints();
             if (hints.length > 0 && ctx.contextManager) {
-              const hintMsg = t("exec.hints", { hints: hints.map((h) => `- ${h}`).join(`
-`) });
+              const hintMsg = t("exec.hints", {
+                hints: hints.map((h) => `- ${h}`).join(`
+`)
+              });
               ctx.contextManager.addMessage({
                 role: "user",
                 content: `<system-summary>${hintMsg}</system-summary>`
@@ -14093,7 +14283,7 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
               const step2 = this.tracker?.getCurrentStep();
               ctx.contextManager.addMessage({
                 role: "user",
-                content: `<system-summary>CRITICAL: You have been stuck on step ${step2?.id ?? "?"} ("${step2?.description ?? ""}") for ${this.stuckDetector.getIterationsOnCurrentStep()} iterations. You MUST stop trying the same approach. Options: 1) Skip this step via plan update step=${step2?.id ?? "?"} status=skipped with a note explaining why. 2) Mark the step as done if the code runs correctly, even if there are type errors. 3) Try a completely different approach. Do NOT continue with the current approach.</system-summary>`
+                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>`
               });
             }
           }
@@ -14162,7 +14352,10 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
               const file = this.stuckDetector.getExcessiveRewriteFile();
               const count = this.stuckDetector.getFileRewriteCount(file);
               if (ctx.onMeta) {
-                ctx.onMeta(t("exec.file_rewrite_warning", { file, count: String(count) }));
+                ctx.onMeta(t("exec.file_rewrite_warning", {
+                  file,
+                  count: String(count)
+                }));
               }
             }
           }
@@ -14288,7 +14481,7 @@ Tool "${this.stuckDetector.getLastFailedTool()}" is failing. Try "${alternative}
     return getMessageText(firstUser.content).trim();
   }
 }
-var STUCK_RECOVERY_COOLDOWN = 5, MAX_PLAN_WARNINGS_BEFORE_BLOCK = 3, FORCE_SKIP_THRESHOLD = 15;
+var STUCK_RECOVERY_COOLDOWN = 5, MAX_PLAN_WARNINGS_BEFORE_BLOCK = 3, FORCE_SKIP_THRESHOLD = 10;
 var init_module = __esm(() => {
   init_i18n();
   init_tracker();
@@ -14301,8 +14494,8 @@ var init_module = __esm(() => {
 });
 
 // src/modules/security/session-encryption.ts
-import { readFileSync as readFileSync16, writeFileSync as writeFileSync10, existsSync as existsSync28, readdirSync as readdirSync6, unlinkSync as unlinkSync3 } from "fs";
-import { join as join19 } from "path";
+import { readFileSync as readFileSync16, writeFileSync as writeFileSync9, existsSync as existsSync28, readdirSync as readdirSync6, unlinkSync as unlinkSync3 } from "fs";
+import { join as join20 } from "path";
 import { homedir as homedir8 } from "os";
 
 class SessionFileEncryptor {
@@ -14311,7 +14504,7 @@ class SessionFileEncryptor {
   constructor(config) {
     this.config = { ...DEFAULT_SESSION_ENCRYPTION, ...config };
     this.encryptor = new ConfigEncryptor({
-      keyPath: config?.keyPath || join19(homedir8(), ".mma", ".session-encryption-key")
+      keyPath: config?.keyPath || join20(homedir8(), ".mma", ".session-encryption-key")
     });
   }
   isEnabled() {
@@ -14356,7 +14549,7 @@ class SessionFileEncryptor {
   }
   writeSessionFile(filePath, content) {
     const encrypted = this.encryptFileContent(content);
-    writeFileSync10(filePath, encrypted, "utf8");
+    writeFileSync9(filePath, encrypted, "utf8");
   }
   readSessionJSON(filePath) {
     const content = readFileSync16(filePath, "utf8");
@@ -14364,7 +14557,7 @@ class SessionFileEncryptor {
   }
   writeSessionJSON(filePath, obj) {
     const content = this.encryptJSON(obj);
-    writeFileSync10(filePath, content, "utf8");
+    writeFileSync9(filePath, content, "utf8");
   }
   readSessionJSONL(filePath) {
     const content = readFileSync16(filePath, "utf8");
@@ -14375,7 +14568,7 @@ class SessionFileEncryptor {
   }
   appendToSessionJSONL(filePath, obj) {
     const encryptedLine = this.encryptFileContent(JSON.stringify(obj));
-    writeFileSync10(filePath, encryptedLine + `
+    writeFileSync9(filePath, encryptedLine + `
 `, { flag: "a", encoding: "utf8" });
   }
   encryptSessionDirectory(sessionDir) {
@@ -14383,12 +14576,12 @@ class SessionFileEncryptor {
       return;
     const files = readdirSync6(sessionDir);
     for (const file of files) {
-      const filePath = join19(sessionDir, file);
+      const filePath = join20(sessionDir, file);
       if (existsSync28(filePath) && !file.endsWith(".enc")) {
         try {
           const content = readFileSync16(filePath, "utf8");
           const encrypted = this.encryptFileContent(content);
-          writeFileSync10(filePath + ".enc", encrypted, "utf8");
+          writeFileSync9(filePath + ".enc", encrypted, "utf8");
           unlinkSync3(filePath);
         } catch {}
       }
@@ -14400,12 +14593,12 @@ class SessionFileEncryptor {
     const files = readdirSync6(sessionDir);
     for (const file of files) {
       if (file.endsWith(".enc")) {
-        const encFilePath = join19(sessionDir, file);
+        const encFilePath = join20(sessionDir, file);
         const decFilePath = encFilePath.slice(0, -4);
         try {
           const content = readFileSync16(encFilePath, "utf8");
           const decrypted = this.decryptFileContent(content);
-          writeFileSync10(decFilePath, decrypted, "utf8");
+          writeFileSync9(decFilePath, decrypted, "utf8");
           unlinkSync3(encFilePath);
         } catch {}
       }
@@ -14430,21 +14623,25 @@ import {
   readdirSync as readdirSync7,
   readFileSync as readFileSync17,
   rmSync,
-  writeFileSync as writeFileSync11,
+  writeFileSync as writeFileSync10,
   appendFileSync as appendFileSync5
 } from "fs";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 import { gzipSync } from "zlib";
 
 class SessionStore {
   baseDir;
   encryptor = null;
+  _metaCache = new Map;
   constructor(baseDir, encryptionConfig) {
     this.baseDir = baseDir;
     if (encryptionConfig?.enabled) {
       this.encryptor = new SessionFileEncryptor(encryptionConfig);
     }
   }
+  getSessionDir(id) {
+    return join21(this.baseDir, id);
+  }
   updateEncryption(config) {
     if (config?.enabled) {
       this.encryptor = new SessionFileEncryptor(config);
@@ -14459,38 +14656,44 @@ class SessionStore {
     mkdirSync12(this.baseDir, { recursive: true });
   }
   sessionDir(id) {
-    return join20(this.baseDir, id);
+    return join21(this.baseDir, id);
   }
   metaPath(id) {
-    return join20(this.sessionDir(id), "meta.json");
+    return join21(this.sessionDir(id), "meta.json");
   }
   historyPath(id) {
-    return join20(this.sessionDir(id), "history.jsonl");
+    return join21(this.sessionDir(id), "history.jsonl");
   }
   sessionLogPath(id) {
-    return join20(this.sessionDir(id), "session.jsonl");
+    return join21(this.sessionDir(id), "session.jsonl");
   }
   sessionExists(id) {
     return existsSync29(this.metaPath(id));
   }
   saveMeta(id, meta) {
+    this._metaCache.set(id, meta);
     const dir = this.sessionDir(id);
     mkdirSync12(dir, { recursive: true });
     const content = JSON.stringify(meta, null, 2);
     if (this.encryptor) {
-      writeFileSync11(this.metaPath(id), this.encryptor.encryptFileContent(content), "utf-8");
+      writeFileSync10(this.metaPath(id), this.encryptor.encryptFileContent(content), "utf-8");
     } else {
-      writeFileSync11(this.metaPath(id), content, "utf-8");
+      writeFileSync10(this.metaPath(id), content, "utf-8");
     }
   }
   loadMeta(id) {
+    const cached = this._metaCache.get(id);
+    if (cached)
+      return cached;
     const path = this.metaPath(id);
     if (!existsSync29(path))
       return null;
     try {
       const raw = readFileSync17(path, "utf-8");
       const content = this.encryptor ? this.encryptor.decryptFileContent(raw) : raw;
-      return JSON.parse(content);
+      const meta = JSON.parse(content);
+      this._metaCache.set(id, meta);
+      return meta;
     } catch {
       return null;
     }
@@ -14521,11 +14724,23 @@ class SessionStore {
       const raw = readFileSync17(path, "utf-8");
       const lines = raw.split(`
 `).filter(Boolean);
+      const parseLine = (line) => {
+        try {
+          return JSON.parse(line);
+        } catch {
+          return null;
+        }
+      };
       if (this.encryptor?.isEnabled()) {
-        const decryptedLines = lines.map((line) => this.encryptor.decryptFileContent(line));
-        return decryptedLines.map((line) => JSON.parse(line));
+        return lines.map((line) => {
+          try {
+            return this.encryptor.decryptFileContent(line);
+          } catch {
+            return null;
+          }
+        }).filter((l) => l !== null).map(parseLine).filter((m) => m !== null);
       }
-      return lines.map((line) => JSON.parse(line));
+      return lines.map(parseLine).filter((m) => m !== null);
     } catch {
       return [];
     }
@@ -14550,11 +14765,23 @@ class SessionStore {
       const raw = readFileSync17(path, "utf-8");
       const lines = raw.split(`
 `).filter(Boolean);
+      const parseLine = (line) => {
+        try {
+          return JSON.parse(line);
+        } catch {
+          return null;
+        }
+      };
       if (this.encryptor?.isEnabled()) {
-        const decryptedLines = lines.map((line) => this.encryptor.decryptFileContent(line));
-        return decryptedLines.map((line) => JSON.parse(line));
+        return lines.map((line) => {
+          try {
+            return this.encryptor.decryptFileContent(line);
+          } catch {
+            return null;
+          }
+        }).filter((l) => l !== null).map(parseLine).filter((e) => e !== null);
       }
-      return lines.map((line) => JSON.parse(line));
+      return lines.map(parseLine).filter((e) => e !== null);
     } catch {
       return [];
     }
@@ -14575,6 +14802,7 @@ class SessionStore {
     return sessions;
   }
   deleteSession(id) {
+    this._metaCache.delete(id);
     const dir = this.sessionDir(id);
     if (existsSync29(dir)) {
       rmSync(dir, { recursive: true, force: true });
@@ -14591,8 +14819,8 @@ class SessionStore {
         if (existsSync29(historyPath)) {
           const content = readFileSync17(historyPath, "utf-8");
           const compressed = gzipSync(content);
-          const gzPath = join20(this.baseDir, `${session2.id}.jsonl.gz`);
-          writeFileSync11(gzPath, compressed);
+          const gzPath = join21(this.baseDir, `${session2.id}.jsonl.gz`);
+          writeFileSync10(gzPath, compressed);
           rmSync(historyPath);
         }
       }
@@ -14702,6 +14930,9 @@ class SessionManager {
       return;
     return this.getSessionContextById(this.activeId);
   }
+  getSessionDirectory(id) {
+    return this.store.getSessionDir(id);
+  }
   getSessionContextById(sessionId) {
     if (!this.sessionContexts.has(sessionId)) {
       const meta = this.store.loadMeta(sessionId);
@@ -14798,8 +15029,8 @@ class ProfileCompressor {
 }
 
 // src/modules/user-profile/profile.ts
-import { readFileSync as readFileSync18, writeFileSync as writeFileSync12, existsSync as existsSync30, mkdirSync as mkdirSync13 } from "fs";
-import { join as join21 } from "path";
+import { readFileSync as readFileSync18, writeFileSync as writeFileSync11, existsSync as existsSync30, mkdirSync as mkdirSync13 } from "fs";
+import { join as join22 } from "path";
 import { homedir as homedir9, hostname, platform as platform3, type } from "os";
 import { env } from "process";
 
@@ -14826,10 +15057,10 @@ class UserProfile {
     if (!existsSync30(this.profileDir)) {
       mkdirSync13(this.profileDir, { recursive: true });
     }
-    writeFileSync12(join21(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
+    writeFileSync11(join22(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
   }
   load() {
-    const path = join21(this.profileDir, "profile.json");
+    const path = join22(this.profileDir, "profile.json");
     if (!existsSync30(path))
       return null;
     try {
@@ -14869,7 +15100,7 @@ var init_profile = () => {};
 
 // src/modules/skills/loader.ts
 import { readdirSync as readdirSync8, readFileSync as readFileSync19, existsSync as existsSync31, statSync as statSync5 } from "fs";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 
 class SkillsLoader {
   loadFromDir(dirPath) {
@@ -14882,7 +15113,7 @@ class SkillsLoader {
   scanDir(dirPath, skills) {
     const entries = readdirSync8(dirPath);
     for (const entry of entries) {
-      const fullPath = join22(dirPath, entry);
+      const fullPath = join23(dirPath, entry);
       const stat = statSync5(fullPath);
       if (stat.isDirectory()) {
         this.scanDir(fullPath, skills);
@@ -15162,7 +15393,7 @@ var init_browser2 = __esm(() => {
 });
 
 // src/modules/lsp/client.ts
-import { spawn as spawn5, execSync as execSync2 } from "child_process";
+import { spawn as spawn5, execSync } from "child_process";
 import { resolve as resolve16 } from "path";
 
 class LspClient {
@@ -15219,7 +15450,7 @@ class LspClient {
   async startServer(config, baseDir) {
     if (config.autoInstall === false) {
       try {
-        execSync2(`where ${config.command}`, { stdio: "pipe", timeout: 3000 });
+        execSync(`where ${config.command}`, { stdio: "pipe", timeout: 3000 });
       } catch {
         throw new Error(`${config.command} not found in PATH`);
       }
@@ -15267,6 +15498,11 @@ class LspClient {
           continue;
         }
         this.contentLength = parseInt(match[1], 10);
+        if (this.contentLength > 10485760) {
+          this.buffer = this.buffer.slice(headerEnd + 4);
+          this.contentLength = -1;
+          continue;
+        }
         this.buffer = this.buffer.slice(headerEnd + 4);
       }
       if (this.buffer.length < this.contentLength)
@@ -15474,7 +15710,7 @@ var init_lsp = __esm(() => {
 
 // src/modules/indexer/walker.ts
 import { readdirSync as readdirSync9, readFileSync as readFileSync20, statSync as statSync6, existsSync as existsSync33, watch } from "fs";
-import { join as join23, relative, extname as extname5 } from "path";
+import { join as join24, relative, extname as extname5 } from "path";
 
 class Indexer {
   baseDir;
@@ -15512,7 +15748,7 @@ class Indexer {
       for (const entry of entries) {
         if (count >= this.MAX_FILES)
           return;
-        const fullPath = join23(dir, entry);
+        const fullPath = join24(dir, entry);
         const relPath = relative(this.baseDir, fullPath);
         const stat = statSync6(fullPath);
         if (stat.isDirectory()) {
@@ -15575,14 +15811,14 @@ var init_walker = __esm(() => {
 });
 
 // src/modules/indexer/cache.ts
-import { readFileSync as readFileSync21, writeFileSync as writeFileSync13, existsSync as existsSync34, mkdirSync as mkdirSync14, rmSync as rmSync2 } from "fs";
-import { join as join24 } from "path";
+import { readFileSync as readFileSync21, writeFileSync as writeFileSync12, existsSync as existsSync34, mkdirSync as mkdirSync14, rmSync as rmSync2 } from "fs";
+import { join as join25 } from "path";
 
 class IndexCache {
   cachePath;
   cache = null;
   constructor(cacheDir) {
-    this.cachePath = join24(cacheDir, "index-cache.json");
+    this.cachePath = join25(cacheDir, "index-cache.json");
   }
   load() {
     if (this.cache)
@@ -15598,10 +15834,10 @@ class IndexCache {
   }
   save(result) {
     this.cache = result;
-    const dir = join24(this.cachePath, "..");
+    const dir = join25(this.cachePath, "..");
     if (!existsSync34(dir))
       mkdirSync14(dir, { recursive: true });
-    writeFileSync13(this.cachePath, JSON.stringify(result), "utf-8");
+    writeFileSync12(this.cachePath, JSON.stringify(result), "utf-8");
   }
   invalidate() {
     this.cache = null;
@@ -15963,13 +16199,13 @@ var init_mcp = __esm(() => {
 
 // src/modules/memory/module.ts
 import { homedir as homedir10 } from "os";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 
 class MemoryModule {
   name = "memory";
   store;
   constructor(memoryDir) {
-    const dir = memoryDir || join25(homedir10(), ".mma", "memory");
+    const dir = memoryDir || join26(homedir10(), ".mma", "memory");
     this.store = new MemoryStore(dir);
   }
   getSystemPromptBlock() {
@@ -16016,8 +16252,8 @@ __export(exports_bootstrap, {
   bootstrap: () => bootstrap
 });
 import { homedir as homedir11 } from "os";
-import { join as join26, resolve as resolve18 } from "path";
-import { existsSync as existsSync35, readFileSync as readFileSync22, writeFileSync as writeFileSync14 } from "fs";
+import { join as join27, resolve as resolve18 } from "path";
+import { existsSync as existsSync35, 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");
@@ -16036,7 +16272,7 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
     `- DRY: Do not duplicate code, logic, or configuration — reuse existing utilities and patterns.`
   ];
   if (isWin) {
-    lines.push(``, `Windows environment — use Windows-compatible commands (shell is cmd.exe, not PowerShell):`, `- Use "dir" instead of "ls". Use "dir /b" for bare listing. For file listings prefer the list_dir tool.`, `- Use "type" instead of "cat". For reading files prefer the read_file tool.`, `- Use "cd" instead of "pwd". Use "echo %cd%" to print working directory.`, `- Use "copy" instead of "cp", "move" instead of "mv", "del" instead of "rm".`, `- Do not use "mkdir -p" — Windows mkdir creates intermediate dirs by default. Use the create_dir tool instead.`, `- Do not use "head" or "tail" — they are Unix commands. Use the read_file tool with offset/limit instead.`, `- Do not use "grep" — use the grep tool instead. Do not use PowerShell cmdlets (Get-Content, Select-Object, cat) in bash — the shell is cmd.exe.`, `- Use forward slashes (/) or escaped backslashes (\\\\) in file paths.`, `- Your working directory is: ${baseDir}`);
+    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(``, `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.`);
@@ -16051,8 +16287,8 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
 `);
 }
 async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
-  const dir = configDir || join26(homedir11(), ".mma");
-  const projectConfigPath = projectDir ? join26(projectDir, ".mmrc") : join26(process.cwd(), ".mmrc");
+  const dir = configDir || join27(homedir11(), ".mma");
+  const projectConfigPath = projectDir ? join27(projectDir, ".mmrc") : join27(process.cwd(), ".mmrc");
   const config = loadConfig({ configDir: dir, projectConfigPath });
   setLocale(config.locale);
   try {
@@ -16062,7 +16298,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     }
   } catch {}
   const logger = new Logger(config.logLevel);
-  logger.setLogDir(join26(dir, "logs"));
+  logger.setLogDir(join27(dir, "logs"));
   logger.debug("MMA bootstrap", {
     version: config.version,
     model: config.model
@@ -16084,7 +16320,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
       logger.info(`Model ${config.model} loaded in ${loadResult.loadTime}s`);
     }
   }
-  const profile = new UserProfile(join26(dir));
+  const profile = new UserProfile(join27(dir));
   profile.load() || profile.collect();
   profile.save();
   const llmProvider = new OpenAICompatProvider({
@@ -16096,7 +16332,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     rateLimits: config.security?.rateLimits
   });
   const baseDir = projectDir ? resolve18(projectDir) : process.cwd();
-  const projectMapCacheDir = join26(baseDir, ".mma");
+  const projectMapCacheDir = join27(baseDir, ".mma");
   const indexerModule = new IndexerModule({
     baseDir,
     cacheDir: projectMapCacheDir
@@ -16107,9 +16343,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     logger.warn(`Project indexing failed: ${err.message}`);
   }
   const skillsLoader = new SkillsLoader;
-  const builtinDir = join26(import.meta.dirname, "skills", "builtin");
-  const globalDir = join26(homedir11(), ".agents", "skills");
-  const projectSkillsDir = join26(baseDir, ".mma", "skills");
+  const builtinDir = join27(import.meta.dirname, "skills", "builtin");
+  const globalDir = join27(homedir11(), ".agents", "skills");
+  const projectSkillsDir = join27(baseDir, ".mma", "skills");
   const availableSkills = skillsLoader.loadFromAllSources(builtinDir, globalDir, projectSkillsDir);
   const skillsMatcher = new SkillsMatcher;
   const skillsBudget = Math.floor(config.contextWindow * 0.1);
@@ -16123,11 +16359,11 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     essential: true,
     estimatedTokens: 250
   };
-  const agentsMdGlobal = join26(dir, "AGENTS.md");
+  const agentsMdGlobal = join27(dir, "AGENTS.md");
   if (!existsSync35(agentsMdGlobal)) {
-    writeFileSync14(agentsMdGlobal, "", "utf-8");
+    writeFileSync13(agentsMdGlobal, "", "utf-8");
   }
-  const sessionDir = join26(dir, "sessions");
+  const sessionDir = join27(dir, "sessions");
   const sessionStore = new SessionStore(sessionDir);
   sessionStore.init();
   const sessionManager = new SessionManager(sessionStore, {
@@ -16183,7 +16419,10 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const hallucinationDetector = new HallucinationDetector(baseDir, llmProvider);
   const moduleRegistry = new ModuleRegistry;
   const execModule = new ExecutionModule(baseDir, config.stuckThreshold);
-  execModule.restorePlan();
+  const activeMeta = sessionManager.getActiveMeta();
+  if (activeMeta && activeMeta.messageCount > 0) {
+    execModule.restorePlan();
+  }
   moduleRegistry.register(execModule);
   const sessionModule = new SessionModule(sessionManager);
   moduleRegistry.register(sessionModule);
@@ -16192,7 +16431,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const mcpModule = new MCPModule(config);
   await mcpModule.initialize();
   moduleRegistry.register(mcpModule);
-  const memoryModule = new MemoryModule(join26(dir, "memory"));
+  const memoryModule = new MemoryModule(join27(dir, "memory"));
   moduleRegistry.register(memoryModule);
   if (config.browser.enabled) {
     const browserModule = new BrowserModule;
@@ -16242,8 +16481,8 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   pluginManager.register(plugin);
   pluginManager.register(plugin2);
   const pluginLoader = new PluginLoader;
-  const globalPluginsDir = join26(homedir11(), ".mma", "plugins");
-  const projectPluginsDir = join26(dir, ".mma", "plugins");
+  const globalPluginsDir = join27(homedir11(), ".mma", "plugins");
+  const projectPluginsDir = join27(baseDir, ".mma", "plugins");
   pluginLoader.loadFromDir(globalPluginsDir, pluginManager, logger);
   pluginLoader.loadFromDir(projectPluginsDir, pluginManager, logger);
   contextManager.onCompact = (summary) => {
@@ -16261,9 +16500,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const skipAgentsMd = noAgentsMd === true;
   if (!skipAgentsMd) {
     const agentsMdCandidates = [
-      join26(baseDir, "AGENTS.md"),
-      join26(baseDir, ".mma", "AGENTS.md"),
-      join26(dir, "AGENTS.md")
+      join27(baseDir, "AGENTS.md"),
+      join27(baseDir, ".mma", "AGENTS.md"),
+      join27(dir, "AGENTS.md")
     ];
     for (const p of agentsMdCandidates) {
       if (existsSync35(p)) {
@@ -16349,7 +16588,7 @@ function ansiRegex({ onlyFirst = false } = {}) {
   return new RegExp(pattern, onlyFirst ? undefined : "g");
 }
 
-// node_modules/strip-ansi/index.js
+// node_modules/string-width/node_modules/strip-ansi/index.js
 function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
@@ -16448,135 +16687,65 @@ 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 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) {
+function stringWidth(string, options = {}) {
+  if (typeof string !== "string" || string.length === 0) {
     return 0;
   }
   const {
     ambiguousIsNarrow = true,
     countAnsiEscapeCodes = false
   } = options;
-  let string = input;
-  if (!countAnsiEscapeCodes && (string.includes("\x1B") || string.includes("›"))) {
+  if (!countAnsiEscapeCodes) {
     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 } of segmenter.segment(string)) {
-    if (isZeroWidthCluster(segment)) {
+  for (const { segment: character } of segmenter.segment(string)) {
+    const codePoint = character.codePointAt(0);
+    if (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) {
       continue;
     }
-    if (rgiEmojiRegex.test(segment) || isDoubleWidthNonRgiEmojiSequence(segment)) {
-      width += 2;
+    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) {
+      continue;
+    }
+    if (defaultIgnorableCodePointRegex.test(character)) {
       continue;
     }
-    const visibleSegment = baseVisible(segment);
-    const hangulWidth = hangulClusterWidth(visibleSegment, eastAsianWidthOptions);
-    if (hangulWidth !== undefined) {
-      width += hangulWidth;
+    if (import_emoji_regex.default().test(character)) {
+      width += 2;
       continue;
     }
-    const codePoint = visibleSegment.codePointAt(0);
     width += eastAsianWidth(codePoint, eastAsianWidthOptions);
-    width += trailingWidth(visibleSegment, eastAsianWidthOptions);
   }
   return width;
 }
-var segmenter, zeroWidthClusterRegex, leadingNonPrintingRegex, spacingMarkRegex, rgiEmojiRegex, unqualifiedKeycapRegex, extendedPictographicRegex;
+var import_emoji_regex, segmenter, defaultIgnorableCodePointRegex;
 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;
-  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;
+  defaultIgnorableCodePointRegex = /^\p{Default_Ignorable_Code_Point}$/u;
 });
 
 // src/ui/table.ts
@@ -16681,12 +16850,12 @@ function formatTable(tableLines, opts = {}) {
       const a = isHeader && align[c] === undefined ? "center" : align[c] ?? "left";
       cells.push(pad(cell, widths[c], a));
     }
-    const content = cells.map((c) => pc.dim("│ ") + c).join("") + pc.dim("│");
-    return isHeader ? pc.bold(content) : content;
+    const content = cells.map((c) => pc2.dim("│ ") + c).join("") + pc2.dim("│");
+    return isHeader ? pc2.bold(content) : content;
   };
   const border = (l, m, r) => {
     const seg = widths.map((w) => "─".repeat(w + 2)).join(m);
-    return pc.dim(l + seg + r);
+    return pc2.dim(l + seg + r);
   };
   const out = [];
   out.push(border("┌", "┬", "┐"));
@@ -16784,7 +16953,7 @@ class Spinner {
       return;
     const frame = FRAMES[this.frame % FRAMES.length];
     this.frame++;
-    this.stream.write("\r" + pc.cyan(frame) + " " + this.message + "\x1B[K");
+    this.stream.write("\r" + pc2.cyan(frame) + " " + this.message + "\x1B[K");
   }
 }
 var FRAMES;
@@ -16851,19 +17020,19 @@ function box(lines, opts = {}) {
   const title = opts.title ?? "";
   if (title) {
     const head = `─ ${title} `;
-    out.push(pc.dim(`┌${head}${"─".repeat(Math.max(0, width - 2 - stringWidth(head)))}┐`));
+    out.push(pc2.dim(`┌${head}${"─".repeat(Math.max(0, width - 2 - stringWidth(head)))}┐`));
   } else {
-    out.push(pc.dim(`┌${"─".repeat(width - 2)}┐`));
+    out.push(pc2.dim(`┌${"─".repeat(width - 2)}┐`));
   }
   for (const line of wrapped) {
-    out.push(pc.dim("│") + " ".repeat(pad2) + padTo(line, inner) + " ".repeat(pad2) + pc.dim("│"));
+    out.push(pc2.dim("│") + " ".repeat(pad2) + padTo(line, inner) + " ".repeat(pad2) + pc2.dim("│"));
   }
-  out.push(pc.dim(`└${"─".repeat(width - 2)}┘`));
+  out.push(pc2.dim(`└${"─".repeat(width - 2)}┘`));
   return out;
 }
 function divider(width) {
   const w = Math.min(width ?? getTerminalWidth(), 60);
-  return pc.dim("─".repeat(w));
+  return pc2.dim("─".repeat(w));
 }
 var init_box = __esm(() => {
   init_string_width();
@@ -16883,7 +17052,7 @@ async function withSpinner(message, fn) {
   }
 }
 function menuList(items) {
-  const lines = items.map((it, i) => ` ${pc.cyan(`[${i + 1}]`)} ${it.label}${it.url ? `  ${pc.dim(it.url)}` : ""}`);
+  const lines = items.map((it, i) => ` ${pc2.cyan(`[${i + 1}]`)} ${it.label}${it.url ? `  ${pc2.dim(it.url)}` : ""}`);
   for (const l of box(lines, { width: 72 }))
     console.log(l);
 }
@@ -17018,15 +17187,15 @@ async function runSetup(externalRl) {
   }
   const connected = await withSpinner(t("setup.testing_spinner", { model }), () => testChat(apiBase, apiKey, model));
   if (connected) {
-    console.log(pc.green(t("setup.ok")));
+    console.log(pc2.green(t("setup.ok")));
   } else {
-    console.log(pc.yellow(t("setup.warning")));
+    console.log(pc2.yellow(t("setup.warning")));
   }
   console.log(t("setup.agent_settings"));
   const contextWindow = parseInt(await ask(rl, t("setup.context_window"), "32768"));
   const maxIterations = parseInt(await ask(rl, t("setup.max_iters"), "1000"));
   console.log(t("setup.security_header"));
-  console.log(pc.dim(t("setup.security_status_off")));
+  console.log(pc2.dim(t("setup.security_status_off")));
   const configureSecurity = await ask(rl, t("setup.security_configure"), "n");
   let securityBashBlock = false;
   let securityFlagsBlock = false;
@@ -17050,7 +17219,7 @@ async function runSetup(externalRl) {
     securityFlagsBlock,
     securityPathsDeny
   };
-  console.log(pc.green(pc.bold(t("setup.complete"))));
+  console.log(pc2.green(pc2.bold(t("setup.complete"))));
   const summary = renderTable([
     t("setup.summary_setting"),
     t("setup.summary_value"),
@@ -17110,9 +17279,9 @@ __export(exports_manifest, {
   getCertMark: () => getCertMark,
   MANIFEST_PATH: () => MANIFEST_PATH
 });
-import { existsSync as existsSync36, readFileSync as readFileSync23, mkdirSync as mkdirSync15, writeFileSync as writeFileSync15 } from "fs";
+import { existsSync as existsSync36, readFileSync as readFileSync23, mkdirSync as mkdirSync15, writeFileSync as writeFileSync14 } from "fs";
 import { homedir as homedir13 } from "os";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 function readManifest(path = MANIFEST_PATH) {
   try {
     if (existsSync36(path)) {
@@ -17123,8 +17292,8 @@ function readManifest(path = MANIFEST_PATH) {
   return { version: 1, certifications: [] };
 }
 function saveManifest(m, path = MANIFEST_PATH) {
-  mkdirSync15(join28(homedir13(), ".mma"), { recursive: true });
-  writeFileSync15(path, JSON.stringify(m, null, 2), "utf-8");
+  mkdirSync15(join29(homedir13(), ".mma"), { recursive: true });
+  writeFileSync14(path, JSON.stringify(m, null, 2), "utf-8");
 }
 function upsertCertification(entry, path = MANIFEST_PATH) {
   const m = readManifest(path);
@@ -17158,7 +17327,7 @@ function getCertMark(model, providerUrl, currentVersion, path = MANIFEST_PATH) {
 }
 var MANIFEST_PATH;
 var init_manifest = __esm(() => {
-  MANIFEST_PATH = join28(homedir13(), ".mma", "certifications.json");
+  MANIFEST_PATH = join29(homedir13(), ".mma", "certifications.json");
 });
 
 // node_modules/yaml/dist/nodes/identity.js
@@ -24282,7 +24451,7 @@ var init_scenarios = __esm(() => {
 
 // src/modules/certification/loader.ts
 import { existsSync as existsSync37, readdirSync as readdirSync10, readFileSync as readFileSync24 } from "fs";
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 function validateScenario(s) {
   const errors2 = [];
   const isSkip = s.mode === "skip";
@@ -24336,7 +24505,7 @@ function loadScenarios(userDir) {
       if (!file.endsWith(".yaml") && !file.endsWith(".yml"))
         continue;
       try {
-        const raw = readFileSync24(join29(userDir, file), "utf-8");
+        const raw = readFileSync24(join30(userDir, file), "utf-8");
         const data = $parse(raw);
         const parsed = normalizeScenario(data, file);
         const errs = validateScenario(parsed);
@@ -24390,7 +24559,7 @@ 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 join30 } from "path";
+import { join as join31 } from "path";
 function checkSandbox(sandboxDir, checks, exitCode, output) {
   const failures = [];
   for (const check of checks) {
@@ -24407,13 +24576,13 @@ function runCheck(sandboxDir, check, exitCode, output) {
     case "outputContains":
       return output.includes(check.text);
     case "fileExists":
-      return isFile(join30(sandboxDir, check.path));
+      return isFile(join31(sandboxDir, check.path));
     case "fileNotExists":
-      return !existsSync38(join30(sandboxDir, check.path));
+      return !existsSync38(join31(sandboxDir, check.path));
     case "dirExists":
-      return isDir(join30(sandboxDir, check.path));
+      return isDir(join31(sandboxDir, check.path));
     case "fileContent": {
-      const abs = join30(sandboxDir, check.path);
+      const abs = join31(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       const content = readFileSync25(abs, "utf-8");
@@ -24424,7 +24593,7 @@ function runCheck(sandboxDir, check, exitCode, output) {
       return false;
     }
     case "fileRegex": {
-      const abs = join30(sandboxDir, check.path);
+      const abs = join31(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       return new RegExp(check.pattern).test(readFileSync25(abs, "utf-8"));
@@ -24475,7 +24644,7 @@ var init_fact_checker = () => {};
 import { spawn as spawn6 } from "child_process";
 import { existsSync as existsSync39, mkdirSync as mkdirSync16, rmSync as rmSync3, cpSync as cpSync2 } from "fs";
 import { platform as platform4 } from "os";
-import { join as join31, resolve as resolve19, dirname as dirname9 } from "path";
+import { join as join32, resolve as resolve19, dirname as dirname9 } from "path";
 async function runScenario(scenario, opts) {
   if (scenario.mode === "skip") {
     return {
@@ -24494,7 +24663,7 @@ async function runScenario(scenario, opts) {
   let passed = 0;
   let firstError;
   for (let i = 1;i <= reps; i++) {
-    const sandbox = join31(opts.sandboxBase, `run-${scenario.id}-${i}`);
+    const sandbox = join32(opts.sandboxBase, `run-${scenario.id}-${i}`);
     let failures = [];
     let exitCode = -1;
     let output = "";
@@ -24555,20 +24724,20 @@ function prepareSandbox(sandbox, scenario, mmaRoot) {
   rmSync3(sandbox, { recursive: true, force: true });
   mkdirSync16(sandbox, { recursive: true });
   for (const f of scenario.fixtures ?? []) {
-    const src = join31(mmaRoot, f.source);
+    const src = join32(mmaRoot, f.source);
     if (!existsSync39(src)) {
       throw new Error(`fixture missing: ${f.source}`);
     }
-    const dest = join31(sandbox, f.dest);
+    const dest = join32(sandbox, f.dest);
     mkdirSync16(dirname9(dest), { recursive: true });
     cpSync2(src, dest);
   }
 }
 function resolveMmaEntry(mmaRoot) {
-  const dev = join31(mmaRoot, "src", "cli", "main.ts");
+  const dev = join32(mmaRoot, "src", "cli", "main.ts");
   if (existsSync39(dev))
     return dev;
-  return join31(mmaRoot, "dist", "main.js");
+  return join32(mmaRoot, "dist", "main.js");
 }
 function findMmaRoot(fromDir) {
   const candidates = [
@@ -24576,7 +24745,7 @@ function findMmaRoot(fromDir) {
     resolve19(fromDir, "..")
   ];
   for (const c of candidates) {
-    if (existsSync39(join31(c, "package.json")))
+    if (existsSync39(join32(c, "package.json")))
       return c;
   }
   return process.cwd();
@@ -24644,12 +24813,12 @@ __export(exports_cli, {
 });
 import { rmSync as rmSync4 } from "fs";
 import { homedir as homedir14 } from "os";
-import { join as join32, dirname as dirname10 } from "path";
+import { join as join33, dirname as dirname10 } from "path";
 import { fileURLToPath } from "url";
 import { existsSync as existsSync40, readFileSync as readFileSync26 } from "fs";
 function readVersion() {
   const candidates = [
-    join32(MMA_ROOT, "package.json")
+    join33(MMA_ROOT, "package.json")
   ];
   for (const p of candidates) {
     if (existsSync40(p)) {
@@ -24666,36 +24835,36 @@ function parseTags(s) {
 async function certify(opts) {
   const providerUrl = opts.providerUrl || opts.config.provider.baseUrl;
   if (opts.tags.includes("security") && !opts.config.security?.enabled) {
-    console.error(pc.red(t("cli.cert_security_required")));
+    console.error(pc2.red(t("cli.cert_security_required")));
     process.exitCode = 1;
     return;
   }
   const { scenarios, errors: errors2 } = loadScenarios(USER_SCENARIO_DIR);
   for (const e of errors2)
-    console.error(pc.yellow(`  ${e}`));
+    console.error(pc2.yellow(`  ${e}`));
   const selected = filterByTags(scenarios, opts.tags);
   if (selected.length === 0) {
-    console.error(pc.red(t("cli.cert_no_scenarios", { tags: opts.tags.join(",") })));
+    console.error(pc2.red(t("cli.cert_no_scenarios", { tags: opts.tags.join(",") })));
     process.exitCode = 1;
     return;
   }
   const manifest = readManifest();
   const existing = manifest.certifications.find((e) => e.model === opts.name && e.providerUrl === providerUrl);
   if (existing && !opts.force) {
-    console.error(pc.yellow(t("cli.cert_exists", { model: opts.name })));
-    console.error(pc.yellow(t("cli.cert_exists_hint")));
+    console.error(pc2.yellow(t("cli.cert_exists", { model: opts.name })));
+    console.error(pc2.yellow(t("cli.cert_exists_hint")));
     process.exitCode = 1;
     return;
   }
   console.log(t("cli.cert_started", { model: opts.name, provider: providerUrl }));
-  const sandboxBase = join32(process.cwd(), ".mma", "certification");
+  const sandboxBase = join33(process.cwd(), ".mma", "certification");
   const results = [];
   const total = selected.length;
   let idx = 0;
   for (const scenario of selected) {
     idx++;
     if (scenario.mode === "skip") {
-      console.log(pc.dim(`[${idx}/${total}] ${scenario.id} ... skipped`));
+      console.log(pc2.dim(`[${idx}/${total}] ${scenario.id} ... skipped`));
       results.push({ id: scenario.id, title: scenario.title, status: "skipped", passed: 0, of: 0 });
       continue;
     }
@@ -24709,10 +24878,10 @@ async function certify(opts) {
       defaultReps: opts.reps,
       defaultThreshold: 2,
       onRep: (id, rep, reps, passed, failures) => {
-        const word = passed ? pc.green(t("cli.cert_rep_pass")) : pc.red(t("cli.cert_rep_fail"));
+        const word = passed ? pc2.green(t("cli.cert_rep_pass")) : pc2.red(t("cli.cert_rep_fail"));
         console.log(`[${idx}/${total}] ${id} (${rep}/${reps})... ${word}`);
         if (!passed)
-          console.log(`    ${pc.dim(failures.join("; "))}`);
+          console.log(`    ${pc2.dim(failures.join("; "))}`);
       }
     });
     results.push(res);
@@ -24760,7 +24929,7 @@ async function certList() {
     return;
   }
   for (const e of m.certifications) {
-    console.log(`  ${pc.green("✔")} ${e.model}  ${pc.dim(e.providerUrl)}  ${e.mmaVersion}  ${e.certifiedAt.slice(0, 10)}  ${e.suite.passed}/${e.suite.total} pass`);
+    console.log(`  ${pc2.green("✔")} ${e.model}  ${pc2.dim(e.providerUrl)}  ${e.mmaVersion}  ${e.certifiedAt.slice(0, 10)}  ${e.suite.passed}/${e.suite.total} pass`);
   }
 }
 async function uncertify(name, config) {
@@ -24780,11 +24949,11 @@ function summarize(results) {
 }
 function printResults(results) {
   for (const r of results) {
-    const icon = r.status === "pass" ? pc.green("✔") : r.status === "fail" ? pc.red("✘") : r.status === "skipped" ? pc.dim("–") : pc.yellow("!");
-    const detail = r.status === "skipped" ? pc.dim(r.title) : `${r.passed}/${r.of}`;
+    const icon = r.status === "pass" ? pc2.green("✔") : r.status === "fail" ? pc2.red("✘") : r.status === "skipped" ? pc2.dim("–") : pc2.yellow("!");
+    const detail = r.status === "skipped" ? pc2.dim(r.title) : `${r.passed}/${r.of}`;
     console.log(`  ${icon} ${r.id}  ${detail}`);
     if (r.error)
-      console.log(`    ${pc.dim(r.error)}`);
+      console.log(`    ${pc2.dim(r.error)}`);
   }
 }
 var HERE, MMA_ROOT, USER_SCENARIO_DIR;
@@ -24796,7 +24965,7 @@ var init_cli = __esm(() => {
   init_manifest();
   HERE = dirname10(fileURLToPath(import.meta.url));
   MMA_ROOT = findMmaRoot(HERE);
-  USER_SCENARIO_DIR = join32(homedir14(), ".mma", "certification", "scenarios");
+  USER_SCENARIO_DIR = join33(homedir14(), ".mma", "certification", "scenarios");
 });
 
 // src/cli/repl-commands.ts
@@ -24805,15 +24974,15 @@ __export(exports_repl_commands, {
   registerAllCommands: () => registerAllCommands,
   COMMAND_GROUPS: () => COMMAND_GROUPS
 });
-import { join as join34, dirname as dirname12 } from "path";
+import { join as join35, dirname as dirname12 } from "path";
 import { homedir as homedir16 } from "os";
 import { existsSync as existsSync42, readFileSync as readFileSync28 } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function readVersion3() {
   const here = dirname12(fileURLToPath3(import.meta.url));
   const candidates = [
-    join34(here, "..", "..", "package.json"),
-    join34(here, "..", "package.json")
+    join35(here, "..", "..", "package.json"),
+    join35(here, "..", "package.json")
   ];
   for (const p of candidates) {
     if (existsSync42(p)) {
@@ -24887,7 +25056,7 @@ function registerMmaCommands(ctx) {
         if (source.toLowerCase() === "clipboard") {
           const clipBuf = await readClipboardImage2();
           if (!clipBuf) {
-            console.log(pc.yellow(t("image.clipboard_empty")));
+            console.log(pc2.yellow(t("image.clipboard_empty")));
             return;
           }
           const { bufferToDataUrl: bufferToDataUrl2 } = await Promise.resolve().then(() => (init_image_utils(), exports_image_utils));
@@ -24901,7 +25070,7 @@ function registerMmaCommands(ctx) {
         } else {
           const absPath = resolve20(process.cwd(), source);
           if (!existsSync43(absPath)) {
-            console.log(pc.red(t("image.not_found", { path: source })));
+            console.log(pc2.red(t("image.not_found", { path: source })));
             return;
           }
           const result = await loadFileAsDataUrl2(absPath);
@@ -24910,7 +25079,7 @@ function registerMmaCommands(ctx) {
         }
         const contextManager = ctx.agent.contextManager;
         if (!contextManager) {
-          console.log(pc.red(t("image.no_context")));
+          console.log(pc2.red(t("image.no_context")));
           return;
         }
         contextManager.addPendingImage({
@@ -24918,9 +25087,9 @@ function registerMmaCommands(ctx) {
           image_url: { url: dataUrl }
         });
         const sizeKb = Math.round(dataUrl.length * 3 / 4 / 1024);
-        console.log(pc.green(t("image.attached", { source: label, size: `${sizeKb} KB` })));
+        console.log(pc2.green(t("image.attached", { source: label, size: `${sizeKb} KB` })));
       } catch (err) {
-        console.log(pc.red(t("image.error", { message: err.message })));
+        console.log(pc2.red(t("image.error", { message: err.message })));
       }
     }
   });
@@ -24938,7 +25107,7 @@ function registerMmaCommands(ctx) {
       console.log(`${t("repl.context")}     ${ctxW}  (sys:${sys}  res:${res}  hist:${ctxW - sys - res})`);
       console.log(`${t("repl.max_iters")}   ${cfg.maxToolIterations}`);
       console.log(`${t("repl.stuck_thresh")} ${cfg.stuckThreshold}`);
-      console.log(`${t("repl.reasoning_label")}   ${cfg.showReasoning ? pc.green(t("repl.show")) : pc.dim(t("repl.hide"))}`);
+      console.log(`${t("repl.reasoning_label")}   ${cfg.showReasoning ? pc2.green(t("repl.show")) : pc2.dim(t("repl.hide"))}`);
       console.log(`${t("repl.log_level")}   ${cfg.logLevel}`);
       console.log(`${t("repl.locale")}      ${cfg.locale}`);
       const meta = ctx.sessionManager?.getActiveMeta();
@@ -24953,7 +25122,7 @@ function registerMmaCommands(ctx) {
     usage: t("repl.reasoning_usage"),
     action: () => {
       ctx.config.showReasoning = !ctx.config.showReasoning;
-      const status = ctx.config.showReasoning ? pc.green(t("repl.show")) : pc.dim(t("repl.hide"));
+      const status = ctx.config.showReasoning ? pc2.green(t("repl.show")) : pc2.dim(t("repl.hide"));
       console.log(t("repl.reasoning_status", { status }));
     }
   });
@@ -24976,10 +25145,10 @@ function registerMmaCommands(ctx) {
     aliases: ["setup"],
     usage: t("repl.wizard_usage"),
     action: async () => {
-      console.log(pc.yellow(t("repl.wizard_running")));
+      console.log(pc2.yellow(t("repl.wizard_running")));
       await ctx.withExclusiveInput(async () => {
         const answers = await runSetup(ctx.rl);
-        const configPath = join34(homedir16(), ".mma", "config.json");
+        const configPath = join35(homedir16(), ".mma", "config.json");
         ctx.config.provider.type = answers.provider;
         ctx.config.provider.baseUrl = answers.apiBase;
         ctx.config.provider.apiKey = answers.apiKey;
@@ -24989,7 +25158,7 @@ function registerMmaCommands(ctx) {
         ctx.config.locale = answers.locale;
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
-        console.log(pc.green(t("cli.config_saved")));
+        console.log(pc2.green(t("cli.config_saved")));
       });
     }
   });
@@ -24999,18 +25168,18 @@ function registerMmaCommands(ctx) {
     usage: t("repl.sysprompt_desc"),
     action: () => {
       const info = ctx.agent.getSystemPromptInfo();
-      console.log(pc.bold(`System prompt (${info.tokenCount} tokens):`));
-      console.log(pc.dim("─".repeat(60)));
+      console.log(pc2.bold(`System prompt (${info.tokenCount} tokens):`));
+      console.log(pc2.dim("─".repeat(60)));
       for (const line of info.text.split(`
 `)) {
         console.log(line);
       }
-      console.log(pc.dim("─".repeat(60)));
+      console.log(pc2.dim("─".repeat(60)));
       if (info.excluded.length > 0) {
-        console.log(pc.yellow(`
+        console.log(pc2.yellow(`
 Excluded blocks: ${info.excluded.length}`));
         for (const e of info.excluded) {
-          console.log(pc.dim(`  - ${e.slice(0, 80)}${e.length > 80 ? "..." : ""}`));
+          console.log(pc2.dim(`  - ${e.slice(0, 80)}${e.length > 80 ? "..." : ""}`));
         }
       }
     }
@@ -25033,10 +25202,10 @@ Excluded blocks: ${info.excluded.length}`));
           return;
         }
         ctx.config.provider.type = name;
-        const configPath = join34(homedir16(), ".mma", "config.json");
+        const configPath = join35(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
-        console.log(pc.green(t("repl.provider_set", { name })));
+        console.log(pc2.green(t("repl.provider_set", { name })));
         return;
       }
       console.log(t("repl.provider_usage"));
@@ -25067,9 +25236,9 @@ Excluded blocks: ${info.excluded.length}`));
             console.log(t("cli.available_models"));
             const { getCertMark: getCertMark2 } = await Promise.resolve().then(() => (init_manifest(), exports_manifest));
             for (const m of models) {
-              const marker = m === ctx.config.model ? pc.green("* ") : "  ";
+              const marker = m === ctx.config.model ? pc2.green("* ") : "  ";
               const mark = getCertMark2(m, ctx.config.provider.baseUrl, version2);
-              const cert = mark === "certified" ? pc.green("✔") : mark === "stale" ? pc.yellow("○") : pc.dim("·");
+              const cert = mark === "certified" ? pc2.green("✔") : mark === "stale" ? pc2.yellow("○") : pc2.dim("·");
               console.log(` ${marker}${cert} ${m}`);
             }
           } else {
@@ -25089,10 +25258,10 @@ Excluded blocks: ${info.excluded.length}`));
           return;
         }
         ctx.config.model = name;
-        const configPath = join34(homedir16(), ".mma", "config.json");
+        const configPath = join35(homedir16(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
-        console.log(pc.green(t("repl.model_set", { name })));
+        console.log(pc2.green(t("repl.model_set", { name })));
         return;
       }
       console.log(t("repl.model_usage"));
@@ -25114,10 +25283,10 @@ Excluded blocks: ${info.excluded.length}`));
         return;
       }
       ctx.config.contextWindow = size;
-      const configPath = join34(homedir16(), ".mma", "config.json");
+      const configPath = join35(homedir16(), ".mma", "config.json");
       saveConfig(ctx.config, configPath);
       await ctx.agent.reconfigure(ctx.config);
-      console.log(pc.green(t("cli.context_set", { size })));
+      console.log(pc2.green(t("cli.context_set", { size })));
     }
   });
   ctx.registerCommand({
@@ -25125,7 +25294,7 @@ Excluded blocks: ${info.excluded.length}`));
     description: t("repl.reload"),
     usage: t("repl.reload_usage"),
     action: async () => {
-      console.log(pc.yellow(t("repl.reloading")));
+      console.log(pc2.yellow(t("repl.reloading")));
       if (ctx.sessionManager && ctx.config.session.autoSave) {
         const active = ctx.sessionManager.getActiveMeta();
         if (active) {}
@@ -25133,19 +25302,20 @@ 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: join35 } = await import("path");
-      const configDir = join35(homedir17(), ".mma");
-      const projectConfigPath = join35(process.cwd(), ".mmrc");
+      const { join: join36 } = await import("path");
+      const configDir = ctx.configDir;
+      const baseDir = ctx.baseDir;
+      const projectConfigPath = join36(baseDir, ".mmrc");
       const freshConfig = loadConfig2({ configDir, projectConfigPath });
       Object.assign(ctx.config, freshConfig);
       const { bootstrap: bootstrap2 } = await Promise.resolve().then(() => (init_bootstrap(), exports_bootstrap));
-      const result = await bootstrap2(configDir, process.cwd(), false, false);
+      const result = await bootstrap2(configDir, baseDir, false, false);
       ctx.agent = result.agent;
       ctx.sessionManager = result.sessionManager;
       ctx.skillsModule = result.skillsModule;
       ctx.pluginManager = result.pluginManager;
       ctx.setupCompleter();
-      console.log(pc.green(t("repl.reloaded")));
+      console.log(pc2.green(t("repl.reloaded")));
       console.log(`${t("repl.model")}       ${ctx.config.model}`);
       console.log(`${t("repl.context")}     ${ctx.config.contextWindow}`);
       console.log(`${t("repl.provider")}    ${ctx.config.provider.type} @ ${ctx.config.provider.baseUrl}`);
@@ -25168,7 +25338,7 @@ function registerSessionCommands(ctx) {
         return;
       }
       const rows = sessions.map((s) => [
-        s.id === active ? pc.green("●") : "",
+        s.id === active ? pc2.green("●") : "",
         s.id.slice(0, 12),
         s.name,
         s.updatedAt.slice(0, 19).replace("T", " "),
@@ -25183,7 +25353,7 @@ function registerSessionCommands(ctx) {
       ], rows)) {
         console.log(line);
       }
-      console.log(pc.dim(`
+      console.log(pc2.dim(`
   ${t("repl.resume_hint")}`));
     }
   });
@@ -25197,8 +25367,8 @@ function registerSessionCommands(ctx) {
       const meta = ctx.sessionManager.create(name);
       ctx.agent.clearContext();
       console.clear();
-      console.log(`${t("session.created", { name: meta.name })} (${pc.dim(meta.id.slice(0, 12))})`);
-      console.log(pc.dim(`  ${t("session.chat_cleared")}
+      console.log(`${t("session.created", { name: meta.name })} (${pc2.dim(meta.id.slice(0, 12))})`);
+      console.log(pc2.dim(`  ${t("session.chat_cleared")}
 `));
     }
   });
@@ -25211,13 +25381,13 @@ function registerSessionCommands(ctx) {
       const query = args.join(" ");
       const sessions = ctx.sessionManager.list();
       if (!query) {
-        console.log(pc.dim(t("session.available")));
+        console.log(pc2.dim(t("session.available")));
         const active = ctx.sessionManager.getActive();
         for (const s of sessions) {
-          const marker = s.id === active ? pc.green(" *") : "  ";
-          console.log(pc.dim(` ${marker} ${s.id.slice(0, 12)}  ${s.name}`));
+          const marker = s.id === active ? pc2.green(" *") : "  ";
+          console.log(pc2.dim(` ${marker} ${s.id.slice(0, 12)}  ${s.name}`));
         }
-        console.log(pc.dim(`
+        console.log(pc2.dim(`
   ${t("repl.resume_usage")}`));
         return;
       }
@@ -25230,27 +25400,27 @@ function registerSessionCommands(ctx) {
       const history = ctx.sessionManager.loadHistory();
       ctx.agent.setContext(history);
       console.clear();
-      console.log(pc.bold(pc.green(t("session.resumed", { name: match.name }))) + " " + pc.dim(`(${match.id.slice(0, 12)})`) + "  —  " + match.messageCount + " msgs");
-      console.log(pc.dim("─".repeat(50)));
+      console.log(pc2.bold(pc2.green(t("session.resumed", { name: match.name }))) + " " + pc2.dim(`(${match.id.slice(0, 12)})`) + "  —  " + match.messageCount + " msgs");
+      console.log(pc2.dim("─".repeat(50)));
       if (history.length === 0) {
-        console.log(pc.dim(t("session.no_history")));
+        console.log(pc2.dim(t("session.no_history")));
       } else {
-        console.log(pc.dim(t("session.chat_history")));
+        console.log(pc2.dim(t("session.chat_history")));
         console.log();
         for (const msg of history) {
           if (msg.role === "user") {
-            console.log(pc.cyan(t("session.user_label") + ":"));
+            console.log(pc2.cyan(t("session.user_label") + ":"));
             console.log(getMessageText(msg.content));
             console.log();
           } else if (msg.role === "assistant") {
-            console.log(pc.green(t("session.assistant_label") + ":"));
+            console.log(pc2.green(t("session.assistant_label") + ":"));
             console.log(getMessageText(msg.content));
             console.log();
           }
         }
       }
-      console.log(pc.dim("─".repeat(50)));
-      console.log(pc.dim(`  ${t("session.chat_loaded")}`));
+      console.log(pc2.dim("─".repeat(50)));
+      console.log(pc2.dim(`  ${t("session.chat_loaded")}`));
     }
   });
   ctx.registerCommand({
@@ -25310,12 +25480,12 @@ function registerSkillCommands(ctx) {
           console.log(t("repl.no_skills"));
           return;
         }
-        console.log(pc.bold(t("repl.available_skills")));
+        console.log(pc2.bold(t("repl.available_skills")));
         for (const skill of available) {
           const tokens = Math.ceil(skill.content.length / 4);
           const loaded = ctx.skillsModule.getLoaded().some((s) => s.name === skill.name);
-          const marker = loaded ? pc.green(" [loaded]") : "";
-          console.log(`  ${pc.cyan(skill.name)}${marker}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
+          const marker = loaded ? pc2.green(" [loaded]") : "";
+          console.log(`  ${pc2.cyan(skill.name)}${marker}  ${pc2.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
         }
         return;
       }
@@ -25326,12 +25496,12 @@ function registerSkillCommands(ctx) {
           console.log(t("repl.no_loaded"));
           return;
         }
-        console.log(pc.bold(t("repl.loaded_skills")));
+        console.log(pc2.bold(t("repl.loaded_skills")));
         for (const skill of loaded) {
           const tokens = Math.ceil(skill.content.length / 4);
-          console.log(`  ${pc.cyan(skill.name)}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
+          console.log(`  ${pc2.cyan(skill.name)}  ${pc2.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
         }
-        console.log(pc.dim(`
+        console.log(pc2.dim(`
   ${t("repl.budget", { used: budget.used, total: budget.total, remaining: budget.remaining })}`));
         return;
       }
@@ -25342,9 +25512,9 @@ function registerSkillCommands(ctx) {
         }
         const result = ctx.skillsModule.loadByName(arg);
         if (result.success) {
-          console.log(pc.green(result.message));
+          console.log(pc2.green(result.message));
         } else {
-          console.log(pc.red(result.message));
+          console.log(pc2.red(result.message));
         }
         return;
       }
@@ -25354,9 +25524,9 @@ function registerSkillCommands(ctx) {
           return;
         }
         if (ctx.skillsModule.unload(arg)) {
-          console.log(pc.green(t("repl.skill_unloaded", { name: arg })));
+          console.log(pc2.green(t("repl.skill_unloaded", { name: arg })));
         } else {
-          console.log(pc.red(t("repl.skill_not_loaded", { name: arg })));
+          console.log(pc2.red(t("repl.skill_not_loaded", { name: arg })));
         }
         return;
       }
@@ -25370,14 +25540,14 @@ function registerSkillCommands(ctx) {
           console.log(t("repl.no_skill_match", { query: arg }));
           return;
         }
-        console.log(pc.bold(t("repl.skills_matching", { query: arg })));
+        console.log(pc2.bold(t("repl.skills_matching", { query: arg })));
         for (const skill of results) {
           const tokens = Math.ceil(skill.content.length / 4);
-          console.log(`  ${pc.cyan(skill.name)}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
+          console.log(`  ${pc2.cyan(skill.name)}  ${pc2.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
         }
         return;
       }
-      console.log(pc.red(t("repl.skill_unknown_sub", { subcmd })));
+      console.log(pc2.red(t("repl.skill_unknown_sub", { subcmd })));
       console.log(t("repl.skill_usage"));
     }
   });
@@ -25435,14 +25605,14 @@ init_bootstrap();
 init_config2();
 init_setup();
 init_i18n();
-import { join as join33, dirname as dirname11 } from "path";
+import { join as join34, dirname as dirname11 } from "path";
 import { homedir as homedir15 } from "os";
 import { existsSync as existsSync41, readFileSync as readFileSync27 } from "fs";
 
 // src/cli/security-commands.ts
 init_bootstrap();
 init_config2();
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 import { homedir as homedir12 } from "os";
 
 // src/modules/security/security-policies.ts
@@ -25972,7 +26142,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 = join27(homedir12(), ".mma", "config.json");
+    const configPath = join28(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const validPresets = ["strict", "balanced", "permissive"];
     if (!validPresets.includes(preset)) {
@@ -25987,7 +26157,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 = join27(homedir12(), ".mma", "config.json");
+    const configPath = join28(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -25999,7 +26169,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 = join27(homedir12(), ".mma", "config.json");
+    const configPath = join28(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -26011,7 +26181,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 = join27(homedir12(), ".mma", "config.json");
+    const configPath = join28(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -26025,7 +26195,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 = join27(homedir12(), ".mma", "config.json");
+    const configPath = join28(homedir12(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -26061,8 +26231,8 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 function readVersion2() {
   const here = dirname11(fileURLToPath2(import.meta.url));
   const candidates = [
-    join33(here, "..", "..", "package.json"),
-    join33(here, "..", "package.json")
+    join34(here, "..", "..", "package.json"),
+    join34(here, "..", "package.json")
   ];
   for (const p of candidates) {
     if (existsSync41(p)) {
@@ -26078,7 +26248,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 = join33(homedir15(), ".mma", "config.json");
+    const configPath = join34(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = answers.provider;
     config.provider.baseUrl = answers.apiBase;
@@ -26123,7 +26293,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 = join33(homedir15(), ".mma", "config.json");
+    const configPath = join34(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     const keys = key.split(".");
     let obj = config;
@@ -26186,7 +26356,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 = join33(homedir15(), ".mma", "config.json");
+    const configPath = join34(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.model = name;
     saveConfig(config, configPath);
@@ -26222,7 +26392,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 = join33(homedir15(), ".mma", "config.json");
+    const configPath = join34(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     const contextWindow = parseInt(size, 10);
     if (isNaN(contextWindow) || contextWindow < 1024) {
@@ -26240,7 +26410,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 = join33(homedir15(), ".mma", "config.json");
+    const configPath = join34(homedir15(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = name;
     saveConfig(config, configPath);
@@ -26292,8 +26462,8 @@ init_bootstrap();
 // src/cli/repl.ts
 init_colors();
 import * as readline2 from "readline";
-import { existsSync as existsSync43, readFileSync as readFileSync29, writeFileSync as writeFileSync16 } from "fs";
-import { join as join35, dirname as dirname13 } from "path";
+import { existsSync as existsSync43, readFileSync as readFileSync29, writeFileSync as writeFileSync15 } from "fs";
+import { join as join36, dirname as dirname13 } from "path";
 import { homedir as homedir17 } from "os";
 import { fileURLToPath as fileURLToPath4 } from "url";
 
@@ -26411,24 +26581,24 @@ var TAG = /<\/?([A-Z][a-zA-Z0-9]*|[a-z][a-zA-Z0-9-]*)/g;
 var ATTR = /\b([a-zA-Z-]+=)"([^"]*)"/g;
 function highlight(code, lang) {
   if (lang === "html" || lang === "xml" || lang === "svg") {
-    code = code.replace(COMMENT, (m) => pc.dim(pc.green(m)));
-    code = code.replace(ATTR, (_m, attr, val) => pc.yellow(attr) + "=" + pc.green('"' + val + '"'));
-    code = code.replace(TAG, (_m, tag) => "<" + pc.cyan(tag));
+    code = code.replace(COMMENT, (m) => pc2.dim(pc2.green(m)));
+    code = code.replace(ATTR, (_m, attr, val) => pc2.yellow(attr) + "=" + pc2.green('"' + val + '"'));
+    code = code.replace(TAG, (_m, tag) => "<" + pc2.cyan(tag));
   } else if (lang === "css" || lang === "scss" || lang === "less") {
-    code = code.replace(COMMENT, (m) => pc.dim(pc.green(m)));
-    code = code.replace(STRING, (m) => pc.green(m));
-    code = code.replace(NUMBER, (m) => pc.yellow(m));
+    code = code.replace(COMMENT, (m) => pc2.dim(pc2.green(m)));
+    code = code.replace(STRING, (m) => pc2.green(m));
+    code = code.replace(NUMBER, (m) => pc2.yellow(m));
   } else if (lang === "bash" || lang === "sh" || lang === "shell" || lang === "zsh") {
-    code = code.replace(COMMENT, (m) => pc.dim(pc.green(m)));
-    code = code.replace(STRING, (m) => pc.green(m));
+    code = code.replace(COMMENT, (m) => pc2.dim(pc2.green(m)));
+    code = code.replace(STRING, (m) => pc2.green(m));
   } else if (lang === "json") {
-    code = code.replace(STRING, (m) => pc.green(m));
-    code = code.replace(NUMBER, (m) => pc.yellow(m));
+    code = code.replace(STRING, (m) => pc2.green(m));
+    code = code.replace(NUMBER, (m) => pc2.yellow(m));
   } else {
-    code = code.replace(COMMENT, (m) => pc.dim(pc.green(m)));
-    code = code.replace(STRING, (m) => pc.green(m));
-    code = code.replace(KW, (m) => pc.magenta(m));
-    code = code.replace(NUMBER, (m) => pc.yellow(m));
+    code = code.replace(COMMENT, (m) => pc2.dim(pc2.green(m)));
+    code = code.replace(STRING, (m) => pc2.green(m));
+    code = code.replace(KW, (m) => pc2.magenta(m));
+    code = code.replace(NUMBER, (m) => pc2.yellow(m));
   }
   return code;
 }
@@ -26529,13 +26699,13 @@ class FormattingStream {
 `);
       const highlighted = highlight(code, this.codeLang);
       const lang = this.codeLang ? ` ${this.codeLang} ` : " ";
-      const top = pc.dim(`┌─${lang}${"─".repeat(Math.max(0, this.width - 3 - lang.length))}┐`);
+      const top = pc2.dim(`┌─${lang}${"─".repeat(Math.max(0, this.width - 3 - lang.length))}┐`);
       this.onWrite(top);
       for (const l of highlighted.split(`
 `)) {
-        this.onWrite(pc.dim("│ ") + l);
+        this.onWrite(pc2.dim("│ ") + l);
       }
-      this.onWrite(pc.dim(`└${"─".repeat(Math.max(0, this.width - 1))}┘`));
+      this.onWrite(pc2.dim(`└${"─".repeat(Math.max(0, this.width - 1))}┘`));
     }
     this.codeLines = [];
     this.codeLang = "";
@@ -26547,47 +26717,47 @@ class FormattingStream {
       const level = heading[1].length;
       const content = this.formatInline(heading[2]);
       if (level === 1)
-        return pc.cyan(pc.bold(pc.underline(content)));
-      return pc.cyan(pc.bold(content));
+        return pc2.cyan(pc2.bold(pc2.underline(content)));
+      return pc2.cyan(pc2.bold(content));
     }
     if (isHorizontalRule(result)) {
-      return pc.dim("─".repeat(Math.max(0, Math.min(this.width, 60))));
+      return pc2.dim("─".repeat(Math.max(0, Math.min(this.width, 60))));
     }
     const quote = result.match(/^(>+)\s?(.*)$/);
     if (quote) {
       const depth = Math.min(quote[1].length, 4);
-      const marker = pc.dim("▍".repeat(depth));
+      const marker = pc2.dim("▍".repeat(depth));
       return `${marker} ${this.formatInline(quote[2])}`;
     }
     const checkbox = result.match(/^[-*]\s+\[([ xX])\]\s+(.+)$/);
     if (checkbox) {
       const checked = checkbox[1].toLowerCase() === "x";
-      const mark = checked ? pc.green("✓") : pc.dim("☐");
+      const mark = checked ? pc2.green("✓") : pc2.dim("☐");
       return `  ${mark} ${this.formatInline(checkbox[2])}`;
     }
     const ordered = result.match(/^(\d+)[.)]\s+(.+)$/);
     if (ordered) {
-      return ` ${pc.yellow(ordered[1])}. ${this.formatInline(ordered[2])}`;
+      return ` ${pc2.yellow(ordered[1])}. ${this.formatInline(ordered[2])}`;
     }
     const bullet = result.match(/^[-*]\s+(.+)$/);
     if (bullet) {
-      return ` ${pc.dim("•")} ${this.formatInline(bullet[1])}`;
+      return ` ${pc2.dim("•")} ${this.formatInline(bullet[1])}`;
     }
     return this.formatInline(result);
   }
   formatInline(text) {
     const codeSpans = [];
     let result = text.replace(/`([^`]+)`/g, (_m, c) => {
-      codeSpans.push(pc.yellow(c));
+      codeSpans.push(pc2.yellow(c));
       return `\x00${codeSpans.length - 1}\x00`;
     });
-    result = result.replace(/\*\*(.+?)\*\*/g, (_, s) => pc.bold(s));
-    result = result.replace(/~~(.+?)~~/g, (_, s) => pc.strikethrough(s));
-    result = result.replace(/\*([^*]+)\*/g, (_, s) => pc.italic(s));
-    result = result.replace(/(^|\s)_([^_\n]+)_(?=\s|$)/g, (_m, pre, s) => pre + pc.italic(s));
+    result = result.replace(/\*\*(.+?)\*\*/g, (_, s) => pc2.bold(s));
+    result = result.replace(/~~(.+?)~~/g, (_, s) => pc2.strikethrough(s));
+    result = result.replace(/\*([^*]+)\*/g, (_, s) => pc2.italic(s));
+    result = result.replace(/(^|\s)_([^_\n]+)_(?=\s|$)/g, (_m, pre, s) => pre + pc2.italic(s));
     result = result.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_, label, url) => {
       const short = url.length > 80 ? url.slice(0, 77) + "…" : url;
-      return `${pc.cyan(label)} ${pc.dim(`(${short})`)}`;
+      return `${pc2.cyan(label)} ${pc2.dim(`(${short})`)}`;
     });
     result = result.replace(/\u0000(\d+)\u0000/g, (_m, i) => codeSpans[Number(i)]);
     return result;
@@ -26702,7 +26872,7 @@ class Renderer {
   }
   reasoning(chunk) {
     this.spinner.stop();
-    this.out.write(pc.dim(chunk));
+    this.out.write(pc2.dim(chunk));
   }
   thinkingStart() {
     this.spinner.start(t("ui.thinking"));
@@ -26716,7 +26886,7 @@ class Renderer {
     const summary = summarizeArgs2(args);
     if (!this.rich) {
       this.out.write(`
-${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
+${pc2.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc2.dim(summary)}` : ""}
 `);
       return;
     }
@@ -26724,18 +26894,18 @@ ${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
     if (this.toolStyle === "inline") {
       const marker = toolMarker(tool);
       this.out.write(`
-${pc.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
+${pc2.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc2.dim(summary)}` : ""}
 `);
       return;
     }
-    this.spinner.start(`${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}`);
+    this.spinner.start(`${pc2.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc2.dim(summary)}` : ""}`);
   }
   toolEnd(_tool, duration, error, ctxDelta) {
     this.spinner.stop();
     if (!this.rich) {
       if (ctxDelta !== undefined && ctxDelta !== 0) {
-        const deltaStr = ctxDelta > 0 ? pc.green(`+${ctxDelta}`) : pc.yellow(`${ctxDelta} ↓`);
-        this.out.write(`${pc.dim("ctx")} ${deltaStr}
+        const deltaStr = ctxDelta > 0 ? pc2.green(`+${ctxDelta}`) : pc2.yellow(`${ctxDelta} ↓`);
+        this.out.write(`${pc2.dim("ctx")} ${deltaStr}
 `);
       }
       return;
@@ -26743,11 +26913,11 @@ ${pc.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
     if (!this.card)
       return;
     const { tool, args, body } = this.card;
-    const marker = error ? pc.red("✗") : pc.green("✓");
-    let footer = `${marker} ${pc.dim(`${duration}ms`)}`;
+    const marker = error ? pc2.red("✗") : pc2.green("✓");
+    let footer = `${marker} ${pc2.dim(`${duration}ms`)}`;
     if (ctxDelta !== undefined && ctxDelta !== 0) {
-      const deltaStr = ctxDelta > 0 ? pc.green(`+${ctxDelta}`) : pc.yellow(`${ctxDelta} ↓`);
-      footer += `  ${pc.dim("ctx")} ${deltaStr}`;
+      const deltaStr = ctxDelta > 0 ? pc2.green(`+${ctxDelta}`) : pc2.yellow(`${ctxDelta} ↓`);
+      footer += `  ${pc2.dim("ctx")} ${deltaStr}`;
     }
     if (this.toolStyle === "inline") {
       this.out.write(`${GUTTER}${footer}
@@ -26760,7 +26930,7 @@ ${pc.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
     const lines = [];
     const summary = summarizeArgs2(args);
     if (summary)
-      lines.push(pc.dim(summary));
+      lines.push(pc2.dim(summary));
     for (const chunk of body) {
       for (const line of chunk.split(`
 `)) {
@@ -26784,7 +26954,7 @@ ${pc.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
   error(text) {
     this.endCard();
     this.spinner.stop();
-    this.err.write(`${pc.red(text)}
+    this.err.write(`${pc2.red(text)}
 `);
   }
   flush() {
@@ -26807,8 +26977,8 @@ init_repl_commands();
 function readVersion4() {
   const here = dirname13(fileURLToPath4(import.meta.url));
   const candidates = [
-    join35(here, "..", "..", "package.json"),
-    join35(here, "..", "package.json")
+    join36(here, "..", "..", "package.json"),
+    join36(here, "..", "package.json")
   ];
   for (const p of candidates) {
     if (existsSync43(p)) {
@@ -26824,14 +26994,14 @@ function formatContextBar(used, limit, compactions, quality) {
   const pct = Math.min(100, Math.round(used / limit * 100));
   const barLen = 20;
   const filled = Math.round(pct / 100 * barLen);
-  const bar = pc.green("█".repeat(filled)) + pc.dim("░".repeat(barLen - filled));
-  const pctStr = pct >= 75 ? pc.yellow(`${pct}%`) : pc.dim(`${pct}%`);
-  let line = `  ${bar}  ${pctStr}  ${pc.dim(`(${used} / ${limit} tokens)`)}`;
+  const bar = pc2.green("█".repeat(filled)) + pc2.dim("░".repeat(barLen - filled));
+  const pctStr = pct >= 75 ? pc2.yellow(`${pct}%`) : pc2.dim(`${pct}%`);
+  let line = `  ${bar}  ${pctStr}  ${pc2.dim(`(${used} / ${limit} tokens)`)}`;
   if (compactions !== undefined) {
-    line += pc.dim(`  compactions: ${compactions}`);
+    line += pc2.dim(`  compactions: ${compactions}`);
   }
   if (quality !== undefined) {
-    const qColor = quality >= 70 ? pc.green : quality >= 40 ? pc.yellow : pc.red;
+    const qColor = quality >= 70 ? pc2.green : quality >= 40 ? pc2.yellow : pc2.red;
     line += `  ${qColor(`quality: ${quality}%`)}`;
   }
   return line;
@@ -26863,15 +27033,15 @@ class Repl {
     this.sessionManager = sessionManager;
     this.skillsModule = skillsModule;
     this.pluginManager = pluginManager;
-    this.configDir = configDir || join35(homedir17(), ".mma");
+    this.configDir = configDir || join36(homedir17(), ".mma");
     this.baseDir = baseDir || process.cwd();
     this.noAgentsMd = noAgentsMd === true;
-    this.historyPath = join35(homedir17(), ".mma", "repl-history");
+    this.historyPath = join36(homedir17(), ".mma", "repl-history");
     this.loadHistory();
     this.rl = readline2.createInterface({
       input: process.stdin,
       output: process.stdout,
-      prompt: pc.cyan("> "),
+      prompt: pc2.cyan("> "),
       history: this.history,
       historySize: this.maxHistory,
       tabSize: 2,
@@ -26899,7 +27069,7 @@ class Repl {
   }
   saveHistory() {
     const allHistory = this.history.slice(-this.maxHistory);
-    writeFileSync16(this.historyPath, allHistory.join(`
+    writeFileSync15(this.historyPath, allHistory.join(`
 `), "utf-8");
   }
   setupCompleter() {
@@ -26954,11 +27124,11 @@ class Repl {
             }
           }
           if (this.running) {
-            this.rl.setPrompt(pc.cyan("> "));
+            this.rl.setPrompt(pc2.cyan("> "));
             this.rl.prompt();
           }
         } else {
-          this.rl.setPrompt(pc.cyan("... "));
+          this.rl.setPrompt(pc2.cyan("... "));
           this.rl.prompt();
         }
         return;
@@ -26966,7 +27136,7 @@ class Repl {
       if (this.isMultiLineInput(trimmed)) {
         inMultiLine = true;
         multiLineBuffer = trimmed;
-        this.rl.setPrompt(pc.cyan("... "));
+        this.rl.setPrompt(pc2.cyan("... "));
         this.rl.prompt();
         return;
       }
@@ -26997,7 +27167,7 @@ class Repl {
           if (escBytes >= 2 || withinWindow) {
             this.lastEscTime = 0;
             if (this.agentRunning) {
-              process.stdout.write(pc.yellow(`
+              process.stdout.write(pc2.yellow(`
 ${t("repl.interrupt")}
 `));
               this.agent.shutdown();
@@ -27013,11 +27183,11 @@ ${t("repl.interrupt")}
               const { dataUrl } = await bufferToDataUrl2(clipBuf);
               this.pendingClipboardImage = dataUrl;
               const sizeKb = Math.round(dataUrl.length * 3 / 4 / 1024);
-              console.log(pc.green(`
+              console.log(pc2.green(`
 ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
               this.rl.prompt();
             } else {
-              console.log(pc.yellow(`
+              console.log(pc2.yellow(`
 ${t("image.clipboard_empty")}`));
               this.rl.prompt();
             }
@@ -27025,13 +27195,16 @@ ${t("image.clipboard_empty")}`));
         }
       });
     }
+    let forceExitTimer = null;
     process.on("SIGINT", () => {
       if (this.agentRunning) {
-        console.log(pc.yellow(`
+        console.log(pc2.yellow(`
 [Ctrl+C] Остановка агента... (ещё раз — принудительно)`));
         this.agent.shutdown();
         this.agentRunning = false;
-        setTimeout(() => process.exit(1), 2000).unref();
+        if (forceExitTimer)
+          clearTimeout(forceExitTimer);
+        forceExitTimer = setTimeout(() => process.exit(1), 2000).unref();
       } else {
         process.exit(0);
       }
@@ -27062,7 +27235,7 @@ ${t("image.clipboard_empty")}`));
         this.pendingClipboardImage = null;
       }
       process.stdout.write(`
-` + pc.green(t("repl.agent")));
+` + pc2.green(t("repl.agent")));
       const renderer = new Renderer({
         spinner: this.config.ui?.spinner ?? true,
         toolStyle: this.config.ui?.toolStyle ?? "inline"
@@ -27084,7 +27257,7 @@ ${t("image.clipboard_empty")}`));
       process.stdout.write(`
 `);
       if (!result.success) {
-        console.error(pc.red(`${t("error.prefix")}${result.error}`));
+        console.error(pc2.red(`${t("error.prefix")}${result.error}`));
       }
       this.showContextBar(result);
     } finally {
@@ -27114,13 +27287,13 @@ ${t("image.clipboard_empty")}`));
     const args = parts.slice(1);
     const cmd = this.commands.get(name);
     if (!cmd) {
-      console.log(pc.red(t("cli.unknown_cmd", { name })), t("cli.help_hint"));
+      console.log(pc2.red(t("cli.unknown_cmd", { name })), t("cli.help_hint"));
       return;
     }
     try {
       await cmd.action(args);
     } catch (err) {
-      console.error(pc.red(t("error.command_error", {
+      console.error(pc2.red(t("error.command_error", {
         message: err instanceof Error ? err.message : String(err)
       })));
     }
@@ -27144,12 +27317,12 @@ ${t("image.clipboard_empty")}`));
       }
       if (cmds.length === 0)
         continue;
-      console.log(pc.bold(t(`repl.group.${groupKey}`)));
+      console.log(pc2.bold(t(`repl.group.${groupKey}`)));
       for (const cmd of cmds) {
-        const aliases = cmd.aliases?.length ? ` (${pc.dim(cmd.aliases.join(", "))})` : "";
-        console.log(`  ${pc.cyan("/" + cmd.name)}${aliases}  ${pc.dim(cmd.description)}`);
+        const aliases = cmd.aliases?.length ? ` (${pc2.dim(cmd.aliases.join(", "))})` : "";
+        console.log(`  ${pc2.cyan("/" + cmd.name)}${aliases}  ${pc2.dim(cmd.description)}`);
         if (cmd.usage) {
-          console.log(`    ${pc.dim(cmd.usage)}`);
+          console.log(`    ${pc2.dim(cmd.usage)}`);
         }
       }
       console.log();
@@ -27161,7 +27334,7 @@ ${t("image.clipboard_empty")}`));
       const ctxLine = formatContextBar(result.contextUsed, result.contextLimit, result.compactionCount, result.contextQuality);
       console.log(ctxLine);
       if (result.totalTokens !== undefined && result.totalTokens > 0) {
-        const apiLine = pc.dim(`  API: ${result.promptTokens} prompt + ${result.completionTokens} completion = ${result.totalTokens} total`);
+        const apiLine = pc2.dim(`  API: ${result.promptTokens} prompt + ${result.completionTokens} completion = ${result.totalTokens} total`);
         console.log(apiLine);
       }
     }
@@ -27170,57 +27343,57 @@ ${t("image.clipboard_empty")}`));
     this.running = true;
     const info = [];
     const row = (label, value) => {
-      info.push(` ${pc.yellow(label)} ${value}`);
+      info.push(` ${pc2.yellow(label)} ${value}`);
     };
     const ctx = this.config.contextWindow;
     const sysBudget = Math.floor(ctx * this.config.contextBudget.systemPrompt);
     const resBudget = Math.floor(ctx * this.config.contextBudget.responseReserve);
     const histBudget = ctx - sysBudget - resBudget;
-    row(t("repl.model"), pc.white(this.config.model));
-    row(t("repl.provider"), `${this.config.provider.type}  →  ${pc.dim(this.config.provider.baseUrl)}`);
-    row(t("repl.context"), `${pc.white(String(ctx))}  ${pc.dim(`(sys:${sysBudget}  res:${resBudget}  hist:${histBudget})`)}`);
+    row(t("repl.model"), pc2.white(this.config.model));
+    row(t("repl.provider"), `${this.config.provider.type}  →  ${pc2.dim(this.config.provider.baseUrl)}`);
+    row(t("repl.context"), `${pc2.white(String(ctx))}  ${pc2.dim(`(sys:${sysBudget}  res:${resBudget}  hist:${histBudget})`)}`);
     const si = this.agent.getSystemPromptInfo();
-    row(t("repl.sysprompt_label"), pc.dim(t("repl.sysprompt_size", { used: si.tokenCount, budget: sysBudget })));
+    row(t("repl.sysprompt_label"), pc2.dim(t("repl.sysprompt_size", { used: si.tokenCount, budget: sysBudget })));
     if (this.skillsModule) {
       const budget = this.skillsModule.getBudget();
-      row(t("repl.skills_label"), `${pc.white(String(this.skillsModule.getAvailable().length))} available, ${pc.dim(`budget: ${budget.total} tokens`)}`);
+      row(t("repl.skills_label"), `${pc2.white(String(this.skillsModule.getAvailable().length))} available, ${pc2.dim(`budget: ${budget.total} tokens`)}`);
     }
     if (this.pluginManager) {
       const plugins = this.pluginManager.getAllPlugins().filter((p) => !p.isBuiltin);
       if (plugins.length > 0) {
         const pluginNames = plugins.map((p) => p.name).join(", ");
-        row(t("repl.plugins_label"), `${pc.white(String(plugins.length))} active  ${pc.dim(`(${pluginNames})`)}`);
+        row(t("repl.plugins_label"), `${pc2.white(String(plugins.length))} active  ${pc2.dim(`(${pluginNames})`)}`);
       }
     }
     const mcpServers = this.config.mcpServers || {};
     const enabledServers = Object.entries(mcpServers).filter(([, s]) => s.enabled !== false);
     if (enabledServers.length > 0) {
       const names = enabledServers.map(([name]) => name).join(", ");
-      row(t("repl.mcp_label"), `${pc.white(String(enabledServers.length))}  ${pc.dim(`(${names})`)}`);
+      row(t("repl.mcp_label"), `${pc2.white(String(enabledServers.length))}  ${pc2.dim(`(${names})`)}`);
     }
     const cwd = process.cwd();
-    row(t("repl.work_dir"), pc.dim(cwd));
+    row(t("repl.work_dir"), pc2.dim(cwd));
     if (this.noAgentsMd) {
-      row(t("repl.agents_label"), pc.red(t("repl.disabled")));
+      row(t("repl.agents_label"), pc2.red(t("repl.disabled")));
     } else {
       const agentsMdCandidates = [
-        join35(this.baseDir, "AGENTS.md"),
-        join35(this.baseDir, ".mma", "AGENTS.md"),
-        join35(this.configDir, "AGENTS.md")
+        join36(this.baseDir, "AGENTS.md"),
+        join36(this.baseDir, ".mma", "AGENTS.md"),
+        join36(this.configDir, "AGENTS.md")
       ];
       const foundAgents = agentsMdCandidates.filter((p) => existsSync43(p));
       if (foundAgents.length > 0) {
         for (const p of foundAgents) {
-          row(t("repl.agents_label"), pc.dim(p));
+          row(t("repl.agents_label"), pc2.dim(p));
         }
       } else {
-        row(t("repl.agents_label"), pc.dim(t("repl.not_found")));
+        row(t("repl.agents_label"), pc2.dim(t("repl.not_found")));
       }
     }
     const meta = this.sessionManager?.getActiveMeta();
     if (meta) {
-      const sessionPath = join35(this.configDir, "sessions", meta.id);
-      row(t("repl.session_label"), `${pc.cyan(meta.name)} ${pc.dim(`(${meta.id.slice(0, 12)})`)}  —  ${meta.messageCount} msgs  ${pc.dim(sessionPath)}`);
+      const sessionPath = join36(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));
     for (const line of box(info, {
@@ -27246,7 +27419,7 @@ init_config2();
 init_i18n();
 init_colors();
 import { existsSync as existsSync44 } from "fs";
-import { join as join36 } from "path";
+import { join as join37 } from "path";
 import { homedir as homedir18 } from "os";
 async function main() {
   const program2 = createProgram();
@@ -27302,7 +27475,7 @@ async function main() {
     renderer.flush();
     if (result.success) {
       if (!result.text) {
-        console.log(pc.yellow(t("cli.no_output")));
+        console.log(pc2.yellow(t("cli.no_output")));
       }
     } else {
       console.error(`${t("error.prefix")}${result.error}`);
@@ -27313,13 +27486,16 @@ async function main() {
     }
     agent.shutdown();
   } else {
-    const configPath = join36(homedir18(), ".mma", "config.json");
+    const configPath = join37(homedir18(), ".mma", "config.json");
     if (!existsSync44(configPath)) {
-      console.log(pc.yellow(`
+      console.log(pc2.yellow(`
   ` + t("cli.first_run") + `
 `));
       const answers = await runSetup();
-      const { config: config2 } = await bootstrap(undefined, projectDir, noAgentsMd, exitOnComplete);
+      const config2 = loadConfig({
+        configDir: join37(homedir18(), ".mma"),
+        projectConfigPath: projectDir ? join37(projectDir, ".mmrc") : join37(process.cwd(), ".mmrc")
+      });
       config2.provider.type = answers.provider;
       config2.provider.baseUrl = answers.apiBase;
       config2.provider.apiKey = answers.apiKey;