@armadra/agent 0.5.0 → 0.6.0

package/dist/cli/compose-memory.js

@@ -0,0 +1,127 @@
+/**
+ * 记忆的组装（docs/wave6-plan.md §3、D8、D9、D11、D12）。[W6-M]
+ *
+ * - 开关：独立终端看合并后的 `memory.enabled`（用户级 / profile.config；项目级只能设 false；`--memory` /
+ *   `--no-memory`；`AMA_MEMORY=0|1` 经 bootstrap 并入命令行覆盖，命令行优先）。缺省关闭：不建运行期、不读盘、
+ *   不注册工具、不渲染节。
+ * - 嵌入宿主（有 profile；SDK `createAgentSession`）：只看 `profile.memory = { enabled, dir }`，作用域只有
+ *   `workspace`（= dir），不读用户级；合并配置里显式 `memory.enabled: false`（项目级、`--no-memory`、
+ *   `AMA_MEMORY=0`）仍可关掉。
+ * - 项目作用域要求项目已受信任，否则跳过（`/memory` 提示）。
+ * - 系统节：会话开始（新会话）渲染一次；resume / fork 沿用会话里已有的 `memory` 节；压缩结束后重渲染
+ *   （`compaction_end` 时 `updateSystem`，压缩本就是前缀重置点）；`/memory reload` 显式重渲染。
+ */
+import { AmaError } from "../errors.js";
+import { projectRootOf, standaloneRoots } from "../memory/paths.js";
+import { MemoryRuntime } from "../memory/runtime.js";
+import { DEFAULT_MEMORY_LIMITS, MemoryStore } from "../memory/store.js";
+import { replaySystem } from "../session/projection.js";
+/** `AMA_MEMORY=0|1`（也认 true / false / on / off）；其它值或未设 → undefined。 */
+export function memoryEnvOverride(env) {
+    const raw = env["AMA_MEMORY"]?.trim().toLowerCase();
+    if (raw === "1" || raw === "true" || raw === "on")
+        return true;
+    if (raw === "0" || raw === "false" || raw === "off")
+        return false;
+    return undefined;
+}
+/** 按配置建运行期；关闭时返回 undefined（什么都不做）。 */
+export function resolveMemory(input) {
+    const config = input.config.memory ?? {};
+    const limits = {
+        indexMaxBytes: config.indexMaxBytes ?? DEFAULT_MEMORY_LIMITS.indexMaxBytes,
+        fileMaxBytes: config.fileMaxBytes ?? DEFAULT_MEMORY_LIMITS.fileMaxBytes,
+        maxFiles: config.maxFiles ?? DEFAULT_MEMORY_LIMITS.maxFiles,
+    };
+    const subagents = config.subagents ?? "read";
+    const storeOptions = input.today === undefined ? {} : { today: input.today };
+    if (input.embedded !== undefined) {
+        const profile = input.embedded.memory;
+        if (profile?.enabled !== true || config.enabled === false)
+            return undefined;
+        if (profile.dir === undefined || profile.dir === "")
+            throw new AmaError("invalid_arguments", "memory.enabled is true but memory.dir is missing (embedded hosts must give a per-workspace directory)");
+        const roots = { workspace: profile.dir };
+        return new MemoryRuntime(new MemoryStore(roots, limits, storeOptions), {
+            subagents,
+            embedded: true,
+        });
+    }
+    if (config.enabled !== true)
+        return undefined;
+    const scopes = config.scopes ?? ["user", "project"];
+    const skipped = [];
+    let projectRoot;
+    if (scopes.includes("project")) {
+        if (input.trusted)
+            projectRoot = projectRootOf(input.cwd);
+        else
+            skipped.push({ scope: "project", reason: "untrusted" });
+    }
+    const roots = standaloneRoots({
+        dataDir: input.dataDir,
+        projectRoot,
+        user: scopes.includes("user"),
+    });
+    const store = new MemoryStore(roots, limits, {
+        ...storeOptions,
+        ...(projectRoot === undefined ? {} : { projectRoot }),
+    });
+    return new MemoryRuntime(store, {
+        subagents,
+        embedded: false,
+        skipped,
+        ...(projectRoot === undefined ? {} : { projectRoot }),
+    });
+}
+const attached = new WeakMap();
+/** 会话的记忆运行期（未开启 → undefined）。 */
+export function memoryOf(session) {
+    return attached.get(session);
+}
+/**
+ * 新会话渲染当前索引；会话里已有 system 状态（resume / fork）时沿用其中的 `memory` 节（可能没有）。
+ * 未开启 → undefined。
+ */
+export function initialMemorySection(runtime, manager) {
+    if (runtime === undefined)
+        return undefined;
+    const messages = manager
+        .branch()
+        .flatMap((entry) => (entry.type === "message" ? [entry.message] : []));
+    const existing = replaySystem(messages);
+    if (existing !== undefined)
+        return existing.sections["memory"];
+    return runtime.renderSection();
+}
+/** 把 `memory` 节并进静态系统输入（未开启时原样返回同一对象，字节不变）。 */
+export function withMemorySection(system, runtime, manager) {
+    const section = initialMemorySection(runtime, manager);
+    return section === undefined ? system : { ...system, memory: section };
+}
+/** 会话建好后：登记运行期，压缩结束后重渲染 `memory` 节。 */
+export function attachMemory(session, runtime) {
+    if (runtime === undefined)
+        return;
+    attached.set(session, runtime);
+    session.subscribe((event) => {
+        if (event.type === "compaction_end" && event.result !== undefined)
+            session.updateSystem({ memory: runtime.renderSection() ?? "" });
+    });
+}
+/**
+ * `/memory reload`：按磁盘重渲染 `memory` 节。返回 undefined = 会话未开启记忆；`changed` = 节有变化
+ * （下次请求产生一条 system 补丁，缓存前缀断一次）。
+ */
+export function reloadMemorySection(session) {
+    const runtime = memoryOf(session);
+    if (runtime === undefined)
+        return undefined;
+    const impl = session;
+    const before = impl.childBase().system?.memory;
+    const next = runtime.renderSection() ?? "";
+    if ((before ?? "") === next)
+        return { changed: false };
+    impl.updateSystem({ memory: next });
+    return { changed: true };
+}

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

