@armadra/agent 0.4.0 → 0.5.1

package/dist/modes/interactive/status-bar.js

@@ -1,20 +1,30 @@
 /**
- * 状态栏（设计 §12.6；终端界面视觉设计 v1 §3.10）：编辑器下方一行，永远是最后一行。[B7]
+ * 状态栏（设计 §12.6；终端界面视觉设计 v1 §3.10；第五波 §1）：编辑器下方，永远是最后一行。[B7][W5-A]
  *
- * 两区：左区「权限模式 · shift+tab 切换」，右区用量，中间用空格撑开；空隙不足 4 列时退回单区（` · ` 连接）。
- * `Accept edits · shift+tab 切换        sonnet-4-5 · medium · ↑12.3k ↓1.2k · cache 80% ♨ · $0.12 · ctx 34%`
+ * 两区：左区「权限模式 + shift+tab 切换」，右区信息，中间用空格撑开；空隙不足 4 列时退回单区。模式永远在最左；
+ * 同组项（模型与思考级别、目录与 git）以空格相连。compact 分隔符固定为 ` · `（tmux 宿主按此解析），full 按用户
+ * 样例用 ` | `。
  *
- * - 右区顺序固定：模型 · 思考级别（只显示值，off 不显示）· `↑` 输入（含缓存读写）`↓` 输出 · cache · 费用 ·
- *   rebill · ctx · queue · codemode · 预设（非 default 才显示）· [宿主状态]；分隔符固定为 ` · `，
- *   模式永远在最左（tmux 宿主可按此解析）。
- * - 用量来自 `session.getStats()`，只在 `refresh()` 时读取（事件驱动），渲染只拼字符串；
+ * 两种布局（`ui.statusLine`，§1.1）：
+ * - `compact`（嵌入宿主缺省，即原单行状态栏）：
+ *   `Manual · shift+tab 切换    sonnet-4-5 · medium · ↑12.3k ↓1.2k · cache 80% ♨ · $0.12 · ctx 34% · proj ⎇ main 5ae9e54 +12 −3 · 2h24m`
+ *   右区顺序：模型 · 思考 · `↑ ↓` · cache · 费用 · rebill · ctx · git · 时长 · queue · codemode · 预设 · [宿主]。
+ * - `full`（独立终端缺省，用户样例）：用量类项移到上方速率行（status-line.ts），本行为
+ *   `Manual | 模型 思考 | Ctx 3.0% | 目录 ⎇ 分支 短提交 (+a,-d) | $费用 | 会话时长`；Ctx 一位小数、不换余量表。
+ *
+ * - 用量来自 `session.getStats()`，只在 `refresh()` 时读取（事件驱动），渲染只拼字符串；时长按渲染时刻算。
  * - [W3-C2] `cache` 是**最近一次**请求的命中率；端点三态 `cache —` / `cache 未报告`；保温中追加 `♨`；
- *   重计费 `rebill $x`（无价模型显示 token）；codemode 生效时 `codemode on|only`，网络未隔离追加 `net!`；
+ *   重计费 `rebill $x`（无价模型显示 token）；codemode 生效时 `codemode on|only`，网络未隔离追加 `net!`
+ *   （S2：Node 权限模型与 OS 沙箱都不隔离网络时）。
+ * - 费用 = `stats.cost` + 外部 Agent 以美元计的用量（`stats.external`，W5-E；其它单位只在 /session 显示）。
  * - 着色：整行 dim；模式名正文色（Bypass permissions warning、Plan accent）；模型 accent；ctx 按阈值
  *   success / warning / error；rebill、queue warning；`net!` error。宽 ≥ 110 时 ctx 用余量表。
+ * - [W5-U] bash 在操作系统沙箱里跑时（S2）用量类项多一个 `沙箱`（与 codemode 同一丢弃优先级）。
+ * - [W5-U] 模型回退中（`model_fallback`）模型项显示 `主模型 → 回退模型`，切回主模型后恢复。
  * - 模型名缩写：宽 < 100 去掉供应商前缀，< 60 再去掉 `@渠道`，< 48 去掉版本后缀（第一个 `-数字` 起）。
- * - 宽度不够时按优先级丢弃（数字大的先丢）：切换提示 12 → 宿主 11 → 预设 10 → rebill 9 → 费用 8 →
- *   cache 7 → token 6 → 思考 5 → 队列 4 → codemode 3 → ctx 1 → 模型 0；模式永不丢。
+ * - ASCII：`⎇` → `git`（字形表 `branch`）、`−` → `-`、`♨` → `~`。
+ * - 宽度不够时按优先级丢弃（数字大的先丢，表见 §1.2）；会变的数字按最宽形状占位（`reserve`），
+ *   数字变化不会让某项时有时无（40 列不抖动）。
  */
 import { permissionModeLabel } from "../../permissions/modes.js";
 import { formatModelRef } from "../../ai/providers/channels.js";
