min-agent 0.3.0 → 0.4.0

package/dist/tui/session-switch.js

@@ -0,0 +1,28 @@
+export function prepareSwitch(opts) {
+    if (opts.running)
+        return { ok: false, reason: "running" };
+    if (opts.currentId === opts.targetId)
+        return { ok: false, reason: "current" };
+    if (!opts.exists)
+        return { ok: false, reason: "missing" };
+    return { ok: true };
+}
+export function switchFailMessage(reason) {
+    if (reason === "running")
+        return "请先等待当前回合结束或按 Esc 取消";
+    if (reason === "current")
+        return "已是当前会话";
+    return "会话不存在";
+}
+export function prepareNew(opts) {
+    if (opts.running)
+        return { ok: false, reason: "running" };
+    if (!opts.sessionId && opts.messageCount === 0)
+        return { ok: false, reason: "already_new" };
+    return { ok: true };
+}
+export function newFailMessage(reason) {
+    if (reason === "running")
+        return "请先等待当前回合结束或按 Esc 取消";
+    return "已是新会话";
+}

package/dist/tui/slash-commands.js

@@ -1,21 +1,28 @@
 export const SLASH_COMMANDS = [
-    { name: "clear", description: "清除对话历史" },
+    { name: "new", description: "新建会话（保留当前）" },
     { name: "compact", description: "压缩上下文" },
     { name: "model", description: "选择/切换模型" },
     { name: "models", description: "列出可用模型" },
     { name: "provider", description: "查看/切换 Provider", argHint: "[name]" },
-    { name: "memory", description: "查看/保存记忆", argHint: "[t]" },
-    { name: "tokens", description: "显示 token 用量与成本" },
-    { name: "budget", description: "查看/设置预算上限", argHint: "[n]" },
+    { name: "memory", description: "查看/保存记忆", argHint: "[t] [--project]" },
+    { name: "tokens", description: "显示上下文占用、累计用量与成本" },
+    { name: "budget", description: "查看/设置预算上限", argHint: "[n] [--project]" },
+    { name: "permission", description: "查看/设置确认模式", argHint: "[ask|accept-edits|allow-all] [--project]" },
+    { name: "sandbox", description: "查看/设置隔离", argHint: "[off|workspace|strict] [--project]" },
     { name: "undo", description: "撤销上一轮" },
     { name: "redo", description: "重发最后一条消息" },
     { name: "diff", description: "显示工作区未提交变更" },
     { name: "plan", description: "切换只读计划模式" },
-    { name: "sessions", description: "列出已保存会话" },
+    { name: "sessions", description: "列出/切换已保存会话", argHint: "[id]", aliases: ["resume"] },
+    { name: "reload", description: "重新加载规则" },
     { name: "rename", description: "重命名当前会话", argHint: "<title>" },
     { name: "attach", description: "附加本地图片", argHint: "<path>", aliases: ["image"] },
     { name: "mcp", description: "显示 MCP 状态" },
-    { name: "skills", description: "显示/启用/禁用 skills", argHint: "[list|info <name>|enable|disable <name> [--project]]" },
+    {
+        name: "skills",
+        description: "显示/启用/禁用 skills",
+        argHint: "[list|info <name>|enable|disable <name> [--project]]",
+    },
     { name: "path", description: "显示工作目录", aliases: ["pwd"] },
     { name: "paste", description: "粘贴剪贴板图片", argHint: "[t]" },
     { name: "help", description: "显示帮助" },
@@ -27,6 +34,15 @@ export function filterSlashCommands(input, commands = SLASH_COMMANDS) {
         return commands;
     return commands.filter((c) => c.name.startsWith(q) || (c.aliases ?? []).some((a) => a.startsWith(q)));
 }
+/** True for submitted input that is a known slash command (including aliases). */
+export function isKnownSlashCommandInput(text, commands = SLASH_COMMANDS) {
+    if (!text.startsWith("/"))
+        return false;
+    const name = text.slice(1).trim().split(/\s/, 1)[0]?.toLowerCase() ?? "";
+    if (!name)
+        return true;
+    return commands.some((c) => c.name === name || (c.aliases ?? []).some((a) => a === name));
+}
 const argProviders = new Map();
 /** Registered by the app at startup so this module stays free of app imports. */
 export function setSlashArgProvider(command, provider) {

package/dist/tui/slash-handler.js

@@ -20,14 +20,9 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
         case "q":
             requestExit();
             break;
-        case "clear": {
-            const { clearStack } = await import("./undo-stack.js");
-            messages.length = 0;
-            tui.update({ messages: [] });
-            state.setUndoStack(clearStack(state.undoStack));
-            sysMsg(tui, "✓ 对话已清除");
+        case "new":
+            state.startNewSession();
             break;
-        }
         case "undo": {
             const { popTurn } = await import("./undo-stack.js");
             const popped = popTurn(state.undoStack);
@@ -55,7 +50,11 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
             const { getWorkingTreeDiff } = await import("./diff-view.js");
             const result = await getWorkingTreeDiff();
             if (!result.ok) {
-                const msg = result.reason === "not_git" ? "非 git 仓库，无法显示 diff" : result.reason === "no_changes" ? "工作区无未提交变更" : `diff 失败: ${result.message}`;
+                const msg = result.reason === "not_git"
+                    ? "非 git 仓库，无法显示 diff"
+                    : result.reason === "no_changes"
+                        ? "工作区无未提交变更"
+                        : `diff 失败: ${result.message}`;
                 sysMsg(tui, msg);
             }
             else
@@ -67,20 +66,17 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
             sysMsg(tui, state.planMode ? "✓ 计划模式已开启：仅只读工具可用，输出计划后再次输入 /plan 确认并执行" : "✓ 已退出计划模式");
             break;
         }
+        case "reload":
+            await state.reloadSystemPrompt();
+            break;
+        case "resume":
         case "sessions": {
-            const { listSessions } = await import("../sessions.js");
-            const sessions = listSessions();
-            if (sessions.length === 0)
-                sysMsg(tui, "无已保存的会话");
-            else {
-                const header = state.sessionId ? "" : "  (当前会话未保存)\n";
-                const lines = sessions.map((s) => {
-                    const current = state.sessionId === s.id ? " ← 当前" : "";
-                    const date = s.updated.split("T")[0];
-                    return `  ${s.id}  ${date}  ${s.title} (${s.messageCount} msgs)${current}`;
-                });
-                sysMsg(tui, `会话 (${sessions.length}):\n${header}${lines.join("\n")}\n\n恢复: min-agent chat --resume <id>`);
+            const id = arg.trim();
+            if (!id) {
+                state.openSessionPicker();
+                break;
             }
+            state.applySession(id);
             break;
         }
         case "rename": {
@@ -92,7 +88,7 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
             const { saveSession, renameSession } = await import("../sessions.js");
             let id = state.sessionId;
             if (!id) {
-                id = saveSession(messages);
+                id = saveSession(messages, undefined, undefined, undefined, state.taskState);
                 state.setSessionId(id);
             }
             if (renameSession(id, title))
@@ -119,7 +115,12 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
             if (parts.length <= 1)
                 break;
             messages.push({ role: "user", content: parts });
-            tui.addMessage({ id: `user-${Date.now()}`, role: "user", content: `[📎 图片] ${filePath}`, timestamp: Date.now() });
+            tui.addMessage({
+                id: `user-${Date.now()}`,
+                role: "user",
+                content: `[📎 图片] ${filePath}`,
+                timestamp: Date.now(),
+            });
             return "run";
         }
         case "compact": {
@@ -133,12 +134,17 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
                 sysMsg(tui, "⟳ 正在压缩上下文...");
                 const model = resolveModel(currentModel);
                 state.setUndoStack(clearStack(state.undoStack));
-                const result = await compactMessages(messages, model, { keepRecentTurns: 2, autoContinue: false });
+                const result = await compactMessages(messages, model, {
+                    keepRecentTurns: 2,
+                    taskGoal: state.taskState.goal || undefined,
+                });
                 messages.length = 0;
                 messages.push(...result.messages);
                 if (tracker)
                     tracker.resetContext();
                 sysMsg(tui, `✓ 已压缩 (约 ${estimateTokens(messages)} tokens)`);
+                const { snapshotTokenInfo } = await import("./token-info.js");
+                tui.setTokenInfo(await snapshotTokenInfo(tracker, currentModel, messages));
             }
             break;
         }
@@ -209,23 +215,34 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
             break;
         }
         case "memory": {
-            if (arg) {
+            const { takeScopeFlags, defaultMemoryScope } = await import("../memory.js");
+            const { scope, rest: memRest } = takeScopeFlags(rest);
+            const text = memRest.join(" ").trim();
+            if (text) {
                 const { addMemory } = await import("../memory.js");
-                addMemory(arg);
-                sysMsg(tui, `✓ 已保存记忆: "${arg}"`);
+                const resolved = scope ?? defaultMemoryScope();
+                addMemory(text, [], resolved);
+                sysMsg(tui, `✓ 已保存${resolved === "project" ? "项目" : "全局"}记忆: "${text}"`);
             }
             else {
                 const { loadMemories } = await import("../memory.js");
-                const memories = loadMemories();
-                if (memories.length === 0)
-                    sysMsg(tui, "无已保存的记忆");
-                else {
+                const scopes = scope ? [scope] : ["project", "global"];
+                const sections = scopes.map((s) => {
+                    const memories = loadMemories(s);
+                    const label = s === "project" ? "项目记忆" : "全局记忆";
+                    if (memories.length === 0)
+                        return `${label}: 无`;
                     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")}`);
+                    return `${label} (${memories.length}):\n${lines.join("\n")}`;
+                });
+                if (!scope && loadMemories("project").length === 0 && loadMemories("global").length === 0) {
+                    sysMsg(tui, "无已保存的记忆");
                 }
+                else
+                    sysMsg(tui, sections.join("\n"));
             }
             break;
         }
@@ -242,46 +259,87 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
             }
             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 }];
