micro-models-agent 0.27.0 → 0.28.1

package/dist/main.js

@@ -2229,7 +2229,9 @@ var init_defaults = __esm(() => {
       navigationTimeout: 15000
     },
     ui: {
-      spinner: true
+      spinner: true,
+      toolStyle: "inline",
+      toolComments: true
     },
     mcpServers: {
       context7: {
@@ -2416,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",
@@ -2960,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": "Нет активного плана",
@@ -3349,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;
@@ -3362,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) {
@@ -3684,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 : [];
@@ -3758,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)
@@ -3823,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 }));
@@ -4514,12 +4538,12 @@ class OpenAICompatProvider {
     };
     this.rateLimiter = createRateLimiter(config.rateLimits);
   }
-  async* chat(messages, tools) {
+  async* chat(messages, tools, signal) {
     if (!this.rateLimiter.canMakeRequest()) {
       throw new Error(`Rate limit exceeded: ${this.rateLimiter.getConfig().maxRequestsPerMinute} requests per minute`);
     }
     this.rateLimiter.recordRequest();
-    const streamResult = this.doStream(messages, tools);
+    const streamResult = this.doStream(messages, tools, signal);
     let hasToolCall = false;
     let hasText = false;
     let reasoningAcc = "";
@@ -4534,13 +4558,13 @@ class OpenAICompatProvider {
       yield chunk;
     }
     if (!hasToolCall && !hasText) {
-      const fallback = await this.doNonStreaming(messages, tools);
+      const fallback = await this.doNonStreaming(messages, tools, signal);
       for (const chunk of fallback) {
         yield chunk;
       }
     }
   }
-  async* doStream(messages, tools) {
+  async* doStream(messages, tools, signal) {
     const body = {
       model: this.model,
       messages,
@@ -4567,11 +4591,23 @@ class OpenAICompatProvider {
     const controller = new AbortController;
     const totalTimeoutMs = 120000;
     const timeoutId = setTimeout(() => controller.abort(), totalTimeoutMs);
+    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,
       body: JSON.stringify(body),
-      signal: controller.signal
+      signal: abortSignal
     });
     if (!response.ok) {
       clearTimeout(timeoutId);
@@ -4670,7 +4706,7 @@ class OpenAICompatProvider {
       reader.releaseLock();
     }
   }
-  async doNonStreaming(messages, tools) {
+  async doNonStreaming(messages, tools, signal) {
     const body = {
       model: this.model,
       messages,
@@ -4698,7 +4734,8 @@ class OpenAICompatProvider {
       const response = await this.fetchWithRetry(`${this.config.baseUrl}/chat/completions`, {
         method: "POST",
         headers,
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        signal
       });
       if (!response.ok) {
         const errorText = await response.text();
@@ -4792,7 +4829,7 @@ class OpenAICompatProvider {
       if (attempt < maxRetries) {
         const delay = Math.min(baseDelay * Math.pow(2, attempt), maxDelay);
         const jitter = Math.random() * baseDelay * 0.1;
-        await this.sleep(delay + jitter);
+        await this.sleep(delay + jitter, init.signal ?? undefined);
       }
     }
     throw lastError ?? new Error(t("error.llm_retries"));
@@ -4800,8 +4837,23 @@ class OpenAICompatProvider {
   isRetryable(status) {
     return status === 429 || status >= 500;
   }
-  sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+  sleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+      if (signal?.aborted) {
+        reject(new DOMException("Aborted", "AbortError"));
+        return;
+      }
+      let timer;
+      const onAbort = () => {
+        clearTimeout(timer);
+        reject(new DOMException("Aborted", "AbortError"));
+      };
+      timer = setTimeout(() => {
+        signal?.removeEventListener("abort", onAbort);
+        resolve();
+      }, ms);
+      signal?.addEventListener("abort", onAbort, { once: true });
+    });
   }
 }
 var init_openai_compat = __esm(() => {
@@ -5959,9 +6011,9 @@ 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 pc.red(`${pc.bgRed(`${numStr} - ${line.content}`)}`);
+    return `${numStr} ${pc.red("-")} ${line.content}`;
   } else if (line.type === "add") {
-    return pc.green(`${pc.bgGreen(`${numStr} + ${line.content}`)}`);
+    return `${numStr} ${pc.green("+")} ${line.content}`;
   } else if (line.content === "...") {
     return pc.dim(`  ${" ".repeat(maxNumWidth)}...`);
   } else {
@@ -5975,14 +6027,13 @@ 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) {
@@ -6000,7 +6051,7 @@ function generateNewFileDiff(content) {
   const diffLines = [];
   for (let i = 0;i < lines.length; i++) {
     const numStr = String(i + 1).padStart(maxNumWidth);
-    diffLines.push(pc.green(`${pc.bgGreen(`${numStr} + ${lines[i]}`)}`));
+    diffLines.push(`${numStr} ${pc.green("+")} ${lines[i]}`);
   }
   if (diffLines.length > MAX_DIFF_LINES) {
     const truncated = diffLines.slice(0, MAX_DIFF_LINES);
@@ -6018,7 +6069,7 @@ function generateDeleteDiff(content) {
   const diffLines = [];
   for (let i = 0;i < lines.length; i++) {
     const numStr = String(i + 1).padStart(maxNumWidth);
-    diffLines.push(pc.red(`${pc.bgRed(`${numStr} - ${lines[i]}`)}`));
+    diffLines.push(`${numStr} ${pc.red("-")} ${lines[i]}`);
   }
   if (diffLines.length > MAX_DIFF_LINES) {
     const truncated = diffLines.slice(0, MAX_DIFF_LINES);
@@ -6030,10 +6081,7 @@ function generateDeleteDiff(content) {
 `);
 }
 function generateMoveDiff(fromPath, toPath) {
-  return [
-    pc.red(`  - ${fromPath}`),
-    pc.green(`  + ${toPath}`)
-  ].join(`
+  return [pc.red(`  - ${fromPath}`), pc.green(`  + ${toPath}`)].join(`
 `);
 }
 var CONTEXT_LINES = 3, MAX_DIFF_LINES = 100;
@@ -6220,7 +6268,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(`
@@ -6243,8 +6291,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"]
     },
@@ -6262,22 +6316,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 })
+          };
         }
       }
     }
@@ -6457,6 +6523,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.",
@@ -6473,8 +6540,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;
@@ -6791,7 +6858,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) {
@@ -8805,22 +8884,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;
@@ -9382,18 +9445,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
 `];
@@ -9547,6 +9621,18 @@ var init_store = __esm(() => {
 
 // src/core/agent.ts
 import { join as join10 } from "path";
+function isToolCallJson(text) {
+  const trimmed = text.trim();
+  if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+    try {
+      JSON.parse(trimmed);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
 
 class Agent {
   deps;
@@ -9734,7 +9820,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       const textChunks = [];
       this.emitPhase(iteration, "thinking", onPhase);
       try {
-        for await (const chunk of llmProvider.chat(history, allTools)) {
+        for await (const chunk of llmProvider.chat(history, allTools, this.abortController?.signal)) {
           if (this.shutdownRequested)
             break;
           if (chunk.type === "text" && chunk.content) {
@@ -9776,6 +9862,10 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           }
         }
       } catch (err) {
+        if (this.shutdownRequested || err?.name === "AbortError") {
+          logger.info("LLM call aborted (interrupt)");
+          break;
+        }
         logger.error(`LLM call failed: ${err.message}`);
         slog.logError(err.message);
         pluginManager.runOnError({ iteration, logger }, err);
@@ -9788,7 +9878,12 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       } finally {
         this.emitPhase(iteration, "done", onPhase);
       }
-      if (!sawToolCall && textChunks.length > 0) {
+      if (this.shutdownRequested) {
+        break;
+      }
+      const toolComments = this.deps.config.ui?.toolComments ?? true;
+      const showText = textChunks.length > 0 && (!sawToolCall || toolComments && !isToolCallJson(textContent));
+      if (showText) {
         for (const chunk of textChunks) {
           const textOut = pluginManager.runOnText({ iteration, logger }, chunk);
           onChunk?.(textOut);
@@ -10080,6 +10175,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;
@@ -10302,6 +10398,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++;
@@ -10320,7 +10417,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:]
@@ -10956,6 +11053,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",
@@ -10980,21 +11079,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}` };
@@ -11716,19 +11818,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();
       });
     });
@@ -12114,8 +12222,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"]
     },
@@ -12127,7 +12241,10 @@ var init_search_history = __esm(() => {
       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) {
@@ -12143,10 +12260,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) })
+        };
       }
     }
   };
@@ -12963,13 +13089,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`);
   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;
     }
@@ -13282,6 +13408,8 @@ import { resolve as resolve13, extname as extname4, join as join17 } 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;
@@ -13364,8 +13492,8 @@ class LintOnWritePlugin {
       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 += `
 
@@ -13373,9 +13501,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 += `
 
@@ -13438,7 +13566,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;
 });
@@ -13490,7 +13618,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,
@@ -13737,8 +13865,7 @@ var init_plan_coverage = __esm(() => {
     "css",
     "scss",
     "less",
-    "html",
-    "jsx"
+    "html"
   ]);
 });
 
@@ -13757,6 +13884,7 @@ class ExecutionModule {
   lastRecoveryIteration = -STUCK_RECOVERY_COOLDOWN;
   consecutivePlanWarnings = 0;
   lastStepId = -1;
+  _auditSkipsRemaining = 0;
   constructor(baseDir, stuckThreshold = 8) {
     this.baseDir = baseDir;
     this.verifier = new StepVerifier(baseDir);
@@ -13767,6 +13895,7 @@ class ExecutionModule {
   setPlan(plan) {
     this.tracker = new PlanTracker(plan);
     this.persister.save(plan);
+    this._auditSkipsRemaining = 0;
   }
   restorePlan() {
     const plan = this.persister.load();
@@ -13774,6 +13903,7 @@ class ExecutionModule {
       return false;
     this.tracker = new PlanTracker(plan);
     this.tracker.syncCurrentStep();
+    this._auditSkipsRemaining = 1;
     return true;
   }
   getTracker() {
@@ -13785,6 +13915,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}`);
@@ -13848,7 +13982,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) {
@@ -13897,6 +14034,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();
@@ -13943,9 +14096,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") {
@@ -14033,8 +14197,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>`
@@ -14122,7 +14288,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)
+                }));
               }
             }
           }
@@ -14399,6 +14568,7 @@ import { gzipSync } from "zlib";
 class SessionStore {
   baseDir;
   encryptor = null;
+  _metaCache = new Map;
   constructor(baseDir, encryptionConfig) {
     this.baseDir = baseDir;
     if (encryptionConfig?.enabled) {
@@ -14434,6 +14604,7 @@ class SessionStore {
     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);
@@ -14444,13 +14615,18 @@ class SessionStore {
     }
   }
   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;
     }
@@ -14481,11 +14657,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 [];
     }
@@ -14510,11 +14698,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 [];
     }
@@ -14535,6 +14735,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 });
@@ -15122,7 +15323,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 {
@@ -15179,7 +15380,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`);
       }
@@ -15227,6 +15428,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)
@@ -16143,7 +16349,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);
@@ -16203,7 +16412,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   pluginManager.register(plugin2);
   const pluginLoader = new PluginLoader;
   const globalPluginsDir = join26(homedir11(), ".mma", "plugins");
-  const projectPluginsDir = join26(dir, ".mma", "plugins");
+  const projectPluginsDir = join26(baseDir, ".mma", "plugins");
   pluginLoader.loadFromDir(globalPluginsDir, pluginManager, logger);
   pluginLoader.loadFromDir(projectPluginsDir, pluginManager, logger);
   contextManager.onCompact = (summary) => {
@@ -16309,7 +16518,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}\``);
@@ -16408,135 +16617,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
@@ -16821,6 +16960,10 @@ function box(lines, opts = {}) {
   out.push(pc.dim(`└${"─".repeat(width - 2)}┘`));
   return out;
 }
+function divider(width) {
+  const w = Math.min(width ?? getTerminalWidth(), 60);
+  return pc.dim("─".repeat(w));
+}
 var init_box = __esm(() => {
   init_string_width();
   init_colors();
@@ -25090,12 +25233,13 @@ Excluded blocks: ${info.excluded.length}`));
       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 configDir = ctx.configDir;
+      const baseDir = ctx.baseDir;
+      const projectConfigPath = join35(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;
@@ -26563,6 +26707,28 @@ init_spinner();
 init_box();
 init_table();
 init_i18n();
+var GUTTER = "  ";
+function toolMarker(tool) {
+  switch (tool) {
+    case "write_file":
+    case "edit_file":
+    case "create_dir":
+    case "move_file":
+    case "delete_file":
+      return "←";
+    case "read_file":
+    case "list_dir":
+    case "file_info":
+      return "→";
+    case "glob":
+    case "grep":
+      return "✱";
+    case "bash":
+      return "$";
+    default:
+      return "⚙";
+  }
+}
 function isRichTerminal() {
   return Boolean(process.stdout.isTTY) && !process.env.CI;
 }
@@ -26592,12 +26758,14 @@ class Renderer {
   out;
   err;
   width;
+  toolStyle;
   card = null;
   constructor(opts = {}) {
     this.rich = opts.rich ?? isRichTerminal();
     this.out = opts.out ?? process.stdout;
     this.err = opts.err ?? process.stderr;
     this.width = opts.width ?? getTerminalWidth();
+    this.toolStyle = opts.toolStyle ?? "inline";
     this.spinner = new Spinner({
       enabled: this.rich && (opts.spinner ?? true),
       stream: this.err,
@@ -26614,11 +26782,24 @@ class Renderer {
   meta(chunk) {
     this.spinner.stop();
     if (this.card) {
-      this.card.body.push(chunk);
+      if (this.toolStyle === "inline") {
+        this.writeInlineBody(chunk);
+      } else {
+        this.card.body.push(chunk);
+      }
     } else {
       this.out.write(chunk);
     }
   }
+  writeInlineBody(chunk) {
+    for (const line of chunk.split(`
+`)) {
+      if (line.trim() === "")
+        continue;
+      this.out.write(`${GUTTER}${line}
+`);
+    }
+  }
   reasoning(chunk) {
     this.spinner.stop();
     this.out.write(pc.dim(chunk));
@@ -26640,6 +26821,13 @@ ${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
       return;
     }
     this.card = { tool, args, body: [], start: Date.now() };
+    if (this.toolStyle === "inline") {
+      const marker = toolMarker(tool);
+      this.out.write(`
+${pc.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
+`);
+      return;
+    }
     this.spinner.start(`${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}`);
   }
   toolEnd(_tool, duration, error, ctxDelta) {
@@ -26655,6 +26843,20 @@ ${pc.dim("⚙")} ${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`)}`;
+    if (ctxDelta !== undefined && ctxDelta !== 0) {
+      const deltaStr = ctxDelta > 0 ? pc.green(`+${ctxDelta}`) : pc.yellow(`${ctxDelta} ↓`);
+      footer += `  ${pc.dim("ctx")} ${deltaStr}`;
+    }
+    if (this.toolStyle === "inline") {
+      this.out.write(`${GUTTER}${footer}
+`);
+      this.out.write(`${divider(this.width)}
+`);
+      this.card = null;
+      return;
+    }
     const lines = [];
     const summary = summarizeArgs2(args);
     if (summary)
@@ -26666,12 +26868,6 @@ ${pc.dim("⚙")} ${friendlyTool(tool)}${summary ? ` ${pc.dim(summary)}` : ""}
           lines.push(line);
       }
     }
-    const marker = error ? pc.red("✗") : pc.green("✓");
-    let footer = `${marker} ${pc.dim(`${duration}ms`)}`;
-    if (ctxDelta !== undefined && ctxDelta !== 0) {
-      const deltaStr = ctxDelta > 0 ? pc.green(`+${ctxDelta}`) : pc.yellow(`${ctxDelta} ↓`);
-      footer += `  ${pc.dim("ctx")} ${deltaStr}`;
-    }
     lines.push(footer);
     const title = `${marker} ${friendlyTool(tool)}`;
     for (const line of box(lines, { title, width: this.width })) {
@@ -26894,18 +27090,20 @@ class Repl {
       readline2.emitKeypressEvents(process.stdin);
       process.stdin.on("keypress", async (str, key) => {
         if (key.name === "escape") {
+          const escBytes = key.sequence ? (key.sequence.match(/\x1b/g) || []).length : 1;
           const now = Date.now();
-          if (now - this.lastEscTime < this.doubleEscDelay) {
+          const withinWindow = now - this.lastEscTime < this.doubleEscDelay;
+          this.lastEscTime = now;
+          if (escBytes >= 2 || withinWindow) {
+            this.lastEscTime = 0;
             if (this.agentRunning) {
               process.stdout.write(pc.yellow(`
 ${t("repl.interrupt")}
 `));
               this.agent.shutdown();
             }
-            this.lastEscTime = 0;
-            return;
           }
-          this.lastEscTime = now;
+          return;
         }
         if (key.ctrl && key.name === "v" && !this.agentRunning) {
           try {
@@ -26918,18 +27116,25 @@ ${t("repl.interrupt")}
               console.log(pc.green(`
 ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
               this.rl.prompt();
+            } else {
+              console.log(pc.yellow(`
+${t("image.clipboard_empty")}`));
+              this.rl.prompt();
             }
           } catch {}
         }
       });
     }
+    let forceExitTimer = null;
     process.on("SIGINT", () => {
       if (this.agentRunning) {
         console.log(pc.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);
       }
@@ -26962,7 +27167,8 @@ ${t("image.attached", { source: "clipboard", size: `${sizeKb} KB` })}`));
       process.stdout.write(`
 ` + pc.green(t("repl.agent")));
       const renderer = new Renderer({
-        spinner: this.config.ui?.spinner ?? true
+        spinner: this.config.ui?.spinner ?? true,
+        toolStyle: this.config.ui?.toolStyle ?? "inline"
       });
       const result = await this.agent.run(input, (c) => renderer.text(c), (m) => renderer.meta(m), (ev) => {
         if (ev.type === "start") {
@@ -27179,7 +27385,10 @@ async function main() {
 `);
       process.exit(result2.success ? 0 : 1);
     }
-    const renderer = new Renderer({ spinner: config.ui?.spinner ?? true });
+    const renderer = new Renderer({
+      spinner: config.ui?.spinner ?? true,
+      toolStyle: config.ui?.toolStyle ?? "inline"
+    });
     const result = await agent.run(prompt, (chunk) => renderer.text(chunk), (meta) => renderer.meta(meta), (ev) => {
       if (ev.type === "start") {
         renderer.toolStart(ev.tool, ev.args);
@@ -27213,7 +27422,10 @@ async function main() {
   ` + t("cli.first_run") + `
 `));
       const answers = await runSetup();
-      const { config: config2 } = await bootstrap(undefined, projectDir, noAgentsMd, exitOnComplete);
+      const config2 = loadConfig({
+        configDir: join36(homedir18(), ".mma"),
+        projectConfigPath: projectDir ? join36(projectDir, ".mmrc") : join36(process.cwd(), ".mmrc")
+      });
       config2.provider.type = answers.provider;
       config2.provider.baseUrl = answers.apiBase;
       config2.provider.apiKey = answers.apiKey;