@armadra/agent 0.3.0 → 0.5.0

package/dist/modes/interactive/message-view.js

@@ -1,18 +1,171 @@
 /**
  * 消息区（设计 §12.5）。[B7]
  *
- * 一个纵向 `Container`，块与块之间空一行：
- * - 用户消息 `› 文本`；steer / followUp / 宿主注入按 `UserMessage.origin` 标 `↳ steer` / `↳ host` …；
+ * 一个纵向 `Container`，块与块之间空一行（终端界面视觉设计 v1 §1 原则 2：相邻工具调用之间不空行，
+ * `ui.compact` 时全部不空行）：
+ * - 用户消息 `› 文本`（续行缩进 2 列）；插话 / 之后 / 宿主注入按 `UserMessage.origin` 标
+ *   `↳ 插话` / `↳ 之后` / `↳ 宿主`（整行 muted，其它 origin 原样显示）；
  * - 助手消息按内容块渲染：文本走 `Markdown`（`ui.markdown: false` 时纯文本），流式时只改末块
- *   （Markdown 自己按块缓存）；思考块按 `ui.showThinking`：`collapsed`（缺省）一行 `思考 · N token`、
- *   `full` 显示全文、`hidden` 不显示；
- * - 压缩摘要卡、重试提示、Hook 阻止提示、宿主 / 系统通知；
+ *   （Markdown 自己按块缓存）；思考块按 `ui.showThinking`：`collapsed`（缺省）一行 `✻ 思考 · N token`
+ *   （流式中 `✻ 思考中…`），Ctrl+O 展开为标题 + 缩进 2 列的正文（最多 60 行）；`full` 总是展开且不限行；
+ *   `hidden` 不显示；
+ * - 压缩摘要卡（左竖条 Card）、重试提示、Hook 阻止提示、宿主 / 系统通知；字形取 `theme.glyphs`；
  * - `replay()` 把已有消息（恢复会话、切换会话、/tree 之后）重新画出来，工具调用交给调用方构造。
  *
  * 滚动交给终端回滚：消息区只追加，切换会话时整体清空重画。
  */
