min-agent 0.2.0 → 0.3.0

package/dist/tui-chat.js

@@ -1,23 +1,48 @@
 import { TuiRenderer } from "./tui/index.js";
-import { initMcp, shutdownMcp, getMcpStatus, loadMcpConfig } from "./mcp.js";
-import { discoverSkills, getSkills } from "./skills.js";
+import { initMcp, shutdownMcp } from "./mcp.js";
+import { discoverSkills, getAllSkills, getStaleDisabledSkills } from "./skills.js";
+import { setSlashArgProvider } from "./tui/slash-commands.js";
 import { loadInstructions } from "./instructions.js";
-import { TokenTracker, estimateTokens, compactMessages } from "./compaction.js";
-import { runOnce, runOnceWithSystem } from "./agent.js";
+import { TokenTracker } from "./compaction.js";
+import { loadImageParts } from "./agent.js";
+import { createUndoStack } from "./tui/undo-stack.js";
 import { killActiveProcesses } from "./tools/bash.js";
-import { setTuiConfirm } from "./confirm.js";
-import { getContextWindow } from "./context-window.js";
-import { loadConfig } from "./config.js";
-import { resolveModel } from "./provider.js";
+import { setTuiConfirm, setTuiQuestion } from "./confirm.js";
+import { loadConfig, getActiveProvider } from "./config.js";
 import { scanProject, buildCodeSystemPrompt } from "./code-mode.js";
+import { handleSlashCommand, sysMsg } from "./tui/slash-handler.js";
+import { createAgentRunner } from "./tui/agent-runner.js";
 let confirmResolver = null;
