@jingyi0605/codingns4dsh 0.1.0 → 0.1.2

package/data/build/dist/client/settings-bridge.js

@@ -1,4 +1,5 @@
 import { CODINGNS_RPC_CHANNEL } from '../shared/contracts/transport.js';
+import { debugInfo, debugWarn } from '../shared/debug.js';
 /**
  * 把 DSH 本地设置和远程 Host 设置 RPC 统一成一个设置作用域。
  * 非回环页面使用 RPC，回环页面完全复用 DSH 的原生设置传输。
@@ -14,14 +15,14 @@ export class CodingNsSettingsBridge {
     constructor(local, rpc) {
         this.local = local;
         this.rpc = rpc;
-        this.snapshot = local.getSnapshot();
+        this.snapshot = toStoreSnapshot(local.getSnapshot());
         this.localUnsubscribe = local.subscribe(() => {
             if (this.isRemote()) {
                 void this.load().catch(() => undefined);
                 return;
             }
             this.remoteLoaded = false;
-            this.publish(local.getSnapshot());
+            this.publish(toStoreSnapshot(local.getSnapshot()));
         });
     }
     getSnapshot() { return this.snapshot; }
@@ -36,35 +37,40 @@ export class CodingNsSettingsBridge {
             return;
         if (this.remoteLoad !== undefined)
             return this.remoteLoad;
+        debugInfo('codingns4dsh: client settings load begin');
         this.remoteLoad = this.call('settings/get', {}).then((response) => {
             this.remoteLoaded = true;
             this.publish({
                 status: 'ready',
                 value: response.value,
-                base: undefined,
-                user: undefined,
                 revision: response.revision,
                 writable: true,
-                mode: 'host',
             });
+            debugInfo('codingns4dsh: client settings load success', { revision: response.revision });
         }).finally(() => {
             this.remoteLoad = undefined;
         });
         return this.remoteLoad;
     }
     async set(field, value) {
-        if (!this.isRemote())
-            return this.local.set(field, value);
+        if (!this.isRemote()) {
+            await this.local.set(field, value);
+            return true;
+        }
         return this.mutate([{ op: 'set', path: [field], value: toJsonValue(value) }]);
     }
     async unset(field) {
-        if (!this.isRemote())
-            return this.local.unset(field);
+        if (!this.isRemote()) {
+            await this.local.unset(field);
+            return true;
+        }
         return this.mutate([{ op: 'unset', path: [field] }]);
     }
     async mutate(ops, expectedRevision) {
-        if (!this.isRemote())
-            return this.local.mutate(ops, expectedRevision);
+        if (!this.isRemote()) {
+            await this.local.mutate(ops, expectedRevision);
+            return true;
+        }
         const payload = expectedRevision === undefined ? { ops } : { ops, expectedRevision };
         const response = await this.call('settings/set', payload);
         this.remoteLoaded = true;
@@ -74,26 +80,12 @@ export class CodingNsSettingsBridge {
             value: response.value,
             revision: response.revision,
             writable: true,
-            mode: 'host',
         });
+        return true;
     }
     dispose() { this.localUnsubscribe(); }
     async call(endpoint, payload) {
-        let result;
-        try {
-            result = await this.rpc.call(CODINGNS_RPC_CHANNEL, endpoint, payload);
-        }
-        catch (error) {
-            // DSH 原生连接通常把自定义 RPC 映射到 /api；保留逻辑通道兼容
-            // Codingns4DSH Transport，同时在普通 Web Host 上回退到实际 Fetch 路由。
-            const message = error instanceof Error ? error.message : String(error);
-            if (!/HTTP (?:404|405)\b/u.test(message))
-                throw error;
-            result = await this.rpc.call('/api', `codingns/${endpoint}`, payload);
-        }
-        if (!result.ok)
-            throw new Error(result.error.message);
-        return result.value;
+        return callCodingNsRpc(this.rpc, endpoint, payload);
     }
     publish(next) {
         this.snapshot = next;
@@ -105,6 +97,35 @@ export class CodingNsSettingsBridge {
         return snapshot.mode === 'memory' || snapshot.status === 'unavailable';
     }
 }
+/** 调用 Codingns4DSH Host RPC，并兼容 DSH 原生连接与普通 Web API 回退。 */
+export async function callCodingNsRpc(rpc, endpoint, payload) {
+    let result;
+    try {
+        debugInfo('codingns4dsh: client rpc request', { channel: CODINGNS_RPC_CHANNEL, endpoint });
+        result = await rpc.call(CODINGNS_RPC_CHANNEL, endpoint, payload);
+    }
+    catch (error) {
+        // DSH 原生连接通常把自定义 RPC 映射到 /api；保留逻辑通道兼容
+        // Codingns4DSH Transport，同时在普通 Web Host 上回退到实际 Fetch 路由。
+        const message = error instanceof Error ? error.message : String(error);
+        if (!/HTTP (?:404|405)\b/u.test(message))
+            throw error;
+        debugWarn('codingns4dsh: client rpc fallback', { endpoint, error: message });
+        try {
+            result = await rpc.call('/api', `codingns/${endpoint}`, payload);
+        }
+        catch (fallbackError) {
+            console.error('codingns4dsh: client rpc fallback failed', { endpoint, error: fallbackError });
+            throw fallbackError;
+        }
+    }
+    if (!result.ok) {
+        console.error('codingns4dsh: client rpc response error', { endpoint, error: result.error });
+        throw new Error(result.error.message);
+    }
+    debugInfo('codingns4dsh: client rpc response success', { endpoint });
+    return result.value;
+}
 /** 设置 RPC 只能传 JSON；在浏览器边界尽早拒绝函数、循环引用等无效值。 */
 function toJsonValue(value) {
     if (value === null || typeof value === 'string' || typeof value === 'boolean')
@@ -123,4 +144,7 @@ function toJsonValue(value) {
 export function createCodingNsSettingsBridge(local, rpc) {
     return new CodingNsSettingsBridge(local, rpc);
 }
+function toStoreSnapshot(snapshot) {
+    return { value: snapshot.value, revision: snapshot.revision, writable: snapshot.writable, status: snapshot.status };
+}
 //# sourceMappingURL=settings-bridge.js.map

package/data/build/dist/client/settings-section.d.ts

@@ -1,9 +1,10 @@
 import type { ReactElement } from 'react';
 import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
-import type { SettingsScope, SettingsSectionOwnerProps } from '@deepseek-ai/dsh-client-ui-settings/client';
+import type { SettingsSectionOwnerProps } from '@deepseek-ai/dsh-client-ui-settings/client';
 import type { FeatureRegistry } from '../features/registry.js';
 import { type RestartFeatureStates, type CodingNsSettings } from '../shared/contracts/config.js';
 import type { CodingNsClientFeatureModule, CodingNsClientServices } from './features/types.js';
+import type { CodingNsSettingsStore } from '../dsh-capabilities/settings-store.js';
 declare module '@deepseek-ai/dsh-client-ui-slots' {
     interface SlotMap {
         'settings.section': {
@@ -14,7 +15,7 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
     }
 }
 export interface CodingNsSectionProps extends PropsRuntime<'settings.section'> {
-    readonly settings: SettingsScope<CodingNsSettings>;
+    readonly settings: CodingNsSettingsStore<CodingNsSettings>;
     readonly registry: FeatureRegistry<CodingNsClientServices, CodingNsClientFeatureModule>;
     readonly services: CodingNsClientServices;
     /** 当前 Client 进程启动时捕获的重启生效模块状态。 */

package/data/build/dist/client/settings-section.js

@@ -1,9 +1,10 @@
-import { createElement, useState, useSyncExternalStore } from 'react';
+import { createElement, useEffect, useState, useSyncExternalStore } from 'react';
 import { CODINGNS_MODULES_FIELD, isFeatureEnabled, isFeatureDshVersionCompatible, } from '../shared/contracts/config.js';
 import { settingsModules } from './features/index.js';
-import { dshSettingsBodyStyle, dshSettingsCardStyle, dshSettingsHeaderStyle, dshSettingsPageStyle, dshSettingsSubtitleStyle, dshSettingsSummaryDescriptionStyle, dshSettingsSummaryLabelStyle, dshSettingsSummaryStyle, dshSettingsSummaryTextStyle, dshSettingsTitleStyle, dshThemeColor, } from './theme.js';
+import { dshSettingsBodyStyle, dshSettingsCardStyle, dshSettingsHeaderStyle, dshSettingsPageStyle, dshSettingsSubtitleStyle, dshSettingsSummaryDescriptionStyle, dshSettingsSummaryLabelStyle, dshSettingsSummaryStyle, dshSettingsSummaryTextStyle, dshSettingsTitleStyle, dshSettingsToastStyle, dshThemeColor, } from './theme.js';
 import { useCodingNsTranslator } from './locale.js';
-import { isLegacyDshVersion } from '../shared/contracts/version.js';
+import { CODINGNS_VERSION, DSH_COMPATIBILITY, isLegacyDshVersion } from '../shared/contracts/version.js';
+const CODINGNS_GITHUB_URL = 'https://github.com/jingyi0605/Codingns4DSH';
 /**
  * DSH 设置页中的 Codingns4DSH 区块。
  *
@@ -13,41 +14,56 @@ import { isLegacyDshVersion } from '../shared/contracts/version.js';
 export function CodingNsSettingsSection({ settings, registry, services, restartStates = {} }) {
     const snapshot = useSyncExternalStore((listener) => settings.subscribe(listener), () => settings.getSnapshot(), () => settings.getSnapshot());
     const t = useCodingNsTranslator(services.locale);
-    return createElement('section', { style: dshSettingsPageStyle }, createElement('header', { style: dshSettingsHeaderStyle }, createElement('h2', { style: dshSettingsTitleStyle }, t('settings.title')), createElement('p', { style: dshSettingsSubtitleStyle }, t('settings.subtitle'))), createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 12 } }, settingsModules(registry).map((entry) => createElement(FeatureCard, {
+    const [toast, setToast] = useState(null);
+    useEffect(() => {
+        if (toast === null)
+            return;
+        const timer = globalThis.setTimeout(() => setToast(null), 3200);
+        return () => globalThis.clearTimeout(timer);
+    }, [toast]);
+    const notify = (notice) => setToast(notice);
+    return createElement('section', { style: dshSettingsPageStyle }, toast === null ? null : createElement('div', {
+        role: toast.kind === 'error' ? 'alert' : 'status',
+        'aria-live': 'polite',
+        style: { ...dshSettingsToastStyle, borderColor: toast.kind === 'error' ? dshThemeColor.error : toast.kind === 'success' ? dshThemeColor.success : dshThemeColor.border },
+    }, toast.message), createElement('header', { style: dshSettingsHeaderStyle }, createElement('h2', { style: dshSettingsTitleStyle }, t('settings.title')), createElement('p', { style: dshSettingsSubtitleStyle }, t('settings.subtitle'))), createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 12 } }, settingsModules(registry).map((entry) => createElement(FeatureCard, {
         key: entry.module.descriptor.name,
         entry,
         snapshot,
         services,
         restartStates,
-    }))));
+        notify,
+    }))), createElement('details', { style: { alignSelf: 'center', display: 'flex', flexDirection: 'column-reverse', alignItems: 'center', marginTop: 4, color: dshThemeColor.labelTertiary, textAlign: 'center', fontSize: 12, lineHeight: 1.5 } }, createElement('summary', { style: { cursor: 'pointer', color: dshThemeColor.labelSecondary, listStylePosition: 'inside' } }, t('settings.version', { version: CODINGNS_VERSION })), createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 4, alignItems: 'center', maxWidth: 'min(100%, 560px)', marginBottom: 8, padding: '8px 12px', border: `1px solid ${dshThemeColor.border}`, borderRadius: 6, background: dshThemeColor.surfaceSubtle } }, createElement('div', undefined, t('settings.compatibility', { range: DSH_COMPATIBILITY })), createElement('a', { href: CODINGNS_GITHUB_URL, target: '_blank', rel: 'noreferrer', style: { color: dshThemeColor.accent, overflowWrap: 'anywhere' } }, CODINGNS_GITHUB_URL))));
 }
 /** 通用功能模块卡片：标题栏开关由 descriptor.ui 决定，内容由模块自己提供。 */
-function FeatureCard({ entry, snapshot, services, restartStates }) {
+function FeatureCard({ entry, snapshot, services, restartStates, notify }) {
     const { module, ui } = entry;
     const t = useCodingNsTranslator(services.locale);
-    const [writeError, setWriteError] = useState(null);
     const versionCompatible = isFeatureDshVersionCompatible(module.descriptor, services.dshVersion);
     const requestedEnabled = isFeatureEnabled(module.descriptor, snapshot.value);
     const enabled = versionCompatible && requestedEnabled;
-    const effectiveEnabled = module.descriptor.activation === 'restart'
-        ? versionCompatible && (restartStates[module.descriptor.name] ?? module.descriptor.enabledByDefault)
-        : enabled;
     const panel = module.settingsPanel;
     // 常驻模块不提供关闭入口；设置未就绪或只读时也不允许切换。
     const switchDisabled = ui.alwaysEnabled === true || !versionCompatible || snapshot.status === 'loading' || !snapshot.writable;
     const toggle = (next) => {
-        setWriteError(null);
         if (!versionCompatible) {
-            setWriteError(t('settings.versionBlocked', {
-                version: services.dshVersion,
-                minimum: module.descriptor.minimumDshVersion ?? '未知版本',
-            }));
+            notify({ kind: 'error', message: t('settings.versionBlocked', {
+                    version: services.dshVersion,
+                    minimum: module.descriptor.minimumDshVersion ?? '未知版本',
+                }) });
             return;
         }
         void services.settings
             .mutate([{ op: 'set', path: [CODINGNS_MODULES_FIELD, module.descriptor.name], value: next }])
+            .then((accepted) => {
+            if (!accepted) {
+                notify({ kind: 'error', message: t('settings.moduleWriteRejected') });
+                return;
+            }
+            notify({ kind: 'success', message: t(next ? 'settings.moduleEnabled' : 'settings.moduleDisabled', { label: t(ui.labelKey ?? ui.label) }) });
+        })
             .catch((cause) => {
-            setWriteError(cause instanceof Error ? cause.message : String(cause));
+            notify({ kind: 'error', message: cause instanceof Error ? cause.message : String(cause) });
         });
     };
     return createElement('details', {
@@ -67,9 +83,7 @@ function FeatureCard({ entry, snapshot, services, restartStates }) {
             version: services.dshVersion,
             minimum: module.descriptor.minimumDshVersion ?? '未知版本',
         }))
-        : null, module.descriptor.activation !== 'restart' ? null : createElement('div', { role: 'status', style: { display: 'flex', flexDirection: 'column', gap: 4, padding: 10, border: `1px solid ${dshThemeColor.border}`, borderRadius: 6, fontSize: 13 } }, createElement('span', undefined, t('settings.restartTarget', { state: enabled ? t('settings.enabled') : t('settings.disabled') })), effectiveEnabled === enabled
-        ? createElement('span', undefined, t('settings.runtimeReported'))
-        : createElement('strong', undefined, t('settings.restartRequired'))), panel === undefined ? null : createElement(panel, { services, enabled, snapshot }), writeError === null ? null : createElement('div', { role: 'alert', style: { color: dshThemeColor.error } }, writeError)));
+        : null, panel === undefined ? null : createElement(panel, { services, enabled, snapshot, notify })));
 }
 /** 标题栏开关：真实 checkbox 语义，点击不会连带折叠卡片。 */
 function FeatureSwitch({ label, checked, disabled, onChange }) {

package/data/build/dist/client/subscription-slot.d.ts

@@ -1,14 +1,17 @@
 import type { ReactElement } from 'react';
 import type { SlotRegistry } from '@deepseek-ai/dsh-client-ui-renderer/client';
 import type { CodingNsRpcClient } from './features/types.js';
+import type { SessionSnapshot } from './cli-slots.js';
 declare module '@deepseek-ai/dsh-client-ui-slots' {
     interface SessionStandardProps {
         sessionId: string;
     }
 }
+type SessionSelector = <Selected>(selector: (value: SessionSnapshot) => Selected) => Selected;
 interface SubscriptionSlotProps {
     readonly rpc: CodingNsRpcClient;
     readonly sessionId?: string;
+    readonly useSession?: SessionSelector;
 }
 /** 在 DSH 原生步骤统计左侧显示当前 Agent 的订阅余量。 */
 export declare function registerSubscriptionSlot(slots: SlotRegistry, rpc: CodingNsRpcClient): () => void;

package/data/build/dist/client/subscription-slot.js

@@ -1,5 +1,6 @@
 import { createElement, useEffect, useRef, useState } from 'react';
 import { callCliRpc } from './cli-catalog.js';
+import { providerIconUrl } from './provider-icons.js';
 import { dshPopupSurfaceStyle, dshThemeColor } from './theme.js';
 /** 在 DSH 原生步骤统计左侧显示当前 Agent 的订阅余量。 */
 export function registerSubscriptionSlot(slots, rpc) {
@@ -14,17 +15,20 @@ export function registerSubscriptionSlot(slots, rpc) {
 function CommandCodeSubscriptionSlot(props) {
     const [usage, setUsage] = useState(null);
     const [adapterId, setAdapterId] = useState(null);
+    const [providerId, setProviderId] = useState(null);
     const [eligible, setEligible] = useState(false);
     const [open, setOpen] = useState(false);
     const [loading, setLoading] = useState(false);
     const [clock, setClock] = useState(() => Date.now());
     const rootRef = useRef(null);
+    const modelSelectionRevision = props.useSession?.((value) => JSON.stringify(value.modelSelection));
     useEffect(() => {
         const sessionId = props.sessionId?.trim();
         if (!sessionId) {
             setEligible(false);
             setUsage(null);
             setAdapterId(null);
+            setProviderId(null);
             setOpen(false);
             return;
         }
@@ -32,6 +36,7 @@ function CommandCodeSubscriptionSlot(props) {
         setEligible(false);
         setUsage(null);
         setAdapterId(null);
+        setProviderId(null);
         setOpen(false);
         const refresh = async () => {
             setLoading(true);
@@ -43,14 +48,19 @@ function CommandCodeSubscriptionSlot(props) {
                         setEligible(false);
                         setUsage(null);
                         setAdapterId(null);
+                        setProviderId(null);
                     }
                     return;
                 }
                 if (active) {
                     setEligible(true);
                     setAdapterId(adapterId);
+                    setProviderId(selection.providerId ?? null);
                 }
-                const next = await callCliRpc(props.rpc, 'subscription', { adapterId });
+                const next = await callCliRpc(props.rpc, 'subscription', {
+                    adapterId,
+                    ...(selection.providerId ? { providerId: selection.providerId } : {}),
+                });
                 if (active)
                     setUsage(next);
             }
@@ -71,7 +81,7 @@ function CommandCodeSubscriptionSlot(props) {
             active = false;
             globalThis.clearInterval(timer);
         };
-    }, [props.rpc, props.sessionId]);
+    }, [props.rpc, props.sessionId, modelSelectionRevision]);
     useEffect(() => {
         if (!eligible || usage === null)
             return;
@@ -98,17 +108,33 @@ function CommandCodeSubscriptionSlot(props) {
         };
     }, [open]);
     // 未拿到真实订阅数据时不占用底部栏空间；加载状态不能伪装成订阅存在。
-    if (!eligible || usage === null || (usage.sub2api === undefined && resolveDisplayWindow(usage) === null))
+    if (!eligible || usage === null || (usage.sub2api === undefined && usage.deepseek === undefined && usage.providerBalance === undefined && resolveDisplayWindow(usage) === null))
         return null;
     const sub2api = usage.sub2api;
-    const displayWindow = sub2api === undefined ? resolveDisplayWindow(usage) : null;
+    const deepseek = usage.deepseek;
+    const providerBalance = usage.providerBalance;
+    const displayWindow = sub2api === undefined && deepseek === undefined && providerBalance === undefined ? resolveDisplayWindow(usage) : null;
     const remaining = displayWindow?.remainingPercent ?? null;
     const resetLabel = displayWindow === null ? null : formatCountdown(displayWindow.resetsAt, clock);
-    const providerName = subscriptionProviderName(adapterId);
-    const label = sub2api === undefined
+    const providerName = subscriptionProviderName(adapterId, providerId, usage);
+    const deepseekBalance = deepseek === undefined ? null : selectDeepseekBalance(deepseek);
+    const providerLogoSource = usage.provider?.logoDataUrl ?? (isRemoteWebContext() ? '' : usage.provider?.logoUrl ?? '');
+    const deepseekIconSource = providerLogoSource || (providerBalance === undefined ? providerIconUrl('dsh') : '');
+    const label = sub2api === undefined && deepseek === undefined && providerBalance === undefined
         ? `${providerName} 订阅余量 ${formatPercent(remaining ?? 0)}%`
-        : `${providerName} 上游余额 ${formatSub2ApiMoney(sub2api.balance, sub2api.unit)}`;
-    const logoSource = sub2api === undefined ? '' : (sub2api.logoDataUrl ?? (isRemoteWebContext() ? '' : sub2api.logoUrl));
+        : sub2api !== undefined
+            ? `${providerName} 上游余额 ${formatSub2ApiMoney(sub2api.balance, sub2api.unit)}`
+            : deepseek !== undefined
+                ? `${providerName} 余额 ${deepseekBalance === null ? '不可用' : formatDeepseekMoney(deepseekBalance.totalBalance, deepseekBalance.currency)}`
+                : `${providerName} 余量 ${formatProviderBalance(providerBalance)}`;
+    const logoSource = providerLogoSource || (sub2api === undefined ? '' : (sub2api.logoDataUrl ?? (isRemoteWebContext() ? '' : sub2api.logoUrl)));
+    const triggerContent = sub2api === undefined && deepseek === undefined && providerBalance === undefined
+        ? createElement('span', { 'aria-hidden': true, style: progressRingStyle() }, createElement('span', { style: { ...progressRingVisualStyle, background: progressRingVisualBackground(remaining === null ? 0 : remaining / 100, false) } }, createElement('span', { style: progressRingValueStyle }, createElement('span', undefined, formatRingPercentage(remaining ?? 0)), createElement('span', { style: progressRingSuffixStyle }, '%'))))
+        : sub2api !== undefined
+            ? createElement('span', { 'aria-hidden': true, style: sub2apiIdentityStyle }, logoSource !== '' && createElement('img', { src: logoSource, alt: '', width: 20, height: 20, style: sub2apiLogoStyle }), createElement('span', undefined, formatSub2ApiMoney(sub2api.balance, sub2api.unit)))
+            : deepseek !== undefined
+                ? createElement('span', { 'aria-hidden': true, style: deepseekBalanceIdentityStyle }, deepseekIconSource !== undefined && createElement('img', { src: deepseekIconSource, alt: '', width: 18, height: 18, style: deepseekLogoStyle }), createElement('span', { style: deepseekBalanceStyle }, deepseekBalance === null ? '--' : formatDeepseekMoney(deepseekBalance.totalBalance, deepseekBalance.currency)))
+                : createElement('span', { 'aria-hidden': true, style: deepseekBalanceIdentityStyle }, deepseekIconSource !== undefined && createElement('img', { src: deepseekIconSource, alt: '', width: 18, height: 18, style: deepseekLogoStyle }), createElement('span', { style: deepseekBalanceStyle }, formatProviderBalance(providerBalance)));
     return createElement('div', { ref: rootRef, style: subscriptionRootStyle }, createElement('button', {
         type: 'button',
         onClick: () => setOpen((value) => !value),
@@ -116,19 +142,42 @@ function CommandCodeSubscriptionSlot(props) {
         'aria-label': label,
         'aria-expanded': open,
         style: subscriptionTriggerStyle,
-    }, sub2api === undefined
-        ? createElement('span', { 'aria-hidden': true, style: progressRingStyle() }, createElement('span', { style: { ...progressRingVisualStyle, background: progressRingVisualBackground(remaining === null ? 0 : remaining / 100, false) } }, createElement('span', { style: progressRingValueStyle }, createElement('span', undefined, formatRingPercentage(remaining ?? 0)), createElement('span', { style: progressRingSuffixStyle }, '%'))))
-        : createElement('span', { 'aria-hidden': true, style: sub2apiIdentityStyle }, logoSource !== '' && createElement('img', { src: logoSource, alt: '', width: 20, height: 20, style: sub2apiLogoStyle }), createElement('span', undefined, formatSub2ApiMoney(sub2api.balance, sub2api.unit))), createElement('span', { className: 'bOPqQW_label', style: subscriptionLabelStyle }, sub2api === undefined ? (resetLabel ?? '订阅余量') : `今日 ${formatSub2ApiMoney(sub2api.today.cost, sub2api.unit)}`)), open && createElement(SubscriptionPopover, { usage, providerName }));
+    }, triggerContent, createElement('span', { style: subscriptionLabelStyle }, sub2api === undefined && deepseek === undefined && providerBalance === undefined
+        ? (resetLabel ?? '订阅余量')
+        : sub2api !== undefined ? `今日 ${formatSub2ApiMoney(sub2api.today.cost, sub2api.unit)}` : deepseek !== undefined ? '账户余额' : '官方余量')), open && createElement(SubscriptionPopover, { usage, providerName }));
 }
 function SubscriptionPopover({ usage, providerName }) {
     if (usage.sub2api !== undefined)
         return createElement(Sub2ApiPopover, { usage: usage.sub2api, providerName });
+    if (usage.deepseek !== undefined)
+        return createElement(DeepseekPopover, { usage: usage.deepseek, providerName });
+    if (usage.providerBalance !== undefined)
+        return createElement(ProviderBalancePopover, { usage: usage.providerBalance, providerName });
     const windows = [
-        ['5 小时额度', usage.primary],
-        ['周额度', usage.secondary],
-        ['月额度', usage.monthly],
+        { id: 'primary', label: formatSubscriptionWindowLabel(usage.primary, '5 小时额度'), window: usage.primary },
+        { id: 'secondary', label: formatSubscriptionWindowLabel(usage.secondary, '周额度'), window: usage.secondary },
+        { id: 'monthly', label: formatSubscriptionWindowLabel(usage.monthly, '月额度'), window: usage.monthly },
     ];
-    return createElement('div', { role: 'dialog', 'aria-label': `${providerName} 订阅使用情况`, style: subscriptionPopoverStyle }, createElement('div', { style: popoverHeadingStyle }, createElement('strong', undefined, `${providerName} 订阅`), usage.planType && createElement('span', { style: { color: dshThemeColor.labelTertiary } }, formatPlanType(usage.planType))), ...windows.map(([label, window]) => window === null ? null : createElement('section', { key: label, style: windowStyle }, createElement('div', { style: windowHeadingStyle }, createElement('span', undefined, label), createElement('span', undefined, `${formatPercent(window.remainingPercent)}%`)), createElement('div', { role: 'progressbar', 'aria-label': `${label}剩余 ${formatPercent(window.remainingPercent)}%`, 'aria-valuemin': 0, 'aria-valuemax': 100, 'aria-valuenow': window.remainingPercent, style: barStyle }, createElement('span', { style: { ...barFillStyle, width: `${window.remainingPercent}%` } })), window.resetsAt !== null && createElement('div', { style: resetStyle }, `重置于 ${formatCountdown(window.resetsAt)}`))));
+    return createElement('div', { role: 'dialog', 'aria-label': `${providerName} 订阅使用情况`, style: subscriptionPopoverStyle }, createElement('div', { style: popoverHeadingStyle }, createElement('strong', undefined, `${providerName} 订阅`), usage.planType && createElement('span', { style: { color: dshThemeColor.labelTertiary } }, formatPlanType(usage.planType))), ...windows.map(({ id, label, window }) => window === null ? null : createElement('section', { key: id, style: windowStyle }, createElement('div', { style: windowHeadingStyle }, createElement('span', undefined, label), createElement('span', undefined, `${formatPercent(window.remainingPercent)}%`)), createElement('div', { role: 'progressbar', 'aria-label': `${label}剩余 ${formatPercent(window.remainingPercent)}%`, 'aria-valuemin': 0, 'aria-valuemax': 100, 'aria-valuenow': window.remainingPercent, style: barStyle }, createElement('span', { style: { ...barFillStyle, width: `${window.remainingPercent}%` } })), window.resetsAt !== null && createElement('div', { style: resetStyle }, `重置于 ${formatCountdown(window.resetsAt)}`))));
+}
+/** 根据服务端返回的窗口时长生成准确的额度标签，避免把七天窗口误显示成五小时。 */
+function formatSubscriptionWindowLabel(window, fallback) {
+    const durationMins = window?.windowDurationMins;
+    if (durationMins === null || durationMins === undefined || !Number.isFinite(durationMins) || durationMins <= 0)
+        return fallback;
+    if (durationMins % (24 * 60) === 0)
+        return `${durationMins / (24 * 60)} 天额度`;
+    if (durationMins % 60 === 0)
+        return `${durationMins / 60} 小时额度`;
+    return `${durationMins} 分钟额度`;
+}
+function ProviderBalancePopover({ usage, providerName }) {
+    return createElement('div', { role: 'dialog', 'aria-label': `${providerName} 官方余量`, style: subscriptionPopoverStyle }, createElement('div', { style: popoverHeadingStyle }, createElement('strong', undefined, `${providerName} 官方余量`), createElement('span', { style: { color: dshThemeColor.labelTertiary } }, formatProviderBalance(usage))), usage.used !== null && usage.total !== null && createElement('div', { style: upstreamMetaStyle }, `已用 ${formatProviderBalanceValue(usage.used, usage.unit)} / ${formatProviderBalanceValue(usage.total, usage.unit)}`), usage.details.length === 0
+        ? createElement('div', { style: resetStyle }, '暂无更多统计')
+        : usage.details.map((item) => createElement('div', { key: item.label, style: deepseekBalanceDetailsStyle }, createElement('span', undefined, item.label), createElement('span', undefined, String(item.value)))));
+}
+function DeepseekPopover({ usage, providerName }) {
+    return createElement('div', { role: 'dialog', 'aria-label': `${providerName} 账户余额`, style: subscriptionPopoverStyle }, createElement('div', { style: popoverHeadingStyle }, createElement('strong', undefined, `${providerName} 账户余额`), createElement('span', { style: { color: usage.isAvailable === false ? dshThemeColor.error : dshThemeColor.labelTertiary } }, usage.isAvailable === false ? '不可用' : '可用')), usage.balances.map((balance) => createElement('section', { key: balance.currency, style: deepseekBalanceSectionStyle }, createElement('div', { style: windowHeadingStyle }, createElement('span', undefined, balance.currency), createElement('strong', undefined, formatDeepseekMoney(balance.totalBalance, balance.currency))), createElement('div', { style: deepseekBalanceDetailsStyle }, createElement('span', undefined, `赠送 ${formatDeepseekMoney(balance.grantedBalance, balance.currency)}`), createElement('span', undefined, `充值 ${formatDeepseekMoney(balance.toppedUpBalance, balance.currency)}`)))), createElement('div', { style: deepseekUnavailableStatsStyle }, '官方 DeepSeek API 当前只提供账户余额接口，暂无请求量、Token 或费用明细。'));
 }
 function Sub2ApiPopover({ usage, providerName }) {
     return createElement('div', { role: 'dialog', 'aria-label': `${providerName} 上游用量`, style: subscriptionPopoverStyle }, createElement('div', { style: popoverHeadingStyle }, createElement('strong', undefined, `${providerName} 上游用量`), createElement('span', { style: { color: dshThemeColor.labelTertiary } }, formatSub2ApiMoney(usage.balance, usage.unit))), createElement('div', { style: upstreamMetaStyle }, createElement('span', { style: upstreamTypeStyle }, usage.upstreamType), usage.upstreamUrl === ''
@@ -146,13 +195,25 @@ function createModelRow(model, unit) {
 function resolveDisplayWindow(usage) {
     return usage.primary ?? usage.secondary ?? usage.monthly;
 }
+function selectDeepseekBalance(usage) {
+    return usage.balances.find((balance) => balance.currency.toUpperCase() === 'USD') ?? usage.balances[0] ?? null;
+}
 function isSubscriptionAdapter(adapterId) {
     return adapterId === 'command-code' || adapterId === 'codex' || adapterId === 'claude-code' || adapterId === 'dsh' || adapterId === 'grok' || adapterId === 'opencode';
 }
 function isRemoteWebContext() {
     return globalThis.__CODINGNS4DSH_REMOTE_WEB_CONTEXT__ === true;
 }
-function subscriptionProviderName(adapterId) {
+function subscriptionProviderName(adapterId, providerId, usage) {
+    if (usage.provider?.displayName)
+        return usage.provider.displayName;
+    if (adapterId === 'dsh' && providerId !== null) {
+        if (/^(?:deepseek(?:-official)?|official-deepseek)$/iu.test(providerId))
+            return 'DeepSeek 官方';
+        return formatProviderName(providerId);
+    }
+    if (adapterId === 'dsh' && usage.sub2api !== undefined)
+        return `${usage.sub2api.upstreamType} 上游`;
     switch (adapterId) {
         case 'command-code': return 'Command Code';
         case 'codex': return 'Codex';
@@ -163,6 +224,9 @@ function subscriptionProviderName(adapterId) {
         default: return 'Agent';
     }
 }
+function formatProviderName(value) {
+    return value.replace(/[-_]+/gu, ' ').replace(/(^|\s)([a-z])/gu, (_match, prefix, letter) => `${prefix}${letter.toUpperCase()}`);
+}
 function formatPercent(value) { return Math.max(0, Math.min(100, value)).toFixed(0); }
 function formatRingPercentage(value) { return String(Math.floor(Math.max(0, Math.min(100, value)))); }
 function formatSub2ApiMoney(value, unit) {
@@ -171,6 +235,28 @@ function formatSub2ApiMoney(value, unit) {
         return `$${value.toFixed(2)}`;
     return `${value.toFixed(2)}${normalizedUnit === '' ? '' : ` ${normalizedUnit}`}`;
 }
+function formatDeepseekMoney(value, currency) {
+    const normalizedCurrency = currency.trim().toUpperCase();
+    const amount = value.toFixed(2);
+    if (normalizedCurrency === 'USD')
+        return `$${amount}`;
+    if (normalizedCurrency === 'CNY')
+        return `¥${amount}`;
+    return `${amount} ${normalizedCurrency}`;
+}
+function formatProviderBalance(usage) {
+    if (usage === undefined || usage.remaining === null)
+        return '--';
+    return formatProviderBalanceValue(usage.remaining, usage.unit);
+}
+function formatProviderBalanceValue(value, unit) {
+    const normalized = unit?.trim().toUpperCase() ?? '';
+    if (normalized === '%')
+        return `${value.toFixed(0)}%`;
+    if (normalized === 'USD')
+        return `$${value.toFixed(2)}`;
+    return `${value.toFixed(2)}${normalized === '' ? '' : ` ${normalized}`}`;
+}
 function formatSub2ApiTokens(value) { return new Intl.NumberFormat('zh-CN', { notation: 'compact', maximumFractionDigits: 1 }).format(value); }
 function formatSub2ApiPercent(value) { return `${Math.max(0, Math.min(100, value)).toFixed(1)}%`; }
 function formatInteger(value) { return new Intl.NumberFormat('zh-CN').format(Math.max(0, Math.round(value))); }
@@ -193,6 +279,12 @@ const subscriptionTriggerStyle = { display: 'inline-flex', alignItems: 'center',
 const subscriptionLabelStyle = { whiteSpace: 'nowrap' };
 const sub2apiIdentityStyle = { display: 'inline-flex', alignItems: 'center', gap: 5, whiteSpace: 'nowrap', fontVariantNumeric: 'tabular-nums' };
 const sub2apiLogoStyle = { display: 'block', borderRadius: 4, objectFit: 'contain' };
+const deepseekBalanceIdentityStyle = { display: 'inline-flex', alignItems: 'center', gap: 5, whiteSpace: 'nowrap', fontVariantNumeric: 'tabular-nums' };
+const deepseekLogoStyle = { display: 'block', borderRadius: 5, objectFit: 'contain' };
+const deepseekBalanceStyle = { display: 'inline-flex', alignItems: 'center', color: dshThemeColor.labelSecondary, fontSize: 13, fontWeight: 600, fontVariantNumeric: 'tabular-nums' };
+const deepseekBalanceSectionStyle = { display: 'grid', gap: 6, marginTop: 10, padding: '10px 0 2px', borderTop: `1px solid ${dshThemeColor.border}` };
+const deepseekBalanceDetailsStyle = { display: 'flex', justifyContent: 'space-between', gap: 12, color: dshThemeColor.labelTertiary, fontSize: 12 };
+const deepseekUnavailableStatsStyle = { marginTop: 12, paddingTop: 10, borderTop: `1px solid ${dshThemeColor.border}`, color: dshThemeColor.labelTertiary, fontSize: 12, lineHeight: '17px' };
 const progressRingVisualStyle = { boxSizing: 'border-box', width: '100%', height: '100%', display: 'inline-flex', alignItems: 'center', justifyContent: 'center', padding: 2, borderRadius: 'inherit' };
 const progressRingValueStyle = { boxSizing: 'border-box', width: '100%', height: '100%', display: 'inline-flex', alignItems: 'center', justifyContent: 'center', gap: 0.5, borderRadius: 'inherit', background: dshThemeColor.menuBackground, fontSize: 7, lineHeight: 1, fontWeight: 700, color: dshThemeColor.labelPrimary, whiteSpace: 'nowrap' };
 const progressRingSuffixStyle = { fontSize: 5.5, lineHeight: 1, color: dshThemeColor.labelTertiary, transform: 'translateY(1px)' };

package/data/build/dist/client/terminal/model.d.ts

@@ -48,15 +48,20 @@ export interface TerminalObservable<T> {
     getSnapshot(): T;
     subscribe(listener: () => void): () => void;
 }
+interface WorkspaceBindingResolution {
+    readonly id: WebTerminalId;
+    /** 是否来自已有工作区绑定；新建绑定仍允许本次 view 创建 Host 终端。 */
+    readonly existing: boolean;
+}
 /** 一个 Sidebar 标签对应的终端模型；DOM 卸载只 detach，显式 close 才结束 Host 进程。 */
 export declare class CodingNsTerminalView {
     readonly sessionId: string;
-    readonly id: WebTerminalId;
     private readonly remote;
     private readonly createWhenMissing;
     private readonly shellPath?;
     private readonly onWorkspaceResolved?;
     readonly state: TerminalObservable<TerminalViewState>;
+    id: WebTerminalId;
     private readonly store;
     private readonly lifetime;
     private followController;
@@ -68,7 +73,7 @@ export declare class CodingNsTerminalView {
     private attachmentId;
     /** 最近一次已排队的尺寸；ResizeObserver 可能在同一布局周期内重复触发。 */
     private lastResize;
-    constructor(sessionId: string, id: WebTerminalId, remote: TerminalRemoteSource, createWhenMissing: boolean, shellPath?: string | undefined, onWorkspaceResolved?: ((workspaceId: string) => void) | undefined);
+    constructor(sessionId: string, id: WebTerminalId, remote: TerminalRemoteSource, createWhenMissing: boolean, shellPath?: string | undefined, onWorkspaceResolved?: ((workspaceId: string, id: WebTerminalId) => WorkspaceBindingResolution | undefined) | undefined);
     mount(): () => void;
     refresh(): Promise<void>;
     acknowledge(revision: number): void;
@@ -93,7 +98,11 @@ export declare class CodingNsWebTerminals extends Service {
     private readonly recoveries;
     private readonly closeFailureStore;
     readonly closeFailures: TerminalObservable<readonly TerminalCloseFailure[]>;
+    private readonly remoteReadyStore;
+    readonly remoteReadyState: TerminalObservable<boolean>;
     private readonly closeRequests;
+    /** Remote 注入前不能执行关闭请求；就绪后统一冲刷，避免把启动竞态显示成永久错误。 */
+    private cleanupQueued;
     constructor(ctx: Context, remote: TerminalRemoteSource);
     view(sessionId: string, key: string, contentId: string, terminalId?: WebTerminalId, shellPath?: string): CodingNsTerminalView;
     /** 返回某个 Sidebar 内容已经保存的 Host 终端身份，用于恢复时去重。 */
@@ -103,9 +112,12 @@ export declare class CodingNsWebTerminals extends Service {
     close(sessionId: string, key: string, contentId: string, terminalId?: WebTerminalId): void;
     recover(sessionId: string): Promise<readonly WebTerminalInfo[]>;
     retryClose(id: WebTerminalId): void;
+    /** 由 Client 的 Remote 注入回调调用，完成启动阶段延迟的关闭请求。 */
+    remoteReady(): void;
     dispose(): Promise<void>;
     private rememberWorkspace;
     private cleanup;
+    private flushCleanup;
 }
 declare module '@deepseek-ai/cordis' {
     interface Context {