micro-models-agent 0.63.3 → 1.1.0

package/dist/cli/repl-commands.js

@@ -4,10 +4,14 @@ import { renderTable } from "../ui/table";
 import { t } from "../i18n/index";
 import { runSetup } from "./setup";
 import { saveConfig } from "../config/config";
+import { HOSTED_BASE_URLS } from "../modules/providers/presets";
+import { budgetBreakdownLines, setBudgetShare } from "../config/budget";
 import { getMessageText } from "../llm/provider";
+import { estimateTokens } from "../llm/token-counter";
 import { join, dirname } from "path";
-import { homedir } from "os";
 import { existsSync } from "fs";
+import { runMapAction } from "../modules/indexer/map-command";
+import { errMsg } from "../utils";
 const version = readMmaVersion();
 export const COMMAND_GROUPS = {
     help: "general",
@@ -24,6 +28,7 @@ export const COMMAND_GROUPS = {
     reload: "agent",
     wizard: "agent",
     sysprompt: "agent",
+    map: "agent",
     lsp: "agent",
     sessions: "session",
     new: "session",
@@ -58,18 +63,18 @@ function registerBuiltinCommands(ctx) {
         description: t("repl.clear"),
         usage: t("repl.clear_usage"),
         action: () => {
-            console.clear();
+            ctx.output.clearScreen();
         },
     });
 }
