@armadra/agent 0.5.1 → 0.6.1

package/dist/cli/subcommands/sessions.js

@@ -2,9 +2,9 @@
  * `ama sessions list|show|prune`（设计 §1.2、§8）。[B5]
  *
  * 会话存储是 B2 的实现，经 RuntimeDeps.sessions 注入；这里只做参数、目录解析与输出格式。
- * - list [--all]：缺省只列当前目录的会话；`--all` 列全部。
+ * - list [--all]：缺省只列当前目录的会话、不列子 Agent 会话；`--all` 列全部目录并带上子 Agent 会话（标 `↳`）。
  * - show <id>：头信息 + 条目类型统计 + 首条提示 + 用户消息编号（`--from <id>#<编号>` 复用）。
- * - search / export：见 sessions-search.ts、sessions-export.ts（只读扫描，不经会话存储）。
+ * - search / export / trace：见 sessions-search.ts、sessions-export.ts、sessions-trace.ts（只读扫描，不经会话存储）。
  * - prune [--older-than <天>] [--dry-run]：缺省 30 天，移到 trash（不删除）；之后清理检查点备份
  *   （未被任何会话引用且超过 1 天的 blob，docs/rewind-plan.md §1.4）与超过 7 天的剪贴板图片
  *   （`<数据目录>/clipboard/`，W5-I），`--dry-run` 时只报告。
@@ -18,12 +18,12 @@ import { numberUserMessages } from "../../session/reuse.js";
 import { gcClipboardImages } from "../../tools/clipboard-image.js";
 import { runSessionsExport } from "./sessions-export.js";
 import { runSessionsSearch } from "./sessions-search.js";
-export const SESSIONS_USAGE = `用法：ama sessions list [--all] [--session-dir <目录>]
-      ama sessions show <id> [--session-dir <目录>]
-      ama sessions prune [--older-than <天>] [--dry-run] [--all] [--session-dir <目录>]
-      ama sessions search <关键词|/正则/> [--all] [--role user|assistant|tool] [--since 7d] [--limit N]
-      ama sessions export <id> [--format md|json|jsonl] [--output <文件>] [--branch leaf|all]
-`;
+import { runSessionsTrace } from "./sessions-trace.js";
+import { msg } from "../../i18n/index.js";
+/** 用法（随界面语言）。 */
+export function sessionsUsage() {
+    return msg().session.cli.usage;
+}
 function shortTime(iso) {
     return iso.replace("T", " ").replace(/\.\d+Z$|Z$/, "");
 }