@@ -33,6 +43,16 @@ export function formatCost(cost) {
         return `$${cost.toFixed(2)}`;
     return `$${cost.toFixed(3)}`;
 }
+/** 会话时长：`Ns` / `Nm` / `NhMm`。 */
+export function formatDuration(ms) {
+    const seconds = Math.max(0, Math.floor(ms / 1000));
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60)
+        return `${minutes}m`;
+    return `${Math.floor(minutes / 60)}h${minutes % 60}m`;
+}
 /** `cache 83%` / `cache —` / `cache 未报告`，保温计时中追加 ` ♨`。 */
 export function cacheText(cache, warm = "♨") {
     const rate = cache.lastHitRate ?? cache.hitRate;
@@ -43,10 +63,74 @@ export function cacheText(cache, warm = "♨") {
             : "—";
     return `cache ${value}${cache.warming.state === "scheduled" ? ` ${warm}` : ""}`;
 }
+/** 状态费用：会话费用 + 外部 Agent 以美元计的用量；会话费用未知为 undefined。 */
+export function statusCost(stats) {
+    if (stats.cost === undefined)
+        return undefined;
+    let external = 0;
+    for (const usage of Object.values(stats.external?.byAgent ?? {})) {
+        if (usage.unit === "usd")
+            external += usage.amount;
+    }
+    return stats.cost + external;
+}
 /** 两区之间至少留的空格；不足时退回单区。 */
 const MIN_GAP = 4;
 /** ctx 改用余量表的最小宽度。 */
 const METER_WIDTH = 110;
+/** 按优先级丢弃后排成一行（两区 / 单区）；连接符都是 dim。 */
+export function layoutRow(parts, width, theme, style = {}) {
+    const sep = style.sep ?? " · ";
+    const dim = (text) => (text === "" ? "" : theme.fg("dim", text));
+    /** 返回 [文本, 占位宽度]。 */
+    const join = (list) => {
+        let out = "";
+        let size = 0;
+        const add = (text, measured = visibleWidth(text)) => {
+            out += text;
+            size += measured;
+        };
+        list.forEach((p, i) => {
+            const prev = i === 0 ? undefined : list[i - 1];
+            const group = p.group === undefined ? undefined : style.groups?.[p.group];
+            const continues = prev !== undefined && p.group !== undefined && p.group === prev.group;
+            if (continues)
+                add(dim(group?.glue ?? " "));
+            else {
+                if (prev !== undefined) {
+                    const prevGroup = prev.group === undefined ? undefined : style.groups?.[prev.group];
+                    add(dim(prevGroup?.close ?? ""));
+                    add(dim(p.lead ?? sep));
+                }
+                add(dim(group?.open ?? ""));
+            }
+            add(p.text, Math.max(visibleWidth(p.text), p.reserve ?? 0));
+        });
+        const last = list[list.length - 1];
+        if (last?.group !== undefined)
+            add(dim(style.groups?.[last.group]?.close ?? ""));
+        return [out, size];
+    };
+    let kept = [...parts];
+    const zone = (z) => kept.filter((p) => p.zone === z);
+    const fits = () => {
+        const l = join(zone("left"))[1];
+        const right = zone("right");
+        return l + (right.length === 0 ? 0 : sep.length + join(right)[1]) <= width;
+    };
+    while (!fits()) {
+        const droppable = kept.filter((p) => p.priority !== undefined);
+        if (droppable.length === 0)
+            break;
+        const drop = droppable.reduce((worst, p) => (p.priority > worst.priority ? p : worst));
+        kept = kept.filter((p) => p !== drop);
+    }
+    const l = join(zone("left"))[0];
+    const r = join(zone("right"))[0];
+    const gap = width - visibleWidth(l) - visibleWidth(r);
+    const line = r === "" ? l : gap >= MIN_GAP ? l + " ".repeat(gap) + r : l + dim(sep) + r;
+    return truncateToWidth(line, width);
+}
 /** 按终端宽度缩写模型名（§3.10）。 */
 export function abbreviateModel(ref, width) {
     let out = ref;
@@ -58,6 +142,78 @@ export function abbreviateModel(ref, width) {
         out = out.replace(/-\d.*$/, "");
     return out;
 }
+/** 用量类项的文本（已着色；普通项 dim）。 */
+export function usageItems(stats, queue, source, theme) {
+    const g = theme.glyphs;
+    const dim = (text) => theme.fg("dim", text);
+    const out = {};
+    const t = stats.tokens;
+    const prompt = t.input + t.cacheRead + t.cacheWrite;
+    const cache = stats.cache;
+    if (prompt + t.output > 0) {
+        out.tokens = dim(`${g.arrowUp}${formatTokens(prompt)} ${g.arrowDown}${formatTokens(t.output)}`);
+        if (cache !== undefined)
+            out.cache = dim(cacheText(cache, g.warm));
+        else if (stats.cacheHitRate !== undefined) {
+            out.cache = dim(`cache ${Math.round(stats.cacheHitRate * 100)}%`);
+        }
+        const cost = statusCost(stats);
+        if (cost === undefined)
+            out.cost = dim("$?");
+        else if (cost > 0)
+            out.cost = dim(formatCost(cost));
+        if (cache !== undefined && cache.reBilledTokens > 0) {
+            const amount = cache.reBilledUsd === undefined
+                ? `${formatTokens(cache.reBilledTokens)} tok`
+                : formatCost(cache.reBilledUsd);
+            out.rebill = theme.fg("warning", `rebill ${amount}`);
+        }
+    }
+    if (queue > 0)
+        out.queue = theme.fg("warning", `queue ${queue}`);
+    const codemode = source.codemode?.();
+    if (codemode !== undefined) {
+        const strict = source.sandboxStrict?.() ?? true;
+        const label = dim(`codemode ${codemode}`);
+        out.codemode = strict ? label : `${label} ${theme.fg("error", "net!")}`;
+    }
+    if (source.bashSandbox?.() === true)
+        out.sandbox = dim("沙箱");
+    const preset = source.preset();
+    if (preset !== "default")
+        out.preset = dim(`preset ${preset}`);
+    const host = source.hostStatus?.();
+    if (host !== undefined && host.size > 0) {
+        const values = [...host.values()].filter((v) => v.trim() !== "");
+        if (values.length > 0)
+            out.host = dim(`[${values.join(" · ")}]`);
+    }
+    return out;
+}
+/** compact 布局的优先级（§1.2：现状顺序，git 三项与时长插在 ctx 之后）。 */
+const COMPACT = {
+    model: 0,
+    ctx: 1,
+    duration: 3,
+    branch: 4,
+    dir: 5,
+    diff: 6,
+    codemode: 7,
+    queue: 8,
+    thinking: 9,
+    tokens: 10,
+    cache: 11,
+    cost: 12,
+    rebill: 13,
+    preset: 14,
+    host: 15,
+    hint: 16,
+};
+/** full 布局本行的优先级（§1.2 下行表）。 */
+const FULL = { model: 0, ctx: 1, cost: 2, duration: 3, branch: 4, dir: 5, diff: 6, thinking: 7 };
+const FULL_HINT = 12;
+/** full 状态栏（用户样例）：段间 ` | `。 */
+const FULL_STYLE = { sep: " | " };
 export class StatusBar {
     source;
     theme;
@@ -74,106 +230,133 @@ export class StatusBar {
     setQueue(steering, followUp) {
         this.queue = steering + followUp;
     }
+    /** 当前统计（速率行共用，避免重复 getStats）。 */
+    current() {
+        this.stats ??= this.source.session().getStats();
+        return this.stats;
+    }
+    queued() {
+        return this.queue;
+    }
+    layout() {
+        return this.source.layout?.() ?? "compact";
+    }
     parts(width) {
         const theme = this.theme;
         const g = theme.glyphs;
-        const session = this.source.session();
-        const state = session.state;
-        const stats = this.stats ?? session.getStats();
-        this.stats = stats;
+        const state = this.source.session().state;
+        const stats = this.current();
+        const full = this.layout() === "full";
         const parts = [];
-        /** 普通项整项 dim；`colored` 的项已自带颜色。 */
-        const tone = (text, colored) => colored ? text : theme.fg("dim", text);
-        const left = (text, priority, colored = false) => void parts.push({ text: tone(text, colored), priority, zone: "left" });
-        const right = (text, priority, colored = false) => void parts.push({ text: tone(text, colored), priority, zone: "right" });
+        const dim = (text) => theme.fg("dim", text);
+        const right = (text, priority, extra = {}) => void parts.push({ text, priority, zone: "right", ...extra });
         const mode = permissionModeLabel(state.permissionMode);
-        left(state.permissionMode === "full-auto"
-            ? theme.fg("warning", mode)
-            : state.permissionMode === "plan"
-                ? theme.fg("accent", mode)
-                : theme.fg("text", mode), undefined, true);
-        if (width >= 40)
-            left("shift+tab 切换", 12);
+        parts.push({
+            text: state.permissionMode === "full-auto"
+                ? theme.fg("warning", mode)
+                : state.permissionMode === "plan"
+                    ? theme.fg("accent", mode)
+                    : theme.fg("text", mode),
+            priority: undefined,
+            zone: "left",
+        });
+        if (width >= 40) {
+            parts.push({
+                text: dim("shift+tab 切换"),
+                priority: full ? FULL_HINT : COMPACT.hint,
+                zone: "left",
+            });
+        }
         const model = state.model === undefined ? "?" : abbreviateModel(formatModelRef(state.model), width);
-        right(theme.fg("accent", model), 0, true);
-        if (state.thinkingLevel !== "off")
-            right(state.thinkingLevel, 5);
-        const t = stats.tokens;
-        const prompt = t.input + t.cacheRead + t.cacheWrite;
-        const cache = stats.cache;
-        if (prompt + t.output > 0) {
-            right(`${g.arrowUp}${formatTokens(prompt)} ${g.arrowDown}${formatTokens(t.output)}`, 6);
-            if (cache !== undefined)
-                right(cacheText(cache, g.warm), 7);
-            else if (stats.cacheHitRate !== undefined) {
-                right(`cache ${Math.round(stats.cacheHitRate * 100)}%`, 7);
-            }
-            if (stats.cost === undefined)
-                right("$?", 8);
-            else if (stats.cost > 0)
-                right(formatCost(stats.cost), 8);
-            if (cache !== undefined && cache.reBilledTokens > 0) {
-                const amount = cache.reBilledUsd === undefined
-                    ? `${formatTokens(cache.reBilledTokens)} tok`
-                    : formatCost(cache.reBilledUsd);
-                right(theme.fg("warning", `rebill ${amount}`), 9, true);
-            }
+        const p = full ? FULL : COMPACT;
+        const fallback = this.source.fallback?.();
+        // 回退中：`主模型 → 回退模型`（回退模型 warning），切回主模型后恢复原样
+        const modelText = fallback === undefined
+            ? theme.fg("accent", model)
+            : theme.fg("accent", abbreviateModel(fallback.from, width)) +
+                dim(g.ascii ? " -> " : " → ") +
+                theme.fg("warning", abbreviateModel(fallback.to, width));
+        right(modelText, p.model, full ? { group: "model" } : {});
+        if (state.thinkingLevel !== "off") {
+            right(dim(state.thinkingLevel), p.thinking, full ? { group: "model" } : {});
         }
-        right(this.ctxText(stats.contextPercent, width), 1, true);
-        if (this.queue > 0)
-            right(theme.fg("warning", `queue ${this.queue}`), 4, true);
-        const codemode = this.source.codemode?.();
-        if (codemode !== undefined) {
-            const strict = this.source.sandboxStrict?.() ?? true;
-            const label = theme.fg("dim", `codemode ${codemode}`);
-            right(strict ? label : `${label} ${theme.fg("error", "net!")}`, 3, true);
+        const usage = full ? {} : usageItems(stats, this.queue, this.source, theme);
+        if (usage.tokens !== undefined)
+            right(usage.tokens, COMPACT.tokens);
+        if (usage.cache !== undefined)
+            right(usage.cache, COMPACT.cache);
+        if (usage.cost !== undefined)
+            right(usage.cost, COMPACT.cost);
+        if (usage.rebill !== undefined)
+            right(usage.rebill, COMPACT.rebill);
+        right(this.ctxText(stats.contextPercent, width, full), p.ctx, full ? { reserve: 10 } : {});
+        this.gitParts(p, full).forEach((part) => parts.push(part));
+        if (full) {
+            const cost = statusCost(stats);
+            const used = stats.tokens.input + stats.tokens.output + stats.tokens.cacheRead > 0;
+            if (cost === undefined && used)
+                right(dim("$?"), FULL.cost);
+            else if (cost !== undefined && cost > 0)
+                right(dim(formatCost(cost)), FULL.cost);
         }
-        const preset = this.source.preset();
-        if (preset !== "default")
-            right(`preset ${preset}`, 10);
-        const host = this.source.hostStatus?.();
-        if (host !== undefined && host.size > 0) {
-            const values = [...host.values()].filter((v) => v.trim() !== "");
-            if (values.length > 0)
-                right(`[${values.join(" · ")}]`, 11);
+        const started = this.source.sessionStartedAt?.() ?? stats.telemetry?.sessionStartedAt;
+        if (started !== undefined) {
+            const now = this.source.now?.() ?? Date.now();
+            right(dim(formatDuration(now - started)), p.duration, { reserve: 6 });
         }
+        if (usage.queue !== undefined)
+            right(usage.queue, COMPACT.queue);
+        if (usage.codemode !== undefined)
+            right(usage.codemode, COMPACT.codemode);
+        if (usage.sandbox !== undefined)
+            right(usage.sandbox, COMPACT.codemode);
+        if (usage.preset !== undefined)
+            right(usage.preset, COMPACT.preset);
+        if (usage.host !== undefined)
+            right(usage.host, COMPACT.host);
         return parts;
     }
-    ctxText(percent, width) {
+    /** `目录 ⎇ 分支 短提交 +a −b`：三项同组、各自按优先级丢弃。 */
+    gitParts(p, full) {
+        const git = this.source.git?.();
+        if (git === undefined)
+            return [];
+        const theme = this.theme;
+        const g = theme.glyphs;
+        const dim = (text) => theme.fg("dim", text);
+        const out = [];
+        const add = (text, priority) => void out.push({ text: dim(text), priority, zone: "right", group: "git" });
+        if (git.dir !== "")
+            add(git.dir, p.dir);
+        const info = git.info;
+        if (info === undefined)
+            return out;
+        const head = [info.branch, info.shortHead].filter((s) => s !== undefined).join(" ");
+        if (head !== "")
+            add(`${g.branch} ${head}`, p.branch);
+        if (info.insertions !== undefined && info.deletions !== undefined) {
+            const { insertions: a, deletions: d } = info;
+            add(full ? `(+${a},-${d})` : `+${a} ${g.ascii ? "-" : "−"}${d}`, p.diff);
+        }
+        return out;
+    }
+    ctxText(percent, width, decimal) {
         const theme = this.theme;
         if (percent === undefined)
-            return theme.fg("dim", "ctx ?");
+            return theme.fg("dim", decimal ? "Ctx ?" : "ctx ?");
         const color = levelColor(percent / 100);
-        if (width >= METER_WIDTH) {
+        // full 按用户样例总是 `Ctx 3.0%`；compact 宽屏换余量表（现状）
+        if (!decimal && width >= METER_WIDTH) {
             const meter = new Meter(percent / 100, { label: theme.fg("dim", "ctx"), theme });
             return meter.render(80)[0] ?? "";
         }
+        if (decimal)
+            return theme.fg("dim", "Ctx ") + theme.fg(color, `${percent.toFixed(1)}%`);
         return theme.fg("dim", "ctx ") + theme.fg(color, `${Math.round(percent)}%`);
     }
     render(width) {
-        const theme = this.theme;
-        const sep = theme.fg("dim", " · ");
-        const join = (list) => list.map((p) => p.text).join(sep);
-        let kept = this.parts(width);
-        const zones = () => [
-            join(kept.filter((p) => p.zone === "left")),
-            join(kept.filter((p) => p.zone === "right")),
-        ];
-        const fits = () => {
-            const [l, r] = zones();
-            return visibleWidth(l) + (r === "" ? 0 : 3 + visibleWidth(r)) <= width;
-        };
-        while (!fits()) {
-            const droppable = kept.filter((p) => p.priority !== undefined);
-            if (droppable.length === 0)
-                break;
-            const drop = droppable.reduce((worst, p) => (p.priority > worst.priority ? p : worst));
-            kept = kept.filter((p) => p !== drop);
-        }
-        const [l, r] = zones();
-        const gap = width - visibleWidth(l) - visibleWidth(r);
-        const line = r === "" ? l : gap >= MIN_GAP ? l + " ".repeat(gap) + r : l + sep + r;
-        return [truncateToWidth(line, width)];
+        const style = this.layout() === "full" ? FULL_STYLE : {};
+        return [layoutRow(this.parts(width), width, this.theme, style)];
     }
     invalidate() {
         this.stats = undefined;

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

@@ -0,0 +1,33 @@
+/**
+ * 速率行（第五波 §1.1，D1、D2）：`ui.statusLine: "full"` 时在状态栏上方多一行。[W5-A]
+ *
+ * ```text
+ * tps: 100 tok/s • 546 tok / 5.5s (avg 100 · ttft 1.4s)                ↑12.3k ↓1.2k · cache 83% ♨ · [-]
+ * ```
+ *
+ * - 左区（用户样例）：`tps: <速率>`（流式中是最近 2 s 窗口的瞬时值、前缀 accent；结束后是该请求的平均值；
+ *   还没有请求时 `tps: —`）• `<输出 token> tok / <耗时>`（首 token 起算）`(avg <会话均速> · ttft <首 token 延迟>)`；
+ *   `•` 走字形表（ASCII `*`）；
+ * - 右区：从状态栏迁来的用量类项 `↑ ↓` · cache · rebill · queue · codemode · 预设 · [宿主]，行尾 `[-]`
+ *   （折叠提示：Ctrl+G 或 `/statusline compact`）；
+ * - 数据：`StatusBar.current()` 的 `telemetry` 与用量（同一次 getStats）；流式中 `telemetry_tick` 时刷新；
+ * - 丢弃顺序（§1.2，数字大先丢；`tps` 与 `[-]` 永不丢）：tok/耗时 10 → codemode 9 → queue 8 → token 7 →
+ *   cache 6 → rebill 5 → 预设 4 → 宿主 3 → avg 2 → ttft 1；数字按最宽形状占位，不随数值抖动；
+ * - `compact` 时不占行（render 返回空）。
+ */
+import { type Component, type Theme } from "../../tui.js";
+import { type StatusBar, type StatusBarSource } from "./status-bar.js";
+/** 速率：< 10 保留一位小数，其余取整。 */
+export declare function formatRate(tps: number): string;
+/** 耗时：< 60 s 一位小数（`5.5s`），其余 `1m05s`。 */
+export declare function formatSeconds(ms: number): string;
+export declare const COLLAPSE_HINT = "[-]";
+export declare class StatusLine implements Component {
+    private readonly bar;
+    private readonly source;
+    private readonly theme;
+    constructor(bar: StatusBar, source: StatusBarSource, theme: Theme);
+    private parts;
+    render(width: number): string[];
+    invalidate(): void;
+}

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

@@ -0,0 +1,113 @@
+/**
+ * 速率行（第五波 §1.1，D1、D2）：`ui.statusLine: "full"` 时在状态栏上方多一行。[W5-A]
+ *
+ * ```text
+ * tps: 100 tok/s • 546 tok / 5.5s (avg 100 · ttft 1.4s)                ↑12.3k ↓1.2k · cache 83% ♨ · [-]
+ * ```
+ *
+ * - 左区（用户样例）：`tps: <速率>`（流式中是最近 2 s 窗口的瞬时值、前缀 accent；结束后是该请求的平均值；
+ *   还没有请求时 `tps: —`）• `<输出 token> tok / <耗时>`（首 token 起算）`(avg <会话均速> · ttft <首 token 延迟>)`；
+ *   `•` 走字形表（ASCII `*`）；
+ * - 右区：从状态栏迁来的用量类项 `↑ ↓` · cache · rebill · queue · codemode · 预设 · [宿主]，行尾 `[-]`
+ *   （折叠提示：Ctrl+G 或 `/statusline compact`）；
+ * - 数据：`StatusBar.current()` 的 `telemetry` 与用量（同一次 getStats）；流式中 `telemetry_tick` 时刷新；
+ * - 丢弃顺序（§1.2，数字大先丢；`tps` 与 `[-]` 永不丢）：tok/耗时 10 → codemode 9 → queue 8 → token 7 →
+ *   cache 6 → rebill 5 → 预设 4 → 宿主 3 → avg 2 → ttft 1；数字按最宽形状占位，不随数值抖动；
+ * - `compact` 时不占行（render 返回空）。
+ */
+import { truncateToWidth } from "../../tui.js";
+import { formatTokens, layoutRow, usageItems, } from "./status-bar.js";
+/** 速率：< 10 保留一位小数，其余取整。 */
+export function formatRate(tps) {
+    return tps < 10 ? tps.toFixed(1) : String(Math.round(tps));
+}
+/** 耗时：< 60 s 一位小数（`5.5s`），其余 `1m05s`。 */
+export function formatSeconds(ms) {
+    const seconds = Math.max(0, ms) / 1000;
+    if (seconds < 60)
+        return `${seconds.toFixed(1)}s`;
+    const whole = Math.floor(seconds);
+    return `${Math.floor(whole / 60)}m${String(whole % 60).padStart(2, "0")}s`;
+}
+/** 占位宽度（常见的最宽形状）：`tps: 999 tok/s`、`1.2k tok / 59.9s`、`avg 999`、`ttft 9.9s`。 */
+const RESERVE = { tps: 14, amount: 16, avg: 7, ttft: 9 };
+const PRIORITY = {
+    ttft: 1,
+    avg: 2,
+    host: 3,
+    preset: 4,
+    rebill: 5,
+    cache: 6,
+    tokens: 7,
+    queue: 8,
+    codemode: 9,
+    amount: 10,
+};
+export const COLLAPSE_HINT = "[-]";
+/** 用户样例：`tps: 100 tok/s • 546 tok / 5.5s (avg 100 · ttft 1.4s)`；右区用量项仍以 ` · ` 分隔。 */
+const RATE_STYLE = { groups: { stats: { glue: " · ", open: "(", close: ")" } } };
+export class StatusLine {
+    bar;
+    source;
+    theme;
+    constructor(bar, source, theme) {
+        this.bar = bar;
+        this.source = source;
+        this.theme = theme;
+    }
+    parts() {
+        const theme = this.theme;
+        const dim = (text) => theme.fg("dim", text);
+        const stats = this.bar.current();
+        const telemetry = stats.telemetry;
+        const live = telemetry?.live;
+        const last = telemetry?.last;
+        const parts = [];
+        const left = (text, priority, reserve, extra = {}) => void parts.push({ text, priority, zone: "left", reserve, ...extra });
+        const right = (text, priority) => {
+            if (text !== undefined)
+                parts.push({ text, priority, zone: "right" });
+        };
+        let tps;
+        let amount;
+        if (live !== undefined) {
+            tps = live.tps;
+            amount = `${formatTokens(live.outputTokens)} tok / ${formatSeconds(live.elapsedMs)}`;
+        }
+        else if (last?.doneAt !== undefined) {
+            tps = last.tps;
+            if (last.outputTokens !== undefined && last.firstTokenAt !== undefined) {
+                amount = `${formatTokens(last.outputTokens)} tok / ${formatSeconds(last.doneAt - last.firstTokenAt)}`;
+            }
+        }
+        const label = live !== undefined ? theme.fg("accent", "tps:") : dim("tps:");
+        left(`${label} ${dim(tps === undefined ? "—" : `${formatRate(tps)} tok/s`)}`, undefined, RESERVE.tps);
+        if (amount !== undefined) {
+            left(dim(amount), PRIORITY.amount, RESERVE.amount, { lead: ` ${theme.glyphs.dot} ` });
+        }
+        const stat = { group: "stats", lead: " " };
+        if (telemetry?.avgTps !== undefined) {
+            left(dim(`avg ${formatRate(telemetry.avgTps)}`), PRIORITY.avg, RESERVE.avg, stat);
+        }
+        if (last?.ttftMs !== undefined) {
+            left(dim(`ttft ${formatSeconds(last.ttftMs)}`), PRIORITY.ttft, RESERVE.ttft, stat);
+        }
+        const usage = usageItems(stats, this.bar.queued(), this.source, theme);
+        right(usage.tokens, PRIORITY.tokens);
+        right(usage.cache, PRIORITY.cache);
+        right(usage.rebill, PRIORITY.rebill);
+        right(usage.queue, PRIORITY.queue);
+        right(usage.codemode, PRIORITY.codemode);
+        right(usage.sandbox, PRIORITY.codemode);
+        right(usage.preset, PRIORITY.preset);
+        right(usage.host, PRIORITY.host);
+        right(dim(COLLAPSE_HINT), undefined);
+        return parts;
+    }
+    render(width) {
+        if (this.bar.layout() !== "full")
+            return [];
+        return [truncateToWidth(layoutRow(this.parts(), width, this.theme, RATE_STYLE), width)];
+    }
+    invalidate() { }
+}

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

@@ -0,0 +1,56 @@
+/**
+ * 消息区的子 Agent 折叠视图（docs/wave5-plan.md §7.5）。[W5-U]
+ *
+ * 消费 `subagent_start / update / end`，按 taskId 记下类型、状态、轮数、最近 3 个工具与用量；task 工具行
+ * （tool-view.ts）据 `parentToolCallId` 取来显示一行：
+ *
+ * ```
+ * ⏺ task 检查 src/tui 的测试覆盖缺口
+ *   ⎿ ⠋ explore · 运行中 1m05s · 3 轮 · read grep bash · ↑12k ↓3.4k
+ * ```
+ *
+ * 后台任务的工具调用立即返回，工具行下面多一行跟随状态（`↳ t2 explore · 完成 · 7 轮 …`，运行中每秒刷新）；
+ * 完成后父会话收到的 `<task-notification>` 只显示一行（`notificationSummary`），失败 / 停止另有一行提示。
+ * 外部 runner（claude / codex）同一组事件，用量可能缺。
+ */
+import type { SessionEvent, SubagentStatus } from "../../agent/types.js";
+import type { Usage } from "../../ai/types.js";
+import { type Theme } from "../../tui.js";
+export declare const RECENT_TOOLS = 3;
+export interface SubagentState {
+    taskId: string;
+    parentToolCallId: string;
+    agent: string;
+    runner: string;
+    background: boolean;
+    status: SubagentStatus | "running";
+    turns: number;
+    /** 最近的工具名（最多 3 个，新的在后）。 */
+    tools: string[];
+    usage?: Usage;
+    startedAt: number;
+    endedAt?: number;
+}
+export declare class SubagentTracker {
+    private readonly now;
+    private readonly tasks;
+    private readonly byCall;
+    constructor(now?: () => number);
+    /** 子 Agent 事件：更新状态并返回它；其它事件返回 undefined。 */
+    onEvent(event: SessionEvent): SubagentState | undefined;
+    /** 运行中的任务。 */
+    running(): SubagentState[];
+    get(taskId: string): SubagentState | undefined;
+    /** task 工具调用对应的子 Agent（续聊时是同一 taskId）。 */
+    forToolCall(toolCallId: string): SubagentState | undefined;
+    clear(): void;
+}
+/** `explore · 运行中 1m05s · 3 轮 · read grep bash · ↑12k ↓3.4k`（已着色：类型 tool 色，其余 muted）。 */
+export declare function subagentLine(state: SubagentState, theme: Theme, now: number): string;
+/** 后台任务结束的一行提示。 */
+export declare function backgroundEndText(state: SubagentState): string;
+/**
+ * 父会话收到的 `<task-notification …>`（origin `task` 的用户消息）在消息区只显示一行：
+ * `t1 explore 完成 · 7 轮 · /tasks 查看输出`；不是通知格式返回 undefined。
+ */
+export declare function notificationSummary(text: string): string | undefined;