@jingyi0605/codingns4dsh 0.1.0 → 0.1.1

package/data/build/dist/host/cli-adapters/opencode-driver.js

@@ -24,6 +24,7 @@ export class OpenCodeDriver {
     /** Provider 会话的实际工作目录；目录变化时禁止复用旧会话。 */
     sessionCwds = new Map();
     interactionTargets = new Map();
+    modelContextWindows = new Map();
     constructor(options = {}) {
         this.binaries = options.binaries ?? DEFAULT_BINARIES;
         this.serverUrls = options.serverUrls ?? (process.env.OPENCODE_SERVER_URL ? [process.env.OPENCODE_SERVER_URL] : DEFAULT_URLS);
@@ -51,6 +52,7 @@ export class OpenCodeDriver {
                 const response = await this.http.json(`${server}${path}`);
                 if (!response.data || response.status < 200 || response.status >= 300)
                     continue;
+                rememberModelContextWindows(this.modelContextWindows, response.data);
                 const catalog = parseModelCatalog(response.data);
                 if (catalog.groups.length > 0)
                     return catalog;
@@ -106,6 +108,7 @@ export class OpenCodeDriver {
             sessionId = await this.createSession(server, input);
             this.sessions.set(input.sessionId, sessionId);
         }
+        const contextWindow = await this.resolveModelContextWindow(server, input.modelId);
         if (input.cwd?.trim())
             this.sessionCwds.set(sessionId, input.cwd.trim());
         this.interactionTargets.set(input.sessionId, server);
@@ -164,7 +167,7 @@ export class OpenCodeDriver {
                             const pending = pendingMessageParts.get(messageRole.id) ?? [];
                             pendingMessageParts.delete(messageRole.id);
                             for (const pendingPart of pending) {
-                                const chunk = eventToChunk(pendingPart, cumulative, assistantMessageIds, partTypes);
+                                const chunk = eventToChunk(pendingPart, cumulative, assistantMessageIds, partTypes, contextWindow);
                                 if (chunk !== null) {
                                     emitted = true;
                                     yield chunk;
@@ -174,6 +177,15 @@ export class OpenCodeDriver {
                         else {
                             pendingMessageParts.delete(messageRole.id);
                         }
+                        // message.updated 同时承载 assistant 的最终 tokens。角色识别后
+                        // 不能直接跳过，否则 OpenCode 的 token/context 统计会被吞掉。
+                        if (messageRole.role === 'assistant') {
+                            const chunk = eventToChunk(parsed, cumulative, assistantMessageIds, partTypes, contextWindow);
+                            if (chunk !== null) {
+                                emitted = true;
+                                yield chunk;
+                            }
+                        }
                         continue;
                     }
                     const messageId = eventMessageId(parsed);
@@ -183,7 +195,7 @@ export class OpenCodeDriver {
                         // assistant 消息结算后才投影，否则原生工具节点会被追加到正文底部。
                         // 用户消息没有 tool 字段，因此仍然暂存并等待 role 校验。
                         if (isOpenCodeToolEvent(parsed)) {
-                            const chunk = eventToChunk(parsed, cumulative, undefined, partTypes);
+                            const chunk = eventToChunk(parsed, cumulative, undefined, partTypes, contextWindow);
                             if (chunk !== null) {
                                 emitted = true;
                                 yield chunk;
@@ -197,7 +209,7 @@ export class OpenCodeDriver {
                     }
                     if (messageId !== undefined && !assistantMessageIds.has(messageId))
                         continue;
-                    const chunk = eventToChunk(parsed, cumulative, assistantMessageIds, partTypes);
+                    const chunk = eventToChunk(parsed, cumulative, assistantMessageIds, partTypes, contextWindow);
                     if (chunk !== null) {
                         emitted = true;
                         yield chunk;
@@ -218,7 +230,7 @@ export class OpenCodeDriver {
                 const response = await send;
                 if (sendError !== null && !aborted)
                     throw sendError;
-                for (const chunk of responseChunks(response, cumulative, partTypes)) {
+                for (const chunk of responseChunks(response, cumulative, partTypes, contextWindow)) {
                     emitted = true;
                     yield chunk;
                 }
@@ -264,6 +276,7 @@ export class OpenCodeDriver {
     dispose() {
         this.sessions.clear();
         this.sessionCwds.clear();
+        this.modelContextWindows.clear();
         for (const managed of this.managedServers.values())
             terminateChildProcess(managed.child);
         this.managedServers.clear();
@@ -324,6 +337,23 @@ export class OpenCodeDriver {
         }
         catch { /* 取消请求尽力而为 */ }
     }
+    async resolveModelContextWindow(server, modelId) {
+        if (modelId === undefined)
+            return undefined;
+        const known = this.modelContextWindows.get(modelId);
+        if (known !== undefined)
+            return known;
+        try {
+            const response = await this.http.json(`${server}/config/providers`);
+            if (response.status < 200 || response.status >= 300)
+                return undefined;
+            rememberModelContextWindows(this.modelContextWindows, response.data);
+            return this.modelContextWindows.get(modelId);
+        }
+        catch {
+            return undefined;
+        }
+    }
     async ensureServer(probeOnly, cwd) {
         const workspace = cwd ?? process.cwd();
         const managed = this.managedServers.get(workspace);
@@ -423,6 +453,43 @@ function parseOpenCodeModel(modelId) {
         return null;
     return { providerID: modelId.slice(0, separator), modelID: modelId.slice(separator + 1) };
 }
+/** 从 OpenCode provider 配置缓存每个模型的上下文窗口。 */
+function rememberModelContextWindows(target, value) {
+    const root = asRecord(value);
+    const rawProviders = root?.providers;
+    const providers = [];
+    if (Array.isArray(rawProviders)) {
+        for (const raw of rawProviders) {
+            const provider = asRecord(raw);
+            if (provider !== null && typeof provider.id === 'string')
+                providers.push([provider.id, provider]);
+        }
+    }
+    else {
+        const providerMap = asRecord(rawProviders) ?? root;
+        if (providerMap !== null) {
+            for (const [id, raw] of Object.entries(providerMap)) {
+                const provider = asRecord(raw);
+                if (provider !== null)
+                    providers.push([id, provider]);
+            }
+        }
+    }
+    for (const [providerId, provider] of providers) {
+        const models = asRecord(provider.models);
+        if (models === null)
+            continue;
+        for (const [modelId, rawModel] of Object.entries(models)) {
+            const model = asRecord(rawModel);
+            const limit = asRecord(model?.limit);
+            const context = limit?.context ?? model?.contextWindow ?? model?.context_window;
+            if (typeof context !== 'number' || !Number.isFinite(context) || context <= 0)
+                continue;
+            target.set(`${providerId}/${modelId}`, context);
+            target.set(modelId, context);
+        }
+    }
+}
 function readProviderDirectory(record) {
     const value = record?.directory ?? record?.cwd;
     return typeof value === 'string' && value.trim() !== '' ? value.trim() : undefined;
@@ -454,7 +521,7 @@ function parseEvent(event) {
         return null;
     }
 }
-function eventToChunk(event, cumulative, assistantMessageIds, partTypes) {
+function eventToChunk(event, cumulative, assistantMessageIds, partTypes, contextWindow) {
     const type = typeof event.type === 'string' ? event.type : '';
     const properties = asRecord(event.properties);
     const part = asRecord(event.part) ?? asRecord(properties?.part) ?? properties ?? event;
@@ -536,24 +603,42 @@ function eventToChunk(event, cumulative, assistantMessageIds, partTypes) {
             ...(detail !== undefined ? { detail } : {}),
         };
     }
-    const usage = asRecord(event.usage) ?? asRecord(part.usage) ?? readOpenCodeTokenUsage(properties);
+    const usage = asRecord(event.usage) ?? asRecord(part.usage) ?? readOpenCodeTokenUsage(properties, contextWindow);
     if (usage !== null)
         return usageChunk(usage);
     return null;
 }
 /** OpenCode 将最终用量放在 message.updated.properties.info.tokens。 */
-function readOpenCodeTokenUsage(properties) {
+function readOpenCodeTokenUsage(properties, contextWindow) {
     const info = asRecord(properties?.info);
     const tokens = asRecord(info?.tokens);
     if (tokens === null)
         return null;
     const cache = asRecord(tokens.cache);
+    const model = asRecord(info?.model);
+    const modelLimit = asRecord(model?.limit);
+    const input = tokens.input ?? tokens.input_tokens;
+    const cacheRead = cache?.read ?? tokens.cache_read_tokens ?? tokens.cacheReadTokens;
+    const cacheWrite = cache?.write ?? tokens.cache_write_tokens ?? tokens.cacheWriteTokens;
+    const embeddedContextWindow = modelLimit?.context
+        ?? model?.contextWindow
+        ?? info?.contextWindow
+        ?? tokens.contextWindow
+        ?? tokens.context_window;
+    const contextTokens = tokens.contextTokens
+        ?? tokens.context_tokens
+        ?? (typeof input === 'number'
+            ? input + (typeof cacheRead === 'number' ? cacheRead : 0) + (typeof cacheWrite === 'number' ? cacheWrite : 0)
+            : undefined);
     return {
-        input_tokens: tokens.input ?? tokens.input_tokens,
+        input_tokens: input,
         output_tokens: tokens.output ?? tokens.output_tokens,
-        cache_read_tokens: cache?.read ?? tokens.cache_read_tokens ?? tokens.cacheReadTokens,
-        cache_creation_tokens: cache?.write ?? tokens.cache_write_tokens ?? tokens.cacheWriteTokens,
+        cache_read_tokens: cacheRead,
+        cache_creation_tokens: cacheWrite,
         total_tokens: tokens.total ?? tokens.total_tokens ?? tokens.totalTokens,
+        ...(embeddedContextWindow === undefined && contextWindow === undefined ? {} : { context_window: embeddedContextWindow ?? contextWindow }),
+        ...(contextTokens === undefined ? {} : { context_tokens: contextTokens }),
+        ...(typeof tokens.contextUsageRatio === 'number' ? { context_usage_ratio: tokens.contextUsageRatio } : {}),
     };
 }
 function isFinishedEvent(event, emitted) {
@@ -566,11 +651,11 @@ function isFinishedEvent(event, emitted) {
     const status = typeof rawStatus === 'string' ? rawStatus.toLowerCase() : typeof statusRecord?.type === 'string' ? statusRecord.type.toLowerCase() : '';
     return status === 'idle' || status === 'completed' || status === 'success';
 }
-function responseChunks(value, cumulative, partTypes) {
+function responseChunks(value, cumulative, partTypes, contextWindow) {
     const record = asRecord(value);
     if (record === null)
         return [];
-    const chunk = eventToChunk(record, cumulative, undefined, partTypes);
+    const chunk = eventToChunk(record, cumulative, undefined, partTypes, contextWindow);
     return chunk === null ? [] : [chunk];
 }
 function readMessageRole(event) {

package/data/build/dist/host/cli-adapters/pi-driver.js

@@ -40,7 +40,7 @@ export class PiAgentDriver {
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 12_000);
         try {
-            const response = await rpc.request('get_available_models', {}, { signal: controller.signal });
+            const response = await rpc.request('get_available_models', {}, { signal: controller.signal, wireFormat: 'pi' });
             const catalog = parsePiCatalog(response);
             if (catalog.groups.length > 0)
                 return catalog;
@@ -73,23 +73,34 @@ export class PiAgentDriver {
         const command = this.cachedBinary ?? (await this.detect()).command;
         if (command === null)
             throw new Error('Pi Agent 未安装');
-        const session = this.getSession(input.sessionId, command, input.cwd, input.providerSessionId);
+        const session = this.getSession(input.sessionId, command, input.cwd, input.providerSessionId, input.rawStoreRef);
         const rpc = session.rpc;
         try {
-            // 新版 Pi 接受可选模型设置；旧版会以错误响应结束，随后仍可使用默认模型。
-            if (session.needsResume && input.providerSessionId) {
+            // Pi 的 sessionId 由进程创建；先读状态，避免把 DSH sessionId 错当成 Provider 会话标识。
+            if (!session.stateLoaded) {
                 try {
-                    await rpc.request('resume', { sessionId: input.providerSessionId }, { signal: input.signal, killOnAbort: false });
-                    session.providerSessionId = input.providerSessionId;
+                    const state = await rpc.request('get_state', {}, { signal: input.signal, killOnAbort: false, wireFormat: 'pi' });
+                    const discoveredId = readPiStateSessionId(state);
+                    if (discoveredId)
+                        session.providerSessionId = discoveredId;
                 }
-                catch { /* 旧版 Pi 没有显式 resume，继续复用当前进程 */ }
-                session.needsResume = false;
+                catch { /* 旧版 Pi 不提供 get_state 时保留 Host 侧回退标识。 */ }
+                session.stateLoaded = true;
             }
             if (!isProviderDefaultModel(input.modelId)) {
+                const model = parsePiModelId(input.modelId);
+                if (model !== null) {
+                    try {
+                        await rpc.request('set_model', model, { signal: input.signal, killOnAbort: false, wireFormat: 'pi' });
+                    }
+                    catch { /* 模型目录或旧版 Pi 不支持切换时继续使用当前模型。 */ }
+                }
+            }
+            if (input.effortId && input.effortId !== 'default') {
                 try {
-                    await rpc.request('set_model', { model: input.modelId }, { signal: input.signal, killOnAbort: false });
+                    await rpc.request('set_thinking_level', { level: input.effortId }, { signal: input.signal, killOnAbort: false, wireFormat: 'pi' });
                 }
-                catch { /* 兼容旧版 */ }
+                catch { /* 旧版 Pi 不支持单独设置思考等级时使用当前等级。 */ }
             }
             yield { type: 'session-binding', providerSessionId: session.providerSessionId };
             const stream = streamPiPrompt(rpc, input.prompt, input.signal);
@@ -121,14 +132,14 @@ export class PiAgentDriver {
         const session = this.sessions.get(sessionId);
         if (session === undefined)
             throw new Error('Pi 会话不存在');
-        await session.rpc.request('steer', { message: prompt }, { killOnAbort: false });
+        await session.rpc.request('steer', { message: prompt }, { killOnAbort: false, wireFormat: 'pi' });
     }
     /** 向运行中的 Pi 会话追加 follow-up。 */
     async followUp(sessionId, prompt) {
         const session = this.sessions.get(sessionId);
         if (session === undefined)
             throw new Error('Pi 会话不存在');
-        await session.rpc.request('follow_up', { message: prompt }, { killOnAbort: false });
+        await session.rpc.request('follow_up', { message: prompt }, { killOnAbort: false, wireFormat: 'pi' });
     }
     /** 中断当前 turn，但保留 Pi 进程供同一会话继续使用。 */
     async interrupt(sessionId) {
@@ -136,11 +147,11 @@ export class PiAgentDriver {
         if (session === undefined)
             return;
         try {
-            await session.rpc.request('interrupt', {}, { killOnAbort: false });
+            await session.rpc.request('abort', {}, { killOnAbort: false, wireFormat: 'pi' });
         }
         catch {
             try {
-                session.rpc.notify('abort', {});
+                session.rpc.notify('abort', {}, 'pi');
             }
             catch { /* 进程可能已退出 */ }
         }
@@ -152,18 +163,27 @@ export class PiAgentDriver {
         this.processes.clear();
         this.cachedBinary = null;
     }
-    getSession(sessionId, command, cwd, providerSessionId) {
+    getSession(sessionId, command, cwd, providerSessionId, rawStoreRef) {
         const previous = this.sessions.get(sessionId);
-        if (previous !== undefined && previous.cwd === cwd)
+        if (previous !== undefined
+            && previous.cwd === cwd
+            && (providerSessionId === undefined || providerSessionId === previous.providerSessionId)
+            && (rawStoreRef === undefined || rawStoreRef === previous.rawStoreRef))
             return previous;
         previous?.rpc.dispose();
-        const rpc = new JsonRpcProcess({ command, args: ['--mode', 'rpc'], cwd, spawn: this.runSpawn });
+        const args = ['--mode', 'rpc'];
+        if (rawStoreRef?.trim())
+            args.push('--session', rawStoreRef.trim());
+        else if (providerSessionId?.trim())
+            args.push('--session-id', providerSessionId.trim());
+        const rpc = new JsonRpcProcess({ command, args, cwd, spawn: this.runSpawn });
         this.processes.add(rpc);
         const session = {
             rpc,
             cwd,
+            rawStoreRef,
             providerSessionId: providerSessionId ?? sessionId,
-            needsResume: providerSessionId !== undefined,
+            stateLoaded: false,
         };
         this.sessions.set(sessionId, session);
         return session;
@@ -182,10 +202,10 @@ async function* streamPiPrompt(rpc, prompt, signal) {
     const listener = (message) => {
         queue.push(message);
         const type = piEventType(message);
-        if (type === 'agent_settled')
-            terminalReason = 'stop';
-        else if (type === 'error' || type === 'agent_error' || type === 'agent_failed')
+        if (type === 'error' || type === 'agent_error' || type === 'agent_failed' || piEventHasError(message))
             terminalReason = 'error';
+        else if (type === 'agent_settled' && terminalReason === null)
+            terminalReason = 'stop';
         notify();
     };
     const removeListener = rpc.addNotificationListener(listener);
@@ -194,7 +214,7 @@ async function* streamPiPrompt(rpc, prompt, signal) {
         onAbort();
     else
         signal?.addEventListener('abort', onAbort, { once: true });
-    void rpc.request('prompt', { message: prompt }, { signal, killOnAbort: false }).then(() => { promptSettled = true; notify(); }, () => {
+    void rpc.request('prompt', { message: prompt }, { signal, killOnAbort: false, wireFormat: 'pi' }).then(() => { promptSettled = true; notify(); }, () => {
         promptSettled = true;
         terminalReason = signal?.aborted ? 'cancel' : 'error';
         notify();
@@ -218,6 +238,12 @@ function piEventType(message) {
     const params = isRecord(message.params) ? message.params : message;
     return typeof params.type === 'string' ? params.type.toLowerCase() : '';
 }
+function piEventHasError(message) {
+    const params = isRecord(message.params) ? message.params : message;
+    const event = isRecord(params.message) ? params.message : params;
+    const stopReason = textValue(event.stopReason ?? params.stopReason);
+    return stopReason === 'error' || stopReason === 'failed' || typeof event.errorMessage === 'string' && event.errorMessage.trim() !== '';
+}
 function parsePiCliCatalog(output) {
     const models = [];
     const levels = ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
@@ -266,7 +292,13 @@ function piMessageToChunk(message) {
     const assistantEvent = isRecord(params.assistantMessageEvent) ? params.assistantMessageEvent : null;
     const completedMessage = isRecord(params.message) ? params.message : null;
     const rootType = typeof event.type === 'string' ? event.type : typeof params.event === 'string' ? params.event : '';
-    if (rootType === 'agent_settled' || rootType === 'agent_end' || rootType === 'turn_end')
+    if (rootType === 'agent_start'
+        || rootType === 'agent_settled'
+        || rootType === 'agent_end'
+        || rootType === 'turn_start'
+        || rootType === 'turn_end'
+        || rootType === 'message_start'
+        || rootType === 'message_end')
         return null;
     const type = assistantEvent !== null && typeof assistantEvent.type === 'string' ? assistantEvent.type : rootType;
     const text = textValue(assistantEvent?.delta ?? params.delta ?? params.text ?? params.content ?? params.message);
@@ -309,4 +341,18 @@ function readSessionId(message) {
             return params[key].trim();
     return null;
 }
+function readPiStateSessionId(value) {
+    if (!isRecord(value))
+        return null;
+    const data = isRecord(value.data) ? value.data : value;
+    return textValue(data.sessionId ?? data.session_id) ?? null;
+}
+function parsePiModelId(value) {
+    if (!value)
+        return null;
+    const separator = value.indexOf('/');
+    if (separator <= 0 || separator === value.length - 1)
+        return null;
+    return { provider: value.slice(0, separator), modelId: value.slice(separator + 1) };
+}
 //# sourceMappingURL=pi-driver.js.map

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

@@ -0,0 +1,33 @@
+/**
+ * 模型提供商注册表。
+ *
+ * Agent 只是运行入口，订阅归属属于模型提供商。这里集中维护提供商名称、
+ * 官方地址、余额能力和 Logo，调用方只传入 DSH 的 provider 名称与 baseURL。
+ */
+export type ProviderSubscriptionCapability = 'official-balance' | 'official-usage' | 'subscription-window' | 'sub2api' | 'unsupported';
+export type ProviderSubscriptionReader = 'deepseek-balance' | 'openrouter-balance' | 'minimax-usage' | 'zai-usage' | 'github-copilot-usage' | 'sub2api' | 'none';
+export interface ProviderIdentity {
+    readonly name?: string | undefined;
+    readonly baseUrl?: string | undefined;
+}
+export interface ProviderDefinition {
+    readonly id: string;
+    readonly displayName: string;
+    readonly aliases: readonly string[];
+    readonly officialHosts: readonly string[];
+    readonly capability: ProviderSubscriptionCapability;
+    readonly reader: ProviderSubscriptionReader;
+    /** 浏览器可直接加载的公开 Logo 地址；Host 会尽量内联为 data URL。 */
+    readonly logoUrl: string;
+}
+/** DSH 内置模型提供商的统一订阅能力登记。 */
+export declare const MODEL_PROVIDER_DEFINITIONS: readonly ProviderDefinition[];
+/** 规范化名称，避免大小写、下划线和连字符造成重复提供商。 */
+export declare function normalizeProviderName(value: string | undefined): string;
+/** 去掉 path、查询参数和凭据，只保留可用于身份判断的 origin。 */
+export declare function normalizeProviderBaseUrl(value: string | undefined): string;
+/** 按名称和 baseURL 联合识别；同名第三方代理不会冒充官方提供商。 */
+export declare function identifyModelProvider(identity: ProviderIdentity): ProviderDefinition | undefined;
+/** 返回一个不依赖名称的第三方上游定义，供 Sub2API 统计使用。 */
+export declare function thirdPartyProvider(identity: ProviderIdentity): ProviderDefinition;
+//# sourceMappingURL=provider-registry.d.ts.map

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

@@ -0,0 +1,83 @@
+const simpleIcon = (slug) => `https://cdn.simpleicons.org/${slug}`;
+/** DSH 内置模型提供商的统一订阅能力登记。 */
+export const MODEL_PROVIDER_DEFINITIONS = [
+    provider('amazon-bedrock', 'Amazon Bedrock', ['amazon-bedrock'], ['bedrock-runtime.us-east-1.amazonaws.com'], 'unsupported', 'amazonaws'),
+    provider('ant-ling', 'Ant Ling', ['ant-ling'], [], 'sub2api', 'antdesign'),
+    provider('anthropic', 'Anthropic', ['anthropic', 'claude'], ['api.anthropic.com'], 'official-usage', 'anthropic'),
+    provider('azure-openai-responses', 'Azure OpenAI', ['azure-openai-responses', 'azure-openai'], [], 'unsupported', 'microsoftazure'),
+    provider('baseten', 'Baseten', ['baseten'], ['inference.baseten.co'], 'official-usage', 'baseten'),
+    provider('cerebras', 'Cerebras', ['cerebras'], ['api.cerebras.ai'], 'unsupported', 'cerebras'),
+    provider('cloudflare-ai-gateway', 'Cloudflare AI Gateway', ['cloudflare-ai-gateway'], ['api.cloudflare.com'], 'official-usage', 'cloudflare'),
+    provider('cloudflare-workers-ai', 'Cloudflare Workers AI', ['cloudflare-workers-ai'], ['api.cloudflare.com'], 'unsupported', 'cloudflare'),
+    provider('deepseek', 'DeepSeek', ['deepseek', 'deepseek-official', 'official-deepseek'], ['api.deepseek.com', 'api.deepseek.com.cn'], 'official-balance', 'deepseek', 'deepseek-balance'),
+    provider('fireworks', 'Fireworks AI', ['fireworks'], ['api.fireworks.ai'], 'official-usage', 'fireworks'),
+    provider('github-copilot', 'GitHub Copilot', ['github-copilot'], ['api.githubcopilot.com', 'api.github.com'], 'subscription-window', 'github', 'github-copilot-usage'),
+    provider('google', 'Google Gemini', ['google', 'gemini'], ['generativelanguage.googleapis.com'], 'unsupported', 'googlegemini'),
+    provider('google-vertex', 'Google Vertex AI', ['google-vertex', 'vertex'], ['aiplatform.googleapis.com'], 'unsupported', 'googlecloud'),
+    provider('groq', 'Groq', ['groq'], ['api.groq.com'], 'unsupported', 'groq'),
+    provider('huggingface', 'Hugging Face', ['huggingface', 'hf'], ['api-inference.huggingface.co'], 'unsupported', 'huggingface'),
+    provider('kimi-coding', 'Kimi Coding', ['kimi-coding'], ['api.kimi.com'], 'official-usage', 'moonshot'),
+    provider('minimax', 'MiniMax', ['minimax'], ['api.minimax.io'], 'official-balance', 'minimax', 'minimax-usage'),
+    provider('minimax-cn', 'MiniMax 中国', ['minimax-cn'], ['api.minimaxi.com'], 'official-balance', 'minimax', 'minimax-usage'),
+    provider('mistral', 'Mistral AI', ['mistral'], ['api.mistral.ai'], 'official-usage', 'mistral'),
+    provider('moonshotai', 'Moonshot AI', ['moonshotai', 'moonshot'], ['api.moonshot.ai'], 'official-balance', 'moonshot'),
+    provider('moonshotai-cn', 'Moonshot AI 中国', ['moonshotai-cn'], ['api.moonshot.cn'], 'official-balance', 'moonshot'),
+    provider('nvidia', 'NVIDIA NIM', ['nvidia'], ['integrate.api.nvidia.com'], 'unsupported', 'nvidia'),
+    provider('openai', 'OpenAI', ['openai'], ['api.openai.com'], 'official-usage', 'openai'),
+    provider('openai-codex', 'OpenAI Codex', ['openai-codex'], ['chatgpt.com', 'api.openai.com'], 'subscription-window', 'openai'),
+    provider('opencode', 'OpenCode', ['opencode'], [], 'sub2api', 'opencode'),
+    provider('opencode-go', 'OpenCode Go', ['opencode-go'], [], 'sub2api', 'opencode'),
+    provider('openrouter', 'OpenRouter', ['openrouter'], ['openrouter.ai'], 'official-balance', 'openrouter', 'openrouter-balance'),
+    provider('qwen-token-plan', 'Qwen Token Plan', ['qwen-token-plan', 'qwen-token-plan-individual'], ['dashscope.aliyuncs.com'], 'unsupported', 'alibabacloud'),
+    provider('qwen-token-plan-cn', 'Qwen Token Plan 中国', ['qwen-token-plan-cn'], ['dashscope.aliyuncs.com.cn'], 'unsupported', 'alibabacloud'),
+    provider('together', 'Together AI', ['together'], ['api.together.xyz'], 'unsupported', 'together'),
+    provider('vercel-ai-gateway', 'Vercel AI Gateway', ['vercel-ai-gateway'], ['ai-gateway.vercel.sh'], 'official-usage', 'vercel'),
+    provider('xai', 'xAI', ['xai', 'grok'], ['api.x.ai'], 'unsupported', 'x'),
+    provider('xiaomi', 'Xiaomi MiMo', ['xiaomi', 'xiaomi-token-plan-ams', 'xiaomi-token-plan-cn', 'xiaomi-token-plan-sgp'], ['api.xiaomimimo.com'], 'unsupported', 'xiaomi'),
+    provider('zai', 'Z.ai', ['zai'], ['api.z.ai'], 'official-balance', 'zhipu', 'zai-usage'),
+    provider('zai-coding-cn', 'Z.ai Coding 中国', ['zai-coding-cn'], ['open.bigmodel.cn'], 'official-balance', 'zhipu', 'zai-usage'),
+];
+function provider(id, displayName, aliases, officialHosts, capability, logoSlug, reader = capability === 'sub2api' ? 'sub2api' : 'none') {
+    return { id, displayName, aliases, officialHosts, capability, reader, logoUrl: simpleIcon(logoSlug) };
+}
+/** 规范化名称，避免大小写、下划线和连字符造成重复提供商。 */
+export function normalizeProviderName(value) {
+    return (value ?? '').trim().toLowerCase().replace(/[_\s]+/gu, '-');
+}
+/** 去掉 path、查询参数和凭据，只保留可用于身份判断的 origin。 */
+export function normalizeProviderBaseUrl(value) {
+    if (value === undefined || value.trim() === '')
+        return '';
+    try {
+        const url = new URL(value.trim());
+        return url.origin.toLowerCase();
+    }
+    catch {
+        return '';
+    }
+}
+function providerMatches(definition, identity) {
+    const name = normalizeProviderName(identity.name);
+    const nameMatches = name !== '' && definition.aliases.some((alias) => normalizeProviderName(alias) === name);
+    const host = normalizeProviderBaseUrl(identity.baseUrl);
+    const hostMatches = host !== '' && definition.officialHosts.some((officialHost) => normalizeProviderBaseUrl(`https://${officialHost}`) === host);
+    return nameMatches && (host === '' || hostMatches);
+}
+/** 按名称和 baseURL 联合识别；同名第三方代理不会冒充官方提供商。 */
+export function identifyModelProvider(identity) {
+    return MODEL_PROVIDER_DEFINITIONS.find((definition) => providerMatches(definition, identity));
+}
+/** 返回一个不依赖名称的第三方上游定义，供 Sub2API 统计使用。 */
+export function thirdPartyProvider(identity) {
+    const name = identity.name?.trim();
+    return {
+        id: name === undefined || name === '' ? 'custom' : normalizeProviderName(name),
+        displayName: name === undefined || name === '' ? '自定义提供商' : name,
+        aliases: [],
+        officialHosts: [],
+        capability: 'sub2api',
+        reader: 'sub2api',
+        logoUrl: '',
+    };
+}
+//# sourceMappingURL=provider-registry.js.map

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

@@ -1,5 +1,6 @@
 import { spawn, spawnSync } from 'node:child_process';
 import type { CliSubscriptionUsage } from '../../shared/contracts/subscription.js';
+import { OfficialProviderSubscriptionService, type OfficialProviderSubscriptionOptions } from './official-provider-subscription.js';
 type FetchLike = typeof fetch;
 /** 统一读取 Codex、Claude Code、OpenCode 订阅摘要。所有原始凭据都留在 Host。 */
 export declare class ProviderSubscriptionService {
@@ -8,8 +9,11 @@ export declare class ProviderSubscriptionService {
     readonly claudeCode: ClaudeCodeSubscriptionService;
     readonly opencode: OpenCodeSubscriptionService;
     readonly sub2api: Sub2ApiUsageService;
+    readonly deepseek: DeepseekSubscriptionService;
+    readonly official: OfficialProviderSubscriptionService;
     constructor(options?: ProviderSubscriptionOptions);
-    read(adapterId: string): Promise<CliSubscriptionUsage | null>;
+    read(adapterId: string, providerId?: string): Promise<CliSubscriptionUsage | null>;
+    private readDsh;
     private readSub2ApiFirst;
 }
 export interface ProviderSubscriptionOptions {
@@ -18,6 +22,8 @@ export interface ProviderSubscriptionOptions {
     readonly claudeCode?: ClaudeCodeSubscriptionOptions;
     readonly opencode?: OpenCodeSubscriptionOptions;
     readonly sub2api?: Sub2ApiUsageOptions;
+    readonly deepseek?: DeepseekSubscriptionOptions;
+    readonly official?: OfficialProviderSubscriptionOptions;
 }
 export interface SubscriptionReader {
     read(): Promise<CliSubscriptionUsage | null>;
@@ -26,6 +32,20 @@ export interface Sub2ApiSource {
     readonly baseUrl: string;
     readonly apiKey: string;
 }
+export interface DeepseekSubscriptionOptions {
+    readonly fetch?: FetchLike;
+    readonly timeoutMs?: number;
+    readonly sources?: readonly Sub2ApiSource[];
+}
+/** 读取官方 DeepSeek API 的余额；凭据只在 Host 内使用。 */
+export declare class DeepseekSubscriptionService {
+    private readonly request;
+    private readonly timeoutMs;
+    private readonly configuredSources;
+    constructor(options?: DeepseekSubscriptionOptions);
+    read(source?: Sub2ApiSource): Promise<CliSubscriptionUsage | null>;
+    private readSource;
+}
 export interface Sub2ApiUsageOptions {
     readonly fetch?: FetchLike;
     readonly timeoutMs?: number;
@@ -37,8 +57,10 @@ export declare class Sub2ApiUsageService {
     private readonly timeoutMs;
     private readonly configuredSources;
     constructor(options?: Sub2ApiUsageOptions);
-    hasSource(adapterId: string): boolean;
-    read(adapterId: string): Promise<CliSubscriptionUsage | null>;
+    hasSource(adapterId: string, providerId?: string): boolean;
+    /** 只判断是否存在第三方上游；官方 Codex/Claude 源必须允许回退原生订阅读取器。 */
+    hasThirdPartySource(adapterId: string, providerId?: string): boolean;
+    read(adapterId: string, providerId?: string): Promise<CliSubscriptionUsage | null>;
     private readSource;
 }
 export interface CodexSubscriptionOptions {