min-agent 0.3.0 → 0.4.1

package/dist/tui-chat.js

@@ -4,16 +4,74 @@ import { discoverSkills, getAllSkills, getStaleDisabledSkills } from "./skills.j
 import { setSlashArgProvider } from "./tui/slash-commands.js";
 import { loadInstructions } from "./instructions.js";
 import { TokenTracker } from "./compaction.js";
+import { emptyTaskState, copyTaskState, resetTaskState } from "./tools/todo.js";
 import { loadImageParts } from "./agent.js";
-import { createUndoStack } from "./tui/undo-stack.js";
+import { createUndoStack, clearStack } from "./tui/undo-stack.js";
 import { killActiveProcesses } from "./tools/bash.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";
+import { listSessions, loadSession, saveSession } from "./sessions.js";
+import { hydrateMessages, lastUserText } from "./tui/hydrate.js";
+import { createPromptQueue } from "./tui/prompt-queue.js";
+import { prepareSwitch, switchFailMessage, prepareNew, newFailMessage } from "./tui/session-switch.js";
 let confirmResolver = null;
 let questionResolver = null;
+/** Only one confirm/question overlay can be shown at a time; parallel tool calls queue up. */
+const promptQueue = createPromptQueue();
+function registerSessionCompletion() {
+    const provider = () => listSessions().map((s) => ({ value: s.id, description: s.title }));
+    setSlashArgProvider("sessions", provider);
+    setSlashArgProvider("resume", provider);
+}
+function registerPermissionCompletion() {
+    setSlashArgProvider("permission", (tokens) => {
+        const flags = [
+            { value: "--project", description: "写入当前项目" },
+            { value: "--global", description: "写入全局配置" },
+        ];
+        const used = new Set(tokens);
+        const remainingFlags = flags.filter((f) => !used.has(f.value));
+        if (tokens.length === 0) {
+            return [
+                { value: "ask", description: "危险操作前询问（默认）" },
+                { value: "accept-edits", description: "自动允许改文件，危险命令仍询问" },
+                { value: "allow-all", description: "全部自动允许" },
+                ...remainingFlags,
+            ];
+        }
+        return remainingFlags;
+    });
+}
+function registerSandboxCompletion() {
+    setSlashArgProvider("sandbox", (tokens) => {
+        const flags = [
+            { value: "--project", description: "写入当前项目" },
+            { value: "--global", description: "写入全局配置" },
+        ];
+        const used = new Set(tokens);
+        const remainingFlags = flags.filter((f) => !used.has(f.value));
+        if (tokens.length === 0) {
+            return [
+                { value: "off", description: "不隔离（默认）" },
+                { value: "workspace", description: "只允许写入工作目录" },
+                { value: "strict", description: "读写都限制在工作目录" },
+                { value: "network", description: "设置是否允许联网" },
+                ...remainingFlags,
+            ];
+        }
+        if (tokens[0] === "network") {
+            const nets = [
+                { value: "allow", description: "允许联网" },
+                { value: "deny", description: "禁止联网" },
+            ];
+            return [...nets.filter((n) => !used.has(n.value)), ...remainingFlags];
+        }
+        return remainingFlags;
+    });
+}
 function registerSkillCompletion() {
     setSlashArgProvider("skills", (tokens) => {
         const action = tokens[0];
@@ -31,53 +89,93 @@ function registerSkillCompletion() {
             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 })),
+                ...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: "仅对当前项目生效" }])];
+        return [
+            ...pool.filter((o) => !tokens.includes(o.value)),
+            ...(tokens.includes("--project") ? [] : [{ value: "--project", description: "仅对当前项目生效" }]),
+        ];
     });
 }
 export async function runTui(opts) {
-    const { modelId, resumeSessionId, mode, images, providerName } = opts;
+    const { modelId, resumeSessionId, images, providerName, initialPrompt } = opts;
     await initMcp();
     discoverSkills();
     registerSkillCompletion();
+    registerPermissionCompletion();
+    registerSandboxCompletion();
+    registerSessionCompletion();
     const instructions = await loadInstructions();
     const config = loadConfig();
-    let codeSystemPrompt;
-    if (mode === "code") {
-        const project = scanProject();
-        codeSystemPrompt = buildCodeSystemPrompt(project, instructions);
-    }
+    const project = scanProject();
+    let systemPrompt = buildCodeSystemPrompt(project, instructions);
     let messages = [];
     let sessionId = resumeSessionId;
     let currentModel = modelId ?? getActiveProvider(config)?.defaultModel;
     const currentProvider = providerName;
     const tracker = new TokenTracker();
+    const taskState = emptyTaskState();
     let undoStack = createUndoStack();
     let lastUserMessage = null;
     let planMode = false;
     if (resumeSessionId) {
-        const { loadSession } = await import("./sessions.js");
         const session = loadSession(resumeSessionId);
         if (session) {
             messages = session.messages;
             sessionId = resumeSessionId;
+            copyTaskState(session.taskState, taskState);
         }
     }
     let runner = null;
     const tui = new TuiRenderer({
         onSubmit: async (text) => {
             if (text.startsWith("/")) {
-                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)
+                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;
+                    },
+                    reloadSystemPrompt: async () => {
+                        const next = await loadInstructions();
+                        systemPrompt = buildCodeSystemPrompt(scanProject(), next);
+                        sysMsg(tui, `✓ 已重载规则（${next.join("").length} 字符）`);
+                    },
+                    applySession,
+                    startNewSession,
+                    openSessionPicker,
+                    taskState,
+                });
+                if (result === "run" && runner) {
                     await runner.run();
+                    persistSession();
+                }
                 return;
             }
             lastUserMessage = text;
             tui.addMessage({ id: `user-${Date.now()}`, role: "user", content: text, timestamp: Date.now() });
             messages.push({ role: "user", content: text });