@@ -9,6 +9,9 @@
  * - 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。
  */
 import type { ApiRegistry } from "../ai/apis/api.js";
 import { ProviderRegistry } from "../ai/providers/registry.js";
@@ -32,6 +35,8 @@ export interface ProviderComposeOptions {
 }
 export declare function providerConfigOf(provider: ProviderData): ProviderConfig;
 export declare function withExtraProviders(config: AmaConfig, providers: readonly ProviderData[] | undefined): AmaConfig;
+/** [W6-O] 按 auth.json 的 ChatGPT 条目与 `AMA_CHATGPT_BASE_URL` / `auth.chatgpt.originator` 补 chatgpt 的渠道配置。 */
+export declare function withChatGptChannels(config: AmaConfig, authFile: string, env: Readonly<Record<string, string | undefined>>): AmaConfig;
 export declare function buildProviderRegistry(input: ProviderBuildInput, options?: ProviderComposeOptions): Promise<ProviderRegistry>;
 /** 本地服务（无需 key、模型表为空）的模型枚举；连不上静默跳过。 */
 export declare function probeLocalProviders(registry: ProviderRegistry, timeoutMs?: number): Promise<string[]>;

package/dist/cli/compose-providers.js

@@ -9,9 +9,14 @@
  * - 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。
  */
 import { loadModelsDevIndex } from "../ai/providers/models-dev-cache.js";
 import { ProviderRegistry, discoverLocalModels } from "../ai/providers/registry.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 +49,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 +87,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 +104,6 @@ export async function buildProviderRegistry(input, options = {}) {
         if (provider !== undefined)
             registry = make({ provider, apiKey: cli.apiKey });
     }
-    const env = options.env ?? process.env;
     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;