+            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() });
             return "run";
         }
         case "tokens": {
-            const { getContextWindow } = await import("../context-window.js");
+            const { getContextWindowInfo } = await import("../context-window.js");
             const { getModelPrice, estimateCost, formatCost } = await import("../pricing.js");
             const { estimateTokens } = await import("../compaction.js");
-            if (tracker && tracker.lastInputTokens > 0) {
-                const ctxWindow = await getContextWindow(currentModel);
-                const pct = Math.round((tracker.lastInputTokens / ctxWindow) * 100);
-                const price = await getModelPrice(currentModel ?? "");
-                const cost = estimateCost({ inputTokens: tracker.totalInputTokens, outputTokens: tracker.totalOutputTokens }, price);
-                sysMsg(tui, [`Context: ${tracker.lastInputTokens} / ${ctxWindow} tokens (${pct}%)`, `Total: ${tracker.totalInputTokens} in / ${tracker.totalOutputTokens} out`, ...(cost != null ? [`Cost: 约 ${formatCost(cost)}`] : []), `Messages: ${messages.length}`].join("\n"));
-            }
-            else
-                sysMsg(tui, `估算 tokens: ${estimateTokens(messages)} | Messages: ${messages.length}`);
+            const ctx = await getContextWindowInfo(currentModel);
+            const estimated = estimateTokens(messages);
+            const occupied = tracker.lastInputTokens > 0 ? tracker.lastInputTokens : estimated;
+            const pct = ctx.tokens > 0 && occupied > 0 ? Math.round((occupied / ctx.tokens) * 100) : 0;
+            const price = await getModelPrice(currentModel ?? "");
+            const cost = estimateCost({ inputTokens: tracker.totalInputTokens, outputTokens: tracker.totalOutputTokens }, price);
+            const occupancyNote = tracker.lastInputTokens > 0 ? "" : "，按对话内容估算";
+            const windowNote = ctx.source === "fallback" ? "，未读到接口窗口，按 512k 默认" : "";
+            sysMsg(tui, [
+                `上下文: ${occupied} / ${ctx.tokens} tokens (${pct}%${occupancyNote}${windowNote})`,
+                `累计: ${tracker.totalInputTokens} in / ${tracker.totalOutputTokens} out`,
+                ...(cost != null ? [`成本: 约 ${formatCost(cost)}`] : []),
+                `消息: ${messages.length}`,
+            ].join("\n"));
             break;
         }
         case "budget": {
-            const { loadConfig, saveConfig } = await import("../config.js");
+            const { takeScopeFlags } = await import("../memory.js");
+            const { getBudgetSnapshot, setBudgetMaxCost } = await import("../config.js");
             const { getModelPrice, estimateCost, formatCost } = await import("../pricing.js");
-            const cfg = loadConfig();
-            const maxCost = cfg.budget?.maxCostUSD;
-            if (arg) {
-                const n = parseFloat(arg);
-                if (isNaN(n) || n <= 0) {
-                    sysMsg(tui, "用法: /budget <USD 金额>");
+            const { scope, rest: budgetRest } = takeScopeFlags(rest);
+            const amount = budgetRest.join(" ").trim();
+            if (amount) {
+                const n = parseFloat(amount);
+                if (Number.isNaN(n) || n <= 0) {
+                    sysMsg(tui, "用法: /budget <USD 金额> [--project]");
                     break;
                 }
-                cfg.budget = { maxCostUSD: n };
-                saveConfig(cfg);
-                sysMsg(tui, `✓ 预算上限已设为: $${n}`);
+                const resolved = scope === "project" ? "project" : "global";
+                setBudgetMaxCost(n, resolved);
+                sysMsg(tui, `✓ 预算上限已设为: $${n}（${resolved === "project" ? "项目" : "全局"}）`);
                 break;
             }
+            const snap = getBudgetSnapshot();
+            const maxCost = snap.maxCostUSD;
+            const sourceLabel = snap.source === "project" ? "项目" : snap.source === "global" ? "全局" : null;
             const price = await getModelPrice(currentModel ?? "");
             const cost = estimateCost({ inputTokens: tracker.totalInputTokens, outputTokens: tracker.totalOutputTokens }, price);
             const costStr = cost != null ? `约 ${formatCost(cost)}` : "--";
-            sysMsg(tui, maxCost != null ? `预算: 已用${costStr} / 上限 $${maxCost}\n设置: /budget <金额>` : `预算: 已用${costStr} / 未设置上限\n设置: /budget <金额>`);
+            const cap = maxCost != null ? `上限 $${maxCost}${sourceLabel ? `（${sourceLabel}）` : ""}` : "未设置上限";
+            sysMsg(tui, `预算: 已用${costStr} / ${cap}\n设置: /budget <金额>  或  /budget <金额> --project`);
+            break;
+        }
+        case "permission": {
+            const { takeScopeFlags } = await import("../memory.js");
+            const { getPermissionSnapshot, parsePermissionMode, permissionModeLabel, setPermissionMode } = await import("../config.js");
+            const { getPermissionOverride, setPermissionOverride } = await import("../confirm.js");
+            const { scope, rest: permRest } = takeScopeFlags(rest);
+            const sourceLabel = (source) => source === "cli" ? "本次启动参数" : source === "project" ? "项目" : source === "global" ? "全局" : "默认";
+            if (permRest.length === 0) {
+                const snap = getPermissionSnapshot();
+                const override = getPermissionOverride();
+                const mode = override ?? snap.permission;
+                const source = override ? "cli" : snap.source;
+                sysMsg(tui, [
+                    `当前确认: ${permissionModeLabel(mode)}（${sourceLabel(source)}）`,
+                    "设置: /permission ask|accept-edits|allow-all [--project]",
+                ].join("\n"));
+                break;
+            }
+            const parsed = parsePermissionMode(permRest[0]);
+            if (!parsed || permRest.length > 1) {
+                sysMsg(tui, "用法: /permission ask|accept-edits|allow-all [--project]");
+                break;
+            }
+            const resolved = scope === "project" ? "project" : "global";
+            setPermissionMode(parsed, resolved);
+            setPermissionOverride(parsed);
+            sysMsg(tui, `✓ 确认已设为${permissionModeLabel(parsed)}（${resolved === "project" ? "项目" : "全局"}）`);
             break;
         }
         case "mcp": {
@@ -298,9 +356,16 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
                     const st = status[name];
                     const connected = st?.connected ?? false;
                     const toolCount = st?.tools.length ?? 0;
+                    const extra = [
+                        toolCount > 0 ? `${toolCount} tools` : "",
+                        (st?.resource_count ?? 0) > 0 ? `${st.resource_count} resources` : "",
+                        (st?.prompt_count ?? 0) > 0 ? `${st.prompt_count} prompts` : "",
+                    ]
+                        .filter(Boolean)
+                        .join(", ");
                     const state = disabled ? "disabled" : connected ? "connected" : "disconnected";
                     const err = !disabled && !connected && st?.error ? ` — ${st.error}` : "";
-                    return `  ${name}: ${state}${toolCount > 0 ? ` (${toolCount} tools)` : ""}${err}`;
+                    return `  ${name}: ${state}${extra ? ` (${extra})` : ""}${err}`;
                 });
                 sysMsg(tui, `MCP 服务器 (${servers.length}):\n${lines.join("\n")}`);
             }
