@armadra/agent 0.5.1 → 0.6.1

package/dist/modes/interactive/agent-bar.d.ts

@@ -0,0 +1,95 @@
+/**
+ * Agent 栏（docs/wave6-plan.md §1.1–§1.2、D1、D4）。[W6-A]
+ *
+ * 装配在提示行之下、状态行之上。每个任务一行，最多 3 行，多出的给一行「另 N 个」：
+ *
+ * ```
+ * ⏺ t1 explore · 运行中 1m05s · 3 轮 · grep  找测试缺口
+ * ⏺ t2 codex · 等待审批
+ * ⏺ t3 explore · 完成 12s · 2 轮
+ * 另 1 个
+ * ```
+ *
+ * - 显示条件：有排队 / 运行中 / 等审批的任务，或本会话里看着结束、还没查看过的任务（结束后最多 10 分钟）；
+ *   `ui.agentBar: "off"`（嵌入宿主缺省）整个不显示。
+ * - 聚焦（`Ctrl+B` / 空输入 `↓` / `/tasks`）：列出本会话全部任务，`›` 标当前项，窗口跟着选择滚动，
+ *   末行是按键提示。按键处理在 agent-ui.ts。
+ * - 状态来自任务注册表（`TaskInfo`、`live().queued`）、子 Agent 折叠视图的跟踪（轮数、最近工具、用时，界面时钟）
+ *   与 `permission_request.context.taskId`（等审批）。
+ */
+import type { SubagentRegistry } from "../../agent/subagent-registry.js";
+import type { SubagentStatus } from "../../agent/types.js";
+import type { TaskInfo } from "../../tools/types.js";
+import { type Component, type Theme } from "../../tui.js";
+import type { SubagentTracker } from "./subagent-view.js";
+export declare const BAR_ROWS = 3;
+/** 结束后未查看的任务在栏里保留多久。 */
+export declare const BAR_RETAIN_MS: number;
+export type BarStatus = "queued" | "running" | "approval" | SubagentStatus;
+export interface BarRow {
+    taskId: string;
+    agent: string;
+    runner: string;
+    description: string;
+    status: BarStatus;
+    turns: number;
+    tool?: string;
+    elapsedMs?: number;
+}
+/** 栏与视图读的任务注册表（当前会话的 `registryOf(sessionId)`；测试给假的）。 */
+export type TaskSource = Pick<SubagentRegistry, "list" | "get" | "live" | "message">;
+export interface AgentBarDeps {
+    theme: Theme;
+    registry(): TaskSource | undefined;
+    tracker: SubagentTracker;
+    now(): number;
+    /** 正在等审批的任务。 */
+    approvals(): ReadonlySet<string>;
+    /** `ui.agentBar` 不是 off。 */
+    enabled(): boolean;
+}
+export declare function statusLabel(status: BarStatus): string;
+export declare function statusColor(status: BarStatus): "accent" | "dim" | "warning" | "success" | "error";
+/** 一条任务的栏 / 视图标题数据（状态、轮数、最近工具、用时；用时按界面时钟）。 */
+export declare function taskRow(info: TaskInfo, ctx: {
+    tracker: SubagentTracker;
+    approvals: ReadonlySet<string>;
+    queued: boolean;
+    now: number;
+}): BarRow;
+/** `explore` / `gemini(acp:gemini)`。 */
+export declare function agentLabel(row: Pick<BarRow, "agent" | "runner">): string;
+/** `运行中 1m05s · 3 轮 · grep`（不带颜色）。 */
+export declare function rowFacts(row: BarRow, withTool?: boolean): string;
+export declare class AgentBar implements Component {
+    private readonly deps;
+    /** 聚焦时的选择（undefined = 未聚焦）。 */
+    private index;
+    private top;
+    /** 界面看到任务结束的时刻（界面时钟）。 */
+    private readonly endedSeen;
+    private readonly viewed;
+    constructor(deps: AgentBarDeps);
+    get focused(): boolean;
+    /** 本会话全部任务的行（排序后）。 */
+    all(): BarRow[];
+    /** 未聚焦时显示的行：活动的 + 本会话看着结束、未查看、10 分钟内的。 */
+    visibleRows(): BarRow[];
+    get visible(): boolean;
+    /** 聚焦；没有任务返回 false。 */
+    focus(): boolean;
+    blur(): void;
+    /** 移动选择；越过第一项返回 false（调用方退出栏）。 */
+    move(delta: number): boolean;
+    selected(): string | undefined;
+    /** 聚焦时选中某任务。 */
+    select(taskId: string): void;
+    /** 查看过（视图里看到了结束后的状态）：不再留在栏里。 */
+    markViewed(taskId: string): void;
+    /** 换会话：清掉本会话的保留状态。 */
+    reset(): void;
+    private row;
+    render(width: number): string[];
+    private line;
+    invalidate(): void;
+}

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

