@armadra/agent 0.6.7 → 0.7.0

package/dist/drivers/jsonrpc.js

@@ -5,7 +5,10 @@
  * - 分帧复用 `modes/rpc/jsonl.ts`（只按 `\n` 切行、64 KiB 分片写、背压等 drain），写入串行；
  * - 双向：本端可发请求 / 通知，也处理对端的请求（`onRequest` 抛 {@link RpcError} 即回错误）与通知；
  * - `jsonrpcField: false` 时不写 `"jsonrpc":"2.0"`（Codex app-server 的线上形状），读取两种都认；
- * - 连接关闭（输入流结束）时所有挂起的请求以 `connection_closed` 失败。
+ * - 连接关闭（输入流结束）时所有挂起的请求以 `connection_closed` 失败；
+ * - `cancelRequests: true`（ACP 两侧）时支持协议级取消 `$/cancel_request`：本端请求的 `signal` abort
+ *   会通知对端；对端撤回本端正在处理的请求时 abort 该请求的 `ctx.signal`，处理器此后抛错一律回 -32800。
+ *   缺省关闭（Codex app-server 不认），线上形状与之前逐字节相同。
  */
 import { createLineReader, writeChunked } from "../modes/rpc/jsonl.js";
 import { RPC_ERRORS } from "./acp/types.js";
@@ -19,9 +22,13 @@ export class RpcError extends Error {
         this.name = "RpcError";
     }
 }
