@armadra/agent 0.5.0 → 0.6.0

package/dist/compaction/prune-tier.js

@@ -9,7 +9,7 @@
  * 打断一次缓存。缓存已冷时（C3，调用方判断）`need` 为 undefined：全部候选一次换掉。
  * 保护集（C4）：调用方给 `isProtected`（Skill 文件、AGENTS.md、todo、`keepInContext` 工具、
  * `compaction.pruneExclude`），见 `protect.ts`。
- * 动作：返回 `context_edit{reason:"prune", replacement:"[已裁剪 …全文 path]"}` 计划；有 outputDir 时
+ * 动作：返回 `context_edit{reason:"prune", replacement:"[pruned: … full text at path]"}` 计划（[W6-C0] 固定英文）；有 outputDir 时
  * 把全文写到 `<outputDir>/<toolCallId>.txt`（已存在则不覆盖），模型可用 read 取回。
  */
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
@@ -114,8 +114,8 @@ function materialize(candidate, outputDir) {
         }
     }
     const replacement = fullTextPath === undefined
-        ? `[已裁剪：${message.toolName} 的结果原有 ${bytes} 字节，全文不可用]`
-        : `[已裁剪：${message.toolName} 的结果原有 ${bytes} 字节，全文 ${fullTextPath}]`;
+        ? `[pruned: ${message.toolName} result was ${bytes} bytes; full text unavailable]`
+        : `[pruned: ${message.toolName} result was ${bytes} bytes; full text at ${fullTextPath}]`;
     const planned = {
         targetId: entry.id,
         replacement,

package/dist/compaction/serialize.js

@@ -9,7 +9,8 @@ export const TOOL_RESULT_SERIALIZE_LIMIT = 2000;
 function truncate(text, limit) {
     if (text.length <= limit)
         return text;
-    return `${text.slice(0, limit)}… [截断，原 ${text.length} 字符]`;
+    // [W6-C0] 送摘要模型的文本，固定英文
+    return `${text.slice(0, limit)}… [truncated; ${text.length} chars originally]`;
 }
 function formatArgs(args) {
     return Object.entries(args)

package/dist/config/auth-file.d.ts

@@ -7,6 +7,7 @@
  *   也不把 key 写进任何日志或返回给展示层（`describeAuthFile` 只给来源与形态）。
  */
 import type { AuthFile } from "./types.js";
+import { type ChatGptFlavor } from "./types-w6.js";
 export declare function defaultAuthFilePath(configDir: string): string;
 export declare const PROVIDER_ID_PATTERN: RegExp;
 export interface ReadAuthResult {
@@ -32,8 +33,17 @@ export type AuthValueKind = "literal" | "command" | "env-ref";
 export declare function classifyKeyValue(value: string): AuthValueKind;
 export interface AuthEntrySummary {
     provider: string;
-    kind: AuthValueKind;
+    /** `oauth`：OAuth 条目（只给 flavor / plan / expiresIn / needsLogin，从不给 token、邮箱、账户 id）。 */
+    kind: AuthValueKind | "oauth";
     hasBaseUrl: boolean;
     envNames: string[];
+    /** [W6-O] OAuth 条目：登录路径。 */
+    flavor?: ChatGptFlavor;
+    /** [W6-O] OAuth 条目：计划类型（plus / pro …）。 */
+    plan?: string;
+    /** [W6-O] OAuth 条目：access token 剩余毫秒（已过期为负；刷新会自动续）。 */
+    expiresIn?: number;
+    /** [W6-O] OAuth 条目：刷新永久失败，需要重新登录。 */
+    needsLogin?: boolean;
 }
-export declare function describeAuthFile(file: AuthFile): AuthEntrySummary[];
+export declare function describeAuthFile(file: AuthFile, now?: number): AuthEntrySummary[];

package/dist/config/auth-file.js

@@ -10,7 +10,9 @@ import { chmodSync, mkdirSync, renameSync, statSync, writeFileSync } from "node:
 import { dirname, join } from "node:path";
 import { loadConfigFile } from "./load.js";
 import { AUTH_FILE } from "./paths.js";
-import { CONFIG_FILE_VERSION } from "./types.js";
+import { CONFIG_FILE_VERSION, apiKeyEntry } from "./types.js";
+import { isOAuthEntry } from "./types-w6.js";
+import { msg } from "../i18n/index.js";
 export function defaultAuthFilePath(configDir) {
     return join(configDir, AUTH_FILE);
 }
@@ -41,7 +43,7 @@ export function readAuthFile(path) {
     const warnings = [...loaded.warnings];
     const mode = fileMode(path);
     if (isModeTooOpen(mode)) {
-        warnings.push(`${path}: 权限为 ${mode?.toString(8).padStart(4, "0")}，应为 0600（chmod 600 ${path}）`);
+        warnings.push(msg().config.authFile.modeTooOpen(path, mode?.toString(8).padStart(4, "0") ?? ""));
     }
     const result = { path, exists: true, file: loaded.value, warnings };
     if (mode !== undefined && process.platform !== "win32")
@@ -59,7 +61,8 @@ export function writeAuthFile(path, file) {
 /** `ama auth set`：设置 / 替换一家的 key（保留该条目的 env / baseUrl）。 */
 export function setAuthKey(path, provider, apiKey) {
     const { file } = readAuthFile(path);
-    const previous = file.providers[provider];
+    // [W6-C0] 覆盖 OAuth 条目时不带走它的字段
+    const previous = apiKeyEntry(file.providers[provider]);
     file.providers[provider] = { ...previous, apiKey };
     writeAuthFile(path, { version: CONFIG_FILE_VERSION, providers: file.providers });
 }
@@ -80,13 +83,32 @@ export function classifyKeyValue(value) {
         return "env-ref";
     return "literal";
 }
-export function describeAuthFile(file) {
+export function describeAuthFile(file, now = Date.now()) {
     return Object.entries(file.providers)
-        .map(([provider, entry]) => ({
-        provider,
-        kind: classifyKeyValue(entry.apiKey),
-        hasBaseUrl: entry.baseUrl !== undefined,
-        envNames: Object.keys(entry.env ?? {}).sort(),
-    }))
+        .map(([provider, raw]) => {
+        if (isOAuthEntry(raw)) {
+            const summary = {
+                provider,
+                kind: "oauth",
+                hasBaseUrl: false,
+                envNames: [],
+                flavor: raw.flavor,
+                expiresIn: raw.expiresAt - now,
+                needsLogin: raw.needsLogin === true,
+            };
+            if (raw.planType !== undefined)
+                summary.plan = raw.planType;
+            return summary;
+        }
+        const entry = apiKeyEntry(raw);
+        if (entry === undefined)
+            return { provider, kind: "oauth", hasBaseUrl: false, envNames: [] };
+        return {
+            provider,
+            kind: classifyKeyValue(entry.apiKey),
+            hasBaseUrl: entry.baseUrl !== undefined,
+            envNames: Object.keys(entry.env ?? {}).sort(),
+        };
+    })
         .sort((a, b) => a.provider.localeCompare(b.provider));
 }

package/dist/config/checker.js

@@ -1,6 +1,7 @@
 /**
  * 配置校验的诊断收集器（从 schema.ts 抽出，schema-w5.ts 共用）。[W5-C0]
  */
+import { msg } from "../i18n/index.js";
 export const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"];
 export class Checker {
     diagnostics = [];
@@ -13,44 +14,44 @@ export class Checker {
     object(value, path) {
         if (typeof value === "object" && value !== null && !Array.isArray(value))
             return true;
-        this.error(path, "应为对象");
+        this.error(path, msg().config.schema.object);
         return false;
     }
     /** 未知字段只警告（前向兼容）。 */
     keys(value, path, allowed) {
         for (const key of Object.keys(value)) {
             if (!allowed.includes(key))
-                this.warn(join(path, key), "未知字段，已忽略");
+                this.warn(join(path, key), msg().config.schema.unknownKey);
         }
     }
     version(value, path) {
         if (value["version"] !== 1)
-            this.error(join(path, "version"), "version 必须为 1");
+            this.error(join(path, "version"), msg().config.schema.version);
     }
     string(value, key, path, required = false) {
         const v = value[key];
         if (v === undefined) {
             if (required)
-                this.error(join(path, key), "缺少必填字符串");
+                this.error(join(path, key), msg().config.schema.requiredString);
             return;
         }
         if (typeof v !== "string")
-            this.error(join(path, key), "应为字符串");
+            this.error(join(path, key), msg().config.schema.string);
     }
     boolean(value, key, path) {
         const v = value[key];
         if (v !== undefined && typeof v !== "boolean")
-            this.error(join(path, key), "应为布尔值");
+            this.error(join(path, key), msg().config.schema.boolean);
     }
     number(value, key, path, min = 0, max = Number.MAX_SAFE_INTEGER) {
         const v = value[key];
         if (v === undefined)
             return;
         if (typeof v !== "number" || !Number.isFinite(v)) {
-            this.error(join(path, key), "应为数字");
+            this.error(join(path, key), msg().config.schema.number);
         }
         else if (v < min || v > max) {
-            this.error(join(path, key), `应在 ${min}–${max} 之间`);
+            this.error(join(path, key), msg().config.schema.range(min, max));
         }
     }
     oneOf(value, key, path, choices) {
@@ -58,7 +59,7 @@ export class Checker {
         if (v === undefined)
             return;
         if (typeof v !== "string" || !choices.includes(v)) {
-            this.error(join(path, key), `取值应为 ${choices.join(" | ")}`);
+            this.error(join(path, key), msg().config.schema.oneOf(choices));
         }
     }
     stringArray(value, key, path) {
@@ -66,7 +67,7 @@ export class Checker {
         if (v === undefined)
             return;
         if (!Array.isArray(v) || v.some((item) => typeof item !== "string")) {
-            this.error(join(path, key), "应为字符串数组");
+            this.error(join(path, key), msg().config.schema.stringArray);
         }
     }
     stringRecord(value, key, path) {
@@ -77,7 +78,7 @@ export class Checker {
             return;
         for (const [k, item] of Object.entries(v)) {
             if (typeof item !== "string")
-                this.error(join(join(path, key), k), "应为字符串");
+                this.error(join(join(path, key), k), msg().config.schema.string);
         }
     }
 }

package/dist/config/context-files.js

@@ -10,6 +10,7 @@
  */
 import { readFileSync, realpathSync, statSync } from "node:fs";
 import { join } from "node:path";
+import { msg } from "../i18n/index.js";
 import { ancestorsOf } from "./trust.js";
 export const CONTEXT_FILE_NAMES = ["AGENTS.override.md", "AGENTS.md", "AGENTS.MD"];
 function isFile(path) {
@@ -51,12 +52,12 @@ export function findContextFiles(input) {
             content = readFileSync(path, "utf8");
         }
         catch (error) {
-            warnings.push(`${path}: 读取失败（${error.message}）`);
+            warnings.push(msg().config.context.readFailed(path, error.message));
             return;
         }
         if (Buffer.byteLength(content) > maxBytes) {
             content = Buffer.from(content).subarray(0, maxBytes).toString("utf8");
-            warnings.push(`${path}: 超过 ${maxBytes} 字节，已截断`);
+            warnings.push(msg().config.context.truncated(path, maxBytes));
         }
         if (seenContent.has(content))
             return;

package/dist/config/edit.d.ts

@@ -0,0 +1,106 @@
+/**
+ * Settings edit core (docs/wave6-plan.md §6.2, D24-D26). [W6-S]
+ *
+ * Shared by the `/config` panel, `/config key=value` and `ama config get | set | unset | list`:
+ * - `readSnapshot()` reads the user and project files fresh and merges them with the profile / command
+ *   line layers the same way bootstrap does (default <- user <- profile <- project, tighten only <- cli);
+ * - `getConfigValue()` gives the effective value of a key and which layer it came from (env vars that
+ *   override a key count as a layer `env`);
+ * - `setConfigValue()` / `unsetConfigValue()` re-read the target file right before writing, change one
+ *   path, run `validateConfig`, check project writes with `restrictProjectConfig` (anything that would be
+ *   ignored there -- a loosening or a user-only key -- is refused), then write atomically with `.bak`
+ *   (`writeConfigFile`). Refusals leave the file byte-for-byte untouched.
+ * There is no file lock: a concurrent `ama config edit` between our read and write is lost (R12).
+ */
+import { AmaError } from "../errors.js";
+import { type CliConfigOverrides, type ConfigLayerName } from "./merge.js";
+import { type SettingApply } from "./settings-registry.js";
+import { type AmaConfig } from "./types.js";
+export type SettingSource = ConfigLayerName | "env";
+export type EditScope = "user" | "project";
+export type ConfigEditCode = "config_unknown_key" | "config_invalid_value" | "config_project_denied" | "config_locked" | "config_read_failed" | "config_write_failed";
+/** Refused edit; `exitCode` 3 (`ExitCode.Config`) except write failures (1). */
+export declare class ConfigEditError extends AmaError {
+    readonly code: ConfigEditCode;
+    constructor(code: ConfigEditCode, message: string);
+}
+type Env = Readonly<Record<string, string | undefined>>;
+type Obj = Record<string, unknown>;
+export interface ConfigLayerInput {
+    /** User config directory (`AMA_CONFIG_DIR` / XDG). */
+    configDir: string;
+    /** Project root (`.ama/config.json` lives here). */
+    cwd: string;
+    env: Env;
+    /** Embedded host profile: its `config` layer (PROFILE_DEFAULTS are added when `hasProfile`). */
+    profile?: {
+        config?: AmaConfig | undefined;
+    } | undefined;
+    hasProfile?: boolean;
+    /** Command line overrides of this process. */
+    cli?: CliConfigOverrides | undefined;
+}
+export interface ConfigSnapshot {
+    input: ConfigLayerInput;
+    userPath: string;
+    projectPath: string;
+    user: AmaConfig | undefined;
+    project: AmaConfig | undefined;
+    /** default <- user <- profile (the baseline project-level tightening is measured against). */
+    base: AmaConfig;
+    /** Effective config (what bootstrap would build now). */
+    config: AmaConfig;
+    /** Each layer as it contributes (project = accepted part only), lowest first. */
+    layers: readonly {
+        name: ConfigLayerName;
+        value: unknown;
+    }[];
+}
+export interface SettingValue {
+    key: string;
+    /** Effective value (built-in default when no layer sets it; undefined = unset / decided at run time). */
+    value: unknown;
+    source: SettingSource;
+    /** Env var that overrides it (when source is `env`). */
+    envName?: string;
+}
+export interface EditResult {
+    key: string;
+    scope: EditScope;
+    path: string;
+    before: SettingValue;
+    after: SettingValue;
+    apply: SettingApply | undefined;
+    /** The key changes the cache prefix and its effective value changed. */
+    prefixChanged: boolean;
+    /** The written value is still hidden by a higher layer. */
+    overriddenBy: SettingSource | undefined;
+    snapshot: ConfigSnapshot;
+}
+export declare function getPath(value: unknown, key: string): unknown;
+/** Set (or with `undefined` delete) one dotted path; empty parent objects are removed. */
+export declare function setPath(target: Obj, key: string, value: unknown): void;
+/** Read both files and merge all layers. */
+export declare function readSnapshot(input: ConfigLayerInput): ConfigSnapshot;
+/** Effective value and source of one key. */
+export declare function getConfigValue(snapshot: ConfigSnapshot, key: string): SettingValue;
+export declare function overriddenFor(value: SettingValue, scope: EditScope): SettingSource | undefined;
+/** Throws `config_unknown_key` unless `ama config set` accepts the key. */
+export declare function assertSettable(key: string): void;
+/**
+ * Parse a command line / panel value. `undefined` means unset (`none`, `unset`; `default` too unless it
+ * is a valid enum value). `jsonValue` takes JSON (lists and objects need it).
+ */
+export declare function parseValue(key: string, raw: string, jsonValue?: boolean): unknown;
+export interface SetOptions extends ConfigLayerInput {
+    scope: EditScope;
+    key: string;
+    /** Parsed value; `undefined` unsets. */
+    value: unknown;
+}
+/** Write one key into the user or project file (or unset it with `value: undefined`). */
+export declare function setConfigValue(options: SetOptions): EditResult;
+export declare function unsetConfigValue(options: Omit<SetOptions, "value">): EditResult;
+/** Display text of a value (JSON for lists / objects, plain otherwise). */
+export declare function formatSettingValue(value: unknown): string;
+export {};