@armadra/agent 0.5.0 → 0.6.0

package/dist/config/merge.js

@@ -8,12 +8,14 @@
  *   auto / full-auto）、
  *   `compaction`、`tools.disabled`、`tools.preset`（只能更严）、`codemode.mode: "off"`、`ui`、
  *   `checkpoints.mode: "off"`、`checkpoints.maxFileBytes`（只能调小）、（W5-C0）`plan.bash`（只能更严）、
- *   `reminders`；`compaction.prune / pruneExclude` 与第五波其余段只认用户级；
+ *   `reminders`；`compaction.prune / pruneExclude` 与第五波其余段只认用户级；（W6-C0）`ui.language` /
+ *   `ui.agentBar` 随 `ui` 段、`memory.enabled: false`；`ui.replyLanguage`、`memory` 其余键、`auth` 只认用户级；
  *   其它字段与放宽项（含 `permission.builtinDeny / autoModel / autoSafeCommands`）被忽略并记 warning。
  * - 同时产出带来源的权限规则清单（`ruleSpecs`），交给权限管线（B3 的 rules.ts 解析）。
  */
 import { CONFIG_FILE_VERSION, DEFAULT_CHECKPOINTS_CONFIG, PLAN_BASH_MODES_STRICT_FIRST, TOOLS_PRESETS_STRICT_FIRST, canonicalPreset, } from "./types.js";
 import { isAtLeastAsStrict } from "../permissions/rules.js";