+/** `$/cancel_request` 的方法名（与 ACP_METHODS.cancelRequest 相同；这里不依赖 ACP 词汇表）。 */
+const CANCEL_REQUEST = "$/cancel_request";
 export class JsonRpcPeer {
     options;
     pending = new Map();
+    /** 正在处理的对端请求（只在 `cancelRequests` 时记录），供 `$/cancel_request` 撤回。 */
+    inflight = new Map();
     reader;
     lifetime = new AbortController();
     nextId = 1;
@@ -39,14 +46,19 @@ export class JsonRpcPeer {
     get isOpen() {
         return !this.isClosed;
     }
-    /** 发请求；`signal` abort 时本端不再等（不通知对端，协议级取消由调用方另发）。 */
+    /**
+     * 发请求；`signal` abort 时本端不再等。`cancelRequests` 开着时同时给对端发
+     * `$/cancel_request { requestId }`（已发出的请求才发），否则不通知对端。
+     */
     request(method, params, signal) {
         if (this.isClosed)
             return Promise.reject(closedError(method));
         const id = this.nextId++;
         return new Promise((resolve, reject) => {
             const onAbort = () => {
-                this.pending.delete(id);
+                const sent = this.pending.delete(id);
+                if (sent && this.options.cancelRequests === true && !this.isClosed)
+                    void this.notify(CANCEL_REQUEST, { requestId: id });
                 reject(new RpcError(RPC_ERRORS.internalError, `${method}: aborted`));
             };
             if (signal?.aborted === true)
@@ -116,6 +128,14 @@ export class JsonRpcPeer {
             return;
         }
         if (typeof message.method === "string") {
+            if (message.method === CANCEL_REQUEST &&
+                this.options.cancelRequests === true &&
+                (message.id === undefined || message.id === null)) {
+                const requestId = message.params?.requestId;
+                if (typeof requestId === "string" || typeof requestId === "number")
+                    this.inflight.get(requestId)?.abort();
+                return;
+            }
             if (message.id !== undefined && message.id !== null) {
                 void this.handleRequest(message.id, message.method, message.params);
             }
@@ -154,14 +174,23 @@ export class JsonRpcPeer {
             });
             return;
         }
+        let cancel;
+        let signal = this.lifetime.signal;
+        if (this.options.cancelRequests === true) {
+            cancel = new AbortController();
+            this.inflight.set(id, cancel);
+            signal = AbortSignal.any([this.lifetime.signal, cancel.signal]);
+        }
         try {
-            const result = await handler(method, params, { id, signal: this.lifetime.signal });
+            const result = await handler(method, params, { id, signal });
             await this.send({ id, result: result ?? null });
         }
         catch (error) {
-            const rpc = error instanceof RpcError
-                ? error
-                : new RpcError(RPC_ERRORS.internalError, error instanceof Error ? error.message : String(error));
+            const rpc = cancel?.signal.aborted === true
+                ? new RpcError(RPC_ERRORS.requestCancelled, `${method}: request cancelled`)
+                : error instanceof RpcError
+                    ? error
+                    : new RpcError(RPC_ERRORS.internalError, error instanceof Error ? error.message : String(error));
             await this.send({
                 id,
                 error: {
@@ -171,6 +200,10 @@ export class JsonRpcPeer {
                 },
             });
         }
+        finally {
+            if (cancel !== undefined && this.inflight.get(id) === cancel)
+                this.inflight.delete(id);
+        }
     }
 }
 function closedError(method) {

package/dist/drivers/turn.d.ts

@@ -2,7 +2,8 @@
  * 一个回合的结果汇总（各驱动共用）。[W5-E]
  *
  * 驱动把归一化后的 {@link DriverEvent} 交给收集器：它转发给 `onEvent`，同时累计最终文本、
- * 工具摘要（≤ 20 行，§5.2）、触及的文件（edit / delete / move 类工具的 locations）与用量。
+ * 工具摘要（≤ 20 行，§5.2）、触及的文件（edit / delete / move 类工具的 locations，以及带 diff 内容的
+ * 工具改动的路径——不论种类，见 {@link TurnCollector.noteDiff}）与用量。
  * 原始事件只在内存里流过，不落盘（§5.4 敏感数据）。
  */
 import type { AcpToolKind, DriverEvent, DriverTurnResult } from "./types.js";
@@ -12,6 +13,10 @@ interface ToolState {
     kind: AcpToolKind;
     status: "pending" | "in_progress" | "completed" | "failed";
     locations: string[];
+    /** 工具内容里 diff 的路径（ACP `content[].type === "diff"`）。 */
+    diffPaths?: string[];
+    /** 已转发过的状态（去重用）。 */
+    reported: Set<ToolState["status"]>;
 }
 export declare class TurnCollector {
     private readonly onEvent;
@@ -20,8 +25,16 @@ export declare class TurnCollector {
     private readonly order;
     private usage;
     constructor(onEvent: (event: DriverEvent) => void);
-    /** 归一化事件：累计后转发给 onEvent。 */
+    /**
+     * 归一化事件：累计后转发给 onEvent。同一工具调用回到已报过的状态（如审批前后
+     * `in_progress → pending → in_progress`）且标题、种类、位置都没变时不再转发，免得下游重复报进度。
+     */
     push(event: DriverEvent): void;
+    /**
+     * 记下工具改动的文件（diff 内容的路径）：工具完成后计入 filesTouched，不论它报的种类。
+     * 在 `push` 该工具的 `tool_call` 之后调（未知的 id 忽略）。[ACP-D]
+     */
+    noteDiff(id: string, paths: readonly string[]): void;
     /** 工具调用的最近状态（驱动做 tool_call_update 时补全标题与种类）。 */
     tool(id: string): Readonly<ToolState> | undefined;
     /** 回合结束时的累计用量合并（`result.usage` 等）。 */

package/dist/drivers/turn.js

@@ -2,7 +2,8 @@
  * 一个回合的结果汇总（各驱动共用）。[W5-E]
  *
  * 驱动把归一化后的 {@link DriverEvent} 交给收集器：它转发给 `onEvent`，同时累计最终文本、
- * 工具摘要（≤ 20 行，§5.2）、触及的文件（edit / delete / move 类工具的 locations）与用量。
+ * 工具摘要（≤ 20 行，§5.2）、触及的文件（edit / delete / move 类工具的 locations，以及带 diff 内容的
+ * 工具改动的路径——不论种类，见 {@link TurnCollector.noteDiff}）与用量。
  * 原始事件只在内存里流过，不落盘（§5.4 敏感数据）。
  */
 export const TOOL_SUMMARY_LINES = 20;
@@ -16,7 +17,10 @@ export class TurnCollector {
     constructor(onEvent) {
         this.onEvent = onEvent;
     }
-    /** 归一化事件：累计后转发给 onEvent。 */
+    /**
+     * 归一化事件：累计后转发给 onEvent。同一工具调用回到已报过的状态（如审批前后
+     * `in_progress → pending → in_progress`）且标题、种类、位置都没变时不再转发，免得下游重复报进度。
+     */
     push(event) {
         switch (event.type) {
             case "message_delta":
@@ -29,10 +33,20 @@ export class TurnCollector {
                     kind: event.kind,
                     status: event.status,
                     locations: event.locations ?? known?.locations ?? [],
+                    ...(known?.diffPaths !== undefined ? { diffPaths: known.diffPaths } : {}),
+                    reported: known?.reported ?? new Set(),
                 };
                 if (known === undefined)
                     this.order.push(event.id);
                 this.tools.set(event.id, next);
+                const repeat = known !== undefined &&
+                    next.reported.has(event.status) &&
+                    next.title === known.title &&
+                    next.kind === known.kind &&
+                    next.locations.join("\n") === known.locations.join("\n");
+                if (repeat)
+                    return;
+                next.reported.add(event.status);
                 break;
             }
             case "usage":
@@ -43,6 +57,16 @@ export class TurnCollector {
         }
         this.onEvent(event);
     }
+    /**
+     * 记下工具改动的文件（diff 内容的路径）：工具完成后计入 filesTouched，不论它报的种类。
+     * 在 `push` 该工具的 `tool_call` 之后调（未知的 id 忽略）。[ACP-D]
+     */
+    noteDiff(id, paths) {
+        const known = this.tools.get(id);
+        if (known === undefined || paths.length === 0)
+            return;
+        known.diffPaths = [...new Set([...(known.diffPaths ?? []), ...paths])];
+    }
     /** 工具调用的最近状态（驱动做 tool_call_update 时补全标题与种类）。 */
     tool(id) {
         return this.tools.get(id);
@@ -67,10 +91,15 @@ export class TurnCollector {
     }
     result(stopReason) {
         const files = new Set();
-        for (const tool of this.tools.values())
-            if (WRITE_KINDS.has(tool.kind) && tool.status === "completed")
+        for (const tool of this.tools.values()) {
+            if (tool.status !== "completed")
+                continue;
+            if (WRITE_KINDS.has(tool.kind))
                 for (const path of tool.locations)
                     files.add(path);
+            for (const path of tool.diffPaths ?? [])
+                files.add(path);
+        }
         const lines = this.order.map((id) => {
             const tool = this.tools.get(id);
             return `${tool.status === "failed" ? "✗" : tool.status === "completed" ? "✓" : "…"} ${tool.kind} ${tool.title}`;

package/dist/i18n/catalog.d.ts

@@ -4,7 +4,7 @@
  *
  * 领域 → 所有者：cli / subcommands（I1）；interactive / approval / plan / rewind / panels / permissions（I2）；
  * report / print / drivers / session / errors（I3）；config（I4）；agents（A）；trace（T1 / T2）；
- * memory（M）；auth（O）；settings（S）。
+ * memory（M）；auth（O）；settings（S）；acp（ACP-C0 新增，docs/acp-plan.md D15）。
  */
 import type { Messages } from "./types.js";
 import * as rewind from "./messages/rewind.js";
@@ -16,6 +16,7 @@ declare const en: {
             flagsConflict: (flags: readonly string[]) => string;
             invalidChoice: (option: string, choices: readonly string[], got: string) => string;
             emptyValue: (option: string) => string;
+            unknownTerminalAuth: (id: string) => string;
             fullscreenUnsupported: string;
             maxTurnsPositive: (got: string) => string;
             maxCostPositive: (got: string) => string;
@@ -162,6 +163,7 @@ declare const en: {
             appendToolFailed: (name: string, message: string) => string;
             notComposed: string;
             switchWhileStreaming: string;
+            notLiveSession: string;
         };
         composeStore: {
             ambiguousId: (id: string, candidates: readonly string[]) => string;
@@ -1279,21 +1281,6 @@ declare const en: {
             noPlan: string;
             badMode: (modes: readonly string[]) => string;
         };
-        acp: {
-            missingParam: (key: string) => string;
-            promptNotArray: string;
-            unparsable: (reason: string) => string;
-            missingProtocolVersion: string;
-            fixedCwd: (cwd: string, got: string) => string;
-            sessionNotFound: (id: string, error: string) => string;
-            busy: string;
-            modelFailed: string;
-            unknownMode: (mode: string) => string;
-            allowOnce: string;
-            allowAlways: string;
-            rejectOnce: string;
-            truncated: (length: number) => string;
-        };
     };
     config: {
         keys: {
@@ -1995,6 +1982,7 @@ declare const en: {
         unknownAction: (action: string) => string;
         setPrompt: (provider: string) => string;
         noKeyFromStdin: string;
+        pickProvider: string;
         saved: (provider: string, path: string) => string;
         warning: (text: string) => string;
         listEmpty: (path: string) => string;
@@ -2255,6 +2243,61 @@ declare const en: {
             missingValue: string;
         };
     };
+    acp: {
+        core: {
+            missingParam: (key: string) => string;
+            promptNotArray: string;
+            unparsable: (reason: string) => string;
+            missingProtocolVersion: string;
+            fixedCwd: (cwd: string, got: string) => string;
+            sessionNotFound: (id: string, error: string) => string;
+            modelFailed: string;
+            unknownMode: (mode: string) => string;
+            allowOnce: string;
+            allowAlways: string;
+            rejectOnce: string;
+            unknownConfigOption: (id: string) => string;
+        };
+        auth: {
+            chatgptName: string;
+            chatgptDescription: string;
+            apiKeyName: string;
+            apiKeyDescription: string;
+            notAgentMethod: string;
+            waiting: (reason: string) => string;
+            ready: (model: string) => string;
+        };
+        session: {
+            notOpen: (id: string) => string;
+            invalidCursor: string;
+            ignoredMcp: (count: number) => string;
+            ignoredDirs: (count: number) => string;
+        };
+        tools: {
+            codemodePrefix: (title: string) => string;
+            truncated: (length: number) => string;
+        };
+        config: {
+            model: string;
+            mode: string;
+            thinking: string;
+            levels: {
+                off: string;
+                minimal: string;
+                low: string;
+                medium: string;
+                high: string;
+                xhigh: string;
+            };
+            invalidValue: (id: string, value: string) => string;
+            unknownModel: (ref: string) => string;
+        };
+        client: {
+            authRequired: (agent: string, methods: readonly string[]) => string;
+            authNoMethods: (agent: string) => string;
+            authTerminal: (name: string, command: string) => string;
+        };
+    };
 };
 /** 运行期取用的目录形状：en 的形状、叶子放宽为 string / 同签名函数。 */
 export type Catalog = Messages<typeof en>;

package/dist/i18n/catalog.js

@@ -4,7 +4,7 @@
  *
  * 领域 → 所有者：cli / subcommands（I1）；interactive / approval / plan / rewind / panels / permissions（I2）；
  * report / print / drivers / session / errors（I3）；config（I4）；agents（A）；trace（T1 / T2）；
- * memory（M）；auth（O）；settings（S）。
+ * memory（M）；auth（O）；settings（S）；acp（ACP-C0 新增，docs/acp-plan.md D15）。
  */
 import * as cli from "./messages/cli.js";
 import * as subcommands from "./messages/subcommands.js";
@@ -25,6 +25,7 @@ import * as trace from "./messages/trace.js";
 import * as memory from "./messages/memory.js";
 import * as auth from "./messages/auth.js";
 import * as settings from "./messages/settings.js";
+import * as acp from "./messages/acp.js";
 const en = {
     cli: cli.en,
     subcommands: subcommands.en,
@@ -45,6 +46,7 @@ const en = {
     memory: memory.en,
     auth: auth.en,
     settings: settings.en,
+    acp: acp.en,
 };
 const zh = {
     cli: cli.zh,
@@ -66,6 +68,7 @@ const zh = {
     memory: memory.zh,
     auth: auth.zh,
     settings: settings.zh,
+    acp: acp.zh,
 };
 export const CATALOGS = { en, zh };
 /** 领域名（一级命名空间）。 */

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

@@ -0,0 +1,125 @@
+/**
+ * 消息目录：acp（键名规范见 docs/i18n.md）。[ACP-C0 从 print.acp 迁入，docs/acp-plan.md D15]
+ *
+ * en 是形状源；zh 用 `satisfies Messages<typeof en>`，缺键 / 多键 / 参数不符在 tsc 期报错。
+ * 整句一个键、禁止片段拼接；插值写成函数，条件分支写进函数体。
+ * 发给 ACP 客户端的 name / description / error message 是给人看的，走这里；`_meta`、id、value 等机器字段不翻译。
+ * 子对象各归一个批次：core（现有服务端文案）、auth（A）、session（B）、tools（C）、config / client（D）。
+ */
+export declare const en: {
+    /** ACP 服务端（`ama --mode acp`）的现有文案。 */
+    core: {
+        missingParam: (key: string) => string;
+        promptNotArray: string;
+        unparsable: (reason: string) => string;
+        missingProtocolVersion: string;
+        fixedCwd: (cwd: string, got: string) => string;
+        sessionNotFound: (id: string, error: string) => string;
+        modelFailed: string;
+        unknownMode: (mode: string) => string;
+        allowOnce: string;
+        allowAlways: string;
+        rejectOnce: string;
+        unknownConfigOption: (id: string) => string;
+    };
+    /** [ACP-A] 认证门与终端认证方法。 */
+    auth: {
+        chatgptName: string;
+        chatgptDescription: string;
+        apiKeyName: string;
+        apiKeyDescription: string;
+        notAgentMethod: string;
+        waiting: (reason: string) => string;
+        ready: (model: string) => string;
+    };
+    /** [ACP-B] 多会话与会话元数据。 */
+    session: {
+        notOpen: (id: string) => string;
+        invalidCursor: string;
+        ignoredMcp: (count: number) => string;
+        ignoredDirs: (count: number) => string;
+    };
+    /** [ACP-C] 工具调用映射。 */
+    tools: {
+        /** codemode 脚本里的内层调用的标题。 */
+        codemodePrefix: (title: string) => string;
+        truncated: (length: number) => string;
+    };
+    /** [ACP-D] 配置项与命令表。 */
+    config: {
+        model: string;
+        mode: string;
+        thinking: string;
+        levels: {
+            off: string;
+            minimal: string;
+            low: string;
+            medium: string;
+            high: string;
+            xhigh: string;
+        };
+        invalidValue: (id: string, value: string) => string;
+        unknownModel: (ref: string) => string;
+    };
+    /** [ACP-D] ama 作 ACP 客户端时的文案。 */
+    client: {
+        authRequired: (agent: string, methods: readonly string[]) => string;
+        authNoMethods: (agent: string) => string;
+        authTerminal: (name: string, command: string) => string;
+    };
+};
+export declare const zh: {
+    core: {
+        missingParam: (key: string) => string;
+        promptNotArray: string;
+        unparsable: (reason: string) => string;
+        missingProtocolVersion: string;
+        fixedCwd: (cwd: string, got: string) => string;
+        sessionNotFound: (id: string, error: string) => string;
+        modelFailed: string;
+        unknownMode: (mode: string) => string;
+        allowOnce: string;
+        allowAlways: string;
+        rejectOnce: string;
+        unknownConfigOption: (id: string) => string;
+    };
+    auth: {
+        chatgptName: string;
+        chatgptDescription: string;
+        apiKeyName: string;
+        apiKeyDescription: string;
+        notAgentMethod: string;
+        waiting: (reason: string) => string;
+        ready: (model: string) => string;
+    };
+    session: {
+        notOpen: (id: string) => string;
+        invalidCursor: string;
+        ignoredMcp: (count: number) => string;
+        ignoredDirs: (count: number) => string;
+    };
+    tools: {
+        codemodePrefix: (title: string) => string;
+        truncated: (length: number) => string;
+    };
+    config: {
+        model: string;
+        mode: string;
+        thinking: string;
+        levels: {
+            off: string;
+            minimal: string;
+            low: string;
+            medium: string;
+            high: string;
+            xhigh: string;
+        };
+        invalidValue: (id: string, value: string) => string;
+        unknownModel: (ref: string) => string;
+    };
+    client: {
+        authRequired: (agent: string, methods: readonly string[]) => string;
+        authNoMethods: (agent: string) => string;
+        authTerminal: (name: string, command: string) => string;
+    };
+};

package/dist/i18n/messages/acp.js

@@ -0,0 +1,126 @@
+/**
+ * 消息目录：acp（键名规范见 docs/i18n.md）。[ACP-C0 从 print.acp 迁入，docs/acp-plan.md D15]
+ *
+ * en 是形状源；zh 用 `satisfies Messages<typeof en>`，缺键 / 多键 / 参数不符在 tsc 期报错。
+ * 整句一个键、禁止片段拼接；插值写成函数，条件分支写进函数体。
+ * 发给 ACP 客户端的 name / description / error message 是给人看的，走这里；`_meta`、id、value 等机器字段不翻译。
+ * 子对象各归一个批次：core（现有服务端文案）、auth（A）、session（B）、tools（C）、config / client（D）。
+ */
+import { plural } from "../format.js";
+export const en = {
+    /** ACP 服务端（`ama --mode acp`）的现有文案。 */
+    core: {
+        missingParam: (key) => `missing ${key}`,
+        promptNotArray: "prompt must be an array of content blocks",
+        unparsable: (reason) => `ACP: unparsable input (${reason})`,
+        missingProtocolVersion: "missing protocolVersion",
+        fixedCwd: (cwd, got) => `the session directory of ama --mode acp is fixed to the start directory ${cwd} (got ${got})`,
+        sessionNotFound: (id, error) => `session ${id} not found: ${error}`,
+        modelFailed: "model request failed",
+        unknownMode: (mode) => `unknown mode: ${mode}`,
+        allowOnce: "Allow",
+        allowAlways: "Allow for this session",
+        rejectOnce: "Deny",
+        unknownConfigOption: (id) => `unknown config option: ${id}`,
+    },
+    /** [ACP-A] 认证门与终端认证方法。 */
+    auth: {
+        chatgptName: "Sign in with ChatGPT",
+        chatgptDescription: "Runs ama auth login chatgpt in a terminal (ChatGPT subscription)",
+        apiKeyName: "Enter an API key",
+        apiKeyDescription: "Runs ama auth set in a terminal: pick a provider, then paste its API key",
+        notAgentMethod: "ama only offers terminal auth methods, which are not passed to authenticate; run the method in a terminal",
+        waiting: (reason) => `no model available yet (${reason}); ACP stays up — sign in from the client's terminal login or run ama auth set, then open a session again`,
+        ready: (model) => `model available (${model}); ACP sessions are served from now on`,
+    },
+    /** [ACP-B] 多会话与会话元数据。 */
+    session: {
+        notOpen: (id) => `session ${id} is not open in this connection; send session/load or session/resume first`,
+        invalidCursor: "invalid cursor (pass back the nextCursor of a previous session/list)",
+        ignoredMcp: (count) => `ACP: ignoring ${plural(count, "MCP server")} from the client (ama does not connect MCP servers)`,
+        ignoredDirs: (count) => `ACP: ignoring ${plural(count, "additional directory", "additional directories")} from the client (the workspace is fixed to the start directory)`,
+    },
+    /** [ACP-C] 工具调用映射。 */
+    tools: {
+        /** codemode 脚本里的内层调用的标题。 */
+        codemodePrefix: (title) => `codemode › ${title}`,
+        truncated: (length) => `…(truncated, ${plural(length, "character")} in total)`,
+    },
+    /** [ACP-D] 配置项与命令表。 */
+    config: {
+        model: "Model",
+        mode: "Permission mode",
+        thinking: "Thinking level",
+        levels: {
+            off: "Off",
+            minimal: "Minimal",
+            low: "Low",
+            medium: "Medium",
+            high: "High",
+            xhigh: "Extra high",
+        },
+        invalidValue: (id, value) => `invalid value for config option ${id}: ${value}`,
+        unknownModel: (ref) => `unknown model: ${ref}`,
+    },
+    /** [ACP-D] ama 作 ACP 客户端时的文案。 */
+    client: {
+        authRequired: (agent, methods) => `${agent} requires sign-in. Sign in with one of: ${methods.join("; ")}; then try again`,
+        authNoMethods: (agent) => `${agent} requires sign-in and offers no sign-in method; sign in with the agent's own CLI, then try again`,
+        authTerminal: (name, command) => `${name} (run in a terminal: ${command})`,
+    },
+};
+export const zh = {
+    core: {
+        missingParam: (key) => `缺少 ${key}`,
+        promptNotArray: "prompt 应为内容块数组",
+        unparsable: (reason) => `ACP：无法解析的输入（${reason}）`,
+        missingProtocolVersion: "缺少 protocolVersion",
+        fixedCwd: (cwd, got) => `ama --mode acp 的会话目录固定为启动目录 ${cwd}（收到 ${got}）`,
+        sessionNotFound: (id, error) => `找不到会话 ${id}：${error}`,
+        modelFailed: "模型请求失败",
+        unknownMode: (mode) => `未知模式：${mode}`,
+        allowOnce: "允许",
+        allowAlways: "本会话允许",
+        rejectOnce: "拒绝",
+        unknownConfigOption: (id) => `未知配置项：${id}`,
+    },
+    auth: {
+        chatgptName: "使用 ChatGPT 登录",
+        chatgptDescription: "在终端运行 ama auth login chatgpt（ChatGPT 订阅）",
+        apiKeyName: "填写 API key",
+        apiKeyDescription: "在终端运行 ama auth set：选供应商后粘贴它的 API key",
+        notAgentMethod: "ama 只提供终端型认证方法，这类方法不经 authenticate；请在终端里运行该方法",
+        waiting: (reason) => `暂无可用模型（${reason}）；ACP 连接保持——在客户端的终端登录或运行 ama auth set 后再开会话`,
+        ready: (model) => `模型已可用（${model}），开始处理 ACP 会话`,
+    },
+    session: {
+        notOpen: (id) => `会话 ${id} 没有在本连接中打开；先发 session/load 或 session/resume`,
+        invalidCursor: "无效的 cursor（应原样传回上一次 session/list 的 nextCursor）",
+        ignoredMcp: (count) => `ACP：忽略客户端给的 ${count} 个 MCP 服务器（ama 不连接 MCP）`,
+        ignoredDirs: (count) => `ACP：忽略客户端给的 ${count} 个附加目录（工作目录固定为启动目录）`,
+    },
+    tools: {
+        codemodePrefix: (title) => `codemode › ${title}`,
+        truncated: (length) => `…（已截断，共 ${length} 字符）`,
+    },
+    config: {
+        model: "模型",
+        mode: "权限模式",
+        thinking: "思考级别",
+        levels: {
+            off: "关",
+            minimal: "最低",
+            low: "低",
+            medium: "中",
+            high: "高",
+            xhigh: "超高",
+        },
+        invalidValue: (id, value) => `配置项 ${id} 的值无效：${value}`,
+        unknownModel: (ref) => `未知模型：${ref}`,
+    },
+    client: {
+        authRequired: (agent, methods) => `${agent} 需要先登录。可用的登录方式：${methods.join("；")}；登录后再试`,
+        authNoMethods: (agent) => `${agent} 需要先登录，但没有提供登录方式；请用它自己的命令行登录后再试`,
+        authTerminal: (name, command) => `${name}（在终端里运行：${command}）`,
+    },
+};

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

@@ -19,6 +19,7 @@ export declare const en: {
     unknownAction: (action: string) => string;
     setPrompt: (provider: string) => string;
     noKeyFromStdin: string;
+    pickProvider: string;
     saved: (provider: string, path: string) => string;
     warning: (text: string) => string;
     listEmpty: (path: string) => string;
@@ -116,6 +117,7 @@ export declare const zh: {
     unknownAction: (action: string) => string;
     setPrompt: (provider: string) => string;
     noKeyFromStdin: string;
+    pickProvider: string;
     saved: (provider: string, path: string) => string;
     warning: (text: string) => string;
     listEmpty: (path: string) => string;

package/dist/i18n/messages/auth.js

@@ -6,7 +6,7 @@
  * 文案里从不放 token、code、账户 id；邮箱只放掩码。
  */
 export const en = {
-    usage: `Usage: ama auth set <provider> [--auth-file <file>]   read the key from stdin
+    usage: `Usage: ama auth set [<provider>] [--auth-file <file>]   read the key from stdin (no provider on a TTY: pick one)
        ama auth list [--auth-file <file>]
        ama auth remove <provider> [--auth-file <file>]
        ama auth login chatgpt [--flavor siwc|codex] [--paste | --device] [--port <n>] [--no-browser] [--yes] [--auth-file <file>]
@@ -20,6 +20,7 @@ export const en = {
     unknownAction: (action) => `unknown auth subcommand: ${action}`,
     setPrompt: (provider) => `Enter the API key for ${provider} (hidden), then press Enter: `,
     noKeyFromStdin: "no key read from stdin",
+    pickProvider: "Which provider is the API key for?",
     saved: (provider, path) => `Saved the key for ${provider} → ${path} (0600)`,
     warning: (text) => `ama: warning: ${text}`,
     listEmpty: (path) => `${path}: no saved keys`,
@@ -114,7 +115,7 @@ export const en = {
     },
 };
 export const zh = {
-    usage: `用法：ama auth set <provider> [--auth-file <文件>]   从 stdin 读取 key
+    usage: `用法：ama auth set [<provider>] [--auth-file <文件>]   从 stdin 读取 key（TTY 下不给供应商则先选）
       ama auth list [--auth-file <文件>]
       ama auth remove <provider> [--auth-file <文件>]
       ama auth login chatgpt [--flavor siwc|codex] [--paste | --device] [--port <n>] [--no-browser] [--yes] [--auth-file <文件>]
@@ -128,6 +129,7 @@ export const zh = {
     unknownAction: (action) => `未知的 auth 子命令：${action}`,
     setPrompt: (provider) => `输入 ${provider} 的 API key（不回显），回车结束：`,
     noKeyFromStdin: "没有从 stdin 读到 key",
+    pickProvider: "这个 API key 属于哪个供应商？",
     saved: (provider, path) => `已保存 ${provider} 的 key → ${path}（0600）`,
     warning: (text) => `ama: 警告：${text}`,
     listEmpty: (path) => `${path}：没有保存的 key`,