-            if (runner)
+            if (runner) {
                 await runner.run();
+                persistSession();
+            }
         },
         onConfirm: (accepted) => {
             tui.hideConfirm();
@@ -105,17 +203,130 @@ export async function runTui(opts) {
             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); }));
+        onModelCancel: () => {
+            tui.hideModelPicker();
+        },
+        onSessionPick: (id) => {
+            tui.hideSessionPicker();
+            applySession(id);
+        },
+        onSessionCancel: () => {
+            tui.hideSessionPicker();
+        },
+        onToggleSelectionMode: () => {
+            tui.toggleSelectionMode();
+        },
+        onExitSelectionMode: () => {
+            tui.setSelectionMode(false);
+        },
+        onExit: () => {
+            requestExit();
+        },
+    }, modelId ?? getActiveProvider(config)?.defaultModel, sessionId);
+    runner = createAgentRunner({
+        tui,
+        messages,
+        tracker,
+        getModel: () => currentModel,
+        getProvider: () => currentProvider,
+        getPlanMode: () => planMode,
+        getUndoStack: () => undoStack,
+        setUndoStack: (s) => {
+            undoStack = s;
+        },
+        getSystemPrompt: () => systemPrompt,
+        getTaskState: () => taskState,
+        persist: () => persistSession(),
+    });
+    function persistSession() {
+        if (messages.length === 0)
+            return;
+        try {
+            sessionId = saveSession(messages, sessionId, undefined, undefined, taskState);
+        }
+        catch { }
+    }
+    async function refreshTokenBar() {
+        const { snapshotTokenInfo } = await import("./tui/token-info.js");
+        tui.setTokenInfo(await snapshotTokenInfo(tracker, currentModel, messages));
+    }
+    function applySession(id) {
+        const ready = prepareSwitch({
+            running: Boolean(runner?.getController()),
+            currentId: sessionId,
+            targetId: id,
+            exists: Boolean(loadSession(id)),
+        });
+        if (!ready.ok) {
+            sysMsg(tui, switchFailMessage(ready.reason));
+            return;
+        }
+        if (messages.length > 0)
+            sessionId = saveSession(messages, sessionId, undefined, undefined, taskState);
+        const session = loadSession(id);
+        if (!session) {
+            sysMsg(tui, switchFailMessage("missing"));
+            return;
+        }
+        messages.length = 0;
+        messages.push(...session.messages);
+        copyTaskState(session.taskState, taskState);
+        sessionId = id;
+        undoStack = clearStack(undoStack);
+        tracker.reset();
+        lastUserMessage = lastUserText(session.messages);
+        tui.setSessionId(id);
+        tui.update({ messages: hydrateMessages(session.messages) });
+        void refreshTokenBar();
+        sysMsg(tui, `✓ 已切换到: ${session.meta.title}`);
+    }
+    function startNewSession() {
+        const ready = prepareNew({
+            running: Boolean(runner?.getController()),
+            sessionId,
+            messageCount: messages.length,
+        });
+        if (!ready.ok) {
+            sysMsg(tui, newFailMessage(ready.reason));
+            return;
+        }
+        if (messages.length > 0)
+            sessionId = saveSession(messages, sessionId, undefined, undefined, taskState);
+        messages.length = 0;
+        resetTaskState(taskState);
+        sessionId = undefined;
+        undoStack = clearStack(undoStack);
+        tracker.reset();
+        lastUserMessage = null;
+        tui.setSessionId(undefined);
+        tui.update({ messages: [], tokenInfo: undefined });
+        sysMsg(tui, "✓ 已新建会话");
+    }
+    function openSessionPicker() {
+        if (listSessions().length === 0) {
+            sysMsg(tui, "无已保存的会话");
+            return;
+        }
+        tui.showSessionPicker();
+    }
+    setTuiConfirm((message) => promptQueue.run(() => new Promise((resolve) => {
+        confirmResolver = resolve;
+        tui.showConfirm(message);
+    }), () => false));
+    setTuiQuestion((prompt, options) => promptQueue.run(() => new Promise((resolve) => {
+        questionResolver = resolve;
+        tui.showQuestion(prompt, options);
+    }), () => null));
     let exitResolve;
