@armadra/agent 0.6.1 → 0.6.3

package/dist/git/info.js

@@ -7,13 +7,16 @@
  *   `GIT_OPTIONAL_LOCKS=0`；两次之间 ≥ `minIntervalMs`（缺省 10 s），超过 `timeoutMs`（缺省 2 s）或
  *   非零退出 / 起不来就省略增删项，并在本实例（本会话）停用 numstat，HEAD 仍照常显示。
  *   `AMA_STATUS_GIT=0` 直接关闭 numstat（排错用）。
+ * - [W6] 领先 / 落后上游：当前分支在 git 配置里有 `branch.<名>.merge`（零依赖读 config，不起进程判断）时，
+ *   numstat 之后同一节流周期再跑 `git rev-list --left-right --count @{upstream}...HEAD`（同样的超时与环境）；
+ *   没有上游、detached、非零退出就省略；超时则本会话不再统计领先 / 落后。`AMA_STATUS_GIT=0` 同样关闭。
  * - 非 git 目录 `current()` 为 undefined（状态行整段省略）。
  * - `refresh()` 在回合边界调用（agent_settled、写类工具结束、回滚、/tree），只发起读取、不阻塞；
  *   结果有变化时通知 `onChange` 的监听者。
  */
 import { spawn as nodeSpawn } from "node:child_process";
 import { readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { isAbsolute, join, resolve } from "node:path";
 import { findGitDir, readGitHead } from "../checkpoints/git-head.js";
 export const GIT_NUMSTAT_INTERVAL_MS = 10_000;
 export const GIT_NUMSTAT_TIMEOUT_MS = 2_000;
@@ -30,6 +33,32 @@ export function parseNumstat(text) {
     }
     return { insertions, deletions };
 }
