@armadra/agent 0.7.3 → 0.7.5

package/dist/cli/bootstrap.js

@@ -76,7 +76,8 @@ export async function bootstrap(argsIn, deps, io) {
         request = { kind: "resume", id };
     }
     const sessionRequest = request;
-    const sessionManager = await step(ExitCode.Session, m().steps.session, () => deps.sessions.open(sessionRequest, { sessionDir: paths.sessionDir, cwd: paths.cwd }));
+    // [#165] 会话替换后跟随当前会话（闭包只经它取，启动会话的 manager 不被常驻）
+    let sessionManager = await step(ExitCode.Session, m().steps.session, () => deps.sessions.open(sessionRequest, { sessionDir: paths.sessionDir, cwd: paths.cwd }));
     let sessionCwd = sessionManager.cwd;
     if (!existsSync(sessionCwd)) {
         const replacement = interactive ? await deps.ui?.askCwd?.(sessionCwd) : undefined;
@@ -281,6 +282,8 @@ export async function bootstrap(argsIn, deps, io) {
             uiBroker: () => uiBroker,
             onSessionReplaced: (next) => {
                 session = next;
+                sessionManager = next.manager ?? sessionManager;
+                assembly.sessionManager = sessionManager;
             },
             sessionStartContext: () => sessionStartContext,
             unattended,
@@ -302,7 +305,7 @@ export async function bootstrap(argsIn, deps, io) {
         if (Object.keys(overrides).length > 0)
             assembly.overrides = overrides;
         session = await step(ExitCode.RuntimeError, m().steps.assembly, () => deps.session.create(assembly));
-        const active = session;
+        const active = session; // 只同步使用：闭包捕获它会让启动会话常驻（#165）
         let disposed;
         shutdown = (reason) => {
             disposed ??= (async () => {
@@ -310,7 +313,7 @@ export async function bootstrap(argsIn, deps, io) {
                 await hooks.run("SessionEnd", { reason }).catch(() => undefined);
                 await disposeHost(host, (e) => warn(m().hostDisposeFailed(String(e))));
                 // 会话被替换过时 dispose 当前那个（旧会话由替换方负责）
-                await (session ?? active).dispose();
+                await session?.dispose();
             })();
             return disposed;
         };
@@ -339,8 +342,13 @@ export async function bootstrap(argsIn, deps, io) {
             providers,
             model,
             thinkingLevel,
-            sessionManager,
-            session: active,
+            // [#165] 跟随当前会话（ACP 关掉启动会话后它可被回收）
+            get sessionManager() {
+                return sessionManager;
+            },
+            get session() {
+                return session;
+            },
             hooks,
             host,
             permission,

package/dist/cli/compose-agents.js

@@ -56,6 +56,9 @@ export function subagentEnvironment(deps, catalog) {
     const pending = config.subagents?.maxPending;
     if (pending !== undefined)
         env.maxPending = pending;
+    const retain = config.subagents?.retainSessions; // [M-F] 子会话句柄 LRU 上限
+    if (retain !== undefined)
+        env.retain = retain;
     // [W7-B1] 缺省后台与自动转后台（配置键 W7-B2 登记于 config/types-w5.ts）
     const sub = config.subagents;
     env.background = resolveTaskBackground(sub?.background, deps.assembly.unattended === true);

package/dist/cli/compose-extensions.js

@@ -25,6 +25,7 @@ import { createLimitsExtension } from "../agent/limits.js";
 import { createRemindersExtension, remindersSettings } from "../agent/reminders.js";
 import { planExtensionFor } from "../plan/compose.js";
 import { createSubagentsFactory } from "./compose-agents.js";
+import { requestTimeoutsFactory } from "./compose-request.js";
 import { createExternalStatsExtension } from "../drivers/store.js";
 export function composeExtensions(deps) {
     return [
@@ -42,5 +43,6 @@ export function composeExtensions(deps) {
         // [W5-E] 外部 Agent 记账 → SessionStats.external（只主会话）
         ({ core }) => core.depth > 0 ? undefined : createExternalStatsExtension(() => core.manager.branch()),
         createSubagentsFactory(deps), // [W5-G] 子 Agent 任务注册表
+        requestTimeoutsFactory(deps), // [ME-C] request.streamIdleTimeoutMs → 每次请求的流中空闲上限
     ];
 }

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

@@ -0,0 +1,20 @@
+/**
+ * 模型请求的流中空闲超时（docs/model-efficiency-plan.md D18）。[ME-C]
+ *
+ * 等响应头仍由 `request.idleTimeoutMs` / `AMA_IDLE_TIMEOUT_MS`（compose-session.ts `idleTimeoutFrom`）
+ * 决定；流开始后两块数据之间的上限读 `AMA_STREAM_IDLE_TIMEOUT_MS` > config
+ * `request.streamIdleTimeoutMs`，都没有时协议层取缺省 180 000（ai/http.ts）。
+ *
+ * `session.ts` 不加行：值经会话扩展的 `wrapStream` 写进每次请求的 `StreamOptions.streamIdleTimeoutMs`
+ * （已显式给出的不覆盖）；工厂对主会话与 task 子会话都装（子会话沿用父的扩展表）。
+ */
+import type { SessionExtensionFactory } from "../agent/session-extensions.js";
+import type { AmaConfig } from "../config/types.js";
+import type { ComposeExtensionDeps } from "./compose-extensions.js";
+export declare const STREAM_IDLE_TIMEOUT_ENV = "AMA_STREAM_IDLE_TIMEOUT_MS";
+/** 流中空闲超时：环境变量 > config；都没有 → undefined。0 关闭；非法的环境变量值忽略并 warning。 */
+export declare function streamIdleTimeoutFrom(config: Pick<AmaConfig, "request">, env?: NodeJS.ProcessEnv, warn?: (message: string) => void): number | undefined;
+/** 给每次请求补上 `streamIdleTimeoutMs`（调用方已给出的不覆盖）。 */
+export declare function streamIdleExtension(ms: number): SessionExtensionFactory;
+/** compose-extensions.ts 表里的一行：配置或环境变量给了值才装。 */
+export declare function requestTimeoutsFactory(deps: ComposeExtensionDeps): SessionExtensionFactory;

package/dist/cli/compose-request.js

@@ -0,0 +1,37 @@
+/**
+ * 模型请求的流中空闲超时（docs/model-efficiency-plan.md D18）。[ME-C]
+ *
+ * 等响应头仍由 `request.idleTimeoutMs` / `AMA_IDLE_TIMEOUT_MS`（compose-session.ts `idleTimeoutFrom`）
+ * 决定；流开始后两块数据之间的上限读 `AMA_STREAM_IDLE_TIMEOUT_MS` > config
+ * `request.streamIdleTimeoutMs`，都没有时协议层取缺省 180 000（ai/http.ts）。
+ *
+ * `session.ts` 不加行：值经会话扩展的 `wrapStream` 写进每次请求的 `StreamOptions.streamIdleTimeoutMs`
+ * （已显式给出的不覆盖）；工厂对主会话与 task 子会话都装（子会话沿用父的扩展表）。
+ */
+import { msg } from "../i18n/index.js";
+export const STREAM_IDLE_TIMEOUT_ENV = "AMA_STREAM_IDLE_TIMEOUT_MS";
+/** 流中空闲超时：环境变量 > config；都没有 → undefined。0 关闭；非法的环境变量值忽略并 warning。 */
+export function streamIdleTimeoutFrom(config, env = process.env, warn = () => undefined) {
+    const raw = env[STREAM_IDLE_TIMEOUT_ENV];
+    if (raw !== undefined && raw.trim() !== "") {
+        const value = Number(raw);
+        if (Number.isFinite(value) && value >= 0)
+            return value;
+        warn(msg().cli.composeSession.invalidStreamIdleTimeout(raw));
+    }
+    return config.request?.streamIdleTimeoutMs;
+}
+/** 给每次请求补上 `streamIdleTimeoutMs`（调用方已给出的不覆盖）。 */
+export function streamIdleExtension(ms) {
+    return () => ({
+        id: "request-timeouts",
+        wrapStream: (stream) => (model, context, options) => stream(model, context, options.streamIdleTimeoutMs === undefined
+            ? { ...options, streamIdleTimeoutMs: ms }
+            : options),
+    });
+}
+/** compose-extensions.ts 表里的一行：配置或环境变量给了值才装。 */
+export function requestTimeoutsFactory(deps) {
+    const ms = streamIdleTimeoutFrom(deps.assembly.config, deps.env, (message) => deps.log("warn", message));
+    return ms === undefined ? () => undefined : streamIdleExtension(ms);
+}

package/dist/cli/compose-session.js

@@ -411,8 +411,8 @@ export async function createSessionAlongside(target, request, options = {}) {
     const { assembly } = record;
     const sessionDir = assembly.paths.sessionDir;
     const fresh = (id) => assembly.overrides?.noSession === true
-        ? SessionManager.inMemory(current.cwd)
-        : SessionManager.create(sessionDirForCwd(sessionDir, current.cwd), current.cwd, id !== undefined ? { id } : {});
+        ? SessionManager.inMemory(record.current.cwd)
+        : SessionManager.create(sessionDirForCwd(sessionDir, record.current.cwd), record.current.cwd, id !== undefined ? { id } : {});
     let manager;
     if (request.kind === "new")
         manager = fresh();

package/dist/cli/deps.d.ts

@@ -107,7 +107,7 @@ export interface SessionAssembly {
     /**
      * 模式层把当前会话换成另一个（`/new`、`/resume`、`/fork`、RPC `switch_session`）后调用：
      * bootstrap 让 HostApi.session.*、宿主 sendUser、Hook 公共字段与退出时的 dispose 跟随 `next`。
-     * 旧会话由调用方自行 dispose；`Runtime.session` 仍指初始会话。
+     * 旧会话由调用方自行 dispose；`Runtime.session` / `sessionManager` 也随之指向 `next`（#165）。
      */
     onSessionReplaced(next: AgentSession): void;
     /** SessionStart Hook 的 additionalContext（系统提示 hooks 节）；首次装配系统提示时读取。 */

package/dist/cli/subcommands/model-meta.d.ts

@@ -1,6 +1,7 @@
 /**
  * 模型元数据的一行描述（`ama models list`、`ama config show`、`ama providers`）：上下文、输出、思考、
- * 图片、渠道，以及每个字段来自哪里（config / 目录 / models.dev / 缺省）与 models.dev 匹配。
+ * 图片、渠道，以及每个字段来自哪里（config / 目录 / 按 id 继承的目录 / models.dev / 缺省）、继承的
+ * 目录条目与 models.dev 匹配。
  */
 import { type ModelMetadata } from "../../ai/providers/enrich.js";
 import type { Model, ProviderRegistryApi } from "../../ai/types.js";

package/dist/cli/subcommands/model-meta.js

@@ -1,6 +1,7 @@
 /**
  * 模型元数据的一行描述（`ama models list`、`ama config show`、`ama providers`）：上下文、输出、思考、
- * 图片、渠道，以及每个字段来自哪里（config / 目录 / models.dev / 缺省）与 models.dev 匹配。
+ * 图片、渠道，以及每个字段来自哪里（config / 目录 / 按 id 继承的目录 / models.dev / 缺省）、继承的
+ * 目录条目与 models.dev 匹配。
  */
 import { sourceText } from "../../ai/providers/enrich.js";
 import { matchLabel } from "../../ai/providers/models-dev.js";
@@ -52,5 +53,5 @@ export function sourcesLine(metadata) {
     };
     const parts = Object.keys(label).map((field) => `${label[field]} ${sourceText(metadata.sources[field])}`);
     const match = metadata.looked ? matchLabel(metadata.match) : undefined;
-    return t.sources(parts, match, metadata.toolCall === false);
+    return t.sources(parts, match, metadata.toolCall === false, metadata.catalog);
 }

package/dist/codemode/host-side.d.ts

@@ -1,8 +1,9 @@
 /**
  * codemode 父进程侧：起子进程、转发工具调用、超时杀树（设计 §5.5 沙箱第 1–4 条）。[B10]
  *
- * - 命令行：`<node> --permission --allow-fs-read=<入口> --disallow-code-generation-from-strings
- *   <入口> --ama-codemode-sandbox`；Node 22.0–22.12 用 `--experimental-permission`。不授予文件写、
+ * - 命令行：`<node> --max-old-space-size=<MB> --permission --allow-fs-read=<入口>
+ *   --disallow-code-generation-from-strings <入口> --ama-codemode-sandbox`；堆上限取 `codemode.maxHeapMb`
+ *   （缺省 256，0 不加），超出时子进程 OOM 退出，映射为脚本错误（docs/memory-plan.md D10）；Node 22.0–22.12 用 `--experimental-permission`。不授予文件写、
  *   子进程、worker、addon、inspector 权限；以空环境启动（拿不到密钥与会话路径）；嵌入 Electron
  *   时设 `ELECTRON_RUN_AS_NODE=1` 运行同一可执行文件。
  * - 入口：bundle 里是 ama.cjs 同目录的 `ama-sandbox.cjs`（构建脚本定义 `__AMA_SANDBOX_ENTRY__`）；
@@ -25,10 +26,12 @@ import { type ScriptOptions, type StoreSnapshot, type ToolDecl } from "./protoco
 export declare const MAX_COLLECTED_OUTPUT_CHARS: number;
 /** 外层 abort 后等子进程自行结束的宽限。 */
 export declare const ABORT_GRACE_MS = 500;
+/** 子进程 V8 老生代堆上限（MB）缺省值；`codemode.maxHeapMb` 覆盖，0 不设上限。 */
+export declare const DEFAULT_CODEMODE_HEAP_MB = 256;
 /** 子进程入口的绝对路径（realpath）；找不到 → undefined。 */
 export declare function resolveSandboxEntry(moduleUrl?: string): string | undefined;
-/** 子进程参数（不含可执行文件）。 */
-export declare function sandboxArgs(entry: string, capability?: Pick<SandboxCapability, "permissionFlag">): string[];
+/** 子进程参数（不含可执行文件）。V8 选项必须在 `--permission` 与脚本之前。 */
+export declare function sandboxArgs(entry: string, capability?: Pick<SandboxCapability, "permissionFlag">, heapMb?: number): string[];
 /** codemode 子进程的 OS 沙箱策略：拒绝网络，任何位置都不可写。 */
 export declare const CODEMODE_OS_POLICY: OsSandboxPolicy;
 /** 完整命令行：`<node> <sandboxArgs>`，有 OS 沙箱时再经它包装。 */
@@ -53,7 +56,11 @@ export interface SandboxRunRequest {
     os?: Pick<OsSandboxStatus, "kind" | "path">;
     /** true：必须经 OS 沙箱启动（Node 22 / 24 的 strict 依赖它），包装不了直接失败。 */
     requireOsSandbox?: boolean;
+    /** 子进程堆上限（MB），缺省 DEFAULT_CODEMODE_HEAP_MB；0 不设上限。 */
+    maxHeapMb?: number;
 }
+/** 子进程因堆上限 OOM 退出时给模型的文案（固定英文）。 */
+export declare function heapLimitError(heapMb: number): string;
 export interface SandboxRunResult {
     ok: boolean;
     error?: string;

package/dist/codemode/host-side.js

@@ -1,8 +1,9 @@
 /**
  * codemode 父进程侧：起子进程、转发工具调用、超时杀树（设计 §5.5 沙箱第 1–4 条）。[B10]
  *
- * - 命令行：`<node> --permission --allow-fs-read=<入口> --disallow-code-generation-from-strings
- *   <入口> --ama-codemode-sandbox`；Node 22.0–22.12 用 `--experimental-permission`。不授予文件写、
+ * - 命令行：`<node> --max-old-space-size=<MB> --permission --allow-fs-read=<入口>
+ *   --disallow-code-generation-from-strings <入口> --ama-codemode-sandbox`；堆上限取 `codemode.maxHeapMb`
+ *   （缺省 256，0 不加），超出时子进程 OOM 退出，映射为脚本错误（docs/memory-plan.md D10）；Node 22.0–22.12 用 `--experimental-permission`。不授予文件写、
  *   子进程、worker、addon、inspector 权限；以空环境启动（拿不到密钥与会话路径）；嵌入 Electron
  *   时设 `ELECTRON_RUN_AS_NODE=1` 运行同一可执行文件。
  * - 入口：bundle 里是 ama.cjs 同目录的 `ama-sandbox.cjs`（构建脚本定义 `__AMA_SANDBOX_ENTRY__`）；
@@ -29,6 +30,8 @@ import { LineSplitter, SANDBOX_MAIN_FLAG, decodeChildLine, encodeLine, } from ".
 export const MAX_COLLECTED_OUTPUT_CHARS = 16 * 1024 * 1024;
 /** 外层 abort 后等子进程自行结束的宽限。 */
 export const ABORT_GRACE_MS = 500;
+/** 子进程 V8 老生代堆上限（MB）缺省值；`codemode.maxHeapMb` 覆盖，0 不设上限。 */
+export const DEFAULT_CODEMODE_HEAP_MB = 256;
 /** 子进程入口的绝对路径（realpath）；找不到 → undefined。 */
 export function resolveSandboxEntry(moduleUrl = import.meta.url) {
     const here = dirname(fileURLToPath(moduleUrl));
@@ -44,9 +47,11 @@ export function resolveSandboxEntry(moduleUrl = import.meta.url) {
     }
     return undefined;
 }
-/** 子进程参数（不含可执行文件）。 */
-export function sandboxArgs(entry, capability = detectSandboxCapability()) {
+/** 子进程参数（不含可执行文件）。V8 选项必须在 `--permission` 与脚本之前。 */
+export function sandboxArgs(entry, capability = detectSandboxCapability(), heapMb = DEFAULT_CODEMODE_HEAP_MB) {
+    const heap = Math.floor(heapMb);
     return [
+        ...(heap > 0 ? [`--max-old-space-size=${heap}`] : []),
         capability.permissionFlag,
         `--allow-fs-read=${entry}`,
         "--disallow-code-generation-from-strings",
@@ -75,9 +80,14 @@ export function sandboxEnv(versions = process.versions, platform = process.platf
     }
     return env;
 }
+/** 子进程因堆上限 OOM 退出时给模型的文案（固定英文）。 */
+export function heapLimitError(heapMb) {
+    return `Script exceeded the codemode memory limit (${heapMb} MB); process the data in smaller pieces`;
+}
 export async function runSandbox(request) {
     const started = Date.now();
     const entry = request.entry ?? resolveSandboxEntry();
+    const heapMb = Math.floor(request.maxHeapMb ?? DEFAULT_CODEMODE_HEAP_MB);
     const base = {
         outputs: [],
         timedOut: false,
@@ -96,7 +106,7 @@ export async function runSandbox(request) {
     if (request.signal.aborted) {
         return { ...base, ok: false, error: "Script aborted", aborted: true, elapsedMs: 0 };
     }
-    const command = sandboxCommand(request.nodePath ?? process.execPath, sandboxArgs(entry, request.capability), request.os ?? osSandboxStatus());
+    const command = sandboxCommand(request.nodePath ?? process.execPath, sandboxArgs(entry, request.capability, heapMb), request.os ?? osSandboxStatus());
     if (request.requireOsSandbox === true && !command.networkDenied) {
         return {
             ...base,
@@ -121,6 +131,7 @@ export async function runSandbox(request) {
         result.pid = pid;
     let collected = 0;
     let stderr = "";
+    let outOfMemory = false;
     let settled = false;
     let finish;
     const finished = new Promise((resolve) => (finish = resolve));
@@ -166,7 +177,11 @@ export async function runSandbox(request) {
     child.stdin.on("error", () => { });
     child.stderr.setEncoding("utf8");
     child.stderr.on("data", (chunk) => {
-        stderr = (stderr + chunk).slice(-4000);
+        stderr = stderr + chunk;
+        // 原生栈可能把 OOM 那行挤出 4000 字符的尾部：在截断前判定
+        if (heapMb > 0 && /heap out of memory/i.test(stderr))
+            outOfMemory = true;
+        stderr = stderr.slice(-4000);
     });
     const splitter = new LineSplitter();
     const onLine = (line) => {
@@ -247,6 +262,10 @@ export async function runSandbox(request) {
             onLine(line);
         if (pid !== undefined && !isWindows)
             untrackProcessGroup(pid);
+        if (outOfMemory) {
+            settle({ ok: false, error: heapLimitError(heapMb) });
+            return;
+        }
         const detail = stderr.trim().split("\n").slice(-3).join(" | ");
         settle({
             ok: false,

package/dist/codemode/tool.d.ts

@@ -48,6 +48,8 @@ export interface CodemodeToolOptions {
     /** 子进程入口（测试 / 嵌入方覆盖）。 */
     entry?: string;
     nodePath?: string;
+    /** 子进程堆上限（MB，`codemode.maxHeapMb`）；缺省 256，0 不设上限。 */
+    maxHeapMb?: number;
 }
 export interface CodemodeDetails {
     ok: boolean;

package/dist/codemode/tool.js

@@ -222,6 +222,7 @@ export function createCodemodeTool(options) {
                 requireOsSandbox: strictNeedsOsSandbox(capability),
                 ...(options.entry !== undefined ? { entry: options.entry } : {}),
                 ...(options.nodePath !== undefined ? { nodePath: options.nodePath } : {}),
+                ...(options.maxHeapMb !== undefined ? { maxHeapMb: options.maxHeapMb } : {}),
                 callTool: async (name, args, signal) => {
                     if (!callable.has(name))
                         throw new Error(`Tool ${name} is not available in codemode`);
@@ -316,6 +317,9 @@ export function codemodeToolFactory(overrides = {}) {
         const budget = ctx.config.codemode?.inlineBudget;
         if (budget !== undefined)
             options.inlineBudget = budget;
+        const heapMb = ctx.config.codemode?.maxHeapMb;
+        if (heapMb !== undefined)
+            options.maxHeapMb = heapMb;
         const maxChars = ctx.config.tools?.maxToolResultChars;
         if (maxChars !== undefined)
             options.maxResultChars = maxChars;

package/dist/config/json-schema.js

@@ -11,7 +11,7 @@ import { PERMISSION_MODES_STRICT_FIRST } from "../permissions/types.js";
 import { msg } from "../i18n/index.js";
 import { defaultFor, isDynamicDefault, keyDoc } from "./key-docs.js";
 import { HOOK_TIMEOUT_MAX_MS, THINKING_LEVELS } from "./schema.js";
-import { CACHE_RETENTIONS, CHANNEL_NAME_PATTERN, CHECKPOINT_MODES, SANDBOX_ENABLED_MODES, SANDBOX_NETWORK_MODES, CODEMODE_MODES, IMAGE_RESIZE_MODES, PLAN_BASH_MODES_STRICT_FIRST, PLAN_UNATTENDED_MODES, STATUS_LINE_MODES, TOOLS_PRESET_INPUTS, LANGUAGE_SETTINGS, AGENT_BAR_MODES, CHATGPT_FLAVORS, MEMORY_SCOPES, MEMORY_SUBAGENT_MODES, } from "./types.js";
+import { CACHE_RETENTIONS, CHANNEL_NAME_PATTERN, CHECKPOINT_MODES, SANDBOX_ENABLED_MODES, SANDBOX_NETWORK_MODES, CODEMODE_MODES, IMAGE_RESIZE_MODES, PLAN_BASH_MODES_STRICT_FIRST, PLAN_UNATTENDED_MODES, STATUS_LINE_MODES, TOOLS_PRESET_INPUTS, LANGUAGE_SETTINGS, AGENT_BAR_MODES, CHATGPT_FLAVORS, MEMORY_SCOPES, MEMORY_SUBAGENT_MODES, MIN_CONTEXT_BUDGET, } from "./types.js";
 import { AGENT_ID_PATTERN } from "./schema-w5.js";
 import { AGENTS_RESERVED_KEYS, SUBAGENT_BACKGROUND_MODES } from "./types-w5.js";
 export const CONFIG_SCHEMA_FILE = "config.schema.json";
@@ -89,6 +89,10 @@ function providerSchema() {
                 description: m.modelsDev,
                 anyOf: [{ type: "string", pattern: "^[^/]+/.+$" }, { const: false }],
             },
+            catalog: {
+                description: m.modelCatalog,
+                anyOf: [{ type: "string", pattern: "^[^/]+/.+$" }, { const: false }],
+            },
             headers: stringRecord,
             compat,
             promptCache: object({ short: num(), long: num(), minTokens: num() }),
@@ -156,6 +160,7 @@ function w5Sections() {
             defaultModel: str(),
             background: oneOf(SUBAGENT_BACKGROUND_MODES),
             autoBackgroundAfterMs: num(0),
+            retainSessions: num(0),
         }),
         models: object({ aliases: object({ fast: str(), strong: str() }), enabled: strings }),
         fallbackModel: str(),
@@ -244,6 +249,7 @@ function buildBaseSchema() {
                 enabled: bool(),
                 reserveTokens: num(0),
                 keepRecentTokens: num(0),
+                contextBudget: num(MIN_CONTEXT_BUDGET),
                 prune: object({
                     keepResults: num(0),
                     clearAtLeast: { anyOf: [{ const: "auto" }, { type: "number", minimum: 0 }] },
@@ -267,6 +273,7 @@ function buildBaseSchema() {
                 mode: oneOf(CODEMODE_MODES),
                 inlineBudget: num(0),
                 requireStrict: bool(),
+                maxHeapMb: num(0),
             }),
             hooks: object({ timeoutMs: num(1, HOOK_TIMEOUT_MAX_MS) }),
             ui: object({
@@ -295,7 +302,7 @@ function buildBaseSchema() {
                 missNotices: bool(),
                 warmSubagents: bool(),
             }),
-            request: object({ idleTimeoutMs: num(0) }),
+            request: object({ idleTimeoutMs: num(0), streamIdleTimeoutMs: num(0) }),
             checkpoints: object({
                 mode: oneOf(CHECKPOINT_MODES),
                 maxFileBytes: num(0),

package/dist/config/key-docs.js

@@ -14,15 +14,18 @@ import { DEFAULT_CODEX_CLIENT_VERSION } from "../auth/chatgpt/presets.js";
 import { messagesFor, msg } from "../i18n/index.js";
 import { DEFAULT_INLINE_BUDGET } from "../codemode/declarations.js";
 import { DEFAULT_CONFIG, mergeConfig } from "./merge.js";
-import { DEFAULT_CACHE_CONFIG, DEFAULT_CHECKPOINTS_CONFIG } from "./types.js";
+import { DEFAULT_CACHE_CONFIG, DEFAULT_CHECKPOINTS_CONFIG, DEFAULT_STREAM_IDLE_TIMEOUT_MS, } from "./types.js";
 /** 代码里生效、但 DEFAULT_CONFIG 不写的缺省（写进去会改变合并结果或 `config.codemode` 的有无）。 */
 const IMPLICIT_DEFAULTS = {
     providers: {},
     permission: { builtinDeny: true, autoSafeCommands: [] },
     tools: { default: [] },
-    codemode: { inlineBudget: DEFAULT_INLINE_BUDGET, requireStrict: false },
+    codemode: { inlineBudget: DEFAULT_INLINE_BUDGET, requireStrict: false, maxHeapMb: 256 },
     cache: { ...DEFAULT_CACHE_CONFIG },
-    request: { idleTimeoutMs: DEFAULT_IDLE_TIMEOUT_MS },
+    request: {
+        idleTimeoutMs: DEFAULT_IDLE_TIMEOUT_MS,
+        streamIdleTimeoutMs: DEFAULT_STREAM_IDLE_TIMEOUT_MS,
+    },
     ui: {
         compact: false,
         logo: "auto",
@@ -56,7 +59,13 @@ const IMPLICIT_DEFAULTS = {
     images: { resize: "auto" },
     plan: { bash: "readonly", unattended: "stop" },
     agents: { maxConcurrent: 3, dirs: [] },
-    subagents: { maxConcurrent: 4, maxPending: 16, background: "auto", autoBackgroundAfterMs: 0 },
+    subagents: {
+        maxConcurrent: 4,
+        maxPending: 16,
+        background: "auto",
+        autoBackgroundAfterMs: 0,
+        retainSessions: 4,
+    },
     reminders: { todo: true, fileChanges: true, contextPressure: true, budget: true },
     todo: { reminder: 10 },
 };

package/dist/config/schema-w5.js

@@ -83,12 +83,20 @@ export function validateConfigW5(c, config) {
         c.oneOf(s, "thinkingLevel", p, THINKING_LEVELS);
     });
     checkAgents(c, config);
-    checkSection(c, config, "subagents", ["maxConcurrent", "maxPending", "defaultModel", "background", "autoBackgroundAfterMs"], (s, p) => {
+    checkSection(c, config, "subagents", [
+        "maxConcurrent",
+        "maxPending",
+        "defaultModel",
+        "background",
+        "autoBackgroundAfterMs",
+        "retainSessions",
+    ], (s, p) => {
         c.number(s, "maxConcurrent", p, 1, 64);
         c.number(s, "maxPending", p, 0, 1024);
         c.string(s, "defaultModel", p);
         c.oneOf(s, "background", p, SUBAGENT_BACKGROUND_MODES);
         c.number(s, "autoBackgroundAfterMs", p, 0);
+        c.number(s, "retainSessions", p, 0);
     });
     checkSection(c, config, "models", ["aliases", "enabled"], (s, p) => {
         c.stringArray(s, "enabled", p);

package/dist/config/schema.d.ts

@@ -5,7 +5,7 @@
  * 校验结果是诊断列表：`severity: "error"` 拒绝该文件（启动退出码 3），`"warning"` 只提示
  * （未知字段等）。`path` 是 JSON 指针风格的字段路径（`permission.mode`、`hooks.PreToolUse[0]`）。
  */
-import type { AmaConfig, AuthFile, ProfileFile, TrustFile } from "./types.js";
+import { type AmaConfig, type AuthFile, type ProfileFile, type TrustFile } from "./types.js";
 import { type Diagnostic } from "./checker.js";
 import type { HookConfig } from "../hooks/types.js";
 export type { AmaConfig, AuthFile, ProfileFile, TrustFile, TrustEntry, ProviderConfig, PermissionConfig, CompactionConfig, RetryConfig, ToolsConfig, ToolsPreset, ToolsPresetInput, CodemodeConfig, CodemodeMode, HooksSettings, UiConfig, SkillsConfig, CacheConfig, CheckpointsConfig, ModelConfig, ModelOverride, ChannelConfig, } from "./types.js";

package/dist/config/schema.js

@@ -7,6 +7,7 @@
  */
 import { isAbsolute } from "node:path";
 import { msg } from "../i18n/index.js";
+import { MIN_CONTEXT_BUDGET, } from "./types.js";
 import { Checker, THINKING_LEVELS, checkSection, join, } from "./checker.js";
 import { W5_COMPACTION_KEYS, W5_CONFIG_KEYS, W5_UI_KEYS, checkCompactionW5, checkUiW5, validateConfigW5, } from "./schema-w5.js";
 import { W6_CONFIG_KEYS, W6_UI_KEYS, checkOAuthEntry, checkProfileMemory, checkUiW6, validateConfigW6, } from "./schema-w6.js";
@@ -93,6 +94,12 @@ function checkModels(c, value, path, channels) {
             (typeof modelsDev !== "string" || !/^[^/]+\/.+$/.test(modelsDev))) {
             c.error(join(p, "modelsDev"), msg().config.schema.modelsDev);
         }
+        const catalog = item["catalog"];
+        if (catalog !== undefined &&
+            catalog !== false &&
+            (typeof catalog !== "string" || !/^[^/]+\/.+$/.test(catalog))) {
+            c.error(join(p, "catalog"), msg().config.schema.catalog);
+        }
         c.stringArray(item, "channels", p);
         const used = item["channels"];
         if (Array.isArray(used)) {
@@ -221,11 +228,18 @@ export function validateConfig(value) {
             c.error(join(p, "builtinDeny"), msg().config.schema.builtinDeny);
         }
     });
-    const compactionKeys = ["enabled", "reserveTokens", "keepRecentTokens", ...W5_COMPACTION_KEYS];
+    const compactionKeys = [
+        "enabled",
+        "reserveTokens",
+        "keepRecentTokens",
+        "contextBudget",
+        ...W5_COMPACTION_KEYS,
+    ];
     checkSection(c, value, "compaction", compactionKeys, (s, p) => {
         c.boolean(s, "enabled", p);
         c.number(s, "reserveTokens", p);
         c.number(s, "keepRecentTokens", p);
+        c.number(s, "contextBudget", p, MIN_CONTEXT_BUDGET);
         checkCompactionW5(c, s, p);
     });
     checkSection(c, value, "retry", ["enabled", "maxRetries", "baseDelayMs", "maxDelayMs"], (s, p) => {
@@ -241,10 +255,11 @@ export function validateConfig(value) {
         c.number(s, "bashTimeoutMs", p, 1);
         c.stringArray(s, "disabled", p);
     });
-    checkSection(c, value, "codemode", ["mode", "inlineBudget", "requireStrict"], (s, p) => {
+    checkSection(c, value, "codemode", ["mode", "inlineBudget", "requireStrict", "maxHeapMb"], (s, p) => {
         c.oneOf(s, "mode", p, CODEMODE_MODES);
         c.number(s, "inlineBudget", p, 0);
         c.boolean(s, "requireStrict", p);
+        c.number(s, "maxHeapMb", p, 0);
     });
     checkSection(c, value, "hooks", ["timeoutMs"], (s, p) => {
         c.number(s, "timeoutMs", p, 1, HOOK_TIMEOUT_MAX_MS);
@@ -281,8 +296,9 @@ export function validateConfig(value) {
         checkUiW6(c, s, p);
     });
     checkSection(c, value, "skills", ["dirs"], (s, p) => c.stringArray(s, "dirs", p));
-    checkSection(c, value, "request", ["idleTimeoutMs"], (s, p) => {
+    checkSection(c, value, "request", ["idleTimeoutMs", "streamIdleTimeoutMs"], (s, p) => {
         c.number(s, "idleTimeoutMs", p, 0);
+        c.number(s, "streamIdleTimeoutMs", p, 0);
     });
     checkSection(c, value, "checkpoints", ["mode", "maxFileBytes", "keep"], (s, p) => {
         c.oneOf(s, "mode", p, CHECKPOINT_MODES);

package/dist/config/settings-registry.js

@@ -57,6 +57,7 @@ const ROWS = [
     row("codemode.mode", "tools", "restart", "tighten", { prefix: true }),
     row("codemode.inlineBudget", "tools", "restart", "deny", { prefix: true }),
     row("codemode.requireStrict", "tools", "restart", "deny"),
+    row("codemode.maxHeapMb", "tools", "restart", "deny"),
     row("tools.maxToolResultChars", "tools", "nextSession", "deny"),
     row("tools.bashTimeoutMs", "tools", "restart", "deny"),
     row("images.resize", "tools", "restart", "deny"),
@@ -64,6 +65,7 @@ const ROWS = [
     row("compaction.enabled", "context", "now", "any"),
     row("compaction.reserveTokens", "context", "nextSession", "any"),
     row("compaction.keepRecentTokens", "context", "nextSession", "any"),
+    row("compaction.contextBudget", "context", "nextSession", "any", { kind: "optionalNumber" }),
     row("compaction.prune.keepResults", "context", "nextSession", "deny"),
     row("compaction.prune.clearAtLeast", "context", "nextSession", "deny"),
     row("cache.warming", "context", "now", "deny", { envOverride: "AMA_CACHE_WARMING" }),
@@ -74,6 +76,9 @@ const ROWS = [
     row("request.idleTimeoutMs", "context", "nextSession", "deny", {
         envOverride: "AMA_IDLE_TIMEOUT_MS",
     }),
+    row("request.streamIdleTimeoutMs", "context", "nextSession", "deny", {
+        envOverride: "AMA_STREAM_IDLE_TIMEOUT_MS",
+    }),
     row("retry.enabled", "context", "now", "deny"),
     row("retry.maxRetries", "context", "nextSession", "deny"),
     row("retry.baseDelayMs", "context", "nextSession", "deny"),
@@ -95,6 +100,7 @@ const ROWS = [
     row("agents.sessionBudgetUsd", "agents", "nextSession", "deny", { kind: "optionalNumber" }),
     row("subagents.maxConcurrent", "agents", "nextSession", "deny"),
     row("subagents.maxPending", "agents", "nextSession", "deny"),
+    row("subagents.retainSessions", "agents", "nextSession", "deny"),
     // [W7-B2] 改 task 工具描述（缺省后台 / 前台两种文案），故 prefix
     row("subagents.background", "agents", "restart", "any", { prefix: true }),
     row("subagents.autoBackgroundAfterMs", "agents", "restart", "any"),

package/dist/config/types-w5.d.ts

@@ -77,6 +77,8 @@ export interface SubagentsConfig {
     background?: SubagentBackgroundMode;
     /** [W7-B2] 前台任务运行超过该毫秒数自动转后台；缺省 0 关闭。用户 / 项目级都认。 */
     autoBackgroundAfterMs?: number;
+    /** [M-F] 已结束子会话保留在内存的句柄数（LRU），缺省 4；超出的续聊时从会话文件重开。只认用户级。 */
+    retainSessions?: number;
 }
 /** `models.enabled` 的一项：`provider/model[@channel]` 或 `provider/*`。 */
 export declare const MODELS_ENABLED_REF: RegExp;

package/dist/config/types.d.ts

@@ -31,6 +31,11 @@ export type ModelConfig = Partial<Omit<Model, "id" | "provider" | "channel" | "c
     channels?: string[];
     /** models.dev 条目 `provider/model`（显式匹配）；false 关闭 models.dev 补全。 */
     modelsDev?: string | false;
+    /**
+     * [ME-C0] 从内置目录继承模型固有属性：缺省按 id 别名自动匹配；`"provider/id"` 显式指定；false 关闭
+     * （docs/model-efficiency-plan.md D10，实现归 ME-D）。
+     */
+    catalog?: string | false;
 };
 /** 只改元数据的覆盖项（含模型级 `api` 与 `channels`）。 */
 export type ModelOverride = ModelConfig;
@@ -83,6 +88,8 @@ export interface CompactionConfig {
     enabled?: boolean;
     reserveTokens?: number;
     keepRecentTokens?: number;
+    /** [ME-C0] 软窗口（≥ 32768）：档一 / 档二 / context_pressure 的窗口取 min(模型窗口, 它)；缺省 = 模型窗口。 */
+    contextBudget?: number;
     /** [W5-C0] 档一裁剪参数（W5-H1）；只认用户级。 */
     prune?: PruneConfig;
     /** [W5-C0] 不被档一裁剪的工具名（W5-H1）；只认用户级。 */
@@ -129,6 +136,8 @@ export interface CodemodeConfig {
     inlineBudget?: number;
     /** true：运行时 Node 的权限模型不隔离网络（Node 22 / 24）时直接禁用 codemode。 */
     requireStrict?: boolean;
+    /** [M-F] 脚本子进程的 V8 堆上限（MB，`--max-old-space-size`），缺省 256，0 不加；只认用户级。 */
+    maxHeapMb?: number;
 }
 export interface HooksSettings {
     timeoutMs?: number;
@@ -183,9 +192,18 @@ export declare const DEFAULT_CACHE_CONFIG: Readonly<Required<CacheConfig>>;
  * 模型请求（W4-C）。只认用户级 / profile；环境变量 `AMA_IDLE_TIMEOUT_MS` 覆盖 `idleTimeoutMs`。
  */
 export interface RequestConfig {
-    /** 等响应头与流中两块数据之间的最长间隔（毫秒），收到任何字节即重新计时；缺省 300 000，0 关闭。 */
+    /** 等响应头的最长时间（毫秒）；缺省 300 000，0 关闭。流中的间隔见 `streamIdleTimeoutMs`。 */
     idleTimeoutMs?: number;
+    /**
+     * [ME-C0] 流中两块数据之间的最长间隔（毫秒）；缺省 180 000，0 关闭；环境变量
+     * `AMA_STREAM_IDLE_TIMEOUT_MS` 覆盖（cli/compose-request.ts）。
+     */
+    streamIdleTimeoutMs?: number;
 }
+/** [ME-C0] `compaction.contextBudget` 的下限。 */
+export declare const MIN_CONTEXT_BUDGET = 32768;
+/** [ME-C0] `request.streamIdleTimeoutMs` 的缺省（毫秒）。 */
+export declare const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 180000;
 export declare const CHECKPOINT_MODES: readonly CheckpointMode[];
 /**
  * 检查点（docs/rewind-plan.md §5）。环境变量 `AMA_CHECKPOINTS` 覆盖 `mode`；项目级只接受