@@ -38,10 +38,12 @@ export async function runSessions(argv, io, deps) {
         return runSessionsSearch(argv.slice(1), io);
     if (argv[0] === "export")
         return runSessionsExport(argv.slice(1), io);
+    if (argv[0] === "trace")
+        return runSessionsTrace(argv.slice(1), io); // [W6-T2]
     const { positionals, values, flags } = parseSubArgs(argv, ["session-dir", "older-than"], ["all", "dry-run"]);
     const action = positionals[0];
     if (flags.has("help") || action === undefined) {
-        io.stdout(SESSIONS_USAGE);
+        io.stdout(sessionsUsage());
         return flags.has("help") ? ExitCode.Ok : ExitCode.Usage;
     }
     const dirFlag = values.get("session-dir");
@@ -54,46 +56,47 @@ export async function runSessions(argv, io, deps) {
         case "list": {
             if (sessions?.list === undefined)
                 return notWired(io, "sessions list");
-            const items = await sessions.list({ sessionDir, ...scope });
+            const all = flags.has("all");
+            const items = await sessions.list({ sessionDir, ...scope, includeSubagents: all });
             if (items.length === 0) {
-                io.stdout("没有会话\n");
+                io.stdout(msg().session.cli.none);
                 return ExitCode.Ok;
             }
             for (const item of items) {
-                const name = item.name ?? oneLine(item.firstPrompt);
-                io.stdout(`${item.id.slice(0, 8)}  ${shortTime(item.modifiedAt)}  ${String(item.messageCount).padStart(4)} 条  ${name}\n`);
+                const title = item.name ?? oneLine(item.firstPrompt);
+                const name = item.subagent === true ? `${msg().session.cli.subagentTag} ${title}` : title;
+                io.stdout(msg().session.cli.listRow(item.id.slice(0, 8), shortTime(item.modifiedAt), item.messageCount, name));
             }
             return ExitCode.Ok;
         }
         case "show": {
             const id = positionals[1];
             if (id === undefined)
-                throw new UsageError("ama sessions show 需要 <id>");
+                throw new UsageError(msg().session.cli.showNeedsId);
             if (sessions?.show === undefined)
                 return notWired(io, "sessions show");
             const { item, entries } = await sessions.show(id, { sessionDir });
             const counts = new Map();
             for (const entry of entries)
                 counts.set(entry.type, (counts.get(entry.type) ?? 0) + 1);
-            io.stdout([
-                `id：${item.id}`,
-                `文件：${item.file}`,
-                `目录：${item.cwd}`,
-                ...(item.name !== undefined ? [`名称：${item.name}`] : []),
-                `创建：${shortTime(item.createdAt)} · 修改：${shortTime(item.modifiedAt)}`,
-                `消息：${item.messageCount}`,
-                `条目：${[...counts].map(([type, n]) => `${type} ${n}`).join(" · ")}`,
-                ...(item.firstPrompt !== undefined
-                    ? [`首条提示：${oneLine(item.firstPrompt, 200)}`]
-                    : []),
-            ].join("\n") + "\n");
+            io.stdout(msg().session.cli.show({
+                id: item.id,
+                file: item.file,
+                cwd: item.cwd,
+                name: item.name,
+                created: shortTime(item.createdAt),
+                modified: shortTime(item.modifiedAt),
+                messages: item.messageCount,
+                entries: [...counts].map(([type, n]) => `${type} ${n}`).join(" · "),
+                firstPrompt: item.firstPrompt !== undefined ? oneLine(item.firstPrompt, 200) : undefined,
+            }));
             const users = numberUserMessages(entries);
             if (users.length > 0) {
-                io.stdout(`用户消息（ama --from ${item.id.slice(0, 8)}#<编号> 复用）：\n`);
+                io.stdout(msg().session.cli.userMessages(item.id.slice(0, 8)));
                 for (const user of users) {
                     const tags = [
                         ...(user.origin !== undefined ? [`[${user.origin}]`] : []),
-                        ...(user.images.length > 0 ? [`[图片 ${user.images.length}]`] : []),
+                        ...(user.images.length > 0 ? [msg().session.cli.images(user.images.length)] : []),
                     ];
                     io.stdout(`  #${String(user.n).padEnd(3)} ${shortTime(user.timestamp)}  ${[...tags, oneLine(user.text, 100)].join(" ")}\n`);
                 }
@@ -104,21 +107,21 @@ export async function runSessions(argv, io, deps) {
             const raw = values.get("older-than") ?? "30";
             const olderThanDays = Number(raw);
             if (!Number.isFinite(olderThanDays) || olderThanDays < 0) {
-                throw new UsageError(`--older-than 应为非负天数（收到 ${raw}）`);
+                throw new UsageError(msg().session.cli.olderThanInvalid(raw));
             }
             if (sessions?.prune === undefined)
                 return notWired(io, "sessions prune");
             const dryRun = flags.has("dry-run");
             const { moved } = await sessions.prune({ sessionDir, olderThanDays, dryRun, ...scope });
             for (const file of moved)
-                io.stdout(`${dryRun ? "将移到 trash" : "已移到 trash"}：${file}\n`);
-            io.stdout(`${moved.length} 个会话${dryRun ? "（演练，未改动）" : ""}\n`);
+                io.stdout(msg().session.cli.moved(dryRun, file));
+            io.stdout(msg().session.cli.pruned(moved.length, dryRun));
             await pruneFileHistory(io, sessionDir, dryRun);
             await pruneClipboard(io, dryRun);
             return ExitCode.Ok;
         }
         default:
-            throw new UsageError(`未知的 sessions 子命令：${action}`);
+            throw new UsageError(msg().session.cli.unknownAction(action));
     }
 }
 /** 检查点备份 GC：扫描本次的会话目录、缺省会话目录与登记过的目录。失败只提示，不影响 prune。 */
@@ -132,10 +135,10 @@ async function pruneFileHistory(io, sessionDir, dryRun) {
         });
         if (result.removed.length === 0)
             return;
-        io.stdout(`file-history：${dryRun ? "将清除" : "已清除"} ${result.removed.length} 个未引用的备份（${formatBytes(result.removedBytes)}）\n`);
+        io.stdout(msg().session.cli.fileHistoryPruned(dryRun, result.removed.length, formatBytes(result.removedBytes)));
     }
     catch (error) {
-        io.stderr(`ama: file-history 清理跳过（${error instanceof Error ? error.message : String(error)}）\n`);
+        io.stderr(msg().session.cli.fileHistorySkipped(error instanceof Error ? error.message : String(error)));
     }
 }
 /** [W5-I] `<数据目录>/clipboard/` 超过 7 天的剪贴板图片。失败只提示。 */
