@armadra/agent 0.7.2 → 0.7.4

package/dist/i18n/catalog.d.ts

@@ -158,6 +158,7 @@ declare const en: {
             invalidCacheWarming: (value: string) => string;
             invalidCacheRetention: (value: string) => string;
             invalidIdleTimeout: (value: string) => string;
+            invalidStreamIdleTimeout: (value: string) => string;
             notSessionManager: string;
             apiNotImplemented: (ref: string, api: string, viaOpenrouter: boolean) => string;
             appendToolFailed: (name: string, message: string) => string;
@@ -361,7 +362,7 @@ declare const en: {
             image: string;
             channels: (names: readonly string[]) => string;
             price: string;
-            sources: (parts: readonly string[], match: string | undefined, noTools: boolean) => string;
+            sources: (parts: readonly string[], match: string | undefined, noTools: boolean, catalog?: string) => string;
         };
         cacheProbe: {
             adviceSilent: (provider: string, cacheFieldPresent: boolean) => string;
@@ -1152,6 +1153,7 @@ declare const en: {
             keySource: string;
             sourceUsage: (usage: string, estimate: string) => string;
             sourceEstimate: string;
+            sourcePrefix: string;
             keyAutoCompact: string;
             autoCompact: (at: string, distance: string) => string;
             autoCompactReached: (at: string) => string;
@@ -1162,6 +1164,7 @@ declare const en: {
             breakdown: (total: string) => string;
             prefixCounted: string;
             prefixPending: string;
+            prefixEstimated: string;
             categories: {
                 system: string;
                 tools: string;
@@ -1196,6 +1199,7 @@ declare const en: {
             missModel: string;
             missTools: string;
             missSystem: string;
+            missSystemSections: (sections: string) => string;
             missPrefix: string;
             missEvicted: string;
             missNotice: (reason: string, tokens: string, cost: string | undefined) => string;
@@ -1350,6 +1354,7 @@ declare const en: {
             "compaction.enabled": string;
             "compaction.reserveTokens": string;
             "compaction.keepRecentTokens": string;
+            "compaction.contextBudget": string;
             "compaction.prune": string;
             "compaction.prune.keepResults": string;
             "compaction.prune.clearAtLeast": string;
@@ -1369,6 +1374,7 @@ declare const en: {
             "codemode.mode": string;
             "codemode.inlineBudget": string;
             "codemode.requireStrict": string;
+            "codemode.maxHeapMb": string;
             hooks: string;
             "hooks.timeoutMs": string;
             ui: string;
@@ -1408,6 +1414,7 @@ declare const en: {
             cache: string;
             request: string;
             "request.idleTimeoutMs": string;
+            "request.streamIdleTimeoutMs": string;
             "cache.warming": string;
             "cache.retention": string;
             "cache.minSavingsUsd": string;
@@ -1437,6 +1444,7 @@ declare const en: {
             subagents: string;
             "subagents.maxConcurrent": string;
             "subagents.maxPending": string;
+            "subagents.retainSessions": string;
             "subagents.defaultModel": string;
             "subagents.background": string;
             "subagents.autoBackgroundAfterMs": string;
@@ -1474,6 +1482,7 @@ declare const en: {
             "models.enabled": string;
             fallbackModel: string;
             "limits.maxTurns": string;
+            "compaction.contextBudget": string;
             "limits.maxCostUsd": string;
             "ui.replyLanguage": string;
             "ui.agentBar": string;
@@ -1497,6 +1506,7 @@ declare const en: {
             stringArray: string;
             array: string;
             modelsDev: string;
+            catalog: string;
             modelsEnabled: string;
             noChannels: string;
             unknownChannelOf: (name: string, available: readonly string[]) => string;
@@ -1575,6 +1585,7 @@ declare const en: {
             input: string;
             modelChannels: string;
             modelsDev: string;
+            modelCatalog: string;
             baseUrl: string;
             channelApiKey: string;
             apiKey: string;
@@ -1759,7 +1770,7 @@ declare const en: {
             lookupFailure: (ref: string, reason: Extract<import("../index.js").ModelLookup, {
                 ok: false;
             }>["reason"], list: string, hasCandidates: boolean) => string;
-            source: (source: import("../ai/providers/enrich.js").FieldSource) => string;
+            source: (source: import("../ai/providers/enrich.js").FieldSource | "catalog-alias") => string;
             unmatched: string;
             match: (kind: import("../ai/providers/models-dev.js").MatchKind, ref: string, normalized: string | undefined) => string;
             consensus: (key: string, entries: number, groups: number, best: number, signature: string) => string;
@@ -2170,6 +2181,7 @@ declare const en: {
             "compaction.enabled": string;
             "compaction.reserveTokens": string;
             "compaction.keepRecentTokens": string;
+            "compaction.contextBudget": string;
             "compaction.prune.keepResults": string;
             "compaction.prune.clearAtLeast": string;
             "cache.warming": string;
@@ -2178,6 +2190,7 @@ declare const en: {
             "cache.missNotices": string;
             "cache.warmSubagents": string;
             "request.idleTimeoutMs": string;
+            "request.streamIdleTimeoutMs": string;
             "retry.enabled": string;
             "retry.maxRetries": string;
             "retry.baseDelayMs": string;

package/dist/i18n/messages/cli.d.ts

@@ -156,6 +156,7 @@ export declare const en: {
         invalidCacheWarming: (value: string) => string;
         invalidCacheRetention: (value: string) => string;
         invalidIdleTimeout: (value: string) => string;
+        invalidStreamIdleTimeout: (value: string) => string;
         notSessionManager: string;
         apiNotImplemented: (ref: string, api: string, viaOpenrouter: boolean) => string;
         appendToolFailed: (name: string, message: string) => string;
@@ -321,6 +322,7 @@ export declare const zh: {
         invalidCacheWarming: (value: string) => string;
         invalidCacheRetention: (value: string) => string;
         invalidIdleTimeout: (value: string) => string;
+        invalidStreamIdleTimeout: (value: string) => string;
         notSessionManager: string;
         apiNotImplemented: (ref: string, api: string, viaOpenrouter: boolean) => string;
         appendToolFailed: (name: string, message: string) => string;

package/dist/i18n/messages/cli.js

@@ -144,6 +144,7 @@ export const en = {
         invalidCacheWarming: (value) => `AMA_CACHE_WARMING=${value} is invalid (off | streaming | idle), ignored`,
         invalidCacheRetention: (value) => `AMA_CACHE_RETENTION=${value} is invalid (none | short | long), ignored`,
         invalidIdleTimeout: (value) => `AMA_IDLE_TIMEOUT_MS=${value} is invalid (expected milliseconds ≥ 0), ignored`,
+        invalidStreamIdleTimeout: (value) => `AMA_STREAM_IDLE_TIMEOUT_MS=${value} is invalid (expected milliseconds ≥ 0), ignored`,
         notSessionManager: "The composition root only accepts SessionManager instances (created by sessions.open)",
         apiNotImplemented: (ref, api, viaOpenrouter) => `Protocol ${api} of model ${ref} is not implemented yet` +
             (viaOpenrouter ? "; go through openrouter for now" : ""),
@@ -294,6 +295,7 @@ export const zh = {
         invalidCacheWarming: (value) => `AMA_CACHE_WARMING=${value} 无效（off | streaming | idle），已忽略`,
         invalidCacheRetention: (value) => `AMA_CACHE_RETENTION=${value} 无效（none | short | long），已忽略`,
         invalidIdleTimeout: (value) => `AMA_IDLE_TIMEOUT_MS=${value} 无效（应为不小于 0 的毫秒数），已忽略`,
+        invalidStreamIdleTimeout: (value) => `AMA_STREAM_IDLE_TIMEOUT_MS=${value} 无效（应为不小于 0 的毫秒数），已忽略`,
         notSessionManager: "组装根只接受 SessionManager 实例（由 sessions.open 创建）",
         apiNotImplemented: (ref, api, viaOpenrouter) => `模型 ${ref} 的协议 ${api} 尚未实现` + (viaOpenrouter ? "；过渡期请经 openrouter 调用" : ""),
         appendToolFailed: (name, message) => `追加工具 ${name} 失败：${message}`,

package/dist/i18n/messages/config-keys.d.ts

@@ -23,6 +23,7 @@ export declare const en: {
         "compaction.enabled": string;
         "compaction.reserveTokens": string;
         "compaction.keepRecentTokens": string;
+        "compaction.contextBudget": string;
         "compaction.prune": string;
         "compaction.prune.keepResults": string;
         "compaction.prune.clearAtLeast": string;
@@ -42,6 +43,7 @@ export declare const en: {
         "codemode.mode": string;
         "codemode.inlineBudget": string;
         "codemode.requireStrict": string;
+        "codemode.maxHeapMb": string;
         hooks: string;
         "hooks.timeoutMs": string;
         ui: string;
@@ -81,6 +83,7 @@ export declare const en: {
         cache: string;
         request: string;
         "request.idleTimeoutMs": string;
+        "request.streamIdleTimeoutMs": string;
         "cache.warming": string;
         "cache.retention": string;
         "cache.minSavingsUsd": string;
@@ -110,6 +113,7 @@ export declare const en: {
         subagents: string;
         "subagents.maxConcurrent": string;
         "subagents.maxPending": string;
+        "subagents.retainSessions": string;
         "subagents.defaultModel": string;
         "subagents.background": string;
         "subagents.autoBackgroundAfterMs": string;
@@ -147,6 +151,7 @@ export declare const en: {
         "models.enabled": string;
         fallbackModel: string;
         "limits.maxTurns": string;
+        "compaction.contextBudget": string;
         "limits.maxCostUsd": string;
         "ui.replyLanguage": string;
         "ui.agentBar": string;
@@ -172,6 +177,7 @@ export declare const zh: {
         "compaction.enabled": string;
         "compaction.reserveTokens": string;
         "compaction.keepRecentTokens": string;
+        "compaction.contextBudget": string;
         "compaction.prune": string;
         "compaction.prune.keepResults": string;
         "compaction.prune.clearAtLeast": string;
@@ -191,6 +197,7 @@ export declare const zh: {
         "codemode.mode": string;
         "codemode.inlineBudget": string;
         "codemode.requireStrict": string;
+        "codemode.maxHeapMb": string;
         hooks: string;
         "hooks.timeoutMs": string;
         ui: string;
@@ -230,6 +237,7 @@ export declare const zh: {
         cache: string;
         request: string;
         "request.idleTimeoutMs": string;
+        "request.streamIdleTimeoutMs": string;
         "cache.warming": string;
         "cache.retention": string;
         "cache.minSavingsUsd": string;
@@ -259,6 +267,7 @@ export declare const zh: {
         subagents: string;
         "subagents.maxConcurrent": string;
         "subagents.maxPending": string;
+        "subagents.retainSessions": string;
         "subagents.defaultModel": string;
         "subagents.background": string;
         "subagents.autoBackgroundAfterMs": string;
@@ -296,6 +305,7 @@ export declare const zh: {
         "models.enabled": string;
         fallbackModel: string;
         "limits.maxTurns": string;
+        "compaction.contextBudget": string;
         "limits.maxCostUsd": string;
         "ui.replyLanguage": string;
         "ui.agentBar": string;

package/dist/i18n/messages/config-keys.js

@@ -23,6 +23,7 @@ const dynamicDefaultsEn = {
     "models.enabled": "unset: /model shows every model of configured providers",
     fallbackModel: "unset: no fallback",
     "limits.maxTurns": "unset: unlimited",
+    "compaction.contextBudget": "unset: the model's context window",
     "limits.maxCostUsd": "unset: unlimited",
     "ui.replyLanguage": "unset: no reply-language rule is appended (zero-byte change)",
     "ui.agentBar": "auto (embedding hosts turn it off in their profile)",
@@ -46,6 +47,7 @@ const dynamicDefaultsZh = {
     "models.enabled": "不设：/model 显示已配置供应商的全部模型",
     fallbackModel: "不设：不回退",
     "limits.maxTurns": "不设：不限",
+    "compaction.contextBudget": "不设：模型的上下文窗口",
     "limits.maxCostUsd": "不设：不限",
     "ui.replyLanguage": "不设：不追加回复语言规则（零字节变化）",
     "ui.agentBar": "auto（嵌入宿主要关在自己的 profile 写 off）",
@@ -70,6 +72,7 @@ const keysEn = {
     "compaction.enabled": "Compact automatically when the context nears its limit",
     "compaction.reserveTokens": "Tokens reserved for the reply; compaction starts when less is left",
     "compaction.keepRecentTokens": "Tokens of recent messages kept verbatim when compacting",
+    "compaction.contextBudget": "Soft context window (tokens, at least 32768): pruning, compaction and context-pressure notices use min(model window, this value); lower it to keep long sessions cheaper on large-window models",
     "compaction.prune": "Tier-one pruning (old tool results replaced with placeholders); user level only (effective from wave 5 W5-H1)",
     "compaction.prune.keepResults": "Keep the most recent N tool results unpruned",
     "compaction.prune.clearAtLeast": "Prune only when at least this many tokens are saved (avoids breaking the cache too often); auto = max(20000, 0.1 × context budget)",
@@ -89,6 +92,7 @@ const keysEn = {
     "codemode.mode": "off | on | only; when unset it follows the preset: default → on (Node ≥ 25; Node 22 / 24 → off), codemode-only → only, minimal / coordinator → off; project level only accepts off",
     "codemode.inlineBudget": "Budget (estimated tokens) for inlining tool declarations in the description in only mode; beyond it only names are listed",
     "codemode.requireStrict": "true: disable codemode when the runtime Node does not isolate the network (Node 22 / 24)",
+    "codemode.maxHeapMb": "V8 heap limit (MB) for the script child process; a script that exceeds it ends with an error; 0 sets no limit",
     hooks: "Hook settings (the hooks themselves live in hooks.json)",
     "hooks.timeoutMs": "Default timeout for a single hook command (ms)",
     ui: "Terminal interface",
@@ -127,7 +131,8 @@ const keysEn = {
     "skills.dirs": "Extra skill directories; accumulated across levels",
     cache: "Prompt caching; the whole section is user level only",
     request: "Model requests; the whole section is user level / profile only",
-    "request.idleTimeoutMs": "Stream idle timeout (ms): waiting longer for headers or between two chunks counts as stuck and is retried as a retryable error; 0 disables; AMA_IDLE_TIMEOUT_MS overrides",
+    "request.idleTimeoutMs": "Response idle timeout (ms): waiting longer than this for the response headers counts as stuck and is retried as a retryable error (gaps inside the stream use request.streamIdleTimeoutMs); 0 disables; AMA_IDLE_TIMEOUT_MS overrides",
+    "request.streamIdleTimeoutMs": "Idle limit between two chunks once the stream has started (ms); longer than the header wait because reasoning endpoints can stay silent while thinking; 0 disables; AMA_STREAM_IDLE_TIMEOUT_MS overrides",
     "cache.warming": "Warming: off disables, streaming warms while generating, idle also warms while idle",
     "cache.retention": "Cache retention tier: none, short, long (when the provider supports it)",
     "cache.minSavingsUsd": "Minimum expected savings (USD) for warming",
@@ -157,6 +162,7 @@ const keysEn = {
     subagents: "ama's own task sub-sessions; user level only except background / autoBackgroundAfterMs (effective from wave 5 W5-G)",
     "subagents.maxConcurrent": "Sub-sessions running at the same time",
     "subagents.maxPending": "Queue limit; task fails beyond it",
+    "subagents.retainSessions": "Finished sub-sessions kept in memory (least recently used first out); others reopen from their session file when continued",
     "subagents.defaultModel": "Default sub-session model provider/model[@channel]",
     "subagents.background": "Whether task runs in the background by default: auto = background in the TUI / RPC / ACP and foreground with -p; always / never are fixed. The call argument and the agent type's background: override it; user, project and host level",
     "subagents.autoBackgroundAfterMs": "Move a foreground task to the background after it has run this many milliseconds; 0 disables; user and project level",
@@ -194,6 +200,7 @@ const keysZh = {
     "compaction.enabled": "上下文接近上限时自动压缩",
     "compaction.reserveTokens": "为回复预留的 token；剩余不足时触发压缩",
     "compaction.keepRecentTokens": "压缩时原样保留的最近消息 token",
+    "compaction.contextBudget": "软窗口（token，至少 32768）：裁剪、压缩与上下文余量提示按 min(模型窗口, 它) 计算；大窗口模型调低它可让长会话更省钱",
     "compaction.prune": "档一裁剪（旧工具结果换成占位）；只认用户级（第五波 W5-H1 起生效）",
     "compaction.prune.keepResults": "保留最近 N 个工具结果不裁",
     "compaction.prune.clearAtLeast": "一次至少能省这么多 token 才裁（避免频繁打断缓存）；auto = max(20000, 0.1 × 上下文预算)",
@@ -213,6 +220,7 @@ const keysZh = {
     "codemode.mode": "off | on | only；不写时跟随预设：default → on（Node ≥ 25；Node 22 / 24 → off）、codemode-only → only、minimal / coordinator → off；项目级只接受 off",
     "codemode.inlineBudget": "only 模式在描述里内联工具声明的预算（估算 token），超出只列名字",
     "codemode.requireStrict": "true：运行时 Node 不隔离网络（Node 22 / 24）时直接禁用 codemode",
+    "codemode.maxHeapMb": "脚本子进程的 V8 堆上限（MB），超出时脚本以错误结束；0 不设上限",
     hooks: "Hook 设置（Hook 本身写在 hooks.json）",
     "hooks.timeoutMs": "单个 Hook 命令的缺省超时（毫秒）",
     ui: "终端界面",
@@ -251,7 +259,8 @@ const keysZh = {
     "skills.dirs": "追加的 Skill 目录；各层累加",
     cache: "提示缓存；整段只认用户级",
     request: "模型请求；整段只认用户级 / profile",
-    "request.idleTimeoutMs": "流空闲超时（毫秒）：等响应头或两块数据之间超过即判卡住并按可重试错误重试；0 关闭；AMA_IDLE_TIMEOUT_MS 覆盖",
+    "request.idleTimeoutMs": "响应头等待超时（毫秒）：等响应头超过即判卡住并按可重试错误重试（流中两块数据之间由 request.streamIdleTimeoutMs 管）；0 关闭；AMA_IDLE_TIMEOUT_MS 覆盖",
+    "request.streamIdleTimeoutMs": "流开始后两块数据之间的空闲上限（毫秒）；比等响应头宽，因为推理端点思考时可能长时间没有字节；0 关闭；AMA_STREAM_IDLE_TIMEOUT_MS 覆盖",
     "cache.warming": "保温：off 关闭，streaming 生成期间保温，idle 空闲时也保温",
     "cache.retention": "缓存时长档：none、short、long（供应商支持时）",
     "cache.minSavingsUsd": "保温的最低期望节省（美元）",
@@ -281,6 +290,7 @@ const keysZh = {
     subagents: "ama 自己的 task 子会话；除 background / autoBackgroundAfterMs 外只认用户级（第五波 W5-G 起生效）",
     "subagents.maxConcurrent": "同时运行的子会话数",
     "subagents.maxPending": "排队上限，超出时 task 报错",
+    "subagents.retainSessions": "内存中保留的已结束子会话数（最久未用的先释放），其余续聊时从会话文件重开",
     "subagents.defaultModel": "子会话缺省模型 provider/model[@channel]",
     "subagents.background": "task 缺省是否后台：auto = TUI / RPC / ACP 下后台、-p 下前台；always / never 固定。调用参数与类型定义的 background: 优先；用户、项目、宿主级都认",
     "subagents.autoBackgroundAfterMs": "前台任务运行超过该毫秒数自动转后台；0 关闭；用户、项目级都认",

package/dist/i18n/messages/config.d.ts

@@ -23,6 +23,7 @@ export declare const en: {
         "compaction.enabled": string;
         "compaction.reserveTokens": string;
         "compaction.keepRecentTokens": string;
+        "compaction.contextBudget": string;
         "compaction.prune": string;
         "compaction.prune.keepResults": string;
         "compaction.prune.clearAtLeast": string;
@@ -42,6 +43,7 @@ export declare const en: {
         "codemode.mode": string;
         "codemode.inlineBudget": string;
         "codemode.requireStrict": string;
+        "codemode.maxHeapMb": string;
         hooks: string;
         "hooks.timeoutMs": string;
         ui: string;
@@ -81,6 +83,7 @@ export declare const en: {
         cache: string;
         request: string;
         "request.idleTimeoutMs": string;
+        "request.streamIdleTimeoutMs": string;
         "cache.warming": string;
         "cache.retention": string;
         "cache.minSavingsUsd": string;
@@ -110,6 +113,7 @@ export declare const en: {
         subagents: string;
         "subagents.maxConcurrent": string;
         "subagents.maxPending": string;
+        "subagents.retainSessions": string;
         "subagents.defaultModel": string;
         "subagents.background": string;
         "subagents.autoBackgroundAfterMs": string;
@@ -147,6 +151,7 @@ export declare const en: {
         "models.enabled": string;
         fallbackModel: string;
         "limits.maxTurns": string;
+        "compaction.contextBudget": string;
         "limits.maxCostUsd": string;
         "ui.replyLanguage": string;
         "ui.agentBar": string;
@@ -171,6 +176,7 @@ export declare const en: {
         stringArray: string;
         array: string;
         modelsDev: string;
+        catalog: string;
         modelsEnabled: string;
         noChannels: string;
         unknownChannelOf: (name: string, available: readonly string[]) => string;
@@ -257,6 +263,7 @@ export declare const en: {
         input: string;
         modelChannels: string;
         modelsDev: string;
+        modelCatalog: string;
         baseUrl: string;
         channelApiKey: string;
         apiKey: string;
@@ -284,6 +291,7 @@ export declare const zh: {
         "compaction.enabled": string;
         "compaction.reserveTokens": string;
         "compaction.keepRecentTokens": string;
+        "compaction.contextBudget": string;
         "compaction.prune": string;
         "compaction.prune.keepResults": string;
         "compaction.prune.clearAtLeast": string;
@@ -303,6 +311,7 @@ export declare const zh: {
         "codemode.mode": string;
         "codemode.inlineBudget": string;
         "codemode.requireStrict": string;
+        "codemode.maxHeapMb": string;
         hooks: string;
         "hooks.timeoutMs": string;
         ui: string;
@@ -342,6 +351,7 @@ export declare const zh: {
         cache: string;
         request: string;
         "request.idleTimeoutMs": string;
+        "request.streamIdleTimeoutMs": string;
         "cache.warming": string;
         "cache.retention": string;
         "cache.minSavingsUsd": string;
@@ -371,6 +381,7 @@ export declare const zh: {
         subagents: string;
         "subagents.maxConcurrent": string;
         "subagents.maxPending": string;
+        "subagents.retainSessions": string;
         "subagents.defaultModel": string;
         "subagents.background": string;
         "subagents.autoBackgroundAfterMs": string;
@@ -408,6 +419,7 @@ export declare const zh: {
         "models.enabled": string;
         fallbackModel: string;
         "limits.maxTurns": string;
+        "compaction.contextBudget": string;
         "limits.maxCostUsd": string;
         "ui.replyLanguage": string;
         "ui.agentBar": string;
@@ -431,6 +443,7 @@ export declare const zh: {
         stringArray: string;
         array: string;
         modelsDev: string;
+        catalog: string;
         modelsEnabled: string;
         noChannels: string;
         unknownChannelOf: (name: string, available: readonly string[]) => string;
@@ -509,6 +522,7 @@ export declare const zh: {
         input: string;
         modelChannels: string;
         modelsDev: string;
+        modelCatalog: string;
         baseUrl: string;
         channelApiKey: string;
         apiKey: string;

package/dist/i18n/messages/config.js

@@ -25,6 +25,7 @@ export const en = {
         stringArray: "should be an array of strings",
         array: "should be an array",
         modelsDev: `should be "provider/model" or false`,
+        catalog: `should be "provider/model" or false`,
         modelsEnabled: `should be "provider/model[@channel]" or "provider/*"`,
         noChannels: "the provider has no channels",
         unknownChannelOf: (name, available) => `channel "${name}" does not exist (available: ${available.join(", ")})`,
@@ -117,6 +118,7 @@ export const en = {
         input: '["text"] or ["text", "image"] (accepts images)',
         modelChannels: "Channels the model is mounted on; the first is preferred",
         modelsDev: 'models.dev entry "provider/model"; false disables enrichment',
+        modelCatalog: 'Built-in catalog entry "provider/model" whose intrinsic properties this model inherits; matched by id alias when unset; false disables',
         baseUrl: "Endpoint address",
         channelApiKey: "$ENV / ${ENV} / !command / literal; defaults to the provider's key",
         apiKey: "$ENV / ${ENV} / !command / literal",
@@ -145,6 +147,7 @@ export const zh = {
         stringArray: "应为字符串数组",
         array: "应为数组",
         modelsDev: `应为 "provider/model" 或 false`,
+        catalog: `应为 "provider/model" 或 false`,
         modelsEnabled: `应为 "provider/model[@channel]" 或 "provider/*"`,
         noChannels: "供应商没有 channels",
         unknownChannelOf: (name, available) => `渠道 "${name}" 不存在（可用：${available.join(", ")}）`,
@@ -229,6 +232,7 @@ export const zh = {
         input: '["text"] 或 ["text", "image"]（收图片）',
         modelChannels: "挂载的渠道，第一个是首选",
         modelsDev: 'models.dev 条目 "provider/model"；false 关闭补全',
+        modelCatalog: '继承其固有属性的内置目录条目 "provider/model"；不写时按 id 别名自动匹配；false 关闭',
         baseUrl: "接口地址",
         channelApiKey: "$ENV / ${ENV} / !command / 字面量；缺省用供应商的 key",
         apiKey: "$ENV / ${ENV} / !command / 字面量",

package/dist/i18n/messages/errors.d.ts

@@ -25,7 +25,8 @@ export declare const en: {
         lookupFailure: (ref: string, reason: Extract<ModelLookup, {
             ok: false;
         }>["reason"], list: string, hasCandidates: boolean) => string;
-        source: (source: FieldSource) => string;
+        /** [ME-C0] `catalog-alias`：中转 / 自定义模型按 id 匹配内置目录后继承的字段（ME-D 起使用）。 */
+        source: (source: FieldSource | "catalog-alias") => string;
         unmatched: string;
         match: (kind: MatchKind, ref: string, normalized: string | undefined) => string;
         consensus: (key: string, entries: number, groups: number, best: number, signature: string) => string;
@@ -59,7 +60,7 @@ export declare const zh: {
     };
     models: {
         lookupFailure: (ref: string, reason: "not_found" | "ambiguous" | "provider_not_found" | "channel_not_found", list: string, hasCandidates: boolean) => string;
-        source: (source: FieldSource) => "config" | "目录" | "缺省" | "models.dev";
+        source: (source: FieldSource) => "config" | "目录" | "缺省" | "models.dev" | "目录（按 id 匹配）";
         unmatched: string;
         match: (kind: MatchKind, ref: string, normalized: string | undefined) => string;
         consensus: (key: string, entries: number, groups: number, best: number, signature: string) => string;

package/dist/i18n/messages/errors.js

@@ -49,7 +49,14 @@ export const en = {
                         : `model not found: ${ref} (ama models list shows available models)`;
             }
         },
-        source: (source) => source === "catalog" ? "catalog" : source === "default" ? "default" : source,
+        /** [ME-C0] `catalog-alias`：中转 / 自定义模型按 id 匹配内置目录后继承的字段（ME-D 起使用）。 */
+        source: (source) => source === "catalog"
+            ? "catalog"
+            : source === "catalog-alias"
+                ? "catalog (via id)"
+                : source === "default"
+                    ? "default"
+                    : source,
         unmatched: "unmatched",
         match: (kind, ref, normalized) => {
             const label = {
@@ -124,7 +131,13 @@ export const zh = {
                         : `模型不存在：${ref}（ama models list 查看可用模型）`;
             }
         },
-        source: (source) => (source === "catalog" ? "目录" : source === "default" ? "缺省" : source),
+        source: (source) => source === "catalog"
+            ? "目录"
+            : source === "catalog-alias"
+                ? "目录（按 id 匹配）"
+                : source === "default"
+                    ? "缺省"
+                    : source,
         unmatched: "未匹配",
         match: (kind, ref, normalized) => {
             const label = {

package/dist/i18n/messages/report-context.d.ts

@@ -13,6 +13,7 @@ export declare const en: {
     keySource: string;
     sourceUsage: (usage: string, estimate: string) => string;
     sourceEstimate: string;
+    sourcePrefix: string;
     keyAutoCompact: string;
     autoCompact: (at: string, distance: string) => string;
     autoCompactReached: (at: string) => string;
@@ -23,6 +24,7 @@ export declare const en: {
     breakdown: (total: string) => string;
     prefixCounted: string;
     prefixPending: string;
+    prefixEstimated: string;
     categories: {
         system: string;
         tools: string;
@@ -57,6 +59,7 @@ export declare const zh: {
     keySource: string;
     sourceUsage: (usage: string, estimate: string) => string;
     sourceEstimate: string;
+    sourcePrefix: string;
     keyAutoCompact: string;
     autoCompact: (at: string, distance: string) => string;
     autoCompactReached: (at: string) => string;
@@ -67,6 +70,7 @@ export declare const zh: {
     breakdown: (total: string) => string;
     prefixCounted: string;
     prefixPending: string;
+    prefixEstimated: string;
     categories: {
         system: string;
         tools: string;

package/dist/i18n/messages/report-context.js

@@ -14,6 +14,7 @@ export const en = {
     keySource: "Source",
     sourceUsage: (usage, estimate) => `reported usage ${usage} + estimated ${estimate}`,
     sourceEstimate: "estimated in full (no usable usage yet)",
+    sourcePrefix: "system prompt and tools only, estimated before the first request",
     keyAutoCompact: "Auto-compact",
     autoCompact: (at, distance) => `at ${at}, ≈ ${distance} to go`,
     autoCompactReached: (at) => `at ${at}, reached`,
@@ -24,6 +25,7 @@ export const en = {
     breakdown: (total) => `By category (estimated, ${total})`,
     prefixCounted: "System prompt and tool declarations are counted from the stored system messages; the full estimate can differ from reported usage.",
     prefixPending: "System prompt and tool declarations are not counted until the first request.",
+    prefixEstimated: "System prompt and tool declarations are estimated from what the first request will send.",
     categories: {
         system: "System prompt",
         tools: "Tool declarations",
@@ -58,6 +60,7 @@ export const zh = {
     keySource: "来源",
     sourceUsage: (usage, estimate) => `usage 实测 ${usage} + 估算 ${estimate}`,
     sourceEstimate: "全量估算（还没有可用的 usage）",
+    sourcePrefix: "首次请求前，只有系统提示与工具声明的估算",
     keyAutoCompact: "自动压缩",
     autoCompact: (at, distance) => `${at} 触发，还差 ≈ ${distance}`,
     autoCompactReached: (at) => `${at} 触发，已达到`,
@@ -68,6 +71,7 @@ export const zh = {
     breakdown: (total) => `按类别（估算，${total}）`,
     prefixCounted: "系统提示与工具声明按会话里存的 system 消息计入；全量估算可能与 usage 实测不同。",
     prefixPending: "系统提示与工具声明在首次请求后才计入。",
+    prefixEstimated: "系统提示与工具声明按首次请求将要发送的内容估算。",
     categories: {
         system: "系统提示",
         tools: "工具声明",

package/dist/i18n/messages/report.d.ts

@@ -97,6 +97,7 @@ export declare const en: {
         keySource: string;
         sourceUsage: (usage: string, estimate: string) => string;
         sourceEstimate: string;
+        sourcePrefix: string;
         keyAutoCompact: string;
         autoCompact: (at: string, distance: string) => string;
         autoCompactReached: (at: string) => string;
@@ -107,6 +108,7 @@ export declare const en: {
         breakdown: (total: string) => string;
         prefixCounted: string;
         prefixPending: string;
+        prefixEstimated: string;
         categories: {
             system: string;
             tools: string;
@@ -142,6 +144,7 @@ export declare const en: {
         missModel: string;
         missTools: string;
         missSystem: string;
+        missSystemSections: (sections: string) => string;
         missPrefix: string;
         missEvicted: string;
         missNotice: (reason: string, tokens: string, cost: string | undefined) => string;
@@ -339,6 +342,7 @@ export declare const zh: {
         keySource: string;
         sourceUsage: (usage: string, estimate: string) => string;
         sourceEstimate: string;
+        sourcePrefix: string;
         keyAutoCompact: string;
         autoCompact: (at: string, distance: string) => string;
         autoCompactReached: (at: string) => string;
@@ -349,6 +353,7 @@ export declare const zh: {
         breakdown: (total: string) => string;
         prefixCounted: string;
         prefixPending: string;
+        prefixEstimated: string;
         categories: {
             system: string;
             tools: string;
@@ -383,6 +388,7 @@ export declare const zh: {
         missModel: string;
         missTools: string;
         missSystem: string;
+        missSystemSections: (sections: string) => string;
         missPrefix: string;
         missEvicted: string;
         missNotice: (reason: string, tokens: string, cost: string | undefined) => string;

package/dist/i18n/messages/report.js

@@ -113,6 +113,7 @@ export const en = {
         missModel: "after switching model",
         missTools: "tool list changed",
         missSystem: "system prompt changed",
+        missSystemSections: (sections) => `system prompt changed: ${sections}`,
         missPrefix: "prefix changed",
         missEvicted: "evicted by the server",
         missNotice: (reason, tokens, cost) => `Cache miss (${reason}): re-billed ${tokens} tokens${cost === undefined ? "" : ` (about ${cost})`}`,
@@ -362,6 +363,7 @@ export const zh = {
         missModel: "切换模型后",
         missTools: "工具表变化",
         missSystem: "系统提示变化",
+        missSystemSections: (sections) => `系统提示变化：${sections}`,
         missPrefix: "前缀变化",
         missEvicted: "服务端已淘汰",
         missNotice: (reason, tokens, cost) => `缓存未命中（${reason}）：重计费 ${tokens} token${cost === undefined ? "" : `（约 ${cost}）`}`,