micro-models-agent 0.57.2 → 0.58.1

package/dist/main.js

@@ -2290,22 +2290,26 @@ var init_defaults = __esm(() => {
       code: {
         model: DEFAULT_MODEL,
         tool_tags: ["file", "code", "shell"],
-        max_attempts: 3
+        max_attempts: 3,
+        description: "file operations, code editing, shell commands"
       },
       research: {
         model: DEFAULT_MODEL,
         tool_tags: ["research"],
-        max_attempts: 3
+        max_attempts: 3,
+        description: "web search, web fetch, web browse, history search"
       },
       browser: {
         model: DEFAULT_MODEL,
         tool_tags: ["browser", "vision"],
-        max_attempts: 3
+        max_attempts: 3,
+        description: "browser automation, screenshots"
       },
       vision: {
         model: DEFAULT_MODEL,
         tool_tags: ["browser", "vision", "file"],
-        max_attempts: 2
+        max_attempts: 2,
+        description: "browser + file reading for visual tasks"
       }
     },
     contextWindow: 32768,
@@ -3010,7 +3014,7 @@ Use this knowledge to answer the user's question.`,
     "exec.audit_leftovers": "[✗] Task incomplete: {done}/{total} steps done, {files} files from delete-steps still exist",
     "exec.audit_fail_tests": "[✗] Task incomplete: {done}/{total} steps done, tests FAILING: {failed} failed / {passed} passed — {detail}",
     "exec.audit_fail_typecheck": "[✗] Task incomplete: {done}/{total} steps done, {missing} files missing, typecheck error: {typeError}",
-    "exec.audit_incomplete": "[⚠ Final audit incomplete: {summary}. Task is NOT finished — continue working. Remaining steps: {steps}]",
+    "exec.audit_incomplete": "❗ Final audit incomplete: {summary}. Task is NOT finished. Remaining steps: {steps}. Resolve them - pick ONE path: (a) if the step's deliverable already exists on disk, mark it done (plan update step=N status=done); (b) if the step is no longer needed, mark it skipped; (c) if the plan drifted from reality (wrong file names, changed approach), re-plan to align it. Do NOT retry plan update repeatedly without changing anything.",
     "exec.mass_edit_warning": "⚠️ Plan affects {count} files — review the full list before proceeding.",
     "exec.escalation": `
 
@@ -3777,7 +3781,7 @@ var init_ru = __esm(() => {
     "exec.audit_leftovers": "[✗] Задача не выполнена: {done}/{total} шагов, {files} файлов из delete-шагов всё ещё существуют",
     "exec.audit_fail_tests": "[✗] Задача не выполнена: {done}/{total} шагов, тесты ПАДАЮТ: {failed} failed / {passed} passed — {detail}",
     "exec.audit_fail_typecheck": "[✗] Задача не выполнена: {done}/{total} шагов, {missing} файлов отсутствует, ошибка typecheck: {typeError}",
-    "exec.audit_incomplete": "[⚠ Финальная проверка не пройдена: {summary}. Задача НЕ завершена — продолжайте работу. Оставшиеся шаги: {steps}]",
+    "exec.audit_incomplete": "❗ Финальная проверка не пройдена: {summary}. Задача НЕ завершена. Незакрытые шаги: {steps}. Устрани одним путём: (a) если результат шага уже существует на диске — закрой шаг (plan update step=N status=done); (b) если шаг больше не нужен — status=skipped; (c) если план разошёлся с реальностью (другие имена файлов, сменился подход) — сделай re-plan. Не повторяй plan update без изменений.",
     "exec.mass_edit_warning": "⚠️ План затрагивает {count} файлов — проверьте полный список перед продолжением.",
     "exec.escalation": `
 
@@ -9539,12 +9543,24 @@ var init_bash = __esm(() => {
     mv: "Use the move_file tool instead.",
     rm: "Use the delete_file tool instead.",
     grep: "Use the grep tool instead.",
+    sed: "Use the edit_file tool instead.",
+    awk: "Not available in cmd.exe. Use a Node.js one-liner or 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.",
+    uniq: "Not available in cmd.exe. Use a Node.js one-liner instead.",
+    xargs: "Not available in cmd.exe. Use a Node.js one-liner instead.",
+    cut: "Not available in cmd.exe. Use a Node.js one-liner instead.",
+    tr: "Not available in cmd.exe. Use a Node.js one-liner instead.",
+    basename: "Not available in cmd.exe. Use a Node.js one-liner instead.",
+    dirname: "Not available in cmd.exe. Use a Node.js one-liner instead.",
+    export: 'cmd.exe has no export - use "set VAR=value" (no spaces around =).',
+    source: 'cmd.exe has no source - use "call script.bat".',
+    sleep: 'Use "timeout /t N" instead.',
+    env: "cmd.exe has no env - use set to list/set variables.",
     diff: "Use the diff tool instead.",
     which: 'Use "where" instead.',
     echo: "echo works on Windows, but avoid pipes (|).",
@@ -10179,6 +10195,14 @@ class SessionLogger {
       source: data.source
     });
   }
+  logMoE(event, data) {
+    this.session?.appendLog({
+      ts: new Date().toISOString(),
+      type: event,
+      content: data.detail ?? data.explanation ?? event,
+      ...data
+    });
+  }
 }
 var init_session_logger = __esm(() => {
   init_audit_log();
@@ -10993,23 +11017,58 @@ function parseChunks(chunks) {
 }
 
 // src/llm/orchestrator.ts
+function buildPlanSystemPrompt(experts) {
+  if (!experts || Object.keys(experts).length === 0) {
+    return PLAN_SYSTEM_PROMPT;
+  }
+  const lines = Object.entries(experts).map(([tag, cfg]) => {
+    const desc = cfg.description || (cfg.tool_tags?.length ? `tools: ${cfg.tool_tags.join(", ")}` : "general purpose");
+    return `- ${tag}: ${desc}`;
+  });
+  return `You are a planning assistant for an agent system with multiple expert sub-agents.
+Break down the user's task into subtasks that can be executed by different expert agents.
+
+Available experts and their tool tags:
+${lines.join(`
+`)}
+
+${PLAN_SYSTEM_PROMPT_RULES}`;
+}
+
 class OrchestratorClient {
   config;
   provider = null;
   constructor(config, defaultProvider) {
     this.config = config;
-    if (config.model) {
-      if (config.provider) {
-        this.provider = this.createProviderInstance(config.provider.type ?? "openai-compat", config.model, config.provider.baseUrl || DEFAULT_BASE_URL, config.provider.apiKey, config.retry);
-      } else if (defaultProvider) {
-        this.provider = defaultProvider;
-      } else {
-        this.provider = this.createProviderInstance("openai-compat", config.model, DEFAULT_BASE_URL, undefined, config.retry);
-      }
+    if (!config.model)
+      return;
+    if (config.provider) {
+      this.provider = this.buildManagedProvider(config);
+    } else if (defaultProvider) {
+      this.provider = defaultProvider;
+    } else {
+      this.provider = this.buildManagedProvider({
+        ...config,
+        provider: { type: "openai-compat", baseUrl: DEFAULT_BASE_URL }
+      });
     }
   }
-  createProviderInstance(type, model, baseUrl, apiKey, retry) {
-    return createProvider(type, { model, baseUrl, apiKey, contextWindow: 32768, retry });
+  buildManagedProvider(config) {
+    const providerCfg = config.provider;
+    const manager = new ProviderManager({ ...providerCfg, baseUrl: providerCfg.baseUrl || DEFAULT_BASE_URL }, {
+      contextWindow: config.contextWindow ?? DEFAULT_ORCH_CONTEXT_WINDOW,
+      retry: config.retry,
+      rateLimits: config.rateLimits,
+      logger: config.logger
+    });
+    manager.setModel(config.model);
+    let provider = manager.active;
+    if (providerCfg.fallback && manager.listNames().length > 1) {
+      provider = new FallbackProvider(manager, (from, to, error) => {
+        config.logger?.warn(`orchestrator provider failover: ${from} -> ${to} (${error.message.slice(0, 120)})`);
+      });
+    }
+    return provider;
   }
   isEnabled() {
     return this.provider !== null;
@@ -11047,7 +11106,7 @@ class OrchestratorClient {
     if (!this.provider)
       return { error: "Orchestrator not enabled — no orchestrator model configured" };
     const messages = [
-      { role: "system", content: PLAN_SYSTEM_PROMPT },
+      { role: "system", content: buildPlanSystemPrompt(this.config.experts) },
       { role: "user", content: userPrompt }
     ];
     const text = await this.chat(messages, signal);
@@ -11137,16 +11196,7 @@ class OrchestratorClient {
     return parsed.type === "text" ? parsed.content : "";
   }
 }
-var PLAN_SYSTEM_PROMPT = `You are a planning assistant for an agent system with multiple expert sub-agents.
-Break down the user's task into subtasks that can be executed by different expert agents.
-
-Available experts and their tool tags:
-- code: file operations, code editing, shell commands
-- research: web search, web fetch, web browse, history search
-- browser: browser automation, screenshots
-- vision: browser + file reading for visual tasks
-
-Rules:
+var PLAN_SYSTEM_PROMPT_RULES = `Rules:
 1. Each subtask must have an expert_tag from the available experts.
 2. Use depends_on for ordering when subtask B reads what subtask A writes.
 3. Independent subtasks should NOT depend on each other (they run in parallel).
@@ -11175,7 +11225,7 @@ Respond with a JSON object only (no markdown fences):
     "rules": ["rule 1"],
     "refs": []
   }
-}`, VERIFY_SYSTEM_PROMPT = `You are a verification and merge assistant for an agent system with multiple expert sub-agents.
+}`, PLAN_SYSTEM_PROMPT, VERIFY_SYSTEM_PROMPT = `You are a verification and merge assistant for an agent system with multiple expert sub-agents.
 You receive the original plan, the results from each subtask, and any verification errors.
 Your job is to determine if the overall task was completed successfully or if re-planning is needed.
 
@@ -11191,10 +11241,21 @@ Decide what to do with its scope request:
 Respond with JSON only (no markdown fences):
 {"action": "approve", "write": ["file1"], "read": ["file2"]}
 or
-{"action": "reject", "explanation": "why"}`, DEFAULT_BASE_URL = "http://localhost:1234/v1";
+{"action": "reject", "explanation": "why"}`, DEFAULT_BASE_URL = "http://localhost:1234/v1", DEFAULT_ORCH_CONTEXT_WINDOW = 32768;
 var init_orchestrator = __esm(() => {
-  init_create();
+  init_manager();
+  init_fallback();
   init_esm();
+  PLAN_SYSTEM_PROMPT = `You are a planning assistant for an agent system with multiple expert sub-agents.
+Break down the user's task into subtasks that can be executed by different expert agents.
+
+Available experts and their tool tags:
+- code: file operations, code editing, shell commands
+- research: web search, web fetch, web browse, history search
+- browser: browser automation, screenshots
+- vision: browser + file reading for visual tasks
+
+${PLAN_SYSTEM_PROMPT_RULES}`;
 });
 
 // src/modules/execution/input-from.ts
@@ -12208,7 +12269,7 @@ function topologicalSort(subtasks) {
   }
   return sorted;
 }
-async function executeSubtask(subtask, deps, depResults, sharedContext) {
+async function executeSubtask(subtask, deps, depResults, sharedContext, onUsage) {
   const startTime = Date.now();
   const expertConfig = getExpertConfig(deps.config, subtask.expert_tag);
   if (!expertConfig) {
@@ -12290,8 +12351,11 @@ ${(subtask.success_criteria || []).map((c) => `- ${c}`).join(`
         logger: deps.logger,
         llmProvider: deps.llmProvider,
         toolExecutor: deps.toolExecutor,
-        sessionId: "moe"
+        sessionId: deps.sessionId || "moe"
       }, subagentArgs);
+      if (result.usage) {
+        onUsage?.(subtask.expert_tag, result.usage);
+      }
       deps.onTool?.({
         type: "end",
         tool: "subagent",
@@ -12305,7 +12369,7 @@ ${(subtask.success_criteria || []).map((c) => `- ${c}`).join(`
           if (abs) {
             const store = new ArtifactStore({
               baseDir: deps.baseDir,
-              sessionId: "moe"
+              sessionId: deps.sessionId || "moe"
             });
             const full = store.read(abs.split(/[\\/]/).pop() || "");
             deps.logger.debug(`MoE subtask "${subtask.id}" attached artifact ${abs} (${full?.length ?? 0} chars) to Router`);
@@ -12395,14 +12459,34 @@ ${stuckReason}`;
 
 class MoEExecutor {
   deps;
+  usageByTag = new Map;
   constructor(deps) {
     this.deps = deps;
   }
-  async executePlan(plan) {
-    const results = [];
+  getUsageByTag() {
+    return Object.fromEntries(this.usageByTag);
+  }
+  recordUsage(expertTag, usage) {
+    const entry = this.usageByTag.get(expertTag) ?? {
+      promptTokens: 0,
+      completionTokens: 0,
+      totalTokens: 0,
+      subtasks: 0
+    };
+    entry.promptTokens += usage.promptTokens;
+    entry.completionTokens += usage.completionTokens;
+    entry.totalTokens += usage.totalTokens;
+    entry.subtasks += 1;
+    this.usageByTag.set(expertTag, entry);
+  }
+  async executePlan(plan, opts) {
+    const skipIds = opts?.skipIds;
+    const carried = opts?.carriedResults ?? [];
+    const results = carried.map((r) => ({ ...r }));
     const errors = [];
     const warnings = [];
-    const waves = topologicalSort(plan.subtasks);
+    const subtasks = skipIds && skipIds.size > 0 ? plan.subtasks.filter((s) => !skipIds.has(s.id)) : plan.subtasks;
+    const waves = topologicalSort(subtasks);
     if (waves.length === 0) {
       return {
         success: false,
@@ -12412,8 +12496,8 @@ class MoEExecutor {
       };
     }
     const sortedCount = waves.flat().length;
-    if (sortedCount < plan.subtasks.length) {
-      const missing = plan.subtasks.filter((s) => !waves.flat().some((w) => w.id === s.id)).map((s) => s.id);
+    if (sortedCount < subtasks.length) {
+      const missing = subtasks.filter((s) => !waves.flat().some((w) => w.id === s.id)).map((s) => s.id);
       return {
         success: false,
         results: [],
@@ -12442,9 +12526,13 @@ class MoEExecutor {
           release();
           throw newAbortError();
         }
+        this.deps.onEvent?.({
+          type: "moe_subtask",
+          data: { subtaskId: subtask.id, expertTag: subtask.expert_tag, status: "start" }
+        });
         let result;
         try {
-          result = await executeSubtask(subtask, this.deps, depResults, plan.shared_context);
+          result = await executeSubtask(subtask, this.deps, depResults, plan.shared_context, (tag, usage) => this.recordUsage(tag, usage));
           if (!result.success && this.deps.onScopeRequest) {
             result = await this.resolveScopeAndRetry(subtask, result, depResults, plan.shared_context);
           }
@@ -12462,6 +12550,16 @@ class MoEExecutor {
         } finally {
           release();
         }
+        this.deps.onEvent?.({
+          type: "moe_subtask",
+          data: {
+            subtaskId: subtask.id,
+            expertTag: subtask.expert_tag,
+            status: result.success ? "done" : "failed",
+            durationMs: result.durationMs,
+            summary: result.summary
+          }
+        });
         results.push(result);
         return result;
       });
@@ -12473,7 +12571,13 @@ class MoEExecutor {
     if (failed.length > 0) {
       errors.push(...failed.map((f) => `[${f.subtaskId}] ${f.error || f.summary}`));
     }
-    return { success: failed.length === 0, results, errors, warnings };
+    return {
+      success: failed.length === 0,
+      results,
+      errors,
+      warnings,
+      ...carried.length > 0 ? { carriedSubtaskIds: carried.map((r) => r.subtaskId) } : {}
+    };
   }
   async resolveScopeAndRetry(subtask, failed, depResults, sharedContext) {
     let current = failed;
@@ -12493,7 +12597,7 @@ Router rejected scope request for files: ${req.files.join(", ")}`
       subtask.allowed_files = uniq([...subtask.allowed_files || [], ...decision.write]);
       subtask.read_only_files = uniq([...subtask.read_only_files || [], ...decision.read]);
       this.deps.logger.info?.(`MoE: approved scope expansion for "${subtask.id}": +write [${decision.write.join(", ")}] +read [${decision.read.join(", ")}]`);
-      const retry = await executeSubtask(subtask, this.deps, depResults, sharedContext);
+      const retry = await executeSubtask(subtask, this.deps, depResults, sharedContext, (tag, usage) => this.recordUsage(tag, usage));
       if (retry.success || !retry.scopeRequest)
         return retry;
       current = retry;
@@ -13084,7 +13188,7 @@ var init_auditor = __esm(() => {
 });
 
 // src/modules/execution/verifier.ts
-import { existsSync as existsSync26 } from "fs";
+import { existsSync as existsSync26, readFileSync as readFileSync13 } from "fs";
 import { resolve as resolve13, extname as extname3, join as join16 } from "path";
 import { spawn as spawn4 } from "child_process";
 
@@ -13155,6 +13259,65 @@ class StepVerifier {
   async verifyArtifactFiles(files) {
     return Promise.all(files.map((f) => this.checkFileExists(f)));
   }
+  async verifySubtaskCriteria(subtask) {
+    const errors = [];
+    const warnings = [];
+    const details = [];
+    for (const criterion of subtask.success_criteria || []) {
+      const sep2 = criterion.indexOf(":");
+      if (sep2 <= 0) {
+        warnings.push(`Subtask "${subtask.id}": non-machine criterion "${criterion}" (LLM-only)`);
+        continue;
+      }
+      const kind = criterion.slice(0, sep2);
+      const rest = criterion.slice(sep2 + 1);
+      if (kind === "file-exists") {
+        const check = await this.checkFileExists(rest);
+        details.push(check);
+        if (!check.passed)
+          errors.push(`[${subtask.id}] ${check.message}`);
+        continue;
+      }
+      if (kind === "substring-in-file") {
+        const colon = rest.indexOf(":");
+        if (colon <= 0) {
+          warnings.push(`Subtask "${subtask.id}": malformed substring-in-file criterion "${criterion}"`);
+          continue;
+        }
+        const path = rest.slice(0, colon);
+        const needle = rest.slice(colon + 1);
+        const resolved = resolve13(this.baseDir, path);
+        if (!existsSync26(resolved)) {
+          const item = { passed: false, message: t("verify.file_not_found", { path }) };
+          details.push(item);
+          errors.push(`[${subtask.id}] ${item.message}`);
+          continue;
+        }
+        const content = readFileSync13(resolved, "utf-8");
+        const passed = content.includes(needle);
+        details.push({ passed, message: `substring "${needle}" in ${path}: ${passed}` });
+        if (!passed)
+          errors.push(`[${subtask.id}] "${needle}" not found in ${path}`);
+        continue;
+      }
+      if (kind === "command-exit-0") {
+        try {
+          await this.runAsync(rest, this.baseDir, 30000);
+          details.push({ passed: true, message: `command ok: ${rest}` });
+        } catch (e) {
+          const item = {
+            passed: false,
+            message: `command failed: ${rest} (${String(e.message).slice(0, 200)})`
+          };
+          details.push(item);
+          errors.push(`[${subtask.id}] ${item.message}`);
+        }
+        continue;
+      }
+      warnings.push(`Subtask "${subtask.id}": unknown criterion kind "${kind}" (LLM-only)`);
+    }
+    return { errors, warnings, details };
+  }
   async verifyMoEManifest(plan, config, allToolTags) {
     const errors = [];
     const warnings = [];
@@ -13177,6 +13340,10 @@ class StepVerifier {
           errors.push(check.message);
         }
       }
+      const criteria = await this.verifySubtaskCriteria(sub);
+      errors.push(...criteria.errors);
+      warnings.push(...criteria.warnings);
+      details.push(...criteria.details);
     }
     return {
       success: errors.length === 0,
@@ -13295,7 +13462,8 @@ var init_verifier = __esm(() => {
 // src/core/agent-moe.ts
 async function runWithMoE(deps, input, fallback, opts = {}) {
   const { config, llmProvider, logger, toolExecutor, baseDir } = deps;
-  const { onMeta, onPhase, onTool, signal } = opts;
+  const { onMeta, onPhase, onTool, signal, onEvent, sessionId } = opts;
+  const emit = (type, data) => onEvent?.({ type, data });
   const ensureNotAborted = () => {
     if (signal?.aborted)
       throw newAbortError();
@@ -13305,11 +13473,16 @@ async function runWithMoE(deps, input, fallback, opts = {}) {
   if (!orchestrator) {
     orchestrator = new OrchestratorClient({
       model: config.orchestrator.model,
-      provider: config.orchestrator.provider
+      provider: config.orchestrator.provider,
+      contextWindow: config.orchestrator.contextWindow,
+      retry: config.retry,
+      rateLimits: config.security?.rateLimits,
+      logger,
+      experts: config.experts
     }, llmProvider);
   }
   if (!orchestrator.isEnabled()) {
-    logger.debug("MoE enabled but no orchestrator model configured — falling back to single-agent");
+    logger.warn("MoE enabled but no orchestrator model configured — falling back to single-agent. Set orchestrator.model to activate MoE.");
     return fallback();
   }
   onMeta?.(`\uD83E\uDD16 Planning with MoE mode...
@@ -13319,16 +13492,28 @@ async function runWithMoE(deps, input, fallback, opts = {}) {
   onPhase?.("done");
   if ("error" in planResult) {
     logger.warn(`MoE plan failed: ${planResult.error} — falling back to single-agent`);
+    emit("moe_plan", { status: "error", error: planResult.error });
     return fallback();
   }
+  emit("moe_plan", {
+    status: "ok",
+    title: planResult.plan.title,
+    subtaskIds: planResult.plan.subtasks.map((s) => s.id)
+  });
   const maxCycles = Math.max(1, config.moe?.maxReplanCycles ?? DEFAULT_MOE_MAX_REPLAN_CYCLES);
   const mergedResults = new Map;
   let currentPlan = planResult.plan;
+  const usageByTag = {};
   for (let cycle = 1;cycle <= maxCycles; cycle++) {
     ensureNotAborted();
     if (cycle > 1) {
       onMeta?.(t("moe.replan_started", { cycle, max: maxCycles }) + `
 `);
+      emit("moe_replan", {
+        cycle,
+        title: currentPlan.title,
+        subtaskIds: currentPlan.subtasks.map((s) => s.id)
+      });
     }
     const validation = validatePlan(currentPlan, config);
     if (!validation.valid) {
@@ -13357,6 +13542,8 @@ async function runWithMoE(deps, input, fallback, opts = {}) {
       logger,
       baseDir,
       onTool,
+      sessionId,
+      onEvent: (e) => emit(e.type, e.data),
       onScopeRequest: async (subtaskId, req) => {
         const decision = await orchestrator.resolveScopeRequest(subtaskId, req, signal);
         if (decision.action === "approve") {
@@ -13374,8 +13561,36 @@ async function runWithMoE(deps, input, fallback, opts = {}) {
     });
     onMeta?.(t("moe.executing", { count: String(currentPlan.subtasks.length), cycle: String(cycle) }) + `
 `);
-    const planResults = await executor.executePlan(currentPlan);
+    const skipIds = new Set;
+    const carriedResults = [];
+    for (const s of currentPlan.subtasks) {
+      const prev = mergedResults.get(s.id);
+      if (prev?.success) {
+        skipIds.add(s.id);
+        carriedResults.push(prev);
+      }
+    }
+    for (const id of skipIds) {
+      emit("moe_subtask", { subtaskId: id, status: "carried", cycle });
+    }
+    const planResults = await executor.executePlan(currentPlan, { skipIds, carriedResults });
     ensureNotAborted();
+    const cycleUsage = executor.getUsageByTag?.();
+    if (cycleUsage) {
+      for (const [tag, usage] of Object.entries(cycleUsage)) {
+        const agg = usageByTag[tag] ?? {
+          promptTokens: 0,
+          completionTokens: 0,
+          totalTokens: 0,
+          subtasks: 0
+        };
+        agg.promptTokens += usage.promptTokens;
+        agg.completionTokens += usage.completionTokens;
+        agg.totalTokens += usage.totalTokens;
+        agg.subtasks += usage.subtasks;
+        usageByTag[tag] = agg;
+      }
+    }
     for (const r of planResults.results) {
       mergedResults.set(r.subtaskId, r);
     }
@@ -13405,6 +13620,7 @@ async function runWithMoE(deps, input, fallback, opts = {}) {
       onPhase?.("done");
       if (err?.name === "AbortError")
         throw err;
+      emit("moe_verify", { status: "error", error: err.message });
       return {
         success: false,
         text: `MoE verifyAndMerge crashed: ${err.message}`,
@@ -13413,6 +13629,11 @@ async function runWithMoE(deps, input, fallback, opts = {}) {
       };
     }
     onPhase?.("done");
+    emit("moe_verify", {
+      decision: verifyResult.type,
+      explanation: verifyResult.explanation,
+      usageByTag: Object.keys(usageByTag).length > 0 ? usageByTag : undefined
+    });
     if (verifyResult.type === "final") {
       return buildFinalResult(mergedResults, verification.success, verifyResult);
     }
@@ -13674,7 +13895,7 @@ function evaluateReasoningPolicy(input, state) {
 var DECAY_THRESHOLD = 5;
 
 // src/core/agent/constants.ts
-var TOOL_RESULT_MAX_TOKENS_RATIO = 0.3, TOOL_RESULT_ABSOLUTE_MAX_CHARS = 15000, QUALITY_TRIGGER_THRESHOLD = 40, TOOL_ARGS_SUMMARY_MAX_CHARS = 240, FORCED_COMPACTION_COOLDOWN = 3, MAX_LLM_ERROR_RETRIES = 2, MAX_HALLUCINATION_RETRIES = 3, MAX_CONSECUTIVE_TOOL_FAILURES = 5, MIN_REPEATED_TOOL_FAILURES = 3, MAX_AUDIT_RETRIES = 3, MAX_EMPTY_RESPONSE_RETRIES = 2, MAX_REPEATED_TOOL_CALLS = 2;
+var TOOL_RESULT_MAX_TOKENS_RATIO = 0.3, TOOL_RESULT_ABSOLUTE_MAX_CHARS = 15000, QUALITY_TRIGGER_THRESHOLD = 40, TOOL_ARGS_SUMMARY_MAX_CHARS = 240, FORCED_COMPACTION_COOLDOWN = 3, MAX_LLM_ERROR_RETRIES = 2, MAX_HALLUCINATION_RETRIES = 3, MAX_CONSECUTIVE_TOOL_FAILURES = 5, MIN_REPEATED_TOOL_FAILURES = 3, MAX_AUDIT_RETRIES = 3, MAX_EMPTY_RESPONSE_RETRIES = 2, MAX_REPEATED_TOOL_CALLS = 2, MUTATION_CYCLE_NUDGE_THRESHOLD = 5;
 
 // src/core/agent/loop-state.ts
 function createLoopState() {
@@ -13690,6 +13911,8 @@ function createLoopState() {
     repeatedToolCount: 0,
     toolFailureCounts: new Map,
     memoryRuleRecorded: new Set,
+    toolTargetCounts: new Map,
+    cycleNudgedKeys: new Set,
     apiPromptTokens: 0,
     apiCompletionTokens: 0,
     apiCompletionChars: 0,
@@ -13866,7 +14089,7 @@ class ReasoningEffortResolver {
         planCreated: state.iterPlanCreated,
         consecutiveSuccesses: state.consecutiveToolSuccesses,
         isRepetitive: state.iterRepetitive,
-        baseline: "medium"
+        baseline: reasoningConfig?.baseline ?? "medium"
       }, deps.policyState);
       level = policyResult.level;
       source = "policy";
@@ -14256,6 +14479,32 @@ var init_audit_gate = __esm(() => {
 });
 
 // src/core/agent.ts
+function mutationTargetKey(name, rawArgs) {
+  let a = null;
+  if (typeof rawArgs === "string") {
+    try {
+      a = JSON.parse(rawArgs);
+    } catch {
+      return null;
+    }
+  } else if (rawArgs && typeof rawArgs === "object") {
+    a = rawArgs;
+  }
+  if (!a)
+    return null;
+  if ((name === "edit_file" || name === "write_file") && typeof a.path === "string") {
+    return `write:${a.path.replace(/\\/g, "/").toLowerCase()}`;
+  }
+  if (name === "bash" && typeof a.command === "string") {
+    const cmd = a.command.replace(/\s+/g, " ").trim().slice(0, 80).toLowerCase();
+    return cmd ? `bash:${cmd}` : null;
+  }
+  if ((name === "plan" || name === "todo") && typeof a.action === "string") {
+    return `book:${name}:${a.action.toLowerCase()}`;
+  }
+  return null;
+}
+
 class Agent {
   deps;
   systemPromptAdded = false;
@@ -14450,7 +14699,8 @@ class Agent {
     };
     try {
       const moeEnabled = config.moe?.enabled === true;
-      const result = moeEnabled ? await runWithMoE({
+      const moeRunner = this.deps.runWithMoEOverride ?? runWithMoE;
+      const result = moeEnabled ? await moeRunner({
         config,
         llmProvider,
         toolExecutor,
@@ -14460,7 +14710,9 @@ class Agent {
         onMeta,
         onTool: countTool,
         onPhase,
-        signal: this.abortController.signal
+        signal: this.abortController.signal,
+        onEvent: (event) => slog.logMoE(event.type, event.data),
+        sessionId: this.deps.sessionManager?.getActiveMeta()?.id
       }) : await this.executeSingleAgentLoop(input, slog, onChunk, onMeta, countTool, onPhase);
       if (moeEnabled && result.moeHandled) {
         if (result.text) {
@@ -14674,27 +14926,49 @@ class Agent {
         const signature = toolCalls.map((tc) => `${tc.name}:${JSON.stringify(tc.arguments)}`).join("|");
         if (signature && signature === state.lastToolSignature) {
           state.iterRepetitive = true;
+          logger.info(`Repeated identical tool call detected (iteration ${state.iteration}) — nudging model to finish or change approach`);
+          contextManager.addMessage({
+            role: "user",
+            content: `<system-summary>You just called the same tool with identical arguments. If the task is done, answer with a final text response NOW. If the command failed, try a different approach.</system-summary>`
+          });
           if (this.deps.exitOnComplete) {
             state.repeatedToolCount++;
             if (state.repeatedToolCount >= MAX_REPEATED_TOOL_CALLS) {
               logger.debug("Exit-on-complete: repeated identical tool call, stopping");
               break;
             }
-            contextManager.addMessage({
-              role: "user",
-              content: `<system-summary>You just called the same tool with identical arguments. If the task is done, answer with a final text response NOW. If the command failed, try a different approach.</system-summary>`
-            });
           }
         } else {
           state.repeatedToolCount = 0;
         }
         state.lastToolSignature = signature;
       }
+      const cycleNudges = [];
+      if (sawToolCall) {
+        for (const tc of toolCalls) {
+          const target = mutationTargetKey(tc.name, tc.arguments);
+          if (!target)
+            continue;
+          const count = (state.toolTargetCounts.get(target) ?? 0) + 1;
+          state.toolTargetCounts.set(target, count);
+          if (count >= MUTATION_CYCLE_NUDGE_THRESHOLD && !state.cycleNudgedKeys.has(target)) {
+            state.cycleNudgedKeys.add(target);
+            cycleNudges.push(target);
+          }
+        }
+      }
       if (sawToolCall) {
         const batch = await toolBatch.execute(state, toolCalls, boundedToolNames, textContent, reasoningContent, input, onTool, onMeta, slog);
         if (batch.interrupted) {
           break;
         }
+        if (cycleNudges.length > 0) {
+          logger.info(`Perfectionism cycle detected (${cycleNudges.length} target(s) at ${MUTATION_CYCLE_NUDGE_THRESHOLD}+ mutations) — nudging model to finalize`);
+          contextManager.addMessage({
+            role: "user",
+            content: `<system-summary>You have already modified or re-run the same target many times (e.g. ${cycleNudges[0]}). If the latest output is correct, STOP polishing and answer with a final text response. More identical edits will not change the result.</system-summary>`
+          });
+        }
         this.contextRenderer.render(this.deps.config.ui, contextManager, onMeta);
         state.suppressRepetitionRetry = false;
         continue;
@@ -16253,8 +16527,9 @@ var init_subagent = __esm(() => {
           essential: true,
           estimatedTokens: 150
         };
+        const subConfig = { ...ctx.config, moe: { ...ctx.config.moe, enabled: false } };
         const subDeps = {
-          config: ctx.config,
+          config: subConfig,
           llmProvider: ctx.llmProvider,
           toolExecutor: ctx.toolExecutor,
           pluginManager: subPluginManager,
@@ -16266,12 +16541,17 @@ var init_subagent = __esm(() => {
           toolTags,
           promptBlocks: [systemPrompt]
         };
-        const subAgent = new Agent(subDeps);
+        const subAgent = (ctx.agentFactory ?? ((d) => new Agent(d)))(subDeps);
         const fullTask = context ? `${task}
 
 Context: ${context}` : task;
         try {
           const result = await subAgent.run(fullTask);
+          const pickUsage = () => result.promptTokens !== undefined || result.totalTokens !== undefined ? {
+            promptTokens: result.promptTokens ?? 0,
+            completionTokens: result.completionTokens ?? 0,
+            totalTokens: result.totalTokens ?? 0
+          } : undefined;
           if (!result.success) {
             let output = `Sub-agent failed: ${result.error}
 Partial output: ${result.text}`;
@@ -16298,7 +16578,8 @@ ${formatScopeRequest(scopeReq)}`;
                 iterations: String(result.iterationCount),
                 summary
               }),
-              artifactPath: abs
+              artifactPath: abs,
+              usage: pickUsage()
             };
           }
           return {
@@ -16306,7 +16587,8 @@ ${formatScopeRequest(scopeReq)}`;
             output: `Sub-agent completed:
 ${result.text}
 
-Iterations: ${result.iterationCount}`
+Iterations: ${result.iterationCount}`,
+            usage: pickUsage()
           };
         } finally {
           ctx.toolExecutor.setScope(parentScope);
@@ -16442,7 +16724,7 @@ var init_chunk_query = __esm(() => {
 });
 
 // src/tools/chunk-query.ts
-import { readFileSync as readFileSync13 } from "node:fs";
+import { readFileSync as readFileSync14 } from "node:fs";
 import { resolve as resolve15 } from "node:path";
 var chunkQueryTool;
 var init_chunk_query2 = __esm(() => {
@@ -16454,7 +16736,7 @@ var init_chunk_query2 = __esm(() => {
     name: "chunk_query",
     icon: "\uD83E\uDDE9",
     description: "Answer a query over a large text (file or inline) by splitting it into chunks and querying the model per chunk in parallel, then optionally synthesizing a final answer. Use when the input is too large for the context window.",
-    tags: ["research", "code"],
+    tags: ["research"],
     timeoutMs: 300000,
     parameters: {
       type: "object",
@@ -16515,7 +16797,7 @@ var init_chunk_query2 = __esm(() => {
           return { success: false, output: `[SCOPE] ${check.reason || "Path not allowed"}` };
         }
         try {
-          content = readFileSync13(resolvedInput, "utf8");
+          content = readFileSync14(resolvedInput, "utf8");
         } catch (e) {
           return { success: false, output: `Cannot read ${inputPath}: ${e.message}` };
         }
@@ -16983,7 +17265,7 @@ var init_download_file = __esm(() => {
     name: "download_file",
     icon: "⬇️",
     description: "Download a file (image, archive, binary, font, etc.) from a URL and save it to disk. Returns only the path, size and content type — read the saved file with read_file/attach_image afterwards. Use this for binary files; web_fetch/web_browse return text only and cannot save bytes.",
-    tags: ["file", "research"],
+    tags: ["research"],
     parameters: {
       type: "object",
       properties: {
@@ -17320,7 +17602,7 @@ var init_pipeline_run = __esm(() => {
     name: "pipeline_run",
     icon: "▶️",
     description: "Run a named pipeline with YAML definition. Creates a DAG of sub-agents that execute in dependency order.",
-    tags: ["shell", "code"],
+    tags: ["shell"],
     parameters: {
       type: "object",
       properties: {
@@ -17878,7 +18160,7 @@ var init_mcp_call = __esm(() => {
     name: "mcp_call",
     icon: "\uD83D\uDD17",
     description: "Call a tool on an MCP (Model Context Protocol) server. MCP servers provide external capabilities like databases, APIs, or specialized tools.",
-    tags: ["code", "research"],
+    tags: ["research"],
     parameters: {
       type: "object",
       properties: {
@@ -18010,7 +18292,7 @@ var init_search_history = __esm(() => {
 });
 
 // src/modules/memory/search.ts
-import { readFileSync as readFileSync15, existsSync as existsSync30 } from "fs";
+import { readFileSync as readFileSync16, existsSync as existsSync30 } from "fs";
 import { join as join20 } from "path";
 
 class MemorySearch {
@@ -18025,7 +18307,7 @@ class MemorySearch {
       const path = join20(this.memoryDir, `${name}.md`);
       if (!existsSync30(path))
         continue;
-      const content = readFileSync15(path, "utf-8");
+      const content = readFileSync16(path, "utf-8");
       const lines = content.split(`
 `);
       for (const line of lines) {
@@ -18037,7 +18319,7 @@ class MemorySearch {
     const prefsPath = join20(this.memoryDir, "preferences.json");
     if (existsSync30(prefsPath)) {
       try {
-        const prefs = JSON.parse(readFileSync15(prefsPath, "utf-8"));
+        const prefs = JSON.parse(readFileSync16(prefsPath, "utf-8"));
         for (const [key, value] of Object.entries(prefs)) {
           const searchStr = `${key}=${value}`;
           if (searchStr.toLowerCase().includes(lowerQuery)) {
@@ -18055,7 +18337,7 @@ var init_search = __esm(() => {
 });
 
 // src/modules/memory/store.ts
-import { readFileSync as readFileSync16, writeFileSync as writeFileSync11, appendFileSync as appendFileSync5, existsSync as existsSync31, mkdirSync as mkdirSync14 } from "fs";
+import { readFileSync as readFileSync17, writeFileSync as writeFileSync11, appendFileSync as appendFileSync5, existsSync as existsSync31, mkdirSync as mkdirSync14 } from "fs";
 import { join as join21 } from "path";
 
 class MemoryStore {
@@ -18081,7 +18363,7 @@ class MemoryStore {
     const path = join21(this.memoryDir, `${name}.md`);
     if (!existsSync31(path))
       return "";
-    return readFileSync16(path, "utf-8");
+    return readFileSync17(path, "utf-8");
   }
   append(name, entry) {
     const path = join21(this.memoryDir, `${name}.md`);
@@ -18102,7 +18384,7 @@ class MemoryStore {
     if (!existsSync31(path))
       return {};
     try {
-      return JSON.parse(readFileSync16(path, "utf-8"));
+      return JSON.parse(readFileSync17(path, "utf-8"));
     } catch {
       return {};
     }
@@ -19397,7 +19679,7 @@ __export(exports_image_utils, {
   detectMime: () => detectMime,
   bufferToDataUrl: () => bufferToDataUrl
 });
-import { readFileSync as readFileSync17 } from "fs";
+import { readFileSync as readFileSync18 } from "fs";
 import { extname as extname4 } from "path";
 function detectMime(filePath) {
   const ext = extname4(filePath).toLowerCase();
@@ -19418,7 +19700,7 @@ async function readClipboardImage() {
 async function readClipboardFallback() {
   const { platform: platform6 } = await import("os");
   const { execSync } = await import("child_process");
-  const { readFileSync: readFileSync18, unlinkSync: unlinkSync5 } = await import("fs");
+  const { readFileSync: readFileSync19, unlinkSync: unlinkSync5 } = await import("fs");
   const { join: join27 } = await import("path");
   if (platform6() !== "linux")
     return null;
@@ -19430,7 +19712,7 @@ async function readClipboardFallback() {
   for (const cmd of commands) {
     try {
       execSync(cmd, { timeout: 5000 });
-      const buf = readFileSync18(tmpPath);
+      const buf = readFileSync19(tmpPath);
       unlinkSync5(tmpPath);
       if (buf.length > 0)
         return buf;
@@ -19442,7 +19724,7 @@ async function readClipboardFallback() {
   return null;
 }
 async function loadFileAsDataUrl(filePath) {
-  const buf = readFileSync17(filePath);
+  const buf = readFileSync18(filePath);
   if (typeof Bun !== "undefined" && typeof Bun.Image !== "undefined") {
     try {
       const img = new Bun.Image(buf);
@@ -20042,7 +20324,7 @@ var init_auto_fixer = __esm(() => {
 
 // src/modules/plugins/builtin/lint-on-write.ts
 import { spawn as spawn7, execSync } from "child_process";
-import { existsSync as existsSync35, readFileSync as readFileSync18, writeFileSync as writeFileSync12 } from "fs";
+import { existsSync as existsSync35, readFileSync as readFileSync19, writeFileSync as writeFileSync12 } from "fs";
 import { resolve as resolve17, extname as extname6, join as join28 } from "path";
 import { platform as platform6 } from "os";
 function lintCacheKey(baseDir, lintScript) {
@@ -20143,7 +20425,7 @@ class LintOnWritePlugin {
     if (ext === ".ts" || ext === ".tsx" || ext === ".cts" || ext === ".mts") {
       let content = "";
       try {
-        content = readFileSync18(filePath, "utf-8");
+        content = readFileSync19(filePath, "utf-8");
       } catch {
         return null;
       }
@@ -20189,7 +20471,7 @@ class LintOnWritePlugin {
       if (!existsSync35(packageJsonPath)) {
         return;
       }
-      const packageJson = JSON.parse(readFileSync18(packageJsonPath, "utf-8"));
+      const packageJson = JSON.parse(readFileSync19(packageJsonPath, "utf-8"));
       lintScript = packageJson.scripts?.lint;
       if (!lintScript) {
         return;
@@ -20244,7 +20526,7 @@ ${stdout}`;
       const output = stderr || stdout;
       const errors = parseTscOutput(output);
       if (errors.length > 0) {
-        const fixResult = autoFixErrors(filePath, readFileSync18(filePath, "utf-8"), errors);
+        const fixResult = autoFixErrors(filePath, readFileSync19(filePath, "utf-8"), errors);
         if (fixResult.fixed) {
           writeFileSync12(filePath, fixResult.newContent, "utf-8");
           result.output += `
@@ -20509,11 +20791,11 @@ class PlanTracker {
 var init_tracker = () => {};
 
 // src/modules/execution/plan-store.ts
-import { readFileSync as readFileSync19, writeFileSync as writeFileSync13, renameSync as renameSync3, mkdirSync as mkdirSync15, existsSync as existsSync36, readdirSync as readdirSync11, rmSync } from "fs";
+import { readFileSync as readFileSync20, writeFileSync as writeFileSync13, renameSync as renameSync3, mkdirSync as mkdirSync15, existsSync as existsSync36, readdirSync as readdirSync11, rmSync } from "fs";
 import { join as join29 } from "path";
 function readPlanFile(path, fallbackBaseDir) {
   try {
-    const raw = readFileSync19(path, "utf-8");
+    const raw = readFileSync20(path, "utf-8");
     if (!raw.trim())
       return null;
     const parsed = JSON.parse(raw);
@@ -20725,6 +21007,17 @@ var init_windows_commands = __esm(() => {
   FORBIDDEN_COMMANDS = new Set([
     "grep",
     "sed",
+    "awk",
+    "uniq",
+    "xargs",
+    "cut",
+    "tr",
+    "basename",
+    "dirname",
+    "export",
+    "source",
+    "sleep",
+    "env",
     "ls",
     "find",
     "rm",
@@ -21784,7 +22077,7 @@ var init_plan_tool = __esm(() => {
 });
 
 // src/modules/execution/module.ts
-import { existsSync as existsSync37, readFileSync as readFileSync20 } from "fs";
+import { existsSync as existsSync37, readFileSync as readFileSync21 } from "fs";
 import { resolve as resolve18 } from "path";
 
 class ExecutionModule {
@@ -21934,14 +22227,35 @@ class ExecutionModule {
       });
     }).catch((e) => ctx.logger?.warn(`error web search: ${e.message}`));
   }
+  autoCloseEvidenceSteps(plan) {
+    let closed = 0;
+    for (const step of plan.steps) {
+      if (step.status === "done" || step.status === "skipped")
+        continue;
+      const tokens = extractFileLikeTokens(stripUrls(step.description));
+      if (tokens.length === 0)
+        continue;
+      const allExist = tokens.every((f) => findExistingFile(this.baseDir, f) !== null);
+      if (!allExist)
+        continue;
+      step.status = "done";
+      step.note = `auto-closed by final audit: all named files exist (${tokens.join(", ")})`;
+      closed++;
+    }
+    return closed;
+  }
   async runFinalAudit() {
     if (!this.tracker) {
       if (!this.completedPlan)
         return null;
       const plan2 = this.completedPlan;
+      const autoClosed2 = this.autoCloseEvidenceSteps(plan2);
       const audit2 = await this.auditor.audit(plan2);
       const pendingSteps2 = plan2.steps.flatMap((s) => s.status !== "done" && s.status !== "skipped" ? [`${s.id}. ${s.description}`] : []);
       const done2 = plan2.steps.filter((s) => s.status === "done").length;
+      if (autoClosed2 > 0) {
+        this.store.saveActive(plan2);
+      }
       return {
         passed: audit2.passed && pendingSteps2.length === 0,
         done: done2,
@@ -21956,6 +22270,10 @@ class ExecutionModule {
       return null;
     }
     const plan = this.tracker.getPlan();
+    const autoClosed = this.autoCloseEvidenceSteps(plan);
+    if (autoClosed > 0) {
+      this.store.saveActive(plan);
+    }
     const audit = await this.auditor.audit(plan);
     const pendingSteps = plan.steps.flatMap((s) => s.status !== "done" && s.status !== "skipped" ? [`${s.id}. ${s.description}`] : []);
     const done = plan.steps.filter((s) => s.status === "done").length;
@@ -22150,7 +22468,7 @@ class ExecutionModule {
         if (!r)
           continue;
         try {
-          const content = readFileSync20(r, "utf-8");
+          const content = readFileSync21(r, "utf-8");
           if (content.trim().length < 10) {
             emptyFiles.push(r);
           }
@@ -22258,7 +22576,7 @@ var init_module = __esm(() => {
 });
 
 // src/modules/security/session-encryption.ts
-import { readFileSync as readFileSync21, writeFileSync as writeFileSync14, existsSync as existsSync38, readdirSync as readdirSync12, unlinkSync as unlinkSync5 } from "fs";
+import { readFileSync as readFileSync22, writeFileSync as writeFileSync14, existsSync as existsSync38, readdirSync as readdirSync12, unlinkSync as unlinkSync5 } from "fs";
 import { join as join30 } from "path";
 import { homedir as homedir9 } from "os";
 
@@ -22320,7 +22638,7 @@ class SessionFileEncryptor {
     });
   }
   readSessionFile(filePath) {
-    const content = readFileSync21(filePath, "utf8");
+    const content = readFileSync22(filePath, "utf8");
     return this.decryptFileContent(content);
   }
   writeSessionFile(filePath, content) {
@@ -22328,7 +22646,7 @@ class SessionFileEncryptor {
     writeFileSync14(filePath, encrypted, "utf8");
   }
   readSessionJSON(filePath) {
-    const content = readFileSync21(filePath, "utf8");
+    const content = readFileSync22(filePath, "utf8");
     return this.decryptJSON(content);
   }
   writeSessionJSON(filePath, obj) {
@@ -22336,7 +22654,7 @@ class SessionFileEncryptor {
     writeFileSync14(filePath, content, "utf8");
   }
   readSessionJSONL(filePath) {
-    const content = readFileSync21(filePath, "utf8");
+    const content = readFileSync22(filePath, "utf8");
     const lines = content.split(`
 `).filter((line) => line.trim());
     const decryptedLines = this.decryptJSONL(lines);
@@ -22364,7 +22682,7 @@ class SessionFileEncryptor {
       const filePath = join30(sessionDir, file);
       if (existsSync38(filePath) && !file.endsWith(".enc")) {
         try {
-          const content = readFileSync21(filePath, "utf8");
+          const content = readFileSync22(filePath, "utf8");
           const encrypted = this.encryptFileContent(content);
           writeFileSync14(filePath + ".enc", encrypted, "utf8");
           unlinkSync5(filePath);
@@ -22381,7 +22699,7 @@ class SessionFileEncryptor {
         const encFilePath = join30(sessionDir, file);
         const decFilePath = encFilePath.slice(0, -4);
         try {
-          const content = readFileSync21(encFilePath, "utf8");
+          const content = readFileSync22(encFilePath, "utf8");
           const decrypted = this.decryptFileContent(content);
           writeFileSync14(decFilePath, decrypted, "utf8");
           unlinkSync5(encFilePath);
@@ -22406,7 +22724,7 @@ import {
   existsSync as existsSync39,
   mkdirSync as mkdirSync16,
   readdirSync as readdirSync13,
-  readFileSync as readFileSync22,
+  readFileSync as readFileSync23,
   rmSync as rmSync2,
   writeFileSync as writeFileSync15,
   appendFileSync as appendFileSync6
@@ -22474,7 +22792,7 @@ class SessionStore {
     if (!existsSync39(path))
       return null;
     try {
-      const raw = readFileSync22(path, "utf-8");
+      const raw = readFileSync23(path, "utf-8");
       const content = this.encryptor ? this.encryptor.decryptFileContent(raw) : raw;
       const meta = JSON.parse(content);
       this._metaCache.set(id, meta);
@@ -22488,7 +22806,7 @@ class SessionStore {
     if (!existsSync39(path))
       return null;
     try {
-      const raw = readFileSync22(path, "utf-8");
+      const raw = readFileSync23(path, "utf-8");
       const content = this.encryptor ? this.encryptor.decryptFileContent(raw) : raw;
       return JSON.parse(content);
     } catch {
@@ -22518,7 +22836,7 @@ class SessionStore {
     if (!existsSync39(path))
       return [];
     try {
-      const raw = readFileSync22(path, "utf-8");
+      const raw = readFileSync23(path, "utf-8");
       const lines = raw.split(`
 `).filter(Boolean);
       const parseLine = (line) => {
@@ -22559,7 +22877,7 @@ class SessionStore {
     if (!existsSync39(path))
       return [];
     try {
-      const raw = readFileSync22(path, "utf-8");
+      const raw = readFileSync23(path, "utf-8");
       const lines = raw.split(`
 `).filter(Boolean);
       const parseLine = (line) => {
@@ -22614,7 +22932,7 @@ class SessionStore {
       if (updatedAt < thirtyDaysAgo) {
         const historyPath = this.historyPath(session2.id);
         if (existsSync39(historyPath)) {
-          const content = readFileSync22(historyPath, "utf-8");
+          const content = readFileSync23(historyPath, "utf-8");
           const compressed = gzipSync(content);
           const gzPath = join31(this.baseDir, `${session2.id}.jsonl.gz`);
           writeFileSync15(gzPath, compressed);
@@ -22723,6 +23041,13 @@ class SessionManager {
       return;
     this.store.appendSessionLog(this.activeId, entry);
   }
+  loadSessionLog(id) {
+    try {
+      return this.store.loadSessionLog(id);
+    } catch {
+      return [];
+    }
+  }
   loadHistory() {
     if (!this.activeId)
       return [];
@@ -22834,7 +23159,7 @@ class ProfileCompressor {
 }
 
 // src/modules/user-profile/profile.ts
-import { readFileSync as readFileSync23, writeFileSync as writeFileSync16, existsSync as existsSync40, mkdirSync as mkdirSync17 } from "fs";
+import { readFileSync as readFileSync24, writeFileSync as writeFileSync16, existsSync as existsSync40, mkdirSync as mkdirSync17 } from "fs";
 import { join as join32 } from "path";
 import { homedir as homedir10, hostname, platform as platform8, type } from "os";
 import { env } from "process";
@@ -22869,7 +23194,7 @@ class UserProfile {
     if (!existsSync40(path))
       return null;
     try {
-      const data = JSON.parse(readFileSync23(path, "utf-8"));
+      const data = JSON.parse(readFileSync24(path, "utf-8"));
       this.info = {
         platform: data.platform,
         os: data.os,
@@ -22904,7 +23229,7 @@ class UserProfile {
 var init_profile = () => {};
 
 // src/modules/skills/loader.ts
-import { readdirSync as readdirSync14, readFileSync as readFileSync24, existsSync as existsSync41, statSync as statSync7 } from "fs";
+import { readdirSync as readdirSync14, readFileSync as readFileSync25, existsSync as existsSync41, statSync as statSync7 } from "fs";
 import { join as join33 } from "path";
 
 class SkillsLoader {
@@ -22931,7 +23256,7 @@ class SkillsLoader {
       }
       if (!entry.endsWith(".md") && !entry.endsWith(".skill.md"))
         continue;
-      const content = readFileSync24(fullPath, "utf-8");
+      const content = readFileSync25(fullPath, "utf-8");
       const parsed = this.parseSkillFile(content, fullPath);
       if (parsed)
         skills.push(parsed);
@@ -23580,6 +23905,10 @@ var init_check_tool = __esm(() => {
 // src/modules/lsp/module.ts
 import { existsSync as existsSync42 } from "fs";
 import { relative as relative5, resolve as resolve21 } from "path";
+import { join as join34 } from "path";
+function hasTypeEnvironment(projectRoot) {
+  return existsSync42(join34(projectRoot, "tsconfig.json")) || existsSync42(join34(projectRoot, "jsconfig.json")) || existsSync42(join34(projectRoot, "node_modules"));
+}
 
 class LspModule {
   name = "lsp";
@@ -23734,6 +24063,7 @@ ${items}`;
     const notes = [];
     const checkedFiles = [];
     let checked = 0;
+    let suppressedTypeEnvDiags = 0;
     for (const file of files) {
       const serverConfig = getServerForFile(file, this.config);
       if (!serverConfig)
@@ -23743,10 +24073,20 @@ ${items}`;
         continue;
       const projectRoot = findProjectRoot(file, ctx.baseDir, serverConfig.workspaceMarkers ?? []);
       try {
-        const diags = await this.client.checkFile(file, ctx.baseDir, serverConfig, projectRoot);
+        let diags = await this.client.checkFile(file, ctx.baseDir, serverConfig, projectRoot);
         this.failuresByServer.set(key, 0);
         checked++;
         checkedFiles.push(toForwardSlash(relative5(ctx.baseDir, file)));
+        if (!hasTypeEnvironment(projectRoot)) {
+          const kept = diags.filter((d) => {
+            if (TYPE_ENV_DIAG_PATTERN.test(d.message)) {
+              suppressedTypeEnvDiags++;
+              return false;
+            }
+            return true;
+          });
+          diags = kept;
+        }
         for (const d of diags) {
           if (d.severity === 1)
             errors.push({ file, diag: d });
@@ -23784,6 +24124,9 @@ ${items}`;
     if (checked > 0 && errors.length === 0 && warnings.length === 0) {
       lines.push(t("lsp.check_clean", { count: String(checked) }));
     }
+    if (suppressedTypeEnvDiags > 0) {
+      lines.push(`[lsp_check inconclusive: no tsconfig.json / node_modules near project root — ${suppressedTypeEnvDiags} module-resolution diagnostic(s) suppressed. Initialize the project (package.json + types) for accurate TypeScript checks.]`);
+    }
     lines.push(...notes);
     if (lines.length === 0) {
       return {
@@ -23805,7 +24148,7 @@ function formatDiagnostics(diagnostics, filePath) {
   }).join(`
 `);
 }
-var MAX_CONSECUTIVE_LSP_FAILURES = 3;
+var MAX_CONSECUTIVE_LSP_FAILURES = 3, TYPE_ENV_DIAG_PATTERN;
 var init_module5 = __esm(() => {
   init_client2();
   init_config();
@@ -23817,6 +24160,7 @@ var init_module5 = __esm(() => {
   init_i18n();
   init_check_tool();
   init_utils();
+  TYPE_ENV_DIAG_PATTERN = /Cannot find module ['"][^'"]+['"] or its corresponding type declarations|Cannot find name '(__dirname|__filename|require|process|Buffer|console)'|Do you need to install type definitions/;
 });
 
 // src/modules/lsp/index.ts
@@ -23828,7 +24172,7 @@ var init_lsp = __esm(() => {
 
 // src/modules/lsp/startup-check.ts
 import { existsSync as existsSync43 } from "fs";
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 import { spawn as spawn9 } from "child_process";
 async function runStartupHealthCheck(config, baseDir, deps = {}) {
   if (!config.enabled)
@@ -23855,7 +24199,7 @@ ${result.lines.join(`
 }
 async function runCheck(config, baseDir, deps) {
   const projectRoot = findProjectRoot(baseDir, baseDir, ["tsconfig.json", "package.json"]);
-  if (existsSync43(join34(projectRoot, "tsconfig.json"))) {
+  if (existsSync43(join35(projectRoot, "tsconfig.json"))) {
     const runTsc = deps.runTsc ?? runTscDefault;
     const errors = await runTsc(projectRoot, STARTUP_CHECK_TIMEOUT_MS);
     if (errors.length === 0)
@@ -23957,8 +24301,8 @@ var init_startup_check = __esm(() => {
 });
 
 // src/modules/indexer/walker.ts
-import { readdirSync as readdirSync15, readFileSync as readFileSync25, statSync as statSync8, lstatSync, existsSync as existsSync44, watch } from "fs";
-import { join as join35, relative as relative6, extname as extname7 } from "path";
+import { readdirSync as readdirSync15, readFileSync as readFileSync26, statSync as statSync8, lstatSync, existsSync as existsSync44, watch } from "fs";
+import { join as join36, relative as relative6, extname as extname7 } from "path";
 
 class Indexer {
   baseDir;
@@ -23996,7 +24340,7 @@ class Indexer {
       for (const entry of entries) {
         if (count >= this.MAX_FILES)
           return;
-        const fullPath = join35(dir, entry);
+        const fullPath = join36(dir, entry);
         const relPath = relative6(this.baseDir, fullPath);
         try {
           const lst = lstatSync(fullPath, { throwIfNoEntry: false });
@@ -24011,7 +24355,7 @@ class Indexer {
             const ext = extname7(entry).toLowerCase();
             const language = LANGUAGES[ext];
             if (language) {
-              const content = readFileSync25(fullPath, "utf-8");
+              const content = readFileSync26(fullPath, "utf-8");
               const exports = this.extractExports(content, language);
               files.push({ path: relPath, language, exports, size: stat2.size });
               totalSize += stat2.size;
@@ -24069,14 +24413,14 @@ var init_walker = __esm(() => {
 });
 
 // src/modules/indexer/cache.ts
-import { readFileSync as readFileSync26, writeFileSync as writeFileSync17, existsSync as existsSync45, mkdirSync as mkdirSync18, rmSync as rmSync3 } from "fs";
-import { join as join36 } from "path";
+import { readFileSync as readFileSync27, writeFileSync as writeFileSync17, existsSync as existsSync45, mkdirSync as mkdirSync18, rmSync as rmSync3 } from "fs";
+import { join as join37 } from "path";
 
 class IndexCache {
   cachePath;
   cache = null;
   constructor(cacheDir) {
-    this.cachePath = join36(cacheDir, "index-cache.json");
+    this.cachePath = join37(cacheDir, "index-cache.json");
   }
   load() {
     if (this.cache)
@@ -24084,7 +24428,7 @@ class IndexCache {
     if (!existsSync45(this.cachePath))
       return null;
     try {
-      this.cache = JSON.parse(readFileSync26(this.cachePath, "utf-8"));
+      this.cache = JSON.parse(readFileSync27(this.cachePath, "utf-8"));
       return this.cache;
     } catch {
       return null;
@@ -24092,7 +24436,7 @@ class IndexCache {
   }
   save(result) {
     this.cache = result;
-    const dir = join36(this.cachePath, "..");
+    const dir = join37(this.cachePath, "..");
     if (!existsSync45(dir))
       mkdirSync18(dir, { recursive: true });
     writeFileSync17(this.cachePath, JSON.stringify(result), "utf-8");
@@ -24109,11 +24453,11 @@ class IndexCache {
 var init_cache = () => {};
 
 // src/modules/indexer/project-profile.ts
-import { readFileSync as readFileSync27, existsSync as existsSync46 } from "fs";
-import { join as join37 } from "path";
+import { readFileSync as readFileSync28, existsSync as existsSync46 } from "fs";
+import { join as join38 } from "path";
 function detectManifest(baseDir) {
   for (const manifest of MANIFEST_ORDER) {
-    if (existsSync46(join37(baseDir, manifest)))
+    if (existsSync46(join38(baseDir, manifest)))
       return manifest;
   }
   return null;
@@ -24130,7 +24474,7 @@ function cleanDependency(entry) {
 }
 function readPackageJson(baseDir) {
   try {
-    const raw = JSON.parse(readFileSync27(join37(baseDir, "package.json"), "utf-8"));
+    const raw = JSON.parse(readFileSync28(join38(baseDir, "package.json"), "utf-8"));
     if (!raw || typeof raw !== "object")
       return null;
     const profile = {
@@ -24154,7 +24498,7 @@ function readPackageJson(baseDir) {
 }
 function readPyproject(baseDir) {
   try {
-    const content = readFileSync27(join37(baseDir, "pyproject.toml"), "utf-8");
+    const content = readFileSync28(join38(baseDir, "pyproject.toml"), "utf-8");
     const profile = { runtime: "python", deps: [], devDeps: [], scripts: {} };
     const nameMatch = content.match(/^\s*name\s*=\s*"([^"]+)"/m);
     if (nameMatch)
@@ -24170,7 +24514,7 @@ function readPyproject(baseDir) {
 }
 function readCargo(baseDir) {
   try {
-    const content = readFileSync27(join37(baseDir, "Cargo.toml"), "utf-8");
+    const content = readFileSync28(join38(baseDir, "Cargo.toml"), "utf-8");
     const profile = { runtime: "rust", deps: [], devDeps: [], scripts: {} };
     const nameMatch = content.match(/^\s*name\s*=\s*"([^"]+)"/m);
     if (nameMatch)
@@ -24194,7 +24538,7 @@ function readCargo(baseDir) {
 }
 function readGoMod(baseDir) {
   try {
-    const content = readFileSync27(join37(baseDir, "go.mod"), "utf-8");
+    const content = readFileSync28(join38(baseDir, "go.mod"), "utf-8");
     const profile = { runtime: "go", deps: [], devDeps: [], scripts: {} };
     const moduleMatch = content.match(/^module\s+(\S+)/m);
     if (moduleMatch)
@@ -24212,7 +24556,7 @@ function readGoMod(baseDir) {
 }
 function readRequirements(baseDir) {
   try {
-    const content = readFileSync27(join37(baseDir, "requirements.txt"), "utf-8");
+    const content = readFileSync28(join38(baseDir, "requirements.txt"), "utf-8");
     const profile = { runtime: "python", deps: [], devDeps: [], scripts: {} };
     for (const line of content.split(`
 `)) {
@@ -24761,7 +25105,7 @@ var init_mcp = __esm(() => {
 
 // src/modules/memory/module.ts
 import { homedir as homedir11 } from "os";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 
 class MemoryModule {
   name = "memory";
@@ -24770,7 +25114,7 @@ class MemoryModule {
     if (storeOrDir instanceof MemoryStore) {
       this.store = storeOrDir;
     } else {
-      const dir = storeOrDir || join38(homedir11(), ".mma", "memory");
+      const dir = storeOrDir || join39(homedir11(), ".mma", "memory");
       this.store = new MemoryStore(dir);
     }
   }
@@ -24857,16 +25201,16 @@ var init_module8 = __esm(() => {
 });
 
 // src/core/version.ts
-import { existsSync as existsSync47, readFileSync as readFileSync28 } from "fs";
-import { join as join39, dirname as dirname15 } from "path";
+import { existsSync as existsSync47, readFileSync as readFileSync29 } from "fs";
+import { join as join40, dirname as dirname15 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function readMmaVersion() {
   const here = dirname15(fileURLToPath2(import.meta.url));
-  const candidates = [join39(here, "..", "..", "package.json"), join39(here, "..", "package.json")];
+  const candidates = [join40(here, "..", "..", "package.json"), join40(here, "..", "package.json")];
   for (const p of candidates) {
     if (existsSync47(p)) {
       try {
-        const raw = JSON.parse(readFileSync28(p, "utf8"));
+        const raw = JSON.parse(readFileSync29(p, "utf8"));
         if (raw.version)
           return raw.version;
       } catch {}
@@ -24877,21 +25221,21 @@ function readMmaVersion() {
 var init_version = () => {};
 
 // src/core/environment.ts
-import { existsSync as existsSync48, readFileSync as readFileSync29, readdirSync as readdirSync16 } from "fs";
+import { existsSync as existsSync48, readFileSync as readFileSync30, readdirSync as readdirSync16 } from "fs";
 import { spawnSync as spawnSync3 } from "child_process";
 import { createRequire as createRequire2 } from "module";
-import { join as join40, dirname as dirname16 } from "path";
+import { join as join41, dirname as dirname16 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { arch, homedir as homedir12, hostname as hostname2, platform as platform10, release } from "os";
 import { env as env2 } from "process";
 function readEngineRequirement() {
   const here = dirname16(fileURLToPath3(import.meta.url));
-  const candidates = [join40(here, "..", "..", "package.json"), join40(here, "..", "package.json")];
+  const candidates = [join41(here, "..", "..", "package.json"), join41(here, "..", "package.json")];
   for (const p of candidates) {
     if (!existsSync48(p))
       continue;
     try {
-      const raw = JSON.parse(readFileSync29(p, "utf8"));
+      const raw = JSON.parse(readFileSync30(p, "utf8"));
       if (raw.engines?.node)
         return String(raw.engines.node);
     } catch {}
@@ -24954,7 +25298,7 @@ function toolVersion(cmd) {
 function playwrightBrowsersDir() {
   if (process.env.PLAYWRIGHT_BROWSERS_PATH)
     return process.env.PLAYWRIGHT_BROWSERS_PATH;
-  return process.platform === "win32" ? join40(homedir12(), "AppData", "Local", "ms-playwright") : join40(homedir12(), ".cache", "ms-playwright");
+  return process.platform === "win32" ? join41(homedir12(), "AppData", "Local", "ms-playwright") : join41(homedir12(), ".cache", "ms-playwright");
 }
 function playwrightInfo() {
   let installed = false;
@@ -24964,7 +25308,7 @@ function playwrightInfo() {
     const require2 = createRequire2(import.meta.url);
     const pkgPath = require2.resolve("playwright/package.json");
     installed = existsSync48(pkgPath);
-    version = JSON.parse(readFileSync29(pkgPath, "utf8")).version || "";
+    version = JSON.parse(readFileSync30(pkgPath, "utf8")).version || "";
   } catch {
     installed = false;
   }
@@ -25077,24 +25421,24 @@ __export(exports_manifest, {
   getCertMark: () => getCertMark,
   bundledManifestPath: () => bundledManifestPath
 });
-import { existsSync as existsSync49, readFileSync as readFileSync30, mkdirSync as mkdirSync19, writeFileSync as writeFileSync18 } from "fs";
-import { dirname as dirname17, join as join41 } from "path";
+import { existsSync as existsSync49, readFileSync as readFileSync31, mkdirSync as mkdirSync19, writeFileSync as writeFileSync18 } from "fs";
+import { dirname as dirname17, join as join42 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { homedir as homedir13 } from "os";
 function manifestPath(projectDir) {
-  return join41(projectDir, "certification", "certifications.json");
+  return join42(projectDir, "certification", "certifications.json");
 }
 function globalManifestDir(override) {
-  return override || process.env.MMA_CERT_HOME || join41(homedir13(), ".mma");
+  return override || process.env.MMA_CERT_HOME || join42(homedir13(), ".mma");
 }
 function globalManifestPath(override) {
-  return join41(globalManifestDir(override), "certifications.json");
+  return join42(globalManifestDir(override), "certifications.json");
 }
 function readManifest(projectDir) {
   const path = manifestPath(projectDir);
   try {
     if (existsSync49(path)) {
-      const raw = JSON.parse(readFileSync30(path, "utf-8"));
+      const raw = JSON.parse(readFileSync31(path, "utf-8"));
       return { version: 1, certifications: raw.certifications ?? [] };
     }
   } catch {}
@@ -25102,14 +25446,14 @@ function readManifest(projectDir) {
 }
 function saveManifest(m, projectDir) {
   const path = manifestPath(projectDir);
-  mkdirSync19(join41(projectDir, "certification"), { recursive: true });
+  mkdirSync19(join42(projectDir, "certification"), { recursive: true });
   writeFileSync18(path, JSON.stringify(m, null, 2), "utf-8");
 }
 function readGlobalManifest(override) {
   const path = globalManifestPath(override);
   try {
     if (existsSync49(path)) {
-      const raw = JSON.parse(readFileSync30(path, "utf-8"));
+      const raw = JSON.parse(readFileSync31(path, "utf-8"));
       return { version: 1, certifications: raw.certifications ?? [] };
     }
   } catch {}
@@ -25175,14 +25519,14 @@ function getCertMark(model, providerUrl, currentVersion, projectDir, globalOverr
   return isFullyPassed(entry) ? "certified" : "none";
 }
 function syncSnapshotPath(override) {
-  return join41(globalManifestDir(override), "certifications.synced.json");
+  return join42(globalManifestDir(override), "certifications.synced.json");
 }
 function bundledManifestPath() {
   const here = dirname17(fileURLToPath4(import.meta.url));
   const candidates = [
-    join41(here, "certification", "certifications.json"),
-    join41(here, "..", "certification", "certifications.json"),
-    join41(here, "..", "..", "..", "certification", "certifications.json")
+    join42(here, "certification", "certifications.json"),
+    join42(here, "..", "certification", "certifications.json"),
+    join42(here, "..", "..", "..", "certification", "certifications.json")
   ];
   for (const p of candidates) {
     if (existsSync49(p))
@@ -25195,9 +25539,9 @@ function syncGlobalManifest(override, bundledPathOverride) {
     const bundledPath = bundledPathOverride ?? bundledManifestPath();
     if (!bundledPath || !existsSync49(bundledPath))
       return { synced: false, reason: "no-bundled" };
-    const raw = readFileSync30(bundledPath, "utf-8");
+    const raw = readFileSync31(bundledPath, "utf-8");
     const snapshotPath = syncSnapshotPath(override);
-    if (existsSync49(snapshotPath) && readFileSync30(snapshotPath, "utf-8") === raw) {
+    if (existsSync49(snapshotPath) && readFileSync31(snapshotPath, "utf-8") === raw) {
       return { synced: false, reason: "unchanged" };
     }
     const bundled = JSON.parse(raw);
@@ -25227,11 +25571,11 @@ __export(exports_probe, {
   getCachedProbeResult: () => getCachedProbeResult,
   cacheKey: () => cacheKey
 });
-import { existsSync as existsSync50, readFileSync as readFileSync31, writeFileSync as writeFileSync19, mkdirSync as mkdirSync20 } from "fs";
-import { join as join42, dirname as dirname18 } from "path";
+import { existsSync as existsSync50, readFileSync as readFileSync32, writeFileSync as writeFileSync19, mkdirSync as mkdirSync20 } from "fs";
+import { join as join43, dirname as dirname18 } from "path";
 import { homedir as homedir14 } from "os";
 function cachePath() {
-  return join42(homedir14(), ".mma", "reasoning-cache.json");
+  return join43(homedir14(), ".mma", "reasoning-cache.json");
 }
 async function probeReasoningSupport(provider, strategy, signal) {
   if (strategy === "none")
@@ -25288,7 +25632,7 @@ function readDiskCache() {
   try {
     const path = cachePath();
     if (existsSync50(path)) {
-      return JSON.parse(readFileSync31(path, "utf-8"));
+      return JSON.parse(readFileSync32(path, "utf-8"));
     }
   } catch {}
   return {};
@@ -25389,8 +25733,8 @@ __export(exports_bootstrap, {
   bootstrap: () => bootstrap
 });
 import { homedir as homedir15 } from "os";
-import { join as join43, resolve as resolve22 } from "path";
-import { existsSync as existsSync51, readFileSync as readFileSync32 } from "fs";
+import { join as join44, resolve as resolve22 } from "path";
+import { existsSync as existsSync51, readFileSync as readFileSync33 } from "fs";
 function applyReasoningCliOverride(config, reasoningLevel) {
   if (!reasoningLevel || reasoningLevel === "auto")
     return;
@@ -25416,13 +25760,13 @@ function loadAgentsMdBlocks(baseDir, dir, skip) {
     return [];
   const blocks = [];
   const candidates = [
-    join43(baseDir, "AGENTS.md"),
-    join43(baseDir, ".mma", "AGENTS.md"),
-    join43(dir, "AGENTS.md")
+    join44(baseDir, "AGENTS.md"),
+    join44(baseDir, ".mma", "AGENTS.md"),
+    join44(dir, "AGENTS.md")
   ];
   for (const p of candidates) {
     if (existsSync51(p)) {
-      const content = readFileSync32(p, "utf-8").trim();
+      const content = readFileSync33(p, "utf-8").trim();
       if (content) {
         blocks.push({
           content,
@@ -25499,8 +25843,8 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
 `);
 }
 async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reasoningLevel) {
-  const dir = configDir || process.env.MMA_CONFIG_DIR || join43(homedir15(), ".mma");
-  const projectConfigPath = projectDir ? join43(projectDir, ".mmrc") : join43(process.cwd(), ".mmrc");
+  const dir = configDir || process.env.MMA_CONFIG_DIR || join44(homedir15(), ".mma");
+  const projectConfigPath = projectDir ? join44(projectDir, ".mmrc") : join44(process.cwd(), ".mmrc");
   const { config, legacyDetected } = loadConfig({ configDir: dir, projectConfigPath });
   setLocale(config.locale);
   applyReasoningCliOverride(config, reasoningLevel);
@@ -25511,7 +25855,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reas
     }
   } catch {}
   const logger4 = new Logger(config.logLevel);
-  logger4.setLogDir(join43(dir, "logs"));
+  logger4.setLogDir(join44(dir, "logs"));
   logger4.debug("MMA bootstrap", {
     version: config.version,
     model: config.model
@@ -25540,7 +25884,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reas
       logger4.info(`Model ${config.model} loaded in ${loadResult.loadTime}s`);
     }
   }
-  const profile = new UserProfile(join43(dir));
+  const profile = new UserProfile(join44(dir));
   profile.load() || profile.collect();
   profile.save();
   const llmProvider = buildActiveProvider(config, logger4).provider;
@@ -25574,7 +25918,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reas
   for (const warning of envReport.warnings) {
     logger4.warn(warning);
   }
-  const projectMapCacheDir = join43(baseDir, ".mma");
+  const projectMapCacheDir = join44(baseDir, ".mma");
   const indexerModule = new IndexerModule({
     baseDir,
     cacheDir: projectMapCacheDir
@@ -25585,9 +25929,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reas
     logger4.warn(`Project indexing failed: ${err.message}`);
   }
   const skillsLoader = new SkillsLoader;
-  const builtinDir = join43(import.meta.dirname, "skills", "builtin");
-  const globalDir = join43(homedir15(), ".agents", "skills");
-  const projectSkillsDir = join43(baseDir, ".mma", "skills");
+  const builtinDir = join44(import.meta.dirname, "skills", "builtin");
+  const globalDir = join44(homedir15(), ".agents", "skills");
+  const projectSkillsDir = join44(baseDir, ".mma", "skills");
   const availableSkills = skillsLoader.loadFromAllSources(builtinDir, globalDir, projectSkillsDir);
   const skillsBudget = Math.floor(config.contextWindow * config.skills.budget);
   const skillsModule = new SkillsModule(availableSkills, skillsBudget);
@@ -25603,7 +25947,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reas
     essential: true,
     estimatedTokens: estimateTokens(systemInfoContent)
   };
-  const sessionDir = join43(dir, "sessions");
+  const sessionDir = join44(dir, "sessions");
   const sessionStore = new SessionStore(sessionDir);
   sessionStore.init();
   const sessionManager = new SessionManager(sessionStore, {
@@ -25687,7 +26031,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reas
     logger4.warn(`MCP init failed or timed out (${err instanceof Error ? err.message.slice(0, 120) : String(err)}) — continuing without MCP tools.`);
   }
   moduleRegistry.register(mcpModule);
-  const memoryStore = new MemoryStore(join43(dir, "memory"));
+  const memoryStore = new MemoryStore(join44(dir, "memory"));
   const memoryModule = new MemoryModule(memoryStore);
   moduleRegistry.register(memoryModule);
   if (config.browser.enabled) {
@@ -25714,8 +26058,8 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete, reas
   pluginManager.register(plugin);
   pluginManager.register(plugin2);
   const pluginLoader = new PluginLoader;
-  const globalPluginsDir = join43(homedir15(), ".mma", "plugins");
-  const projectPluginsDir = join43(baseDir, ".mma", "plugins");
+  const globalPluginsDir = join44(homedir15(), ".mma", "plugins");
+  const projectPluginsDir = join44(baseDir, ".mma", "plugins");
   const mmaVersion = readMmaVersion();
   pluginLoader.loadFromDir(globalPluginsDir, pluginManager, logger4, {
     source: "global",
@@ -34087,6 +34431,50 @@ var init_scenarios = __esm(() => {
         { type: "fileContent", path: "file-b.txt", contains: "beta" }
       ]
     },
+    {
+      id: "5.2-moe-parallel-waves",
+      title: "MoE parallel waves with distinct deliverables",
+      tags: ["moe"],
+      mode: "run",
+      timeoutMs: 600000,
+      prompt: "Create three files. These are independent tasks that must run in parallel: wave-one.txt containing 'w1-done', wave-two.txt containing 'w2-done', and wave-three.txt containing 'w3-done'. After all three exist, report completion.",
+      config: {
+        moe: { enabled: true },
+        orchestrator: { model: "" },
+        experts: {
+          code: { model: "", tool_tags: ["file", "code"], max_attempts: 3 }
+        }
+      },
+      checks: [
+        { type: "fileExists", path: "wave-one.txt" },
+        { type: "fileExists", path: "wave-two.txt" },
+        { type: "fileExists", path: "wave-three.txt" },
+        { type: "fileContent", path: "wave-one.txt", contains: "w1-done" },
+        { type: "fileContent", path: "wave-two.txt", contains: "w2-done" },
+        { type: "fileContent", path: "wave-three.txt", contains: "w3-done" }
+      ]
+    },
+    {
+      id: "5.3-moe-read-after-write",
+      title: "MoE read-after-write via input_from dependency",
+      tags: ["moe"],
+      mode: "run",
+      timeoutMs: 600000,
+      prompt: "Two sequential steps. Step 1: create data.txt containing the exact token DATA_TOKEN_XYZ. Step 2 (depends on step 1 — it reads data.txt): create summary.txt that contains the exact token DATA_TOKEN_XYZ copied from data.txt. Step 2 must only run after data.txt exists.",
+      config: {
+        moe: { enabled: true },
+        orchestrator: { model: "" },
+        experts: {
+          code: { model: "", tool_tags: ["file", "code"], max_attempts: 3 }
+        }
+      },
+      checks: [
+        { type: "fileExists", path: "data.txt" },
+        { type: "fileExists", path: "summary.txt" },
+        { type: "fileContent", path: "data.txt", contains: "DATA_TOKEN_XYZ" },
+        { type: "fileContent", path: "summary.txt", contains: "DATA_TOKEN_XYZ" }
+      ]
+    },
     {
       id: "6.2-project-map",
       title: "Project map summary",
@@ -34117,8 +34505,8 @@ var init_scenarios = __esm(() => {
 });
 
 // src/modules/certification/loader.ts
-import { existsSync as existsSync53, readdirSync as readdirSync17, readFileSync as readFileSync34 } from "fs";
-import { join as join46 } from "path";
+import { existsSync as existsSync53, readdirSync as readdirSync17, readFileSync as readFileSync35 } from "fs";
+import { join as join47 } from "path";
 function validateScenario(s) {
   const errors2 = [];
   const isSkip = s.mode === "skip";
@@ -34175,7 +34563,7 @@ function loadScenarios(userDir) {
       if (!file.endsWith(".yaml") && !file.endsWith(".yml"))
         continue;
       try {
-        const raw = readFileSync34(join46(userDir, file), "utf-8");
+        const raw = readFileSync35(join47(userDir, file), "utf-8");
         const data = $parse(raw);
         const parsed = normalizeScenario(data, file);
         const errs = validateScenario(parsed);
@@ -34238,8 +34626,8 @@ var init_loader3 = __esm(() => {
 });
 
 // src/modules/certification/fact-checker.ts
-import { existsSync as existsSync54, readFileSync as readFileSync35, statSync as statSync9 } from "fs";
-import { join as join47 } from "path";
+import { existsSync as existsSync54, readFileSync as readFileSync36, statSync as statSync9 } from "fs";
+import { join as join48 } from "path";
 function checkSandbox(sandboxDir, checks, exitCode, output) {
   const failures = [];
   for (const check of checks) {
@@ -34256,16 +34644,16 @@ function runCheck2(sandboxDir, check, exitCode, output) {
     case "outputContains":
       return output.includes(check.text);
     case "fileExists":
-      return isFile(join47(sandboxDir, check.path));
+      return isFile(join48(sandboxDir, check.path));
     case "fileNotExists":
-      return !existsSync54(join47(sandboxDir, check.path));
+      return !existsSync54(join48(sandboxDir, check.path));
     case "dirExists":
-      return isDir(join47(sandboxDir, check.path));
+      return isDir(join48(sandboxDir, check.path));
     case "fileContent": {
-      const abs = join47(sandboxDir, check.path);
+      const abs = join48(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
-      const content = readFileSync35(abs, "utf-8");
+      const content = readFileSync36(abs, "utf-8");
       if (check.contains !== undefined)
         return content.includes(check.contains);
       if (check.equals !== undefined)
@@ -34273,10 +34661,10 @@ function runCheck2(sandboxDir, check, exitCode, output) {
       return false;
     }
     case "fileRegex": {
-      const abs = join47(sandboxDir, check.path);
+      const abs = join48(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
-      return new RegExp(check.pattern).test(readFileSync35(abs, "utf-8"));
+      return new RegExp(check.pattern).test(readFileSync36(abs, "utf-8"));
     }
     default:
       return false;
@@ -34322,8 +34710,8 @@ var init_fact_checker = () => {};
 
 // src/modules/certification/runner.ts
 import { spawn as spawn10 } from "child_process";
-import { existsSync as existsSync55, mkdirSync as mkdirSync21, rmSync as rmSync4, cpSync as cpSync2, writeFileSync as writeFileSync21, readdirSync as readdirSync18, readFileSync as readFileSync36 } from "fs";
-import { join as join48, resolve as resolve23, dirname as dirname21, relative as relative7 } from "path";
+import { existsSync as existsSync55, mkdirSync as mkdirSync21, rmSync as rmSync4, cpSync as cpSync2, writeFileSync as writeFileSync21, readdirSync as readdirSync18, readFileSync as readFileSync37 } from "fs";
+import { join as join49, resolve as resolve23, dirname as dirname21, relative as relative7 } from "path";
 async function runScenario(scenario, opts) {
   if (scenario.mode === "skip") {
     return {
@@ -34343,7 +34731,7 @@ async function runScenario(scenario, opts) {
   let firstError;
   let lastFailedSandbox;
   for (let i = 1;i <= reps; i++) {
-    const sandbox = join48(opts.sandboxBase, `run-${scenario.id}-${i}`);
+    const sandbox = join49(opts.sandboxBase, `run-${scenario.id}-${i}`);
     let failures = [];
     let exitCode = -1;
     let output = "";
@@ -34367,9 +34755,9 @@ async function runScenario(scenario, opts) {
         env3.MMA_PROVIDER_APIKEY = opts.providerKey;
       if (scenario.config && opts.baseConfig) {
         const merged = deepMergeAny(opts.baseConfig, scenario.config);
-        const certConfigDir = join48(sandbox, ".mma");
+        const certConfigDir = join49(sandbox, ".mma");
         mkdirSync21(certConfigDir, { recursive: true });
-        writeFileSync21(join48(certConfigDir, "config.json"), JSON.stringify(merged, null, 2), "utf-8");
+        writeFileSync21(join49(certConfigDir, "config.json"), JSON.stringify(merged, null, 2), "utf-8");
         env3.MMA_CONFIG_DIR = certConfigDir;
       }
       const res = await runner(env3, opts.mmaRoot, args, timeoutMs);
@@ -34416,11 +34804,11 @@ function prepareSandbox(sandbox, scenario, mmaRoot) {
   rmSync4(sandbox, { recursive: true, force: true });
   mkdirSync21(sandbox, { recursive: true });
   for (const f of scenario.fixtures ?? []) {
-    const src = join48(mmaRoot, f.source);
+    const src = join49(mmaRoot, f.source);
     if (!existsSync55(src)) {
       throw new Error(`fixture missing: ${f.source}`);
     }
-    const dest = join48(sandbox, f.dest);
+    const dest = join49(sandbox, f.dest);
     mkdirSync21(dirname21(dest), { recursive: true });
     cpSync2(src, dest);
   }
@@ -34433,10 +34821,10 @@ function collectDiagnostics(sandbox) {
   } else {
     lines.push("  Files created: (none)");
   }
-  const planPath = join48(sandbox, ".mma", "plans", "active.json");
+  const planPath = join49(sandbox, ".mma", "plans", "active.json");
   if (existsSync55(planPath)) {
     try {
-      const plan = JSON.parse(readFileSync36(planPath, "utf-8"));
+      const plan = JSON.parse(readFileSync37(planPath, "utf-8"));
       const steps = plan.steps ?? [];
       const done = steps.filter((s) => s.status === "done").length;
       const pending = steps.filter((s) => s.status === "pending" || s.status === "in_progress");
@@ -34455,7 +34843,7 @@ function listFiles(dir, root) {
     for (const entry of readdirSync18(dir, { withFileTypes: true })) {
       if (entry.name === ".mma")
         continue;
-      const abs = join48(dir, entry.name);
+      const abs = join49(dir, entry.name);
       const rel = toForwardSlash(relative7(root, abs));
       if (entry.isDirectory()) {
         result.push(...listFiles(abs, root));
@@ -34467,15 +34855,15 @@ function listFiles(dir, root) {
   return result;
 }
 function resolveMmaEntry(mmaRoot) {
-  const dev = join48(mmaRoot, "src", "cli", "main.ts");
+  const dev = join49(mmaRoot, "src", "cli", "main.ts");
   if (existsSync55(dev))
     return dev;
-  return join48(mmaRoot, "dist", "main.js");
+  return join49(mmaRoot, "dist", "main.js");
 }
 function findMmaRoot(fromDir) {
   const candidates = [resolve23(fromDir, "..", "..", ".."), resolve23(fromDir, "..")];
   for (const c of candidates) {
-    if (existsSync55(join48(c, "package.json")))
+    if (existsSync55(join49(c, "package.json")))
       return c;
   }
   return process.cwd();
@@ -34543,15 +34931,15 @@ __export(exports_cli, {
   certList: () => certList
 });
 import { rmSync as rmSync5, writeFileSync as writeFileSync22 } from "fs";
-import { join as join49, dirname as dirname22 } from "path";
+import { join as join50, dirname as dirname22 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
-import { existsSync as existsSync56, readFileSync as readFileSync37 } from "fs";
+import { existsSync as existsSync56, readFileSync as readFileSync38 } from "fs";
 function readVersion() {
-  const candidates = [join49(MMA_ROOT, "package.json")];
+  const candidates = [join50(MMA_ROOT, "package.json")];
   for (const p of candidates) {
     if (existsSync56(p)) {
       try {
-        const raw = JSON.parse(readFileSync37(p, "utf-8"));
+        const raw = JSON.parse(readFileSync38(p, "utf-8"));
         if (raw.version)
           return raw.version;
       } catch {}
@@ -34564,7 +34952,7 @@ function parseTags(s) {
 }
 async function certify(opts) {
   const providerUrl = opts.providerUrl || opts.config.provider.baseUrl;
-  const { scenarios, errors: errors2 } = loadScenarios(join49(opts.projectDir, ".mma", "certification", "scenarios"));
+  const { scenarios, errors: errors2 } = loadScenarios(join50(opts.projectDir, ".mma", "certification", "scenarios"));
   for (const e of errors2)
     console.error(pc2.yellow(`  ${e}`));
   let selected = filterByTags(scenarios, opts.tags);
@@ -34595,7 +34983,7 @@ async function certify(opts) {
     return;
   }
   console.log(t("cli.cert_started", { model: opts.name, provider: providerUrl }));
-  const sandboxBase = join49(process.cwd(), ".mma", "certification");
+  const sandboxBase = join50(process.cwd(), ".mma", "certification");
   const results = [];
   const total = selected.length;
   let idx = 0;
@@ -34728,10 +35116,10 @@ function printResults(results) {
   }
 }
 function writeReport(entry, projectDir) {
-  const reportDir = join49(projectDir, "certification");
+  const reportDir = join50(projectDir, "certification");
   const ts = entry.certifiedAt.replace(/[:.]/g, "-").slice(0, 19);
   const filename = `report-${entry.model.replace(/[/\\:]/g, "_")}-${ts}.json`;
-  const reportPath = join49(reportDir, filename);
+  const reportPath = join50(reportDir, filename);
   const report = {
     model: entry.model,
     providerUrl: entry.providerUrl,
@@ -34774,7 +35162,7 @@ __export(exports_repl_commands, {
   registerAllCommands: () => registerAllCommands,
   COMMAND_GROUPS: () => COMMAND_GROUPS
 });
-import { join as join51, dirname as dirname24 } from "path";
+import { join as join52, dirname as dirname24 } from "path";
 import { existsSync as existsSync58 } from "fs";
 function registerAllCommands(ctx) {
   registerBuiltinCommands(ctx);
@@ -34957,7 +35345,7 @@ function registerConfigCommands(ctx) {
       console.log(pc2.yellow(t("repl.wizard_running")));
       await ctx.withExclusiveInput(async () => {
         const answers = await runSetup(ctx.rl);
-        const configPath = join51(ctx.configDir, "config.json");
+        const configPath = join52(ctx.configDir, "config.json");
         ctx.config.provider.type = answers.provider;
         ctx.config.provider.baseUrl = answers.apiBase;
         ctx.config.provider.apiKey = answers.apiKey;
@@ -35081,7 +35469,7 @@ function registerProviderCommands(ctx) {
           return;
         }
         ctx.config.model = name;
-        const configPath = join51(ctx.configDir, "config.json");
+        const configPath = join52(ctx.configDir, "config.json");
         saveConfig(ctx.config, configPath, dirname24(configPath));
         await ctx.agent.reconfigure(ctx.config);
         console.log(pc2.green(t("repl.model_set", { name })));
@@ -35106,7 +35494,7 @@ function registerProviderCommands(ctx) {
         return;
       }
       ctx.config.contextWindow = size;
-      const configPath = join51(ctx.configDir, "config.json");
+      const configPath = join52(ctx.configDir, "config.json");
       saveConfig(ctx.config, configPath, dirname24(configPath));
       await ctx.agent.reconfigure(ctx.config);
       console.log(pc2.green(t("cli.context_set", { size })));
@@ -35470,7 +35858,7 @@ async function runConfigMigrate(ctx) {
   const { hasDomainFiles: hasDomainFiles3 } = await Promise.resolve().then(() => (init_domains(), exports_domains));
   const { loadConfig: loadCfg } = await Promise.resolve().then(() => (init_config2(), exports_config));
   const configDir = ctx.configDir;
-  const configPath = join51(configDir, "config.json");
+  const configPath = join52(configDir, "config.json");
   if (hasDomainFiles3(configDir)) {
     console.log(pc2.yellow(t("config.migrate_no_legacy")));
     return;
@@ -35480,11 +35868,11 @@ async function runConfigMigrate(ctx) {
     return;
   }
   console.log(t("config.migrate_start"));
-  const { config } = loadCfg({ configDir, projectConfigPath: join51(configDir, ".mmrc") });
+  const { config } = loadCfg({ configDir, projectConfigPath: join52(configDir, ".mmrc") });
   saveConfig(config, configPath, configDir);
   const { renameSync: renameSync4, readdirSync: readdirSync19 } = await import("fs");
   renameSync4(configPath, configPath + ".bak");
-  const domainFiles = readdirSync19(join51(configDir, "config")).filter((f) => f.endsWith(".json"));
+  const domainFiles = readdirSync19(join52(configDir, "config")).filter((f) => f.endsWith(".json"));
   console.log(pc2.green(t("config.migrate_done", { count: String(domainFiles.length) })));
 }
 var version2, COMMAND_GROUPS;
@@ -35546,14 +35934,14 @@ init_config2();
 init_setup();
 init_i18n();
 init_colors();
-import { join as join50, dirname as dirname23 } from "path";
+import { join as join51, dirname as dirname23 } from "path";
 import { homedir as homedir17 } from "os";
 import { existsSync as existsSync57 } from "fs";
 
 // src/cli/security-commands.ts
 init_bootstrap();
 init_config2();
-import { join as join44, dirname as dirname19 } from "path";
+import { join as join45, dirname as dirname19 } from "path";
 import { homedir as homedir16 } from "os";
 
 // src/modules/security/security-policies.ts
@@ -36079,7 +36467,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 = join44(homedir16(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const validPresets = ["strict", "balanced", "permissive"];
     if (!validPresets.includes(preset)) {
@@ -36094,7 +36482,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 = join44(homedir16(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const security = appConfig.security = appConfig.security || {};
     toggleSessionEncryption(security, true);
@@ -36102,7 +36490,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 = join44(homedir16(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const security = appConfig.security = appConfig.security || {};
     toggleSessionEncryption(security, false);
@@ -36110,7 +36498,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 = join44(homedir16(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const security = appConfig.security = appConfig.security || {};
     toggleAuditNotifier(security, true);
@@ -36118,7 +36506,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 = join44(homedir16(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const security = appConfig.security = appConfig.security || {};
     toggleAuditNotifier(security, false);
@@ -36225,8 +36613,8 @@ function targetsFromProviders(entries) {
 init_version();
 
 // src/modules/updater/changelog-reader.ts
-import { readFileSync as readFileSync33, existsSync as existsSync52 } from "fs";
-import { dirname as dirname20, join as join45 } from "path";
+import { readFileSync as readFileSync34, existsSync as existsSync52 } from "fs";
+import { dirname as dirname20, join as join46 } from "path";
 function readChangelog(packageName) {
   try {
     let dir = dirname20(import.meta.url);
@@ -36234,13 +36622,13 @@ function readChangelog(packageName) {
       dir = decodeURIComponent(dir.slice(7));
     }
     for (let i = 0;i < 10; i++) {
-      const pkgPath = join45(dir, "package.json");
+      const pkgPath = join46(dir, "package.json");
       if (existsSync52(pkgPath)) {
-        const pkg = JSON.parse(readFileSync33(pkgPath, "utf-8"));
+        const pkg = JSON.parse(readFileSync34(pkgPath, "utf-8"));
         if (pkg.name === packageName) {
-          const changelogPath = join45(dir, "CHANGELOG.md");
+          const changelogPath = join46(dir, "CHANGELOG.md");
           if (existsSync52(changelogPath)) {
-            return readFileSync33(changelogPath, "utf-8");
+            return readFileSync34(changelogPath, "utf-8");
           }
           return null;
         }
@@ -36307,7 +36695,7 @@ var version = readMmaVersion();
 function buildInitCommand(program2) {
   program2.command("init").description(t("cli.init")).action(async () => {
     const answers = await runSetup();
-    const configPath = join50(homedir17(), ".mma", "config.json");
+    const configPath = join51(homedir17(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = answers.provider;
     config.provider.baseUrl = answers.apiBase;
@@ -36354,7 +36742,7 @@ function buildInitCommand(program2) {
 function buildConfigCommands(program2) {
   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 = join50(homedir17(), ".mma", "config.json");
+    const configPath = join51(homedir17(), ".mma", "config.json");
     const { config } = await bootstrap();
     const keys = key.split(".");
     let obj = config;
@@ -36384,8 +36772,8 @@ function buildConfigCommands(program2) {
   configCmd.command("migrate").description(t("cli.migrate_config")).action(async () => {
     const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config2(), exports_config));
     const { hasDomainFiles: hasDomainFiles3 } = await Promise.resolve().then(() => (init_domains(), exports_domains));
-    const configDir = join50(homedir17(), ".mma");
-    const configPath = join50(configDir, "config.json");
+    const configDir = join51(homedir17(), ".mma");
+    const configPath = join51(configDir, "config.json");
     if (hasDomainFiles3(configDir)) {
       console.log(pc2.yellow(t("config.migrate_no_legacy")));
       return;
@@ -36395,13 +36783,13 @@ function buildConfigCommands(program2) {
       return;
     }
     console.log(t("config.migrate_start"));
-    const { config } = loadConfig2({ configDir, projectConfigPath: join50(configDir, ".mmrc") });
+    const { config } = loadConfig2({ configDir, projectConfigPath: join51(configDir, ".mmrc") });
     saveConfig(config, configPath, configDir);
     const bakPath = configPath + ".bak";
     const { renameSync: renameSync4 } = await import("fs");
     renameSync4(configPath, bakPath);
     const { readdirSync: readdirSync19 } = await import("fs");
-    const domainFiles = readdirSync19(join50(configDir, "config")).filter((f) => f.endsWith(".json"));
+    const domainFiles = readdirSync19(join51(configDir, "config")).filter((f) => f.endsWith(".json"));
     console.log(pc2.green(t("config.migrate_done", { count: String(domainFiles.length) })));
   });
 }
@@ -36443,7 +36831,7 @@ function buildModelCommands(program2) {
     console.log(t("cli.model_hint"));
   });
   model.command("use").argument("<name>", "Model name").description(t("cli.set_model")).action(async (name) => {
-    const configPath = join50(homedir17(), ".mma", "config.json");
+    const configPath = join51(homedir17(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.model = name;
     saveConfig(config, configPath, dirname23(configPath));
@@ -36484,7 +36872,7 @@ function buildModelCommands(program2) {
 }
 function buildContextCommand(program2) {
   program2.command("context").description(t("cli.manage_context")).argument("<size>", "Context window size in tokens").action(async (size) => {
-    const configPath = join50(homedir17(), ".mma", "config.json");
+    const configPath = join51(homedir17(), ".mma", "config.json");
     const { config } = await bootstrap();
     const contextWindow = parseInt(size, 10);
     if (isNaN(contextWindow) || contextWindow < 1024) {
@@ -36532,7 +36920,7 @@ function buildProviderCommands(program2) {
     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 = join50(homedir17(), ".mma", "config.json");
+    const configPath = join51(homedir17(), ".mma", "config.json");
     const { config, agent } = await bootstrap();
     if (config.provider.entries && config.provider.entries.length > 0) {
       try {
@@ -36555,7 +36943,7 @@ function buildProviderCommands(program2) {
     }
   });
   provider.command("add").argument("<name>", "Provider type or label").option("--url <url>", "Base URL").option("--key <key>", "API key").option("--priority <n>", "Fallback priority (lower = tried first)").option("--context-window <n>", "Context window override for this entry").option("--rpm <n>", "Max requests per minute for this entry").option("--parallel <n>", "Max parallel tasks for this entry").description(t("cli.add_provider")).action(async (name, opts) => {
-    const configPath = join50(homedir17(), ".mma", "config.json");
+    const configPath = join51(homedir17(), ".mma", "config.json");
     const { config } = await bootstrap();
     const entries = Array.isArray(config.provider.entries) ? config.provider.entries : [];
     if (entries.length === 0) {
@@ -36622,6 +37010,24 @@ function buildSessionCommands(program2) {
     console.log(`Model:        ${meta.model}`);
     console.log(`Context:      ${meta.contextWindow}`);
     console.log(`Project:      ${meta.projectDir}`);
+    const moeEvents = sessionManager.loadSessionLog(id).filter((e) => e.type.startsWith("moe_"));
+    if (moeEvents.length > 0) {
+      console.log("");
+      console.log(pc2.cyan("MoE events:"));
+      for (const e of moeEvents) {
+        const ts = e.ts.slice(11, 19);
+        if (e.type === "moe_subtask") {
+          console.log(`  ${pc2.dim(ts)} [subtask] ${e.subtaskId} (${e.expertTag}) ${e.status ?? ""}${e.durationMs !== undefined ? ` ${e.durationMs}ms` : ""}`);
+        } else if (e.type === "moe_plan") {
+          console.log(`  ${pc2.dim(ts)} [plan] ${e.status === "ok" ? e.subtaskIds?.join(", ") : e.status}`);
+        } else if (e.type === "moe_replan") {
+          console.log(`  ${pc2.dim(ts)} [replan] cycle ${e.cycle}: ${e.subtaskIds?.join(", ")}`);
+        } else {
+          const usage = e.usageByTag ? " | usage: " + Object.entries(e.usageByTag).map(([tag, u]) => `${tag}=${u.totalTokens}t`).join(", ") : "";
+          console.log(`  ${pc2.dim(ts)} [verify] ${e.decision ?? e.status ?? "?"}${e.explanation ? ` — ${e.explanation}` : ""}${usage}`);
+        }
+      }
+    }
   });
   session2.command("delete").argument("<id>", "Session id").description(t("cli.delete_session")).action(async (id) => {
     const { sessionManager } = await bootstrap();
@@ -36667,6 +37073,11 @@ function createProgram() {
   createPluginCommand(program2);
   buildChangelogCommand(program2);
   program2.argument("[prompt...]", "Prompt to execute").description("Run a single prompt").action((prompt) => {});
+  for (const cmd of program2.commands) {
+    cmd.hook("postAction", () => {
+      process.exit(0);
+    });
+  }
   return program2;
 }
 
@@ -37543,8 +37954,8 @@ class LineEditor {
 }
 
 // src/cli/repl.ts
-import { existsSync as existsSync59, readFileSync as readFileSync39, writeFileSync as writeFileSync23 } from "fs";
-import { join as join52 } from "path";
+import { existsSync as existsSync59, readFileSync as readFileSync40, writeFileSync as writeFileSync23 } from "fs";
+import { join as join53 } from "path";
 import { homedir as homedir18 } from "os";
 
 // src/cli/completer.ts
@@ -38376,10 +38787,10 @@ class Repl {
     this.envReport = envReport;
     this.execModule = execModule;
     this.slog = new SessionLogger(sessionManager, logger4);
-    this.configDir = configDir || join52(homedir18(), ".mma");
+    this.configDir = configDir || join53(homedir18(), ".mma");
     this.baseDir = baseDir || process.cwd();
     this.noAgentsMd = noAgentsMd === true;
-    this.historyPath = historyPath ?? join52(homedir18(), ".mma", "repl-history");
+    this.historyPath = historyPath ?? join53(homedir18(), ".mma", "repl-history");
     this.loadHistory();
     this.rl = process.stdin.isTTY ? new LineEditor({
       input: process.stdin,
@@ -38434,7 +38845,7 @@ class Repl {
     const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config2(), exports_config));
     const { bootstrap: bootstrap2 } = await Promise.resolve().then(() => (init_bootstrap(), exports_bootstrap));
     this.agent.shutdown();
-    const projectConfigPath = join52(this.baseDir, ".mmrc");
+    const projectConfigPath = join53(this.baseDir, ".mmrc");
     const { config: freshConfig } = loadConfig2({
       configDir: this.configDir,
       projectConfigPath
@@ -38452,7 +38863,7 @@ class Repl {
   loadHistory() {
     if (existsSync59(this.historyPath)) {
       try {
-        const raw = readFileSync39(this.historyPath, "utf-8");
+        const raw = readFileSync40(this.historyPath, "utf-8");
         this.history = raw.split(`
 `).filter(Boolean).slice(-this.maxHistory);
       } catch {
@@ -38853,9 +39264,9 @@ ${t("image.clipboard_empty")}`));
       row(t("repl.agents_label"), pc2.red(t("repl.disabled")));
     } else {
       const agentsMdCandidates = [
-        join52(this.baseDir, "AGENTS.md"),
-        join52(this.baseDir, ".mma", "AGENTS.md"),
-        join52(this.configDir, "AGENTS.md")
+        join53(this.baseDir, "AGENTS.md"),
+        join53(this.baseDir, ".mma", "AGENTS.md"),
+        join53(this.configDir, "AGENTS.md")
       ];
       const foundAgents = agentsMdCandidates.filter((p) => existsSync59(p));
       if (foundAgents.length > 0) {
@@ -38868,7 +39279,7 @@ ${t("image.clipboard_empty")}`));
     }
     const meta = this.sessionManager?.getActiveMeta();
     if (meta) {
-      const sessionPath = join52(this.configDir, "sessions", meta.id);
+      const sessionPath = join53(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 isTty2 = process.stdout.isTTY === true;
@@ -38984,7 +39395,7 @@ init_config2();
 init_i18n();
 init_colors();
 import { existsSync as existsSync60 } from "fs";
-import { join as join54, dirname as dirname25 } from "path";
+import { join as join55, dirname as dirname25 } from "path";
 import { homedir as homedir20 } from "os";
 
 // src/modules/updater/index.ts
@@ -39099,9 +39510,9 @@ init_data_sanitizer();
 init_i18n();
 init_utils();
 import { appendFileSync as appendFileSync7, mkdirSync as mkdirSync22 } from "fs";
-import { join as join53 } from "path";
+import { join as join54 } from "path";
 import { homedir as homedir19 } from "os";
-var CRASH_LOG_DIR = join53(homedir19(), ".mma", "logs");
+var CRASH_LOG_DIR = join54(homedir19(), ".mma", "logs");
 var CRASH_LOG_FILE = "crash.jsonl";
 function formatCrashEntry(type2, err) {
   const message = errMsg(err);
@@ -39117,7 +39528,7 @@ function formatCrashEntry(type2, err) {
 function writeCrashEntry(dir, entry) {
   try {
     mkdirSync22(dir, { recursive: true });
-    appendFileSync7(join53(dir, CRASH_LOG_FILE), JSON.stringify(entry) + `
+    appendFileSync7(join54(dir, CRASH_LOG_FILE), JSON.stringify(entry) + `
 `, "utf-8");
   } catch {}
 }
@@ -39294,8 +39705,8 @@ async function main() {
     await updater?.waitForIdle();
     process.exit(exitCode);
   } else {
-    const mmaDir = process.env.MMA_CONFIG_DIR || join54(homedir20(), ".mma");
-    const legacyConfigPath = join54(mmaDir, "config.json");
+    const mmaDir = process.env.MMA_CONFIG_DIR || join55(homedir20(), ".mma");
+    const legacyConfigPath = join55(mmaDir, "config.json");
     let hasAnyConfig = existsSync60(legacyConfigPath);
     if (!hasAnyConfig) {
       try {