@armadra/agent 0.5.0 → 0.6.0

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

@@ -0,0 +1,89 @@
+/**
+ * `/trace` 覆盖层（docs/wave6-plan.md §2.4）。[W6-T1]
+ *
+ * - `/trace`（当前会话）、`/trace t2`（以任务 t2 为根：ama 子会话的子轨迹，或外部 Agent 骨架）。
+ * - 主屏约束下的覆盖层：`anchor: "bottom"`、高度 `rows − 1`（同 rewind 面板）；退出撤掉覆盖层，消息区不变。
+ * - 布局：标题汇总一行 + 列表窗口 + 按键提示一行；只格式化可见窗口里的行（10k 节点也只算可见行）。
+ * - 键：↑↓ / PgUp PgDn / Home End 移动；→ 展开（子 Agent 展开即懒加载子轨迹）或进第一个子行；← 折叠或回父行；
+ *   Enter 详情卡片（再按或 Esc 返回）；「更早的 N 个回合」行上 Enter / ↑ 加载前一页；f 跟随开关（进行中自动开，
+ *   手动上移暂停，End 恢复）；Esc 先关详情再关视图。
+ * - 刷新：会话事件（`entry_appended` / `telemetry_tick` / 工具起止 / 请求起止）触发，节流 ≤ 2 Hz；每次整棵
+ *   重建（构建器是 O(条目) 的纯函数，10k 节点实测见 trace-view.test.ts），展开状态与光标按行 key 保留。
+ */
+import type { AgentSession } from "../../agent/types.js";
+import { type Component, type Focusable, type Keybindings, type OverlayHandle, type Theme } from "../../tui.js";
+import { type TraceRow } from "../../trace/flatten.js";
+import { LiveTracker, type ChildLoader } from "../../trace/session.js";
+import type { NoticeLevel } from "./message-view.js";
+/** 尾部优先：首屏与每次向前翻页的回合数。 */
+export declare const TRACE_PAGE_TURNS = 50;
+/** 刷新节流（≤ 2 Hz）。 */
+export declare const TRACE_REFRESH_MS = 500;
+export interface TraceViewHost {
+    theme: Theme;
+    keybindings?: Keybindings;
+    showOverlay(component: Component, options: {
+        anchor: "bottom";
+    }): OverlayHandle;
+    rows(): number;
+    session(): AgentSession;
+    now(): number;
+    notice(level: NoticeLevel, text: string): void;
+    /** 请求重画（异步刷新后）。 */
+    render?(): void;
+    /** 子会话读取（测试注入）；缺省只读读文件、按 mtime 缓存。 */
+    loadChild?: ChildLoader;
+    /** 刷新节流（测试用 0）。 */
+    refreshMs?: number;
+}
+export declare class TraceView implements Component, Focusable {
+    private readonly host;
+    private readonly taskId;
+    private readonly close;
+    focused: boolean;
+    private trace;
+    private root;
+    private rows;
+    private lookup;
+    private readonly expanded;
+    /** 已展开过的 ama 子 Agent（重建后重新挂子轨迹）。 */
+    private readonly loaded;
+    private fromTurn;
+    private cursor;
+    private top;
+    private follow;
+    private detail;
+    readonly live: LiveTracker;
+    private readonly loadChild;
+    constructor(host: TraceViewHost, taskId: string | undefined, close: () => void);
+    /** 任务存在（`/trace <id>`）或看主会话。 */
+    get found(): boolean;
+    private rowsKeyOfRoot;
+    /** 重建轨迹（会话条目 + live 叠加 + 已展开的子轨迹）。 */
+    rebuild(): void;
+    /** 重新摊平，光标按 key 保持；跟随时贴底。 */
+    private reflow;
+    /** 会话有变化：重建并重排。 */
+    refresh(): void;
+    /** 当前行数（测试用）。 */
+    get rowCount(): number;
+    get cursorIndex(): number;
+    get selected(): TraceRow | undefined;
+    get following(): boolean;
+    get detailOpen(): boolean;
+    private bodyHeight;
+    private move;
+    private loadEarlier;
+    private expand;
+    private collapse;
+    handleInput(data: string): void;
+    private detailInput;
+    private ctx;
+    private headerLine;
+    render(width: number): string[];
+    invalidate(): void;
+}
+/**
+ * 打开 `/trace` 覆盖层；关闭时 resolve。任务不存在时提示一行、不打开。
+ */
+export declare function openTraceView(host: TraceViewHost, taskId?: string): Promise<void>;

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

