@jingyi0605/codingns4dsh 0.2.0-beta.2 → 0.2.0-rc3

package/data/build/dist/host/cli-adapters/provider-subscription.d.ts

@@ -1,6 +1,11 @@
 import { spawn, spawnSync } from 'node:child_process';
-import type { CliSubscriptionUsage } from '../../shared/contracts/subscription.js';
+import type { CliSubscriptionResetResult, CliSubscriptionUsage } from '../../shared/contracts/subscription.js';
 import { OfficialProviderSubscriptionService, type OfficialProviderSubscriptionOptions } from './official-provider-subscription.js';
+import { ZcodeSubscriptionService, type ZcodeSubscriptionOptions } from './zcode-subscription.js';
+import { QoderSubscriptionService, type QoderSubscriptionOptions } from './qoder-subscription.js';
+import { NewApiSubscriptionService, type NewApiSubscriptionOptions } from './new-api-subscription.js';
+import { CodeBuddySubscriptionService, type CodeBuddySubscriptionOptions } from './codebuddy-subscription.js';
+import { CustomUpstreamClassifier, type CustomUpstreamClassifierOptions } from './custom-upstream-classifier.js';
 type FetchLike = typeof fetch;
 /** 统一读取 Codex、Claude Code、OpenCode 订阅摘要。所有原始凭据都留在 Host。 */
 export declare class ProviderSubscriptionService {
@@ -9,14 +14,23 @@ export declare class ProviderSubscriptionService {
     readonly claudeCode: ClaudeCodeSubscriptionService;
     readonly opencode: OpenCodeSubscriptionService;
     readonly sub2api: Sub2ApiUsageService;
+    readonly newApi: NewApiSubscriptionService;
+    readonly customUpstreamClassifier: CustomUpstreamClassifier;
     readonly deepseek: DeepseekSubscriptionService;
     readonly official: OfficialProviderSubscriptionService;
     readonly kimi: KimiSubscriptionService;
     readonly grok: GrokSubscriptionService;
+    readonly zcode: ZcodeSubscriptionService;
+    readonly qoder: QoderSubscriptionService;
+    readonly qoderCn: QoderSubscriptionService;
+    readonly codebuddy: CodeBuddySubscriptionService;
     constructor(options?: ProviderSubscriptionOptions);
     read(adapterId: string, providerId?: string): Promise<CliSubscriptionUsage | null>;
+    /** 消耗一次官方订阅重置；仅官方 Codex 订阅支持，第三方上游必须显式拒绝。 */
+    reset(adapterId: string, providerId?: string): Promise<CliSubscriptionResetResult>;
     private readDsh;
     private readSub2ApiFirst;
+    private readCustomUpstream;
 }
 export interface ProviderSubscriptionOptions {
     readonly commandCode?: SubscriptionReader;
@@ -24,10 +38,16 @@ export interface ProviderSubscriptionOptions {
     readonly claudeCode?: ClaudeCodeSubscriptionOptions;
     readonly opencode?: OpenCodeSubscriptionOptions;
     readonly sub2api?: Sub2ApiUsageOptions;
+    readonly newApi?: NewApiSubscriptionOptions;
+    readonly customUpstream?: CustomUpstreamClassifierOptions;
     readonly deepseek?: DeepseekSubscriptionOptions;
     readonly official?: OfficialProviderSubscriptionOptions;
     readonly kimi?: KimiSubscriptionOptions;
     readonly grok?: GrokSubscriptionOptions;
+    readonly zcode?: ZcodeSubscriptionOptions;
+    readonly qoder?: QoderSubscriptionOptions;
+    readonly qoderCn?: QoderSubscriptionOptions;
+    readonly codebuddy?: CodeBuddySubscriptionOptions;
     /** 所有读取器共用的网络超时（毫秒）；单项服务显式给出时优先。 */
     readonly timeoutMs?: number;
 }
@@ -55,7 +75,15 @@ export declare class DeepseekSubscriptionService {
 export interface Sub2ApiUsageOptions {
     readonly fetch?: FetchLike;
     readonly timeoutMs?: number;
-    readonly sources?: Partial<Record<'codex' | 'claude-code' | 'dsh' | 'grok' | 'opencode', Sub2ApiSource | readonly Sub2ApiSource[]>>;
+    /**
+     * 按适配器或 Provider 保存自定义来源。这里使用开放键集合，确保新增
+     * Command Code、ZCode、CodeBuddy、WorkBuddy 等适配器时不会丢失配置。
+     */
+    readonly sources?: Partial<Record<string, Sub2ApiSource | readonly Sub2ApiSource[]>>;
+}
+export interface Sub2ApiReadResult {
+    readonly usage: CliSubscriptionUsage | null;
+    readonly kind: 'sub2api';
 }
 /** 通过 Provider 的上游 base URL 检测 Sub2API；只返回脱敏后的统计摘要。 */
 export declare class Sub2ApiUsageService {
@@ -64,11 +92,18 @@ export declare class Sub2ApiUsageService {
     private readonly configuredSources;
     constructor(options?: Sub2ApiUsageOptions);
     hasSource(adapterId: string, providerId?: string): boolean;
+    /** 判断当前来源是否由调用方显式注入；用于隔离本机自动发现的其它来源。 */
+    hasConfiguredSource(adapterId: string, providerId?: string): boolean;
+    resolveSources(adapterId: string, providerId?: string): Sub2ApiSource[];
     /** 只判断是否存在第三方上游；官方 Codex/Claude 源必须允许回退原生订阅读取器。 */
     hasThirdPartySource(adapterId: string, providerId?: string): boolean;
-    read(adapterId: string, providerId?: string): Promise<CliSubscriptionUsage | null>;
-    private readSource;
+    read(adapterId: string, providerId?: string, source?: Sub2ApiSource): Promise<CliSubscriptionUsage | null>;
+    readWithKind(adapterId: string, providerId?: string, source?: Sub2ApiSource): Promise<Sub2ApiReadResult | null>;
+    private readSourceWithKind;
+    private configuredSource;
 }
+/** 判断 Sub2API 用量端点的协议结构；统计明细为空时仍保留协议分类。 */
+export declare function isSub2ApiUsageSignature(value: unknown): boolean;
 export interface CodexSubscriptionOptions {
     readonly homeDirectory?: string;
     readonly binaries?: readonly string[];
@@ -85,6 +120,8 @@ export declare class CodexSubscriptionService implements SubscriptionReader {
     private command;
     constructor(options?: CodexSubscriptionOptions);
     read(): Promise<CliSubscriptionUsage | null>;
+    /** 消耗一次 Codex 官方重置券；凭据始终留在 Codex 侧，Host 只中转协议结果。 */
+    reset(): Promise<CliSubscriptionResetResult>;
 }
 export interface ClaudeCodeSubscriptionOptions {
     readonly homeDirectory?: string;

package/data/build/dist/host/cli-adapters/provider-subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-subscription.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/provider-subscription.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provider-subscription.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/provider-subscription.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/provider-subscription.js

@@ -2,10 +2,16 @@ import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { spawn, spawnSync } from 'node:child_process';
+import { randomUUID } from 'node:crypto';
 import { identifyModelProvider, normalizeProviderBaseUrl, thirdPartyProvider } from './provider-registry.js';
 import { OfficialProviderSubscriptionService } from './official-provider-subscription.js';
-import { JsonRpcProcess } from './json-rpc-process.js';
+import { ZcodeSubscriptionService } from './zcode-subscription.js';
+import { JsonRpcProcess, JsonRpcRequestError } from './json-rpc-process.js';
 import { detectBinary } from './rpc-driver-utils.js';
+import { QoderSubscriptionService } from './qoder-subscription.js';
+import { NewApiSubscriptionService, isOfficialAgentBaseUrl } from './new-api-subscription.js';
+import { CodeBuddySubscriptionService } from './codebuddy-subscription.js';
+import { CustomUpstreamClassifier, mergeCustomUpstreamCandidates } from './custom-upstream-classifier.js';
 /** 统一读取 Codex、Claude Code、OpenCode 订阅摘要。所有原始凭据都留在 Host。 */
 export class ProviderSubscriptionService {
     commandCode;
@@ -13,10 +19,16 @@ export class ProviderSubscriptionService {
     claudeCode;
     opencode;
     sub2api;
+    newApi;
+    customUpstreamClassifier;
     deepseek;
     official;
     kimi;
     grok;
+    zcode;
+    qoder;
+    qoderCn;
+    codebuddy;
     constructor(options = {}) {
         // 全局超时只作为缺省值；单项服务显式给出的 timeoutMs 优先。
         const shared = options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs };
@@ -25,26 +37,43 @@ export class ProviderSubscriptionService {
         this.claudeCode = new ClaudeCodeSubscriptionService({ ...shared, ...options.claudeCode });
         this.opencode = new OpenCodeSubscriptionService(options.opencode);
         this.sub2api = new Sub2ApiUsageService({ ...shared, ...options.sub2api });
+        this.newApi = new NewApiSubscriptionService({ ...shared, ...options.newApi });
+        this.customUpstreamClassifier = new CustomUpstreamClassifier(options.customUpstream);
         this.deepseek = new DeepseekSubscriptionService({ ...shared, ...options.deepseek });
         this.official = new OfficialProviderSubscriptionService({ ...shared, ...options.official });
         this.kimi = new KimiSubscriptionService({ ...shared, ...options.kimi });
         this.grok = new GrokSubscriptionService({ ...shared, ...options.grok });
+        this.zcode = new ZcodeSubscriptionService({ ...shared, ...options.zcode });
+        this.qoder = new QoderSubscriptionService({ ...shared, variant: 'qoder', ...options.qoder });
+        this.qoderCn = new QoderSubscriptionService({ ...shared, variant: 'qoder-cn', ...options.qoderCn });
+        this.codebuddy = new CodeBuddySubscriptionService({ ...shared, ...options.codebuddy });
     }
     read(adapterId, providerId) {
+        if (adapterId === 'codebuddy-cn')
+            adapterId = 'codebuddy';
         if (adapterId === 'dsh')
             return this.readDsh(providerId);
-        if (adapterId === 'codex' || adapterId === 'claude-code' || adapterId === 'grok' || adapterId === 'opencode') {
-            return this.readSub2ApiFirst(adapterId);
+        if (adapterId === 'qoder')
+            return this.qoder.read();
+        if (adapterId === 'qoder-cn')
+            return this.qoderCn.read();
+        if (adapterId === 'codex' || adapterId === 'claude-code' || adapterId === 'grok' || adapterId === 'opencode' || adapterId === 'command-code' || adapterId === 'zcode' || adapterId === 'codebuddy' || adapterId === 'workbuddy') {
+            return this.readSub2ApiFirst(adapterId, providerId);
         }
         switch (adapterId) {
-            case 'command-code': return this.commandCode?.read() ?? Promise.resolve(null);
-            case 'codex': return this.codex.read();
-            case 'claude-code': return this.claudeCode.read();
-            case 'opencode': return this.opencode.read();
             case 'kimi': return this.kimi.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'kimi-coding' }), ''));
             default: return Promise.resolve(null);
         }
     }
+    /** 消耗一次官方订阅重置；仅官方 Codex 订阅支持，第三方上游必须显式拒绝。 */
+    async reset(adapterId, providerId) {
+        if (adapterId !== 'codex')
+            throw new Error('当前 Agent 不支持重置订阅');
+        if (this.sub2api.hasThirdPartySource(adapterId, providerId) || this.newApi.hasSource(adapterId, providerId)) {
+            throw new Error('Codex 正在使用第三方上游，无法重置官方订阅');
+        }
+        return this.codex.reset();
+    }
     async readDsh(providerId) {
         const currentProviderId = providerId ?? resolveDshDefaultProvider();
         const configuredSource = resolveDshProviderSource(currentProviderId);
@@ -54,34 +83,65 @@ export class ProviderSubscriptionService {
         }
         if (matchedProvider?.reader === 'deepseek-balance' && isOfficialDeepseekSource(currentProviderId, configuredSource))
             return this.deepseek.read(configuredSource ?? undefined);
+        const customUpstream = !isOfficialDeepseekSource(currentProviderId, configuredSource)
+            ? await this.readCustomUpstream('dsh', currentProviderId)
+            : null;
+        if (customUpstream !== null)
+            return customUpstream.usage;
         if (matchedProvider?.reader === 'sub2api')
-            return this.sub2api.read('dsh', currentProviderId);
+            return null;
         // 已识别的官方提供商但没有可用读取器时，不尝试把官方 API 当成 Sub2API。
         if (matchedProvider !== undefined && configuredSource !== null)
             return null;
         if (isThirdPartyDeepseekProvider(currentProviderId))
-            return this.sub2api.read('dsh', currentProviderId);
-        // 明确配置了第三方来源时，始终沿用 sub2api 适配器，避免把失败的上游误判为官方余额。
-        const hasThirdPartySource = this.sub2api.hasSource('dsh');
-        if (hasThirdPartySource)
-            return this.sub2api.read('dsh');
+            return null;
+        // 没有第三方来源时才允许读取官方 DeepSeek 余额。
         const official = await this.deepseek.read();
         return official === null || matchedProvider === undefined ? official : withProvider(official, matchedProvider, configuredSource?.baseUrl);
     }
-    async readSub2ApiFirst(adapterId) {
-        // 已配置第三方上游时，官方额度接口没有意义；即使 Sub2API 探测失败也必须隐藏，
-        // 不能把旧的官方订阅窗口误显示成当前上游的用量。
-        const hasThirdPartySource = this.sub2api.hasThirdPartySource(adapterId);
-        if (hasThirdPartySource)
-            return this.sub2api.read(adapterId);
+    async readSub2ApiFirst(adapterId, providerId) {
+        // 统一分类后只调用一个读取器；已分类来源临时失败时不切换协议。
+        const customUpstream = await this.readCustomUpstream(adapterId, providerId);
+        if (customUpstream !== null)
+            return customUpstream.usage;
         if (adapterId === 'codex')
             return this.codex.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'openai-codex' }), ''));
         if (adapterId === 'claude-code')
             return this.claudeCode.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'anthropic' }), ''));
         if (adapterId === 'grok')
             return this.grok.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'xai' }), ''));
