@armadra/agent 0.5.1 → 0.6.1

package/dist/ai/providers/registry.js

@@ -57,6 +57,8 @@ export class ProviderRegistry {
     envBaseUrls = new Map();
     /** baseUrl 指向非官方主机的内置供应商：接受目录外的 model id。 */
     relayed = new Set();
+    /** 模型表只来自发现缓存的供应商：表外的 id 照样合成（与空表相同）。 */
+    openTables = new Set();
     /** config 里写了自己 `channels` 的供应商（内置渠道不因改 baseUrl 作废）。 */
     userChannels = new Set();
     /** config 里写了供应商级 `api` 的供应商（单渠道回落时目录模型跟它走）。 */
@@ -344,6 +346,8 @@ export class ProviderRegistry {
         const provider = this.providers.get(providerId);
         if (!provider)
             return;
+        if (source === "discovered" && provider.models.length === 0 && provider.requiresApiKey)
+            this.openTables.add(providerId);
         for (const raw of models) {
             this.raw.delete(`${providerId}/${raw.id}`);
             const model = this.materialize(provider, { ...raw, provider: providerId });
@@ -408,7 +412,8 @@ export class ProviderRegistry {
                 const model = provider.models.find((m) => m.id === id);
                 if (model)
                     return { ok: true, model, provider };
-                const relayed = provider.models.length === 0 || this.relayed.has(provider.id);
+                const open = this.relayed.has(provider.id) || this.openTables.has(provider.id);
+                const relayed = provider.models.length === 0 || open;
                 if (synthesize && relayed && id.length > 0) {
                     const synthesized = this.synthesize(provider, id);
                     if (channel !== undefined && provider.channels?.some((c) => c.name === channel))

package/dist/ai/providers/suggest.js

@@ -4,6 +4,7 @@
  * 候选排序：包含关系（`sonnet` ⊂ `claude-sonnet-5`）优先，其次按编辑距离；距离超过
  * `max(2, ⌈长度 / 3⌉)` 的不算接近。只比较 id 本身（不含 `provider/` 前缀），大小写不敏感。
  */
+import { msg } from "../../i18n/index.js";
 /** Levenshtein 距离（插入 / 删除 / 替换各计 1）。 */
 export function editDistance(a, b) {
     if (a === b)
@@ -53,20 +54,5 @@ export function closest(needle, candidates, limit = 5, key = String) {
 /** 解析失败的一行说明（不含前缀标签）：`渠道不存在：x；该模型可用渠道：…` 等。 */
 export function describeLookupFailure(ref, failure) {
     const list = failure.candidates.slice(0, 20).join(", ");
-    switch (failure.reason) {
-        case "channel_not_found":
-            return failure.candidates.length > 0
-                ? `渠道不存在：${ref}；该模型可用渠道：${list}`
-                : `渠道不存在：${ref}；该模型没有可选渠道（去掉 @ 后缀）`;
-        case "provider_not_found":
-            return failure.candidates.length > 0
-                ? `供应商不存在：${ref}；最接近的供应商：${list}`
-                : `供应商不存在：${ref}（ama providers list 查看已配置的供应商）`;
-        case "ambiguous":
-            return `模型名有歧义：${ref}；候选：${list}`;
-        default:
-            return failure.candidates.length > 0
-                ? `模型不存在：${ref}；最接近的模型：${list}`
-                : `模型不存在：${ref}（ama models list 查看可用模型）`;
-    }
+    return msg().errors.models.lookupFailure(ref, failure.reason, list, failure.candidates.length > 0);
 }

package/dist/ai/types.d.ts

@@ -115,6 +115,8 @@ export interface Usage {
      * 协议尚未解析该标记时缺省（第三波 §1.6，「值为 0」与「不报」由此区分）。
      */
     cacheReported?: boolean;
+    /** [W6-C0] 订阅计费（ChatGPT 登录，W6-O）：`cost` 为 0，统计单列「订阅」不折算美元。 */
+    billing?: "subscription";
 }
 export type StopReason = "stop" | "length" | "toolUse" | "aborted" | "error";
 /** 工具声明（发给供应商的形状）。 */
@@ -230,6 +232,12 @@ export interface OpenAIResponsesCompat {
     supportsStore: boolean;
     /** [W5-C0] 端点私有的显式缓存字段：`volcengine` = 火山方舟 `caching: { type: "enabled" }`。 */
     explicitCacheField?: "volcengine";
+    /** [W6-C0] ChatGPT 订阅后端（W6-O）：决定请求体白名单、请求头与配额解析。 */
+    chatgptBackend?: "siwc" | "codex";
+    /** [W6-C0] 系统提示的放法：native（`instructions`）/ developer-message（codex flavor 400 回退）。 */
+    instructionsMode?: "native" | "developer-message";
+    /** [W6-C0] 工具放进 namespace（SIWC 待实测）。 */
+    toolsInNamespace?: boolean;
 }
 /**
  * [W3-C0] 供应商不报缓存时的处理（第三波 §1.6）：`auto` 按响应自动判定三态；`silent` /
@@ -390,6 +398,23 @@ export interface StreamOptions {
     /** 观测 / 替换请求体：返回非 undefined 即替换。 */
     onPayload?(payload: unknown): unknown;
     onResponse?(status: number, headers: Headers): void;
+    /**
+     * [W6-O] 订阅配额更新（ChatGPT 后端的响应头 / `codex.rate_limits` / 429）；会话层转成 `quota_update` 事件。
+     * 窗口时间为 epoch 毫秒，usedPercent 0–100。
+     */
+    onQuota?(update: {
+        planType?: string;
+        primary?: {
+            usedPercent: number;
+            resetsAt?: number;
+            windowMinutes?: number;
+        };
+        secondary?: {
+            usedPercent: number;
+            resetsAt?: number;
+            windowMinutes?: number;
+        };
+    }): void;
 }
 export type AssistantEvent = {
     type: "start";
@@ -452,7 +477,8 @@ export interface ApiImplementation<C = unknown> {
     /** 推断缺省 compat。 */
     detectCompat?(model: Model, provider: ProviderData): C;
 }
-export type KeySource = "cli" | "auth-file" | "config" | "env" | "none";
+/** [W6-C0] `oauth`：auth.json 的 OAuth 条目（W6-O）。 */
+export type KeySource = "cli" | "auth-file" | "config" | "env" | "oauth" | "none";
 /** 密钥只存在于 `apiKey` 字段，不进日志、会话、事件。 */
 export interface ApiKeyResolution {
     apiKey: string | undefined;

package/dist/auth/chatgpt/backend-client.d.ts

@@ -0,0 +1,26 @@
+/**
+ * ChatGPT 后端的只读查询（[W6-O]）：模型列表（`ama models discover chatgpt`）与 codex 的 `wham/usage`。
+ *
+ * - SIWC：`GET {base}/models`，只留 `visibility === "list"`（没有该字段的也留）；
+ * - codex：`GET {base}/models?client_version=<ama 版本>`，`models[].slug`（同样按 visibility 筛）；
+ *   `GET https://chatgpt.com/backend-api/wham/usage`（由 codex base 推出），私有格式，解析失败返回 undefined。
+ * 只取 slug 与显示名，上下文窗口不猜。请求带 Bearer；codex 另带 `ChatGPT-Account-ID` 与 `originator`。
+ */
+import { type QuotaSnapshot } from "../../ai/apis/chatgpt-rate-limits.js";
+import type { ChatGptFlavor } from "../../config/types-w6.js";
+import type { FetchLike } from "../oauth/token-client.js";
+export declare const BACKEND_TIMEOUT_MS = 15000;
+export interface BackendAuth {
+    flavor: ChatGptFlavor;
+    accessToken: string;
+    accountId?: string | undefined;
+    originator?: string | undefined;
+}
+export interface DiscoveredModel {
+    id: string;
+    name?: string;
+}
+export declare function listChatGptModels(fetchFn: FetchLike, baseUrl: string, auth: BackendAuth): Promise<DiscoveredModel[]>;
+export declare function usageUrl(codexBaseUrl: string): string;
+/** codex 的配额；任何失败返回 undefined。 */
+export declare function fetchCodexUsage(fetchFn: FetchLike, codexBaseUrl: string, auth: BackendAuth, timeoutMs?: number): Promise<QuotaSnapshot | undefined>;

package/dist/auth/chatgpt/backend-client.js

@@ -0,0 +1,74 @@
+/**
+ * ChatGPT 后端的只读查询（[W6-O]）：模型列表（`ama models discover chatgpt`）与 codex 的 `wham/usage`。
+ *
+ * - SIWC：`GET {base}/models`，只留 `visibility === "list"`（没有该字段的也留）；
+ * - codex：`GET {base}/models?client_version=<ama 版本>`，`models[].slug`（同样按 visibility 筛）；
+ *   `GET https://chatgpt.com/backend-api/wham/usage`（由 codex base 推出），私有格式，解析失败返回 undefined。
+ * 只取 slug 与显示名，上下文窗口不猜。请求带 Bearer；codex 另带 `ChatGPT-Account-ID` 与 `originator`。
+ */
+import { parseUsagePayload } from "../../ai/apis/chatgpt-rate-limits.js";
+import { AMA_VERSION } from "../../version.js";
+import { DEFAULT_ORIGINATOR } from "./presets.js";
+export const BACKEND_TIMEOUT_MS = 15_000;
+function headers(auth) {
+    const out = {
+        authorization: `Bearer ${auth.accessToken}`,
+        accept: "application/json",
+    };
+    if (auth.flavor === "codex") {
+        if (auth.accountId !== undefined)
+            out["ChatGPT-Account-ID"] = auth.accountId;
+        out["originator"] = auth.originator ?? DEFAULT_ORIGINATOR;
+    }
+    return out;
+}
+function listed(item) {
+    const visibility = item["visibility"];
+    return visibility === undefined || visibility === "list";
+}
+export async function listChatGptModels(fetchFn, baseUrl, auth) {
+    const base = baseUrl.replace(/\/+$/, "");
+    const url = auth.flavor === "codex"
+        ? `${base}/models?client_version=${encodeURIComponent(AMA_VERSION)}`
+        : `${base}/models`;
+    const response = await fetchFn(url, {
+        headers: headers(auth),
+        signal: AbortSignal.timeout(BACKEND_TIMEOUT_MS),
+    });
+    if (!response.ok)
+        throw new Error(`${response.status} listing models from ${url}`);
+    const body = (await response.json());
+    const items = (Array.isArray(body.models) ? body.models : Array.isArray(body.data) ? body.data : [])
+        .filter((x) => typeof x === "object" && x !== null)
+        .filter(listed);
+    const out = [];
+    const seen = new Set();
+    for (const item of items) {
+        const id = item["slug"] ?? item["id"];
+        if (typeof id !== "string" || id === "" || seen.has(id))
+            continue;
+        seen.add(id);
+        const name = item["display_name"];
+        out.push(typeof name === "string" && name !== "" ? { id, name } : { id });
+    }
+    return out;
+}
+export function usageUrl(codexBaseUrl) {
+    const base = codexBaseUrl.replace(/\/+$/, "").replace(/\/codex$/, "");
+    return `${base}/wham/usage`;
+}
+/** codex 的配额；任何失败返回 undefined。 */
+export async function fetchCodexUsage(fetchFn, codexBaseUrl, auth, timeoutMs = 5_000) {
+    try {
+        const response = await fetchFn(usageUrl(codexBaseUrl), {
+            headers: headers(auth),
+            signal: AbortSignal.timeout(timeoutMs),
+        });
+        if (!response.ok)
+            return undefined;
+        return parseUsagePayload(await response.json());
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/auth/chatgpt/claims.d.ts

@@ -0,0 +1,17 @@
+/**
+ * id_token 声明里的账户信息（R6 §1.2 账户 id 行）。[W6-O]
+ *
+ * codex：`https://api.openai.com/auth` 下的 `chatgpt_account_id` / `chatgpt_plan_type`；SIWC：以验签后的
+ * `sub` 作账户标识（官方文档），计划类型若有同样取 auth 声明。邮箱取 `email` 或 profile 声明。
+ */
+import type { JwtPayload } from "../oauth/jwt.js";
+export interface ChatGptAccount {
+    accountId?: string;
+    planType?: string;
+    email?: string;
+}
+export declare function chatgptAccount(claims: JwtPayload | undefined, flavor: "siwc" | "codex"): ChatGptAccount;
+/** 空格分隔的 scope 是否含 `required`。 */
+export declare function hasScope(scope: string | undefined, required: string): boolean;
+/** `a***@example.com`：status / doctor 用。 */
+export declare function maskEmail(email: string | undefined): string | undefined;

package/dist/auth/chatgpt/claims.js

@@ -0,0 +1,46 @@
+/**
+ * id_token 声明里的账户信息（R6 §1.2 账户 id 行）。[W6-O]
+ *
+ * codex：`https://api.openai.com/auth` 下的 `chatgpt_account_id` / `chatgpt_plan_type`；SIWC：以验签后的
+ * `sub` 作账户标识（官方文档），计划类型若有同样取 auth 声明。邮箱取 `email` 或 profile 声明。
+ */
+function obj(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function str(value) {
+    return typeof value === "string" && value !== "" ? value : undefined;
+}
+export function chatgptAccount(claims, flavor) {
+    if (claims === undefined)
+        return {};
+    const auth = obj(claims["https://api.openai.com/auth"]);
+    const profile = obj(claims["https://api.openai.com/profile"]);
+    const out = {};
+    const accountId = flavor === "codex"
+        ? (str(auth?.["chatgpt_account_id"]) ?? str(claims["chatgpt_account_id"]))
+        : (str(claims["sub"]) ?? str(auth?.["chatgpt_account_id"]));
+    if (accountId !== undefined)
+        out.accountId = accountId;
+    const plan = str(auth?.["chatgpt_plan_type"]) ?? str(claims["chatgpt_plan_type"]);
+    if (plan !== undefined)
+        out.planType = plan;
+    const email = str(claims["email"]) ?? str(profile?.["email"]);
+    if (email !== undefined)
+        out.email = email;
+    return out;
+}
+/** 空格分隔的 scope 是否含 `required`。 */
+export function hasScope(scope, required) {
+    return (scope ?? "").split(/[\s+]+/).includes(required);
+}
+/** `a***@example.com`：status / doctor 用。 */
+export function maskEmail(email) {
+    if (email === undefined)
+        return undefined;
+    const at = email.indexOf("@");
+    if (at <= 0)
+        return "***";
+    return `${email.slice(0, 1)}***${email.slice(at)}`;
+}

package/dist/auth/chatgpt/cli.d.ts

@@ -0,0 +1,35 @@
+/**
+ * `ama auth login | logout | status chatgpt`（docs/wave6-plan.md §4.2、D16）。[W6-O]
+ *
+ * - login：flavor 取 `--flavor` > 用户级 `auth.chatgpt.flavor` > siwc；`--paste` / `--device`（只 codex）/ 缺省
+ *   浏览器；codex 首次在 TTY 下一次性确认「非官方、仅个人使用」（非 TTY 需 `--yes`），`acknowledgedAt` 入条目；
+ *   成功后在刷新锁下写 auth.json（0600）。
+ *   成功后查一次模型列表写发现缓存（`<dataDir>/models/discovered/chatgpt.json`，失败静默）。
+ * - logout：SIWC 先撤销 refresh token（失败照样删本地，提示到 ChatGPT 设置里断开）；codex 只删本地；
+ *   同时删发现缓存。
+ * - status：flavor、计划、掩码邮箱、access token 剩余、needsLogin；codex 另查 `wham/usage` 显示配额。
+ *
+ * 输出里从不出现 token、code、账户 id；错误按码渲染（i18n），不回显响应原文。
+ */
+import { type ChatGptFlavor } from "../../config/types-w6.js";
+import type { CliIo } from "../../cli/deps.js";
+import { type BrowserOpener } from "../oauth/browser.js";
+import type { FetchLike } from "../oauth/token-client.js";
+export interface AuthCliDeps {
+    fetch?: FetchLike;
+    openBrowser?: BrowserOpener;
+    now?: () => number;
+    /** `--paste` 读回调 URL；缺省 `io.readStdin`（TTY 下一行不回显）。 */
+    readLine?: () => Promise<string>;
+}
+export interface AuthCliArgs {
+    positionals: string[];
+    values: Map<string, string>;
+    flags: Set<string>;
+    path: string;
+}
+/** AmaError → 本地化的一行（不含响应原文）。 */
+export declare function loginErrorText(error: unknown, flavor: ChatGptFlavor): string;
+export declare function runLogin(args: AuthCliArgs, io: CliIo, deps?: AuthCliDeps): Promise<number>;
+export declare function runLogout(args: AuthCliArgs, io: CliIo, deps?: AuthCliDeps): Promise<number>;
+export declare function runStatus(args: AuthCliArgs, io: CliIo, deps?: AuthCliDeps): Promise<number>;

package/dist/auth/chatgpt/cli.js

@@ -0,0 +1,279 @@
+/**
+ * `ama auth login | logout | status chatgpt`（docs/wave6-plan.md §4.2、D16）。[W6-O]
+ *
+ * - login：flavor 取 `--flavor` > 用户级 `auth.chatgpt.flavor` > siwc；`--paste` / `--device`（只 codex）/ 缺省
+ *   浏览器；codex 首次在 TTY 下一次性确认「非官方、仅个人使用」（非 TTY 需 `--yes`），`acknowledgedAt` 入条目；
+ *   成功后在刷新锁下写 auth.json（0600）。
+ *   成功后查一次模型列表写发现缓存（`<dataDir>/models/discovered/chatgpt.json`，失败静默）。
+ * - logout：SIWC 先撤销 refresh token（失败照样删本地，提示到 ChatGPT 设置里断开）；codex 只删本地；
+ *   同时删发现缓存。
+ * - status：flavor、计划、掩码邮箱、access token 剩余、needsLogin；codex 另查 `wham/usage` 显示配额。
+ *
+ * 输出里从不出现 token、code、账户 id；错误按码渲染（i18n），不回显响应原文。
+ */
+import { isAmaError } from "../../errors.js";
+import { describeAuthFile, readAuthFile } from "../../config/auth-file.js";
+import { loadConfigFile } from "../../config/load.js";
+import { CONFIG_FILE, resolveConfigDir, resolveDataDir } from "../../config/paths.js";
+import { CHATGPT_FLAVORS, isOAuthEntry, } from "../../config/types-w6.js";
+import { formatDuration, msg } from "../../i18n/index.js";
+import { UsageError } from "../../cli/args.js";
+import { ExitCode } from "../../cli/exit-codes.js";
+import { openBrowser } from "../oauth/browser.js";
+import { readOAuthEntry, withRefreshLock, writeOAuthEntry } from "../oauth/token-store.js";
+import { clearDiscoveredCache, writeDiscoveredCache } from "../../ai/providers/discovered-cache.js";
+import { fetchCodexUsage, listChatGptModels } from "./backend-client.js";
+import { maskEmail } from "./claims.js";
+import { loginChatGpt, revokeChatGpt } from "./login.js";
+import { CHATGPT_PROVIDER_ID, chatgptBaseUrl } from "./presets.js";
+import { quotaParts } from "./quota-text.js";
+function userAuthConfig(io) {
+    try {
+        const path = `${resolveConfigDir({ env: io.env })}/${CONFIG_FILE}`;
+        return loadConfigFile("config", path)?.value.auth?.chatgpt;
+    }
+    catch {
+        return undefined;
+    }
+}
+function providerOf(args, action) {
+    const provider = args.positionals[1];
+    if (provider === undefined)
+        throw new UsageError(msg().auth.needProvider(action));
+    if (args.positionals.length > 2)
+        throw new UsageError(msg().auth.extraArgs(args.positionals.slice(2).join(" ")));
+    if (provider !== CHATGPT_PROVIDER_ID)
+        throw new UsageError(msg().auth.login.onlyChatgpt(provider));
+    return provider;
+}
+/** AmaError → 本地化的一行（不含响应原文）。 */
+export function loginErrorText(error, flavor) {
+    const m = msg().auth.errors;
+    if (!isAmaError(error))
+        return error?.message ?? String(error);
+    const detail = (error.detail ?? {});
+    switch (error.code) {
+        case "oauth_ports_busy":
+            return m.portsBusy((detail.ports ?? []).join(" / "), flavor === "codex");
+        case "oauth_timeout":
+            return m.timeout;
+        case "oauth_denied":
+            return m.denied(detail.error ?? "error", flavor === "siwc");
+        case "oauth_state_mismatch":
+            return m.stateMismatch;
+        case "oauth_no_code":
+            return m.noCode;
+        case "oauth_invalid_token":
+            return m.invalidToken(detail.reason ?? "invalid");
+        case "oauth_scope_missing":
+            return m.scopeMissing(detail.scope ?? "chatgpt.tokens.use.direct");
+        case "oauth_no_client_id":
+            return m.noClientId;
+        case "oauth_no_account":
+            return m.noAccount;
+        case "oauth_device_unavailable":
+            return m.deviceUnavailable;
+        case "oauth_device_unsupported":
+            return msg().auth.login.deviceNeedsCodex;
+        case "oauth_http":
+        case "oauth_bad_response":
+            return m.http(error.message);
+        case "oauth_network":
+            return m.network(error.message);
+        case "auth_lock_timeout":
+            return m.lockTimeout;
+        case "aborted":
+            return m.aborted;
+        default:
+            return error.message;
+    }
+}
+function parseFlavor(raw, config) {
+    const value = raw ?? config?.flavor ?? "siwc";
+    if (!CHATGPT_FLAVORS.includes(value))
+        throw new UsageError(msg().auth.login.badFlavor(value));
+    return value;
+}
+function parsePort(raw) {
+    if (raw === undefined)
+        return undefined;
+    const port = Number(raw);
+    if (!Number.isInteger(port) || port < 0 || port > 65_535)
+        throw new UsageError(msg().auth.login.badPort(raw));
+    return port;
+}
+/** 确认输入两种语言都认（y / yes / 是 / 好），与界面语言无关。 */
+function isYes(answer) {
+    return /^\s*(y|yes|\u662f|\u597d)\s*$/i.test(answer);
+}
+export async function runLogin(args, io, deps = {}) {
+    const m = msg().auth.login;
+    const provider = providerOf(args, "login");
+    const config = userAuthConfig(io);
+    const flavor = parseFlavor(args.values.get("flavor"), config);
+    const port = parsePort(args.values.get("port"));
+    if (args.flags.has("paste") && args.flags.has("device"))
+        throw new UsageError(m.pasteDevice);
+    const method = args.flags.has("device")
+        ? "device"
+        : args.flags.has("paste")
+            ? "paste"
+            : "browser";
+    if (method === "device" && flavor !== "codex")
+        throw new UsageError(m.deviceNeedsCodex);
+    const existing = readOAuthEntry(args.path, provider);
+    let acknowledgedAt;
+    if (flavor === "codex") {
+        acknowledgedAt = existing?.flavor === "codex" ? existing.acknowledgedAt : undefined;
+        if (acknowledgedAt === undefined) {
+            io.stderr(`${m.codexNotice}\n`);
+            if (!args.flags.has("yes")) {
+                if (!io.stdinIsTTY) {
+                    io.stderr(`ama: ${m.codexNeedsYes}\n`);
+                    return ExitCode.Usage;
+                }
+                io.stderr(m.codexConfirm);
+                const answer = await io.readStdin();
+                io.stderr("\n");
+                if (!isYes(answer)) {
+                    io.stderr(`ama: ${m.cancelled}\n`);
+                    return ExitCode.RuntimeError;
+                }
+            }
+            acknowledgedAt = new Date((deps.now ?? Date.now)()).toISOString();
+        }
+    }
+    const onStep = (step) => {
+        if (step.kind === "open_url")
+            io.stderr(`${step.opened ? m.openedBrowser(step.url) : m.openUrl(step.url)}\n`);
+        else if (step.kind === "paste_prompt")
+            io.stderr(m.pastePrompt(step.url));
+        else
+            io.stderr(`${m.deviceCode(step.url, step.userCode)}\n`);
+    };
+    let entry;
+    try {
+        entry = await loginChatGpt({
+            flavor,
+            method,
+            noBrowser: args.flags.has("no-browser"),
+            dataDir: resolveDataDir({ env: io.env }),
+            env: io.env,
+            config,
+            entry: existing,
+            port,
+            acknowledgedAt,
+            deps: {
+                fetch: deps.fetch ?? fetch,
+                openBrowser: deps.openBrowser ?? openBrowser,
+                onStep,
+                readLine: async () => {
+                    const line = await (deps.readLine ?? (() => io.readStdin()))();
+                    if (io.stdinIsTTY)
+                        io.stderr("\n");
+                    return line;
+                },
+                pages: { success: m.pageSuccess, failure: m.pageFailure },
+            },
+        });
+        await withRefreshLock(args.path, async () => writeOAuthEntry(args.path, provider, entry));
+    }
+    catch (error) {
+        io.stderr(`ama: ${loginErrorText(error, flavor)}\n`);
+        return ExitCode.RuntimeError;
+    }
+    io.stdout(`${m.loggedIn(flavor, entry.planType, maskEmail(entry.email), args.path)}\n`);
+    if (entry.planType === "free")
+        io.stdout(`${m.freePlanHint(entry.planType)}\n`);
+    if (flavor === "siwc")
+        io.stdout(`${m.siwcLimitHint}\n`);
+    const count = await cacheModels(io, entry, config, deps);
+    io.stdout(`${count === undefined ? m.modelHint : m.modelsCached(count)}\n`);
+    return ExitCode.Ok;
+}
+/**
+ * 登录后查一次账户可用的模型（只读的模型列表接口，不消耗额度）并写发现缓存，`/model` 由此列出；
+ * 任何失败静默（返回 undefined，调用方改提示 `ama models discover chatgpt`）。
+ */
+async function cacheModels(io, entry, config, deps) {
+    try {
+        const models = await listChatGptModels(deps.fetch ?? fetch, chatgptBaseUrl(entry.flavor, io.env), {
+            flavor: entry.flavor,
+            accessToken: entry.accessToken,
+            accountId: entry.accountId,
+            originator: config?.originator,
+        });
+        if (models.length === 0)
+            return undefined;
+        const dataDir = resolveDataDir({ env: io.env });
+        writeDiscoveredCache(dataDir, CHATGPT_PROVIDER_ID, { models, flavor: entry.flavor });
+        return models.length;
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function runLogout(args, io, deps = {}) {
+    const m = msg().auth.logout;
+    const provider = providerOf(args, "logout");
+    const entry = readOAuthEntry(args.path, provider);
+    if (entry === undefined) {
+        io.stderr(`${m.notLoggedIn(provider, args.path)}\n`);
+        return ExitCode.RuntimeError;
+    }
+    const revoked = entry.flavor === "siwc"
+        ? await revokeChatGpt(deps.fetch ?? fetch, entry, { env: io.env, config: userAuthConfig(io) })
+        : undefined;
+    try {
+        await withRefreshLock(args.path, async () => writeOAuthEntry(args.path, provider, undefined));
+    }
+    catch (error) {
+        io.stderr(`ama: ${loginErrorText(error, entry.flavor)}\n`);
+        return ExitCode.RuntimeError;
+    }
+    clearDiscoveredCache(resolveDataDir({ env: io.env }), provider);
+    const text = revoked === undefined
+        ? m.local(provider, args.path)
+        : revoked
+            ? m.revoked(provider, args.path)
+            : m.notRevoked(provider, args.path);
+    io.stdout(`${text}\n`);
+    return ExitCode.Ok;
+}
+export async function runStatus(args, io, deps = {}) {
+    const m = msg().auth.status;
+    if (args.positionals.length > 2)
+        throw new UsageError(msg().auth.extraArgs(args.positionals.slice(2).join(" ")));
+    const only = args.positionals[1];
+    const now = (deps.now ?? Date.now)();
+    const { file } = readAuthFile(args.path);
+    const entries = Object.entries(file.providers).filter((pair) => isOAuthEntry(pair[1]) && (only === undefined || pair[0] === only));
+    if (entries.length === 0) {
+        io.stdout(`${m.none(args.path)}\n`);
+        return ExitCode.Ok;
+    }
+    const summaries = new Map(describeAuthFile(file, now).map((s) => [s.provider, s]));
+    const config = userAuthConfig(io);
+    for (const [provider, entry] of entries) {
+        const summary = summaries.get(provider);
+        io.stdout(`${m.header(provider, msg().auth.oauthSummary(entry.flavor, entry.planType, entry.needsLogin === true), maskEmail(entry.email))}\n`);
+        const left = summary?.expiresIn ?? entry.expiresAt - now;
+        if (entry.needsLogin === true)
+            io.stdout(`${m.needsLogin(provider)}\n`);
+        else
+            io.stdout(`${left > 0 ? m.expiresIn(formatDuration(left)) : m.expired}\n`);
+        if (entry.flavor === "siwc")
+            io.stdout(`${m.quotaSiwc}\n`);
+        else if (entry.needsLogin !== true && left > 0) {
+            const quota = await fetchCodexUsage(deps.fetch ?? fetch, chatgptBaseUrl("codex", io.env), {
+                flavor: "codex",
+                accessToken: entry.accessToken,
+                accountId: entry.accountId,
+                originator: config?.originator,
+            });
+            const parts = quota === undefined ? undefined : quotaParts(quota, now);
+            io.stdout(`${parts === undefined ? m.quotaUnavailable : m.quota(parts)}\n`);
+        }
+    }
+    return ExitCode.Ok;
+}

package/dist/auth/chatgpt/doctor.d.ts

@@ -0,0 +1,17 @@
+/**
+ * `ama doctor` 的 OAuth 行（[W6-O]）：只读文件、不刷新 token；codex flavor 且 token 未过期时查一次
+ * `wham/usage`（3 s 超时，失败静默）显示配额，SIWC 只给查看位置。
+ */
+import type { ChatGptAuthConfig, OAuthAuthEntry } from "../../config/types-w6.js";
+import type { FetchLike } from "../oauth/token-client.js";
+export interface OAuthDoctorLines {
+    line: string;
+    quota?: string;
+    problem?: string;
+}
+export declare function oauthDoctorLines(provider: string, entry: OAuthAuthEntry, options?: {
+    now?: number;
+    fetch?: FetchLike;
+    env?: Readonly<Record<string, string | undefined>>;
+    config?: ChatGptAuthConfig | undefined;
+}): Promise<OAuthDoctorLines>;

package/dist/auth/chatgpt/doctor.js

@@ -0,0 +1,36 @@
+/**
+ * `ama doctor` 的 OAuth 行（[W6-O]）：只读文件、不刷新 token；codex flavor 且 token 未过期时查一次
+ * `wham/usage`（3 s 超时，失败静默）显示配额，SIWC 只给查看位置。
+ */
+import { formatDuration, msg } from "../../i18n/index.js";
+import { fetchCodexUsage } from "./backend-client.js";
+import { chatgptBaseUrl } from "./presets.js";
+import { quotaParts } from "./quota-text.js";
+export async function oauthDoctorLines(provider, entry, options = {}) {
+    const m = msg().auth;
+    const now = options.now ?? Date.now();
+    const left = entry.expiresAt - now;
+    const state = entry.needsLogin === true
+        ? m.doctor.needsLogin
+        : left > 0
+            ? m.doctor.valid(formatDuration(left))
+            : m.doctor.expired;
+    const out = { line: m.doctor.oauth(entry.flavor, entry.planType, state) };
+    if (entry.needsLogin === true) {
+        out.problem = m.doctor.relogin(provider);
+        return out;
+    }
+    if (entry.flavor === "siwc")
+        out.quota = m.status.quotaSiwc.trim();
+    else if (left > 0) {
+        const quota = await fetchCodexUsage(options.fetch ?? fetch, chatgptBaseUrl("codex", options.env), {
+            flavor: "codex",
+            accessToken: entry.accessToken,
+            accountId: entry.accountId,
+            originator: options.config?.originator,
+        }, 3_000);
+        const parts = quota === undefined ? undefined : quotaParts(quota, now);
+        out.quota = (parts === undefined ? m.status.quotaUnavailable : m.status.quota(parts)).trim();
+    }
+    return out;
+}

package/dist/auth/chatgpt/host-id.d.ts

@@ -0,0 +1,7 @@
+/**
+ * SIWC 的 `ext_agent_host_id`（docs/wave6-plan.md D16）：每个安装稳定不变，存
+ * `<dataDir>/chatgpt-host.json`（0600，按安装、不随 dotfiles 同步），形如 `urn:uuid:…`。[W6-O]
+ */
+export declare const HOST_ID_FILE = "chatgpt-host.json";
+export declare function hostIdPath(dataDir: string): string;
+export declare function readOrCreateHostId(dataDir: string): string;