@@ -326,7 +391,9 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
                     break;
                 }
                 const results = setSkillEnabled(names, action === "enable", scope);
-                const notes = results.filter((r) => r.blockedBy).map((r) => `  ⚠ ${r.name} 仍为${r.enabled ? "启用" : "禁用"}（被 ${r.blockedBy} 范围覆盖）`);
+                const notes = results
+                    .filter((r) => r.blockedBy)
+                    .map((r) => `  ⚠ ${r.name} 仍为${r.enabled ? "启用" : "禁用"}（被 ${r.blockedBy} 范围覆盖）`);
                 sysMsg(tui, [`✓ 已${action === "enable" ? "启用" : "禁用"}(${scope}): ${names.join(", ")}`, ...notes].join("\n"));
                 break;
             }
@@ -338,7 +405,16 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
                     break;
                 }
                 const status = skill.enabled ? "enabled" : `disabled(${skill.disabledScope === "project" ? "proj" : "glob"})`;
-                const meta = [`Name:        ${skill.name}`, `Status:      ${status}`, ...(skill.version ? [`Version:     ${skill.version}`] : []), `Description: ${skill.description.replace(/\s+/g, " ")}`, `Location:    ${skill.location}`, ...(skill.allowedTools.length ? [`Tools:       ${skill.allowedTools.join(", ")}`] : []), ...(skill.requiredBins.length ? [`Requires:    ${skill.requiredBins.join(", ")}`] : [])];
+                const meta = [
+                    `Name:        ${skill.name}`,
+                    `Status:      ${status}`,
+                    ...(skill.builtin ? ["Source:      内置"] : []),
+                    ...(skill.version ? [`Version:     ${skill.version}`] : []),
+                    `Description: ${skill.description.replace(/\s+/g, " ")}`,
+                    `Location:    ${skill.location}`,
+                    ...(skill.allowedTools.length ? [`Tools:       ${skill.allowedTools.join(", ")}`] : []),
+                    ...(skill.requiredBins.length ? [`Requires:    ${skill.requiredBins.join(", ")}`] : []),
+                ];
                 const content = skill.content.trim();
                 sysMsg(tui, [...meta, ...(content ? ["", "--- Content ---", "", content.slice(0, 4000)] : [])].join("\n"));
                 break;