-import { Box, Container, Markdown, Spacer, Text } from "../../tui.js";
+import { Card, Container, Markdown, Spacer, Text, visibleWidth, wrapTextWithAnsi, } from "../../tui.js";
+import { formatCost, formatTokens } from "./status-bar.js";
+import { notificationSummary } from "./subagent-view.js";
+import { PLAN_APPROVED_PROMPT } from "../../plan/prompts.js";
+/** 退出摘要的时长：不足 1 分钟按秒，否则按分钟。 */
+function sessionDuration(ms) {
+    const seconds = Math.max(0, Math.round(ms / 1000));
+    return seconds < 60 ? `${seconds} 秒` : `${Math.round(seconds / 60)} 分钟`;
+}
+/**
+ * 退出摘要（§3.14）：`─ 会话 <id> · 时长 · N 回合 · ↑in ↓out · cache x% · $y（重计费 $z）` 与
+ * `  恢复：ama --resume <id>`。整体 dim，会话 id 与恢复命令正文色；0 回合只到「回合」；会话没落盘不给恢复行。
+ */
+export function exitSummaryLines(stats, elapsedMs, theme) {
+    const g = theme.glyphs;
+    const dim = (s) => theme.fg("dim", s);
+    const id = stats.sessionId.slice(0, 8);
+    const parts = [
+        dim(`${g.rule} 会话 `) + theme.fg("text", id),
+        dim(sessionDuration(elapsedMs)),
+        dim(`${stats.userMessages} 回合`),
+    ];
+    const t = stats.tokens;
+    const prompt = t.input + t.cacheRead + t.cacheWrite;
+    if (stats.userMessages > 0 && prompt + t.output > 0) {
+        parts.push(dim(`${g.arrowUp}${formatTokens(prompt)} ${g.arrowDown}${formatTokens(t.output)}`));
+        const rate = stats.cache?.hitRate ?? stats.cacheHitRate;
+        if (rate !== undefined)
+            parts.push(dim(`cache ${Math.round(rate * 100)}%`));
+        if (stats.cost !== undefined && stats.cost > 0) {
+            const rebill = stats.cache?.reBilledUsd;
+            const extra = rebill !== undefined && rebill > 0 ? `（重计费 ${formatCost(rebill)}）` : "";
+            parts.push(dim(formatCost(stats.cost) + extra));
+        }
+    }
+    const lines = [parts.join(dim(" · "))];
+    if (stats.userMessages > 0 && stats.sessionFile !== undefined) {
+        lines.push(dim("  恢复：") + theme.fg("text", `ama --resume ${id}`));
+    }
+    return lines;
+}
+/** 思考块展开时的正文行数上限（`full` 不限）。 */
+export const THINKING_EXPANDED_LINES = 60;
+/** origin → 中文标签（未知 origin 原样显示）。 */
+export const ORIGIN_LABELS = {
+    steer: "插话",
+    followUp: "之后",
+    host: "宿主",
+    task: "子 Agent 通知",
+    plan: "计划",
+};
+/** [W5-U] origin 为 plan 的交接消息（给模型的英文开场）在消息区的说法。 */
+const PLAN_HANDOFF_TEXT = "按批准的计划开始执行";
+/** 首行带前缀、续行按 `indent` 缩进的文本（用户消息、排队消息）。 */
+export class PrefixedText {
+    prefix;
+    body;
+    indent;
+    cache = null;
+    constructor(prefix, body, indent = 2) {
+        this.prefix = prefix;
+        this.body = body;
+        this.indent = indent;
+    }
+    render(width) {
+        if (this.cache?.width === width)
+            return this.cache.lines;
+        const prefixWidth = Math.max(this.indent, visibleWidth(this.prefix));
+        const pieces = wrapTextWithAnsi(this.body, Math.max(1, width - prefixWidth));
+        const pad = " ".repeat(this.indent);
+        const lines = pieces.map((line, i) => (i === 0 ? this.prefix + line : pad + line));
+        if (lines.length === 0)
+            lines.push(this.prefix);
+        this.cache = { width, lines };
+        return lines;
+    }
+    invalidate() {
+        this.cache = null;
+    }
+}
+/** 思考块：折叠一行 / 展开（标题 + 缩进正文）。 */
+class ThinkingView {
+    theme;
+    display;
+    text = "";
+    tokens = 0;
+    streaming = true;
+    redacted = false;
+    expanded = false;
+    cache = null;
+    constructor(theme, display) {
+        this.theme = theme;
+        this.display = display;
+    }
+    set(text, tokens, streaming, redacted) {
+        if (text === this.text &&
+            tokens === this.tokens &&
+            streaming === this.streaming &&
+            redacted === this.redacted)
+            return;
+        this.text = text;
+        this.tokens = tokens;
+        this.streaming = streaming;
+        this.redacted = redacted;
+        this.cache = null;
+    }
+    setExpanded(expanded) {
+        if (expanded === this.expanded)
+            return;
+        this.expanded = expanded;
+        this.cache = null;
+    }
+    get open() {
+        return !this.redacted && (this.display === "full" || this.expanded);
+    }
+    render(width) {
+        if (this.cache?.width === width)
+            return this.cache.lines;
+        const t = this.theme;
+        const g = t.glyphs;
+        const style = (s) => t.fg("dim", t.italic(s));
+        const title = this.streaming
+            ? `${g.thinking} 思考中${g.ellipsis}`
+            : `${g.thinking} 思考 · ${formatTokens(this.tokens)} token`;
+        const lines = [
+            style(title) + (this.open && !this.streaming ? "  " + t.fg("dim", g.collapse) : ""),
+        ];
+        if (this.open && this.text.trim() !== "") {
+            const all = this.text
+                .trim()
+                .split("\n")
+                .flatMap((line) => wrapTextWithAnsi(line, Math.max(1, width - 2)));
+            const limit = this.display === "full" ? all.length : THINKING_EXPANDED_LINES;
+            for (const line of all.slice(0, limit))
+                lines.push("  " + t.fg("muted", t.italic(line)));
+            if (all.length > limit) {
+                lines.push("  " + t.fg("dim", `${g.ellipsis} 另 ${all.length - limit} 行`));
+            }
+        }
+        this.cache = { width, lines };
+        return lines;
+    }
+    invalidate() {
+        this.cache = null;
+    }
+}
 /** 粗估 token（4 字符 ≈ 1 token），只用于思考块的流式计数。 */
