@armadra/agent 0.3.0 → 0.4.0

package/dist/modes/interactive/interactive-mode.js

@@ -11,30 +11,33 @@
  * - 晚绑定：`runtime.approvals.setUiBroker`（审批对话框）与 `runtime.notifier.set`（宿主通知进消息区），
  *   退出时撤下。
  * - 键位：Enter 发送（运行中 = steer），其余应用级键位见 `key-dispatch.ts`。
- * - 启动画面按 `ui.quietStartup`：normal 标题 + 模型 / 信任 / 资源清单，header 只有标题，silent 不输出。
+ * - 启动头按 `ui.quietStartup`（startup-header.ts）：normal 框 + 模型 / 目录 / 模式 / 资源清单（窄屏或
+ *   `ui.compact` 去框），header 一行，silent 不输出。
  */
 import { promptImages, sessionModel } from "../image-input.js";
 import { join } from "node:path";
 import { AgentSessionImpl } from "../../agent/session.js";
 import { currentSession, switchSession } from "../../cli/compose-session.js";
-import { buildStartupScreen } from "../../cli/startup-screen.js";
+import { startupInfo, startupScreenLevel } from "../../cli/startup-screen.js";
 import { KEYBINDINGS_FILE } from "../../config/paths.js";
 import { AmaError, isAmaError } from "../../errors.js";
 import { detectSandboxCapability } from "../../codemode/capability.js";
 import { effectiveCodemodeMode } from "../../tools/presets.js";
-import { Container, Editor, Keybindings, Loader, ProcessTerminal, Spacer, TUI, Text, createTheme, detectCapabilities, loadKeybindingsFile, truncateToWidth, } from "../../tui.js";
+import { Container, Editor, Keybindings, Loader, ProcessTerminal, Spacer, TUI, Text, createTheme, detectCapabilities, resolveAscii, resolveThemeName, loadKeybindingsFile, truncateToWidth, } from "../../tui.js";
 import { cacheEventNotice, cacheNoticesEnabled } from "../session-report.js";
 import { onTerminationSignals } from "../shared.js";
 import { ApprovalDialogBroker, approvalOutcomeText } from "./approval-dialog.js";
 import { ALL_COMMANDS, runInteractiveCommand } from "./commands.js";
 import { InteractiveCompletion } from "./completion.js";
 import { createKeyDispatch } from "./key-dispatch.js";
-import { MessageView } from "./message-view.js";
+import { MessageView, exitSummaryLines } from "./message-view.js";
 import { openPicker } from "./pickers.js";
+import { StartupHeader } from "./startup-header.js";
+import { QueueView, RunIndicator } from "./run-indicator.js";
 import { StatusBar } from "./status-bar.js";
 import { ToolTracker } from "./tool-view.js";
 const HINT_MS = 2500;