+let questionResolver = null;
+function registerSkillCompletion() {
+    setSlashArgProvider("skills", (tokens) => {
+        const action = tokens[0];
+        if (action === undefined) {
+            return [
+                { value: "list", description: "列出全部 skills" },
+                { value: "info", description: "查看 skill 详情" },
+                { value: "enable", description: "启用 skill" },
+                { value: "disable", description: "禁用 skill" },
+            ];
+        }
+        if (action === "info")
+            return getAllSkills().map((s) => ({ value: s.name, description: s.description }));
+        if (action !== "enable" && action !== "disable")
+            return [];
+        const all = getAllSkills();
+        const pool = action === "enable"
+            ? [...all.filter((s) => !s.enabled).map((s) => ({ value: s.name, description: s.description })), ...getStaleDisabledSkills().map((name) => ({ value: name, description: "(配置中的孤儿条目)" }))]
+            : all.filter((s) => s.enabled).map((s) => ({ value: s.name, description: s.description }));
+        return [...pool.filter((o) => !tokens.includes(o.value)), ...(tokens.includes("--project") ? [] : [{ value: "--project", description: "仅对当前项目生效" }])];
+    });
+}
 export async function runTui(opts) {
-    const { modelId, resumeSessionId, mode } = opts;
+    const { modelId, resumeSessionId, mode, images, providerName } = opts;
     await initMcp();
     discoverSkills();
+    registerSkillCompletion();
     const instructions = await loadInstructions();
     const config = loadConfig();
-    // Code mode: scan project and build code-specific system prompt
     let codeSystemPrompt;
     if (mode === "code") {
         const project = scanProject();
@@ -25,9 +50,12 @@ export async function runTui(opts) {
     }
     let messages = [];
     let sessionId = resumeSessionId;
+    let currentModel = modelId ?? getActiveProvider(config)?.defaultModel;
+    const currentProvider = providerName;
     const tracker = new TokenTracker();
-    let abortController = null;
-    // Resume session if requested
+    let undoStack = createUndoStack();
+    let lastUserMessage = null;
+    let planMode = false;
     if (resumeSessionId) {
         const { loadSession } = await import("./sessions.js");
         const session = loadSession(resumeSessionId);
@@ -36,26 +64,20 @@ export async function runTui(opts) {
             sessionId = resumeSessionId;
         }
     }
-    // Forward reference — assigned after tui is created
-    let executeAgent;
+    let runner = null;
     const tui = new TuiRenderer({
         onSubmit: async (text) => {
             if (text.startsWith("/")) {
-                const result = await handleSlashCommand(text, tui, messages, modelId, tracker);
-                if (result === "run") {
-                    await executeAgent();
-                }
+                const result = await handleSlashCommand(text, tui, messages, currentModel, tracker, (model) => { currentModel = model; tui.setModel(model); }, requestExit, { undoStack, setUndoStack: (s) => { undoStack = s; }, lastUserMessage, setLastUserMessage: (t) => { lastUserMessage = t; }, sessionId, setSessionId: (id) => { sessionId = id; }, planMode, togglePlanMode: () => { planMode = !planMode; } });
+                if (result === "run" && runner)
+                    await runner.run();
                 return;
             }
-            // Add user message
-            tui.addMessage({
-                id: `user-${Date.now()}`,
-                role: "user",
-                content: text,
-                timestamp: Date.now(),
-            });
+            lastUserMessage = text;
+            tui.addMessage({ id: `user-${Date.now()}`, role: "user", content: text, timestamp: Date.now() });
             messages.push({ role: "user", content: text });
-            await executeAgent();
+            if (runner)
+                await runner.run();
         },
         onConfirm: (accepted) => {
             tui.hideConfirm();
@@ -64,321 +86,79 @@ export async function runTui(opts) {
                 confirmResolver = null;
             }
         },
-        onExit: () => {
-            if (abortController) {
-                killActiveProcesses();
-                abortController.abort();
-                abortController = null;
-                tui.setRunning(false);
-                tui.addMessage({
-                    id: `sys-${Date.now()}`,
-                    role: "system",
-                    content: "(已取消)",
-                    timestamp: Date.now(),
-                });
+        onQuestionAnswer: (answer) => {
+            tui.hideQuestion();
+            if (questionResolver) {
+                questionResolver(answer);
+                questionResolver = null;
             }
         },
-    }, modelId ?? config.provider?.defaultModel);
-    // Define the agent execution function (uses tui, messages, etc. from closure)
-    executeAgent = async () => {
-        abortController = new AbortController();
-        tui.setRunning(true, "思考中...");
-        const callbacks = {
-            onAssistantDisplayDelta: (delta) => {
-                // Pass raw delta — markdown formatting is applied at display time
-                tui.appendToLast(delta);
-            },
-            onThinkingDelta: (delta) => {
-                tui.setRunning(true, "推理中...");
-                tui.appendToThinking(delta);
-            },
-            onToolCall: (toolName, input) => {
-                tui.setRunning(true, `执行 ${toolName}...`);
-                const args = typeof input === "object" && input
-                    ? Object.entries(input)
-                        .map(([k, v]) => `${k}=${typeof v === "string" ? (v.length > 40 ? v.slice(0, 40) + "..." : v) : JSON.stringify(v)}`)
-                        .join(" ")
-                    : "";
-                tui.addMessage({
-                    id: `tool-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`,
-                    role: "tool",
-                    content: args,
-                    toolName,
-                    timestamp: Date.now(),
-                });
-            },
-            onToolResult: (_toolName, _output) => {
-                tui.setRunning(true, "思考中...");
-            },
-            onStreamError: (msg) => {
-                tui.addMessage({
-                    id: `err-${Date.now()}`,
-                    role: "system",
-                    content: `错误: ${msg}`,
-                    timestamp: Date.now(),
-                });
-            },
-            onRunFinish: async (info) => {
-                abortController = null;
-                tui.setRunning(false);
-                if (info.usage) {
-                    const input = info.usage.inputTokens ?? 0;
-                    const output = info.usage.outputTokens ?? 0;
-                    const total = input + output;
-                    const ctxWindow = await getContextWindow(modelId);
-                    const pct = ctxWindow > 0 ? Math.round((input / ctxWindow) * 100) : 0;
-                    tui.setTokenInfo(input, output, ctxWindow);
-                    tui.addMessage({
-                        id: `done-${Date.now()}`,
-                        role: "system",
-                        content: `Done in ${info.stepCount} step(s) | Tokens: ${input} in / ${output} out / ${total} total | Context: ${pct}%`,
-                        timestamp: Date.now(),
-                    });
-                }
-            },
-        };
-        if (mode === "code" && codeSystemPrompt) {
-            await runOnceWithSystem(messages, codeSystemPrompt, modelId, abortController?.signal, callbacks, tracker);
-        }
-        else {
-            await runOnce(messages, instructions, modelId, abortController?.signal, callbacks, tracker);
+        onModelPick: (model) => {
+            tui.hideModelPicker();
+            const cfg = loadConfig();
+            const provider = getActiveProvider(cfg);
+            if (provider) {
+                provider.defaultModel = model;
+                import("./config.js").then((m) => m.saveConfig(cfg));
+            }
+            currentModel = model;
+            tui.setModel(model);
+            sysMsg(tui, `✓ 默认模型已设为: ${model}`);
+        },
+        onModelCancel: () => { tui.hideModelPicker(); },
+        onExit: () => { requestExit(); },
+    }, modelId ?? getActiveProvider(config)?.defaultModel);
+    runner = createAgentRunner({ tui, messages, tracker, getModel: () => currentModel, getProvider: () => currentProvider, getPlanMode: () => planMode, getUndoStack: () => undoStack, setUndoStack: (s) => { undoStack = s; }, mode, codeSystemPrompt });
+    setTuiConfirm((message) => new Promise((resolve) => { confirmResolver = resolve; tui.showConfirm(message); }));
+    setTuiQuestion((prompt, options) => new Promise((resolve) => { questionResolver = resolve; tui.showQuestion(prompt, options); }));
+    let exitResolve;
+    const exitPromise = new Promise((resolve) => { exitResolve = resolve; });
+    const requestExit = () => {
+        if (runner?.getController()) {
+            killActiveProcesses();
+            if (confirmResolver) {
+                confirmResolver(false);
+                confirmResolver = null;
+                tui.hideConfirm();
+            }
+            if (questionResolver) {
+                questionResolver(null);
+                questionResolver = null;
+                tui.hideQuestion();
+            }
+            runner.getController().abort();
+            tui.setRunning(false);
+            tui.addMessage({ id: `sys-${Date.now()}`, role: "system", content: "(已取消)", timestamp: Date.now() });
         }
-        abortController = null;
-        tui.setRunning(false);
+        else
+            exitResolve?.();
     };
-    // Override the confirm module to use TUI overlay
-    setTuiConfirm((message) => {
-        return new Promise((resolve) => {
-            confirmResolver = resolve;
-            tui.showConfirm(message);
-        });
-    });
     tui.start();
-    // Keep process alive until exit
-    await new Promise((resolve) => {
-        process.on("SIGINT", () => {
-            if (abortController) {
-                killActiveProcesses();
-                abortController.abort();
-                abortController = null;
-                tui.setRunning(false);
-            }
-            else {
-                resolve();
-            }
-        });
-    });
-    // Save session
+    if (images && images.length > 0) {
+        const notify = (kind, imgPath) => {
+            if (kind === "not_found")
+                sysMsg(tui, `⚠ 图片不存在: ${imgPath}`);
+            else if (kind === "too_large")
+                sysMsg(tui, `⚠ 图片超过 5 MB 限制: ${imgPath}`);
+            else
+                sysMsg(tui, `📎 ${imgPath}`);
+        };
+        const parts = [{ type: "text", text: "" }, ...loadImageParts(images, notify)];
+        if (parts.length > 1) {
+            messages.push({ role: "user", content: parts });
+            tui.addMessage({ id: `user-${Date.now()}`, role: "user", content: `[📎 图片] ${images.join(", ")}`, timestamp: Date.now() });
+            await runner.run();
+        }
+    }
+    process.on("SIGINT", requestExit);
+    await exitPromise;
+    process.off("SIGINT", requestExit);
     if (messages.length > 0) {
         const { saveSession } = await import("./sessions.js");
         sessionId = saveSession(messages, sessionId);
     }
     setTuiConfirm(null);
+    setTuiQuestion(null);
     tui.destroy();
     await shutdownMcp();
 }
-async function handleSlashCommand(input, tui, messages, modelId, tracker) {
-    const [cmd, ...rest] = input.slice(1).split(/\s+/);
-    const arg = rest.join(" ");
-    switch (cmd) {
-        case "exit":
-        case "quit":
-        case "q":
-            process.emit("SIGINT", "SIGINT");
-            break;
-        case "clear":
-            messages.length = 0;
-            tui.update({ messages: [] });
-            sysMsg(tui, "✓ 对话已清除");
-            break;
-        case "compact": {
-            if (messages.length < 4) {
-                sysMsg(tui, "消息太少，无需压缩");
-            }
-            else {
-                sysMsg(tui, "⟳ 正在压缩上下文...");
-                const model = resolveModel(modelId);
-                const result = await compactMessages(messages, model, { keepRecentTurns: 2, autoContinue: false });
-                messages.length = 0;
-                messages.push(...result.messages);
-                if (tracker)
-                    tracker.resetContext();
-                sysMsg(tui, `✓ 已压缩 (约 ${estimateTokens(messages)} tokens)`);
-            }
-            break;
-        }
-        case "model": {
-            if (arg) {
-                const config = await import("./config.js");
-                const cfg = config.loadConfig();
-                if (cfg.provider) {
-                    cfg.provider.defaultModel = arg;
-                    config.saveConfig(cfg);
-                    sysMsg(tui, `✓ 默认模型已设为: ${arg}`);
-                }
-            }
-            else {
-                const config = loadConfig();
-                sysMsg(tui, `当前模型: ${config.provider?.defaultModel ?? "未设置"}`);
-            }
-            break;
-        }
-        case "models": {
-            const { fetchModels } = await import("./config.js");
-            const cfg = loadConfig();
-            if (!cfg.provider?.baseURL || !cfg.provider?.apiKey) {
-                sysMsg(tui, "未配置 Provider，运行: min-agent setup");
-                break;
-            }
-            sysMsg(tui, "正在获取模型列表...");
-            const models = await fetchModels(cfg.provider.baseURL, cfg.provider.apiKey);
-            if (models.length === 0) {
-                sysMsg(tui, "无法获取模型列表");
-            }
-            else {
-                const lines = models.map((m) => {
-                    const marker = m === cfg.provider?.defaultModel ? " ← 默认" : "";
-                    return `  ${m}${marker}`;
-                });
-                sysMsg(tui, `可用模型 (${models.length}):\n${lines.join("\n")}`);
-            }
-            break;
-        }
-        case "memory": {
-            if (arg) {
-                const { addMemory } = await import("./memory.js");
-                addMemory(arg);
-                sysMsg(tui, `✓ 已保存记忆: "${arg}"`);
-            }
-            else {
-                const { loadMemories } = await import("./memory.js");
-                const memories = loadMemories();
-                if (memories.length === 0) {
-                    sysMsg(tui, "无已保存的记忆");
-                }
-                else {
-                    const lines = memories.map((m, i) => {
-                        const tags = m.tags.length > 0 ? ` [${m.tags.join(", ")}]` : "";
-                        return `  #${i + 1}: ${m.content}${tags}`;
-                    });
-                    sysMsg(tui, `记忆 (${memories.length}):\n${lines.join("\n")}`);
-                }
-            }
-            break;
-        }
-        case "path":
-        case "pwd":
-            sysMsg(tui, process.cwd());
-            break;
-        case "paste": {
-            const { getClipboardImage } = await import("./clipboard.js");
-            const img = getClipboardImage();
-            if (!img) {
-                sysMsg(tui, "剪贴板中未找到图片");
-                break;
-            }
-            sysMsg(tui, `📎 剪贴板图片 (${(img.data.length / 1024).toFixed(1)} KB)`);
-            const text = arg || "What's in this image?";
-            const content = [
-                { type: "text", text },
-                { type: "image", image: img.data, mimeType: img.mimeType },
-            ];
-            messages.push({ role: "user", content });
-            tui.addMessage({
-                id: `user-${Date.now()}`,
-                role: "user",
-                content: `${text} [📎 图片]`,
-                timestamp: Date.now(),
-            });
-            // Signal that we need to run the agent
-            return "run";
-        }
-        case "tokens": {
-            if (tracker && tracker.lastInputTokens > 0) {
-                const ctxWindow = await getContextWindow(modelId);
-                const pct = Math.round((tracker.lastInputTokens / ctxWindow) * 100);
-                sysMsg(tui, [
-                    `Context: ${tracker.lastInputTokens} / ${ctxWindow} tokens (${pct}%)`,
-                    `Total: ${tracker.totalInputTokens} in / ${tracker.totalOutputTokens} out`,
-                    `Messages: ${messages.length}`,
-                ].join("\n"));
-            }
-            else {
-                sysMsg(tui, `估算 tokens: ${estimateTokens(messages)} | Messages: ${messages.length}`);
-            }
-            break;
-        }
-        case "mcp": {
-            const config = loadMcpConfig();
-            const servers = Object.entries(config.mcpServers);
-            if (servers.length === 0) {
-                sysMsg(tui, "无 MCP 服务器配置");
-            }
-            else {
-                const status = getMcpStatus();
-                const lines = servers.map(([name, cfg]) => {
-                    const disabled = cfg.enabled === false;
-                    const connected = status[name]?.connected ?? false;
-                    const toolCount = status[name]?.tools.length ?? 0;
-                    const state = disabled ? "disabled" : connected ? "connected" : "disconnected";
-                    return `  ${name}: ${state}${toolCount > 0 ? ` (${toolCount} tools)` : ""}`;
-                });
-                sysMsg(tui, `MCP 服务器 (${servers.length}):\n${lines.join("\n")}`);
-            }
-            break;
-        }
-        case "skills": {
-            discoverSkills({ silent: true });
-            const skills = getSkills();
-            const cfg = loadConfig();
-            const disabledNames = cfg.disabledSkills ?? [];
-            if (skills.length === 0 && disabledNames.length === 0) {
-                sysMsg(tui, "无可用 skills。添加 SKILL.md 到 .min-agent/skills/<name>/");
-            }
-            else {
-                const lines = [];
-                for (const s of skills) {
-                    lines.push(`  ${s.name}  enabled`);
-                }
-                for (const n of disabledNames) {
-                    lines.push(`  ${n}  disabled`);
-                }
-                sysMsg(tui, `Skills:\n${lines.join("\n")}`);
-            }
-            break;
-        }
-        case "help":
-            sysMsg(tui, [
-                "命令:",
-                "  /clear        清除对话历史",
-                "  /compact      压缩上下文",
-                "  /model [n]    显示/切换模型",
-                "  /models       列出可用模型",
-                "  /memory [t]   查看/保存记忆",
-                "  /tokens       显示 token 用量",
-                "  /mcp          显示 MCP 状态",
-                "  /skills       显示可用 skills",
-                "  /path         显示工作目录",
-                "  /paste [t]    粘贴剪贴板图片 + 可选提示",
-                "  /help         显示帮助",
-                "  /exit         退出",
-                "",
-                "快捷键:",
-                "  Esc           取消当前任务",
-                "  Ctrl+J        输入框换行",
-                "  Ctrl+C        退出程序",
-                "  PageUp/Down   滚动消息",
-            ].join("\n"));
-            break;
-        default:
-            sysMsg(tui, `未知命令: /${cmd}，输入 /help 查看可用命令`);
-    }
-}
-function sysMsg(tui, content) {
-    tui.addMessage({
-        id: `sys-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`,
-        role: "system",
-        content,
-        timestamp: Date.now(),
-    });
-}

package/dist/updater.js

@@ -0,0 +1,57 @@
+import { readFileSync } from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import { execSync } from "child_process";
+export function localVersion() {
+    const pkgPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../package.json");
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    return pkg.version ?? "0.0.0";
+}
+export function compareVersions(a, b) {
+    const pa = a.split("-")[0].split(".").map(Number);
+    const pb = b.split("-")[0].split(".").map(Number);
+    for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+        const va = pa[i] ?? 0;
+        const vb = pb[i] ?? 0;
+        if (va !== vb)
+            return va - vb;
+    }
+    return 0;
+}
+export async function fetchLatestVersion() {
+    try {
+        const response = await fetch("https://registry.npmjs.org/min-agent/latest", {
+            signal: AbortSignal.timeout(10000),
+            headers: { Accept: "application/json" },
+        });
+        if (!response.ok)
+            return null;
+        const data = (await response.json());
+        return data.version ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+export async function runUpdate() {
+    const current = localVersion();
+    console.log(`当前版本: ${current}`);
+    const latest = await fetchLatestVersion();
+    if (!latest) {
+        console.error("无法检查新版本（网络不可用）。");
+        return;
+    }
+    if (compareVersions(current, latest) >= 0) {
+        console.log(`已是最新版本 (${latest})`);
+        return;
+    }
+    console.log(`发现新版本: ${latest}`);
+    console.log("正在升级 min-agent...");
+    try {
+        execSync("npm install -g min-agent@latest", { stdio: "inherit" });
+        console.log(`✓ 已升级到 ${latest}，请重启终端后生效`);
+    }
+    catch {
+        console.error("自动升级失败。请手动执行: npm install -g min-agent@latest");
+    }
+}