@armadra/agent 0.3.0 → 0.4.0

package/dist/modes/interactive/approval-dialog.js

@@ -7,14 +7,19 @@
  * - 执行前预览（W3-B9a-2，`request.preview`）：输入摘要之后列出会碰到的路径与规模，danger 红、
  *   warn 黄、info 暗色；`other` 类预览与输入摘要重复，不显示；
  * - 原因：mode（当前权限模式需要确认）/ dangerous / hook + Hook 给的文本；
- * - 按键：`y` 允许、`n` / Esc / Ctrl+C 拒绝、`a` 本会话允许同类；
+ * - 选项（终端界面视觉设计 v1 §3.11）：编号列表 `1. 允许  y` / `2. 本会话允许同类  a` / `3. 拒绝  n Esc`，
+ *   选中行 `›` + selection 底色；缺省选中：危险命令 → 拒绝，其余 → 允许。按键 `y / a / n / Esc / Ctrl+C /
+ *   1 2 3 / ↑↓ Enter / v` 都有效；
+ * - 标题按原因：需要确认 / 危险命令 / Hook 要求确认（子 Agent 发起前缀 `[task] `）；边框颜色随预览严重度
+ *   （danger error、warn warning）；宽 < 56 时紧凑：工具名单独一行、去掉空行、按键提示缩短；
  * - 超时与中断：broker 链在超时（缺省 10 分钟）或运行被中断时 abort `signal`，对话框关闭并返回
  *   undefined（链按 deny 处理），消息区留一行说明。
  *
  * broker 链本身串行化审批，所以同一时刻最多一个对话框。
  */
+import { AUTO_LAYER_TEXT, isPermissionMode, permissionModeLabel } from "../../permissions/modes.js";
 import { previewDisplayLines } from "../../permissions/preview.js";