@@ -0,0 +1,332 @@
+/**
+ * `/trace` 覆盖层（docs/wave6-plan.md §2.4）。[W6-T1]
+ *
+ * - `/trace`（当前会话）、`/trace t2`（以任务 t2 为根：ama 子会话的子轨迹，或外部 Agent 骨架）。
+ * - 主屏约束下的覆盖层：`anchor: "bottom"`、高度 `rows − 1`（同 rewind 面板）；退出撤掉覆盖层，消息区不变。
+ * - 布局：标题汇总一行 + 列表窗口 + 按键提示一行；只格式化可见窗口里的行（10k 节点也只算可见行）。
+ * - 键：↑↓ / PgUp PgDn / Home End 移动；→ 展开（子 Agent 展开即懒加载子轨迹）或进第一个子行；← 折叠或回父行；
+ *   Enter 详情卡片（再按或 Esc 返回）；「更早的 N 个回合」行上 Enter / ↑ 加载前一页；f 跟随开关（进行中自动开，
+ *   手动上移暂停，End 恢复）；Esc 先关详情再关视图。
+ * - 刷新：会话事件（`entry_appended` / `telemetry_tick` / 工具起止 / 请求起止）触发，节流 ≤ 2 Hz；每次整棵
+ *   重建（构建器是 O(条目) 的纯函数，10k 节点实测见 trace-view.test.ts），展开状态与光标按行 key 保留。
+ */
+import { msg } from "../../i18n/index.js";
+import { defaultKeybindings, matchesKey, padToWidth, truncateToWidth, visibleWidth, } from "../../tui.js";
+import { buildTrace, findSubagent, loadSubagentTrace } from "../../trace/build.js";
+import { describeNode, detailLines, entryLookup, } from "../../trace/detail.js";
+import { flattenNode, flattenTrace, needsChild, rowIndex, tailStart, } from "../../trace/flatten.js";
+import { formatRow, rowLabel, summaryText } from "../../trace/format.js";
+import { childLoader, LiveTracker, traceInputOf } from "../../trace/session.js";
+/** 尾部优先：首屏与每次向前翻页的回合数。 */
+export const TRACE_PAGE_TURNS = 50;
+/** 刷新节流（≤ 2 Hz）。 */
+export const TRACE_REFRESH_MS = 500;
+export class TraceView {
+    host;
+    taskId;
+    close;
+    focused = false;
+    trace;
+    root;
+    rows = [];
+    lookup;
+    expanded = new Map();
+    /** 已展开过的 ama 子 Agent（重建后重新挂子轨迹）。 */
+    loaded = new Set();
+    fromTurn = 0;
+    cursor = 0;
+    top = 0;
+    follow = false;
+    detail;
+    live;
+    loadChild;
+    constructor(host, taskId, close) {
+        this.host = host;
+        this.taskId = taskId;
+        this.close = close;
+        this.live = new LiveTracker(host.session, host.now);
+        this.loadChild = host.loadChild ?? childLoader();
+        this.rebuild();
+        this.follow = this.trace.partial;
+        if (taskId === undefined)
+            this.fromTurn = tailStart(this.trace, TRACE_PAGE_TURNS);
+        if (this.root !== undefined)
+            this.expanded.set(this.rowsKeyOfRoot(), true);
+        this.reflow();
+        this.cursor = Math.max(0, this.rows.length - 1);
+    }
+    /** 任务存在（`/trace <id>`）或看主会话。 */
+    get found() {
+        return this.taskId === undefined || this.root !== undefined;
+    }
+    rowsKeyOfRoot() {
+        return `a:${this.taskId}`;
+    }
+    /** 重建轨迹（会话条目 + live 叠加 + 已展开的子轨迹）。 */
+    rebuild() {
+        const session = this.host.session();
+        const input = traceInputOf(session);
+        this.trace = buildTrace(input, { live: this.live.overlay() });
+        for (const taskId of this.loaded) {
+            const node = findSubagent(this.trace, taskId);
+            if (node !== undefined)
+                loadSubagentTrace(node, this.loadChild);
+        }
+        if (this.taskId !== undefined) {
+            this.root = findSubagent(this.trace, this.taskId);
+            if (this.root !== undefined)
+                loadSubagentTrace(this.root, this.loadChild);
+        }
+        const children = this.loadChild.inputs().flatMap((i) => i.entries);
+        this.lookup = entryLookup([...input.entries, ...children], session.state.cwd);
+    }
+    /** 重新摊平，光标按 key 保持；跟随时贴底。 */
+    reflow() {
+        const key = this.rows[this.cursor]?.key;
+        const opts = { expanded: this.expanded, fromTurn: this.fromTurn };
+        this.rows =
+            this.root !== undefined ? flattenNode(this.root, opts) : flattenTrace(this.trace, opts);
+        const at = key === undefined ? -1 : rowIndex(this.rows, key);
+        this.cursor = this.follow
+            ? Math.max(0, this.rows.length - 1)
+            : at >= 0
+                ? at
+                : Math.min(this.cursor, Math.max(0, this.rows.length - 1));
+        if (this.detail !== undefined) {
+            const fresh = this.rows[rowIndex(this.rows, this.detail.row.key)];
+            if (fresh !== undefined)
+                this.detail.row = fresh;
+        }
+    }
+    /** 会话有变化：重建并重排。 */
+    refresh() {
+        this.rebuild();
+        this.reflow();
+    }
+    /** 当前行数（测试用）。 */
+    get rowCount() {
+        return this.rows.length;
+    }
+    get cursorIndex() {
+        return this.cursor;
+    }
+    get selected() {
+        return this.rows[this.cursor];
+    }
+    get following() {
+        return this.follow;
+    }
+    get detailOpen() {
+        return this.detail !== undefined;
+    }
+    bodyHeight() {
+        return Math.max(1, this.host.rows() - 1 - 2);
+    }
+    move(delta) {
+        if (this.rows.length === 0)
+            return;
+        if (delta < 0)
+            this.follow = false;
+        // 第一行是「更早的回合」时继续上移 = 加载前一页
+        if (delta < 0 && this.cursor === 0 && this.rows[0]?.node.kind === "more")
+            return this.loadEarlier();
+        this.cursor = Math.max(0, Math.min(this.rows.length - 1, this.cursor + delta));
+        if (delta > 0 && this.cursor === this.rows.length - 1 && this.trace.partial)
+            this.follow = true;
+    }
+    loadEarlier() {
+        const key = this.rows[1]?.key;
+        this.fromTurn = Math.max(0, this.fromTurn - TRACE_PAGE_TURNS);
+        this.reflow();
+        const at = key === undefined ? -1 : rowIndex(this.rows, key);
+        this.cursor = Math.max(0, at - 1);
+    }
+    expand() {
+        const row = this.selected;
+        if (row === undefined)
+            return;
+        if (!row.expandable)
+            return;
+        if (!row.expanded) {
+            if (needsChild(row.node)) {
+                this.loaded.add(row.node.taskId);
+                loadSubagentTrace(row.node, this.loadChild);
+                this.rebuild();
+            }
+            this.expanded.set(row.key, true);
+            this.reflow();
+            return;
+        }
+        if (this.rows[this.cursor + 1]?.depth === row.depth + 1)
+            this.cursor++;
+    }
+    collapse() {
+        const row = this.selected;
+        if (row === undefined)
+            return;
+        this.follow = false;
+        if (row.expanded) {
+            this.expanded.set(row.key, false);
+            this.reflow();
+            return;
+        }
+        const slash = row.key.lastIndexOf("/");
+        if (slash < 0)
+            return;
+        const parent = rowIndex(this.rows, row.key.slice(0, slash));
+        if (parent >= 0)
+            this.cursor = parent;
+    }
+    handleInput(data) {
+        const keys = this.host.keybindings ?? defaultKeybindings;
+        if (this.detail !== undefined)
+            return this.detailInput(data, keys);
+        const page = this.bodyHeight();
+        if (keys.matches(data, "tui.select.up"))
+            this.move(-1);
+        else if (keys.matches(data, "tui.select.down"))
+            this.move(1);
+        else if (keys.matches(data, "tui.select.pageUp"))
+            this.move(-page);
+        else if (keys.matches(data, "tui.select.pageDown"))
+            this.move(page);
+        else if (matchesKey(data, "home")) {
+            this.follow = false;
+            this.cursor = 0;
+        }
+        else if (matchesKey(data, "end")) {
+            this.cursor = Math.max(0, this.rows.length - 1);
+            this.follow = this.trace.partial;
+        }
+        else if (matchesKey(data, "right"))
+            this.expand();
+        else if (matchesKey(data, "left"))
+            this.collapse();
+        else if (matchesKey(data, "enter")) {
+            const row = this.selected;
+            if (row?.node.kind === "more")
+                this.loadEarlier();
+            else if (row !== undefined && row.node.kind !== "aux_group")
+                this.detail = { row, scroll: 0 };
+        }
+        else if (data === "f") {
+            this.follow = !this.follow;
+            if (this.follow)
+                this.cursor = Math.max(0, this.rows.length - 1);
+        }
+        else if (matchesKey(data, "escape") || keys.matches(data, "tui.select.cancel"))
+            this.close();
+    }
+    detailInput(data, keys) {
+        const detail = this.detail;
+        const page = this.bodyHeight();
+        if (keys.matches(data, "tui.select.up"))
+            detail.scroll = Math.max(0, detail.scroll - 1);
+        else if (keys.matches(data, "tui.select.down"))
+            detail.scroll++;
+        else if (keys.matches(data, "tui.select.pageUp"))
+            detail.scroll = Math.max(0, detail.scroll - page);
+        else if (keys.matches(data, "tui.select.pageDown"))
+            detail.scroll += page;
+        else if (matchesKey(data, "escape") || matchesKey(data, "enter") || matchesKey(data, "left"))
+            this.detail = undefined;
+    }
+    ctx() {
+        return {
+            theme: this.host.theme,
+            describe: (n) => describeNode(n, this.lookup),
+        };
+    }
+    headerLine(width) {
+        const theme = this.host.theme;
+        const m = msg().trace;
+        const root = this.root;
+        const title = root !== undefined ? m.taskTitle(root.taskId, root.agent) : m.title;
+        const source = root !== undefined ? root.child : this.trace;
+        const summary = source !== undefined ? ` · ${summaryText(source, theme)}` : "";
+        const state = this.trace.partial ? (this.follow ? m.follow.on : m.follow.off) : "";
+        const right = state === "" ? "" : ` ${theme.fg(this.follow ? "accent" : "muted", state)}`;
+        const left = truncateToWidth(`${theme.bold(title)}${theme.fg("muted", summary)}`, Math.max(1, width - visibleWidth(right)), theme.glyphs.ellipsis);
+        return padToWidth(`${left}${right}`, width);
+    }
+    render(width) {
+        const theme = this.host.theme;
+        const height = this.bodyHeight();
+        const lines = [this.headerLine(width)];
+        if (this.detail !== undefined) {
+            const { row } = this.detail;
+            const body = [
+                theme.bold(rowLabel(row, this.ctx())),
+                ...detailLines(row.node, this.lookup, Math.max(8, width - 2), theme, this.trace.startedAt),
+            ].map((l) => ` ${l}`);
+            const max = Math.max(0, body.length - height);
+            this.detail.scroll = Math.min(this.detail.scroll, max);
+            for (const line of body.slice(this.detail.scroll, this.detail.scroll + height))
+                lines.push(padToWidth(truncateToWidth(line, width, theme.glyphs.ellipsis), width));
+        }
+        else if (this.rows.length === 0)
+            lines.push(padToWidth(theme.dim(` ${msg().trace.empty}`), width));
+        else {
+            // 窗口：光标始终可见；跟随时贴底
+            if (this.cursor < this.top)
+                this.top = this.cursor;
+            if (this.cursor >= this.top + height)
+                this.top = this.cursor - height + 1;
+            this.top = Math.max(0, Math.min(this.top, Math.max(0, this.rows.length - height)));
+            const ctx = this.ctx();
+            for (let i = this.top; i < Math.min(this.rows.length, this.top + height); i++)
+                lines.push(formatRow(this.rows[i], width, ctx, i === this.cursor));
+        }
+        while (lines.length < height + 1)
+            lines.push(" ".repeat(width));
+        const hints = msg().trace.hints;
+        const hint = this.detail !== undefined ? hints.detail : width < 60 ? hints.listNarrow : hints.list;
+        lines.push(padToWidth(truncateToWidth(theme.dim(hint), width, theme.glyphs.ellipsis), width));
+        return lines;
+    }
+    invalidate() { }
+}
+/**
+ * 打开 `/trace` 覆盖层；关闭时 resolve。任务不存在时提示一行、不打开。
+ */
+export function openTraceView(host, taskId) {
+    return new Promise((resolve) => {
+        let handle;
+        let timer;
+        let unsubscribe;
+        let last = 0;
+        const finish = () => {
+            if (timer !== undefined)
+                clearTimeout(timer);
+            unsubscribe?.();
+            handle?.hide();
+            host.render?.();
+            resolve();
+        };
+        const view = new TraceView(host, taskId, finish);
+        if (!view.found) {
+            host.notice("warn", msg().trace.taskNotFound(taskId));
+            resolve();
+            return;
+        }
+        const throttle = host.refreshMs ?? TRACE_REFRESH_MS;
+        const flush = () => {
+            timer = undefined;
+            last = host.now();
+            view.refresh();
+            host.render?.();
+        };
+        unsubscribe = host.session().subscribe((event) => {
+            if (!view.live.onEvent(event) || timer !== undefined)
+                return;
+            const wait = Math.max(0, throttle - (host.now() - last));
+            if (wait === 0)
+                flush();
+            else {
+                timer = setTimeout(flush, wait);
+                timer.unref?.();
+            }
+        });
+        handle = host.showOverlay(view, { anchor: "bottom" });
+    });
+}

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