@@ -354,15 +430,114 @@ export async function handleSlashCommand(input, tui, messages, currentModel, tra
             }
             const lines = all.map((s) => {
                 const status = s.enabled ? "enabled" : `disabled(${s.disabledScope === "project" ? "proj" : "glob"})`;
-                return `  ${s.name}  ${status}  ${truncateDisplay(s.description.replace(/\s+/g, " "), 56)}`;
+                const origin = s.builtin ? " 内置" : "";
+                return `  ${s.name}  ${status}${origin}  ${truncateDisplay(s.description.replace(/\s+/g, " "), 56)}`;
             });
             if (stale.length > 0)
                 lines.push(`  ⚠ disabledSkills/enabledSkills 中无对应 skill: ${stale.join(", ")}`);
             sysMsg(tui, `Skills (${all.filter((s) => s.enabled).length} enabled / ${all.length}):\n${lines.join("\n")}\n切换: /skills disable <name> [--project]`);
             break;
         }
+        case "sandbox": {
+            const { takeScopeFlags } = await import("../memory.js");
+            const { getSandboxSnapshot, setSandboxConfig } = await import("../config.js");
+            const { parseSandboxMode, parseNetworkPolicy, getEffectiveSandboxPolicy, sandboxEnforcementCaveat, sandboxModeLabel, setSandboxOverride, } = await import("../sandbox.js");
+            const { scope, rest: sbRest } = takeScopeFlags(rest);
+            const sourceLabel = (source) => source === "cli"
+                ? "本次启动参数"
+                : source === "env"
+                    ? "环境变量"
+                    : source === "project"
+                        ? "项目"
+                        : source === "global"
+                            ? "全局"
+                            : "默认";
+            if (sbRest.length === 0) {
+                const snap = getSandboxSnapshot();
+                const extras = [
+                    ...(snap.extraWriteRoots.length > 0 ? [`额外可写目录: ${snap.extraWriteRoots.join(", ")}`] : []),
+                    ...(snap.extraReadRoots.length > 0 ? [`额外可读目录: ${snap.extraReadRoots.join(", ")}`] : []),
+                ];
+                const caveat = sandboxEnforcementCaveat(getEffectiveSandboxPolicy().mode);
+                sysMsg(tui, [
+                    `当前隔离: ${snap.label}（${sourceLabel(snap.source)}）`,
+                    ...extras,
+                    ...(caveat ? [caveat] : []),
+                    "设置: /sandbox off|workspace|strict [--project]",
+                    "      /sandbox network allow|deny [--project]",
+                ].join("\n"));
+                break;
+            }
+            const resolved = scope === "project" ? "project" : "global";
+            const scopeLabel = resolved === "project" ? "项目" : "全局";
+            if (sbRest[0] === "network") {
+                const parsed = parseNetworkPolicy(sbRest[1]);
+                if (!parsed || sbRest.length > 2) {
+                    sysMsg(tui, "用法: /sandbox network allow|deny [--project]");
+                    break;
+                }
+                setSandboxConfig({ network: parsed }, resolved);
+                setSandboxOverride({ network: parsed });
+                sysMsg(tui, `✓ 联网已设为${parsed === "deny" ? "禁止" : "允许"}（${scopeLabel}）`);
+                break;
+            }
+            const parsed = parseSandboxMode(sbRest[0]);
+            if (!parsed || sbRest.length > 1) {
+                sysMsg(tui, "用法: /sandbox off|workspace|strict [--project]\n      /sandbox network allow|deny [--project]");
+                break;
+            }
+            setSandboxConfig({ mode: parsed }, resolved);
+            setSandboxOverride({ mode: parsed });
+            const caveat = sandboxEnforcementCaveat(parsed);
+            sysMsg(tui, [`✓ 隔离已设为${sandboxModeLabel(parsed)}（${scopeLabel}）`, ...(caveat ? [caveat] : [])].join("\n"));
+            break;
+        }
         case "help":