-import { Box, Container, Text, defaultKeybindings, matchesKey, truncateToWidth, } from "../../tui.js";
+import { Box, defaultKeybindings, matchesKey, padToWidth, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from "../../tui.js";
 import { toolSummary } from "./tool-view.js";
 const COMMAND_LINES = 8;
 const EDIT_LINES = 3;
@@ -28,7 +33,17 @@ function lines(text, max) {
 function record(input) {
     return typeof input === "object" && input !== null ? input : {};
 }
-/** 对话框正文（不含按键行）。 */
+/** 原因 → 标题文字（子 Agent 发起加 `[task] `）。 */
+export function approvalTitle(request) {
+    const task = (request.context?.depth ?? 0) > 0 ? "[task] " : "";
+    const reason = request.reason === "dangerous"
+        ? "危险命令"
+        : request.reason === "hook"
+            ? "Hook 要求确认"
+            : "需要确认";
+    return task + reason;
+}
+/** 对话框正文（不含选项与按键行）。 */
 export function describeRequest(request, theme, options = {}) {
     const out = [];
     const task = (request.context?.depth ?? 0) > 0 ? theme.fg("warning", "[task] ") : "";
@@ -37,7 +52,8 @@ export function describeRequest(request, theme, options = {}) {
         : request.reason === "hook"
             ? theme.fg("warning", "Hook 要求确认")
             : theme.fg("dim", "需要确认");
-    out.push(`${task}${theme.bold(theme.fg("tool", request.toolName))}  ${tag}`);
+    const name = theme.bold(theme.fg("tool", request.toolName));
+    out.push(options.compact === true ? `${task}${name}` : `${task}${name}  ${tag}`);
     const input = record(request.input);
     const more = (n) => theme.fg("dim", `… 另 ${n} 行（v 查看）`);
     if (options.expanded === true) {
@@ -84,42 +100,42 @@ export function describeRequest(request, theme, options = {}) {
     const severity = request.preview?.severity;
     const color = severity === "danger" ? "error" : severity === "warn" ? "warning" : "dim";
     out.push(...previewDisplayLines(request.preview).map((l) => theme.fg(color, l)));
+    const auto = request.autoDecision;
     if (request.reason === "hook") {
         out.push(theme.fg("warning", `Hook：${request.hookReason ?? "（无说明）"}`));
     }
     else if (request.reason === "dangerous") {
         out.push(theme.fg("error", "这条命令可能有破坏性，请确认"));
     }
+    else if (auto !== undefined) {
+        out.push(theme.fg("warning", `Auto ${AUTO_LAYER_TEXT[auto.layer]}：${auto.reason}`));
+    }
     else if (options.permissionMode !== undefined) {
-        out.push(theme.fg("dim", `权限模式 ${options.permissionMode} 下需要确认`));
+        const mode = options.permissionMode;
+        const label = isPermissionMode(mode) ? permissionModeLabel(mode) : mode;
+        out.push(theme.fg("dim", `权限模式 ${label} 下需要确认`));
     }
     return out;
 }
-export const APPROVAL_KEYS_HINT = "[y] 允许  [n] 拒绝  [a] 本会话允许同类  [v] 完整输入";
+export const APPROVAL_OPTIONS = [
+    { decision: "allow", label: "允许", keys: "y" },
+    { decision: "allow_session", label: "本会话允许同类", keys: "a" },
+    { decision: "deny", label: "拒绝", keys: "n Esc" },
+];
+/** 宽度低于它（Box 外宽）时用紧凑布局。 */
+const COMPACT_WIDTH = 56;
 class ApprovalDialog {
     request;
     host;
     decide;
     focused = false;
     expanded = false;
-    body = new Container();
+    selected;
     constructor(request, host, decide) {
         this.request = request;
         this.host = host;
         this.decide = decide;
-        this.rebuild();
-    }
-    rebuild() {
-        const { theme } = this.host;
-        this.body.clear();
-        const options = {
-            permissionMode: this.host.permissionMode(),
-            expanded: this.expanded,
-        };
-        if (this.host.cwd !== undefined)
-            options.cwd = this.host.cwd;
-        this.body.addChild(new Text(describeRequest(this.request, theme, options).join("\n")));
-        this.body.addChild(new Text(theme.fg("accent", APPROVAL_KEYS_HINT)));
+        this.selected = request.reason === "dangerous" ? 2 : 0;
     }
     handleInput(data) {
         const keys = this.host.keybindings ?? defaultKeybindings;
@@ -134,17 +150,74 @@ class ApprovalDialog {
             keys.matches(data, "tui.select.cancel")) {
             this.decide("deny");
         }
-        else if (key === "v") {
-            this.expanded = !this.expanded;
-            this.rebuild();
+        else if (/^[1-3]$/.test(data))
+            this.decide(APPROVAL_OPTIONS[Number(data) - 1].decision);
+        else if (keys.matches(data, "tui.select.up")) {
+            this.selected = (this.selected + APPROVAL_OPTIONS.length - 1) % APPROVAL_OPTIONS.length;
         }
+        else if (keys.matches(data, "tui.select.down")) {
+            this.selected = (this.selected + 1) % APPROVAL_OPTIONS.length;
+        }
+        else if (matchesKey(data, "enter"))
+            this.decide(APPROVAL_OPTIONS[this.selected].decision);
+        else if (key === "v")
+            this.expanded = !this.expanded;
     }
+    /** `width` 是 Box 内宽；紧凑与否按外宽（+ 4）判断。 */
     render(width) {
-        return this.body.render(width).map((l) => truncateToWidth(l, width));
+        const { theme } = this.host;
+        const compact = width + 4 < COMPACT_WIDTH;
+        const options = {
+            permissionMode: this.host.permissionMode(),
+            expanded: this.expanded,
+            compact,
+        };
+        if (this.host.cwd !== undefined)
+            options.cwd = this.host.cwd;
+        const body = describeRequest(this.request, theme, options);
+        const lines = [];
+        // 输入摘要（标题 + 命令）与预览 / 原因之间空一行
+        const head = this.inputLines(body);
+        for (const line of body.slice(0, head))
+            lines.push(...wrapTextWithAnsi(line, width));
+        if (!compact && head < body.length)
+            lines.push("");
+        for (const line of body.slice(head))
+            lines.push(...wrapTextWithAnsi(line, width));
+        if (!compact)
+            lines.push("");
+        lines.push(...this.optionLines(width, compact));
+        if (!compact)
+            lines.push("");
+        const arrows = theme.glyphs.arrowUp + theme.glyphs.arrowDown;
+        const hint = compact
+            ? `${arrows} Enter · v 完整输入`
+            : `${arrows} 选择 · Enter 确认 · v 完整输入`;
+        lines.push(theme.fg("dim", hint));
+        return lines.map((l) => truncateToWidth(l, width));
     }
-    invalidate() {
-        this.body.invalidate();
+    /** 正文里属于「输入摘要」的行数（首行 + 命令 / 路径 / 修改摘要，止于预览或原因行）。 */
+    inputLines(body) {
+        const preview = previewDisplayLines(this.request.preview).length;
+        const reasonLines = body.length > 0 ? 1 : 0;
+        return Math.max(1, body.length - preview - reasonLines);
+    }
+    optionLines(width, compact) {
+        const { theme } = this.host;
+        const g = theme.glyphs;
+        const keyWidth = compact ? 1 : Math.max(...APPROVAL_OPTIONS.map((o) => o.keys.length));
+        return APPROVAL_OPTIONS.map((option, i) => {
+            const selected = i === this.selected;
+            const keys = compact ? option.keys.slice(0, 1) : option.keys;
+            const left = `${selected ? g.prompt : " "} ${i + 1}. ${option.label}`;
+            const right = keys.padEnd(keyWidth);
+            const room = Math.max(1, width - visibleWidth(right) - 1);
+            const label = selected ? theme.fg("accent", theme.bold(left)) : left;
+            const line = padToWidth(truncateToWidth(label, room), room) + " " + theme.fg("dim", right);
+            return selected ? theme.bg("selection", line) : line;
+        });
     }
+    invalidate() { }
 }
 /** UI broker：每个请求开一个底部覆盖层，等用户按键或 signal abort。 */
 export class ApprovalDialogBroker {
@@ -177,9 +250,15 @@ export class ApprovalDialogBroker {
             const dialog = new ApprovalDialog(request, this.host, settle);
             this.open++;
             this.host.onOpen?.();
+            const severity = request.preview?.severity;
             handle = this.host.showOverlay(new Box(dialog, {
-                title: (request.context?.depth ?? 0) > 0 ? "子任务审批" : "审批",
+                title: approvalTitle(request),
                 theme: this.host.theme,
+                ...(severity === "danger"
+                    ? { borderColor: "error" }
+                    : severity === "warn"
+                        ? { borderColor: "warning" }
+                        : {}),
             }));
             signal.addEventListener("abort", onAbort, { once: true });
         });

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

@@ -2,16 +2,17 @@
  * 交互模式的斜杠命令：把 commands-core 的 `CommandResult` 变成界面动作。[B7]
  *
  * - `handled` → 消息区显示文本；`prompt` → 发提示；`exit` → 退出；
- * - `pick` → 打开对应选择器：模型（setModel）、会话（resume）、树（/fork 无参数：从选中的用户消息
+ * - `pick` → 打开对应选择器：模型（setModel；不列测试供应商 fake，`AMA_SHOW_FAKE=1` 或 `AMA_FAKE_SCRIPT` 时照列）、会话（resume）、树（/fork 无参数：从选中的用户消息
  *   之前分叉，消息文本回填编辑器）、权限模式、思考级别；
  * - 交互模式自有命令：`/tree`（同一文件内换叶子到选中消息之前，文本回填编辑器，可改后重发形成新分支）、
  *   `/permissions`（当前模式、判定顺序与已加载规则）；`/help` 追加这两条与按键说明。
+ * - `/session`、`/cache`（无参数）与 `/permissions` 在消息区画左竖条面板（panels.ts），不再拍成文本。
  * - 不是命令（含模板与 `/skill:`）返回 false，调用方把整行当提示发出。
  */
 import type { AgentSession } from "../../agent/types.js";
 import type { SwitchRequest } from "../../cli/compose-session.js";
 import type { Runtime } from "../../cli/runtime.js";
-import type { SelectItem } from "../../tui.js";
+import type { Component, SelectItem, Theme } from "../../tui.js";
 import { type CommandInfo } from "../commands-core.js";
 import { type NoticeLevel } from "./message-view.js";
 import { type PickerSpec } from "./pickers.js";
@@ -26,6 +27,8 @@ export interface CommandUi {
     switchSession(request: SwitchRequest): Promise<AgentSession>;
     pick(spec: PickerSpec): Promise<SelectItem | undefined>;
     notice(level: NoticeLevel, text: string): void;
+    /** 消息区面板（/session、/cache、/permissions）；缺省回落为文本通知。 */
+    panel?(component: Component): void;
     setEditorText(text: string): void;
     /** 发一条提示（不等运行结束）。 */
     prompt(text: string): void;
@@ -33,6 +36,12 @@ export interface CommandUi {
     reload(): void;
     exit(code: number): void;
     now(): number;
+    /** 面板用的主题（与 panel 一起提供）。 */
+    theme?(): Theme;
+    /** 家目录（面板里路径缩写为 ~）。 */
+    home?: string;
+    /** 进程环境：给出时 /model 选择器按 fake-visibility 规则藏起测试供应商 fake。 */
+    env?: Readonly<Record<string, string | undefined>>;
 }
 /** 当前分支上的条目 id（树选择器标 ●）。 */
 export declare function activeBranchIds(session: AgentSession): Set<string>;

package/dist/modes/interactive/commands.js

@@ -2,18 +2,22 @@
  * 交互模式的斜杠命令：把 commands-core 的 `CommandResult` 变成界面动作。[B7]
  *
  * - `handled` → 消息区显示文本；`prompt` → 发提示；`exit` → 退出；
- * - `pick` → 打开对应选择器：模型（setModel）、会话（resume）、树（/fork 无参数：从选中的用户消息
+ * - `pick` → 打开对应选择器：模型（setModel；不列测试供应商 fake，`AMA_SHOW_FAKE=1` 或 `AMA_FAKE_SCRIPT` 时照列）、会话（resume）、树（/fork 无参数：从选中的用户消息
  *   之前分叉，消息文本回填编辑器）、权限模式、思考级别；
  * - 交互模式自有命令：`/tree`（同一文件内换叶子到选中消息之前，文本回填编辑器，可改后重发形成新分支）、
  *   `/permissions`（当前模式、判定顺序与已加载规则）；`/help` 追加这两条与按键说明。
+ * - `/session`、`/cache`（无参数）与 `/permissions` 在消息区画左竖条面板（panels.ts），不再拍成文本。
  * - 不是命令（含模板与 `/skill:`）返回 false，调用方把整行当提示发出。
  */
 import { formatModelRef } from "../../ai/providers/channels.js";
 import { AgentSessionImpl } from "../../agent/session.js";
 import { listSessions } from "../../cli/compose-store.js";
+import { hideFakeProvider } from "../../cli/fake-visibility.js";
+import { AUTO_LAYER_TEXT, permissionModeLabel } from "../../permissions/modes.js";
 import { BUILTIN_COMMANDS, parseSlash, runSlashCommand, } from "../commands-core.js";
 import { contentText } from "./message-view.js";
-import { modelItems, permissionItems, sessionItems, thinkingItems, treeItems, } from "./pickers.js";
+import { cachePanel, permissionsPanel, sessionPanel } from "./panels.js";
+import { modelItems, permissionPickerSpec, sessionItems, thinkingItems, treeItems, } from "./pickers.js";
 export const INTERACTIVE_COMMANDS = [
     { name: "tree", description: "浏览会话树，回到某条消息之前重写" },
     { name: "permissions", description: "权限模式、判定顺序与规则" },
@@ -21,11 +25,15 @@ export const INTERACTIVE_COMMANDS = [
 /** 补全与 /help 用的完整命令表。 */
 export const ALL_COMMANDS = [...BUILTIN_COMMANDS, ...INTERACTIVE_COMMANDS];
 export const KEY_HINTS = [
-    "Enter 发送（运行中 = steer）  Alt+Enter 排到本轮之后  Shift+Enter / Ctrl+J 换行",
+    "Enter 发送（运行中 = 插话）  Alt+Enter 排到本轮之后  Shift+Enter / Ctrl+J 换行",
     "Esc 中断（排队消息回填编辑器）  Alt+↑ 取回最后一条排队消息",
-    "Shift+Tab 切换权限模式  Ctrl+L 模型  Ctrl+T 思考级别  Ctrl+O 展开工具输出",
+    "Shift+Tab 切换权限模式  Ctrl+L 模型  Ctrl+T 思考级别  Ctrl+O 展开工具输出与思考",
+    "审批：1–3 或 ↑↓ Enter 选择，y 允许  a 本会话允许同类  n / Esc 拒绝  v 完整输入",
     "Ctrl+C 清空输入（再按退出）  Ctrl+D 空输入时退出  Tab 补全  @ 引用文件",
 ].join("\n");
+function homeOf(ui) {
+    return ui.home !== undefined ? { home: ui.home } : {};
+}
 function userEntryText(entry) {
     if (entry?.type !== "message" || entry.message.role !== "user")
         return undefined;
@@ -39,12 +47,26 @@ export function activeBranchIds(session) {
 }
 export function permissionsText(runtime, session) {
     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 lines = [
-        `权限模式：${session.state.permissionMode}`,
-        "判定顺序：deny 规则 → Hook deny → 危险命令确认 → 权限模式 → allow 规则 / Hook allow / 本会话记忆 → 询问",
+        `权限模式：${permissionModeLabel(mode)}（${mode}）`,
+        `判定顺序：${order}`,
         rules.length === 0 ? "规则：（无）" : `规则（${rules.length}）：`,
         ...rules.map((r) => `  ${r.effect === "deny" ? "deny " : "allow"}  ${r.raw}  [${r.source}]`),
     ];
+    const recent = runtime.permission.autoDecisions?.() ?? [];
+    if (recent.length > 0) {
+        lines.push(`最近的 auto 判定（${recent.length}）：`);
+        for (const d of recent) {
+            const cached = d.cached === true ? "（缓存）" : "";
+            lines.push(`  ${AUTO_LAYER_TEXT[d.layer]}  ${d.decision}  ${d.toolName} ${d.summary} — ${d.reason}${cached}`);
+        }
+    }
     return lines.join("\n");
 }
 async function pickTree(ui, title) {
@@ -86,11 +108,15 @@ async function handlePick(what, ui) {
     switch (what) {
         case "model": {
             const current = session.state.model;
+            const ref = current === undefined ? undefined : `${current.provider}/${current.id}`;
             const picked = await ui.pick({
                 title: "选择模型",
-                items: await modelItems(ui.runtime.providers),
+                items: await modelItems(ui.env === undefined
+                    ? ui.runtime.providers
+                    : hideFakeProvider(ui.runtime.providers, ui.env)),
                 filterable: true,
-                ...(current !== undefined ? { selected: `${current.provider}/${current.id}` } : {}),
+                showCount: true,
+                ...(ref !== undefined ? { selected: ref, currentValue: ref } : {}),
             });
             if (picked === undefined)
                 return;
@@ -129,13 +155,12 @@ async function handlePick(what, ui) {
             return;
         }
         case "permission": {
-            const picked = await ui.pick({
-                title: "权限模式",
-                items: permissionItems(),
-                selected: session.state.permissionMode,
-            });
-            if (picked !== undefined)
-                session.setPermissionMode(picked.value);
+            const picked = await ui.pick(permissionPickerSpec(session.state.permissionMode, ui.runtime.config.permission?.mode ?? "default"));
+            if (picked === undefined)
+                return;
+            const mode = picked.value;
+            session.setPermissionMode(mode);
+            ui.notice("info", `权限模式：${permissionModeLabel(mode)}`);
             return;
         }
         case "thinking": {
@@ -163,8 +188,23 @@ export async function runInteractiveCommand(line, ui) {
             await treeCommand(ui);
             return true;
         }
+        const theme = ui.theme?.();
         if (parsed.name === "permissions") {
-            ui.notice("info", permissionsText(ui.runtime, ui.session()));
+            if (ui.panel !== undefined && theme !== undefined) {
+                ui.panel(permissionsPanel(ui.runtime, ui.session(), theme));
+            }
+            else
+                ui.notice("info", permissionsText(ui.runtime, ui.session()));
+            return true;
+        }
+        if ((parsed.name === "session" || parsed.name === "cache") &&
+            parsed.args.trim() === "" &&
+            ui.panel !== undefined &&
+            theme !== undefined) {
+            const session = ui.session();
+            ui.panel(parsed.name === "session"
+                ? sessionPanel(session, theme, { now: ui.now(), ...homeOf(ui) })
+                : cachePanel(session, theme, ui.now()));
             return true;
         }
         const result = await runSlashCommand(line, {

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

@@ -11,7 +11,8 @@
  * - 晚绑定：`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 type { AgentSession } from "../../agent/types.js";
 import type { ModeContext } from "../../cli/deps.js";