@@ -30,6 +30,7 @@ import { errorText, lastAssistant, onStdoutClosed, onTerminationSignals } from "
 import { toJsonLine, toWireEvent } from "./json-event.js";
 import { formatUsd } from "../../agent/limits.js";
 import { promptImages, sessionModel } from "../image-input.js";
+import { msg } from "../../i18n/index.js";
 export function joinPrompt(argument, piped) {
     const parts = [argument ?? "", piped.replace(/\s+$/, "")].filter((p) => p.trim() !== "");
     return parts.join("\n\n");
@@ -75,14 +76,14 @@ export async function readPromptStdin(io, prompt, mode, hintMs = STDIN_WAIT_HINT
             return "";
         const text = await readWithin(io, waitMs);
         if (text === undefined) {
-            io.stderr(`ama: 未在 ${formatSeconds(waitMs)}内收到管道输入，已忽略；需要等待请在末尾加 -\n`);
+            io.stderr(msg().print.print.stdinIgnored(formatSeconds(waitMs)));
             return "";
         }
         return text;
     }
     const timer = safe
         ? undefined
-        : setTimeout(() => io.stderr("ama: 正在等待 stdin 输入结束（Ctrl+D 结束；提示也可以直接写成参数）…\n"), hintMs);
+        : setTimeout(() => io.stderr(msg().print.print.stdinWaiting), hintMs);
     try {
         return await io.readStdin();
     }
@@ -91,7 +92,8 @@ export async function readPromptStdin(io, prompt, mode, hintMs = STDIN_WAIT_HINT
     }
 }
 function formatSeconds(ms) {
-    return ms % 1000 === 0 ? `${ms / 1000} 秒` : `${ms} 毫秒`;
+    const m = msg().print.print;
+    return ms % 1000 === 0 ? m.seconds(ms / 1000) : m.millis(ms);
 }
 export async function runPrintMode(runtime, context) {
     const { io } = context;
@@ -100,7 +102,7 @@ export async function runPrintMode(runtime, context) {
     const piped = await readPromptStdin(io, context.prompt, stdinMode);
     const prompt = joinPrompt(context.prompt, piped);
     if (prompt === "") {
-        io.stderr("ama: -p 需要提示（位置参数或 stdin 管道）\n");
+        io.stderr(msg().print.print.needsPrompt);
         return ExitCode.Usage;
     }
     const session = currentSession(runtime);
@@ -132,7 +134,7 @@ export async function runPrintMode(runtime, context) {
         if (format === "stream-json")
             io.stdout(`${toJsonLine(toWireEvent(event))}\n`);
         else if (event.type === "auto_retry_start")
-            io.stderr(`ama: ↻ 重试 ${event.attempt}/${event.maxAttempts}（${Math.round(event.delayMs / 1000)}s 后）：${event.errorMessage}\n`);
+            io.stderr(msg().print.print.retry(event.attempt, event.maxAttempts, Math.round(event.delayMs / 1000), event.errorMessage));
     });
     let signalled;
     const offSignals = onTerminationSignals((code) => {
@@ -215,7 +217,7 @@ export async function runPrintMode(runtime, context) {
         return ExitCode.LimitReached;
     }
     if (last?.stopReason === "error" || last?.stopReason === "aborted") {
-        io.stderr(`ama: ${last.errorMessage ?? "模型调用失败"}\n`);
+        io.stderr(`ama: ${last.errorMessage ?? msg().print.print.modelFailed}\n`);
         return ExitCode.RuntimeError;
     }
     if (denied.length > 0)
@@ -231,15 +233,14 @@ export async function runPrintMode(runtime, context) {
 /** stderr 一行：计划已落盘待审批（-p 不替人批准）。 */
 export function describePlanPending(plan) {
     const where = plan.filePath ?? plan.planId;
-    return (`ama: 计划 v${plan.version} 已落盘、待审批（未执行）：${where}；-p 不替人批准——` +
-        "在交互界面或 RPC plan_response 里审批，或设 plan.unattended: approve 让 -p 批准后接着执行");
+    return msg().print.print.planPending(plan.version, where);
 }
 /** stderr 一行：哪个预算到限。 */
 export function describeLimit(event) {
+    const m = msg().print.print;
     return event.kind === "turns"
-        ? `ama: 已达到回合上限 ${event.limit}（--max-turns / limits.maxTurns），运行在完成前结束`
-        : `ama: 已达到费用上限 ${formatUsd(event.limit)}（累计 ${formatUsd(event.value)}；` +
-            "--max-cost / limits.maxCostUsd），运行在完成前结束";
+        ? m.limitTurns(event.limit)
+        : m.limitCost(formatUsd(event.limit), formatUsd(event.value));
 }
 function textOf(event) {
     const content = event.result.content;
@@ -253,8 +254,6 @@ export function describeDenied(denied) {
     const counts = new Map();
     for (const item of denied)
         counts.set(item.toolName, (counts.get(item.toolName) ?? 0) + 1);
-    const tools = [...counts].map(([name, n]) => `${name} ×${n}`).join("、");
-    const reason = denied[0]?.reason ?? "";
-    return (`ama: ${denied.length} 次工具调用被拒：${tools}${reason !== "" ? `（${reason}）` : ""}；` +
-        "-p 没有人审批，需要放行时用 --permission-mode auto-edit|auto 或 --allow <规则>");
+    const tools = [...counts].map(([name, n]) => `${name} ×${n}`);
+    return msg().print.print.denied(denied.length, tools, denied[0]?.reason ?? "");
 }

package/dist/modes/rpc/commands.js

@@ -22,6 +22,8 @@ import { AmaError } from "../../errors.js";
 import { isPermissionMode } from "../../permissions/modes.js";
 import { PERMISSION_MODES_STRICT_FIRST } from "../../permissions/types.js";
 import { BUILTIN_COMMANDS } from "../commands-core.js";
+import { msg } from "../../i18n/index.js";
+import { sessionTrace } from "../../trace/query-session.js";
 /** 审批 broker：等客户端 `permission_response`。 */
 export class RpcApprovals {
     pending = new Map();
@@ -65,13 +67,13 @@ export class RpcApprovals {
 function impl(session) {
     if (session instanceof AgentSessionImpl)
         return session;
-    throw new AmaError("not_implemented", "该会话不支持此命令");
+    throw new AmaError("not_implemented", msg().print.rpc.unsupported);
 }
 /** [W5-F] 当前会话的计划控制面；会话没有装配 plan 扩展时报 not_implemented。 */
 function plans(ctx) {
     const controller = planController(ctx.session());
     if (controller === undefined)
-        throw new AmaError("not_implemented", "该会话没有装配 plan 扩展");
+        throw new AmaError("not_implemented", msg().print.rpc.noPlan);
     return controller;
 }
 /** 声明了 `plans` 能力 → 客户端作答；否则按 `plan.unattended`。换会话后重新应用。 */
@@ -286,7 +288,7 @@ export const handlers = {
     },
     set_permission_mode: async (p, ctx) => {
         if (!isPermissionMode(p.mode)) {
-            throw new AmaError("invalid_arguments", `mode 应为 ${PERMISSION_MODES_STRICT_FIRST.join(" | ")}`);
+            throw new AmaError("invalid_arguments", msg().print.rpc.badMode(PERMISSION_MODES_STRICT_FIRST));
         }
         ctx.session().setPermissionMode(p.mode);
         return { mode: p.mode };
@@ -308,5 +310,7 @@ export const handlers = {
     get_todos: async (_p, ctx) => ({ items: currentTodos(impl(ctx.session()).manager.branch()) }),
     get_tasks: async (_p, ctx) => ({ tasks: [...(ctx.tasks?.()?.list() ?? [])] }),
     get_agents: async (_p, ctx) => ({ agents: [...(ctx.agents?.() ?? [])] }),
+    // [W6-T2] 轨迹（docs/wave6-plan.md §2.6；分页 / 增量 / 脱敏见 trace/query.ts）
+    get_trace: async (p, ctx) => sessionTrace(ctx.session(), p ?? {}),
 };
 export const RPC_COMMAND_TYPES = Object.keys(handlers);

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

@@ -23,6 +23,7 @@ import { sessionAgents, taskRegistryView } from "../../agent/subagent-registry.j
 import { cachedAgentInfos } from "../../agents/external.js";
 import { RpcApprovals, handlers } from "./commands.js";
 import { createLineReader, writeChunked } from "./jsonl.js";
+import { msg } from "../../i18n/index.js";
 export const RPC_CAPABILITIES = ["approvals", "images", "hooks", "plans"];
 export async function runRpcMode(runtime, context, options = {}) {
     const stdin = options.stdin ?? process.stdin;
@@ -79,7 +80,7 @@ export async function runRpcMode(runtime, context, options = {}) {
                 type: "response",
                 command: type,
                 success: false,
-                error: `未知命令：${String(type)}`,
+                error: msg().print.rpc.unknownCommand(String(type)),
                 code: "invalid_arguments",
             });
             return;
@@ -116,12 +117,17 @@ export async function runRpcMode(runtime, context, options = {}) {
                 type: "response",
                 command: "parse",
                 success: false,
-                error: `JSON 解析失败：${errorText(error)}`,
+                error: msg().print.rpc.parseFailed(errorText(error)),
             });
             return;
         }
         if (typeof command !== "object" || command === null || typeof command.type !== "string") {
-            void write({ type: "response", command: "parse", success: false, error: "缺少 type" });
+            void write({
+                type: "response",
+                command: "parse",
+                success: false,
+                error: msg().print.rpc.missingType,
+            });
             return;
         }
         const task = respond(command).finally(() => inflight.delete(task));

package/dist/modes/session-report.d.ts

@@ -58,6 +58,8 @@ export declare function externalUsageText(usage: {
 export declare function externalRows(session: AgentSession): KeyValueRow[];
 /** [W5-U] 子 Agent 任务汇总（`getStats().tasks`）；没有任务时 undefined。 */
 export declare function taskStatsText(session: AgentSession): string | undefined;
+/** [W6-O] 「订阅用量」段（`getStats().subscription`）：按供应商列请求与 token、缓存只给命中率；附最近配额。 */
+export declare function subscriptionRows(session: AgentSession, now?: number): KeyValueRow[];
 /** 键值行 → 纯文本（键列对齐、去行尾空白）。 */
 export declare function renderRows(rows: readonly KeyValueRow[], indent?: string): string[];
 export declare function describeCache(session: AgentSession, now?: number): string;