+        if (adapterId === 'command-code')
+            return this.commandCode?.read() ?? null;
+        if (adapterId === 'zcode')
+            return this.zcode.read();
+        if (adapterId === 'codebuddy' || adapterId === 'workbuddy')
+            return this.codebuddy.read(adapterId);
         return null;
     }
+    async readCustomUpstream(adapterId, providerId) {
+        const newApiConfigured = this.newApi.hasConfiguredSource(adapterId, providerId);
+        const sub2apiConfigured = this.sub2api.hasConfiguredSource(adapterId, providerId);
+        // 只要一侧有显式来源，就不把另一侧从本机环境自动发现的无关来源混进来。
+        // 两侧都没有显式来源时，才同时使用各自的 Agent 配置自动发现结果。
+        const newApiSources = sub2apiConfigured && !newApiConfigured ? [] : this.newApi.resolveSources(adapterId, providerId);
+        const sub2apiSources = newApiConfigured && !sub2apiConfigured ? [] : this.sub2api.resolveSources(adapterId, providerId)
+            .filter((source) => !isOfficialAgentBaseUrl(adapterId, source.baseUrl));
+        // 同一自定义来源的协议不能由配置项名称预先决定：一个 Agent 的配置文件
+        // 可能实际接入 New-API，也可能接入 Sub2API。统一分类器需要对每个候选
+        // 同时做两侧协议探测，再缓存最终分类，才能覆盖所有支持自定义 Provider
+        // 的适配器（尤其是 Command Code、ZCode、CodeBuddy 和 WorkBuddy）。
+        const candidates = mergeCustomUpstreamCandidates(newApiSources, sub2apiSources).map((candidate) => ({
+            ...candidate,
+            newApi: true,
+            sub2api: true,
+        }));
+        if (candidates.length === 0)
+            return null;
+        return this.customUpstreamClassifier.read(adapterId, providerId, candidates, {
+            newApi: (source) => this.newApi.readWithKind(adapterId, providerId, source),
+            sub2api: (source) => this.sub2api.readWithKind(adapterId, providerId, source),
+        });
+    }
 }
 /** 读取官方 DeepSeek API 的余额；凭据只在 Host 内使用。 */
 export class DeepseekSubscriptionService {
@@ -155,49 +215,101 @@ export class Sub2ApiUsageService {
         this.configuredSources = options.sources;
     }
     hasSource(adapterId, providerId) {
-        const configured = this.configuredSources?.[adapterId];
+        const configured = this.configuredSource(adapterId, providerId);
         if (configured !== undefined)
             return Array.isArray(configured) ? configured.length > 0 : true;
         return resolveSub2ApiSources(adapterId, providerId).length > 0;
     }
+    /** 判断当前来源是否由调用方显式注入；用于隔离本机自动发现的其它来源。 */
+    hasConfiguredSource(adapterId, providerId) {
+        if (this.configuredSources === undefined)
+            return false;
+        return (providerId !== undefined && this.configuredSources[providerId] !== undefined)
+            || this.configuredSources[adapterId] !== undefined;
+    }
+    resolveSources(adapterId, providerId) {
+        const configured = this.configuredSource(adapterId, providerId);
+        const single = configured;
+        return configured === undefined
+            ? resolveSub2ApiSources(adapterId, providerId)
+            : Array.isArray(configured) ? [...configured] : single === undefined ? [] : [single];
+    }
     /** 只判断是否存在第三方上游；官方 Codex/Claude 源必须允许回退原生订阅读取器。 */
     hasThirdPartySource(adapterId, providerId) {
-        const configured = this.configuredSources?.[adapterId];
+        const configured = this.configuredSource(adapterId, providerId);
         const sources = configured === undefined
             ? resolveSub2ApiSources(adapterId, providerId)
             : Array.isArray(configured) ? configured : [configured];
         return sources.some((source) => !isOfficialAgentSource(adapterId, source));
     }
-    async read(adapterId, providerId) {
-        const configured = this.configuredSources?.[adapterId];
-        const sources = configured === undefined ? resolveSub2ApiSources(adapterId, providerId) : Array.isArray(configured) ? configured : [configured];
+    async read(adapterId, providerId, source) {
+        const result = await this.readWithKind(adapterId, providerId, source);
+        return result?.usage ?? null;
+    }
+    async readWithKind(adapterId, providerId, source) {
+        const sources = source === undefined ? this.resolveSources(adapterId, providerId) : [source];
         for (const source of sources) {
-            const result = await this.readSource(source, providerId);
+            const result = await this.readSourceWithKind(source, providerId);
             if (result !== null)
                 return result;
         }
         return null;
     }
-    async readSource(source, providerId) {
-        const baseUrl = source.baseUrl.trim().replace(/\/+$/u, '');
+    async readSourceWithKind(source, providerId) {
+        // 请求地址与分类缓存使用同一套 URL 清洗规则，避免 query/hash 中的凭据
+        // 被带到上游，也避免同一来源因尾部 /v1 或查询参数产生不同请求路径。
+        const baseUrl = sanitizeUpstreamUrl(source.baseUrl);
+        if (baseUrl === '')
+            return null;
         const usagePath = /\/v1$/u.test(baseUrl) ? '/usage' : '/v1/usage';
+        const billingPath = /\/v1$/u.test(baseUrl) ? '/sub2api/billing' : '/v1/sub2api/billing';
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), this.timeoutMs);
         try {
-            const response = await this.request(`${baseUrl}${usagePath}`, {
-                headers: { Authorization: source.apiKey.trim().startsWith('Bearer ') ? source.apiKey.trim() : `Bearer ${source.apiKey.trim()}`, Accept: 'application/json' },
-                signal: controller.signal,
-            });
-            if (!response.ok)
+            const headers = {
+                Authorization: source.apiKey.trim().startsWith('Bearer ') ? source.apiKey.trim() : `Bearer ${source.apiKey.trim()}`,
+                Accept: 'application/json',
+            };
+            // /v1/usage 是统计主接口。统计服务不可用或响应字段不完整时，仍继续
+            // 读取 /v1/sub2api/billing，用其明确的 object 标记锁定 Sub2API 类型。
+            let usageRaw = null;
+            let usageStatus = 0;
+            try {
+                const response = await this.request(`${baseUrl}${usagePath}`, { headers, signal: controller.signal });
+                usageStatus = response.status;
+                if (response.ok)
+                    usageRaw = await response.json();
+            }
+            catch {
+                // 主接口失败不代表来源类型未知，下面仍尝试 billing 探针。
+            }
+            const usage = normalizeSub2ApiUsage(usageRaw, baseUrl);
+            if (usage !== null) {
+                const logoUrl = buildLogoUrl(baseUrl);
+                const logoDataUrl = logoUrl === '' ? '' : await readLogoDataUrl(logoUrl, this.request, this.timeoutMs);
+                const providerDefinition = identifyModelProvider({ name: providerId, baseUrl }) ?? thirdPartyProvider({ name: providerId, baseUrl });
+                const providerLogoDataUrl = logoDataUrl || await readLogoDataUrl(providerDefinition.logoUrl, this.request, this.timeoutMs);
+                return {
+                    usage: { authenticated: true, planType: usage.planName, primary: null, secondary: null, monthly: null, rateLimitReachedType: null, resetCredits: null, capturedAt: new Date().toISOString(), provider: providerSummary(providerDefinition, baseUrl, providerLogoDataUrl, 'sub2api'), sub2api: { ...usage, logoUrl, logoDataUrl } },
+                    kind: 'sub2api',
+                };
+            }
+            if (isSub2ApiUsageSignature(usageRaw))
+                return { usage: null, kind: 'sub2api' };
+            // 无效凭据时 billing 只会重复返回鉴权错误，避免额外请求；404/5xx
+            // 等临时失败则继续探测，因为 billing 是产品级强特征。
+            if (usageStatus === 401 || usageStatus === 403)
                 return null;
-            const usage = normalizeSub2ApiUsage(await response.json(), baseUrl);
-            if (usage === null)
+            try {
+                const response = await this.request(`${baseUrl}${billingPath}`, { headers, signal: controller.signal });
+                if (!response.ok)
+                    return null;
+                const billing = await response.json();
+                return isSub2ApiUsageSignature(billing) ? { usage: null, kind: 'sub2api' } : null;
+            }
+            catch {
                 return null;
-            const logoUrl = buildLogoUrl(baseUrl);
-            const logoDataUrl = logoUrl === '' ? '' : await readLogoDataUrl(logoUrl, this.request, this.timeoutMs);
-            const providerDefinition = identifyModelProvider({ name: providerId, baseUrl }) ?? thirdPartyProvider({ name: providerId, baseUrl });
-            const providerLogoDataUrl = logoDataUrl || await readLogoDataUrl(providerDefinition.logoUrl, this.request, this.timeoutMs);
-            return { authenticated: true, planType: usage.planName, primary: null, secondary: null, monthly: null, rateLimitReachedType: null, resetCredits: null, capturedAt: new Date().toISOString(), provider: providerSummary(providerDefinition, baseUrl, providerLogoDataUrl, 'sub2api'), sub2api: { ...usage, logoUrl, logoDataUrl } };
+            }
         }
         catch {
             return null;
@@ -206,6 +318,26 @@ export class Sub2ApiUsageService {
             clearTimeout(timer);
         }
     }
+    configuredSource(adapterId, providerId) {
+        if (this.configuredSources === undefined)
+            return undefined;
+        return (providerId !== undefined && this.configuredSources[providerId] !== undefined)
+            ? this.configuredSources[providerId]
+            : this.configuredSources[adapterId];
+    }
+}
+/** 判断 Sub2API 用量端点的协议结构；统计明细为空时仍保留协议分类。 */
+export function isSub2ApiUsageSignature(value) {
+    const root = recordValue(value);
+    if (root === null)
+        return false;
+    const payload = recordValue(root.data) ?? root;
+    if (textValue(payload.object) === 'sub2api.key_billing')
+        return true;
+    const hasMode = textValue(payload.mode) !== null && typeof payload.isValid === 'boolean';
+    const usage = recordValue(payload.usage);
+    const hasUsagePoints = usage !== null && (recordValue(usage.today) !== null || recordValue(usage.total) !== null);
+    return hasMode || hasUsagePoints || Array.isArray(payload.daily_usage) || Array.isArray(payload.model_stats);
 }
 export class CodexSubscriptionService {
     binaries;
@@ -246,6 +378,34 @@ export class CodexSubscriptionService {
             return null;
         }
     }
+    /** 消耗一次 Codex 官方重置券；凭据始终留在 Codex 侧，Host 只中转协议结果。 */
+    async reset() {
+        if (hasThirdPartyCodexConfig(this.homeDirectory))
+            throw new Error('Codex 使用第三方配置，无法重置官方订阅');
+        this.command ??= (await detectBinary({ binaries: this.binaries, spawnSync: this.runSpawnSync })).command;
+        if (this.command === null)
+            throw new Error('未找到 Codex CLI，无法重置订阅');
+        const rpc = new JsonRpcProcess({ command: this.command, args: ['app-server'], spawn: this.runSpawn });
+        const controller = new AbortController();
+        // 消费接口连上游耗时可能超过普通查询；超时过短会在重置已生效时误报失败。
+        const timer = setTimeout(() => controller.abort(), Math.max(this.timeoutMs, 20_000));
+        try {
+            await rpc.request('initialize', { clientInfo: { name: 'codingns4dsh', version: '0.1.1' }, capabilities: {} }, { signal: controller.signal });
+            rpc.notify('initialized', {});
+            const result = await rpc.request('account/rateLimitResetCredit/consume', { idempotencyKey: randomUUID() }, { signal: controller.signal });
+            return { outcome: normalizeCodexResetOutcome(result) };
+        }
+        catch (error) {
+            if (error instanceof JsonRpcRequestError && error.code === -32601) {
+                throw new Error('当前 Codex CLI 版本不支持重置订阅，请升级 Codex 后重试');
+            }
+            throw error;
+        }
+        finally {
+            clearTimeout(timer);
+            rpc.dispose();
+        }
+    }
 }
 export class ClaudeCodeSubscriptionService {
     homeDirectory;
@@ -661,10 +821,57 @@ function normalizeCodexSnapshot(value) {
         secondary,
         monthly: null,
         rateLimitReachedType: textValue(source.rateLimitReachedType ?? source.rate_limit_reached_type),
-        resetCredits: null,
+        resetCredits: normalizeCodexResetCredits(root?.rateLimitResetCredits ?? root?.rate_limit_reset_credits),
+        credits: normalizeCodexCredits(source.credits),
         capturedAt: new Date().toISOString(),
     };
 }
