@jingyi0605/codingns4dsh 0.1.0 → 0.1.2

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

@@ -2,6 +2,8 @@ import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { spawn, spawnSync } from 'node:child_process';
+import { identifyModelProvider, normalizeProviderBaseUrl, thirdPartyProvider } from './provider-registry.js';
+import { OfficialProviderSubscriptionService } from './official-provider-subscription.js';
 import { JsonRpcProcess } from './json-rpc-process.js';
 import { detectBinary } from './rpc-driver-utils.js';
 /** 统一读取 Codex、Claude Code、OpenCode 订阅摘要。所有原始凭据都留在 Host。 */
@@ -11,15 +13,21 @@ export class ProviderSubscriptionService {
     claudeCode;
     opencode;
     sub2api;
+    deepseek;
+    official;
     constructor(options = {}) {
         this.commandCode = options.commandCode;
         this.codex = new CodexSubscriptionService(options.codex);
         this.claudeCode = new ClaudeCodeSubscriptionService(options.claudeCode);
         this.opencode = new OpenCodeSubscriptionService(options.opencode);
         this.sub2api = new Sub2ApiUsageService(options.sub2api);
+        this.deepseek = new DeepseekSubscriptionService(options.deepseek);
+        this.official = new OfficialProviderSubscriptionService(options.official);
     }
-    read(adapterId) {
-        if (adapterId === 'codex' || adapterId === 'claude-code' || adapterId === 'dsh' || adapterId === 'grok' || adapterId === 'opencode') {
+    read(adapterId, providerId) {
+        if (adapterId === 'dsh')
+            return this.readDsh(providerId);
+        if (adapterId === 'codex' || adapterId === 'claude-code' || adapterId === 'grok' || adapterId === 'opencode') {
             return this.readSub2ApiFirst(adapterId);
         }
         switch (adapterId) {
@@ -30,22 +38,103 @@ export class ProviderSubscriptionService {
             default: return Promise.resolve(null);
         }
     }
+    async readDsh(providerId) {
+        const currentProviderId = providerId ?? resolveDshDefaultProvider();
+        const configuredSource = resolveDshProviderSource(currentProviderId);
+        const matchedProvider = identifyModelProvider({ name: currentProviderId, baseUrl: configuredSource?.baseUrl });
+        if (matchedProvider?.reader === 'openrouter-balance' || matchedProvider?.reader === 'minimax-usage' || matchedProvider?.reader === 'zai-usage' || matchedProvider?.reader === 'github-copilot-usage') {
+            return this.official.read(currentProviderId, configuredSource);
+        }
+        if (matchedProvider?.reader === 'deepseek-balance' && isOfficialDeepseekSource(currentProviderId, configuredSource))
+            return this.deepseek.read(configuredSource ?? undefined);
+        if (matchedProvider?.reader === 'sub2api')
+            return this.sub2api.read('dsh', currentProviderId);
+        // 已识别的官方提供商但没有可用读取器时，不尝试把官方 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');
+        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.hasSource(adapterId);
-        const upstream = await this.sub2api.read(adapterId);
-        if (upstream !== null)
-            return upstream;
+        const hasThirdPartySource = this.sub2api.hasThirdPartySource(adapterId);
         if (hasThirdPartySource)
-            return null;
+            return this.sub2api.read(adapterId);
         if (adapterId === 'codex')
-            return this.codex.read();
+            return this.codex.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'openai-codex' }), ''));
         if (adapterId === 'claude-code')
-            return this.claudeCode.read();
+            return this.claudeCode.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'anthropic' }), ''));
         return null;
     }
 }