+/** `git rev-list --left-right --count @{upstream}...HEAD` 的输出：左（上游独有）= 落后，右 = 领先。 */
+export function parseLeftRight(text) {
+    const match = /^\s*(\d+)\s+(\d+)\s*$/.exec(text);
+    return match === null ? undefined : { behind: Number(match[1]), ahead: Number(match[2]) };
+}
+/** 分支在 git 配置里有没有上游（`[branch "<名>"]` 段里的 `merge`）；worktree 读主仓库的 config。 */
+export async function hasUpstream(cwd, branch) {
+    const gitDir = await findGitDir(cwd);
+    if (gitDir === undefined)
+        return false;
+    const common = (await readFile(join(gitDir, "commondir"), "utf8").catch(() => undefined))?.trim();
+    const dir = common === undefined ? gitDir : isAbsolute(common) ? common : resolve(gitDir, common);
+    const text = await readFile(join(dir, "config"), "utf8").catch(() => "");
+    let inBranch = false;
+    for (const raw of text.split("\n")) {
+        const line = raw.trim();
+        const section = /^\[\s*([^\]\s"]+)(?:\s+"((?:[^"\\]|\\.)*)")?\s*\]/.exec(line);
+        if (section !== null) {
+            inBranch = section[1]?.toLowerCase() === "branch" && section[2] === branch;
+            continue;
+        }
+        if (inBranch && /^merge\s*=\s*\S/i.test(line))
+            return true;
+    }
+    return false;
+}
 async function readHead(cwd) {
     const head = await readGitHead(cwd);
     if (head !== undefined) {
@@ -50,6 +79,8 @@ const sameInfo = (a, b) => a?.branch === b?.branch &&
     a?.shortHead === b?.shortHead &&
     a?.insertions === b?.insertions &&
     a?.deletions === b?.deletions &&
+    a?.ahead === b?.ahead &&
+    a?.behind === b?.behind &&
     (a === undefined) === (b === undefined);
 export class GitInfoWatcher {
     cwd;
@@ -67,6 +98,8 @@ export class GitInfoWatcher {
     headAgain = false;
     disposed = false;
     diff;
+    upstream;
+    upstreamDisabled;
     constructor(cwd, deps = {}) {
         this.cwd = cwd;
         this.spawn = deps.spawn ?? ((command, args, options) => nodeSpawn(command, args, options));
@@ -75,6 +108,7 @@ export class GitInfoWatcher {
         this.timeoutMs = deps.timeoutMs ?? GIT_NUMSTAT_TIMEOUT_MS;
         this.env = deps.env ?? process.env;
         this.numstatDisabled = this.env["AMA_STATUS_GIT"] === "0";
+        this.upstreamDisabled = this.numstatDisabled;
     }
     current() {
         return this.info;
@@ -118,6 +152,7 @@ export class GitInfoWatcher {
             : {
                 ...head,
                 ...(this.diff !== undefined && head.shortHead !== undefined ? this.diff : {}),
+                ...(this.upstream !== undefined && head.branch !== undefined ? this.upstream : {}),
             };
         if (sameInfo(this.info, next))
             return;
@@ -135,8 +170,7 @@ export class GitInfoWatcher {
             return Promise.resolve();
         this.lastNumstatAt = at;
         this.numstatRunning = true;
-        return this.numstat().then((diff) => {
-            this.numstatRunning = false;
+        return this.numstat().then(async (diff) => {
             if (this.disposed)
                 return;
             if (diff === undefined) {
@@ -145,14 +179,36 @@ export class GitInfoWatcher {
             }
             else
                 this.diff = diff;
+            await this.leftRight();
+            this.numstatRunning = false;
+            if (this.disposed)
+                return;
             const info = this.info;
             if (info === undefined)
                 return;
-            const { insertions: _i, deletions: _d, ...head } = info;
+            const { insertions: _i, deletions: _d, ahead: _a, behind: _b, ...head } = info;
             this.update(head);
         });
     }
-    numstat() {
+    /** 领先 / 落后上游：只在配置里有上游时起进程；超时本会话停用，非零退出只省略这一次。 */
+    async leftRight() {
+        const branch = this.info?.branch;
+        if (this.upstreamDisabled || branch === undefined || !(await hasUpstream(this.cwd, branch))) {
+            this.upstream = undefined;
+            return;
+        }
+        const result = await this.run(["rev-list", "--left-right", "--count", "@{upstream}...HEAD"]);
+        if (result === "timeout")
+            this.upstreamDisabled = true;
+        this.upstream =
+            typeof result === "object" && result.code === 0 ? parseLeftRight(result.out) : undefined;
+    }
+    async numstat() {
+        const result = await this.run(["diff", "--numstat", "HEAD"]);
+        return typeof result === "object" && result.code === 0 ? parseNumstat(result.out) : undefined;
+    }
+    /** 后台起一次 git；起不来为 undefined，超时杀掉并返回 `"timeout"`。 */
+    run(args) {
         return new Promise((resolve) => {
             let settled = false;
             let timer;
@@ -165,7 +221,7 @@ export class GitInfoWatcher {
             };
             let child;
             try {
-                child = this.spawn("git", ["diff", "--numstat", "HEAD"], {
+                child = this.spawn("git", args, {
                     cwd: this.cwd,
                     env: { ...this.env, GIT_OPTIONAL_LOCKS: "0" },
                 });
@@ -176,7 +232,7 @@ export class GitInfoWatcher {
             }
             timer = setTimeout(() => {
                 child.kill("SIGKILL");
-                done(undefined);
+                done("timeout");
             }, this.timeoutMs);
             timer.unref?.();
             let out = "";
@@ -185,7 +241,7 @@ export class GitInfoWatcher {
                 out += String(chunk);
             });
             child.on("error", () => done(undefined));
-            child.on("close", (code) => done(code === 0 ? parseNumstat(out) : undefined));
+            child.on("close", (code) => done({ code, out }));
         });
     }
 }

package/dist/i18n/catalog.d.ts

@@ -447,6 +447,8 @@ declare const en: {
             listFailed: (provider: string, error: string) => string;
             found: (provider: string, count: number, url: string) => string;
             unmatched: string;
+            fromBackend: string;
+            noBackendWindow: (ids: string) => string;
             image: string;
             reasoning: string;
             noTools: string;
@@ -535,6 +537,17 @@ declare const en: {
             cacheSilent: string;
             sandbox: string;
             cycleHint: string;
+            quota: {
+                session: string;
+                reset: string;
+                weekly: string;
+                weeklyReset: string;
+                window: (duration: string) => string;
+                windowReset: (duration: string) => string;
+                short5h: string;
+                shortWeek: string;
+                pending: string;
+            };
         };
         subagent: {
             running: (elapsed: string) => string;
@@ -633,16 +646,8 @@ declare const en: {
                 templates: (n: number) => string;
                 host: (host: string) => string;
                 warnings: (n: number) => string;
-                hintCompact: string;
-                keyModel: string;
-                keyDir: string;
-                keyMode: string;
-                keyLoaded: string;
-                keyHost: string;
-                keyWarnings: string;
                 thinking: (level: string) => string;
                 preset: (preset: string) => string;
-                warningsValue: (n: number) => string;
                 hint: string;
             };
             ui: {
@@ -1249,6 +1254,7 @@ declare const en: {
             needsPrompt: string;
             retry: (attempt: number, max: number, seconds: number, error: string) => string;
             modelFailed: string;
+            waitingTasks: (n: number) => string;
             planPending: (version: number, where: string) => string;
             limitTurns: (limit: number) => string;
             limitCost: (limit: string, spent: string) => string;
@@ -1257,6 +1263,7 @@ declare const en: {
         rpc: {
             unknownCommand: (type: string) => string;
             parseFailed: (error: string) => string;
+            badTaskId: string;
             missingType: string;
             unsupported: string;
             noPlan: string;
@@ -1325,6 +1332,7 @@ declare const en: {
             "ui.quietStartup": string;
             "ui.ascii": string;
             "ui.compact": string;
+            "ui.logo": string;
             "ui.animation": string;
             "ui.restoreOnCancel": string;
             "ui.statusLine": string;
@@ -1344,6 +1352,7 @@ declare const en: {
             "auth.chatgpt.clientId": string;
             "auth.chatgpt.issuer": string;
             "auth.chatgpt.originator": string;
+            "auth.chatgpt.codexClientVersion": string;
             "auth.chatgpt.redirectPorts": string;
             skills: string;
             "skills.dirs": string;
@@ -1380,6 +1389,8 @@ declare const en: {
             "subagents.maxConcurrent": string;
             "subagents.maxPending": string;
             "subagents.defaultModel": string;
+            "subagents.background": string;
+            "subagents.autoBackgroundAfterMs": string;
             models: string;
             "models.aliases": string;
             "models.aliases.fast": string;
@@ -1736,7 +1747,31 @@ declare const en: {
         bar: {
             more: (n: number) => string;
             keys: (up: string, down: string) => string;
+            keysFull: (up: string, down: string) => string;
             empty: string;
+            runHint: (down: string) => string;
+        };
+        focus: {
+            busyInput: (down: string) => string;
+            disabled: string;
+        };
+        background: {
+            done: (ids: string) => string;
+            none: string;
+            notForeground: (taskId: string) => string;
+            runHint: (key: string) => string;
+            timeout: (taskId: string, agent: string) => string;
+            host: (taskId: string, agent: string) => string;
+            moved: (elapsed: string) => string;
+            started: string;
+            interrupted: (ids: string) => string;
+        };
+        stop: {
+            confirm: (taskId: string) => string;
+            ended: (taskId: string) => string;
+        };
+        approval: {
+            runHint: (down: string) => string;
         };
         view: {
             back: string;
@@ -1974,6 +2009,12 @@ declare const en: {
             freePlanHint: (plan: string) => string;
             modelHint: string;
             modelsCached: (count: number) => string;
+            siwcEligibilityHint: string;
+            codexNoModels: (version: string) => string;
+        };
+        request: {
+            notEligible: string;
+            flavorMismatch: (current: string, ref: string, pinned: string) => string;
         };
         errors: {
             portsBusy: (ports: string, codex: boolean) => string;
@@ -2043,6 +2084,7 @@ declare const en: {
             "ui.showThinking": string;
             "ui.compact": string;
             "ui.animation": string;
+            "ui.logo": string;
             "ui.statusLine": string;
             "ui.restoreOnCancel": string;
             "ui.quietStartup": string;
@@ -2102,6 +2144,8 @@ declare const en: {
             "agents.sessionBudgetUsd": string;
             "subagents.maxConcurrent": string;
             "subagents.maxPending": string;
+            "subagents.background": string;
+            "subagents.autoBackgroundAfterMs": string;
             "memory.enabled": string;
             "memory.subagents": string;
         };

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

@@ -5,6 +5,8 @@
  * 整句一个键、禁止片段拼接；插值写成函数，条件分支写进函数体。
  *
  * W6-A：Agent 栏（状态、轮数、溢出行、按键提示）与子 Agent 视图（标题、占位、发送结果、外部 Agent 的说明）。
+ * W7-A：进栏键落空提示、运行提示行的进栏附加项。
+ * W7-C：转后台（Ctrl+B / 栏内 b / `/tasks bg`）、栏内 x 双击停止、停靠审批的提示、Esc 不影响后台任务。
  */
 export declare const en: {
     status: {
@@ -21,7 +23,37 @@ export declare const en: {
     bar: {
         more: (n: number) => string;
         keys: (up: string, down: string) => string;
+        /** [W7-C] 聚焦时的完整按键行（窄屏退回 `keys`）。 */
+        keysFull: (up: string, down: string) => string;
         empty: string;
+        /** [W7-A] 运行提示行的附加项（有子 Agent 任务时）。 */
+        runHint: (down: string) => string;
+    };
+    /** [W7-A] 进栏键落空时的一行提示。 */
+    focus: {
+        busyInput: (down: string) => string;
+        disabled: string;
+    };
+    /** [W7-C] 前台任务转后台。 */
+    background: {
+        done: (ids: string) => string;
+        none: string;
+        notForeground: (taskId: string) => string;
+        runHint: (key: string) => string;
+        timeout: (taskId: string, agent: string) => string;
+        host: (taskId: string, agent: string) => string;
+        moved: (elapsed: string) => string;
+        started: string;
+        interrupted: (ids: string) => string;
+    };
+    /** [W7-C] 栏内 x 停止（双击确认）。 */
+    stop: {
+        confirm: (taskId: string) => string;
+        ended: (taskId: string) => string;
+    };
+    /** [W7-C] 后台任务的审批停靠在栏里。 */
+    approval: {
+        runHint: (down: string) => string;
     };
     view: {
         back: string;
@@ -59,7 +91,31 @@ export declare const zh: {
     bar: {
         more: (n: number) => string;
         keys: (up: string, down: string) => string;
+        keysFull: (up: string, down: string) => string;
         empty: string;
+        runHint: (down: string) => string;
+    };
+    focus: {
+        busyInput: (down: string) => string;
+        disabled: string;
+    };
+    background: {
+        done: (ids: string) => string;
+        none: string;
+        notForeground: (taskId: string) => string;
+        runHint: (key: string) => string;
+        timeout: (taskId: string, agent: string) => string;
+        host: (taskId: string, agent: string) => string;
+        moved: (elapsed: string) => string;
+        started: string;
+        interrupted: (ids: string) => string;
+    };
+    stop: {
+        confirm: (taskId: string) => string;
+        ended: (taskId: string) => string;
+    };
+    approval: {
+        runHint: (down: string) => string;
     };
     view: {
         back: string;

package/dist/i18n/messages/agents.js

@@ -5,6 +5,8 @@
  * 整句一个键、禁止片段拼接；插值写成函数，条件分支写进函数体。
  *
  * W6-A：Agent 栏（状态、轮数、溢出行、按键提示）与子 Agent 视图（标题、占位、发送结果、外部 Agent 的说明）。
+ * W7-A：进栏键落空提示、运行提示行的进栏附加项。
+ * W7-C：转后台（Ctrl+B / 栏内 b / `/tasks bg`）、栏内 x 双击停止、停靠审批的提示、Esc 不影响后台任务。
  */
 import { plural } from "../format.js";
 export const en = {
@@ -22,7 +24,37 @@ export const en = {
     bar: {
         more: (n) => `${n} more`,
         keys: (up, down) => `${up}${down} select · Enter open · Esc back`,
+        /** [W7-C] 聚焦时的完整按键行（窄屏退回 `keys`）。 */
+        keysFull: (up, down) => `${up}${down} select · Enter open · b background · x stop · Esc back`,
         empty: "No sub-agent tasks yet",
+        /** [W7-A] 运行提示行的附加项（有子 Agent 任务时）。 */
+        runHint: (down) => `${down} Agent bar`,
+    },
+    /** [W7-A] 进栏键落空时的一行提示。 */
+    focus: {
+        busyInput: (down) => `Input is not empty; clear it and press ${down} for the Agent bar`,
+        disabled: "Agent bar is off (ui.agentBar); use /tasks",
+    },
+    /** [W7-C] 前台任务转后台。 */
+    background: {
+        done: (ids) => `Moved to the background: ${ids}; you'll be notified when it finishes`,
+        none: "No foreground task to move to the background",
+        notForeground: (taskId) => `${taskId} is not a running foreground task`,
+        runHint: (key) => `${key} to background`,
+        timeout: (taskId, agent) => `${taskId} ${agent} ran long and moved to the background (subagents.autoBackgroundAfterMs)`,
+        host: (taskId, agent) => `${taskId} ${agent} was moved to the background by the host`,
+        moved: (elapsed) => `moved to the background · ${elapsed}`,
+        started: "started in the background",
+        interrupted: (ids) => `Interrupted (background task ${ids} keeps running; Esc doesn't affect it)`,
+    },
+    /** [W7-C] 栏内 x 停止（双击确认）。 */
+    stop: {
+        confirm: (taskId) => `Press x again to stop ${taskId}`,
+        ended: (taskId) => `${taskId} has already finished`,
+    },
+    /** [W7-C] 后台任务的审批停靠在栏里。 */
+    approval: {
+        runHint: (down) => `${down} handle approval`,
     },
     view: {
         back: "Esc back",
@@ -34,7 +66,7 @@ export const en = {
         resumed: (taskId) => `Sent to ${taskId}; it continues in the background`,
         sendFailed: (message) => `Could not send: ${message}`,
         stopped: (taskId) => `Stopped ${taskId}`,
-        commandsHere: "Only /tasks stop works here; press Esc to go back for other commands",
+        commandsHere: "Only /tasks stop and /tasks bg work here; press Esc to go back for other commands",
         removed: (taskId) => `Task ${taskId} is gone`,
         unknown: (taskId) => `No task ${taskId}`,
         turn: (n) => `turn ${n}`,
@@ -60,7 +92,31 @@ export const zh = {
     bar: {
         more: (n) => `另 ${n} 个`,
         keys: (up, down) => `${up}${down} 选择 · Enter 打开 · Esc 返回`,
+        keysFull: (up, down) => `${up}${down} 选择 · Enter 打开 · b 转后台 · x 停止 · Esc 返回`,
         empty: "还没有子 Agent 任务",
+        runHint: (down) => `${down} Agent 栏`,
+    },
+    focus: {
+        busyInput: (down) => `输入框有字；清空后再按 ${down} 进 Agent 栏`,
+        disabled: "Agent 栏已关闭（ui.agentBar），用 /tasks",
+    },
+    background: {
+        done: (ids) => `已转后台：${ids}，完成后会通知`,
+        none: "没有可转后台的前台任务",
+        notForeground: (taskId) => `${taskId} 不是运行中的前台任务`,
+        runHint: (key) => `${key} 转后台`,
+        timeout: (taskId, agent) => `${taskId} ${agent} 运行较久，已自动转后台（subagents.autoBackgroundAfterMs）`,
+        host: (taskId, agent) => `${taskId} ${agent} 已由宿主转后台`,
+        moved: (elapsed) => `已转后台 · ${elapsed}`,
+        started: "已在后台启动",
+        interrupted: (ids) => `已中断（后台任务 ${ids} 仍在运行，Esc 不影响）`,
+    },
+    stop: {
+        confirm: (taskId) => `再按 x 停止 ${taskId}`,
+        ended: (taskId) => `${taskId} 已结束`,
+    },
+    approval: {
+        runHint: (down) => `${down} 处理审批`,
     },
     view: {
         back: "Esc 返回",
@@ -72,7 +128,7 @@ export const zh = {
         resumed: (taskId) => `已发给 ${taskId}，在后台继续`,
         sendFailed: (message) => `发送失败：${message}`,
         stopped: (taskId) => `已停止 ${taskId}`,
-        commandsHere: "这里只能用 /tasks stop；其它命令按 Esc 返回后输入",
+        commandsHere: "这里只能用 /tasks stop 与 /tasks bg；其它命令按 Esc 返回后输入",
         removed: (taskId) => `任务 ${taskId} 已不存在`,
         unknown: (taskId) => `没有任务 ${taskId}`,
         turn: (n) => `第 ${n} 轮`,

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

@@ -46,6 +46,12 @@ export declare const en: {
         freePlanHint: (plan: string) => string;
         modelHint: string;
         modelsCached: (count: number) => string;
+        siwcEligibilityHint: string;
+        codexNoModels: (version: string) => string;
+    };
+    request: {
+        notEligible: string;
+        flavorMismatch: (current: string, ref: string, pinned: string) => string;
     };
     errors: {
         portsBusy: (ports: string, codex: boolean) => string;
@@ -137,6 +143,12 @@ export declare const zh: {
         freePlanHint: (plan: string) => string;
         modelHint: string;
         modelsCached: (count: number) => string;
+        siwcEligibilityHint: string;
+        codexNoModels: (version: string) => string;
+    };
+    request: {
+        notEligible: string;
+        flavorMismatch: (current: string, ref: string, pinned: string) => string;
     };
     errors: {
         portsBusy: (ports: string, codex: boolean) => string;

package/dist/i18n/messages/auth.js

@@ -47,6 +47,16 @@ export const en = {
         freePlanHint: (plan) => `Note: the "${plan}" plan may not include subscription usage for ama.`,
         modelHint: "Use it with --model chatgpt/<model>; list the models your account can use with ama models discover chatgpt.",
         modelsCached: (count) => `Your account can use ${count} model(s); pick one with /model or --model chatgpt/<model>.`,
+        siwcEligibilityHint: "Whether this account can share its plan usage with ama is only confirmed on the first request.",
+        codexNoModels: (version) => `The codex backend returned no models. codexClientVersion (${version}) may be too old: set a newer Codex CLI version with ama config set auth.chatgpt.codexClientVersion <version>, then run ama models discover chatgpt.`,
+    },
+    request: {
+        notEligible: "this ChatGPT account cannot share plan usage with ama (403 subscription_sharing_user_not_eligible). Possible causes:\n" +
+            "  1. Plan: plan usage is shared with Plus / Pro only\n" +
+            "  2. Workspace account: Team / Enterprise / Edu workspaces may not offer it\n" +
+            "  3. Region restriction, or not yet rolled out during the preview (most likely when a Pro account still gets this error)\n" +
+            "You can sign in the other way instead: ama auth login chatgpt --flavor codex",
+        flavorMismatch: (current, ref, pinned) => `signed in with ${current}, but ${ref} pins the @${pinned} channel. Drop @${pinned} so the channel follows the sign-in, or run ama auth login chatgpt --flavor ${pinned}`,
     },
     errors: {
         portsBusy: (ports, codex) => `callback port ${ports} is in use: finish the other sign-in first, or use --paste${codex ? " / --device" : ""}`,
@@ -145,6 +155,16 @@ export const zh = {
         freePlanHint: (plan) => `注意：「${plan}」计划可能不含给 ama 用的订阅额度。`,
         modelHint: "用 --model chatgpt/<模型> 使用；账户可用的模型用 ama models discover chatgpt 查看。",
         modelsCached: (count) => `账户可用 ${count} 个模型，用 /model 或 --model chatgpt/<模型> 选择。`,
+        siwcEligibilityHint: "这个账户能否把套餐额度共享给 ama，要到首次请求时才能确认。",
+        codexNoModels: (version) => `codex 后端没有返回模型，可能是 codexClientVersion（${version}）过旧：用 ama config set auth.chatgpt.codexClientVersion <版本> 设为较新的 Codex CLI 版本，再运行 ama models discover chatgpt。`,
+    },
+    request: {
+        notEligible: "这个 ChatGPT 账户不能把套餐额度共享给 ama（403 subscription_sharing_user_not_eligible）。可能的原因：\n" +
+            "  1. 账户套餐：额度共享只对 Plus / Pro 开放\n" +
+            "  2. 工作空间账户：Team / Enterprise / Edu 工作空间可能未开放\n" +
+            "  3. 地区受限，或预览期尚未开放（Pro 账户仍报此错时最可能是这一条）\n" +
+            "可以改用另一种登录方式：ama auth login chatgpt --flavor codex",
+        flavorMismatch: (current, ref, pinned) => `当前以 ${current} 方式登录，但 ${ref} 显式指定了 @${pinned} 渠道。去掉 @${pinned} 让渠道跟随登录方式，或运行 ama auth login chatgpt --flavor ${pinned}`,
     },
     errors: {
         portsBusy: (ports, codex) => `回调端口 ${ports} 被占用：请先结束其它登录，或用 --paste${codex ? " / --device" : ""}`,

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

@@ -52,6 +52,7 @@ export declare const en: {
         "ui.quietStartup": string;
         "ui.ascii": string;
         "ui.compact": string;
+        "ui.logo": string;
         "ui.animation": string;
         "ui.restoreOnCancel": string;
         "ui.statusLine": string;
@@ -71,6 +72,7 @@ export declare const en: {
         "auth.chatgpt.clientId": string;
         "auth.chatgpt.issuer": string;
         "auth.chatgpt.originator": string;
+        "auth.chatgpt.codexClientVersion": string;
         "auth.chatgpt.redirectPorts": string;
         skills: string;
         "skills.dirs": string;
@@ -107,6 +109,8 @@ export declare const en: {
         "subagents.maxConcurrent": string;
         "subagents.maxPending": string;
         "subagents.defaultModel": string;
+        "subagents.background": string;
+        "subagents.autoBackgroundAfterMs": string;
         models: string;
         "models.aliases": string;
         "models.aliases.fast": string;
@@ -195,6 +199,7 @@ export declare const zh: {
         "ui.quietStartup": string;
         "ui.ascii": string;
         "ui.compact": string;
+        "ui.logo": string;
         "ui.animation": string;
         "ui.restoreOnCancel": string;
         "ui.statusLine": string;
@@ -214,6 +219,7 @@ export declare const zh: {
         "auth.chatgpt.clientId": string;
         "auth.chatgpt.issuer": string;
         "auth.chatgpt.originator": string;
+        "auth.chatgpt.codexClientVersion": string;
         "auth.chatgpt.redirectPorts": string;
         skills: string;
         "skills.dirs": string;
@@ -250,6 +256,8 @@ export declare const zh: {
         "subagents.maxConcurrent": string;
         "subagents.maxPending": string;
         "subagents.defaultModel": string;
+        "subagents.background": string;
+        "subagents.autoBackgroundAfterMs": string;
         models: string;
         "models.aliases": string;
         "models.aliases.fast": string;