+/** [W5-U] 计划块的开闭标签（独占一行）只给模型与提取用，消息区不显示（计划正文照常渲染）。 */
+const PLAN_TAG_LINE = /^[ \t]*<\/?proposed_plan>[ \t]*$/gm;
+export function displayText(text) {
+    return text.includes("proposed_plan>") ? text.replace(PLAN_TAG_LINE, "") : text;
+}
 export function estimateTokens(text) {
     return Math.ceil(text.length / 4);
 }
@@ -29,10 +182,19 @@ export class AssistantView extends Container {
     parts = new Map();
     status = new Text("");
     streaming = true;
+    thinkingExpanded = false;
     constructor(options) {
         super();
         this.options = options;
     }
+    /** Ctrl+O：展开 / 折叠本消息的思考块（`collapsed` 模式下）。 */
+    setThinkingExpanded(expanded) {
+        this.thinkingExpanded = expanded;
+        for (const part of this.parts.values()) {
+            if (part instanceof ThinkingView)
+                part.setExpanded(expanded);
+        }
+    }
     update(message) {
         const { theme } = this.options;
         const display = this.options.showThinking ?? "collapsed";
@@ -43,35 +205,40 @@ export class AssistantView extends Container {
             if (block.type === "thinking") {
                 if (display === "hidden" || (block.thinking === "" && block.redacted !== true))
                     return;
-                const text = this.part(index, () => new Text(""));
-                if (display === "full" && block.redacted !== true) {
-                    text.setText(theme.fg("dim", theme.italic(block.thinking.trim())));
-                }
-                else {
-                    const single = message.content.filter((b) => b.type === "thinking").length === 1;
-                    const tokens = !this.streaming && single && message.usage.reasoning !== undefined
-                        ? message.usage.reasoning
-                        : estimateTokens(block.thinking);
-                    text.setText(theme.fg("dim", `${this.streaming ? "思考…" : "思考 ·"} ${tokens} token`));
-                }
-                order.push(text);
+                const view = this.part(index, () => {
+                    const created = new ThinkingView(theme, display);
+                    created.setExpanded(this.thinkingExpanded);
+                    return created;
+                });
+                const single = message.content.filter((b) => b.type === "thinking").length === 1;
+                const tokens = !this.streaming && single && message.usage.reasoning !== undefined
+                    ? message.usage.reasoning
+                    : estimateTokens(block.thinking);
+                // 后面已经有正文 / 工具调用：这段思考已结束
+                const later = message.content
+                    .slice(index + 1)
+                    .some((b) => (b.type === "text" ? b.text !== "" : b.type === "toolCall"));
+                view.set(block.thinking, tokens, this.streaming && !later, block.redacted === true);
+                order.push(view);
                 return;
             }
             if (block.text.trim() === "")
                 return;
             const view = this.part(index, () => this.options.markdown === false ? new Text("") : new Markdown("", { theme }));
-            if (view.getText() !== block.text)
-                view.setText(block.text);
+            const text = displayText(block.text);
+            if (view.getText() !== text)
+                view.setText(text);
             order.push(view);
         });
+        const gap = this.options.compact !== true;
         this.clear();
         order.forEach((child, i) => {
-            if (i > 0)
+            if (i > 0 && gap)
                 this.addChild(new Spacer());
             this.addChild(child);
         });
         if (this.status.getText() !== "") {
-            if (order.length > 0)
+            if (order.length > 0 && gap)
                 this.addChild(new Spacer());
             this.addChild(this.status);
         }
@@ -81,7 +248,7 @@ export class AssistantView extends Container {
         this.streaming = false;
         const { theme } = this.options;
         if (message.stopReason === "error") {
-            this.status.setText(theme.fg("error", `✗ ${message.errorMessage ?? "模型调用失败"}`));
+            this.status.setText(theme.fg("error", `${theme.glyphs.fail} ${message.errorMessage ?? "模型调用失败"}`));
         }
         else if (message.stopReason === "aborted") {
             this.status.setText(theme.fg("dim", "已中断"));
@@ -107,6 +274,10 @@ export class MessageView extends Container {
     options;
     current;
     blocks = [];
+    /** 工具调用块（相邻的不空行）。 */
+    toolBlocks = new WeakSet();
+    assistants = [];
+    thinkingExpanded = false;
     constructor(options) {
         super();
         this.options = options;
@@ -114,9 +285,19 @@ export class MessageView extends Container {
     get theme() {
         return this.options.theme;
     }
-    /** 追加一块（与上一块之间空一行）。 */
+    /** 追加一块（与上一块之间空一行；`compact` 不空行）。 */
     add(component) {
-        if (this.blocks.length > 0)
+        this.push(component, this.options.compact !== true);
+    }
+    /** 追加工具调用块：紧跟在另一个工具调用后面时不空行。 */
+    addTool(component) {
+        const last = this.blocks[this.blocks.length - 1];
+        const gap = this.options.compact !== true && !(last !== undefined && this.toolBlocks.has(last));
+        this.toolBlocks.add(component);
+        this.push(component, gap);
+    }
+    push(component, gap) {
+        if (this.blocks.length > 0 && gap)
             this.addChild(new Spacer());
         this.blocks.push(component);
         this.addChild(component);
@@ -141,12 +322,19 @@ export class MessageView extends Container {
     reset() {
         this.clear();
         this.blocks.length = 0;
+        this.assistants.length = 0;
         this.current = undefined;
     }
     get blockCount() {
         return this.blocks.length;
     }
-    /** 启动画面：首行加粗，其余变暗。 */
+    /** Ctrl+O：所有助手消息的思考块一起展开 / 折叠（之后的新消息沿用）。 */
+    setThinkingExpanded(expanded) {
+        this.thinkingExpanded = expanded;
+        for (const view of this.assistants)
+            view.setThinkingExpanded(expanded);
+    }
+    /** 纯文本启动画面（line 模式风格）：首行加粗，其余变暗。交互模式用 StartupHeader。 */
     addHeader(lines) {
         if (lines.length === 0)
             return;
@@ -155,15 +343,34 @@ export class MessageView extends Container {
         this.add(new Text(text.join("\n")));
     }
     addUser(message) {
+        const t = this.theme;
         const text = contentText(message.content).replace(/\s+$/, "");
         const origin = message.origin;
-        const label = origin === undefined || origin === "user"
-            ? this.theme.fg("user", "› ")
-            : this.theme.fg("dim", `↳ ${origin}  `);
-        this.add(new Text(label + text));
+        if (origin === undefined || origin === "user") {
+            this.add(new PrefixedText(t.fg("user", t.bold(t.glyphs.prompt)) + " ", text));
+            return;
+        }
+        const label = ORIGIN_LABELS[origin] ?? origin;
+        // [W5-U] 后台子 Agent 的 <task-notification> 是给模型的全文，消息区只留一行
+        const summary = origin === "task"
+            ? notificationSummary(text)
+            : origin === "plan" && text === PLAN_APPROVED_PROMPT
+                ? PLAN_HANDOFF_TEXT
+                : undefined;
+        if (summary !== undefined) {
+            this.add(new PrefixedText(t.fg("dim", t.glyphs.queued) + " " + t.fg("muted", `${label}  `), t.fg("muted", summary)));
+            return;
+        }
+        this.add(new PrefixedText(t.fg("dim", t.glyphs.queued) + " " + t.fg("muted", `${label}  `), t.fg("muted", text)));
     }
-    startAssistant(message) {
+    newAssistant() {
         const view = new AssistantView(this.options);
+        view.setThinkingExpanded(this.thinkingExpanded);
+        this.assistants.push(view);
+        return view;
+    }
+    startAssistant(message) {
+        const view = this.newAssistant();
         view.update(message);
         this.current = view;
         this.add(view);
@@ -184,39 +391,48 @@ export class MessageView extends Container {
             this.remove(view);
     }
     addNotice(level, message) {
+        const g = this.theme.glyphs;
         const color = level === "error" ? "error" : level === "warn" ? "warning" : "dim";
-        const mark = level === "error" ? "✗ " : level === "warn" ? "! " : "";
+        const mark = level === "error" ? `${g.fail} ` : level === "warn" ? `${g.warn} ` : "";
         this.add(new Text(this.theme.fg(color, mark + message)));
     }
     addHookBlocked(reason) {
-        this.add(new Text(this.theme.fg("warning", `⛔ Hook 阻止：${reason}`)));
+        const glyph = this.theme.glyphs.blocked;
+        this.add(new Text(this.theme.fg("warning", `${glyph} Hook 阻止：${reason}`)));
     }
     addRetry(attempt, maxAttempts, delayMs, error) {
         const seconds = Math.max(1, Math.round(delayMs / 1000));
-        this.add(new Text(this.theme.fg("warning", `↻ 重试 ${attempt}/${maxAttempts}（${seconds}s 后）：${error}`)));
+        const glyph = this.theme.glyphs.retry;
+        this.add(new Text(this.theme.fg("warning", `${glyph} 重试 ${attempt}/${maxAttempts}（${seconds}s 后）：${error}`)));
+    }
+    /** 退出前追加的会话摘要（留在终端回滚里）。 */
+    addExitSummary(lines) {
+        this.add(new Text(lines.join("\n")));
     }
     addRetryFailed(error) {
         this.addNotice("error", `重试失败${error !== undefined ? `：${error}` : ""}`);
     }
-    /** 压缩 / 分支摘要卡：token 变化（有则显示）+ 摘要前 3 行。 */
+    /** 压缩 / 分支摘要卡（左竖条）：标题 + token 变化（有则显示）+ 摘要前 3 行。 */
     addSummaryCard(summary, options = {}) {
-        const dim = (s) => this.theme.fg("dim", s);
+        const t = this.theme;
         const lines = summary
             .trim()
             .split("\n")
             .filter((l) => l.trim() !== "");
         const head = lines.slice(0, 3);
-        const body = [];
+        const body = head.map((l) => t.fg("muted", l));
+        if (lines.length > head.length) {
+            body.push(t.fg("dim", `${t.glyphs.ellipsis} 另 ${lines.length - head.length} 行`));
+        }
+        let subtitle;
         if (options.tokensBefore !== undefined) {
-            const after = options.tokensAfter !== undefined ? ` → ${options.tokensAfter}` : "";
-            body.push(dim(`${options.tokensBefore}${after} token`));
+            const after = options.tokensAfter !== undefined ? ` → ${formatTokens(options.tokensAfter)}` : "";
+            subtitle = `${formatTokens(options.tokensBefore)}${after} token`;
         }
-        body.push(...head.map(dim));
-        if (lines.length > head.length)
-            body.push(dim(`…（另 ${lines.length - head.length} 行）`));
-        this.add(new Box(new Text(body.join("\n")), {
+        this.add(new Card(new Text(body.join("\n")), {
+            theme: t,
             title: options.title ?? "上下文已压缩",
-            theme: this.theme,
+            ...(subtitle !== undefined ? { subtitle } : {}),
         }));
     }
     addCompaction(result) {
@@ -238,7 +454,7 @@ export class MessageView extends Container {
                     this.addUser(message);
                     break;
                 case "assistant": {
-                    const view = new AssistantView(this.options);
+                    const view = this.newAssistant();
                     view.finish(message);
                     if (!view.isEmpty)
                         this.add(view);
@@ -247,7 +463,7 @@ export class MessageView extends Container {
                             continue;
                         const tool = hooks.tool(block, results.get(block.id));
                         if (tool !== undefined)
-                            this.add(tool);
+                            this.addTool(tool);
                     }
                     break;
                 }

package/dist/modes/interactive/panels.d.ts

@@ -0,0 +1,35 @@
+/**
+ * 消息区面板（终端界面视觉设计 v1 §3.13）：`/session`、`/cache`、`/permissions` 用左竖条卡片 + 键值表
+ * 渲染，而不是把纯文本拍进通知。line 模式与 RPC 仍用 session-report 的文本版。
+ *
+ * - `/session`：标题 `会话 <id 前 8 位> · <文件>`；模型 / 消息 / 用量 / 上下文（余量表，阈值着色），
+ *   空一行后「缓存」段（与 `/cache` 共用 `cacheRows`）；
+ * - [W5-U] `/session` 多「子 Agent」行（任务汇总）与「外部 Agent」段（按 Agent 的运行次数与用量，单位不换算）；
+ * - `/permissions`：权限模式、判定顺序（折行对齐值列）、规则（allow success、deny error、来源 dim）、
+ *   最近的 auto 判定。
+ */
+import type { AgentSession } from "../../agent/types.js";
+import type { Runtime } from "../../cli/runtime.js";
+import { KeyValue, type Component, type KeyValueRow, type Theme } from "../../tui.js";
+/** 多段内容按顺序拼起来（段之间不加空行，由调用方放空串）。 */
+export declare class Stack implements Component {
+    private readonly parts;
+    constructor(parts: readonly (Component | string)[]);
+    render(width: number): string[];
+    invalidate(): void;
+}
+/** 缩进若干列的子组件。 */
+export declare class Indent implements Component {
+    private readonly child;
+    private readonly columns;
+    constructor(child: Component, columns: number);
+    render(width: number): string[];
+    invalidate(): void;
+}
+export declare function keyValue(rows: readonly KeyValueRow[], theme: Theme, wrap?: boolean): KeyValue;
+export declare function sessionPanel(session: AgentSession, theme: Theme, options?: {
+    now?: number;
+    home?: string;
+}): Component;
+export declare function cachePanel(session: AgentSession, theme: Theme, now?: number): Component;
+export declare function permissionsPanel(runtime: Pick<Runtime, "permission">, session: AgentSession, theme: Theme): Component;

package/dist/modes/interactive/panels.js

@@ -0,0 +1,157 @@
+/**
+ * 消息区面板（终端界面视觉设计 v1 §3.13）：`/session`、`/cache`、`/permissions` 用左竖条卡片 + 键值表
+ * 渲染，而不是把纯文本拍进通知。line 模式与 RPC 仍用 session-report 的文本版。
+ *
+ * - `/session`：标题 `会话 <id 前 8 位> · <文件>`；模型 / 消息 / 用量 / 上下文（余量表，阈值着色），
+ *   空一行后「缓存」段（与 `/cache` 共用 `cacheRows`）；
+ * - [W5-U] `/session` 多「子 Agent」行（任务汇总）与「外部 Agent」段（按 Agent 的运行次数与用量，单位不换算）；
+ * - `/permissions`：权限模式、判定顺序（折行对齐值列）、规则（allow success、deny error、来源 dim）、
+ *   最近的 auto 判定。
+ */
+import { AUTO_LAYER_TEXT, permissionModeLabel } from "../../permissions/modes.js";
+import { Card, KeyValue, Meter, } from "../../tui.js";
+import { cacheRows, externalRows, formatTokenCount, formatUsd, taskStatsText, } from "../session-report.js";
+import { tildePath } from "../../cli/startup-screen.js";
+/** 多段内容按顺序拼起来（段之间不加空行，由调用方放空串）。 */
+export class Stack {
+    parts;
+    constructor(parts) {
+        this.parts = parts;
+    }
+    render(width) {
+        return this.parts.flatMap((part) => (typeof part === "string" ? [part] : part.render(width)));
+    }
+    invalidate() {
+        for (const part of this.parts)
+            if (typeof part !== "string")
+                part.invalidate();
+    }
+}
+/** 缩进若干列的子组件。 */
+export class Indent {
+    child;
+    columns;
+    constructor(child, columns) {
+        this.child = child;
+        this.columns = columns;
+    }
+    render(width) {
+        const pad = " ".repeat(this.columns);
+        return this.child
+            .render(Math.max(1, width - this.columns))
+            .map((line) => (line === "" ? "" : pad + line));
+    }
+    invalidate() {
+        this.child.invalidate();
+    }
+}
+export function keyValue(rows, theme, wrap = false) {
+    return new KeyValue(rows, { theme, maxKeyRatio: 0.3, ...(wrap ? { wrap: true } : {}) });
+}
+function cacheSection(session, theme, now) {
+    return [theme.bold("缓存"), new Indent(keyValue(cacheRows(session, now), theme), 2)];
+}
+export function sessionPanel(session, theme, options = {}) {
+    const now = options.now ?? Date.now();
+    const state = session.state;
+    const stats = session.getStats();
+    const t = stats.tokens;
+    const sep = theme.fg("dim", " · ");
+    const model = state.model === undefined ? "?" : `${state.model.provider}/${state.model.id}`;
+    const ratio = stats.contextPercent === undefined ? undefined : stats.contextPercent / 100;
+    const meter = new Meter(ratio, { theme }).render(40)[0] ?? "";
+    const window = stats.contextTokens === undefined && stats.contextWindow === undefined
+        ? ""
+        : sep +
+            `${stats.contextTokens === undefined ? "?" : formatTokenCount(stats.contextTokens)} / ` +
+            `${stats.contextWindow === undefined ? "?" : formatTokenCount(stats.contextWindow)}`;
+    const rows = [
+        {
+            key: "模型",
+            value: theme.fg("accent", model) +
+                sep +
+                `思考 ${state.thinkingLevel}` +
+                sep +
+                `权限 ${permissionModeLabel(state.permissionMode)}`,
+        },
+        {
+            key: "消息",
+            value: [
+                `用户 ${stats.userMessages}`,
+                `助手 ${stats.assistantMessages}`,
+                `工具调用 ${stats.toolCalls}`,
+            ].join(sep),
+        },
+        {
+            key: "用量",
+            value: [
+                `输入 ${formatTokenCount(t.input)}`,
+                `输出 ${formatTokenCount(t.output)}`,
+                `缓存读 ${formatTokenCount(t.cacheRead)}`,
+                `缓存写 ${formatTokenCount(t.cacheWrite)}`,
+                formatUsd(stats.cost),
+            ].join(sep),
+        },
+        { key: "上下文", value: meter + window },
+    ];
+    const tasks = taskStatsText(session);
+    if (tasks !== undefined)
+        rows.push({ key: "子 Agent", value: tasks });
+    const external = externalRows(session);
+    const externalSection = external.length > 0
+        ? ["", theme.bold("外部 Agent"), new Indent(keyValue(external, theme), 2)]
+        : [];
+    const file = state.sessionFile === undefined ? "未落盘" : tildePath(state.sessionFile, options.home);
+    const parts = [
+        keyValue(rows, theme),
+        "",
+        ...cacheSection(session, theme, now),
+        ...externalSection,
+    ];
+    return new Card(new Stack(parts), {
+        theme,
+        title: `会话 ${state.sessionId.slice(0, 8)}`,
+        subtitle: file,
+    });
+}
+export function cachePanel(session, theme, now = Date.now()) {
+    return new Card(keyValue(cacheRows(session, now), theme), { theme, title: "缓存" });
+}
+const DECISION_COLOR = {
+    allow: "success",
+    deny: "error",
+    ask: "warning",
+};
+export function permissionsPanel(runtime, session, theme) {
+    const rules = runtime.permission.rules;
+    const mode = session.state.permissionMode;
+    const order = mode === "auto"
+        ? "deny 规则 → Hook deny → 危险命令确认 → 规则层（受保护路径、项目外写入、网络、删除类）→ Hook ask → allow 规则 / Hook allow / 本会话记忆 → 静态判定（只读、项目内写入、安全名单）→ 模型分类器 → 询问"
+        : mode === "allowlist"
+            ? "deny 规则 → Hook deny → 危险命令（拒绝）→ 只读工具 / allow 规则 / Hook allow 放行 → 其余拒绝（从不询问）"
+            : "deny 规则 → Hook deny → 危险命令确认 → 权限模式 → allow 规则 / Hook allow / 本会话记忆 → 询问";
+    const effect = (decision) => theme.fg(DECISION_COLOR[decision] ?? "text", decision.padEnd(5));
+    const parts = [
+        keyValue([
+            { key: "权限模式", value: `${permissionModeLabel(mode)}${theme.fg("dim", `（${mode}）`)}` },
+            { key: "判定顺序", value: order },
+        ], theme, true),
+        theme.bold(rules.length === 0 ? "规则（无）" : `规则（${rules.length}）`),
+    ];
+    if (rules.length > 0) {
+        parts.push(new Indent(keyValue(rules.map((r) => ({
+            key: effect(r.effect),
+            value: `${r.raw}  ${theme.fg("dim", `[${r.source}]`)}`,
+        })), theme), 2));
+    }
+    const recent = runtime.permission.autoDecisions?.() ?? [];
+    if (recent.length > 0) {
+        parts.push(theme.bold(`最近的 auto 判定（${recent.length}）`));
+        parts.push(new Indent(keyValue(recent.map((d) => ({
+            key: AUTO_LAYER_TEXT[d.layer],
+            value: `${effect(d.decision)}  ${d.toolName} ${d.summary} — ${d.reason}` +
+                (d.cached === true ? theme.fg("dim", "（缓存）") : ""),
+        })), theme), 2));
+    }
+    return new Card(new Stack(parts), { theme });
+}

package/dist/modes/interactive/pickers.d.ts

@@ -4,8 +4,11 @@
  * - 模型：按供应商分组并标 key 状态（`modelItems`，与启动期共用），当前模型预选；
  * - 会话：名字或首条提示、相对时间、消息数（`sessionItems`）；
  * - 树：会话文件里全部用户消息，按分叉缩进，`●` 标出当前分支；选中项回填编辑器（由 commands.ts 处理）；
- * - 权限模式（从严到宽）与思考级别。
+ * - 权限模式（标题「权限模式」，界面顺序 1–6，当前模式 ✓ / Default dim / Recommended accent，底部按键提示，
+ *   上下留白，见 permissionItems）与思考级别；
+ * - 所有选择器底部一行按键提示（dim），模型选择器带 (i/n) 并给当前模型打 ✓。
  */
+import type { PermissionMode } from "../../permissions/types.js";
 import type { SessionEntry } from "../../session/types.js";
 import { type Keybindings, type OverlayHandle, type OverlayOptions, type SelectItem, type Theme, type Component } from "../../tui.js";
 export { modelItems, sessionItems } from "./startup-ui.js";
@@ -23,10 +26,28 @@ export interface PickerSpec {
     filterable?: boolean;
     maxVisible?: number;
     emptyText?: string;
+    /** 右侧序号 1–9，按数字直接选中。 */
+    numberKeys?: boolean;
+    /** 说明放在标签下一行。 */
+    stacked?: boolean;
+    /** 当前值（标 ✓）。 */
+    currentValue?: string;
+    /** 列表下的按键提示，缺省「↑↓ 选择 · Enter 确认 · Esc 取消」。 */
+    footer?: string;
+    /** 提示行前带 (i/n)。 */
+    showCount?: boolean;
+    /** 框内上下留白行数。 */
+    paddingY?: number;
 }
+export declare const PICKER_FOOTER = "\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u786E\u8BA4 \u00B7 Esc \u53D6\u6D88";
 /** 打开一个居中选择器；Enter 返回选中项，Esc / Ctrl+C 返回 undefined。 */
 export declare function openPicker(host: PickerHost, spec: PickerSpec): Promise<SelectItem | undefined>;
-export declare function permissionItems(): SelectItem[];
+/**
+ * 模式选择器（标题「权限模式」）：界面顺序、当前模式打勾（`currentValue`）、配置里的缺省模式标
+ * `Default`、Auto 标 `Recommended`，右侧数字快捷键 1–6，说明在下一行。
+ */
+export declare function permissionItems(_current: PermissionMode, configDefault?: PermissionMode): SelectItem[];
+export declare function permissionPickerSpec(current: PermissionMode, configDefault?: PermissionMode): PickerSpec;
 export declare function thinkingItems(reasoning: boolean): SelectItem[];
 export interface TreeNode {
     entry: SessionEntry;