-const QUEUE_PREVIEW = 3;
+const EDITOR_PLACEHOLDER = "输入消息，/ 命令，@ 文件，Shift+Enter 换行";
 function processTerminal() {
     const stdin = process.stdin;
     if (stdin.isTTY !== true || typeof stdin.setRawMode !== "function" || !process.stdout.isTTY) {
@@ -59,17 +62,17 @@ class HintLine {
     }
     invalidate() { }
 }
-function oneLine(text) {
-    return text.replace(/\s+/g, " ").trim();
-}
 export function runInteractiveMode(runtime, context, options = {}) {
     const terminal = options.terminal ?? processTerminal();
     const ui = runtime.config.ui ?? {};
+    const env = context.io.env;
     const theme = options.theme ??
-        createTheme(ui.theme ?? "dark", {
-            caps: detectCapabilities(context.io.env, context.io.stdoutIsTTY),
+        createTheme(resolveThemeName(ui.theme, env), {
+            caps: detectCapabilities(env, context.io.stdoutIsTTY),
+            ascii: resolveAscii(ui.ascii, env),
         });
     const now = options.now ?? Date.now;
+    const startedAt = now();
     const startupWarnings = [];
     const keys = options.keybindings ?? loadKeys(runtime, (m) => startupWarnings.push(m));
     let session = currentSession(runtime);
@@ -78,20 +81,25 @@ export function runInteractiveMode(runtime, context, options = {}) {
         theme,
         ...(ui.showThinking !== undefined ? { showThinking: ui.showThinking } : {}),
         ...(ui.markdown !== undefined ? { markdown: ui.markdown } : {}),
+        ...(ui.compact === true ? { compact: true } : {}),
     });
     const tools = new ToolTracker({
         theme,
         cwd: session.state.cwd,
         getTool: (name) => session.getTools().find((tool) => tool.name === name),
+        now,
+        spinner: () => loader.frame,
     });
-    const queueText = new Text("");
+    const queueView = new QueueView(theme);
     const loaderSlot = new Container();
     const loader = new Loader(() => tui.requestRender(), {
         theme,
-        message: "工作中" + theme.fg("dim", " · Esc 中断"),
+        message: "思考中",
         now,
+        ...(ui.animation === false ? { animation: false } : {}),
         ...(options.spinnerIntervalMs !== undefined ? { intervalMs: options.spinnerIntervalMs } : {}),
     });
+    loader.onFrame(() => tools.tick());
     const hint = new HintLine();
     let sandboxStrict;
     const status = new StatusBar({
@@ -119,6 +127,7 @@ export function runInteractiveMode(runtime, context, options = {}) {
         theme,
         keybindings: keys,
         maxVisibleLines: 8,
+        placeholder: EDITOR_PLACEHOLDER,
         autocomplete: completion,
         requestRender: () => tui.requestRender(),
         ...(historyFile !== undefined ? { historyFile } : {}),
@@ -126,15 +135,13 @@ export function runInteractiveMode(runtime, context, options = {}) {
     });
     tui.addChild(view);
     tui.addChild(new Spacer());
-    tui.addChild(queueText);
+    tui.addChild(queueView);
     tui.addChild(loaderSlot);
     tui.addChild(editor);
     tui.addChild(hint);
     tui.addChild(status);
     // ---- 小工具 ---------------------------------------------------------------
     let finished = false;
-    let running = false;
-    let compacting = false;
     let hintTimer;
     let resolveExit = () => undefined;
     const render = () => tui.requestRender();
@@ -156,47 +163,20 @@ export function runInteractiveMode(runtime, context, options = {}) {
         }
         render();
     };
-    const syncLoader = () => {
-        const active = running || compacting;
-        if (active && loaderSlot.children.length === 0) {
-            loader.setMessage((compacting && !running ? "压缩上下文" : "工作中") + theme.fg("dim", " · Esc 中断"));
-            loaderSlot.addChild(loader);
-            loader.start();
-        }
-        else if (!active && loaderSlot.children.length > 0) {
-            loader.stop();
-            loaderSlot.clear();
-        }
-        render();
-    };
+    const indicator = new RunIndicator({ theme, loader, slot: loaderSlot, tools, render });
     const setQueue = (steering, followUp) => {
         status.setQueue(steering.length, followUp.length);
-        const rows = [
-            ...steering.map((t) => `↳ steer  ${oneLine(t)}`),
-            ...followUp.map((t) => `↳ followUp  ${oneLine(t)}`),
-        ];
-        const shown = rows.slice(-QUEUE_PREVIEW);
-        if (rows.length > shown.length)
-            shown.unshift(`… 另 ${rows.length - shown.length} 条`);
-        if (rows.length > 0)
-            shown.push("Alt+↑ 取回 · Esc 全部回填并中断");
-        queueText.setText(shown.map((l) => theme.fg("dim", l)).join("\n"));
+        queueView.setQueue(steering, followUp);
         render();
     };
     // ---- 会话事件 -------------------------------------------------------------
     const onEvent = (event) => {
         switch (event.type) {
-            case "agent_start":
-                running = true;
-                syncLoader();
-                return;
             case "agent_settled":
-                running = false;
                 if (event.warning !== undefined)
                     view.addNotice("warn", event.warning);
                 status.refresh();
-                syncLoader();
-                return;
+                break;
             case "message_start": {
                 const message = event.message;
                 if (message.role === "user")
@@ -206,26 +186,22 @@ export function runInteractiveMode(runtime, context, options = {}) {
                 else if (message.role === "custom" && message.display) {
                     view.addNotice("info", typeof message.content === "string" ? message.content : "");
                 }
-                render();
-                return;
+                break;
             }
             case "message_update":
                 view.updateAssistant(event.message);
-                render();
-                return;
+                break;
             case "message_end":
                 if (event.message.role === "assistant") {
                     view.endAssistant(event.message);
                     status.refresh();
                 }
-                render();
-                return;
+                break;
             case "tool_execution_start": {
                 const started = tools.start(event);
                 if (started.topLevel)
-                    view.add(started.view);
-                render();
-                return;
+                    view.addTool(started.view);
+                break;
             }
             case "tool_execution_update":
                 tools.update(event.toolCallId, event.partial);
@@ -233,17 +209,11 @@ export function runInteractiveMode(runtime, context, options = {}) {
                 return;
             case "tool_execution_end":
                 tools.end(event.toolCallId, event.result, event.isError);
-                render();
-                return;
+                break;
             case "queue_update":
                 setQueue(event.steering, event.followUp);
                 return;
-            case "compaction_start":
-                compacting = true;
-                syncLoader();
-                return;
             case "compaction_end":
-                compacting = false;
                 if (event.result !== undefined)
                     view.addCompaction(event.result);
                 else if (event.error !== undefined)
@@ -251,17 +221,14 @@ export function runInteractiveMode(runtime, context, options = {}) {
                 else if (event.aborted)
                     view.addNotice("info", "压缩已取消");
                 status.refresh();
-                syncLoader();
-                return;
+                break;
             case "auto_retry_start":
                 view.addRetry(event.attempt, event.maxAttempts, event.delayMs, event.errorMessage);
-                render();
-                return;
+                break;
             case "auto_retry_end":
                 if (!event.success)
                     view.addRetryFailed(event.finalError);
-                render();
-                return;
+                break;
             case "cache_miss":
             case "context_pressure": {
                 const shown = cacheEventNotice(event, cacheNoticesEnabled(session));
@@ -280,15 +247,21 @@ export function runInteractiveMode(runtime, context, options = {}) {
                 render();
                 return;
             default:
-                return;
+                break;
         }
+        indicator.onEvent(event);
+        render();
     };
     let unsubscribe = session.subscribe(onEvent);
-    const startup = buildStartupScreen(runtime);
-    /** 清空消息区（切换会话、/tree）：只留标题行。 */
+    const startupLevel = startupScreenLevel(runtime);
+    const home = env["HOME"] ?? env["USERPROFILE"];
+    const info = startupInfo(runtime, home);
+    const header = (level) => new StartupHeader(info, { theme, level, ...(ui.compact === true ? { compact: true } : {}) });
+    /** 清空消息区（切换会话、/tree）：只留一行头。 */
     const resetView = () => {
         view.reset();
-        view.addHeader(startup.slice(0, 1));
+        if (startupLevel !== "silent")
+            view.add(header("header"));
     };
     const replay = () => {
         view.replay(session.messages, {
@@ -308,11 +281,9 @@ export function runInteractiveMode(runtime, context, options = {}) {
         resetView();
         tools.clear();
         replay();
-        running = false;
-        compacting = false;
         setQueue([], []);
         status.refresh();
-        syncLoader();
+        indicator.reset();
         if (next instanceof AgentSessionImpl)
             next.announceStart(reason);
     };
@@ -356,6 +327,13 @@ export function runInteractiveMode(runtime, context, options = {}) {
             columns: () => terminal.columns,
         }, spec),
         notice,
+        panel: (component) => {
+            view.add(component);
+            render();
+        },
+        theme: () => theme,
+        env,
+        ...(home !== undefined ? { home } : {}),
         setEditorText: (text) => {
             editor.setText(text);
             render();
@@ -388,7 +366,7 @@ export function runInteractiveMode(runtime, context, options = {}) {
         send(text, via);
     }
     function send(text, via) {
-        if (!running)
+        if (!indicator.running)
             startPrompt(text);
         else if (via === "followUp")
             void session.followUp(text).catch(() => undefined);
@@ -403,9 +381,10 @@ export function runInteractiveMode(runtime, context, options = {}) {
         status,
         session: () => session,
         inactive: () => finished || tui.hasOverlay,
-        busy: () => running || compacting,
+        busy: () => indicator.busy,
         now,
         showHint,
+        onExpandToggle: (expanded) => view.setThinkingExpanded(expanded),
         submit: (text, via) => submit(text, via),
         runCommand: (line) => void runCommand(line),
         exit: (code) => exit(code),
@@ -419,11 +398,13 @@ export function runInteractiveMode(runtime, context, options = {}) {
         showOverlay: (component) => tui.showOverlay(component, { anchor: "bottom" }),
         onOpen: () => {
             editor.disableSubmit = true;
-            render();
+            tools.setAwaiting(true);
+            indicator.setApproval(true);
         },
         onClose: () => {
             editor.disableSubmit = false;
-            render();
+            tools.setAwaiting(false);
+            indicator.setApproval(false);
         },
         report: (request, outcome) => {
             if (outcome === "deny" || outcome === "cancelled") {
@@ -439,9 +420,11 @@ export function runInteractiveMode(runtime, context, options = {}) {
         finished = true;
         if (hintTimer !== undefined)
             clearTimeout(hintTimer);
-        hint.setText("");
         loader.stop();
-        loaderSlot.clear();
+        // 退出摘要留在回滚里；输入框、状态栏等底部区域撤掉，屏幕停在摘要下面
+        view.addExitSummary(exitSummaryLines(session.getStats(), now() - startedAt, theme));
+        tui.clear();
+        tui.addChild(view);
         offSignals();
         runtime.approvals.setUiBroker(undefined);
         runtime.notifier.set(undefined);
@@ -455,7 +438,8 @@ export function runInteractiveMode(runtime, context, options = {}) {
             resolveExit(code);
         });
     }
-    view.addHeader(startup);
+    if (startupLevel !== "silent")
+        view.add(header(startupLevel));
     for (const warning of startupWarnings)
         view.addNotice("warn", warning);
     replay();

package/dist/modes/interactive/key-dispatch.d.ts

@@ -3,7 +3,7 @@
  *
  * 编辑器之前的输入监听：Ctrl+C 清空输入 / 再按退出、Esc 中断（clearQueue 回填编辑器后 abort）、
  * Ctrl+D 空输入退出、Alt+Enter followUp、Alt+↑ 取回最后一条排队消息、Shift+Tab 循环权限模式、
- * Ctrl+O 展开工具输出、Ctrl+L 模型、Ctrl+T 思考级别。键位由 `keybindings.json` 覆盖。
+ * Ctrl+O 展开工具输出与思考块、Ctrl+L 模型、Ctrl+T 思考级别。键位由 `keybindings.json` 覆盖。
  */
 import type { AgentSession } from "../../agent/types.js";
 import type { Editor, Keybindings } from "../../tui.js";
@@ -21,6 +21,8 @@ export interface KeyDispatchDeps {
     busy(): boolean;
     now(): number;
     showHint(text: string): void;
+    /** Ctrl+O 之后（消息区思考块跟着展开 / 折叠）。 */
+    onExpandToggle?(expanded: boolean): void;
     submit(text: string, via: "followUp"): void;
     runCommand(line: string): void;
     exit(code: number): void;

package/dist/modes/interactive/key-dispatch.js

@@ -3,10 +3,10 @@
  *
  * 编辑器之前的输入监听：Ctrl+C 清空输入 / 再按退出、Esc 中断（clearQueue 回填编辑器后 abort）、
  * Ctrl+D 空输入退出、Alt+Enter followUp、Alt+↑ 取回最后一条排队消息、Shift+Tab 循环权限模式、
- * Ctrl+O 展开工具输出、Ctrl+L 模型、Ctrl+T 思考级别。键位由 `keybindings.json` 覆盖。
+ * Ctrl+O 展开工具输出与思考块、Ctrl+L 模型、Ctrl+T 思考级别。键位由 `keybindings.json` 覆盖。
  */
 import { ExitCode } from "../../cli/exit-codes.js";
-import { PERMISSION_MODES_STRICT_FIRST } from "../../permissions/types.js";
+import { nextCycleMode, permissionModeLabel } from "../../permissions/modes.js";
 const DOUBLE_CTRL_C_MS = 1500;
 /** 返回输入监听器：已处理返回 true，交给编辑器返回 false。 */
 export function createKeyDispatch(deps) {
@@ -39,12 +39,10 @@ export function createKeyDispatch(deps) {
     };
     const cyclePermission = () => {
         const session = deps.session();
-        const modes = PERMISSION_MODES_STRICT_FIRST;
-        const index = modes.indexOf(session.state.permissionMode);
-        const next = modes[(index + 1) % modes.length];
+        const next = nextCycleMode(session.state.permissionMode);
         session.setPermissionMode(next);
         status.refresh();
-        deps.showHint(`权限模式：${next}`);
+        deps.showHint(`权限模式：${permissionModeLabel(next)}`);
     };
     return (data) => {
         if (deps.inactive())
@@ -91,6 +89,7 @@ export function createKeyDispatch(deps) {
         }
         if (is("app.tools.expand")) {
             const expanded = tools.toggleExpanded();
+            deps.onExpandToggle?.(expanded);
             deps.showHint(expanded ? "工具输出：展开" : "工具输出：折叠");
             return true;
         }

package/dist/modes/interactive/line/line-mode.d.ts

@@ -5,6 +5,7 @@
  *   = steer；Ctrl+C 运行中中断、空闲时连按两次退出（130）；空行 Ctrl+D 退出；审批 y / a / N 单键问答。
  *   问句之前逐行打印执行前预览（`request.preview`，W3-B9a-2）。
  * - 否则（管道）：逐行读 stdin，每行依次执行（等上一条运行结束）；没有审批 UI，ask → deny。
+ *   模型错误在运行结束时只打印一次（重试中只显示 ↻）；有运行最终失败时退出码 1。
  * - 斜杠命令走 commands-core（与 B7 同一语义），`pick` 退化为列出候选。
  */
 import type { ModeContext } from "../../../cli/deps.js";

package/dist/modes/interactive/line/line-mode.js

@@ -5,6 +5,7 @@
  *   = steer；Ctrl+C 运行中中断、空闲时连按两次退出（130）；空行 Ctrl+D 退出；审批 y / a / N 单键问答。
  *   问句之前逐行打印执行前预览（`request.preview`，W3-B9a-2）。
  * - 否则（管道）：逐行读 stdin，每行依次执行（等上一条运行结束）；没有审批 UI，ask → deny。
+ *   模型错误在运行结束时只打印一次（重试中只显示 ↻）；有运行最终失败时退出码 1。
  * - 斜杠命令走 commands-core（与 B7 同一语义），`pick` 退化为列出候选。
  */
 import { promptImages, sessionModel } from "../../image-input.js";
@@ -68,6 +69,7 @@ export async function runLineMode(runtime, context, options = {}) {
         }
         catch (error) {
             printer.endLine();
+            printer.failures++;
             err(`ama: ${errorText(error)}\n`);
         }
         return undefined;
@@ -78,7 +80,7 @@ export async function runLineMode(runtime, context, options = {}) {
         printer.endLine();
     };
     if (!raw)
-        return runPiped(stdin, context, handle, () => session, () => unsubscribe());
+        return runPiped(stdin, context, handle, () => session, () => unsubscribe(), () => printer.failures > 0);
     // ---- raw 终端 ----
     const tty = stdin;
     editor = new LineEditor({ prompt: "› ", write: (t) => io.stdout(t) });
@@ -182,8 +184,8 @@ export async function runLineMode(runtime, context, options = {}) {
             ed.render();
     });
 }
-/** 管道：逐行依次执行；stdin 结束后等最后一条跑完退出 0。 */
-function runPiped(stdin, context, handle, session, unsubscribe) {
+/** 管道：逐行依次执行；stdin 结束后等最后一条跑完退出——有失败的运行时 1，否则 0。 */
+function runPiped(stdin, context, handle, session, unsubscribe, failed) {
     return new Promise((resolve) => {
         let chain = Promise.resolve(undefined);
         let finished = false;
@@ -205,7 +207,7 @@ function runPiped(stdin, context, handle, session, unsubscribe) {
             });
         };
         const reader = createLineReader(stdin, enqueue, () => {
-            void chain.then(() => finish(ExitCode.Ok));
+            void chain.then(() => finish(failed() ? ExitCode.RuntimeError : ExitCode.Ok));
         });
         const offSignals = onTerminationSignals((code) => {
             void session()

package/dist/modes/interactive/line/line-render.d.ts

@@ -23,6 +23,10 @@ export declare class EventPrinter {
     private readonly err;
     private readonly options;
     private midLine;
+    /** 本次运行的模型错误：等 agent_settled 再打（重试中的失败尝试只显示 ↻ 那一行）。 */
+    private pendingError;
+    /** 最终失败的运行次数（管道模式据此返回退出码 1）。 */
+    failures: number;
     constructor(out: (text: string) => void, err: (text: string) => void, options?: EventPrinterOptions);
     private line;
     /** 收尾：保证光标在行首。 */

package/dist/modes/interactive/line/line-render.js

@@ -4,7 +4,7 @@
  */
 import { THINKING_LEVELS } from "../../../ai/thinking.js";
 import { listSessions } from "../../../cli/compose-store.js";
-import { PERMISSION_MODES_STRICT_FIRST } from "../../../permissions/types.js";
+import { AUTO_LAYER_TEXT, permissionModeLines } from "../../../permissions/modes.js";
 import { cacheEventNotice, warmSentNotice } from "../../session-report.js";
 const SUMMARY_KEYS = ["command", "path", "pattern", "file_path", "url", "description", "name"];
 /** 工具参数的一行摘要（第一个常见字段，折叠换行、截到 80 字符）。 */
@@ -24,11 +24,14 @@ export function argsSummary(args) {
 export function approvalQuestion(request) {
     const task = (request.context?.depth ?? 0) > 0 ? "[task] " : "";
     const summary = argsSummary(request.input);
+    const auto = request.autoDecision;
     const why = request.reason === "dangerous"
         ? "（危险命令）"
         : request.hookReason !== undefined
             ? `（${request.hookReason}）`
-            : "";
+            : auto !== undefined
+                ? `（Auto ${AUTO_LAYER_TEXT[auto.layer]}：${auto.reason}）`
+                : "";
     return `${task}允许 ${request.toolName}${summary !== "" ? ` ${summary}` : ""}${why}？[y 允许 / a 本会话都允许 / N 拒绝] `;
 }
 /** `AMA_LOG=info|debug`。 */
@@ -40,6 +43,10 @@ export class EventPrinter {
     err;
     options;
     midLine = false;
+    /** 本次运行的模型错误：等 agent_settled 再打（重试中的失败尝试只显示 ↻ 那一行）。 */
+    pendingError;
+    /** 最终失败的运行次数（管道模式据此返回退出码 1）。 */
+    failures = 0;
     constructor(out, err, options = {}) {
         this.out = out;
         this.err = err;
@@ -72,9 +79,13 @@ export class EventPrinter {
                 if (event.message.role === "assistant") {
                     this.endLine();
                     if (event.message.stopReason === "error")
-                        this.line(`ama: 错误：${event.message.errorMessage ?? "模型调用失败"}`, true);
+                        this.pendingError = event.message.errorMessage ?? "模型调用失败";
                 }
                 return;
+            case "agent_end":
+                if (event.willRetry)
+                    this.pendingError = undefined;
+                return;
             case "tool_execution_start": {
                 const summary = argsSummary(event.args);
                 this.line(`● ${event.toolName}${summary !== "" ? `  ${summary}` : ""}`);
@@ -112,11 +123,19 @@ export class EventPrinter {
                     this.line(`ama: ${text}`, true);
                 return;
             }
-            case "agent_settled":
+            case "agent_settled": {
                 this.endLine();
-                if (event.warning !== undefined)
+                const error = this.pendingError;
+                this.pendingError = undefined;
+                if (error !== undefined) {
+                    this.failures++;
+                    this.line(`ama: 错误：${error}`, true);
+                }
+                // 失败时 warning 就是同一条错误文本，不再重复打印
+                if (event.warning !== undefined && event.warning !== error)
                     this.line(`ama: ${event.warning}`, true);
                 return;
+            }
             default:
                 return;
         }
@@ -164,7 +183,10 @@ export async function pickHint(what, runtime, session) {
             ].join("\n");
         }
         case "permission":
-            return `权限模式（/permission <模式>）：${PERMISSION_MODES_STRICT_FIRST.join(" | ")}；当前 ${session.state.permissionMode}`;
+            return [
+                "Mode（/permission <模式>）：",
+                ...permissionModeLines(session.state.permissionMode, runtime.config.permission?.mode ?? "default").map((line) => `  ${line}`),
+            ].join("\n");
         case "thinking":
             return `思考级别（/thinking <级别>）：${THINKING_LEVELS.join(" | ")}；当前 ${session.state.thinkingLevel}`;
     }

package/dist/modes/interactive/message-view.d.ts

@@ -1,18 +1,21 @@
 /**
  * 消息区（设计 §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 type { AssistantMessage, ContentBlock, ToolCallBlock, UserMessage } from "../../ai/types.js";
-import type { CompactionResult, ToolResultMessage } from "../../agent/types.js";
+import type { CompactionResult, SessionStats, ToolResultMessage } from "../../agent/types.js";
 import type { AgentMessage } from "../../session/types.js";
 import { Container, type Component, type Theme } from "../../tui.js";
 export type ThinkingDisplay = "full" | "collapsed" | "hidden";
@@ -22,6 +25,27 @@ export interface MessageViewOptions {
     showThinking?: ThinkingDisplay;
     /** false：助手文本不做 Markdown 渲染。 */
     markdown?: boolean;
+    /** `ui.compact`：块间不空行。 */
+    compact?: boolean;
+}
+/**
+ * 退出摘要（§3.14）：`─ 会话 <id> · 时长 · N 回合 · ↑in ↓out · cache x% · $y（重计费 $z）` 与
+ * `  恢复：ama --resume <id>`。整体 dim，会话 id 与恢复命令正文色；0 回合只到「回合」；会话没落盘不给恢复行。
+ */
+export declare function exitSummaryLines(stats: Pick<SessionStats, "sessionId" | "sessionFile" | "userMessages" | "tokens" | "cost" | "cache" | "cacheHitRate">, elapsedMs: number, theme: Theme): string[];
+/** 思考块展开时的正文行数上限（`full` 不限）。 */
+export declare const THINKING_EXPANDED_LINES = 60;
+/** origin → 中文标签（未知 origin 原样显示）。 */
+export declare const ORIGIN_LABELS: Readonly<Record<string, string>>;
+/** 首行带前缀、续行按 `indent` 缩进的文本（用户消息、排队消息）。 */
+export declare class PrefixedText implements Component {
+    private readonly prefix;
+    private readonly body;
+    private readonly indent;
+    private cache;
+    constructor(prefix: string, body: string, indent?: number);
+    render(width: number): string[];
+    invalidate(): void;
 }
 /** 粗估 token（4 字符 ≈ 1 token），只用于思考块的流式计数。 */
 export declare function estimateTokens(text: string): number;
@@ -32,7 +56,10 @@ export declare class AssistantView extends Container {
     private readonly parts;
     private readonly status;
     private streaming;
+    private thinkingExpanded;
     constructor(options: MessageViewOptions);
+    /** Ctrl+O：展开 / 折叠本消息的思考块（`collapsed` 模式下）。 */
+    setThinkingExpanded(expanded: boolean): void;
     update(message: AssistantMessage): void;
     /** 收尾：错误 / 中断 / 长度截断提示，思考计数换成用量里的值。 */
     finish(message: AssistantMessage): void;
@@ -47,25 +74,37 @@ export declare class MessageView extends Container {
     private readonly options;
     private current;
     private readonly blocks;
+    /** 工具调用块（相邻的不空行）。 */
+    private readonly toolBlocks;
+    private readonly assistants;
+    private thinkingExpanded;
     constructor(options: MessageViewOptions);
     private get theme();
-    /** 追加一块（与上一块之间空一行）。 */
+    /** 追加一块（与上一块之间空一行；`compact` 不空行）。 */
     add(component: Component): void;
+    /** 追加工具调用块：紧跟在另一个工具调用后面时不空行。 */
+    addTool(component: Component): void;
+    private push;
     /** 去掉一块（空的助手消息等）。 */
     remove(component: Component): void;
     reset(): void;
     get blockCount(): number;
-    /** 启动画面：首行加粗，其余变暗。 */
+    /** Ctrl+O：所有助手消息的思考块一起展开 / 折叠（之后的新消息沿用）。 */
+    setThinkingExpanded(expanded: boolean): void;
+    /** 纯文本启动画面（line 模式风格）：首行加粗，其余变暗。交互模式用 StartupHeader。 */
     addHeader(lines: readonly string[]): void;
     addUser(message: Pick<UserMessage, "content" | "origin">): void;
+    private newAssistant;
     startAssistant(message: AssistantMessage): AssistantView;
     updateAssistant(message: AssistantMessage): void;
     endAssistant(message: AssistantMessage): void;
     addNotice(level: NoticeLevel, message: string): void;
     addHookBlocked(reason: string): void;
     addRetry(attempt: number, maxAttempts: number, delayMs: number, error: string): void;
+    /** 退出前追加的会话摘要（留在终端回滚里）。 */
+    addExitSummary(lines: readonly string[]): void;
     addRetryFailed(error: string | undefined): void;
-    /** 压缩 / 分支摘要卡：token 变化（有则显示）+ 摘要前 3 行。 */
+    /** 压缩 / 分支摘要卡（左竖条）：标题 + token 变化（有则显示）+ 摘要前 3 行。 */
     addSummaryCard(summary: string, options?: {
         title?: string;
         tokensBefore?: number;