@@ -143,13 +146,13 @@ async function pruneClipboard(io, dryRun) {
     try {
         const removed = await gcClipboardImages(resolveDataDir({ env: io.env }), { dryRun });
         if (removed.length > 0)
-            io.stdout(`clipboard：${dryRun ? "将清除" : "已清除"} ${removed.length} 个超过 7 天的剪贴板图片\n`);
+            io.stdout(msg().session.cli.clipboardPruned(dryRun, removed.length));
     }
     catch (error) {
-        io.stderr(`ama: clipboard 清理跳过（${error instanceof Error ? error.message : String(error)}）\n`);
+        io.stderr(msg().session.cli.clipboardSkipped(error instanceof Error ? error.message : String(error)));
     }
 }
 function notWired(io, what) {
-    io.stderr(`ama: ${what} 尚未装配（会话存储由集成批次注入）\n`);
+    io.stderr(msg().session.cli.notWired(what));
     return ExitCode.RuntimeError;
 }

package/dist/cli/subcommands/stats.d.ts

@@ -9,7 +9,7 @@
  */
 import { type StatsReport } from "../../session/stats-aggregate.js";
 import type { CliIo } from "../deps.js";
-export declare const STATS_USAGE = "\u7528\u6CD5\uFF1Aama stats [--since 7d|30d|today|YYYY-MM-DD] [--until \u2026]\n                 [--by day|week|month|provider|channel|model|project]\n                 [--project <\u76EE\u5F55> | --all] [--top N] [--json] [--no-cache] [--session-dir <\u76EE\u5F55>]\n";
+export declare function statsUsage(): string;
 /** `7d` / `today` / `YYYY-MM-DD` → 本地日期。 */
 export declare function parseDaySpec(option: string, raw: string, now?: Date): string;
 export declare function formatTokens(count: number): string;

package/dist/cli/subcommands/stats.js

@@ -15,10 +15,10 @@ import { STATS_INDEX_FILE, collectSummaries } from "../../session/stats-index.js
 import { localDay } from "../../session/stats-scan.js";
 import { parseSubArgs, UsageError } from "../args.js";
 import { ExitCode } from "../exit-codes.js";
