@armadra/agent 0.5.0 → 0.6.0

package/dist/ai/providers/auth.js

@@ -10,11 +10,20 @@
  * auth.json 的 `apiKey` 以 `!` 开头 = 执行命令取值（stdout 去首尾空白；超时 10 s；空输出或
  * 非零退出视为未配置，继续找下一来源）；同一命令进程内只执行一次。
  * 密钥只出现在 `resolve()` 的返回值里：warning 文案不含密钥与命令输出。
+ *
+ * [W6-O] auth.json 的 OAuth 条目（`type: "oauth"`，ChatGPT 登录）在 ②③ 的位置解析：每次从磁盘重读（绕过
+ * `fileCache`），临近过期经 `auth/oauth/refresh.ts` 刷新（跨进程锁），返回 `{ source: "oauth" }`，并把 token 的
+ * 上下文登记进 `auth/oauth/live.ts` 供协议层取账户 id、401 时强制刷新。永久失效（needsLogin）时仍返回旧 token
+ * 并在登记里标 needsLogin，协议层据此直接报 `auth_expired`（不发请求）。
  */
 import { exec } from "node:child_process";
 import { readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { registerLiveToken } from "../../auth/oauth/live.js";
+import { authExpiredError, freshOAuthEntry } from "../../auth/oauth/refresh.js";
+import { readOAuthEntry } from "../../auth/oauth/token-store.js";
+import { apiKeyEntry, isOAuthEntry } from "../../config/types-w6.js";
 /** 用户级配置目录：AMA_CONFIG_DIR > %APPDATA%\ama > $XDG_CONFIG_HOME/ama > ~/.config/ama。 */
 export function defaultConfigDir(env = process.env) {
     if (env["AMA_CONFIG_DIR"])
@@ -110,12 +119,61 @@ export class ApiKeyResolver {
     /** auth.json 里该供应商的条目（按 ② ③ 顺序第一个）。 */
     authEntry(providerId) {
         for (const path of this.authFiles()) {
-            const entry = this.loadFile(path)?.providers[providerId];
+            const entry = apiKeyEntry(this.loadFile(path)?.providers[providerId]);
             if (entry && typeof entry.apiKey === "string")
                 return { entry, path };
         }
         return undefined;
     }
+    /** [W6-O] 第一个给该供应商写了条目的 auth.json 若是 OAuth 条目，返回其路径。 */
+    oauthPath(providerId) {
+        for (const path of this.authFiles()) {
+            const raw = this.loadFile(path)?.providers[providerId];
+            if (raw === undefined)
+                continue;
+            return isOAuthEntry(raw) ? path : undefined;
+        }
+        return undefined;
+    }
+    register(path, providerId, entry) {
+        const deps = this.options.oauth ?? {};
+        registerLiveToken(entry.accessToken, {
+            provider: providerId,
+            flavor: entry.flavor,
+            accountId: entry.accountId,
+            planType: entry.planType,
+            ...(entry.needsLogin === true ? { needsLogin: true } : {}),
+            refresh: async () => {
+                const next = await freshOAuthEntry(path, providerId, deps, {
+                    force: true,
+                    staleToken: entry.accessToken,
+                });
+                if (next === undefined)
+                    throw authExpiredError(providerId);
+                this.register(path, providerId, next);
+                return next.accessToken;
+            },
+        });
+    }
+    async fromOAuth(providerId, path) {
+        let entry;
+        try {
+            entry = await freshOAuthEntry(path, providerId, this.options.oauth ?? {});
+        }
+        catch (error) {
+            // 失效：用旧 token 登记 needsLogin，协议层报 auth_expired；暂时失败：先用现有 token
+            entry = readOAuthEntry(path, providerId);
+            const code = error.code;
+            if (entry !== undefined && code === "auth_expired")
+                entry = { ...entry, needsLogin: true };
+            else
+                this.warn(`${providerId}: OAuth token refresh failed (${String(code ?? "error")})`);
+        }
+        if (entry === undefined)
+            return undefined;
+        this.register(path, providerId, entry);
+        return { apiKey: entry.accessToken, source: "oauth", origin: path };
+    }
     runCommand(command, extraEnv) {
         const key = `${command}\0${JSON.stringify(extraEnv ?? {})}`;
         let pending = this.commandCache.get(key);
@@ -138,7 +196,14 @@ export class ApiKeyResolver {
     }
     async fromAuthFiles(providerId) {
         for (const path of this.authFiles()) {
-            const entry = this.loadFile(path)?.providers[providerId];
+            const raw = this.loadFile(path)?.providers[providerId];
+            if (isOAuthEntry(raw)) {
+                const resolved = await this.fromOAuth(providerId, path);
+                if (resolved)
+                    return resolved;
+                continue;
+            }
+            const entry = apiKeyEntry(raw);
             if (!entry || typeof entry.apiKey !== "string" || entry.apiKey.length === 0)
                 continue;
             const value = entry.apiKey.startsWith("!")
@@ -194,6 +259,8 @@ export class ApiKeyResolver {
             return true;
         if (this.authEntry(provider.id)?.entry.apiKey)
             return true;
+        if (this.oauthPath(provider.id) !== undefined)
+            return true;
         const raw = this.options.configKeys?.[provider.id];
         if (raw && (raw.startsWith("!") || expandEnvRefs(raw, this.env) !== undefined))
             return true;

package/dist/ai/providers/builtin.js

@@ -227,6 +227,33 @@ export const BUILTIN_PROVIDERS = [
         envKeys: ["TOKENHUB_API_KEY", "HUNYUAN_API_KEY", "AMA_API_KEY_TENCENT"],
         requiresApiKey: true,
     },
+    {
+        // [W6-O] ChatGPT 订阅（docs/wave6-plan.md §4、D14）：`ama auth login chatgpt` 写 auth.json 的 OAuth 条目；
+        // 缺省渠道在组装时按条目的 flavor 定（compose-providers.ts）。模型表为空：`chatgpt/<slug>` 任意接受，
+        // `ama models discover chatgpt` 列出账户可用的 slug。缓存只有 prompt_cache_key（无 24h / 30m 显式缓存）。
+        id: "chatgpt",
+        name: "ChatGPT (subscription)",
+        api: RESPONSES,
+        baseUrl: "https://api.openai.com/v1",
+        channels: [
+            ch("siwc", RESPONSES, "https://api.openai.com/v1", { compat: { chatgptBackend: "siwc" } }),
+            ch("codex", RESPONSES, "https://chatgpt.com/backend-api/codex", {
+                headers: { originator: "codex_cli_rs" },
+                compat: { chatgptBackend: "codex" },
+            }),
+        ],
+        defaultChannel: "siwc",
+        envKeys: [],
+        requiresApiKey: true,
+        compat: {
+            supportsStore: true,
+            supportsReasoningSummary: true,
+            sendPromptCacheKey: true,
+            sendSessionAffinityHeaders: false,
+            supportsLongCacheRetention: false,
+            supportsExplicitPromptCacheMode: false,
+        },
+    },
     {
         id: "ollama",
         name: "Ollama (local)",

package/dist/ai/providers/catalog-data.js

@@ -4,6 +4,7 @@
  */
 export const CATALOG_SOURCES = {
     anthropic: '{"version":1,"provider":"anthropic","modelsDev":"anthropic","models":[{"id":"claude-fable-5-1","thinkingLevelMap":{"off":null,"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-fable-5","thinkingLevelMap":{"off":null,"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-5-5","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-5","thinkingLevelMap":{"off":null,"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-4-8","thinkingLevelMap":{"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":1024},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-4-7","thinkingLevelMap":{"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":2048},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-4-6","promptCache":{"short":300,"long":3600,"minTokens":4096},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-5-5","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-5","thinkingLevelMap":{"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":1024},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-4-6","promptCache":{"short":300,"long":3600,"minTokens":1024},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-4-5","promptCache":{"short":300,"long":3600,"minTokens":1024}},{"id":"claude-haiku-4-5","promptCache":{"short":300,"long":3600,"minTokens":4096}},{"id":"claude-opus-4-5","promptCache":{"short":300,"long":3600,"minTokens":4096}}]}',
+    chatgpt: '{"version":1,"provider":"chatgpt","modelsDev":false,"models":[]}',
     dashscope: '{"version":1,"provider":"dashscope","modelsDev":"alibaba-cn","models":[{"id":"qwen3.8-max","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":null,"xhigh":"xhigh"},"compat":{"supportsReasoningEffort":true}},{"id":"qwen3.8-flash","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":null,"xhigh":"xhigh"},"compat":{"supportsReasoningEffort":true}},{"id":"qwen3.7-max","maxTokens":131072,"compat":{"supportsReasoningEffort":false}},{"id":"qwen3.7-plus","maxTokens":65536,"compat":{"supportsReasoningEffort":false}},{"id":"qwen3.6-plus","compat":{"supportsReasoningEffort":false}},{"id":"qwen3.6-flash","compat":{"supportsReasoningEffort":false}}]}',
     deepseek: '{"version":1,"provider":"deepseek","modelsDev":"deepseek","models":[{"id":"deepseek-v4-pro","maxTokens":384000,"cost":{"input":1.32,"output":3.96,"cacheRead":0.044},"thinkingLevelMap":{"minimal":null,"low":null,"medium":null,"high":"high"},"_reason":"按官方价格页的高峰价（UTC 工作日 01–04、06–10 时）计，作上界；平峰为半价。快照价是平峰价或旧价"},{"id":"deepseek-flash","maxTokens":384000,"cost":{"input":0.3,"output":1.2,"cacheRead":0.006},"thinkingLevelMap":{"minimal":null,"low":"low","medium":null,"high":"high"},"_reason":"按官方价格页的高峰价（UTC 工作日 01–04、06–10 时）计，作上界；平峰为半价。快照价是平峰价或旧价"}]}',
     google: '{"version":1,"provider":"google","modelsDev":"google","models":[{"id":"gemini-3.8-flash","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.7-flash","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.5-flash","thinkingLevelMap":{"off":null,"minimal":"minimal","low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.5-flash-lite","thinkingLevelMap":{"off":null,"minimal":"minimal","low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.1-pro-preview","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3-flash-preview","thinkingLevelMap":{"off":null,"minimal":"minimal","low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-2.5-pro","thinkingLevelMap":{"off":null,"minimal":128,"low":2048,"medium":8192,"high":32768}},{"id":"gemini-2.5-flash","thinkingLevelMap":{"minimal":128,"low":2048,"medium":8192,"high":24576}},{"id":"gemini-2.5-flash-lite","thinkingLevelMap":{"minimal":512,"low":2048,"medium":8192,"high":24576}}]}',

package/dist/ai/providers/enrich.js

@@ -7,6 +7,7 @@
  */
 import { catalogInherited } from "./catalog.js";
 import { ENRICHABLE_FIELDS, modelsDevFields, } from "./models-dev.js";
+import { msg } from "../../i18n/index.js";
 /** 惰性取索引：只有真的要补字段时才读缓存（启动时没有自定义模型就不读约 2 MB 的缓存）。 */
 export function lazyIndex(source) {
     if (typeof source !== "function")
@@ -90,12 +91,6 @@ export function catalogMetadata(model) {
     }
     return { sources, looked: false };
 }
-const SOURCE_TEXT = {
-    config: "config",
-    catalog: "目录",
-    "models.dev": "models.dev",
-    default: "缺省",
-};
 export function sourceText(source) {
-    return SOURCE_TEXT[source];
+    return msg().errors.models.source(source);
 }

package/dist/ai/providers/models-dev-cache.js

@@ -12,6 +12,7 @@ import { mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from "no
 import { dirname, join } from "node:path";
 import { ModelsDevIndex as Index } from "./models-dev.js";
 import { buildSnapshot, builtinSnapshot, builtinSnapshotIndex, diffSnapshots, mergeSnapshot, snapshotList, snapshotMeta, } from "./models-dev-snapshot.js";
+import { msg } from "../../i18n/index.js";
 export const MODELS_DEV_URL = "https://models.dev/api.json";
 export const MODELS_DEV_URL_ENV = "AMA_MODELS_DEV_URL";
 export const MODELS_DEV_FILE = "models-dev.json";
@@ -79,11 +80,11 @@ export function loadModelsDevIndex(dataDir) {
 export function describeModelsDev(dataDir) {
     const index = loadModelsDevIndex(dataDir);
     const file = readModelsDevCache(dataDir);
-    const size = `${index.providerCount} 家供应商、${index.modelCount} 个模型`;
+    const m = msg().errors.models;
     const via = file !== undefined && overrideApplies(file)
-        ? `快照 ${snapshotMeta().fetchedAt} ⊕ 刷新 ${file.fetchedAt}`
-        : `快照 ${snapshotMeta().fetchedAt}`;
-    return `models.dev：${via}（${size}）`;
+        ? m.viaRefresh(snapshotMeta().fetchedAt, file.fetchedAt)
+        : m.viaSnapshot(snapshotMeta().fetchedAt);
+    return m.describe(via, index.providerCount, index.modelCount);
 }
 /** 显式联网刷新（只被 `ama models refresh` 调用）：拉 api.json、按清单裁剪、写用户级覆盖。 */
 export async function refreshModelsDev(options) {
@@ -94,12 +95,12 @@ export async function refreshModelsDev(options) {
         status: "failed",
         url,
         index: before,
-        warning: `models.dev 刷新失败（${reason}），沿用现有数据`,
+        warning: msg().errors.models.refreshFailed(reason),
     });
     const list = snapshotList();
     const unknown = (options.providers ?? []).filter((p) => !list.providers.includes(p));
     if (unknown.length > 0)
-        return fail(`不在收录清单里：${unknown.join(", ")}；可选 ${list.providers.join(", ")}`);
+        return fail(msg().errors.models.notListed(unknown.join(", "), list.providers.join(", ")));
     let fresh;
     try {
         const response = await (options.fetch ?? fetch)(url, {
@@ -134,28 +135,23 @@ export async function refreshModelsDev(options) {
 }
 /** 刷新结果的说明（命令输出用）：一行状态 + 新增 / 删除 / 变化清单。 */
 export function describeRefresh(result, limit = 20) {
-    const size = `${result.index.providerCount} 家供应商、${result.index.modelCount} 个模型`;
-    const text = {
-        updated: "已刷新",
-        unchanged: "已刷新，无变化",
-        failed: "刷新失败",
-    };
+    const m = msg().errors.models;
     const lines = [
-        `models.dev：${text[result.status]}（${size}${result.fetchedAt ? `，${result.fetchedAt}` : ""}）`,
+        m.refreshStatus(result.status, result.index.providerCount, result.index.modelCount, result.fetchedAt),
     ];
-    const section = (title, items) => {
+    const section = (kind, items) => {
         if (items.length === 0)
             return;
-        lines.push(`${title}（${items.length}）：`);
+        lines.push(m.section(kind, items.length));
         for (const item of items.slice(0, limit))
             lines.push(`  ${item}`);
         if (items.length > limit)
-            lines.push(`  …另 ${items.length - limit} 条`);
+            lines.push(m.more(items.length - limit));
     };
     if (result.diff !== undefined) {
-        section("新增", result.diff.added);
-        section("上游删除（快照里的条目保留）", result.diff.removed);
-        section("变化", result.diff.changed);
+        section("added", result.diff.added);
+        section("removed", result.diff.removed);
+        section("changed", result.diff.changed);
     }
     return lines.join("\n");
 }

package/dist/ai/providers/models-dev-snapshot.js

@@ -7,10 +7,11 @@
  */
 import { MODELS_DEV_SOURCES } from "./models-dev-data.js";
 import { ModelsDevIndex, keepForSnapshot, trimProvider, } from "./models-dev.js";
+import { msg } from "../../i18n/index.js";
 function parse(id) {
     const text = MODELS_DEV_SOURCES[id];
     if (text === undefined)
-        throw new Error(`models.dev 快照缺少 ${id}`);
+        throw new Error(msg().errors.models.snapshotMissing(id));
     return JSON.parse(text);
 }
 let meta;
@@ -69,17 +70,17 @@ function isRecord(value) {
  */
 export function buildSnapshot(raw, snapshot = snapshotList(), only) {
     if (!isRecord(raw))
-        throw new Error("api.json 顶层不是对象");
+        throw new Error(msg().errors.models.apiNotObject);
     const out = {};
     for (const id of only ?? snapshot.providers) {
         const provider = raw[id];
         if (!isRecord(provider))
-            throw new Error(`api.json 缺少供应商 ${id}`);
+            throw new Error(msg().errors.models.apiMissingProvider(id));
         const prefixes = snapshot.prefixes?.[id];
         const trimmed = trimProvider(id, provider, (modelId, model) => keepForSnapshot(model) &&
             (prefixes === undefined || prefixes.some((p) => modelId.startsWith(`${p}/`))));
         if (Object.keys(trimmed.models).length === 0)
-            throw new Error(`${id} 过滤后没有模型`);
+            throw new Error(msg().errors.models.noModelsAfterFilter(id));
         for (const model of Object.values(trimmed.models))
             delete model.tool_call;
         out[id] = trimmed;
@@ -89,7 +90,7 @@ export function buildSnapshot(raw, snapshot = snapshotList(), only) {
 function priceText(model) {
     const c = model.cost;
     return c === undefined
-        ? "无"
+        ? msg().errors.models.none
         : `${c.input}/${c.output}/${c.cache_read ?? "-"}/${c.cache_write ?? "-"}`;
 }
 /** 新旧对比（与脚本摘要同一口径）；只比较 `after` 里出现的供应商。 */
@@ -109,12 +110,12 @@ export function diffSnapshots(before, after) {
             const parts = [];
             for (const key of ["context", "output"]) {
                 if (prev.limit?.[key] !== next.limit?.[key])
-                    parts.push(`${key} ${prev.limit?.[key] ?? "无"} → ${next.limit?.[key] ?? "无"}`);
+                    parts.push(`${key} ${prev.limit?.[key] ?? msg().errors.models.none} → ${next.limit?.[key] ?? msg().errors.models.none}`);
             }
             if (priceText(prev) !== priceText(next))
                 parts.push(`cost ${priceText(prev)} → ${priceText(next)}`);
             if (parts.length > 0)
-                out.changed.push(`${providerId}/${id}：${parts.join("；")}`);
+                out.changed.push(msg().errors.models.changed(`${providerId}/${id}`, parts));
         }
     }
     out.added.sort();

package/dist/ai/providers/models-dev.js

@@ -8,6 +8,7 @@
  *
  * 本模块只做纯计算（不读文件、不联网）；缓存与拉取在 models-dev-cache.ts。
  */
+import { msg } from "../../i18n/index.js";
 /**
  * 原厂供应商（models.dev 的供应商 id，顺序即优先级）。通义在 `alibaba`、Meta 在 `meta`（Llama API
  * 在 `llama`）、智谱国际站在 `zai`、豆包在 `volcengine`、混元在 `tencent-tokenhub`；models.dev 没有
@@ -168,7 +169,7 @@ export function trimProvider(providerId, provider, keep) {
 /** 校验并裁剪 api.json：只留用到的字段；形状不对的供应商 / 模型跳过。整体不是对象抛错。 */
 export function trimModelsDev(raw) {
     if (!isRecord(raw))
-        throw new Error("models.dev 数据不是对象");
+        throw new Error(msg().errors.models.notObject);
     const out = {};
     for (const [providerId, provider] of Object.entries(raw)) {
         if (!isRecord(provider) || !isRecord(provider["models"]))
@@ -322,9 +323,7 @@ export class ModelsDevIndex {
             candidates,
         };
         if (groups.size > 1) {
-            match.warning =
-                `${key}：models.dev 有 ${pool.length} 个条目、${groups.size} 种取值，` +
-                    `取多数（${best.length} 条：${signature(chosen.model)}）`;
+            match.warning = msg().errors.models.consensus(key, pool.length, groups.size, best.length, signature(chosen.model));
         }
         return match;
     }
@@ -394,15 +393,6 @@ export const ENRICHABLE_FIELDS = [
 /** 匹配方式的中文说明（表格与 `models list`）。 */
 export function matchLabel(match) {
     if (match === undefined)
-        return "未匹配";
-    const kind = {
-        explicit: "显式",
-        prefix: "前缀",
-        canonical: "原厂",
-        vendor: "原厂",
-        consensus: "多数",
-        single: "唯一",
-    };
-    const via = match.normalized !== undefined ? `，按 ${match.normalized}` : "";
-    return `${kind[match.kind]} ${match.ref}${via}`;
+        return msg().errors.models.unmatched;
+    return msg().errors.models.match(match.kind, match.ref, match.normalized);
 }

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)}`;
+}