-            sysMsg(tui, ["命令:", "  输入 / 弹出命令菜单 (↑↓ 选择, Enter 执行, Esc 关闭)", "  /clear        清除对话历史", "  /compact      压缩上下文", "  /model [n]    交互式选择/切换模型", "  /models       列出可用模型", "  /provider [n] 查看/切换 Provider", "  /memory [t]   查看/保存记忆", "  /tokens       显示 token 用量与成本", "  /budget [n]   查看/设置预算上限 (USD)", "  /undo         撤销上一轮", "  /redo         重发最后一条消息", "  /diff         显示工作区未提交变更", "  /plan         切换只读计划模式", "  /sessions     列出已保存会话", "  /rename <t>   重命名当前会话", "  /attach <p>   附加本地图片", "  /mcp          显示 MCP 状态", "  /skills       显示/启用/禁用 skills（/skills info <name> 查看详情）", "  /path         显示工作目录", "  /paste [t]    粘贴剪贴板图片 + 可选提示", "  /help         显示帮助", "  /exit         退出", "", "快捷键:", "  Esc           取消当前任务", "  Ctrl+J        输入框换行", "  Ctrl+C        退出程序", "  PageUp/Down   滚动消息", "  鼠标滚轮      滚动消息", "  鼠标拖拽      选择文本并自动复制", "  鼠标点击      工具调用行展开/收起", "  ← →           移动输入框光标", "  鼠标点击      输入框内定位光标"].join("\n"));
+            sysMsg(tui, [
+                "命令:",
+                "  输入 / 弹出命令菜单 (输入过滤, Tab/Enter 执行, Esc 关闭)",
+                "  /new          新建会话（保留当前）",
+                "  /compact      压缩上下文",
+                "  /model [n]    交互式选择/切换模型",
+                "  /models       列出可用模型",
+                "  /provider [n] 查看/切换 Provider",
+                "  /memory [t]   查看/保存记忆（--project 写入当前项目）",
+                "  /tokens       显示上下文占用、累计用量与成本",
+                "  /budget [n]   查看/设置预算上限（--project 写入当前项目）",
+                "  /permission   查看/设置确认模式（ask|accept-edits|allow-all，--project 写入当前项目）",
+                "  /sandbox      查看/设置隔离（off|workspace|strict，--project 写入当前项目）",
+                "  /undo         撤销上一轮",
+                "  /redo         重发最后一条消息",
+                "  /diff         显示工作区未提交变更",
+                "  /plan         切换只读计划模式",
+                "  /sessions     列出/切换已保存会话",
+                "  /resume [id]  同 /sessions",
+                "  /reload       重新加载规则",
+                "  /rename <t>   重命名当前会话",
+                "  /attach <p>   附加本地图片",
+                "  /mcp          显示 MCP 状态",
+                "  /skills       显示/启用/禁用 skills（/skills info <name> 查看详情）",
+                "  /path         显示工作目录",
+                "  /paste [t]    粘贴剪贴板图片 + 可选提示",
+                "  /help         显示帮助",
+                "  /exit         退出",
+                "",
+                "快捷键:",
+                "  Esc           取消当前任务",
+                "  Ctrl+J        输入框换行",
+                "  Ctrl+C        清空输入（↑↓ 可找回）；生成中则中断，空输入连按两次退出",
+                "  Ctrl+B        消息区选择模式",
+                "  Home/End      行首/行尾",
+                "  PageUp/Down   滚动消息",
+                "  鼠标滚轮      滚动消息",
+                "  鼠标拖拽      选择文本并自动复制",
+                "  鼠标双击      选词并复制",
+                "  鼠标三击      选中该条消息并复制",
+                "  鼠标点击      工具调用行展开/收起",
+                "  ↑↓           翻阅输入历史",
+                "  ← →           移动输入框光标",
+                "  鼠标点击      输入框内定位光标",
+            ].join("\n"));
             break;
         default:
             sysMsg(tui, `未知命令: /${cmd}，输入 /help 查看可用命令`);