-    const exitPromise = new Promise((resolve) => { exitResolve = resolve; });
+    const exitPromise = new Promise((resolve) => {
+        exitResolve = resolve;
+    });
     const requestExit = () => {
+        tui.setSelectionMode(false);
+        persistSession();
         if (runner?.getController()) {
             killActiveProcesses();
+            promptQueue.cancelAll();
             if (confirmResolver) {
                 confirmResolver(false);
                 confirmResolver = null;
@@ -134,31 +345,56 @@ export async function runTui(opts) {
             exitResolve?.();
     };
     tui.start();
+    if (messages.length > 0)
+        tui.update({ messages: hydrateMessages(messages) });
+    if (messages.length > 0)
+        await refreshTokenBar();
+    const prompt = initialPrompt?.trim() ?? "";
+    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}`);
+    };
     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) {
+        const parts = [{ type: "text", text: prompt }, ...loadImageParts(images, notify)];
+        if (parts.length > 1 || prompt) {
             messages.push({ role: "user", content: parts });
-            tui.addMessage({ id: `user-${Date.now()}`, role: "user", content: `[📎 图片] ${images.join(", ")}`, timestamp: Date.now() });
+            tui.addMessage({
+                id: `user-${Date.now()}`,
+                role: "user",
+                content: prompt ? prompt : `[📎 图片] ${images.join(", ")}`,
+                timestamp: Date.now(),
+            });
+            if (prompt)
+                lastUserMessage = prompt;
             await runner.run();
+            persistSession();
         }
     }
-    process.on("SIGINT", requestExit);
+    else if (prompt) {
+        lastUserMessage = prompt;
+        tui.addMessage({ id: `user-${Date.now()}`, role: "user", content: prompt, timestamp: Date.now() });
+        messages.push({ role: "user", content: prompt });
+        await runner.run();
+        persistSession();
+    }
+    const onSigint = () => {
+        if (runner?.getController())
+            requestExit();
+    };
+    process.on("SIGINT", onSigint);
     await exitPromise;
-    process.off("SIGINT", requestExit);
-    if (messages.length > 0) {
-        const { saveSession } = await import("./sessions.js");
-        sessionId = saveSession(messages, sessionId);
+    process.off("SIGINT", onSigint);
+    try {
+        persistSession();
+    }
+    finally {
+        setTuiConfirm(null);
+        setTuiQuestion(null);
+        tui.destroy();
+        await shutdownMcp();
     }
-    setTuiConfirm(null);
-    setTuiQuestion(null);
-    tui.destroy();
-    await shutdownMcp();
 }

package/dist/updater.js

@@ -1,11 +1,25 @@
 import { readFileSync } from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
-import { execSync } from "child_process";
+import { spawnSync } from "child_process";
+export const UPDATE_PACKAGE = "min-agent";
+export const NPM_LATEST_URL = `https://registry.npmjs.org/${UPDATE_PACKAGE}/latest`;
+export const UPDATE_NPM_BIN = "npm";
+export const UPDATE_NPM_ARGS = ["install", "-g", UPDATE_PACKAGE];
+const VERSION_RE = /^\d+\.\d+\.\d+/;
+const FETCH_TIMEOUT_MS = 10_000;
+export function updateInstallCommand() {
+    return [UPDATE_NPM_BIN, ...UPDATE_NPM_ARGS].join(" ");
+}
 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";
+    try {
+        const pkgPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../package.json");
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+        return typeof pkg.version === "string" && pkg.version.length > 0 ? pkg.version : "0.0.0";
+    }
+    catch {
+        return "0.0.0";
+    }
 }
 export function compareVersions(a, b) {
     const pa = a.split("-")[0].split(".").map(Number);
@@ -13,45 +27,90 @@ export function compareVersions(a, b) {
     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;
+        const na = Number.isFinite(va) ? va : 0;
+        const nb = Number.isFinite(vb) ? vb : 0;
+        if (na !== nb)
+            return na - nb;
     }
     return 0;
 }
-export async function fetchLatestVersion() {
+function parseVersion(value) {
+    if (typeof value !== "string" || !VERSION_RE.test(value))
+        return null;
+    return value;
+}
+export async function fetchLatestVersion(fetchFn = fetch) {
+    let response;
     try {
-        const response = await fetch("https://registry.npmjs.org/min-agent/latest", {
-            signal: AbortSignal.timeout(10000),
+        response = await fetchFn(NPM_LATEST_URL, {
+            signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
             headers: { Accept: "application/json" },
         });
-        if (!response.ok)
-            return null;
-        const data = (await response.json());
-        return data.version ?? null;
     }
     catch {
         return null;
     }
+    if (!response.ok)
+        return null;
+    let data;
+    try {
+        data = await response.json();
+    }
+    catch {
+        return null;
+    }
+    if (!data || typeof data !== "object" || !("version" in data))
+        return null;
+    return parseVersion(data.version);
+}
+export async function checkForUpdate(opts) {
+    const current = opts?.currentVersion ?? localVersion();
+    const latest = await fetchLatestVersion(opts?.fetchFn);
+    return {
+        current,
+        latest,
+        updateAvailable: latest !== null && compareVersions(current, latest) < 0,
+    };
+}
+export function installLatest() {
+    const result = spawnSync(UPDATE_NPM_BIN, [...UPDATE_NPM_ARGS], {
+        stdio: "inherit",
+        shell: process.platform === "win32",
+        env: process.env,
+    });
+    if (result.error) {
+        const code = result.error.code;
+        return { ok: false, missing: code === "ENOENT" };
+    }
+    return { ok: result.status === 0 };
 }
-export async function runUpdate() {
-    const current = localVersion();
-    console.log(`当前版本: ${current}`);
-    const latest = await fetchLatestVersion();
+export async function runUpdate(io = {}) {
+    const log = io.log ?? ((msg) => console.log(msg));
+    const error = io.error ?? ((msg) => console.error(msg));
+    const current = io.currentVersion?.() ?? localVersion();
+    const cmd = updateInstallCommand();
+    log(`当前版本: ${current}`);
+    const latest = io.fetchLatest ? await io.fetchLatest() : await fetchLatestVersion();
     if (!latest) {
-        console.error("无法检查新版本（网络不可用）。");
-        return;
+        error(`无法检查新版本（网络不可用）。请稍后重试，或手动执行: ${cmd}`);
+        return { status: "check-failed", current, latest: null };
     }
     if (compareVersions(current, latest) >= 0) {
-        console.log(`已是最新版本 (${latest})`);
-        return;
+        log(`已是最新版本 (${latest})`);
+        return { status: "up-to-date", current, latest };
     }
-    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");
+    log(`发现新版本: ${latest}`);
+    log(`正在执行 ${cmd} ...`);
+    const installed = (io.install ?? installLatest)();
+    if (!installed.ok) {
+        if (installed.missing) {
+            error(`未找到 npm。请先安装 Node.js，然后执行: ${cmd}`);
+        }
+        else {
+            error(`自动升级失败。请手动执行: ${cmd}`);
+        }
+        return { status: "install-failed", current, latest };
     }
+    log(`✓ 已升级到 ${latest}`);
+    return { status: "updated", current, latest };
 }