-function registerMmaCommands(ctx) {
+function registerRunCommands(ctx) {
     ctx.registerCommand({
         name: "run",
         description: t("repl.run"),
         usage: t("repl.run_usage"),
         action: async (args) => {
             if (args.length === 0) {
-                console.log(t("repl.run_usage"));
+                ctx.output.writeLine(t("repl.run_usage"));
                 return;
             }
             const prompt = args.join(" ");
@@ -84,7 +89,7 @@ function registerMmaCommands(ctx) {
         action: async (args) => {
             const source = args.join(" ");
             if (!source) {
-                console.log(t("repl.image_usage"));
+                ctx.output.writeLine(t("repl.image_usage"));
                 return;
             }
             try {
@@ -96,7 +101,7 @@ function registerMmaCommands(ctx) {
                 if (source.toLowerCase() === "clipboard") {
                     const clipBuf = await readClipboardImage();
                     if (!clipBuf) {
-                        console.log(pc.yellow(t("image.clipboard_empty")));
+                        ctx.output.writeLine(pc.yellow(t("image.clipboard_empty")));
                         return;
                     }
                     const { bufferToDataUrl } = await import("../llm/image-utils");
@@ -112,7 +117,7 @@ function registerMmaCommands(ctx) {
                 else {
                     const absPath = resolve(process.cwd(), source);
                     if (!existsSync(absPath)) {
-                        console.log(pc.red(t("image.not_found", { path: source })));
+                        ctx.output.writeLine(pc.red(t("image.not_found", { path: source })), "stderr");
                         return;
                     }
                     const result = await loadFileAsDataUrl(absPath);
@@ -121,7 +126,7 @@ function registerMmaCommands(ctx) {
                 }
                 const contextManager = ctx.agent.contextManager;
                 if (!contextManager) {
-                    console.log(pc.red(t("image.no_context")));
+                    ctx.output.writeLine(pc.red(t("image.no_context")), "stderr");
                     return;
                 }
                 contextManager.addPendingImage({
@@ -129,76 +134,72 @@ function registerMmaCommands(ctx) {
                     image_url: { url: dataUrl },
                 });
                 const sizeKb = Math.round((dataUrl.length * 3) / 4 / 1024);
-                console.log(pc.green(t("image.attached", { source: label, size: `${sizeKb} KB` })));
+                ctx.output.writeLine(pc.green(t("image.attached", { source: label, size: `${sizeKb} KB` })));
             }
             catch (err) {
-                console.log(pc.red(t("image.error", { message: err.message })));
+                ctx.output.writeLine(pc.red(t("image.error", { message: err.message })), "stderr");
             }
         },
     });
+}
+function registerConfigCommands(ctx) {
     ctx.registerCommand({
         name: "config",
         description: t("repl.config"),
         usage: t("repl.config_usage"),
-        action: () => {
+        action: (args) => {
+            // Subcommand routing: `/config migrate`. A separate registration with
+            // a space in the name was unreachable — the dispatcher splits input on
+            // whitespace, so "/config migrate" always resolved to plain "config".
+            if ((args[0] ?? "").trim().toLowerCase() === "migrate") {
+                return runConfigMigrate(ctx);
+            }
             const cfg = ctx.config;
             const ctxW = cfg.contextWindow;
             const sys = Math.floor(ctxW * cfg.contextBudget.systemPrompt);
             const res = Math.floor(ctxW * cfg.contextBudget.responseReserve);
-            console.log(`${t("repl.model")}       ${cfg.model}`);
+            ctx.output.writeLine(`${t("repl.model")}       ${cfg.model}`);
             const providers = ctx.agent.listProviders();
             const active = providers.find((p) => p.active);
             if (active) {
-                console.log(`${t("repl.provider")}    ${active.label} (${pc.dim(active.type)})  →  ${pc.dim(active.baseUrl)}`);
+                ctx.output.writeLine(`${t("repl.provider")}    ${active.label} (${pc.dim(active.type)})  →  ${pc.dim(active.baseUrl)}`);
             }
             else {
-                console.log(`${t("repl.provider")}    ${cfg.provider.type}  →  ${cfg.provider.baseUrl}`);
-            }
-            console.log(`${t("repl.context")}     ${ctxW}  (sys:${sys}  res:${res}  hist:${ctxW - sys - res})`);
-            console.log(`${t("repl.max_iters")}   ${cfg.maxToolIterations}`);
-            console.log(`${t("repl.stuck_thresh")} ${cfg.stuckThreshold}`);
-            console.log(`${t("repl.reasoning_label")}   ${cfg.showReasoning ? pc.green(t("repl.show")) : pc.dim(t("repl.hide"))}`);
-            console.log(`${t("repl.log_level")}   ${cfg.logLevel}`);
-            console.log(`${t("repl.locale")}      ${cfg.locale}`);
+                ctx.output.writeLine(`${t("repl.provider")}    ${cfg.provider.type}  →  ${cfg.provider.baseUrl}`);
+            }
+            ctx.output.writeLine(`${t("repl.context")}     ${ctxW}  (sys:${sys}  res:${res}  hist:${ctxW - sys - res})`);
+            ctx.output.writeLine(`${t("repl.max_iters")}   ${cfg.maxToolIterations}`);
+            ctx.output.writeLine(`${t("repl.stuck_thresh")} ${cfg.stuckThreshold}`);
+            ctx.output.writeLine(`${t("repl.reasoning_label")}   ${cfg.showReasoning ? pc.green(t("repl.show")) : pc.dim(t("repl.hide"))}`);
+            ctx.output.writeLine(`${t("repl.log_level")}   ${cfg.logLevel}`);
+            ctx.output.writeLine(`${t("repl.locale")}      ${cfg.locale}`);
             const meta = ctx.sessionManager?.getActiveMeta();
             if (meta) {
-                console.log(`${t("repl.session_label")}     ${meta.name} (${meta.id})  —  ${meta.messageCount} msgs`);
-            }
-        },
-    });
-    ctx.registerCommand({
-        name: "config migrate",
-        description: t("cli.migrate_config"),
-        action: async () => {
-            const { hasDomainFiles } = await import("../config/domains");
-            const { loadConfig: loadCfg } = await import("../config/config");
-            const configDir = ctx.configDir;
-            const configPath = join(configDir, "config.json");
-            if (hasDomainFiles(configDir)) {
-                console.log(pc.yellow(t("config.migrate_no_legacy")));
-                return;
-            }
-            if (!existsSync(configPath)) {
-                console.log(pc.yellow(t("config.migrate_no_legacy")));
-                return;
+                ctx.output.writeLine(`${t("repl.session_label")}     ${meta.name} (${meta.id})  —  ${meta.messageCount} msgs`);
             }
-            console.log(t("config.migrate_start"));
-            const { config } = loadCfg({ configDir, projectConfigPath: join(configDir, ".mmrc") });
-            saveConfig(config, configPath, configDir);
-            const { renameSync, readdirSync } = await import("fs");
-            renameSync(configPath, configPath + ".bak");
-            const domainFiles = readdirSync(join(configDir, "config")).filter((f) => f.endsWith(".json"));
-            console.log(pc.green(t("config.migrate_done", { count: String(domainFiles.length) })));
         },
     });
     ctx.registerCommand({
         name: "reasoning",
         description: t("repl.reasoning"),
         usage: t("repl.reasoning_usage"),
-        action: () => {
-            ctx.config.showReasoning = !ctx.config.showReasoning;
-            const status = ctx.config.showReasoning ? pc.green(t("repl.show")) : pc.dim(t("repl.hide"));
-            console.log(t("repl.reasoning_status", { status }));
+        action: (args) => {
+            const level = args[0]?.trim().toLowerCase();
+            const VALID_LEVELS = ["auto", "none", "low", "medium", "high", "max"];
+            if (!level) {
+                // Toggle show/hide reasoning content
+                ctx.config.showReasoning = !ctx.config.showReasoning;
+                const status = ctx.config.showReasoning ? pc.green(t("repl.show")) : pc.dim(t("repl.hide"));
+                ctx.output.writeLine(t("repl.reasoning_status", { status }));
+            }
+            else if (VALID_LEVELS.includes(level)) {
+                // Set reasoning effort level
+                ctx.agent.setReasoningLevel(level);
+                ctx.output.writeLine(pc.green(t("repl.reasoning_level_set", { level })));
+            }
+            else {
+                ctx.output.writeLine(pc.yellow(t("repl.reasoning_invalid_level", { level, valid: VALID_LEVELS.join(", ") })));
+            }
         },
     });
     ctx.registerCommand({
@@ -208,16 +209,16 @@ function registerMmaCommands(ctx) {
         action: () => {
             const providers = ctx.agent.listProviders();
             const active = providers.find((p) => p.active);
-            console.log(`${t("repl.model")} ${ctx.config.model}`);
+            ctx.output.writeLine(`${t("repl.model")} ${ctx.config.model}`);
             if (active) {
-                console.log(`${t("repl.provider")} ${active.label} (${pc.dim(active.type)}) @ ${pc.dim(active.baseUrl)}`);
+                ctx.output.writeLine(`${t("repl.provider")} ${active.label} (${pc.dim(active.type)}) @ ${pc.dim(active.baseUrl)}`);
             }
             else {
-                console.log(`${t("repl.provider")} ${ctx.config.provider.type} @ ${ctx.config.provider.baseUrl}`);
+                ctx.output.writeLine(`${t("repl.provider")} ${ctx.config.provider.type} @ ${ctx.config.provider.baseUrl}`);
             }
             const meta = ctx.sessionManager?.getActiveMeta();
             if (meta) {
-                console.log(`${t("repl.session_label")} ${meta.name} (${meta.id}) — ${meta.messageCount} messages`);
+                ctx.output.writeLine(`${t("repl.session_label")} ${meta.name} (${meta.id}) — ${meta.messageCount} messages`);
             }
         },
     });
@@ -227,10 +228,10 @@ function registerMmaCommands(ctx) {
         aliases: ["setup"],
         usage: t("repl.wizard_usage"),
         action: async () => {
-            console.log(pc.yellow(t("repl.wizard_running")));
+            ctx.output.writeLine(pc.yellow(t("repl.wizard_running")));
             await ctx.withExclusiveInput(async () => {
                 const answers = await runSetup(ctx.rl);
-                const configPath = join(homedir(), ".mma", "config.json");
+                const configPath = join(ctx.configDir, "config.json");
                 ctx.config.provider.type = answers.provider;
                 ctx.config.provider.baseUrl = answers.apiBase;
                 ctx.config.provider.apiKey = answers.apiKey;
@@ -240,7 +241,7 @@ function registerMmaCommands(ctx) {
                 ctx.config.locale = answers.locale;
                 saveConfig(ctx.config, configPath, dirname(configPath));
                 await ctx.agent.reconfigure(ctx.config);
-                console.log(pc.green(t("cli.config_saved")));
+                ctx.output.writeLine(pc.green(t("cli.config_saved")));
             });
         },
     });
@@ -250,173 +251,268 @@ function registerMmaCommands(ctx) {
         usage: t("repl.sysprompt_desc"),
         action: () => {
             const info = ctx.agent.getSystemPromptInfo();
-            console.log(pc.bold(`System prompt (${info.tokenCount} tokens):`));
-            console.log(pc.dim("─".repeat(60)));
+            ctx.output.writeLine(pc.bold(t("repl.sysprompt_tokens", { count: String(info.tokenCount) })));
+            ctx.output.writeLine(pc.dim("─".repeat(60)));
             for (const line of info.text.split("\n")) {
-                console.log(line);
+                ctx.output.writeLine(line);
             }
-            console.log(pc.dim("─".repeat(60)));
+            ctx.output.writeLine(pc.dim("─".repeat(60)));
             if (info.excluded.length > 0) {
-                console.log(pc.yellow(`\nExcluded blocks: ${info.excluded.length}`));
+                ctx.output.writeLine(pc.yellow(t("repl.excluded_blocks", { count: String(info.excluded.length) })));
                 for (const e of info.excluded) {
-                    console.log(pc.dim(`  - ${e.slice(0, 80)}${e.length > 80 ? "..." : ""}`));
+                    ctx.output.writeLine(pc.dim(`  - ${e.slice(0, 80)}${e.length > 80 ? "..." : ""}`));
                 }
             }
         },
     });
     ctx.registerCommand({
-        name: "provider",
-        description: t("repl.provider_list"),
-        usage: t("repl.provider_usage"),
+        name: "map",
+        description: t("repl.map"),
+        usage: t("repl.map_usage"),
         action: async (args) => {
-            const subcmd = args[0];
-            if (!subcmd || subcmd === "list") {
-                const providers = ctx.agent.listProviders();
-                if (providers.length === 0) {
-                    console.log(`${t("repl.provider_current")}  ${ctx.config.provider.type}`);
-                    console.log(`  ${ctx.config.provider.baseUrl}`);
-                }
-                else {
-                    console.log(t("repl.provider_current"));
-                    for (const p of providers) {
-                        const marker = p.active ? pc.green("* ") : "  ";
-                        console.log(` ${marker}${p.label}  (${pc.dim(p.type)})  ${pc.dim(p.baseUrl)}`);
-                    }
-                }
+            const indexer = ctx.agent.getModule("indexer");
+            if (!indexer) {
+                ctx.output.writeLine(pc.yellow(t("indexer.not_indexed")));
                 return;
             }
-            if (subcmd === "use") {
-                const name = args[1];
-                if (!name) {
-                    console.log(t("repl.provider_usage"));
+            const action = args[0] || "summary";
+            const query = args.slice(1).join(" ");
+            const result = await runMapAction(indexer, action, query);
+            ctx.output.writeLine(result.output);
+        },
+    });
+}
+function registerProviderCommands(ctx) {
+    const list = () => {
+        const providers = ctx.agent.listProviders();
+        if (providers.length === 0) {
+            ctx.output.writeLine(`${t("repl.provider_current")}  ${ctx.config.provider.type}`);
+            ctx.output.writeLine(`  ${ctx.config.provider.baseUrl}`);
+            return;
+        }
+        ctx.output.writeLine(t("repl.provider_current"));
+        for (const p of providers) {
+            const marker = p.active ? pc.green("* ") : "  ";
+            ctx.output.writeLine(` ${marker}${p.label}  (${pc.dim(p.type)})  ${pc.dim(p.baseUrl)}`);
+        }
+    };
+    const use = async (args) => {
+        const name = args[0];
+        if (!name) {
+            ctx.output.writeLine(t("repl.provider_usage"));
+            return;
+        }
+        try {
+            await ctx.agent.setProvider(name);
+            ctx.refreshModelCache();
+            ctx.output.writeLine(pc.green(t("repl.provider_set", { name })));
+        }
+        catch (e) {
+            ctx.output.writeLine(pc.red(e.message), "stderr");
+        }
+    };
+    const add = async (args) => {
+        const flags = {};
+        let name;
+        for (let i = 0; i < args.length; i++) {
+            const arg = args[i];
+            if (arg.startsWith("--")) {
+                const value = args[i + 1];
+                if (value === undefined || value.startsWith("--")) {
+                    ctx.output.writeLine(pc.red(t("repl.provider_add_missing_value", { flag: arg })), "stderr");
                     return;
                 }
-                try {
-                    await ctx.agent.setProvider(name);
-                    ctx.refreshModelCache();
-                    console.log(pc.green(t("repl.provider_set", { name })));
-                }
-                catch (e) {
-                    console.log(pc.red(e.message));
-                }
+                flags[arg.slice(2)] = value;
+                i++;
+            }
+            else if (name === undefined) {
+                name = arg;
+            }
+        }
+        if (!name) {
+            ctx.output.writeLine(t("repl.provider_usage"));
+            return;
+        }
+        const entries = Array.isArray(ctx.config.provider.entries) ? ctx.config.provider.entries : [];
+        if (entries.length === 0) {
+            entries.push({
+                type: ctx.config.provider.type,
+                label: ctx.config.provider.type,
+                baseUrl: ctx.config.provider.baseUrl,
+                apiKey: ctx.config.provider.apiKey,
+            });
+        }
+        const baseUrl = flags.url || HOSTED_BASE_URLS[name] || HOSTED_BASE_URLS[`opencode-${name}`] || "";
+        if (!baseUrl) {
+            ctx.output.writeLine(pc.red(t("cli.provider_no_url", { name })), "stderr");
+            return;
+        }
+        entries.push({
+            type: name,
+            label: name,
+            baseUrl,
+            apiKey: flags.key,
+            ...(flags.priority !== undefined ? { priority: Number(flags.priority) } : {}),
+            ...(flags["context-window"] !== undefined
+                ? { contextWindow: Number(flags["context-window"]) }
+                : {}),
+            ...(flags.rpm !== undefined || flags.parallel !== undefined
+                ? {
+                    rateLimits: {
+                        maxRequestsPerMinute: Number(flags.rpm ?? 0) || 60,
+                        maxParallelTasks: Number(flags.parallel ?? 0) || 1,
+                    },
+                }
+                : {}),
+        });
+        ctx.config.provider.entries = entries;
+        ctx.config.provider.active = ctx.config.provider.active || ctx.config.provider.type;
+        const configPath = join(ctx.configDir, "config.json");
+        saveConfig(ctx.config, configPath, dirname(configPath));
+        await ctx.agent.reconfigure(ctx.config);
+        ctx.output.writeLine(pc.green(t("cli.provider_added", { name })));
+        ctx.output.writeLine(t("repl.provider_switch_hint", { name }));
+    };
+    const handlers = {
+        list,
+        use,
+        add,
+    };
+    ctx.registerCommand({
+        name: "provider",
+        description: t("repl.provider_list"),
+        usage: t("repl.provider_usage"),
+        action: async (args) => {
+            const subcmd = args[0];
+            const handler = subcmd ? handlers[subcmd] : handlers.list;
+            if (!handler) {
+                ctx.output.writeLine(t("repl.provider_usage"));
                 return;
             }
-            console.log(t("repl.provider_usage"));
+            await handler(args.slice(1));
         },
     });
+    const listModels = async () => {
+        ctx.output.writeLine(`${t("repl.model_current")}  ${ctx.config.model}`);
+        const { OpenAICompatProvider } = await import("../llm/openai-compat");
+        const provider = new OpenAICompatProvider({
+            model: ctx.config.model,
+            baseUrl: ctx.config.provider.baseUrl,
+            apiKey: ctx.config.provider.apiKey,
+            contextWindow: ctx.config.contextWindow,
+        });
+        const { Spinner } = await import("../ui/spinner");
+        const s = new Spinner({ channel: ctx.output });
+        s.start(t("cli.fetching_models"));
+        try {
+            const models = await provider.listModels();
+            s.stop();
+            if (models.length > 0) {
+                ctx.refreshModelCache();
+                ctx.output.writeLine(t("cli.available_models"));
+                const { getCertMark } = await import("../modules/certification/manifest");
+                for (const m of models) {
+                    const marker = m === ctx.config.model ? pc.green("* ") : "  ";
+                    const mark = getCertMark(m, ctx.config.provider.baseUrl, version, process.cwd());
+                    const cert = mark === "certified" ? pc.green("✔") : mark === "stale" ? pc.yellow("○") : pc.dim("·");
+                    const label = mark === "certified"
+                        ? `  ${pc.green(t("cli.cert_label"))}`
+                        : mark === "stale"
+                            ? `  ${pc.yellow(t("cli.cert_stale_label"))}`
+                            : "";
+                    ctx.output.writeLine(` ${marker}${cert} ${m}${label}`);
+                }
+            }
+            else {
+                ctx.output.writeLine(t("cli.no_models_found"));
+            }
+        }
+        catch (err) {
+            s.stop();
+            ctx.output.writeLine(t("cli.model_fetch_failed", { error: String(err) }), "stderr");
+        }
+        ctx.output.writeLine(t("cli.model_hint"));
+    };
+    const useModel = async (args) => {
+        const name = args[0];
+        if (!name) {
+            ctx.output.writeLine(t("repl.model_usage"));
+            return;
+        }
+        ctx.config.model = name;
+        const configPath = join(ctx.configDir, "config.json");
+        saveConfig(ctx.config, configPath, dirname(configPath));
+        await ctx.agent.reconfigure(ctx.config);
+        ctx.output.writeLine(pc.green(t("repl.model_set", { name })));
+    };
+    const modelHandlers = {
+        list: listModels,
+        use: useModel,
+    };
     ctx.registerCommand({
         name: "model",
         description: t("repl.model_list"),
         usage: t("repl.model_usage"),
         action: async (args) => {
             const subcmd = args[0];
-            if (!subcmd || subcmd === "list") {
-                console.log(`${t("repl.model_current")}  ${ctx.config.model}`);
-                const { OpenAICompatProvider } = await import("../llm/openai-compat");
-                const provider = new OpenAICompatProvider({
-                    model: ctx.config.model,
-                    baseUrl: ctx.config.provider.baseUrl,
-                    apiKey: ctx.config.provider.apiKey,
-                    contextWindow: ctx.config.contextWindow,
-                });
-                const { Spinner } = await import("../ui/spinner");
-                const s = new Spinner();
-                s.start(t("cli.fetching_models"));
-                try {
-                    const models = await provider.listModels();
-                    s.stop();
-                    if (models.length > 0) {
-                        ctx.refreshModelCache();
-                        console.log(t("cli.available_models"));
-                        const { getCertMark } = await import("../modules/certification/manifest");
-                        for (const m of models) {
-                            const marker = m === ctx.config.model ? pc.green("* ") : "  ";
-                            const mark = getCertMark(m, ctx.config.provider.baseUrl, version, process.cwd());
-                            const cert = mark === "certified"
-                                ? pc.green("✔")
-                                : mark === "stale"
-                                    ? pc.yellow("○")
-                                    : pc.dim("·");
-                            console.log(` ${marker}${cert} ${m}`);
-                        }
-                    }
-                    else {
-                        console.log(t("cli.no_models_found"));
-                    }
-                }
-                catch (err) {
-                    s.stop();
-                    console.log(t("cli.model_fetch_failed", { error: String(err) }));
-                }
-                console.log(t("cli.model_hint"));
-                return;
-            }
-            if (subcmd === "use") {
-                const name = args[1];
-                if (!name) {
-                    console.log(t("repl.model_usage"));
-                    return;
-                }
-                ctx.config.model = name;
-                const configPath = join(homedir(), ".mma", "config.json");
-                saveConfig(ctx.config, configPath, dirname(configPath));
-                await ctx.agent.reconfigure(ctx.config);
-                console.log(pc.green(t("repl.model_set", { name })));
+            const handler = subcmd ? modelHandlers[subcmd] : modelHandlers.list;
+            if (!handler) {
+                ctx.output.writeLine(t("repl.model_usage"));
                 return;
             }
-            console.log(t("repl.model_usage"));
+            await handler(args.slice(1));
         },
     });
     ctx.registerCommand({
         name: "context",
         description: t("cli.manage_context"),
-        usage: "/context <size>",
+        usage: t("repl.context_usage"),
         action: async (args) => {
+            const save = async () => {
+                const configPath = join(ctx.configDir, "config.json");
+                saveConfig(ctx.config, configPath, dirname(configPath));
+                await ctx.agent.reconfigure(ctx.config);
+            };
             if (args.length === 0) {
-                console.log(`/context ${t("repl.context")}  ${ctx.config.contextWindow}`);
-                console.log(`Usage: /context <size>  (min 1024)`);
+                for (const line of budgetBreakdownLines(ctx.config))
+                    ctx.output.writeLine(line);
+                ctx.output.writeLine(pc.dim(t("repl.context_usage")));
+                return;
+            }
+            if (args[0] === "system" || args[0] === "reserve") {
+                const key = args[0];
+                const value = Number(args[1]);
+                if (setBudgetShare(ctx.config, key, value) !== null) {
+                    ctx.output.writeLine(pc.yellow(t("cli.context_invalid_fraction")));
+                    return;
+                }
+                await save();
+                ctx.output.writeLine(pc.green(t("cli.context_fraction_set", { key, value })));
                 return;
             }
             const size = parseInt(args[0], 10);
             if (isNaN(size) || size < 1024) {
-                console.log(t("cli.invalid_context_size"));
+                ctx.output.writeLine(t("cli.invalid_context_size"));
                 return;
             }
             ctx.config.contextWindow = size;
-            const configPath = join(homedir(), ".mma", "config.json");
-            saveConfig(ctx.config, configPath, dirname(configPath));
-            await ctx.agent.reconfigure(ctx.config);
-            console.log(pc.green(t("cli.context_set", { size })));
+            await save();
+            ctx.output.writeLine(pc.green(t("cli.context_set", { size })));
         },
     });
+}
+function registerAgentCommands(ctx) {
     ctx.registerCommand({
         name: "reload",
         description: t("repl.reload"),
         usage: t("repl.reload_usage"),
         action: async () => {
-            console.log(pc.yellow(t("repl.reloading")));
-            if (ctx.sessionManager && ctx.config.session.autoSave) {
-            }
-            ctx.agent.shutdown();
-            const { loadConfig } = await import("../config/config");
-            const { homedir } = await import("os");
-            const { join } = await import("path");
-            const configDir = ctx.configDir;
-            const baseDir = ctx.baseDir;
-            const projectConfigPath = join(baseDir, ".mmrc");
-            const { config: freshConfig } = loadConfig({ configDir, projectConfigPath });
-            Object.assign(ctx.config, freshConfig);
-            const { bootstrap } = await import("../core/bootstrap");
-            const result = await bootstrap(configDir, baseDir, false, false);
-            ctx.agent = result.agent;
-            ctx.sessionManager = result.sessionManager;
-            ctx.skillsModule = result.skillsModule;
-            ctx.pluginManager = result.pluginManager;
-            ctx.setupCompleter();
-            console.log(pc.green(t("repl.reloaded")));
-            console.log(`${t("repl.model")}       ${ctx.config.model}`);
-            console.log(`${t("repl.context")}     ${ctx.config.contextWindow}`);
-            console.log(`${t("repl.provider")}    ${ctx.config.provider.type} @ ${ctx.config.provider.baseUrl}`);
+            ctx.output.writeLine(pc.yellow(t("repl.reloading")));
+            await ctx.reload();
+            ctx.output.writeLine(pc.green(t("repl.reloaded")));
+            ctx.output.writeLine(`${t("repl.model")}       ${ctx.config.model}`);
+            ctx.output.writeLine(`${t("repl.context")}     ${ctx.config.contextWindow}`);
+            ctx.output.writeLine(`${t("repl.provider")}    ${ctx.config.provider.type} @ ${ctx.config.provider.baseUrl}`);
         },
     });
     ctx.registerCommand({
@@ -425,18 +521,18 @@ function registerMmaCommands(ctx) {
         usage: t("repl.plugins_usage"),
         action: (args) => {
             if (!ctx.pluginManager) {
-                console.log(t("cli.plugins.none"));
+                ctx.output.writeLine(t("cli.plugins.none"));
                 return;
             }
             const showAll = args.includes("--all");
             const infos = ctx.pluginManager.getPluginInfos();
             const filtered = showAll ? infos : infos.filter(({ plugin }) => !plugin.isBuiltin);
             if (filtered.length === 0) {
-                console.log(t("cli.plugins.none"));
+                ctx.output.writeLine(t("cli.plugins.none"));
                 return;
             }
             const mmaVersion = version;
-            console.log(t("cli.plugins.header", {
+            ctx.output.writeLine(t("cli.plugins.header", {
                 count: String(filtered.length),
                 mma: mmaVersion,
             }));
@@ -444,16 +540,18 @@ function registerMmaCommands(ctx) {
                 const v = plugin.version || "-";
                 const origin = source || "builtin";
                 const mark = plugin.isBuiltin ? t("cli.plugins.builtin_mark") : " ";
-                console.log(`  ${mark} ${plugin.name}  v${v}  [${origin}]`);
+                ctx.output.writeLine(`  ${mark} ${plugin.name}  v${v}  [${origin}]`);
             }
             if (!showAll) {
                 const builtinCount = infos.filter(({ plugin }) => plugin.isBuiltin).length;
                 if (builtinCount > 0) {
-                    console.log(pc.dim(`  (${builtinCount} builtin hidden — /plugins --all to show)`));
+                    ctx.output.writeLine(pc.dim(`  (${builtinCount} builtin hidden — /plugins --all to show)`));
                 }
             }
         },
     });
+}
+function registerLspCommands(ctx) {
     ctx.registerCommand({
         name: "lsp",
         description: t("repl.lsp"),
@@ -463,7 +561,7 @@ function registerMmaCommands(ctx) {
             // Access LSP module via the agent's module registry
             const lspModule = ctx.agent.getModule("lsp");
             if (!lspModule) {
-                console.log(pc.yellow(t("repl.lsp_not_available")));
+                ctx.output.writeLine(pc.yellow(t("repl.lsp_not_available")));
                 return;
             }
             switch (subcommand) {
@@ -471,57 +569,62 @@ function registerMmaCommands(ctx) {
                     const disabled = lspModule.getDisabledServers();
                     const failures = lspModule.getFailureCounts();
                     const config = ctx.config.lsp;
-                    console.log(pc.bold(t("repl.lsp_status_header")));
-                    console.log(`${t("repl.lsp_enabled")} ${config?.enabled ? pc.green("yes") : pc.red("no")}`);
+                    ctx.output.writeLine(pc.bold(t("repl.lsp_status_header")));
+                    ctx.output.writeLine(`${t("repl.lsp_enabled")} ${config?.enabled ? pc.green("yes") : pc.red("no")}`);
                     if (disabled.length > 0) {
-                        console.log(pc.yellow(`${t("repl.lsp_disabled_servers")} ${disabled.join(", ")}`));
+                        ctx.output.writeLine(pc.yellow(`${t("repl.lsp_disabled_servers")} ${disabled.join(", ")}`));
                     }
                     if (failures.size > 0) {
-                        console.log(pc.dim(t("repl.lsp_failure_counts")));
+                        ctx.output.writeLine(pc.dim(t("repl.lsp_failure_counts")));
                         for (const [server, count] of failures) {
-                            console.log(pc.dim(`  ${server}: ${count}`));
+                            ctx.output.writeLine(pc.dim(`  ${server}: ${count}`));
                         }
                     }
                     if (disabled.length === 0 && failures.size === 0) {
-                        console.log(pc.green(t("repl.lsp_all_ok")));
+                        ctx.output.writeLine(pc.green(t("repl.lsp_all_ok")));
                     }
                     break;
                 }
                 case "restart": {
-                    console.log(pc.yellow(t("repl.lsp_restarting")));
+                    ctx.output.writeLine(pc.yellow(t("repl.lsp_restarting")));
                     lspModule.resetDisabledServers();
-                    console.log(pc.green(t("repl.lsp_restarted")));
+                    ctx.output.writeLine(pc.green(t("repl.lsp_restarted")));
                     break;
                 }
                 case "check": {
                     const path = args[1];
                     if (!path) {
-                        console.log(pc.yellow(t("repl.lsp_check_usage")));
+                        ctx.output.writeLine(pc.yellow(t("repl.lsp_check_usage")));
                         return;
                     }
-                    console.log(pc.dim(t("repl.lsp_checking", { path })));
-                    // Run lsp_check tool via the agent's tool executor
+                    ctx.output.writeLine(pc.dim(t("repl.lsp_checking", { path })));
+                    // Запуск тула lsp_check через публичный API агента (не через приватные deps)
                     try {
-                        const result = await ctx.agent.deps?.toolExecutor?.execute("lsp_check", { path }, ctx.agent.deps?.toolCtx);
+                        const result = await ctx.agent.runTool("lsp_check", { path });
                         if (result?.output) {
-                            console.log(result.output);
+                            ctx.output.writeLine(result.output);
                         }
                     }
                     catch (e) {
-                        console.log(pc.red(t("repl.lsp_check_error", {
-                            error: e instanceof Error ? e.message : String(e),
-                        })));
+                        ctx.output.writeLine(pc.red(t("repl.lsp_check_error", { error: errMsg(e) })), "stderr");
                     }
                     break;
                 }
                 default: {
-                    console.log(pc.dim(t("repl.lsp_usage")));
+                    ctx.output.writeLine(pc.dim(t("repl.lsp_usage")));
                     break;
                 }
             }
         },
     });
 }
+function registerMmaCommands(ctx) {
+    registerRunCommands(ctx);
+    registerConfigCommands(ctx);
+    registerProviderCommands(ctx);
+    registerAgentCommands(ctx);
+    registerLspCommands(ctx);
+}
 function registerSessionCommands(ctx) {
     if (!ctx.sessionManager)
         return;
@@ -534,7 +637,7 @@ function registerSessionCommands(ctx) {
             const sessions = ctx.sessionManager.list();
             const active = ctx.sessionManager.getActive();
             if (sessions.length === 0) {
-                console.log(t("session.no_sessions_hint"));
+                ctx.output.writeLine(t("session.no_sessions_hint"));
                 return;
             }
             const rows = sessions.map((s) => [
@@ -551,9 +654,9 @@ function registerSessionCommands(ctx) {
                 t("session.col_updated"),
                 t("session.col_msgs"),
             ], rows)) {
-                console.log(line);
+                ctx.output.writeLine(line);
             }
-            console.log(pc.dim(`\n  ${t("repl.resume_hint")}`));
+            ctx.output.writeLine(pc.dim(`\n  ${t("repl.resume_hint")}`));
         },
     });
     ctx.registerCommand({
@@ -565,9 +668,9 @@ function registerSessionCommands(ctx) {
             const name = args.join(" ") || undefined;
             const meta = ctx.sessionManager.create(name);
             ctx.agent.clearContext();
-            console.clear();
-            console.log(`${t("session.created", { name: meta.name })} (${pc.dim(meta.id.slice(0, 12))})`);
-            console.log(pc.dim(`  ${t("session.chat_cleared")}\n`));
+            ctx.output.clearScreen();
+            ctx.output.writeLine(`${t("session.created", { name: meta.name })} (${pc.dim(meta.id.slice(0, 12))})`);
+            ctx.output.writeLine(pc.dim(`  ${t("session.chat_cleared")}\n`));
         },
     });
     ctx.registerCommand({
@@ -579,54 +682,55 @@ function registerSessionCommands(ctx) {
             const query = args.join(" ");
             const sessions = ctx.sessionManager.list();
             if (!query) {
-                console.log(pc.dim(t("session.available")));
+                ctx.output.writeLine(pc.dim(t("session.available")));
                 const active = ctx.sessionManager.getActive();
                 for (const s of sessions) {
                     const marker = s.id === active ? pc.green(" *") : "  ";
-                    console.log(pc.dim(` ${marker} ${s.id.slice(0, 12)}  ${s.name}`));
+                    ctx.output.writeLine(pc.dim(` ${marker} ${s.id.slice(0, 12)}  ${s.name}`));
                 }
-                console.log(pc.dim(`\n  ${t("repl.resume_usage")}`));
+                ctx.output.writeLine(pc.dim(`\n  ${t("repl.resume_usage")}`));
                 return;
             }
             const match = sessions.find((s) => s.id === query ||
                 s.id.startsWith(query) ||
                 s.name.toLowerCase().includes(query.toLowerCase()));
             if (!match) {
-                console.log(t("session.no_match", { query }));
+                ctx.output.writeLine(t("session.no_match", { query }));
                 return;
             }
             ctx.sessionManager.setActive(match.id);
             const history = ctx.sessionManager.loadHistory();
             ctx.agent.setContext(history);
-            console.clear();
-            console.log(pc.bold(pc.green(t("session.resumed", { name: match.name }))) +
+            ctx.output.clearScreen();
+            ctx.output.writeLine(pc.bold(pc.green(t("session.resumed", { name: match.name }))) +
                 " " +
                 pc.dim(`(${match.id.slice(0, 12)})`) +
                 "  —  " +
                 match.messageCount +
-                " msgs");
-            console.log(pc.dim("─".repeat(50)));
+                " " +
+                t("repl.msgs"));
+            ctx.output.writeLine(pc.dim("─".repeat(50)));
             if (history.length === 0) {
-                console.log(pc.dim(t("session.no_history")));
+                ctx.output.writeLine(pc.dim(t("session.no_history")));
             }
             else {
-                console.log(pc.dim(t("session.chat_history")));
-                console.log();
+                ctx.output.writeLine(pc.dim(t("session.chat_history")));
+                ctx.output.writeLine("");
                 for (const msg of history) {
                     if (msg.role === "user") {
-                        console.log(pc.cyan(t("session.user_label") + ":"));
-                        console.log(getMessageText(msg.content));
-                        console.log();
+                        ctx.output.writeLine(pc.cyan(t("session.user_label") + ":"));
+                        ctx.output.writeLine(getMessageText(msg.content));
+                        ctx.output.writeLine("");
                     }
                     else if (msg.role === "assistant") {
-                        console.log(pc.green(t("session.assistant_label") + ":"));
-                        console.log(getMessageText(msg.content));
-                        console.log();
+                        ctx.output.writeLine(pc.green(t("session.assistant_label") + ":"));
+                        ctx.output.writeLine(getMessageText(msg.content));
+                        ctx.output.writeLine("");
                     }
                 }
             }
-            console.log(pc.dim("─".repeat(50)));
-            console.log(pc.dim(`  ${t("session.chat_loaded")}`));
+            ctx.output.writeLine(pc.dim("─".repeat(50)));
+            ctx.output.writeLine(pc.dim(`  ${t("session.chat_loaded")}`));
         },
     });
     ctx.registerCommand({
@@ -636,16 +740,16 @@ function registerSessionCommands(ctx) {
         action: (args) => {
             const name = args.join(" ");
             if (!name) {
-                console.log(t("repl.rename_usage"));
+                ctx.output.writeLine(t("repl.rename_usage"));
                 return;
             }
             const active = ctx.sessionManager.getActive();
             if (!active) {
-                console.log(t("session.no_active"));
+                ctx.output.writeLine(t("session.no_active"));
                 return;
             }
             ctx.sessionManager.rename(active, name);
-            console.log(t("session.renamed", { name }));
+            ctx.output.writeLine(t("session.renamed", { name }));
         },
     });
     ctx.registerCommand({
@@ -656,106 +760,136 @@ function registerSessionCommands(ctx) {
         action: (args) => {
             const query = args[0];
             if (!query) {
-                console.log(t("repl.delete_usage"));
+                ctx.output.writeLine(t("repl.delete_usage"));
                 return;
             }
             const sessions = ctx.sessionManager.list();
             const match = sessions.find((s) => s.id === query || s.id.startsWith(query));
             if (!match) {
-                console.log(t("session.no_match", { query }));
+                ctx.output.writeLine(t("session.no_match", { query }));
                 return;
             }
             ctx.sessionManager.delete(match.id);
-            console.log(`${t("session.deleted", { id: match.id })}: ${match.name}`);
+            ctx.output.writeLine(`${t("session.deleted", { id: match.id })}: ${match.name}`);
         },
     });
 }
 function registerSkillCommands(ctx) {
     if (!ctx.skillsModule)
         return;
+    const listSkills = () => {
+        const available = ctx.skillsModule.getAvailable();
+        if (available.length === 0) {
+            ctx.output.writeLine(t("repl.no_skills"));
+            return;
+        }
+        ctx.output.writeLine(pc.bold(t("repl.available_skills")));
+        for (const skill of available) {
+            const tokens = estimateTokens(skill.content);
+            const loaded = ctx.skillsModule.getLoaded().some((s) => s.name === skill.name);
+            const marker = loaded ? pc.green(" [loaded]") : "";
+            ctx.output.writeLine(`  ${pc.cyan(skill.name)}${marker}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
+        }
+    };
+    const listLoaded = () => {
+        const loaded = ctx.skillsModule.getLoaded();
+        const budget = ctx.skillsModule.getBudget();
+        if (loaded.length === 0) {
+            ctx.output.writeLine(t("repl.no_loaded"));
+            return;
+        }
+        ctx.output.writeLine(pc.bold(t("repl.loaded_skills")));
+        for (const skill of loaded) {
+            const tokens = estimateTokens(skill.content);
+            ctx.output.writeLine(`  ${pc.cyan(skill.name)}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
+        }
+        ctx.output.writeLine(pc.dim(`\n  ${t("repl.budget", { used: budget.used, total: budget.total, remaining: budget.remaining })}`));
+    };
+    const loadSkill = (args) => {
+        const arg = args.join(" ");
+        if (!arg) {
+            ctx.output.writeLine(t("repl.skill_load_usage"));
+            return;
+        }
+        const result = ctx.skillsModule.loadByName(arg);
+        if (result.success) {
+            ctx.output.writeLine(pc.green(result.message));
+        }
+        else {
+            ctx.output.writeLine(pc.red(result.message), "stderr");
+        }
+    };
+    const unloadSkill = (args) => {
+        const arg = args.join(" ");
+        if (!arg) {
+            ctx.output.writeLine(t("repl.skill_unload_usage"));
+            return;
+        }
+        if (ctx.skillsModule.unload(arg)) {
+            ctx.output.writeLine(pc.green(t("repl.skill_unloaded", { name: arg })));
+        }
+        else {
+            ctx.output.writeLine(pc.red(t("repl.skill_not_loaded", { name: arg })), "stderr");
+        }
+    };
+    const searchSkills = (args) => {
+        const arg = args.join(" ");
+        if (!arg) {
+            ctx.output.writeLine(t("repl.skill_search_usage"));
+            return;
+        }
+        const results = ctx.skillsModule.search(arg);
+        if (results.length === 0) {
+            ctx.output.writeLine(t("repl.no_skill_match", { query: arg }));
+            return;
+        }
+        ctx.output.writeLine(pc.bold(t("repl.skills_matching", { query: arg })));
+        for (const skill of results) {
+            const tokens = estimateTokens(skill.content);
+            ctx.output.writeLine(`  ${pc.cyan(skill.name)}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
+        }
+    };
+    const skillHandlers = {
+        list: listSkills,
+        loaded: listLoaded,
+        load: loadSkill,
+        unload: unloadSkill,
+        search: searchSkills,
+    };
     ctx.registerCommand({
         name: "skill",
         description: t("repl.skill"),
         usage: t("repl.skill_usage"),
         action: (args) => {
             const subcmd = args[0];
-            const arg = args.slice(1).join(" ");
-            if (!subcmd || subcmd === "list") {
-                const available = ctx.skillsModule.getAvailable();
-                if (available.length === 0) {
-                    console.log(t("repl.no_skills"));
-                    return;
-                }
-                console.log(pc.bold(t("repl.available_skills")));
-                for (const skill of available) {
-                    const tokens = Math.ceil(skill.content.length / 4);
-                    const loaded = ctx.skillsModule.getLoaded().some((s) => s.name === skill.name);
-                    const marker = loaded ? pc.green(" [loaded]") : "";
-                    console.log(`  ${pc.cyan(skill.name)}${marker}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
-                }
-                return;
-            }
-            if (subcmd === "loaded") {
-                const loaded = ctx.skillsModule.getLoaded();
-                const budget = ctx.skillsModule.getBudget();
-                if (loaded.length === 0) {
-                    console.log(t("repl.no_loaded"));
-                    return;
-                }
-                console.log(pc.bold(t("repl.loaded_skills")));
-                for (const skill of loaded) {
-                    const tokens = Math.ceil(skill.content.length / 4);
-                    console.log(`  ${pc.cyan(skill.name)}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
-                }
-                console.log(pc.dim(`\n  ${t("repl.budget", { used: budget.used, total: budget.total, remaining: budget.remaining })}`));
+            const handler = subcmd ? skillHandlers[subcmd] : skillHandlers.list;
+            if (!handler) {
+                ctx.output.writeLine(pc.red(t("repl.skill_unknown_sub", { subcmd })), "stderr");
+                ctx.output.writeLine(t("repl.skill_usage"));
                 return;
             }
-            if (subcmd === "load") {
-                if (!arg) {
-                    console.log(t("repl.skill_load_usage"));
-                    return;
-                }
-                const result = ctx.skillsModule.loadByName(arg);
-                if (result.success) {
-                    console.log(pc.green(result.message));
-                }
-                else {
-                    console.log(pc.red(result.message));
-                }
-                return;
-            }
-            if (subcmd === "unload") {
-                if (!arg) {
-                    console.log(t("repl.skill_unload_usage"));
-                    return;
-                }
-                if (ctx.skillsModule.unload(arg)) {
-                    console.log(pc.green(t("repl.skill_unloaded", { name: arg })));
-                }
-                else {
-                    console.log(pc.red(t("repl.skill_not_loaded", { name: arg })));
-                }
-                return;
-            }
-            if (subcmd === "search") {
-                if (!arg) {
-                    console.log(t("repl.skill_search_usage"));
-                    return;
-                }
-                const results = ctx.skillsModule.search(arg);
-                if (results.length === 0) {
-                    console.log(t("repl.no_skill_match", { query: arg }));
-                    return;
-                }
-                console.log(pc.bold(t("repl.skills_matching", { query: arg })));
-                for (const skill of results) {
-                    const tokens = Math.ceil(skill.content.length / 4);
-                    console.log(`  ${pc.cyan(skill.name)}  ${pc.dim(`(${tokens} tokens)`)}  ${skill.description.slice(0, 60)}`);
-                }
-                return;
-            }
-            console.log(pc.red(t("repl.skill_unknown_sub", { subcmd })));
-            console.log(t("repl.skill_usage"));
+            handler(args.slice(1));
         },
     });
 }
+async function runConfigMigrate(ctx) {
+    const { hasDomainFiles } = await import("../config/domains");
+    const { loadConfig: loadCfg } = await import("../config/config");
+    const configDir = ctx.configDir;
+    const configPath = join(configDir, "config.json");
+    if (hasDomainFiles(configDir)) {
+        ctx.output.writeLine(pc.yellow(t("config.migrate_no_legacy")));
+        return;
+    }
+    if (!existsSync(configPath)) {
+        ctx.output.writeLine(pc.yellow(t("config.migrate_no_legacy")));
+        return;
+    }
+    ctx.output.writeLine(t("config.migrate_start"));
+    const { config } = loadCfg({ configDir, projectConfigPath: join(configDir, ".mmrc") });
+    saveConfig(config, configPath, configDir);
+    const { renameSync, readdirSync } = await import("fs");
+    renameSync(configPath, configPath + ".bak");
+    const domainFiles = readdirSync(join(configDir, "config")).filter((f) => f.endsWith(".json"));
+    ctx.output.writeLine(pc.green(t("config.migrate_done", { count: String(domainFiles.length) })));
+}