package/dist/tui/text-width.js

@@ -2,10 +2,12 @@
  * Terminal display-width helpers.
  *
  * CJK / fullwidth characters occupy two terminal cells, combining marks and
- * variation selectors occupy none. The input bar needs the same notion of width
- * that the terminal uses, otherwise the caret (and therefore the IME
- * composition window) drifts as soon as non-ASCII text is typed.
+ * variation selectors occupy none. Width is measured per grapheme cluster so
+ * ZWJ emoji (and Ink's own layout, which uses the same cluster rules) stay
+ * aligned with the mouse column.
  */
+const segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
+const EXT_PICT = /\p{Extended_Pictographic}/u;
 /** Zero-width: combining marks, variation selectors, zero-width spaces. */
 function isZeroWidth(cp) {
     return ((cp >= 0x0300 && cp <= 0x036f) ||
@@ -46,44 +48,64 @@ function isFullWidth(cp) {
         (cp >= 0x20000 && cp <= 0x2fffd) ||
         (cp >= 0x30000 && cp <= 0x3fffd));
 }
-/** Display width of a single code point, in terminal cells. */
-export function charWidth(char) {
+function codePointWidth(char) {
     const cp = char.codePointAt(0);
     if (cp === undefined)
         return 0;
-    // C0 / C1 control characters render nothing useful.
     if (cp < 0x20 || (cp >= 0x7f && cp < 0xa0))
         return 0;
     if (isZeroWidth(cp))
         return 0;
-    return isFullWidth(cp) ? 2 : 1;
+    if (isFullWidth(cp) || EXT_PICT.test(char))
+        return 2;
+    return 1;
+}
+/** Display width of a grapheme cluster (or a single code point), in terminal cells. */
+export function clusterWidth(cluster) {
+    if (cluster.length === 0)
+        return 0;
+    if (EXT_PICT.test(cluster) || cluster.includes("\u200D"))
+        return 2;
+    let width = 0;
+    for (const ch of cluster)
+        width += codePointWidth(ch);
+    return cluster.includes("\uFE0F") ? Math.max(width, 2) : width;
+}
+/** Display width of a single code point, in terminal cells. */
+export function charWidth(char) {
+    return clusterWidth(char);
+}
+export function* clustersOf(text) {
+    for (const { segment } of segmenter.segment(text)) {
+        yield { text: segment, width: clusterWidth(segment) };
+    }
 }
 /** Display width of a string (single logical line, no ANSI escapes). */
 export function displayWidth(text) {
     let width = 0;
-    for (const char of text)
-        width += charWidth(char);
+    for (const { width: w } of clustersOf(text))
+        width += w;
     return width;
 }
 /**
  * Break a single logical line into visual rows of at most `maxWidth` cells.
- * Breaks on cell boundaries (not word boundaries) so the caret column can be
- * derived exactly — a fullwidth character is never split across rows.
+ * Breaks on cluster boundaries (not word boundaries) so the caret column can
+ * be derived exactly — a fullwidth character or emoji is never split across rows.
  */
 export function wrapByWidth(line, maxWidth) {
+    const text = typeof line === "string" ? line : line == null ? "" : String(line);
     if (maxWidth < 1)
-        return [line];
+        return [text];
     const rows = [];
     let current = "";
     let width = 0;
-    for (const char of line) {
-        const w = charWidth(char);
-        if (width + w > maxWidth) {
+    for (const { text: g, width: w } of clustersOf(text)) {
+        if (width + w > maxWidth && current.length > 0) {
             rows.push(current);
             current = "";
             width = 0;
         }
-        current += char;
+        current += g;
         width += w;
     }
     rows.push(current);

package/dist/tui/token-info.js

@@ -0,0 +1,7 @@
+import { estimateTokens } from "../compaction.js";
+import { getContextWindowInfo } from "../context-window.js";
+import { tokenInfoFromTracker } from "../token-display.js";
+export async function snapshotTokenInfo(tracker, modelId, messages) {
+    const ctx = await getContextWindowInfo(modelId);
+    return tokenInfoFromTracker(tracker, ctx.tokens, estimateTokens(messages));
+}

package/dist/tui/tool-children.js

@@ -0,0 +1,19 @@
+export function mergeToolChild(messages, parentToolCallId, child) {
+    let idx = -1;
+    if (parentToolCallId)
+        idx = messages.findIndex((m) => m.role === "tool" && m.toolCallId === parentToolCallId);
+    if (idx === -1) {
+        for (let i = messages.length - 1; i >= 0; i--) {
+            if (messages[i].role === "tool" && messages[i].toolName === "task") {
+                idx = i;
+                break;
+            }
+        }
+    }
+    if (idx === -1)
+        return messages;
+    const target = messages[idx];
+    const next = messages.slice();
+    next[idx] = { ...target, toolChildren: [...(target.toolChildren ?? []), child] };
+    return next;
+}

package/dist/tui/undo-stack.js

@@ -9,6 +9,6 @@ export function popTurn(stack) {
         return null;
     return { turn: stack[stack.length - 1], stack: stack.slice(0, -1) };
 }
-export function clearStack(stack) {
+export function clearStack(_stack) {
     return [];
 }

package/dist/tui/use-sgr-mouse.js

@@ -22,6 +22,8 @@ export function useSgrMouse(enabled, onEvent) {
             }
         };
         stdin.on("data", handle);
-        return () => { stdin.off("data", handle); };
+        return () => {
+            stdin.off("data", handle);
+        };
     }, [enabled, stdin]);
 }