-export const STATS_USAGE = `用法：ama stats [--since 7d|30d|today|YYYY-MM-DD] [--until …]
-                 [--by day|week|month|provider|channel|model|project]
-                 [--project <目录> | --all] [--top N] [--json] [--no-cache] [--session-dir <目录>]
-`;
+import { msg } from "../../i18n/index.js";
+export function statsUsage() {
+    return msg().subcommands.stats.usage;
+}
 /** `7d` / `today` / `YYYY-MM-DD` → 本地日期。 */
 export function parseDaySpec(option, raw, now = new Date()) {
     if (raw === "today")
@@ -27,14 +27,14 @@ export function parseDaySpec(option, raw, now = new Date()) {
     if (rel !== null) {
         const days = Number(rel[1]);
         if (days < 1)
-            throw new UsageError(`--${option} 的天数至少为 1（收到 ${raw}）`);
+            throw new UsageError(msg().subcommands.stats.daysAtLeastOne(option, raw));
         const d = new Date(now);
         d.setDate(d.getDate() - (days - 1));
         return localDay(d.toISOString()) ?? "";
     }
     if (/^\d{4}-\d{2}-\d{2}$/.test(raw) && Number.isFinite(Date.parse(`${raw}T00:00:00`)))
         return raw;
-    throw new UsageError(`--${option} 应为 7d、today 或 YYYY-MM-DD（收到 ${raw}）`);
+    throw new UsageError(msg().subcommands.stats.daySpec(option, raw));
 }
 export function formatTokens(count) {
     const trim = (text) => text.replace(/\.?0+$/, "");
@@ -79,40 +79,58 @@ function table(rows, rightAlign) {
 }
 export function renderStats(report, scope) {
     const t = report.totals;
+    const m = msg().subcommands.stats;
     const range = report.since === undefined && report.until === undefined
-        ? "全部时间"
-        : `${report.since ?? "最早"} – ${report.until ?? "今天"}`;
-    const lines = [`${range} · ${scope} · ${report.sessions} 个会话`];
+        ? m.allTime
+        : m.range(report.since, report.until);
+    const lines = [m.header(range, scope, report.sessions)];
     if (t.requests === 0) {
-        lines.push("没有模型请求");
+        lines.push(m.noRequests);
         return lines.join("\n") + "\n";
     }
     const kinds = Object.entries(report.byKind)
         .sort((a, b) => b[1] - a[1])
-        .map(([kind, n]) => `${kind === "turn" ? "对话" : kind} ${n}`)
+        .map(([kind, n]) => `${kind === "turn" ? m.kindTurn : kind} ${n}`)
         .join(" · ");
     const costLine = t.cost === undefined
-        ? "— （所有请求的模型都无价格，见 token）"
+        ? t.unpriced > 0
+            ? m.costUnpriced
+            : "—"
         : t.unpriced > 0
-            ? `${usd(t)}（另有 ${t.unpriced} 次请求无价，未计入）`
+            ? m.costPartial(usd(t), t.unpriced)
             : usd(t);
     const rows = [
-        ["请求", `${t.requests}（${kinds}）`],
-        ["回合", `${t.turns} · 平均耗时 ${seconds(t.avgTurnMs)}`],
+        [m.rows.requests, m.requestsValue(t.requests, kinds)],
+        [m.rows.turns, m.turnsValue(t.turns, seconds(t.avgTurnMs))],
         [
-            "Token",
-            `输入 ${formatTokens(t.input)} · 输出 ${formatTokens(t.output)} · 缓存读 ${formatTokens(t.cacheRead)} · 缓存写 ${formatTokens(t.cacheWrite)}`,
+            m.rows.tokens,
+            m.tokensValue(formatTokens(t.input), formatTokens(t.output), formatTokens(t.cacheRead), formatTokens(t.cacheWrite)),
         ],
         [
-            "缓存命中率",
-            `${percent(t.hitRate)}（报告缓存的端点 ${report.endpoints.reported}/${report.endpoints.total}，其余不进分母）`,
+            m.rows.hitRate,
+            m.hitRateValue(percent(t.hitRate), report.endpoints.reported, report.endpoints.total),
         ],
-        ["费用", costLine],
-        ["错误 / 重试", `${t.errors} / ${t.retries}`],
+        [m.rows.cost, costLine],
+        ...(t.subscription !== undefined
+            ? [[m.rows.subscription, m.subscriptionValue(t.subscription)]]
+            : []),
+        [m.rows.errors, `${t.errors} / ${t.retries}`],
     ];
     lines.push(table(rows, () => false));
     if (report.groups !== undefined && report.groups.length > 0) {
-        const head = ["", "会话", "请求", "回合", "输入", "输出", "缓存读", "缓存写", "命中率", "费用"];
+        const gh = m.groupHead;
+        const head = [
+            "",
+            gh.sessions,
+            gh.requests,
+            gh.turns,
+            gh.input,
+            gh.output,
+            gh.cacheRead,
+            gh.cacheWrite,
+            gh.hitRate,
+            gh.cost,
+        ];
         const body = report.groups.map((g) => [
             g.key,
             String(g.sessions),
@@ -128,7 +146,7 @@ export function renderStats(report, scope) {
         lines.push("", table([head, ...body], (i) => i > 0));
     }
     if (report.tools.length > 0) {
-        lines.push("", `工具调用 Top ${report.tools.length}`);
+        lines.push("", m.topTools(report.tools.length));
         lines.push(table(report.tools.map((tool) => [`  ${tool.name}`, String(tool.count)]), (i) => i > 0));
     }
     return lines.join("\n") + "\n";
@@ -136,24 +154,24 @@ export function renderStats(report, scope) {
 export async function runStats(argv, io) {
     const { positionals, values, flags } = parseSubArgs(argv, ["since", "until", "by", "project", "session-dir", "top"], ["all", "json", "no-cache"]);
     if (flags.has("help")) {
-        io.stdout(STATS_USAGE);
+        io.stdout(statsUsage());
         return ExitCode.Ok;
     }
     if (positionals.length > 0)
-        throw new UsageError(`ama stats 不接受位置参数：${positionals[0]}`);
+        throw new UsageError(msg().subcommands.stats.noPositionals(positionals[0] ?? ""));
     const now = new Date();
     const since = values.has("since") ? parseDaySpec("since", values.get("since"), now) : undefined;
     const until = values.has("until") ? parseDaySpec("until", values.get("until"), now) : undefined;
     const byRaw = values.get("by");
     if (byRaw !== undefined && !STATS_GROUPS.includes(byRaw)) {
-        throw new UsageError(`--by 的取值应为 ${STATS_GROUPS.join(" | ")}（收到 ${byRaw}）`);
+        throw new UsageError(msg().subcommands.common.invalidChoice("--by", STATS_GROUPS, byRaw));
     }
     const by = byRaw;
     const top = Number(values.get("top") ?? "10");
     if (!Number.isInteger(top) || top < 0)
-        throw new UsageError("--top 应为非负整数");
+        throw new UsageError(msg().subcommands.stats.topNonNegative);
     if (flags.has("all") && values.has("project")) {
-        throw new UsageError("--project 与 --all 不能同时使用");
+        throw new UsageError(msg().cli.args.flagConflict("--project", "--all"));
     }
     const dataDir = resolveDataDir({ env: io.env });
     const dirFlag = values.get("session-dir");
@@ -191,8 +209,9 @@ export async function runStats(argv, io) {
         }, null, 2) + "\n");
         return ExitCode.Ok;
     }
-    io.stdout(renderStats(report, project === undefined ? "全部项目" : `项目 ${project}`));
+    const m = msg().subcommands.stats;
+    io.stdout(renderStats(report, project === undefined ? m.allProjects : m.project(project)));
     if (collected.invalid > 0)
-        io.stderr(`ama: 跳过 ${collected.invalid} 个无法读取的会话文件\n`);
+        io.stderr(m.skippedInvalid(collected.invalid));
     return ExitCode.Ok;
 }

package/dist/cli/system-prompt-arg.js

@@ -11,6 +11,7 @@ import { readFileSync, statSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import { StartupError } from "../errors.js";
 import { ExitCode } from "./exit-codes.js";
+import { msg } from "../i18n/index.js";
 export function resolveSystemPromptArg(value, mode, cwd) {
     if (value === undefined)
         return undefined;
@@ -24,11 +25,11 @@ export function resolveSystemPromptArg(value, mode, cwd) {
             text = readFileSync(path, "utf8");
         }
         catch {
-            throw new StartupError("config_invalid", `--system-prompt 文件不存在：${path}`, ExitCode.Config);
+            throw new StartupError("config_invalid", msg().cli.systemPrompt.fileMissing(path), ExitCode.Config);
         }
     }
     text = text.trim();
     if (text === "")
-        throw new StartupError("config_invalid", "--system-prompt 的内容为空", ExitCode.Config);
+        throw new StartupError("config_invalid", msg().cli.systemPrompt.empty, ExitCode.Config);
     return { text, mode: mode ?? "append" };
 }

package/dist/codemode/capability.js

@@ -13,6 +13,7 @@
  * `detectSandboxCapability()`（不经宿主 status）；组装根先用 `configureOsSandbox` 记下 `sandbox.enabled`。
  */
 import { NO_OS_SANDBOX, osSandboxStatus } from "../sandbox/detect.js";
+import { msg } from "../i18n/index.js";
 export const NETWORK_NOT_ISOLATED = "network not isolated";
 export function parseNodeMajor(version) {
     const major = Number.parseInt(version.replace(/^v/, "").split(".")[0] ?? "", 10);
@@ -72,12 +73,12 @@ export function codemodeAvailability(requireStrict, capability = detectSandboxCa
         return {
             available: false,
             capability,
-            warning: `codemode 已禁用：Node ${capability.nodeMajor} 的权限模型不隔离网络，也没有可用的操作系统沙箱（${capability.os.detail}；codemode.requireStrict 为 true；Node ≥ 25 或 macOS sandbox-exec / Linux bwrap 可隔离）`,
+            warning: msg().session.codemode.disabled(capability.nodeMajor, capability.os.detail),
         };
     }
     return {
         available: true,
         capability,
-        warning: `codemode：Node ${capability.nodeMajor} 下网络未隔离（没有可用的操作系统沙箱：${capability.os.detail}；要求隔离可设 codemode.requireStrict）`,
+        warning: msg().session.codemode.unisolated(capability.nodeMajor, capability.os.detail),
     };
 }

package/dist/compaction/post-compact.d.ts

@@ -6,6 +6,7 @@
  * - 当前计划（最近一条未被拒绝 / 取代的 `ama.plan`：编号、状态、文件路径与步骤标题）；
  * - 已加载的 Skill（用 `read` 读过的索引路径，或 `skill` 工具的调用）；
  * - 最近修改 / 读取的文件路径（按最近使用排序，各至多 20 个）；
+ * - [W6-M] 本会话读写过的记忆路径（`memory` 工具的 `/memories/…` 逻辑路径，只给路径不给正文）；
  * - 完整转录与 `outputs/` 路径（模型需要细节时自己 `read`）；
  * - 续接说明。
  *

package/dist/compaction/post-compact.js

@@ -6,6 +6,7 @@
  * - 当前计划（最近一条未被拒绝 / 取代的 `ama.plan`：编号、状态、文件路径与步骤标题）；
  * - 已加载的 Skill（用 `read` 读过的索引路径，或 `skill` 工具的调用）；
  * - 最近修改 / 读取的文件路径（按最近使用排序，各至多 20 个）；
+ * - [W6-M] 本会话读写过的记忆路径（`memory` 工具的 `/memories/…` 逻辑路径，只给路径不给正文）；
  * - 完整转录与 `outputs/` 路径（模型需要细节时自己 `read`）；
  * - 续接说明。
  *
@@ -78,6 +79,7 @@ function fileActivity(input) {
     const read = new Map();
     const modified = new Map();
     const skills = new Map();
+    const memory = new Map();
     let order = 0;
     for (const entry of input.branch) {
         if (entry.type !== "message" || entry.message.role !== "assistant")
@@ -95,6 +97,11 @@ function fileActivity(input) {
             const path = block.arguments["path"];
             if (typeof path !== "string" || path === "")
                 continue;
+            if (block.name === "memory") {
+                if (path.startsWith("/memories/"))
+                    memory.set(clip(path), order);
+                continue;
+            }
             const abs = resolve(input.cwd, path);
             if (WRITE_TOOLS.has(block.name))
                 modified.set(path, order);
@@ -109,7 +116,12 @@ function fileActivity(input) {
     for (const path of modified.keys())
         read.delete(path);
     const recent = (map) => [...map.entries()].sort((a, b) => b[1] - a[1]).map(([key]) => key);
-    return { read: recent(read), modified: recent(modified), skills: recent(skills) };
+    return {
+        read: recent(read),
+        modified: recent(modified),
+        skills: recent(skills),
+        memory: recent(memory),
+    };
 }
 function capped(paths) {
     const shown = paths.slice(0, MAX_RECENT_FILES);
@@ -143,6 +155,8 @@ export function buildPostCompactContent(input) {
         parts.push(`<recently-modified-files>\n${capped(files.modified)}\n</recently-modified-files>`);
     if (files.read.length > 0)
         parts.push(`<recently-read-files>\n${capped(files.read)}\n</recently-read-files>`);
+    if (files.memory.length > 0)
+        parts.push(`<memory-files>\n${capped(files.memory)}\n</memory-files>`);
     if (input.transcriptPath !== undefined)
         parts.push(`<transcript>${input.transcriptPath}</transcript> (full history before compaction, JSONL; read it only if the summary lacks a detail you need)`);
     if (input.outputDir !== undefined)

package/dist/compaction/prune-tier.d.ts

@@ -9,7 +9,7 @@
  * 打断一次缓存。缓存已冷时（C3，调用方判断）`need` 为 undefined：全部候选一次换掉。
  * 保护集（C4）：调用方给 `isProtected`（Skill 文件、AGENTS.md、todo、`keepInContext` 工具、
  * `compaction.pruneExclude`），见 `protect.ts`。
- * 动作：返回 `context_edit{reason:"prune", replacement:"[已裁剪 …全文 path]"}` 计划；有 outputDir 时
+ * 动作：返回 `context_edit{reason:"prune", replacement:"[pruned: … full text at path]"}` 计划（[W6-C0] 固定英文）；有 outputDir 时
  * 把全文写到 `<outputDir>/<toolCallId>.txt`（已存在则不覆盖），模型可用 read 取回。
  */
 import type { ContentBlock } from "../ai/types.js";

package/dist/compaction/prune-tier.js

@@ -9,7 +9,7 @@
  * 打断一次缓存。缓存已冷时（C3，调用方判断）`need` 为 undefined：全部候选一次换掉。
  * 保护集（C4）：调用方给 `isProtected`（Skill 文件、AGENTS.md、todo、`keepInContext` 工具、
  * `compaction.pruneExclude`），见 `protect.ts`。
- * 动作：返回 `context_edit{reason:"prune", replacement:"[已裁剪 …全文 path]"}` 计划；有 outputDir 时
+ * 动作：返回 `context_edit{reason:"prune", replacement:"[pruned: … full text at path]"}` 计划（[W6-C0] 固定英文）；有 outputDir 时
  * 把全文写到 `<outputDir>/<toolCallId>.txt`（已存在则不覆盖），模型可用 read 取回。
  */
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
@@ -114,8 +114,8 @@ function materialize(candidate, outputDir) {
         }
     }
     const replacement = fullTextPath === undefined
-        ? `[已裁剪：${message.toolName} 的结果原有 ${bytes} 字节，全文不可用]`
-        : `[已裁剪：${message.toolName} 的结果原有 ${bytes} 字节，全文 ${fullTextPath}]`;
+        ? `[pruned: ${message.toolName} result was ${bytes} bytes; full text unavailable]`
+        : `[pruned: ${message.toolName} result was ${bytes} bytes; full text at ${fullTextPath}]`;
     const planned = {
         targetId: entry.id,
         replacement,

package/dist/compaction/serialize.js

@@ -9,7 +9,8 @@ export const TOOL_RESULT_SERIALIZE_LIMIT = 2000;
 function truncate(text, limit) {
     if (text.length <= limit)
         return text;
-    return `${text.slice(0, limit)}… [截断，原 ${text.length} 字符]`;
+    // [W6-C0] 送摘要模型的文本，固定英文
+    return `${text.slice(0, limit)}… [truncated; ${text.length} chars originally]`;
 }
 function formatArgs(args) {
     return Object.entries(args)

package/dist/config/auth-file.d.ts

@@ -7,6 +7,7 @@
  *   也不把 key 写进任何日志或返回给展示层（`describeAuthFile` 只给来源与形态）。
  */
 import type { AuthFile } from "./types.js";
+import { type ChatGptFlavor } from "./types-w6.js";
 export declare function defaultAuthFilePath(configDir: string): string;
 export declare const PROVIDER_ID_PATTERN: RegExp;
 export interface ReadAuthResult {
@@ -32,8 +33,17 @@ export type AuthValueKind = "literal" | "command" | "env-ref";
 export declare function classifyKeyValue(value: string): AuthValueKind;
 export interface AuthEntrySummary {
     provider: string;
-    kind: AuthValueKind;
+    /** `oauth`：OAuth 条目（只给 flavor / plan / expiresIn / needsLogin，从不给 token、邮箱、账户 id）。 */
+    kind: AuthValueKind | "oauth";
     hasBaseUrl: boolean;
     envNames: string[];
+    /** [W6-O] OAuth 条目：登录路径。 */
+    flavor?: ChatGptFlavor;
+    /** [W6-O] OAuth 条目：计划类型（plus / pro …）。 */
+    plan?: string;
+    /** [W6-O] OAuth 条目：access token 剩余毫秒（已过期为负；刷新会自动续）。 */
+    expiresIn?: number;
+    /** [W6-O] OAuth 条目：刷新永久失败，需要重新登录。 */
+    needsLogin?: boolean;
 }
-export declare function describeAuthFile(file: AuthFile): AuthEntrySummary[];
+export declare function describeAuthFile(file: AuthFile, now?: number): AuthEntrySummary[];

package/dist/config/auth-file.js

@@ -10,7 +10,9 @@ import { chmodSync, mkdirSync, renameSync, statSync, writeFileSync } from "node:
 import { dirname, join } from "node:path";
 import { loadConfigFile } from "./load.js";
 import { AUTH_FILE } from "./paths.js";
-import { CONFIG_FILE_VERSION } from "./types.js";
+import { CONFIG_FILE_VERSION, apiKeyEntry } from "./types.js";
+import { isOAuthEntry } from "./types-w6.js";
+import { msg } from "../i18n/index.js";
 export function defaultAuthFilePath(configDir) {
     return join(configDir, AUTH_FILE);
 }
@@ -41,7 +43,7 @@ export function readAuthFile(path) {
     const warnings = [...loaded.warnings];
     const mode = fileMode(path);
     if (isModeTooOpen(mode)) {
-        warnings.push(`${path}: 权限为 ${mode?.toString(8).padStart(4, "0")}，应为 0600（chmod 600 ${path}）`);
+        warnings.push(msg().config.authFile.modeTooOpen(path, mode?.toString(8).padStart(4, "0") ?? ""));
     }
     const result = { path, exists: true, file: loaded.value, warnings };
     if (mode !== undefined && process.platform !== "win32")
@@ -59,7 +61,8 @@ export function writeAuthFile(path, file) {
 /** `ama auth set`：设置 / 替换一家的 key（保留该条目的 env / baseUrl）。 */
 export function setAuthKey(path, provider, apiKey) {
     const { file } = readAuthFile(path);
-    const previous = file.providers[provider];
+    // [W6-C0] 覆盖 OAuth 条目时不带走它的字段
+    const previous = apiKeyEntry(file.providers[provider]);
     file.providers[provider] = { ...previous, apiKey };
     writeAuthFile(path, { version: CONFIG_FILE_VERSION, providers: file.providers });
 }
@@ -80,13 +83,32 @@ export function classifyKeyValue(value) {
         return "env-ref";
     return "literal";
 }
-export function describeAuthFile(file) {
+export function describeAuthFile(file, now = Date.now()) {
     return Object.entries(file.providers)
-        .map(([provider, entry]) => ({
-        provider,
-        kind: classifyKeyValue(entry.apiKey),
-        hasBaseUrl: entry.baseUrl !== undefined,
-        envNames: Object.keys(entry.env ?? {}).sort(),
-    }))
+        .map(([provider, raw]) => {
+        if (isOAuthEntry(raw)) {
+            const summary = {
+                provider,
+                kind: "oauth",
+                hasBaseUrl: false,
+                envNames: [],
+                flavor: raw.flavor,
+                expiresIn: raw.expiresAt - now,
+                needsLogin: raw.needsLogin === true,
+            };
+            if (raw.planType !== undefined)
+                summary.plan = raw.planType;
+            return summary;
+        }
+        const entry = apiKeyEntry(raw);
+        if (entry === undefined)
+            return { provider, kind: "oauth", hasBaseUrl: false, envNames: [] };
+        return {
+            provider,
+            kind: classifyKeyValue(entry.apiKey),
+            hasBaseUrl: entry.baseUrl !== undefined,
+            envNames: Object.keys(entry.env ?? {}).sort(),
+        };
+    })
         .sort((a, b) => a.provider.localeCompare(b.provider));
 }