@armadra/agent 0.5.1 → 0.6.1

package/dist/cli/compose-providers.js

@@ -9,9 +9,17 @@
  * - SDK 追加的供应商（`ProviderData[]`）折成 `config.providers` 条目，走同一条合并路径。
  * - 零配置（设计 §10.0）：没有 `defaultModel`、也没有任何需要 key 的供应商配了 key 时，探测本地
  *   ollama / lmstudio（短超时），把枚举到的模型加进注册表，供 `pickDefaultModel` 选用。
+ * - [W6-O] ChatGPT 登录（docs/wave6-plan.md D14）：`chatgpt` 的缺省渠道按 auth.json 条目的 flavor 定（用户写了
+ *   `defaultChannel` 时不动）；`AMA_CHATGPT_BASE_URL` 改该渠道地址；`auth.chatgpt.originator` 改 codex 渠道的
+ *   `originator` 头；OAuth 刷新拿到 `auth.chatgpt` 配置与同一份 env。
+ * - 发现缓存（`<dataDir>/models/discovered/<provider>.json`）并入模型表为空的供应商（discovered-cache.ts）。
  */
 import { loadModelsDevIndex } from "../ai/providers/models-dev-cache.js";
 import { ProviderRegistry, discoverLocalModels } from "../ai/providers/registry.js";
+import { mergeDiscoveredModels } from "../ai/providers/discovered-cache.js";
+import { lazyIndex } from "../ai/providers/enrich.js";
+import { readOAuthEntry } from "../auth/oauth/token-store.js";
+import { CHATGPT_BASE_URLS, CHATGPT_PROVIDER_ID } from "../auth/chatgpt/presets.js";
 export const LOCAL_PROBE_TIMEOUT_MS = 300;
 export const NO_LOCAL_PROBE_ENV = "AMA_NO_LOCAL_PROBE";
 /** 模型协议与供应商不同时保留模型级 `api`（同一中转下的模型可走不同协议）。 */
@@ -44,8 +52,33 @@ export function withExtraProviders(config, providers) {
         merged[provider.id] = providerConfigOf(provider);
     return { ...config, providers: merged };
 }