+/** 读取官方 DeepSeek API 的余额；凭据只在 Host 内使用。 */
+export class DeepseekSubscriptionService {
+    request;
+    timeoutMs;
+    configuredSources;
+    constructor(options = {}) {
+        this.request = options.fetch ?? fetch;
+        this.timeoutMs = options.timeoutMs ?? 8_000;
+        this.configuredSources = options.sources;
+    }
+    async read(source) {
+        const sources = source === undefined ? (this.configuredSources ?? resolveDeepseekSources()) : [source];
+        for (const candidate of sources) {
+            if (!isOfficialDeepseekUrl(candidate.baseUrl))
+                continue;
+            const result = await this.readSource(candidate);
+            if (result !== null)
+                return result;
+        }
+        return null;
+    }
+    async readSource(source) {
+        const baseUrl = deepseekApiRoot(source.baseUrl);
+        if (baseUrl === '' || source.apiKey.trim() === '')
+            return null;
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), this.timeoutMs);
+        try {
+            const response = await this.request(`${baseUrl}/user/balance`, {
+                headers: {
+                    Authorization: source.apiKey.trim().startsWith('Bearer ') ? source.apiKey.trim() : `Bearer ${source.apiKey.trim()}`,
+                    Accept: 'application/json',
+                },
+                signal: controller.signal,
+            });
+            if (!response.ok)
+                return null;
+            const usage = normalizeDeepseekUsage(await response.json(), baseUrl);
+            if (usage === null)
+                return null;
+            return {
+                authenticated: true,
+                planType: null,
+                primary: null,
+                secondary: null,
+                monthly: null,
+                rateLimitReachedType: null,
+                resetCredits: null,
+                capturedAt: new Date().toISOString(),
+                provider: providerSummary(identifyModelProvider({ name: 'deepseek', baseUrl }), baseUrl, await readLogoDataUrl(identifyModelProvider({ name: 'deepseek', baseUrl })?.logoUrl ?? '', this.request, this.timeoutMs)),
+                deepseek: usage,
+            };
+        }
+        catch {
+            return null;
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+}
 /** 通过 Provider 的上游 base URL 检测 Sub2API；只返回脱敏后的统计摘要。 */
 export class Sub2ApiUsageService {
     request;
@@ -56,23 +145,31 @@ export class Sub2ApiUsageService {
         this.timeoutMs = options.timeoutMs ?? 8_000;
         this.configuredSources = options.sources;
     }
-    hasSource(adapterId) {
+    hasSource(adapterId, providerId) {
         const configured = this.configuredSources?.[adapterId];
         if (configured !== undefined)
             return Array.isArray(configured) ? configured.length > 0 : true;
-        return resolveSub2ApiSources(adapterId).length > 0;
+        return resolveSub2ApiSources(adapterId, providerId).length > 0;
     }
-    async read(adapterId) {
+    /** 只判断是否存在第三方上游；官方 Codex/Claude 源必须允许回退原生订阅读取器。 */
+    hasThirdPartySource(adapterId, providerId) {
         const configured = this.configuredSources?.[adapterId];
-        const sources = configured === undefined ? resolveSub2ApiSources(adapterId) : Array.isArray(configured) ? configured : [configured];
+        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];
         for (const source of sources) {
-            const result = await this.readSource(source);
+            const result = await this.readSource(source, providerId);
             if (result !== null)
                 return result;
         }
         return null;
     }
-    async readSource(source) {
+    async readSource(source, providerId) {
         const baseUrl = source.baseUrl.trim().replace(/\/+$/u, '');
         const usagePath = /\/v1$/u.test(baseUrl) ? '/usage' : '/v1/usage';
         const controller = new AbortController();
@@ -89,7 +186,9 @@ export class Sub2ApiUsageService {
                 return null;
             const logoUrl = buildLogoUrl(baseUrl);
             const logoDataUrl = logoUrl === '' ? '' : await readLogoDataUrl(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(), sub2api: { ...usage, logoUrl, logoDataUrl } };
+            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;
@@ -124,7 +223,7 @@ export class CodexSubscriptionService {
             const controller = new AbortController();
             const timer = setTimeout(() => controller.abort(), this.timeoutMs);
             try {
-                await rpc.request('initialize', { clientInfo: { name: 'codingns4dsh', version: '0.1.0' }, capabilities: {} }, { signal: controller.signal });
+                await rpc.request('initialize', { clientInfo: { name: 'codingns4dsh', version: '0.1.1' }, capabilities: {} }, { signal: controller.signal });
                 rpc.notify('initialized', {});
                 const result = await rpc.request('account/rateLimits/read', {}, { signal: controller.signal });
                 return normalizeCodexSnapshot(result);
@@ -278,13 +377,10 @@ function hasSubscriptionWindow(value) {
     return value !== null && (value.primary !== null || value.secondary !== null || value.monthly !== null);
 }
 function hasThirdPartyCodexConfig(homeDirectory) {
-    if (textValue(process.env.OPENAI_API_KEY) !== null)
-        return true;
     const config = readText(join(homeDirectory, 'config.toml'));
-    if (config === null)
-        return false;
-    const baseUrls = [...config.matchAll(/^\s*base_url\s*=\s*["']([^"']+)["']/gmu)].map((match) => match[1] ?? '');
-    return baseUrls.some((value) => !isOfficialOpenAiUrl(value));
+    const configuredBaseUrl = config === null ? null : readCodexBaseUrl(config);
+    const environmentBaseUrl = textValue(process.env.OPENAI_BASE_URL);
+    return [configuredBaseUrl, environmentBaseUrl].some((value) => value !== null && !isOfficialOpenAiUrl(value));
 }
 function hasThirdPartyClaudeConfig(homeDirectory) {
     const baseUrl = textValue(process.env.ANTHROPIC_BASE_URL);
@@ -325,6 +421,23 @@ function readText(path) {
         return null;
     }
 }
+/** 只读取 DSH 凭据文档中的指定引用，不把凭据内容写入任何返回结构。 */
+function readDshCredential(name) {
+    const dshHome = process.env.DSH_HOME ?? join(homedir(), '.dsh');
+    const paths = [join(dshHome, '.credentials.yaml'), join(dshHome, '.env'), join(process.cwd(), '.env')];
+    const pattern = new RegExp(`^\\s*${name}\\s*:\\s*(?:"([^"]*)"|'([^']*)'|([^#\\s]+))`, 'mu');
+    const envPattern = new RegExp(`^\\s*${name}\\s*=\\s*(?:"([^"]*)"|'([^']*)'|([^#\\s]+))`, 'mu');
+    for (const path of paths) {
+        const source = readText(path);
+        if (source === null)
+            continue;
+        const match = path.endsWith('.env') ? envPattern.exec(source) : pattern.exec(source);
+        const value = match?.[1] ?? match?.[2] ?? match?.[3];
+        if (typeof value === 'string' && value.trim() !== '')
+            return value.trim();
+    }
+    return null;
+}
 function readJson(path) {
     if (!existsSync(path))
         return null;
@@ -350,7 +463,138 @@ function timestampValue(value) {
     return null;
 }
 function clamp(value) { return Math.max(0, Math.min(100, value)); }
-function resolveSub2ApiSources(adapterId) {
+function normalizeDeepseekUsage(value, baseUrl) {
+    const root = recordValue(value);
+    if (root === null)
+        return null;
+    const rawBalances = root.balance_infos ?? root.balanceInfos ?? root.balances;
+    if (!Array.isArray(rawBalances))
+        return null;
+    const balances = rawBalances.flatMap((value) => {
+        const source = recordValue(value);
+        const currency = textValue(source?.currency);
+        const totalBalance = numberValue(source?.total_balance ?? source?.totalBalance);
+        if (currency === null || totalBalance === null)
+            return [];
+        return [{
+                currency,
+                totalBalance,
+                grantedBalance: numberValue(source?.granted_balance ?? source?.grantedBalance) ?? 0,
+                toppedUpBalance: numberValue(source?.topped_up_balance ?? source?.toppedUpBalance) ?? 0,
+            }];
+    });
+    if (balances.length === 0)
+        return null;
+    return {
+        upstreamUrl: sanitizeUpstreamUrl(baseUrl),
+        isAvailable: typeof root.is_available === 'boolean' ? root.is_available : typeof root.isAvailable === 'boolean' ? root.isAvailable : null,
+        balances,
+    };
+}
+function resolveDeepseekSources() {
+    const sources = [];
+    const add = (source) => {
+        if (source === null || source.baseUrl.trim() === '' || source.apiKey.trim() === '')
+            return;
+        if (!sources.some((item) => item.baseUrl === source.baseUrl && item.apiKey === source.apiKey))
+            sources.push(source);
+    };
+    const dshBaseUrl = textValue(process.env.DSH_BASE_URL);
+    const dshApiKey = textValue(process.env.DSH_API_KEY);
+    add(dshBaseUrl !== null && dshApiKey !== null ? { baseUrl: dshBaseUrl, apiKey: dshApiKey } : null);
+    const deepseekBaseUrl = textValue(process.env.DEEPSEEK_BASE_URL);
+    const deepseekApiKey = textValue(process.env.DEEPSEEK_API_KEY) ?? readDshCredential('DEEPSEEK_API_KEY');
+    add(deepseekApiKey === null ? null : { baseUrl: deepseekBaseUrl ?? 'https://api.deepseek.com', apiKey: deepseekApiKey });
+    add(envSource('DEEPSEEK_BASE_URL', 'DEEPSEEK_API_KEY'));
+    add(findConfigSource(readJson(join(homedir(), '.dsh', 'config.json'))));
+    return sources;
+}
+function resolveDshProviderSource(providerId) {
+    const normalized = providerId?.trim();
+    if (normalized === undefined || normalized === '')
+        return null;
+    const envPrefix = normalized.replace(/[^a-z0-9]+/giu, '_').toUpperCase();
+    const envBaseUrl = textValue(process.env[`${envPrefix}_BASE_URL`]);
+    const envApiKey = textValue(process.env[`${envPrefix}_API_KEY`]);
+    if (envBaseUrl !== null && envApiKey !== null)
+        return { baseUrl: envBaseUrl, apiKey: envApiKey };
+    const dshHome = process.env.DSH_HOME ?? join(homedir(), '.dsh');
+    for (const path of [join(dshHome, 'settings.yaml'), join(dshHome, 'settings.yaml.imported')]) {
+        const source = readDshProviderYaml(path, normalized);
+        if (source !== null)
+            return source;
+    }
+    return null;
+}
+function resolveDshDefaultProvider() {
+    const dshHome = process.env.DSH_HOME ?? join(homedir(), '.dsh');
+    for (const path of [join(dshHome, 'settings.yaml'), join(dshHome, 'settings.yaml.imported')]) {
+        const text = readText(path);
+        if (text === null)
+            continue;
+        const start = text.search(/^agent-default-model:\s*$/mu);
+        if (start < 0)
+            continue;
+        const rest = text.slice(start);
+        const endMatch = /^\S[^\n]*$/mu.exec(rest.slice(1));
+        const block = endMatch === null ? rest : rest.slice(0, endMatch.index + 1);
+        const provider = yamlScalar(block.match(/^\s+provider:\s*(.+)$/mu)?.[1]);
+        if (provider !== null)
+            return provider;
+    }
+    return undefined;
+}
+function readDshProviderYaml(path, providerId) {
+    const text = readText(path);
+    if (text === null)
+        return null;
+    const escaped = providerId.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const start = text.search(new RegExp(`^ {4}${escaped}:\\s*$`, 'mu'));
+    if (start < 0)
+        return null;
+    const rest = text.slice(start);
+    const endMatch = /^ {4}\S[^\n]*$/mu.exec(rest.slice(1));
+    const block = endMatch === null ? rest : rest.slice(0, endMatch.index + 1);
+    const baseUrl = yamlScalar(block.match(/^\s+baseURL:\s*(.+)$/mu)?.[1]);
+    const keyRef = yamlScalar(block.match(/^\s+apiKeyEnv:\s*(.+)$/mu)?.[1]);
+    const apiKey = keyRef === null ? null : textValue(process.env[keyRef]) ?? readDshCredential(keyRef);
+    return baseUrl === null || apiKey === null ? null : { baseUrl, apiKey };
+}
+function yamlScalar(value) {
+    if (value === undefined)
+        return null;
+    const normalized = value.trim().replace(/^(['"])(.*)\1$/u, '$2');
+    return normalized === '' ? null : normalized;
+}
+function isOfficialDeepseekProvider(providerId) {
+    if (providerId === undefined)
+        return false;
+    return /^(?:deepseek(?:-official)?|official-deepseek)$/iu.test(providerId.trim());
+}
+/** 官方接口必须同时满足提供商名称和官方 baseURL，避免第三方代理冒充官方。 */
+function isOfficialDeepseekSource(providerId, source) {
+    if (source === null || !isOfficialDeepseekUrl(source.baseUrl))
+        return false;
+    return providerId === undefined || isOfficialDeepseekProvider(providerId);
+}
+function isThirdPartyDeepseekProvider(providerId) {
+    return providerId !== undefined && providerId.trim() !== '' && !isOfficialDeepseekProvider(providerId);
+}
+function providerSummary(definition, baseUrl, logoDataUrl, capability) {
+    const resolved = definition ?? thirdPartyProvider({ baseUrl });
+    return {
+        id: resolved.id,
+        displayName: resolved.displayName,
+        baseUrl: sanitizeUpstreamUrl(baseUrl),
+        capability: capability ?? resolved.capability,
+        logoUrl: resolved.logoUrl,
+        ...(logoDataUrl === '' ? {} : { logoDataUrl }),
+    };
+}
+function withProvider(usage, definition, baseUrl = '') {
+    return { ...usage, provider: providerSummary(definition, baseUrl, '') };
+}
+function resolveSub2ApiSources(adapterId, providerId) {
     const sources = [];
     const add = (source) => {
         if (source === null || source.baseUrl.trim() === '' || source.apiKey.trim() === '')
@@ -361,9 +605,7 @@ function resolveSub2ApiSources(adapterId) {
     if (adapterId === 'codex') {
         const home = process.env.CODEX_HOME ?? join(homedir(), '.codex');
         const config = readText(join(home, 'config.toml')) ?? '';
-        const baseUrl = config.match(/^\s*base_url\s*=\s*["']([^"']+)["']/mu)?.[1];
-        const key = textValue(readJsonValue(join(home, 'auth.json'), 'OPENAI_API_KEY'));
-        add(baseUrl === undefined || key === null ? null : { baseUrl, apiKey: key });
+        add(readCodexSource(home, config));
     }
     if (adapterId === 'claude-code') {
         const home = process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), '.claude');
@@ -385,10 +627,16 @@ function resolveSub2ApiSources(adapterId) {
         add(findConfigSource(config));
     }
     if (adapterId === 'dsh') {
-        add(envSource('DSH_BASE_URL', 'DSH_API_KEY'));
-        add(envSource('DEEPSEEK_BASE_URL', 'DEEPSEEK_API_KEY'));
+        const providerSource = resolveDshProviderSource(providerId);
+        add(providerSource);
+        // 已明确拿到当前提供商时只查询它的上游，不能把另一个配置项的余额冒充过来。
+        if (providerId !== undefined && !isOfficialDeepseekProvider(providerId))
+            return sources;
+        for (const source of resolveDeepseekSources()) {
+            if (!isOfficialDeepseekUrl(source.baseUrl))
+                add(source);
+        }
         add(envSource('OPENAI_BASE_URL', 'OPENAI_API_KEY'));
-        add(findConfigSource(readJson(join(homedir(), '.dsh', 'config.json'))));
     }
     if (adapterId === 'grok') {
         add(envSource('GROK_BASE_URL', 'GROK_API_KEY'));
@@ -398,6 +646,74 @@ function resolveSub2ApiSources(adapterId) {
     }
     return sources;
 }
+function readCodexSource(homeDirectory, config) {
+    const baseUrl = readCodexBaseUrl(config) ?? textValue(process.env.OPENAI_BASE_URL);
+    if (baseUrl === null)
+        return null;
+    const provider = tomlScalar(config, 'model_provider');
+    const section = provider === null ? '' : tomlSection(config, `model_providers.${provider}`);
+    const token = tomlScalar(section, 'experimental_bearer_token')
+        ?? tomlScalar(section, 'api_key')
+        ?? (() => {
+            const environmentName = tomlScalar(section, 'api_key_env');
+            return environmentName === null ? null : textValue(process.env[environmentName]);
+        })()
+        ?? textValue(readJsonValue(join(homeDirectory, 'auth.json'), 'OPENAI_API_KEY'))
+        ?? textValue(process.env.OPENAI_API_KEY);
+    return token === null ? null : { baseUrl, apiKey: token };
+}
+function readCodexBaseUrl(config) {
+    const provider = tomlScalar(config, 'model_provider');
+    const section = provider === null ? '' : tomlSection(config, `model_providers.${provider}`);
+    return tomlScalar(section, 'base_url') ?? tomlScalar(config, 'base_url');
+}
+function tomlSection(source, name) {
+    if (source === '')
+        return '';
+    const escaped = name.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const start = source.search(new RegExp(`^\\[${escaped}\\]\\s*$`, 'mu'));
+    if (start < 0)
+        return '';
+    const rest = source.slice(start);
+    const next = /^\[[^\n]+\]\s*$/mu.exec(rest.slice(1));
+    return next === null ? rest : rest.slice(0, next.index + 1);
+}
+function tomlScalar(source, key) {
+    if (source === '')
+        return null;
+    const escaped = key.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    const match = new RegExp(`^\\s*${escaped}\\s*=\\s*(?:"([^"]*)"|'([^']*)'|([^#\\s]+))`, 'mu').exec(source);
+    const value = match?.[1] ?? match?.[2] ?? match?.[3];
+    return textValue(value);
+}
+function isOfficialAgentSource(adapterId, source) {
+    if (adapterId === 'codex')
+        return isOfficialOpenAiUrl(source.baseUrl);
+    if (adapterId === 'claude-code')
+        return isOfficialAnthropicUrl(source.baseUrl);
+    return false;
+}
+function isOfficialDeepseekUrl(value) {
+    try {
+        const hostname = new URL(value).hostname.toLowerCase();
+        return hostname === 'api.deepseek.com' || hostname === 'api.deepseek.com.cn';
+    }
+    catch {
+        return false;
+    }
+}
+function deepseekApiRoot(value) {
+    try {
+        const url = new URL(value);
+        url.pathname = url.pathname.replace(/\/v1\/?$/u, '').replace(/\/+$/u, '');
+        url.search = '';
+        url.hash = '';
+        return url.toString().replace(/\/$/u, '');
+    }
+    catch {
+        return '';
+    }
+}
 function defaultOpenCodeDataDirectory() {
     if (process.platform === 'win32')
         return join(process.env.APPDATA ?? join(homedir(), 'AppData', 'Roaming'), 'opencode');

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

@@ -28,6 +28,8 @@ export declare class CodingNsCliAdapterRegistry {
     private readonly modelTimers;
     private readonly modelGenerations;
     private readonly requestedModelCatalogs;
+    /** 已切到下一个 DSH step、但仍在继续产出 Provider 流的驱动迭代器。 */
+    private readonly segmentedTurns;
     private cacheGeneration;
     private disposed;
     constructor(drivers: readonly CodingNsCliDriver[], enabled?: Readonly<Record<string, boolean>>, options?: {
@@ -62,6 +64,8 @@ export declare class CodingNsCliAdapterRegistry {
     private findRememberedPreference;
     private rememberPreference;
     getSession(sessionId: string): CodingNsCliSessionConfig;
+    /** 只有驱动自己维护 Provider turn 边界时，Host 才能把它映射到 DSH step。 */
+    supportsSegmentedTurns(adapterId: CodingNsCliAdapterId): boolean;
     execute(input: CodingNsCliTurnInput & {
         readonly adapterId: CodingNsCliAdapterId;
     }): AsyncIterable<CodingNsAgentEvent>;
@@ -74,6 +78,8 @@ export declare class CodingNsCliAdapterRegistry {
     respondQuestion(sessionId: string, response: CodingNsAgentQuestionResponse): Promise<void>;
     steer(sessionId: string, prompt: string, followUp?: boolean): Promise<void>;
     interrupt(sessionId: string): Promise<void>;
+    /** 丢弃等待下一步的 Provider 流，避免取消后的旧正文进入新回合。 */
+    discardSegmentedTurn(sessionId: string): void;
     dispose(): Promise<void>;
     private readDetection;
     /** 同一适配器只允许一个探测；刷新失败时保留最后一次可用状态。 */