@@ -0,0 +1,248 @@
+/**
+ * Agent 栏（docs/wave6-plan.md §1.1–§1.2、D1、D4）。[W6-A]
+ *
+ * 装配在提示行之下、状态行之上。每个任务一行，最多 3 行，多出的给一行「另 N 个」：
+ *
+ * ```
+ * ⏺ t1 explore · 运行中 1m05s · 3 轮 · grep  找测试缺口
+ * ⏺ t2 codex · 等待审批
+ * ⏺ t3 explore · 完成 12s · 2 轮
+ * 另 1 个
+ * ```
+ *
+ * - 显示条件：有排队 / 运行中 / 等审批的任务，或本会话里看着结束、还没查看过的任务（结束后最多 10 分钟）；
+ *   `ui.agentBar: "off"`（嵌入宿主缺省）整个不显示。
+ * - 聚焦（`Ctrl+B` / 空输入 `↓` / `/tasks`）：列出本会话全部任务，`›` 标当前项，窗口跟着选择滚动，
+ *   末行是按键提示。按键处理在 agent-ui.ts。
+ * - 状态来自任务注册表（`TaskInfo`、`live().queued`）、子 Agent 折叠视图的跟踪（轮数、最近工具、用时，界面时钟）
+ *   与 `permission_request.context.taskId`（等审批）。
+ */
+import { msg } from "../../i18n/index.js";
+import { formatElapsed, truncateToWidth } from "../../tui.js";
+export const BAR_ROWS = 3;
+/** 结束后未查看的任务在栏里保留多久。 */
+export const BAR_RETAIN_MS = 10 * 60_000;
+const ACTIVE = new Set(["queued", "running", "approval"]);
+function taskNumber(taskId) {
+    const n = /^t(\d+)$/.exec(taskId);
+    return n === null ? Number.MAX_SAFE_INTEGER : Number(n[1]);
+}
+/** 活动的在前，各组内按编号。 */
+function compareRows(a, b) {
+    const group = (row) => (ACTIVE.has(row.status) ? 0 : 1);
+    return group(a) - group(b) || taskNumber(a.taskId) - taskNumber(b.taskId);
+}
+export function statusLabel(status) {
+    return msg().agents.status[status];
+}
+export function statusColor(status) {
+    switch (status) {
+        case "running":
+            return "accent";
+        case "queued":
+            return "dim";
+        case "completed":
+            return "success";
+        case "failed":
+            return "error";
+        default:
+            return "warning";
+    }
+}
+/** 一条任务的栏 / 视图标题数据（状态、轮数、最近工具、用时；用时按界面时钟）。 */
+export function taskRow(info, ctx) {
+    const state = ctx.tracker.get(info.taskId);
+    let status;
+    if (info.status !== "running")
+        status = info.status;
+    else if (ctx.approvals.has(info.taskId))
+        status = "approval";
+    else if (ctx.queued)
+        status = "queued";
+    else
+        status = "running";
+    const row = {
+        taskId: info.taskId,
+        agent: info.agent,
+        runner: info.runner,
+        description: info.description,
+        status,
+        turns: Math.max(state?.turns ?? 0, info.turns ?? 0),
+    };
+    const tool = state?.tools.at(-1);
+    if (tool !== undefined && status !== "queued")
+        row.tool = tool;
+    if (status !== "queued") {
+        if (state !== undefined)
+            row.elapsedMs = (state.endedAt ?? ctx.now) - state.startedAt;
+        else if (info.endedAt !== undefined)
+            row.elapsedMs = info.endedAt - info.startedAt;
+    }
+    return row;
+}
+/** `explore` / `gemini(acp:gemini)`。 */
+export function agentLabel(row) {
+    return row.runner !== "ama" && row.runner !== row.agent
+        ? `${row.agent}(${row.runner})`
+        : row.agent;
+}
+/** `运行中 1m05s · 3 轮 · grep`（不带颜色）。 */
+export function rowFacts(row, withTool = true) {
+    const facts = [statusLabel(row.status)];
+    if (row.elapsedMs !== undefined)
+        facts[0] += ` ${formatElapsed(row.elapsedMs)}`;
+    if (row.turns > 0)
+        facts.push(msg().agents.turns(row.turns));
+    if (withTool && row.tool !== undefined && row.status === "running")
+        facts.push(row.tool);
+    return facts.join(" · ");
+}
+export class AgentBar {
+    deps;
+    /** 聚焦时的选择（undefined = 未聚焦）。 */
+    index;
+    top = 0;
+    /** 界面看到任务结束的时刻（界面时钟）。 */
+    endedSeen = new Map();
+    viewed = new Set();
+    constructor(deps) {
+        this.deps = deps;
+    }
+    get focused() {
+        return this.index !== undefined;
+    }
+    /** 本会话全部任务的行（排序后）。 */
+    all() {
+        const registry = this.deps.registry();
+        if (registry === undefined)
+            return [];
+        const approvals = this.deps.approvals();
+        const now = this.deps.now();
+        const rows = registry.list().map((info) => this.row(info, approvals, now));
+        return rows.sort(compareRows);
+    }
+    /** 未聚焦时显示的行：活动的 + 本会话看着结束、未查看、10 分钟内的。 */
+    visibleRows() {
+        if (!this.deps.enabled())
+            return [];
+        const now = this.deps.now();
+        return this.all().filter((row) => {
+            if (ACTIVE.has(row.status))
+                return true;
+            if (this.deps.tracker.get(row.taskId) === undefined || this.viewed.has(row.taskId))
+                return false;
+            const seen = this.endedSeen.get(row.taskId);
+            return seen !== undefined && now - seen < BAR_RETAIN_MS;
+        });
+    }
+    get visible() {
+        return this.visibleRows().length > 0;
+    }
+    /** 聚焦；没有任务返回 false。 */
+    focus() {
+        if (!this.deps.enabled() || this.all().length === 0)
+            return false;
+        this.index = 0;
+        this.top = 0;
+        return true;
+    }
+    blur() {
+        this.index = undefined;
+        this.top = 0;
+    }
+    /** 移动选择；越过第一项返回 false（调用方退出栏）。 */
+    move(delta) {
+        if (this.index === undefined)
+            return false;
+        const count = this.all().length;
+        const next = this.index + delta;
+        if (next < 0)
+            return false;
+        this.index = Math.min(next, Math.max(0, count - 1));
+        return true;
+    }
+    selected() {
+        if (this.index === undefined)
+            return undefined;
+        const rows = this.all();
+        return rows[Math.min(this.index, rows.length - 1)]?.taskId;
+    }
+    /** 聚焦时选中某任务。 */
+    select(taskId) {
+        if (this.index === undefined)
+            return;
+        const at = this.all().findIndex((row) => row.taskId === taskId);
+        if (at >= 0)
+            this.index = at;
+    }
+    /** 查看过（视图里看到了结束后的状态）：不再留在栏里。 */
+    markViewed(taskId) {
+        this.viewed.add(taskId);
+    }
+    /** 换会话：清掉本会话的保留状态。 */
+    reset() {
+        this.blur();
+        this.endedSeen.clear();
+        this.viewed.clear();
+    }
+    row(info, approvals, now) {
+        const row = taskRow(info, {
+            tracker: this.deps.tracker,
+            approvals,
+            queued: this.deps.registry()?.live(info.taskId)?.queued === true,
+            now,
+        });
+        if (ACTIVE.has(row.status)) {
+            // 又跑起来了（续聊）：重新计保留与查看
+            this.endedSeen.delete(info.taskId);
+            this.viewed.delete(info.taskId);
+        }
+        else if (!this.endedSeen.has(info.taskId))
+            this.endedSeen.set(info.taskId, now);
+        return row;
+    }
+    render(width) {
+        const focused = this.index !== undefined;
+        const rows = focused ? this.all() : this.visibleRows();
+        const t = this.deps.theme;
+        const m = msg().agents;
+        if (rows.length === 0)
+            return focused ? [truncateToWidth(t.fg("dim", m.bar.empty), width)] : [];
+        let start = 0;
+        if (this.index !== undefined) {
+            this.index = Math.min(this.index, rows.length - 1);
+            if (this.index < this.top)
+                this.top = this.index;
+            if (this.index >= this.top + BAR_ROWS)
+                this.top = this.index - BAR_ROWS + 1;
+            this.top = Math.max(0, Math.min(this.top, rows.length - BAR_ROWS));
+            start = this.top;
+        }
+        const shown = rows.slice(start, start + BAR_ROWS);
+        const out = shown.map((row, i) => this.line(row, width, focused, start + i === this.index));
+        const hidden = rows.length - shown.length;
+        const tail = [];
+        if (hidden > 0)
+            tail.push(m.bar.more(hidden));
+        if (focused)
+            tail.push(m.bar.keys(t.glyphs.arrowUp, t.glyphs.arrowDown));
+        if (tail.length > 0)
+            out.push(truncateToWidth(t.fg("dim", tail.join(" · ")), width, t.glyphs.ellipsis));
+        return out;
+    }
+    line(row, width, focused, selected) {
+        const t = this.deps.theme;
+        const g = t.glyphs;
+        const agent = agentLabel(row);
+        const lead = focused ? (selected ? t.fg("accent", g.prompt) : " ") + " " : "";
+        const marker = t.fg(statusColor(row.status), g.tool);
+        const id = selected ? t.bold(row.taskId) : row.taskId;
+        const description = row.description.replace(/\s+/g, " ").trim();
+        const text = `${lead}${marker} ${id} ${t.fg("tool", agent)}` +
+            t.fg("dim", " · ") +
+            t.fg(row.status === "approval" ? "warning" : "muted", rowFacts(row)) +
+            (description === "" ? "" : `  ${t.fg("dim", description)}`);
+        return truncateToWidth(text, width, g.ellipsis);
+    }
+    invalidate() { }
+}