+/** [W6-O] 按 auth.json 的 ChatGPT 条目与 `AMA_CHATGPT_BASE_URL` / `auth.chatgpt.originator` 补 chatgpt 的渠道配置。 */
+export function withChatGptChannels(config, authFile, env) {
+    const entry = readOAuthEntry(authFile, CHATGPT_PROVIDER_ID);
+    const baseUrl = env["AMA_CHATGPT_BASE_URL"]?.trim();
+    const originator = config.auth?.chatgpt?.originator?.trim();
+    if (entry === undefined && !baseUrl && !originator)
+        return config;
+    const current = { ...(config.providers?.[CHATGPT_PROVIDER_ID] ?? {}) };
+    if (current.defaultChannel === undefined && entry !== undefined)
+        current.defaultChannel = entry.flavor;
+    const channels = { ...(current.channels ?? {}) };
+    const channel = (name) => (channels[name] ??= { api: "openai-responses", baseUrl: CHATGPT_BASE_URLS[name] });
+    if (baseUrl) {
+        const name = current.defaultChannel === "codex" ? "codex" : "siwc";
+        channels[name] = { ...channel(name), baseUrl };
+    }
+    if (originator) {
+        const codex = channel("codex");
+        channels.codex = { ...codex, headers: { ...codex.headers, originator } };
+    }
+    if (Object.keys(channels).length > 0)
+        current.channels = channels;
+    return { ...config, providers: { ...(config.providers ?? {}), [CHATGPT_PROVIDER_ID]: current } };
+}
 export async function buildProviderRegistry(input, options = {}) {
-    const config = withExtraProviders(input.config, options.providers);
+    const env = options.env ?? process.env;
+    const config = withChatGptChannels(withExtraProviders(input.config, options.providers), input.authFile, input.authEnv ? env : {});
     const dataDir = input.dataDir;
     const make = (cliApiKey) => new ProviderRegistry({
         config,
@@ -57,6 +90,7 @@ export async function buildProviderRegistry(input, options = {}) {
             userAuthFile: null,
             useEnv: input.authEnv,
             env: options.env,
+            oauth: { env: input.authEnv ? env : {}, config: config.auth?.chatgpt },
         },
         onWarning: options.warn,
         ...(dataDir !== undefined ? { modelsDev: () => loadModelsDevIndex(dataDir) } : {}),
@@ -73,7 +107,9 @@ export async function buildProviderRegistry(input, options = {}) {
         if (provider !== undefined)
             registry = make({ provider, apiKey: cli.apiKey });
     }
-    const env = options.env ?? process.env;
+    // 发现缓存（`ama auth login chatgpt` / `ama models discover chatgpt`）并入模型表为空的供应商
+    if (dataDir !== undefined)
+        mergeDiscoveredModels(registry, dataDir, lazyIndex(() => loadModelsDevIndex(dataDir)));
     const probe = options.probeLocal ?? env[NO_LOCAL_PROBE_ENV] !== "1";
     if (probe && config.defaultModel === undefined && !anyKeyConfigured(registry)) {
         await probeLocalProviders(registry, options.probeTimeoutMs ?? LOCAL_PROBE_TIMEOUT_MS);

package/dist/cli/compose-session.d.ts

@@ -23,6 +23,7 @@ import { type AmaConfig } from "../config/types.js";
 import type { AgentEventBus } from "../host/api-impl.js";
 import type { Skill } from "../skills/discover.js";
 import { type PromptTemplate } from "../skills/templates.js";
+import type { MemoryRuntime } from "../memory/runtime.js";
 import type { SessionAssembly } from "./deps.js";
 import type { Runtime } from "./runtime.js";
 /** createRuntimeDeps 闭包里跨步骤共享的状态。 */
@@ -38,6 +39,8 @@ export interface ComposeState {
     providers?: ProviderRegistryApi;
     /** [S2] tools.create 算出的 bash 沙箱设定，permissions.create 用同一份。 */
     bashSandbox?: BashSandbox;
+    /** [W6-M] tools.create 收到的记忆运行期（未开启为 undefined）。 */
+    memory?: MemoryRuntime | undefined;
 }
 export declare function emptyComposeState(): ComposeState;
 export type LogFn = (level: "debug" | "info" | "warn" | "error", message: string) => void;
@@ -48,6 +51,8 @@ export interface SessionComposeOptions {
 }
 /** `AMA_LOG=debug|info|warn|error`（缺省 warn）过滤后写 stderr。 */
 export declare function stderrLog(env?: NodeJS.ProcessEnv): LogFn;
+/** [W6-S] D22：回复语言规则（发给模型，固定英文）。 */
+export declare function replyLanguageRule(language: string): string;
 /** config `cache` 段 + 环境变量 → 会话缓存设置；非法的环境变量值忽略并 warning。 */
 export declare function cacheSettingsFrom(config: Pick<AmaConfig, "cache">, env?: NodeJS.ProcessEnv, warn?: (message: string) => void): Partial<CacheSettings>;
 /**

package/dist/cli/compose-session.js

@@ -34,7 +34,9 @@ import { expandPromptCommand } from "../skills/templates.js";
 import { PresetToolRegistry } from "../tools/presets.js";
 import { openSession } from "./compose-store.js";
 import { composeExtensions } from "./compose-extensions.js";
+import { attachMemory, withMemorySection } from "./compose-memory.js";
 import { ExitCode } from "./exit-codes.js";
+import { msg } from "../i18n/index.js";
 export function emptyComposeState() {
     return { skills: [], templates: [], warnings: [], session: undefined };
 }
@@ -66,7 +68,7 @@ function sourceText(source, cache, log) {
         text = readFileSync(source.path, "utf8");
     }
     catch (error) {
-        log("warn", `读取指令文件失败：${source.path}：${error.message}`);
+        log("warn", msg().cli.composeSession.instructionsReadFailed(source.path, error.message));
     }
     cache.set(source.path, text);
     return text;
@@ -85,6 +87,10 @@ function contextFiles(record) {
     }));
     return [...resources.contextFiles, ...extra.filter((f) => f.content.trim() !== "")];
 }
+/** [W6-S] D22：回复语言规则（发给模型，固定英文）。 */
+export function replyLanguageRule(language) {
+    return `Reply to the user in ${language}.`;
+}
 function systemInput(record, active) {
     const system = { contextFiles: contextFiles(record) };
     const override = record.assembly.overrides?.systemPrompt;
@@ -92,6 +98,10 @@ function systemInput(record, active) {
         system.preamble = override.text;
     else if (override !== undefined)
         system.extraRules = [override.text];
+    // [W6-S] D22 ui.replyLanguage：会话开始在 rules 节末尾追加一句英文规则；不设时零字节变化
+    const reply = record.assembly.config.ui?.replyLanguage?.trim();
+    if (reply)
+        system.extraRules = [...(system.extraRules ?? []), replyLanguageRule(reply)];
     const index = formatSkillIndex(record.state.skills, {
         hasSkillTool: false,
         hasReadTool: active.includes("read"),
@@ -122,8 +132,7 @@ async function expandPrompt(record, session, text) {
     refreshSystem(record, session);
     const skill = await expandSkillCommand(text, record.state.skills);
     if (skill?.kind === "unknown") {
-        const hint = skill.available.length > 0 ? `（可用：${skill.available.join(", ")}）` : "";
-        throw new AmaError("skill_not_found", `未知 Skill：${skill.name}${hint}`);
+        throw new AmaError("skill_not_found", msg().cli.composeSession.unknownSkill(skill.name, skill.available));
     }
     if (skill?.kind === "expanded")
         return { text: skill.text };
@@ -142,7 +151,7 @@ export function cacheSettingsFrom(config, env = process.env, warn = () => undefi
         if (WARMING_MODES.includes(warming))
             settings.warming = warming;
         else
-            warn(`AMA_CACHE_WARMING=${warming} 无效（off | streaming | idle），已忽略`);
+            warn(msg().cli.composeSession.invalidCacheWarming(warming));
     }
     const retention = env["AMA_CACHE_RETENTION"];
     if (retention !== undefined && retention !== "") {
@@ -150,7 +159,7 @@ export function cacheSettingsFrom(config, env = process.env, warn = () => undefi
         if (CACHE_RETENTIONS.includes(value))
             settings.retention = value;
         else
-            warn(`AMA_CACHE_RETENTION=${retention} 无效（none | short | long），已忽略`);
+            warn(msg().cli.composeSession.invalidCacheRetention(retention));
     }
     return settings;
 }
@@ -164,7 +173,7 @@ export function idleTimeoutFrom(config, env = process.env, warn = () => undefine
         const value = Number(raw);
         if (Number.isFinite(value) && value >= 0)
             return value;
-        warn(`AMA_IDLE_TIMEOUT_MS=${raw} 无效（应为不小于 0 的毫秒数），已忽略`);
+        warn(msg().cli.composeSession.invalidIdleTimeout(raw));
     }
     return config.request?.idleTimeoutMs;
 }
@@ -229,6 +238,11 @@ export function bridgeEvent(event, bus) {
             void bus.emit("context_pressure", pressure);
             return;
         }
+        case "quota_update": {
+            const { type: _type, ...quota } = event;
+            void bus.emit("quota_update", quota);
+            return;
+        }
         // [W5-C0] 子 Agent 与计划事件
         case "subagent_start": {
             const { type: _type, ...payload } = event;
@@ -276,7 +290,7 @@ function buildSession(record, manager, model, thinkingLevel) {
         unattended: assembly.unattended,
         approvalTimeoutMs: approvalTimeout(record.options),
         hooks: assembly.hooks,
-        system: systemInput(record, active),
+        system: withMemorySection(systemInput(record, active), record.state.memory, manager),
         compaction: { ...config.compaction },
         retry: { ...config.retry },
         expandPrompt: (text) => expandPrompt(record, session, text),
@@ -320,6 +334,7 @@ function buildSession(record, manager, model, thinkingLevel) {
         sessionsRoot: assembly.paths.sessionDir,
     });
     session = new AgentSessionImpl(options);
+    attachMemory(session, record.state.memory);
     session.subscribe((event) => bridgeEvent(event, assembly.events));
     records.set(session, record);
     record.state.session = session;
@@ -329,12 +344,11 @@ function buildSession(record, manager, model, thinkingLevel) {
 export function composeSession(assembly, state = emptyComposeState(), options = {}) {
     const manager = assembly.sessionManager;
     if (!(manager instanceof SessionManager)) {
-        throw new AmaError("invalid_arguments", "组装根只接受 SessionManager 实例（由 sessions.open 创建）");
+        throw new AmaError("invalid_arguments", msg().cli.composeSession.notSessionManager);
     }
     const { model } = assembly;
     if (assembly.providers.getApi(model.api) === undefined) {
-        const via = model.api === "google-generative-ai" ? "；过渡期请经 openrouter 调用" : "";
-        throw new StartupError("provider_not_found", `模型 ${model.provider}/${model.id} 的协议 ${model.api} 尚未实现${via}`, ExitCode.NoModel);
+        throw new StartupError("provider_not_found", msg().cli.composeSession.apiNotImplemented(`${model.provider}/${model.id}`, model.api, model.api === "google-generative-ai"), ExitCode.NoModel);
     }
     for (const warning of state.warnings.splice(0))
         assembly.warn(warning);
@@ -366,7 +380,7 @@ export function composeSession(assembly, state = emptyComposeState(), options =
                 record.current.addTool(tool, active);
             }
             catch (error) {
-                record.log("warn", `追加工具 ${tool.name} 失败：${error.message}`);
+                record.log("warn", msg().cli.composeSession.appendToolFailed(tool.name, error.message));
             }
         });
     }
@@ -390,10 +404,10 @@ export function currentSession(target) {
 export async function switchSession(target, request) {
     const record = recordOf(target);
     if (record === undefined)
-        throw new AmaError("not_implemented", "该会话不是由组装根创建的，不能切换");
+        throw new AmaError("not_implemented", msg().cli.composeSession.notComposed);
     const old = record.current;
     if (old.state.isStreaming)
-        throw new AmaError("busy", "运行中不能切换会话");
+        throw new AmaError("busy", msg().cli.composeSession.switchWhileStreaming);
     const { assembly } = record;
     const sessionDir = assembly.paths.sessionDir;
     let manager;

package/dist/cli/compose-store.d.ts

@@ -17,8 +17,10 @@ export declare function openSession(request: SessionRequest, context: {
     sessionDir: string;
     cwd: string;
 }): SessionManager;
+/** 列会话（最新在前）；子 Agent 会话缺省跳过，`includeSubagents` 时保留（带 `subagent` 标记）。 */
 export declare function listSessions(context: {
     sessionDir: string;
     cwd?: string;
+    includeSubagents?: boolean;
 }): SessionListItem[];
 export declare function createSessionStore(): RuntimeDeps["sessions"];

package/dist/cli/compose-store.js

@@ -14,6 +14,7 @@ import { AmaError } from "../errors.js";
 import { SessionManager } from "../session/manager.js";
 import { migrateSessionLines } from "../session/migrate.js";
 import { TRASH_DIR_NAME, listSessionFiles, purgeTrash, readSessionLines, sessionDirForCwd, sessionIdFromFileName, trashSession, } from "../session/store.js";
+import { msg } from "../i18n/index.js";
 /** 根目录下全部 cwd 子目录（不含 trash）。 */
 function cwdDirs(root) {
     if (!existsSync(root))
@@ -49,7 +50,7 @@ export function findSessionFile(root, id, cwd) {
     }
     if (prefix.length > 1) {
         const ids = prefix.map((f) => sessionIdFromFileName(f) ?? f).slice(0, 10);
-        throw new AmaError("invalid_arguments", `会话 id 前缀 ${id} 不唯一，候选：${ids.join(", ")}`, {
+        throw new AmaError("invalid_arguments", msg().cli.composeStore.ambiguousId(id, ids), {
             exitCode: 5,
         });
     }
@@ -58,7 +59,7 @@ export function findSessionFile(root, id, cwd) {
 function requireFile(root, id, cwd) {
     const file = findSessionFile(root, id, cwd);
     if (file === undefined)
-        throw new AmaError("session_not_found", `会话不存在：${id}`);
+        throw new AmaError("session_not_found", msg().cli.composeStore.sessionNotFound(id));
     return file;
 }
 export function openSession(request, context) {
@@ -84,7 +85,7 @@ export function openSession(request, context) {
             try {
                 const leaf = source.leafId();
                 if (leaf === null)
-                    throw new AmaError("session_corrupt", `会话 ${request.id} 没有条目`);
+                    throw new AmaError("session_corrupt", msg().cli.composeStore.noEntries(request.id));
                 return source.fork(leaf);
             }
             finally {
@@ -93,12 +94,14 @@ export function openSession(request, context) {
         }
     }
 }
+/** 列会话（最新在前）；子 Agent 会话缺省跳过，`includeSubagents` 时保留（带 `subagent` 标记）。 */
 export function listSessions(context) {
     const dirs = context.cwd === undefined
         ? cwdDirs(context.sessionDir)
         : [sessionDirForCwd(context.sessionDir, context.cwd)];
     return dirs
         .flatMap((dir) => SessionManager.list(dir))
+        .filter((item) => context.includeSubagents === true || item.subagent !== true)
         .sort((a, b) => b.modifiedAt.localeCompare(a.modifiedAt));
 }
 export function createSessionStore() {
@@ -109,13 +112,14 @@ export function createSessionStore() {
             const file = requireFile(context.sessionDir, id);
             const item = SessionManager.list(join(file, "..")).find((i) => i.file === file);
             if (item === undefined)
-                throw new AmaError("session_corrupt", `会话文件无法读取：${file}`);
+                throw new AmaError("session_corrupt", msg().cli.composeStore.unreadable(file));
             const { entries } = migrateSessionLines(readSessionLines(file).lines, file);
             return { item, entries };
         },
         prune: async (context) => {
             const cutoff = Date.now() - context.olderThanDays * 24 * 60 * 60 * 1000;
-            const old = listSessions(context).filter((i) => Date.parse(i.modifiedAt) < cutoff);
+            // 子 Agent 会话一样按时间清理
+            const old = listSessions({ ...context, includeSubagents: true }).filter((i) => Date.parse(i.modifiedAt) < cutoff);
             if (context.dryRun)
                 return { moved: old.map((i) => i.file) };
             for (const item of old)

package/dist/cli/compose.d.ts

@@ -30,6 +30,7 @@ import type { Rule } from "../permissions/types.js";
 import { type SandboxCapability } from "../codemode/capability.js";
 import { type BashSandbox } from "../sandbox/bash.js";
 import { PresetToolRegistry } from "../tools/presets.js";
+import type { MemoryRuntime } from "../memory/runtime.js";
 import type { ToolDefinition, ToolRegistryApi } from "../tools/types.js";
 import { type ComposeState, type LogFn } from "./compose-session.js";
 import type { CliIo, InteractiveUi, ModeRunner, RuntimeDeps } from "./deps.js";
@@ -94,6 +95,7 @@ export declare function createTools(input: {
         configDir: string;
         dataDir: string;
     } | undefined;
+    memory?: MemoryRuntime | undefined;
 }, options: ComposeOptions, state: ComposeState): PresetToolRegistry;
 /** 当前模型是否收图片（read 工具用）；查不到模型时按收（交给协议层过滤）。 */
 export declare function modelAcceptsImages(state: ComposeState, model: ModelRef | undefined): boolean;

package/dist/cli/compose.js

@@ -37,12 +37,14 @@ import { join } from "node:path";
 import { AUTH_FILE } from "../config/paths.js";
 import { PresetToolRegistry, resolvePreset } from "../tools/presets.js";
 import { builtinTools } from "../tools/registry.js";
+import { MEMORY_TOOL, createMemoryTool } from "../memory/tool.js";
 import { takeCodemodeNotice } from "./codemode-notice.js";
 import { buildProviderRegistry } from "./compose-providers.js";
 import { composeSession, emptyComposeState, } from "./compose-session.js";
 import { createSessionStore } from "./compose-store.js";
 import { defaultSendUser } from "./startup-steps.js";
 import { imageFitOptionsFor } from "../modes/image-input.js";
+import { msg } from "../i18n/index.js";
 /** 缺省工具工厂：codemode（生效模式为 off 时不注册；缺省跟随预设，见 tools/presets.ts）。 */
 export const DEFAULT_TOOL_FACTORIES = [codemodeToolFactory()];
 export function lazyMode(load) {
@@ -105,9 +107,13 @@ export function createTools(input, options, state) {
                 produced.push(tool);
         }
         catch (error) {
-            state.warnings.push(`工具工厂失败：${error.message}`);
+            state.warnings.push(msg().cli.compose.toolFactoryFailed(error.message));
         }
     }
+    // [W6-M] 记忆开启时注册 memory 工具并放进活动集（关闭时什么都不加，工具表字节不变）
+    if (input.memory !== undefined)
+        produced.push(createMemoryTool(input.memory));
+    state.memory = input.memory;
     const extra = options.extraTools ?? [];
     const names = new Set([...builtins, ...produced, ...extra].map((tool) => tool.name));
     const preset = resolvePreset({
@@ -120,13 +126,15 @@ export function createTools(input, options, state) {
             registry.register(tool, "builtin");
         }
         catch (error) {
-            state.warnings.push(`工具 ${tool.name} 注册失败：${error.message}`);
+            state.warnings.push(msg().cli.compose.toolRegisterFailed(tool.name, error.message));
         }
     }
     for (const tool of extra)
         registry.register(tool, "sdk");
+    if (input.memory !== undefined && preset.codemode !== "only")
+        preset.builtin.push(MEMORY_TOOL);
     applyCodemodeMode(registry, preset);
-    state.warnings.push(...preset.warnings);
+    state.warnings.push(...preset.warnings.map((w) => msg().session.codemode.presetWarning(w)));
     // 一次性提示只给有人看的界面（交互 / 行式）；-p 与 RPC 的 stderr 常被脚本解析，不打扰。
     if (input.paths !== undefined && (input.mode === "interactive" || input.mode === "line")) {
         const notice = takeCodemodeNotice({ config: input.config, capability, ...input.paths });
@@ -157,7 +165,7 @@ export function buildRules(specs, builtinDeny, warn) {
             rules.push(parseRule(spec.raw, spec.effect, spec.source));
         }
         catch (error) {
-            warn(`权限规则（${spec.source}）：${error.message}，已忽略`);
+            warn(msg().cli.compose.permissionRuleIgnored(spec.source, error.message));
         }
     }
     return rules;
@@ -238,7 +246,7 @@ export function createRuntimeDeps(options = {}) {
                 const skipped = [...new Set([...skills.skippedUntrusted, ...prompts.skippedUntrusted])];
                 const warnings = [...skills.warnings, ...prompts.warnings];
                 if (skipped.length > 0)
-                    warnings.push(`${skipped.length} 个项目级目录因未信任被跳过（--trust 加载）`);
+                    warnings.push(msg().cli.compose.untrustedDirsSkipped(skipped.length));
                 return {
                     skills: skills.skills.map((s) => ({
                         name: s.name,

package/dist/cli/default-model.d.ts

@@ -27,8 +27,6 @@ export interface PricePick {
     /** 为什么选它（一句话）。 */
     reason: string;
 }
-/** 规则说明（帮助与输出共用）。 */
-export declare const PRICE_RULE = "\u652F\u6301\u5DE5\u5177\u8C03\u7528\u3001\u4E0A\u4E0B\u6587 \u2265 64k \u4E14\u6709\u4EF7\u683C\u7684\u6A21\u578B\u91CC\u8F93\u5165\u4EF7\u6700\u4F4E";
 /** 按价格挑缺省模型；没有满足条件的返回 undefined（规则见文件头）。 */
 export declare function pickByPrice(candidates: readonly PriceCandidate[]): PricePick | undefined;
 export interface DefaultModelChoice {

package/dist/cli/default-model.js

@@ -12,10 +12,9 @@
  * 无 key 时探测）。跳过 `fake`（测试供应商只能显式 `--model fake/…`）与协议尚未实现的供应商。
  */
 import { compactTokens, metadataOf } from "./subcommands/model-meta.js";
+import { msg } from "../i18n/index.js";
 /** 缺省模型的最小上下文（token）。 */
 export const MIN_DEFAULT_CONTEXT = 64_000;
-/** 规则说明（帮助与输出共用）。 */
-export const PRICE_RULE = "支持工具调用、上下文 ≥ 64k 且有价格的模型里输入价最低";
 /** 按价格挑缺省模型；没有满足条件的返回 undefined（规则见文件头）。 */
 export function pickByPrice(candidates) {
     let best;
@@ -41,7 +40,7 @@ export function pickByPrice(candidates) {
     const { c } = best;
     return {
         id: c.id,
-        reason: `${PRICE_RULE}（$${c.inputCost}/M 输入，上下文 ${compactTokens(c.contextWindow)}）`,
+        reason: msg().cli.defaultModel.priceReason(c.inputCost, compactTokens(c.contextWindow)),
     };
 }
 /** 供应商内挑模型：内置取目录首条；自定义按价格规则，挑不出再取首条。 */
@@ -51,7 +50,7 @@ export function pickProviderModel(registry, provider) {
     if (first === undefined)
         return undefined;
     if (provider.builtin)
-        return { model: first, rule: "内置目录推荐的首个模型" };
+        return { model: first, rule: msg().cli.defaultModel.builtinFirst };
     const picked = pickByPrice(usable.map((m) => ({
         id: m.id,
         contextWindow: m.contextWindow,
@@ -63,7 +62,7 @@ export function pickProviderModel(registry, provider) {
         return { model, rule: picked.reason };
     return {
         model: first,
-        rule: "列表首个模型（没有同时支持工具调用、上下文 ≥ 64k 且有价格的模型）",
+        rule: msg().cli.defaultModel.listFirst,
     };
 }
 export async function pickDefaultModel(registry) {
@@ -105,7 +104,5 @@ export function noModelGuidance(registry) {
         .map((p) => p.envKeys[0])
         .filter((name) => name !== undefined);
     const shown = envs.slice(0, 3).join(" / ");
-    const more = envs.length > 3 ? " 等" : "";
-    return (`没有可用模型：设置 ${shown}${more}环境变量，或 \`ama auth set <provider>\` 保存 key，` +
-        "或 `ama providers add <id> --base-url <url>` 接入中转站（也可 --model 指定）");
+    return msg().cli.defaultModel.noModel(shown, envs.length > 3);
 }

package/dist/cli/deps.d.ts

@@ -15,6 +15,7 @@ import type { AmaConfig } from "../config/types.js";
 import type { PermissionRuleSpec } from "../config/merge.js";
 import type { TrustPromptAnswer } from "../config/trust.js";
 import type { HookDispatcherApi } from "../hooks/types.js";
+import type { MemoryRuntime } from "../memory/runtime.js";
 import type { WarmingDecisionHandler } from "../ai/cache/types.js";
 import type { AgentEventBus } from "../host/api-impl.js";
 import type { ApprovalBroker, HostAdapterHandle, InstructionSource } from "../host/types.js";
@@ -162,10 +163,11 @@ export interface RuntimeDeps {
             sessionDir: string;
             cwd: string;
         }): SessionManagerApi | Promise<SessionManagerApi>;
-        /** `--resume` 选择器与 `ama sessions` 用。 */
+        /** `--resume` 选择器与 `ama sessions` 用；子 Agent 会话缺省不列，`includeSubagents` 时列出。 */
         list?(context: {
             sessionDir: string;
             cwd?: string;
+            includeSubagents?: boolean;
         }): Promise<SessionListItem[]>;
         /** `ama sessions show`：id 可为前缀；找不到抛 AmaError{code:"session_not_found"}。 */
         show?(id: string, context: {
@@ -195,6 +197,8 @@ export interface RuntimeDeps {
                 configDir: string;
                 dataDir: string;
             };
+            /** [W6-M] 记忆运行期（开启时注册 memory 工具；组装会话时渲染 memory 节）。 */
+            memory?: MemoryRuntime | undefined;
         }): ToolRegistryApi;
     };
     /** B3：权限管线。 */

package/dist/cli/exit-codes.d.ts

@@ -37,5 +37,5 @@ export declare const ExitCode: {
 };
 export type ExitCodeName = keyof typeof ExitCode;
 export type ExitCode = (typeof ExitCode)[ExitCodeName];
-export declare const EXIT_CODE_DESCRIPTIONS: Readonly<Record<ExitCode, string>>;
+/** [W6-I1] 退出码说明按界面语言取（`msg().cli.exitCodes`，键是 `ExitCode` 名字的 camelCase）。 */
 export declare function describeExitCode(code: number): string;

package/dist/cli/exit-codes.js

@@ -1,6 +1,7 @@
 /**
  * 进程退出码（设计 §11.3）。[B0] 契约文件。
  */
+import { msg } from "../i18n/index.js";
 export const ExitCode = {
     /** 正常。 */
     Ok: 0,
@@ -35,21 +36,11 @@ export const ExitCode = {
     /** SIGTERM。 */
     Sigterm: 143,
 };
-export const EXIT_CODE_DESCRIPTIONS = {
-    0: "正常",
-    1: "运行期错误（模型最终失败等）",
-    2: "参数用法错误",
-    3: "配置 / profile / 路径错误",
-    4: "无可用模型或密钥",
-    5: "会话不存在 / 损坏 / cwd 不匹配",
-    6: "宿主 / Hook 加载或启动失败",
-    7: "-p 运行中有工具调用被拒（没有人审批）",
-    8: "-p 到达预算上限（--max-turns / --max-cost / limits）",
-    9: "-p 产出的计划已落盘、待审批（未执行）",
-    78: "HOST_API_VERSION 不匹配",
-    130: "SIGINT 退出（两次 Ctrl+C）",
-    143: "SIGTERM",
-};
+/** [W6-I1] 退出码说明按界面语言取（`msg().cli.exitCodes`，键是 `ExitCode` 名字的 camelCase）。 */
 export function describeExitCode(code) {
-    return EXIT_CODE_DESCRIPTIONS[code] ?? "未知退出码";
+    const texts = msg().cli.exitCodes;
+    const name = Object.keys(ExitCode).find((key) => ExitCode[key] === code);
+    if (name === undefined)
+        return texts.unknown;
+    return texts[`${name[0].toLowerCase()}${name.slice(1)}`];
 }

package/dist/cli/from-prompt.js

@@ -13,6 +13,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { resolveFromMessage } from "../session/reuse.js";
 import { UsageError } from "./args.js";
+import { msg } from "../i18n/index.js";
 const EXT = {
     "image/png": "png",
     "image/jpeg": "jpg",
@@ -25,7 +26,7 @@ export function applyFromOption(args, runtime, io) {
     if (spec === undefined)
         return plain;
     if (runtime.mode === "rpc")
-        throw new UsageError("--from 不用于 --mode rpc");
+        throw new UsageError(msg().cli.fromPrompt.notWithRpc);
     const picked = resolveFromMessage(runtime.paths.sessionDir, spec, runtime.paths.cwd);
     const parts = [picked.text, args.prompt ?? ""].filter((p) => p.trim() !== "");
     const prompt = parts.length > 0 ? parts.join("\n\n") : undefined;
@@ -33,7 +34,7 @@ export function applyFromOption(args, runtime, io) {
         return { context: { args, prompt, io }, cleanup: () => { } };
     }
     if (runtime.mode !== "print") {
-        io.stderr(`ama: --from 的消息带 ${picked.images.length} 张图片，交互界面只带文本（-p 会一并发送）\n`);
+        io.stderr(msg().cli.fromPrompt.imagesDropped(picked.images.length));
         return { context: { args, prompt, io }, cleanup: () => { } };
     }
     const dir = mkdtempSync(join(tmpdir(), "ama-from-"));

package/dist/cli/help-text.d.ts

@@ -1,4 +1,5 @@
 /**
  * `ama --help` 的文本（从 args.ts 搬出，args.ts 再导出）。[W5-C0]
+ * [W6-I1] 文本进消息目录（`msg().cli.help`），按界面语言取；不能是模块级常量（会按 import 时的语言定死）。
  */
-export declare const HELP_TEXT = "\u7528\u6CD5\uFF1Aama [\u9009\u9879] [\u63D0\u793A]\n      ama <\u5B50\u547D\u4EE4> \u2026\n\n\u6A21\u5F0F\n  \uFF08\u7F3A\u7701\uFF09                     \u7EC8\u7AEF\u754C\u9762\uFF1Bstdin / stdout \u975E TTY \u6216 TERM=dumb \u65F6\u81EA\u52A8\u964D\u7EA7\u4E3A\u884C\u5F0F\n  --no-tui                     \u884C\u5F0F\u754C\u9762\uFF08readline + \u62EC\u53F7\u7C98\u8D34\uFF09\n  -p, --print                  \u975E\u4EA4\u4E92\uFF1A\u6267\u884C\u63D0\u793A\u540E\u9000\u51FA\u3002\u63D0\u793A = \u53C2\u6570 + stdin \u7BA1\u9053\u5185\u5BB9\uFF1B\u6709\u63D0\u793A\u53C2\u6570\u65F6\n                               \u53EA\u7B49\u7BA1\u9053\u9996\u5B57\u8282 2 s\uFF08AMA_STDIN_WAIT_MS\uFF09\uFF0C\u6CA1\u6536\u5230\u5C31\u5FFD\u7565\u5E76\u63D0\u793A\uFF1B\n                               \u672B\u5C3E\u52A0 - \u5219\u4E00\u76F4\u7B49\u5230 EOF\uFF08\u5982 npm test | ama -p \u627E\u539F\u56E0 -\uFF09\n  --no-stdin                   -p \u4E0D\u8BFB stdin\uFF08\u7236\u8FDB\u7A0B\u7559\u7740\u7BA1\u9053\u3001\u53C8\u4E0D\u60F3\u7B49 2 s \u65F6\uFF09\n  --output-format <\u683C\u5F0F>       -p \u7684\u8F93\u51FA\uFF1Atext\uFF08\u7F3A\u7701\uFF09| json | stream-json\n  --max-turns <N>              -p \u6700\u591A\u8DD1 N \u8F6E\uFF08\u4E00\u6B21\u6A21\u578B\u8BF7\u6C42\u52A0\u5176\u5DE5\u5177\u6267\u884C\u7B97\u4E00\u8F6E\uFF09\uFF1B\u5230\u8FBE\u4E0A\u9650\u4ECD\u6709\n                               \u672A\u5B8C\u6210\u7684\u5DE5\u5177\u8C03\u7528\u65F6\u63D0\u524D\u7ED3\u675F\uFF0C\u9000\u51FA\u7801 8\n  --image <\u6587\u4EF6>               -p \u968F\u63D0\u793A\u53D1\u9001\u56FE\u7247\uFF08\u53EF\u91CD\u590D\uFF1Bpng / jpg / gif / webp\uFF0C\u5355\u5F20 \u2264 5 MB\uFF09\uFF1B\n                               \u4EA4\u4E92\u754C\u9762\u91CC\u5199 @\u56FE\u7247\u8DEF\u5F84 \u6216\u7C98\u8D34\u56FE\u7247\u8DEF\u5F84\n  --mode rpc                   stdio JSONL \u534F\u8BAE\uFF08\u4F9B\u5D4C\u5165\uFF09\n  --mode acp                   ACP \u670D\u52A1\u7AEF\uFF08\u4F9B Zed / JetBrains / Armadra \u9A71\u52A8\uFF09\n  --max-cost <USD>             \u4E00\u6B21\u8FD0\u884C\u7684\u7F8E\u5143\u4E0A\u9650\uFF08\u6309\u76EE\u5F55\u4EF7\u4F30\u7B97\uFF09\uFF1B\u5230\u9650\u7ED3\u675F\u8FD0\u884C\uFF0C-p \u9000\u51FA\u7801 8\n  --tui-mode <\u6A21\u5F0F>            \u663E\u793A\u6A21\u5F0F\uFF0C\u7B2C\u4E00\u671F\u53EA\u6709 regular\uFF08\u4E3B\u5C4F\uFF09\n  --quiet-startup <\u6863>         \u542F\u52A8\u753B\u9762\uFF1Anormal | header | silent\n\n\u6A21\u578B\n  --model <provider/id>        \u6A21\u578B\uFF08\u53EF\u914D\u5408 --provider \u53EA\u5199 id\uFF1B@\u6E20\u9053 \u6307\u5B9A\u6E20\u9053\uFF0C\u5982 packy/kimi-k2.5@messages\uFF09\n  --provider <id>              \u4F9B\u5E94\u5546\uFF08\u5FC5\u987B\u540C\u65F6\u7ED9 --model\uFF09\n  --api-key <key>              \u53EA\u7528\u4E8E\u672C\u6B21\u542F\u52A8\u7684 key\uFF08\u9700\u8981 --model\uFF1B\u4F18\u5148\u7528 ama auth set\uFF09\n  --thinking <\u7EA7\u522B>            off | minimal | low | medium | high | xhigh\n\n\u4F1A\u8BDD\n  -c, --continue               \u7EE7\u7EED\u672C\u76EE\u5F55\u6700\u8FD1\u7684\u4F1A\u8BDD\n  -r, --resume [id]            \u6062\u590D\u4F1A\u8BDD\uFF08\u4EA4\u4E92\u6A21\u5F0F\u65E0 id \u65F6\u5F39\u9009\u62E9\u5668\uFF09\n  --session-id <id>            \u4F7F\u7528\u6307\u5B9A id \u7684\u4F1A\u8BDD\uFF08\u4E0D\u5B58\u5728\u5219\u65B0\u5EFA\uFF09\n  --fork <id>                  \u4ECE\u6307\u5B9A\u4F1A\u8BDD\u5206\u53C9\u51FA\u65B0\u4F1A\u8BDD\n  --session-dir <\u76EE\u5F55>         \u4F1A\u8BDD\u76EE\u5F55\uFF08\u7F3A\u7701 ~/.local/share/ama/sessions\uFF09\n  --no-session                 \u4F1A\u8BDD\u53EA\u5728\u5185\u5B58\u91CC\uFF0C\u4E0D\u5199\u4F1A\u8BDD\u6587\u4EF6\uFF08\u4E4B\u540E\u65E0\u6CD5 --resume\uFF09\n  --from <id>[#\u7F16\u53F7]           \u7528\u65E7\u4F1A\u8BDD\u7684\u4E00\u6761\u7528\u6237\u6D88\u606F\u4F5C\u63D0\u793A\uFF08\u7F3A\u7701\u6700\u540E\u4E00\u6761\uFF1B-p \u65F6\u8FDE\u56FE\u7247\u4E00\u8D77\uFF1B\n                               \u7F16\u53F7\u89C1 ama sessions show\uFF09\n\n\u6743\u9650\u4E0E\u4FE1\u4EFB\n  --permission-mode <\u6A21\u5F0F>     default | auto-edit | plan | auto | full-auto | allowlist\n                               \uFF08auto \u7531 ama \u5224\u65AD\u6BCF\u4E00\u6B65\uFF1Ballowlist \u53EA\u653E\u884C allow \u89C4\u5219\u547D\u4E2D\u7684\uFF0C\u9002\u5408 CI\uFF09\n  --allow <\u89C4\u5219>               \u8FFD\u52A0\u5141\u8BB8\u89C4\u5219\uFF0C\u53EF\u91CD\u590D\uFF08\u5982 \"bash(git status*)\"\uFF09\n  --deny <\u89C4\u5219>                \u8FFD\u52A0\u62D2\u7EDD\u89C4\u5219\uFF0C\u53EF\u91CD\u590D\uFF08\u5982 \"write(**/.env*)\"\uFF09\n  --trust / --no-trust         \u4FE1\u4EFB / \u4E0D\u4FE1\u4EFB\u5F53\u524D\u9879\u76EE\uFF08\u9879\u76EE\u7EA7 Hook\u3001Skill\u3001\u63D0\u793A\u6A21\u677F\uFF09\n\n\u8D44\u6E90\n  --system-prompt <\u6587\u672C|@\u6587\u4EF6> \u8FFD\u52A0\u7CFB\u7EDF\u63D0\u793A\uFF1A\u7F3A\u7701\u4F5C\u4E3A\u6700\u540E\u4E00\u6761\u89C4\u5219\u8FFD\u52A0\uFF08\u5DE5\u5177\u8868\u7B49\u524D\u7F00\u4E0D\u53D8\uFF0C\u5229\u4E8E\u7F13\u5B58\uFF09\n  --system-prompt-mode <\u65B9\u5F0F>  append\uFF08\u7F3A\u7701\uFF09| replace\uFF08\u66FF\u6362\u5F00\u5934\u7684\u89D2\u8272\u8BF4\u660E\uFF0C\u5DE5\u5177\u4E0E\u9879\u76EE\u4E0A\u4E0B\u6587\u4FDD\u7559\uFF09\n  --profile <\u6587\u4EF6>             \u5BBF\u4E3B profile.json\uFF08\u5B57\u6BB5\u7B49\u4EF7\u4E8E\u5BF9\u5E94\u53C2\u6570\uFF0C\u547D\u4EE4\u884C\u4F18\u5148\uFF09\n  --host <\u6A21\u5757>                \u5BBF\u4E3B\u9002\u914D\u5668\u6A21\u5757\uFF08CJS / ESM\uFF09\n  --instructions <\u6587\u4EF6>        \u8FFD\u52A0\u6307\u4EE4\u6587\u4EF6\uFF0C\u53EF\u91CD\u590D\n  --skill-dir <\u76EE\u5F55>           \u8FFD\u52A0 Skill \u76EE\u5F55\uFF0C\u53EF\u91CD\u590D\n  --agent-dir <\u76EE\u5F55>           \u8FFD\u52A0\u5B50 Agent \u5B9A\u4E49\u76EE\u5F55\uFF0C\u53EF\u91CD\u590D\n  --auth-file <\u6587\u4EF6>           auth.json \u4F4D\u7F6E\uFF08\u7F3A\u7701 ~/.config/ama/auth.json\uFF09\n  --tools <a,b,\u2026>              \u53EA\u542F\u7528\u8FD9\u4E9B\u5DE5\u5177\n  --exclude-tools <a,b,\u2026>      \u7981\u7528\u8FD9\u4E9B\u5DE5\u5177\n  --tools-preset <\u540D>          \u5DE5\u5177\u9884\u8BBE\uFF1Adefault\uFF08\u7F3A\u7701\uFF09| minimal | codemode-only | coordinator\n                               \uFF08codemode \u662F codemode-only \u7684\u65E7\u540D\uFF0C\u4ECD\u53EF\u7528\uFF09\n  --codemode <\u6A21\u5F0F>            codemode \u8C03\u7528\u65B9\u5F0F\uFF1Aoff | on | only\uFF08\u7F3A\u7701\u968F\u9884\u8BBE\uFF09\n\n\u5B50\u547D\u4EE4\n  ama auth set <provider>      \u4ECE stdin \u8BFB\u53D6 key \u5199\u5165 auth.json\uFF080600\uFF09\n  ama auth list                \u5217\u51FA\u5DF2\u4FDD\u5B58 key \u7684\u4F9B\u5E94\u5546\uFF08\u4E0D\u663E\u793A key\uFF09\n  ama auth remove <provider>   \u5220\u9664\u5DF2\u4FDD\u5B58\u7684 key\n  ama sessions list|show|prune \u4F1A\u8BDD\u7BA1\u7406\n  ama sessions search <\u5173\u952E\u8BCD|/\u6B63\u5219/> [--all] [--role user|assistant|tool] [--since 7d] [--limit N]\n                               \u8DE8\u4F1A\u8BDD\u5168\u6587\u68C0\u7D22\n  ama sessions export <id> [--format md|json|jsonl] [--output <\u6587\u4EF6>] [--branch leaf|all]\n                               \u5BFC\u51FA\u4F1A\u8BDD\uFF08\u5DF2\u8131\u654F\uFF09\n  ama models list [--provider <id>]  \u5217\u51FA\u6A21\u578B\uFF08\u542B\u6765\u6E90\u4E0E key \u72B6\u6001\uFF09\n  ama models check <provider/id>     \u53D1\u4E00\u6B21\u6700\u5C0F\u8BF7\u6C42\u68C0\u67E5\u53EF\u7528\u6027\n  ama models discover <provider> [--probe] [--write] [--limit N]\n                               \u4ECE\u4E2D\u8F6C /v1/models \u5217\u51FA\u6A21\u578B\uFF0C\u63A2\u6D4B\u534F\u8BAE\u5E76\u5199\u5165\u914D\u7F6E\n  ama models refresh [--provider <id>]  \u8054\u7F51\u5237\u65B0 models.dev \u5143\u6570\u636E\u5230\u6570\u636E\u76EE\u5F55\uFF08\u542F\u52A8\u4E0D\u8054\u7F51\uFF1B\n                               \u65E7\u540D refresh-catalog\uFF09\n  ama providers add <id> --base-url <url> [--key-env VAR] [--probe] [--channel n=api@url] [--yes]\n                               \u4E00\u952E\u63A5\u5165\uFF1A\u5217\u6A21\u578B\u3001\u8865 models.dev \u5143\u6570\u636E\u3001\u63A2\u6D4B\u6E20\u9053\u3001\u5199\u5165\u914D\u7F6E\n  ama providers list|channels <id>|remove <id>|refresh <id>\n                               \u4F9B\u5E94\u5546 \u2192 \u6E20\u9053 \u2192 \u6A21\u578B\uFF1B\u5220\u9664\uFF1B\u91CD\u62C9\u6A21\u578B\u5217\u8868\n  ama models cache-probe <provider/id> [--tokens N] [--gap-ms MS] [--yes] [--json]\n                               \u5224\u65AD\u7AEF\u70B9\u662F\u5426\u62A5\u544A\u7F13\u5B58\u547D\u4E2D\n  ama doctor                   \u914D\u7F6E\u5C42\u7EA7\u3001\u4FE1\u4EFB\u3001key \u6765\u6E90\u3001Hook\u3001\u7EC8\u7AEF\u80FD\u529B\n  ama config show [--json]     \u751F\u6548\u914D\u7F6E\u4E0E\u6BCF\u9879\u6765\u6E90\u3001\u5C06\u4F7F\u7528\u7684\u6A21\u578B\n  ama config path              \u914D\u7F6E\u76EE\u5F55\u3001\u6570\u636E\u76EE\u5F55\u4E0E\u5404\u6587\u4EF6\u8DEF\u5F84\n  ama config edit              \u7528 $VISUAL / $EDITOR \u6253\u5F00 config.json\n  ama init [--force]           \u5EFA\u914D\u7F6E\u76EE\u5F55\uFF080700\uFF09\u4E0E config.json\u3001config.schema.json\uFF1B\u5DF2\u6709\u7684\u4E0D\u8986\u76D6\n  ama stats [--since 7d] [--by day|week|month|provider|channel|model|project] [--all] [--json]\n                               \u8DE8\u4F1A\u8BDD\u7EDF\u8BA1\uFF1A\u8BF7\u6C42\u3001token\u3001\u7F13\u5B58\u547D\u4E2D\u7387\u3001\u8D39\u7528\u3001\u5DE5\u5177\u8C03\u7528\n\n\u5176\u5B83\n  -h, --help                   \u8F93\u51FA\u672C\u5E2E\u52A9\n  -v, --version                \u8F93\u51FA\u7248\u672C\n\n\u9000\u51FA\u7801\uFF1A0 \u6B63\u5E38 \u00B7 1 \u8FD0\u884C\u671F\u9519\u8BEF \u00B7 2 \u7528\u6CD5\u9519\u8BEF \u00B7 3 \u914D\u7F6E\u9519\u8BEF \u00B7 4 \u65E0\u53EF\u7528\u6A21\u578B\u6216 key \u00B7\n        5 \u4F1A\u8BDD\u9519\u8BEF \u00B7 6 \u5BBF\u4E3B / Hook \u542F\u52A8\u5931\u8D25 \u00B7 7 -p \u6709\u5DE5\u5177\u8C03\u7528\u88AB\u62D2\uFF08\u65E0\u4EBA\u5BA1\u6279\uFF1B\u7528\n        --permission-mode auto-edit|auto \u6216 --allow \u653E\u884C\uFF09\u00B7 8 -p \u5230\u8FBE\u9884\u7B97\u4E0A\u9650 \u00B7\n        9 -p \u7684\u8BA1\u5212\u5DF2\u843D\u76D8\u5F85\u5BA1\u6279\uFF08plan.unattended: approve \u5219\u81EA\u52A8\u6279\u51C6\u6267\u884C\uFF09\u00B7\n        78 \u5BBF\u4E3B API \u7248\u672C\u4E0D\u5339\u914D \u00B7\n        130 SIGINT \u00B7 143 SIGTERM\n";
+export declare function helpText(): string;