+import { msg } from "../i18n/index.js";
 export const DEFAULT_CONFIG = Object.freeze({
     version: CONFIG_FILE_VERSION,
     thinkingLevel: "medium",
@@ -33,8 +35,8 @@ export const DEFAULT_CONFIG = Object.freeze({
 });
 /** 嵌入宿主（有 profile）时的缺省覆盖（§12.10）。 */
 export const PROFILE_DEFAULTS = Object.freeze({
-    // [W5-A] 嵌入宿主以「最后一行 = 状态栏」锚定，底部信息行缺省单行
-    ui: { quietStartup: "header", statusLine: "compact" },
+    // [W5-A] 嵌入宿主以「最后一行 = 状态栏」锚定，底部信息行缺省单行；[W6-C0] 宿主自己展示节点，Agent 栏缺省关
+    ui: { quietStartup: "header", statusLine: "compact", agentBar: "off" },
 });
 /** 层名 → 规则来源（RuleSource）。 */
 const RULE_SOURCE = {
@@ -109,7 +111,7 @@ export function restrictProjectConfig(project, currentMode, label = ".ama/config
                 if (project.compaction !== undefined) {
                     const { prune, pruneExclude, ...rest } = structuredClone(project.compaction);
                     if (prune !== undefined || pruneExclude !== undefined)
-                        warnings.push(`${label}: 项目级不能设 compaction.prune / pruneExclude，已忽略`);
+                        warnings.push(msg().config.merge.projectIgnored(label, "compaction.prune / pruneExclude"));
                     if (Object.keys(rest).length > 0)
                         accepted.compaction = rest;
                 }
@@ -125,15 +127,29 @@ export function restrictProjectConfig(project, currentMode, label = ".ama/config
                 break;
             }
             case "ui":
-                if (project.ui !== undefined)
-                    accepted.ui = structuredClone(project.ui);
+                if (project.ui !== undefined) {
+                    // [W6-C0] 回复语言改的是发给模型的规则，只认用户级 / profile
+                    const { replyLanguage, ...rest } = structuredClone(project.ui);
+                    if (replyLanguage !== undefined)
+                        warnings.push(msg().config.merge.projectIgnored(label, "ui.replyLanguage"));
+                    accepted.ui = rest;
+                }
+                break;
+            case "memory": {
+                // [W6-C0] 记忆不由仓库决定：项目级只能关闭（D9）
+                const memory = project.memory ?? {};
+                if (Object.keys(memory).some((k) => k !== "enabled") || memory.enabled === true)
+                    warnings.push(msg().config.merge.projectMemoryOnlyDisable(label));
+                if (memory.enabled === false)
+                    accepted.memory = { enabled: false };
                 break;
+            }
             case "tools": {
                 const tools = project.tools ?? {};
                 const result = {};
                 for (const sub of Object.keys(tools)) {
                     if (sub !== "disabled" && sub !== "preset")
-                        warnings.push(`${label}: 项目级只能设 tools.disabled / tools.preset，忽略 tools.${sub}`);
+                        warnings.push(msg().config.merge.projectOnlyKeys(label, "tools.disabled / tools.preset", `tools.${sub}`));
                 }
                 if (tools.disabled !== undefined)
                     result.disabled = [...tools.disabled];
@@ -141,7 +157,7 @@ export function restrictProjectConfig(project, currentMode, label = ".ama/config
                     if (isPresetStricterOrEqual(tools.preset, currentPreset))
                         result.preset = tools.preset;
                     else
-                        warnings.push(`${label}: 项目级不能放宽工具预设，忽略 tools.preset ${tools.preset}（当前 ${currentPreset}）`);
+                        warnings.push(msg().config.merge.projectPresetLoosen(label, tools.preset, currentPreset));
                 }
                 if (Object.keys(result).length > 0)
                     accepted.tools = result;
@@ -152,7 +168,8 @@ export function restrictProjectConfig(project, currentMode, label = ".ama/config
                 for (const [sub, v] of Object.entries(codemode)) {
                     if (sub === "mode" && v === "off")
                         continue;
-                    warnings.push(`${label}: 项目级只接受 codemode.mode "off"，忽略 codemode.${sub}${sub === "mode" ? ` ${String(v)}` : ""}`);
+                    const ignored = `codemode.${sub}${sub === "mode" ? ` ${String(v)}` : ""}`;
+                    warnings.push(msg().config.merge.projectOnlyValue(label, "codemode.mode", "off", ignored));
                 }
                 if (codemode.mode === "off")
                     accepted.codemode = { mode: "off" };
@@ -177,14 +194,15 @@ export function restrictProjectConfig(project, currentMode, label = ".ama/config
                 for (const [sub, v] of Object.entries(sandbox)) {
                     if (sub === "network" && v === "deny")
                         continue;
-                    warnings.push(`${label}: 项目级只接受 sandbox.network "deny"，忽略 sandbox.${sub}${sub === "network" ? ` ${String(v)}` : ""}`);
+                    const ignored = `sandbox.${sub}${sub === "network" ? ` ${String(v)}` : ""}`;
+                    warnings.push(msg().config.merge.projectOnlyValue(label, "sandbox.network", "deny", ignored));
                 }
                 if (sandbox.network === "deny")
                     accepted.sandbox = { network: "deny" };
                 break;
             }
             default:
-                warnings.push(`${label}: 项目级不能设 ${key}，已忽略`);
+                warnings.push(msg().config.merge.projectIgnored(label, key));
         }
     }
     return { accepted, warnings };
@@ -193,14 +211,14 @@ export function restrictProjectConfig(project, currentMode, label = ".ama/config
 function restrictPlan(plan, current, label, warnings) {
     for (const sub of Object.keys(plan)) {
         if (sub !== "bash")
-            warnings.push(`${label}: 项目级只能设 plan.bash，忽略 plan.${sub}`);
+            warnings.push(msg().config.merge.projectOnlyKeys(label, "plan.bash", `plan.${sub}`));
     }
     if (plan.bash === undefined)
         return undefined;
     const order = PLAN_BASH_MODES_STRICT_FIRST;
     if (order.indexOf(plan.bash) <= order.indexOf(current))
         return { bash: plan.bash };
-    warnings.push(`${label}: 项目级只能收紧 plan.bash，忽略 ${plan.bash}（当前 ${current}）`);
+    warnings.push(msg().config.merge.projectPlanBashTighten(label, plan.bash, current));
     return undefined;
 }
 /** 项目级检查点：只能关闭、只能调小单文件上限（多备份即多占用户磁盘）；`keep` 只认用户级。 */
@@ -211,16 +229,16 @@ function restrictCheckpoints(checkpoints, currentMaxFileBytes, label, warnings)
             if (v === "off")
                 result.mode = "off";
             else
-                warnings.push(`${label}: 项目级只接受 checkpoints.mode "off"，忽略 ${String(v)}`);
+                warnings.push(msg().config.merge.projectOnlyValue(label, "checkpoints.mode", "off", String(v)));
         }
         else if (sub === "maxFileBytes" && typeof v === "number") {
             if (v <= currentMaxFileBytes)
                 result.maxFileBytes = v;
             else
-                warnings.push(`${label}: 项目级只能调小 checkpoints.maxFileBytes，忽略 ${v}（当前 ${currentMaxFileBytes}）`);
+                warnings.push(msg().config.merge.projectLowerOnly(label, "checkpoints.maxFileBytes", v, currentMaxFileBytes));
         }
         else {
-            warnings.push(`${label}: 项目级不能设 checkpoints.${sub}，已忽略`);
+            warnings.push(msg().config.merge.projectIgnored(label, `checkpoints.${sub}`));
         }
     }
     return Object.keys(result).length > 0 ? result : undefined;
@@ -228,28 +246,28 @@ function restrictCheckpoints(checkpoints, currentMaxFileBytes, label, warnings)
 function restrictPermission(permission, currentMode, label, warnings) {
     const result = {};
     if (permission.allow !== undefined && permission.allow.length > 0) {
-        warnings.push(`${label}: 项目级不能加 allow 规则，忽略 ${permission.allow.join(", ")}`);
+        warnings.push(msg().config.merge.projectNoAllow(label, permission.allow.join(", ")));
     }
     if (permission.deny !== undefined && permission.deny.length > 0)
         result.deny = [...permission.deny];
     if (permission.builtinDeny !== undefined) {
-        warnings.push(`${label}: 项目级不能改内置 deny 表，忽略 permission.builtinDeny`);
+        warnings.push(msg().config.merge.projectNoBuiltinDeny(label));
     }
     if (permission.autoModel !== undefined) {
-        warnings.push(`${label}: 项目级不能设 permission.autoModel，已忽略`);
+        warnings.push(msg().config.merge.projectIgnored(label, "permission.autoModel"));
     }
     if (permission.autoSafeCommands !== undefined && permission.autoSafeCommands.length > 0) {
-        warnings.push(`${label}: 项目级不能追加 permission.autoSafeCommands（放宽），已忽略`);
+        warnings.push(msg().config.merge.projectNoAutoSafe(label));
     }
     if (permission.mode === "auto" || permission.mode === "full-auto") {
-        warnings.push(`${label}: 项目级不能把权限模式设为 ${permission.mode}（放宽，只能在用户级配置、profile 或命令行设），已忽略`);
+        warnings.push(msg().config.merge.projectModeLoosen(label, permission.mode));
     }
     else if (permission.mode !== undefined) {
         if (isAtLeastAsStrict(permission.mode, currentMode)) {
             result.mode = permission.mode;
         }
         else {
-            warnings.push(`${label}: 项目级只能收紧权限模式，忽略 ${permission.mode}（当前 ${currentMode}）`);
+            warnings.push(msg().config.merge.projectModeTighten(label, permission.mode, currentMode));
         }
     }
     return Object.keys(result).length > 0 ? result : undefined;
@@ -278,6 +296,8 @@ export function cliOverridesToConfig(cli) {
         out.tools = { preset: cli.toolsPreset };
     if (cli.codemode !== undefined)
         out.codemode = { mode: cli.codemode };
+    if (cli.memory !== undefined)
+        out.memory = { enabled: cli.memory };
     return out;
 }
 function collectRules(layer, permission) {

package/dist/config/paths.js

@@ -9,6 +9,7 @@ import { accessSync, constants, mkdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
 import { StartupError } from "../errors.js";
+import { msg } from "../i18n/index.js";
 /** 与 cli/exit-codes.ts 的 Config 相同；config 层不反向依赖 cli 的值。 */
 const EXIT_CONFIG = 3;
 export const CONFIG_FILE = "config.json";
@@ -87,18 +88,18 @@ export function ensureDir(dir, label) {
     try {
         mkdirSync(dir, { recursive: true, mode: 0o700 });
         if (!statSync(dir).isDirectory())
-            throw new Error("不是目录");
+            throw new Error(msg().config.paths.notDirectory);
         accessSync(dir, constants.W_OK);
     }
     catch (error) {
-        throw new StartupError("config_invalid", `${label}不可写：${dir}（${error instanceof Error ? error.message : String(error)}）`, EXIT_CONFIG, { cause: error });
+        throw new StartupError("config_invalid", msg().config.paths.notWritable(label, dir, error instanceof Error ? error.message : String(error)), EXIT_CONFIG, { cause: error });
     }
 }
 /** 第 5 步：建 configDir / dataDir / sessionDir。 */
 export function ensurePaths(paths) {
-    ensureDir(paths.configDir, "配置目录");
-    ensureDir(paths.dataDir, "数据目录");
-    ensureDir(paths.sessionDir, "会话目录");
+    ensureDir(paths.configDir, msg().config.paths.configDir);
+    ensureDir(paths.dataDir, msg().config.paths.dataDir);
+    ensureDir(paths.sessionDir, msg().config.paths.sessionDir);
 }
 export function userFile(paths, name) {
     return join(paths.configDir, name);

package/dist/config/profile.d.ts

@@ -4,7 +4,7 @@
  * profile 的字段等价于对应命令行参数；命令行显式参数优先（合并在 cli/bootstrap.ts）。
  * 文件不存在 / 版本不符 / 路径不是绝对路径 → StartupError（退出码 3）。profile 不含密钥。
  */
-import type { AmaConfig } from "./types.js";
+import type { AmaConfig, ProfileMemoryOptions } from "./types.js";
 /** profile 展开后的等价参数（全部为绝对路径）。 */
 export interface ProfileOptions {
     path: string;
@@ -24,6 +24,10 @@ export interface ProfileOptions {
     /** profile.config 的内容（已校验）。 */
     config?: AmaConfig;
     trustProject: boolean;
+    /** [W6-C0] 宿主界面语言。 */
+    language?: "zh" | "en";
+    /** [W6-C0] 记忆（W6-M）：按工作空间隔离的目录（已校验为绝对路径）。 */
+    memory?: ProfileMemoryOptions;
     warnings: string[];
 }
 export declare function loadProfile(path: string, cwd?: string): ProfileOptions;

package/dist/config/profile.js

@@ -8,12 +8,13 @@ import { isAbsolute, resolve } from "node:path";
 import { StartupError } from "../errors.js";
 import { loadConfigFile } from "./load.js";
 import { PROFILE_PATH_FIELDS, PROFILE_PATH_LIST_FIELDS } from "./schema.js";
+import { msg } from "../i18n/index.js";
 const EXIT_CONFIG = 3;
 export function loadProfile(path, cwd = process.cwd()) {
     const abs = resolve(cwd, path);
     const loaded = loadConfigFile("profile", abs, { required: true });
     if (loaded === undefined) {
-        throw new StartupError("profile_invalid", `${abs}: 文件不存在`, EXIT_CONFIG);
+        throw new StartupError("profile_invalid", msg().config.profile.notFound(abs), EXIT_CONFIG);
     }
     const profile = loaded.value;
     const relative = [];
@@ -29,7 +30,7 @@ export function loadProfile(path, cwd = process.cwd()) {
         }
     }
     if (relative.length > 0) {
-        throw new StartupError("profile_invalid", `${abs}: profile 中的路径必须是绝对路径：\n  ${relative.join("\n  ")}`, EXIT_CONFIG);
+        throw new StartupError("profile_invalid", msg().config.profile.relativePaths(abs, relative), EXIT_CONFIG);
     }
     const options = profileToOptions(abs, profile, loaded.warnings);
     if (profile.config !== undefined) {
@@ -63,5 +64,9 @@ function profileToOptions(path, profile, warnings) {
         options.sessionDir = profile.sessionDir;
     if (profile.config !== undefined)
         options.configFile = profile.config;
+    if (profile.language !== undefined)
+        options.language = profile.language;
+    if (profile.memory !== undefined)
+        options.memory = { ...profile.memory };
     return options;
 }

package/dist/config/schema-w5.js

@@ -5,6 +5,7 @@
  * 未知字段是 warning。只校验形状；行为由各批次实现。
  */
 import { PERMISSION_MODES_STRICT_FIRST } from "../permissions/types.js";
+import { msg } from "../i18n/index.js";
 import { Checker, THINKING_LEVELS, checkSection, join } from "./checker.js";
 import { AGENTS_RESERVED_KEYS, IMAGE_RESIZE_MODES, PLAN_BASH_MODES_STRICT_FIRST, PLAN_UNATTENDED_MODES, STATUS_LINE_MODES, } from "./types-w5.js";
 /** 第五波新增的顶层键（schema.ts 的 CONFIG_KEYS 并入）。 */
@@ -38,7 +39,7 @@ export function checkCompactionW5(c, compaction, path) {
     c.number(prune, "keepResults", p, 0);
     const clear = prune["clearAtLeast"];
     if (clear !== undefined && clear !== "auto" && (typeof clear !== "number" || clear < 0))
-        c.error(join(p, "clearAtLeast"), '应为 "auto" 或非负数字');
+        c.error(join(p, "clearAtLeast"), msg().config.schema.clearAtLeast);
 }
 function checkAgentEntry(c, entry, path) {
     if (!c.object(entry, path))
@@ -66,7 +67,7 @@ function checkAgents(c, config) {
             continue;
         const p = join("agents", id);
         if (!AGENT_ID_PATTERN.test(id))
-            c.error(p, "Agent id 只能是小写字母、数字、- . _（可带 acp: 前缀）");
+            c.error(p, msg().config.schema.agentId);
         else
             checkAgentEntry(c, entry, p);
     }

package/dist/config/schema-w6.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 第六波配置键的校验（docs/wave6-plan.md §7；规则与 json-schema.ts 一一对应，json-schema.test.ts 守住）。[W6-C0]
+ *
+ * 类型 / 取值错误是 error，未知字段是 warning。只校验形状；行为由各批次实现。
+ */
+import { type Checker, type Obj } from "./checker.js";
+/** 第六波新增的顶层键（schema.ts 的 CONFIG_KEYS 并入）。 */
+export declare const W6_CONFIG_KEYS: readonly ["memory", "auth"];
+/** 已有 `ui` 段新增的键。 */
+export declare const W6_UI_KEYS: readonly ["language", "replyLanguage", "agentBar"];
+export declare const MEMORY_KEYS: readonly ["enabled", "scopes", "indexMaxBytes", "fileMaxBytes", "maxFiles", "subagents"];
+export declare const CHATGPT_AUTH_KEYS: readonly ["flavor", "clientId", "issuer", "originator", "redirectPorts"];
+export declare function checkUiW6(c: Checker, ui: Obj, path: string): void;
+/** 第六波顶层段的校验（validateConfig 末尾调用）。 */
+export declare function validateConfigW6(c: Checker, config: Obj): void;
+/** auth.json 的 OAuth 条目（`type: "oauth"`，W6-O）：只查形状，不碰 token 内容。 */
+export declare function checkOAuthEntry(c: Checker, entry: Obj, path: string): void;
+/** profile.json 的 `memory`（D11）：`enabled: true` 时 `dir` 必填且为绝对路径。 */
+export declare function checkProfileMemory(c: Checker, profile: Obj): void;

package/dist/config/schema-w6.js

@@ -0,0 +1,115 @@
+/**
+ * 第六波配置键的校验（docs/wave6-plan.md §7；规则与 json-schema.ts 一一对应，json-schema.test.ts 守住）。[W6-C0]
+ *
+ * 类型 / 取值错误是 error，未知字段是 warning。只校验形状；行为由各批次实现。
+ */
+import { isAbsolute } from "node:path";
+import { msg } from "../i18n/index.js";
+import { checkSection, join } from "./checker.js";
+import { AGENT_BAR_MODES, CHATGPT_FLAVORS, LANGUAGE_SETTINGS, MEMORY_SCOPES, MEMORY_SUBAGENT_MODES, } from "./types-w6.js";
+/** 第六波新增的顶层键（schema.ts 的 CONFIG_KEYS 并入）。 */
+export const W6_CONFIG_KEYS = ["memory", "auth"];
+/** 已有 `ui` 段新增的键。 */
+export const W6_UI_KEYS = ["language", "replyLanguage", "agentBar"];
+export const MEMORY_KEYS = [
+    "enabled",
+    "scopes",
+    "indexMaxBytes",
+    "fileMaxBytes",
+    "maxFiles",
+    "subagents",
+];
+export const CHATGPT_AUTH_KEYS = [
+    "flavor",
+    "clientId",
+    "issuer",
+    "originator",
+    "redirectPorts",
+];
+export function checkUiW6(c, ui, path) {
+    c.oneOf(ui, "language", path, LANGUAGE_SETTINGS);
+    c.string(ui, "replyLanguage", path);
+    c.oneOf(ui, "agentBar", path, AGENT_BAR_MODES);
+}
+function checkEnumArray(c, value, key, path, choices) {
+    const v = value[key];
+    if (v === undefined)
+        return;
+    if (!Array.isArray(v) || v.some((item) => typeof item !== "string" || !choices.includes(item)))
+        c.error(join(path, key), msg().config.schema.enumArray(choices));
+}
+function checkPorts(c, value, key, path) {
+    const v = value[key];
+    if (v === undefined)
+        return;
+    if (!Array.isArray(v) ||
+        v.some((item) => typeof item !== "number" || !Number.isInteger(item) || item < 0 || item > 65535))
+        c.error(join(path, key), msg().config.schema.ports);
+}
+/** 第六波顶层段的校验（validateConfig 末尾调用）。 */
+export function validateConfigW6(c, config) {
+    checkSection(c, config, "memory", MEMORY_KEYS, (s, p) => {
+        c.boolean(s, "enabled", p);
+        checkEnumArray(c, s, "scopes", p, MEMORY_SCOPES);
+        c.number(s, "indexMaxBytes", p, 0, 1_048_576);
+        c.number(s, "fileMaxBytes", p, 1, 1_048_576);
+        c.number(s, "maxFiles", p, 1, 10_000);
+        c.oneOf(s, "subagents", p, MEMORY_SUBAGENT_MODES);
+    });
+    checkSection(c, config, "auth", ["chatgpt"], (s, p) => {
+        const chatgpt = s["chatgpt"];
+        const cp = join(p, "chatgpt");
+        if (chatgpt === undefined || !c.object(chatgpt, cp))
+            return;
+        c.keys(chatgpt, cp, CHATGPT_AUTH_KEYS);
+        c.oneOf(chatgpt, "flavor", cp, CHATGPT_FLAVORS);
+        for (const key of ["clientId", "issuer", "originator"])
+            c.string(chatgpt, key, cp);
+        checkPorts(c, chatgpt, "redirectPorts", cp);
+    });
+}
+/** auth.json 的 OAuth 条目（`type: "oauth"`，W6-O）：只查形状，不碰 token 内容。 */
+export function checkOAuthEntry(c, entry, path) {
+    c.keys(entry, path, [
+        "type",
+        "flavor",
+        "clientId",
+        "issuer",
+        "accountId",
+        "planType",
+        "email",
+        "accessToken",
+        "refreshToken",
+        "idToken",
+        "expiresAt",
+        "lastRefresh",
+        "acknowledgedAt",
+        "needsLogin",
+    ]);
+    c.oneOf(entry, "flavor", path, CHATGPT_FLAVORS);
+    if (entry["flavor"] === undefined)
+        c.error(join(path, "flavor"), msg().config.schema.required);
+    c.string(entry, "accessToken", path, true);
+    c.string(entry, "refreshToken", path, true);
+    for (const key of ["clientId", "issuer", "accountId", "planType", "email", "idToken"])
+        c.string(entry, key, path);
+    for (const key of ["lastRefresh", "acknowledgedAt"])
+        c.string(entry, key, path);
+    c.number(entry, "expiresAt", path);
+    if (entry["expiresAt"] === undefined)
+        c.error(join(path, "expiresAt"), msg().config.schema.required);
+    c.boolean(entry, "needsLogin", path);
+}
+/** profile.json 的 `memory`（D11）：`enabled: true` 时 `dir` 必填且为绝对路径。 */
+export function checkProfileMemory(c, profile) {
+    const memory = profile["memory"];
+    if (memory === undefined || !c.object(memory, "memory"))
+        return;
+    c.keys(memory, "memory", ["enabled", "dir"]);
+    if (typeof memory["enabled"] !== "boolean")
+        c.error("memory.enabled", msg().config.schema.required);
+    c.string(memory, "dir", "memory");
+    const dir = memory["dir"];
+    if (memory["enabled"] === true && (typeof dir !== "string" || !isAbsolute(dir)))
+        c.error("memory.dir", msg().config.schema.memoryDir);
+}