package/dist/modes/interactive/agent-panels.js

@@ -2,12 +2,13 @@
  * 第五波的消息区面板（左竖条卡片，与 `/session` 同一手法）：`/plan`、`/agents`、`/tasks` 展开的任务输出。
  * [W5-U] line 模式用 plan-command.ts / tasks-report.ts 的文本版。
  */
+import { msg } from "../../i18n/index.js";
 import { permissionModeLabel } from "../../permissions/modes.js";
 import { executionMode } from "../../plan/store.js";
 import { Card, wrapTextWithAnsi } from "../../tui.js";
 import { Indent, Stack, keyValue } from "./panels.js";
 import { planStatusText, planTitle } from "./plan-command.js";
-import { agentFacts, listAgents, taskFacts } from "./tasks-report.js";
+import { agentFactItems, listAgents, taskFacts } from "./tasks-report.js";
 import { cleanLines } from "./tool-summary.js";
 /** 折行显示的若干行。 */
 class Lines {
@@ -28,76 +29,76 @@ const STATUS_COLOR = {
 };
 /** `/plan`：当前计划、状态、模式、步骤与待办进度。 */
 export function planPanel(controller, session, theme, displayPath = (p) => p) {
+    const m = msg().panels.plan;
+    const dim = (text) => theme.fg("dim", text);
     const plan = controller.current();
     const mode = session.state.permissionMode;
     const modeText = mode === "plan"
-        ? `Plan${theme.fg("dim", `（批准后回到 ${permissionModeLabel(executionMode(undefined, controller.prePlanMode()))}）`)}`
+        ? m.modePlan(permissionModeLabel(executionMode(undefined, controller.prePlanMode())), dim)
         : permissionModeLabel(mode);
     if (plan === null) {
-        const hint = mode === "plan"
-            ? "还没有计划：模型给出 <proposed_plan> 后在这里审批"
-            : "没有计划。/plan <目标> 进入 Plan 模式";
-        return new Card(new Lines([theme.fg("muted", hint)]), { theme, title: "计划" });
+        const hint = mode === "plan" ? msg().plan.command.noPlanYet : msg().plan.command.noPlan;
+        return new Card(new Lines([theme.fg("muted", hint)]), { theme, title: m.title });
     }
     const rows = [
-        { key: "状态", value: theme.fg(STATUS_COLOR[plan.status], planStatusText(plan.status)) },
-        { key: "模式", value: modeText },
+        { key: m.status, value: theme.fg(STATUS_COLOR[plan.status], planStatusText(plan.status)) },
+        { key: m.mode, value: modeText },
     ];
     const todos = controller.todos();
     if (todos.length > 0) {
         const done = todos.filter((t) => t.status === "done").length;
         const current = todos.find((t) => t.status === "in_progress");
         rows.push({
-            key: "待办",
-            value: `${done}/${todos.length} 完成${current !== undefined ? theme.fg("dim", ` · 进行中 ${current.text}`) : ""}`,
+            key: m.todos,
+            value: m.todosValue(done, todos.length, current?.text, dim),
         });
     }
     const parts = [theme.bold(planTitle(plan)), keyValue(rows, theme)];
     if (plan.steps.length > 0) {
-        parts.push(theme.bold(`步骤（${plan.steps.length}）`));
+        parts.push(theme.bold(m.steps(plan.steps.length)));
         parts.push(new Indent(new Lines(plan.steps.map((s) => `${theme.fg("dim", s.id)} ${s.text}`)), 2));
     }
     if (plan.status === "proposed")
-        parts.push(new Lines([
-            theme.fg("dim", "/plan approve [模式|fresh] 批准 · /plan reject 放弃 · 直接输入修改意见"),
-        ]));
+        parts.push(new Lines([theme.fg("dim", msg().plan.command.actions)]));
     return new Card(new Stack(parts), {
         theme,
-        title: `计划 v${plan.version}`,
+        title: m.titleVersion(plan.version),
         ...(plan.filePath !== undefined ? { subtitle: displayPath(plan.filePath) } : {}),
     });
 }
 /** `/agents`：类型、runner、来源、安装状态与版本、说明。 */
 export function agentsPanel(sessionId, theme) {
+    const m = msg().panels.agents;
     const agents = listAgents(sessionId);
     if (agents.length === 0)
-        return new Card(new Lines([theme.fg("muted", "当前会话没有子 Agent（task 工具未启用）")]), {
-            theme,
-            title: "子 Agent",
-        });
+        return new Card(new Lines([theme.fg("muted", m.none)]), { theme, title: m.title });
     const rows = agents.map((agent) => {
-        const facts = agentFacts(agent);
-        const status = facts.map((f) => f === "未安装" ? theme.fg("warning", f) : f.startsWith("已安装") ? theme.fg("success", f) : f);
+        const status = agentFactItems(agent).map((f) => f.state === "missing"
+            ? theme.fg("warning", f.text)
+            : f.state === "installed"
+                ? theme.fg("success", f.text)
+                : f.text);
         return {
             key: agent.name,
             value: `${status.join(theme.fg("dim", " · "))}  ${theme.fg("muted", agent.description.replace(/\s+/g, " "))}`,
         };
     });
-    return new Card(keyValue(rows, theme, true), { theme, title: `子 Agent（${agents.length}）` });
+    return new Card(keyValue(rows, theme, true), { theme, title: m.titleCount(agents.length) });
 }
 /** `/tasks` 选中一个任务：状态行 + 输出全文（运行中为已有输出）。 */
 export function taskOutputPanel(task, output, theme, now, displayPath = (p) => p) {
+    const m = msg().panels.tasks;
     const body = output === undefined || output.trim() === "" ? [] : cleanLines(output.trimEnd());
     const lines = [
         ...(task.description.trim() !== "" ? [theme.fg("muted", task.description.trim())] : []),
-        ...(body.length === 0 ? [theme.fg("dim", "（还没有输出）")] : body),
+        ...(body.length === 0 ? [theme.fg("dim", m.noOutput)] : body),
     ];
     if (task.outputFile !== undefined)
-        lines.push(theme.fg("dim", `全文：${displayPath(task.outputFile)}`));
-    const facts = [task.agent, ...taskFacts(task, now), ...(task.background ? ["后台"] : [])];
+        lines.push(theme.fg("dim", m.fullOutput(displayPath(task.outputFile))));
+    const facts = [task.agent, ...taskFacts(task, now), ...(task.background ? [m.background] : [])];
     return new Card(new Lines(lines), {
         theme,
-        title: `任务 ${task.taskId}`,
+        title: m.title(task.taskId),
         subtitle: facts.join(" · "),
     });
 }

package/dist/modes/interactive/agent-transcript.d.ts

@@ -0,0 +1,47 @@
+/**
+ * 子 Agent 视图的正文（docs/wave6-plan.md §1.2、D2）。[W6-A]
+ *
+ * - `AmaTranscript`：ama 子会话的全量消息，复用消息区的 `MessageView` / `ToolTracker` 渲染；先按条目重放
+ *   （句柄在内存时读 `entries()`，被 LRU 释放或 resume 后只读加载子会话文件），运行中再跟随子会话事件。
+ *   视图里直接发的消息（`origin:"direct"`）按普通用户消息显示——在这里就是人发给它的。
+ * - `ExternalTranscript`：外部 Agent 的内存环形缓冲（文本、思考、工具起止、回合、notice）；重启后缓冲为空，
+ *   只给一行「用原 CLI resume」的说明。
+ */
+import type { SessionEvent } from "../../agent/types.js";
+import type { ExternalDisplayEvent } from "../../agents/task-record.js";
+import type { SessionEntry } from "../../session/types.js";
+import { type Component, type Theme } from "../../tui.js";
+import { type MessageViewOptions } from "./message-view.js";
+/** 只读读子会话文件当前分支的条目。 */
+export declare function readBranch(file: string): SessionEntry[];
+export declare class AmaTranscript implements Component {
+    private readonly options;
+    private readonly view;
+    private readonly tools;
+    constructor(options: MessageViewOptions & {
+        now(): number;
+        cwd?: string;
+    });
+    get isEmpty(): boolean;
+    /** 按条目重画（打开视图、重新接上句柄）。 */
+    load(entries: readonly SessionEntry[]): void;
+    /** 子会话事件；返回 true 表示内容变了。 */
+    onEvent(event: SessionEvent): boolean;
+    tick(): void;
+    render(width: number): string[];
+    invalidate(): void;
+}
+export interface ExternalSource {
+    events(): readonly ExternalDisplayEvent[];
+    running(): boolean;
+    runner: string;
+    sessionId?: string;
+}
+export declare class ExternalTranscript implements Component {
+    private readonly theme;
+    private readonly source;
+    constructor(theme: Theme, source: ExternalSource);
+    get isEmpty(): boolean;
+    render(width: number): string[];
+    invalidate(): void;
+}