+/** Codex 重置券摘要；availableCount 权威，明细行可能被上游截断。 */
+function normalizeCodexResetCredits(value) {
+    const source = recordValue(value);
+    if (source === null)
+        return null;
+    const rawCount = source.availableCount ?? source.available_count;
+    const availableCount = rawCount === null || rawCount === undefined ? null : numberValue(rawCount);
+    if (availableCount === null)
+        return null;
+    const rows = Array.isArray(source.credits) ? source.credits : [];
+    return {
+        availableCount: Math.max(0, Math.trunc(availableCount)),
+        credits: rows
+            .map((item) => recordValue(item))
+            .filter((row) => row !== null && (typeof row.status !== 'string' || row.status === 'available'))
+            .map((row) => {
+            const rawExpiry = row.expiresAt ?? row.expires_at;
+            return {
+                id: textValue(row.id),
+                expiresAt: rawExpiry === null || rawExpiry === undefined ? null : timestampValue(rawExpiry),
+                title: textValue(row.title),
+                description: textValue(row.description),
+            };
+        }),
+    };
+}
+/** Codex 点数余额：余额保持字符串以保留上游十进制精度；字段全缺时视为未提供。 */
+function normalizeCodexCredits(value) {
+    const source = recordValue(value);
+    if (source === null)
+        return null;
+    const hasCredits = booleanValue(source.hasCredits ?? source.has_credits);
+    const unlimited = booleanValue(source.unlimited);
+    const balance = creditBalanceValue(source.balance);
+    if (hasCredits === null && unlimited === null && balance === null)
+        return null;
+    return { hasCredits: hasCredits ?? balance !== null, unlimited: unlimited ?? false, balance };
+}
+const CODEX_RESET_OUTCOMES = ['reset', 'alreadyRedeemed', 'nothingToReset', 'noCredit'];
+function normalizeCodexResetOutcome(value) {
+    const outcome = textValue(recordValue(value)?.outcome);
+    const matched = CODEX_RESET_OUTCOMES.find((candidate) => candidate === outcome);
+    if (matched === undefined)
+        throw new Error('Codex 返回了无法识别的重置结果');
+    return matched;
+}
 function normalizeClaudeSnapshot(value, planType) {
     const root = recordValue(value) ?? {};
     const source = recordValue(root.data) ?? root;
@@ -863,6 +1070,13 @@ function timestampValue(value) {
     return null;
 }
 function clamp(value) { return Math.max(0, Math.min(100, value)); }
+function booleanValue(value) { return typeof value === 'boolean' ? value : null; }
+/** 点数余额保持字符串以保留上游十进制精度；数字也归一为字符串。 */
+function creditBalanceValue(value) {
+    if (typeof value === 'number' && Number.isFinite(value))
+        return String(value);
+    return textValue(value);
+}
 function normalizeDeepseekUsage(value, baseUrl) {
     const root = recordValue(value);
     if (root === null)