@jingyi0605/codingns4dsh 0.1.7-rc.3 → 0.2.0-beta.1

package/data/build/dist/client/context-breakdown-dom.d.ts

@@ -0,0 +1,53 @@
+/**
+ * DSH 上下文面板（ContextMeter）的构成明细隐藏器。
+ *
+ * 面板同时展示两组不同来源的数字：百分比与 `~已用 / 窗口` 来自 Provider 上报的
+ * 真实用量，而「系统 / 工具 / 消息」三行明细与分段条来自 token-meter 对本地表面
+ * 的启发式估算。外部 Agent（codex 等）自己组装请求，它的系统提示、工具定义和
+ * 对话历史都不经过本地表面，两组数字因此天然对不上；`contextBreakdown` 投影又
+ * 是按定义全局注册的，无法只对某个会话关闭。这里在浏览器侧按会话隐藏构成部分，
+ * 只保留百分比与总量。
+ *
+ * 依赖的 DSH 0.2.0-rc.1 对话 DOM 契约（任何一条不成立都只是不生效，不影响其他
+ * 功能，也不会误改宿主界面）：
+ * - 对话根节点带 `data-conversation-session`；
+ * - 面板触发器是 `button[aria-haspopup="dialog"]`，展开时 `aria-expanded="true"`；
+ * - 面板经 portal 直挂 `document.body`，`role="dialog"`，直接子节点依次是 header、
+ *   分段条 div 与可选的明细 dl（`div > dt + dd` 结构）。
+ */
+/** 命中会话的上下文面板会被打上该属性，插件样式据此隐藏构成部分。 */
+export declare const CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE = "data-codingns-context-breakdown-hidden";
+/** 插件样式标签的幂等键。 */
+export declare const CONTEXT_BREAKDOWN_STYLE_ID = "codingns4dsh-context-breakdown-style";
+/** 对话根节点上承载当前会话 id 的 DSH 属性。 */
+export declare const CONTEXT_BREAKDOWN_CONVERSATION_ATTRIBUTE = "data-conversation-session";
+/** 默认隐藏构成明细的适配器：它们自己组装请求，启发式估算与真实上下文不同源。 */
+export declare const DEFAULT_CONTEXT_BREAKDOWN_HIDDEN_ADAPTERS: readonly string[];
+export interface ContextBreakdownDomController {
+    /** 显式触发一次重扫，例如适配器映射由外部刷新后。 */
+    refresh(): void;
+    /** 断开观察器、取消订阅并移除本轮标记。 */
+    dispose(): void;
+}
+export interface ContextBreakdownDomOptions {
+    readonly document?: Document;
+    readonly MutationObserver?: typeof MutationObserver;
+    /** 会话到适配器的解析；默认读取 Host 映射缓存。 */
+    readonly adapterIdForSession?: (sessionId: string) => string | undefined;
+    /** 需要隐藏构成明细的适配器，默认只有 codex。 */
+    readonly hiddenAdapterIds?: readonly string[];
+    /** 会话适配器未知时按需刷新映射；缺省则只依赖已有缓存。 */
+    readonly refreshAdapters?: () => void | Promise<void>;
+    readonly adapterRefreshIntervalMs?: number;
+    /** 时钟注入点，仅用于测试节流。 */
+    readonly now?: () => number;
+}
+/**
+ * 为上下文面板安装构成明细隐藏器。
+ *
+ * 打开面板时才需要判定所属会话，因此只观察 `body` 的直接子节点（portal 插入），
+ * 不跟踪面板内部重渲染；隐藏通过面板属性加插件样式实现，React 复用面板节点时
+ * 属性仍然有效。
+ */
+export declare function startContextBreakdownDom(options?: ContextBreakdownDomOptions): ContextBreakdownDomController;
+//# sourceMappingURL=context-breakdown-dom.d.ts.map

package/data/build/dist/client/context-breakdown-dom.js

@@ -0,0 +1,171 @@
+/**
+ * DSH 上下文面板（ContextMeter）的构成明细隐藏器。
+ *
+ * 面板同时展示两组不同来源的数字：百分比与 `~已用 / 窗口` 来自 Provider 上报的
+ * 真实用量，而「系统 / 工具 / 消息」三行明细与分段条来自 token-meter 对本地表面
+ * 的启发式估算。外部 Agent（codex 等）自己组装请求，它的系统提示、工具定义和
+ * 对话历史都不经过本地表面，两组数字因此天然对不上；`contextBreakdown` 投影又
+ * 是按定义全局注册的，无法只对某个会话关闭。这里在浏览器侧按会话隐藏构成部分，
+ * 只保留百分比与总量。
+ *
+ * 依赖的 DSH 0.2.0-rc.1 对话 DOM 契约（任何一条不成立都只是不生效，不影响其他
+ * 功能，也不会误改宿主界面）：
+ * - 对话根节点带 `data-conversation-session`；
+ * - 面板触发器是 `button[aria-haspopup="dialog"]`，展开时 `aria-expanded="true"`；
+ * - 面板经 portal 直挂 `document.body`，`role="dialog"`，直接子节点依次是 header、
+ *   分段条 div 与可选的明细 dl（`div > dt + dd` 结构）。
+ */
+import { sessionAdapterId, subscribeSessionAdapters } from './session-adapter-cache.js';
+/** 命中会话的上下文面板会被打上该属性，插件样式据此隐藏构成部分。 */
+export const CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE = 'data-codingns-context-breakdown-hidden';
+/** 插件样式标签的幂等键。 */
+export const CONTEXT_BREAKDOWN_STYLE_ID = 'codingns4dsh-context-breakdown-style';
+/** 对话根节点上承载当前会话 id 的 DSH 属性。 */
+export const CONTEXT_BREAKDOWN_CONVERSATION_ATTRIBUTE = 'data-conversation-session';
+/** 默认隐藏构成明细的适配器：它们自己组装请求，启发式估算与真实上下文不同源。 */
+export const DEFAULT_CONTEXT_BREAKDOWN_HIDDEN_ADAPTERS = ['codex'];
+/** 适配器未知时请求刷新映射的最小间隔，避免面板长时间停留时反复查询。 */
+const ADAPTER_REFRESH_INTERVAL_MS = 5_000;
+const CONTEXT_BREAKDOWN_STYLE_TEXT = `[${CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE}]>dl{display:none!important}`
+    + `[${CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE}]>div:nth-of-type(2){display:none!important}`;
+/**
+ * 为上下文面板安装构成明细隐藏器。
+ *
+ * 打开面板时才需要判定所属会话，因此只观察 `body` 的直接子节点（portal 插入），
+ * 不跟踪面板内部重渲染；隐藏通过面板属性加插件样式实现，React 复用面板节点时
+ * 属性仍然有效。
+ */
+export function startContextBreakdownDom(options = {}) {
+    const dom = options.document ?? (typeof document === 'undefined' ? undefined : document);
+    const Observer = options.MutationObserver
+        ?? (typeof MutationObserver === 'undefined' ? undefined : MutationObserver);
+    const adapterIdForSession = options.adapterIdForSession ?? sessionAdapterId;
+    const hiddenAdapterIds = new Set(options.hiddenAdapterIds ?? DEFAULT_CONTEXT_BREAKDOWN_HIDDEN_ADAPTERS);
+    const refreshAdapters = options.refreshAdapters;
+    const adapterRefreshIntervalMs = options.adapterRefreshIntervalMs ?? ADAPTER_REFRESH_INTERVAL_MS;
+    const now = options.now ?? (() => Date.now());
+    let disposed = false;
+    let scanQueued = false;
+    let lastAdapterRefresh = Number.NEGATIVE_INFINITY;
+    const scan = () => {
+        if (disposed || dom === undefined)
+            return;
+        const sessionId = openContextMeterSessionId(dom);
+        const adapterId = sessionId === undefined ? undefined : adapterIdForSession(sessionId);
+        const hideComposition = adapterId !== undefined && hiddenAdapterIds.has(adapterId);
+        for (const panel of contextMeterPanels(dom)) {
+            if (hideComposition)
+                panel.setAttribute(CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE, '');
+            else
+                panel.removeAttribute(CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE);
+        }
+        if (sessionId !== undefined && adapterId === undefined)
+            scheduleAdapterRefresh();
+    };
+    const scheduleScan = () => {
+        if (disposed || scanQueued)
+            return;
+        scanQueued = true;
+        queueMicrotask(() => {
+            scanQueued = false;
+            scan();
+        });
+    };
+    const scheduleAdapterRefresh = () => {
+        if (disposed || refreshAdapters === undefined)
+            return;
+        const timestamp = now();
+        if (timestamp - lastAdapterRefresh < adapterRefreshIntervalMs)
+            return;
+        lastAdapterRefresh = timestamp;
+        void (async () => {
+            try {
+                await refreshAdapters();
+            }
+            catch {
+                // 映射刷新失败时保持现状；下一次打开面板仍会按缓存判定。
+            }
+            if (!disposed)
+                scheduleScan();
+        })();
+    };
+    installContextBreakdownStyles(dom);
+    const observer = dom === undefined || Observer === undefined ? undefined : new Observer(scheduleScan);
+    const observeTarget = dom?.body ?? dom?.documentElement;
+    if (observer !== undefined && observeTarget !== undefined && observeTarget !== null) {
+        observer.observe(observeTarget, { childList: true });
+    }
+    const unsubscribe = subscribeSessionAdapters(scheduleScan);
+    scheduleScan();
+    return {
+        refresh: scheduleScan,
+        dispose() {
+            if (disposed)
+                return;
+            disposed = true;
+            observer?.disconnect();
+            unsubscribe();
+            if (dom === undefined)
+                return;
+            for (const panel of contextMeterPanels(dom))
+                panel.removeAttribute(CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE);
+        },
+    };
+}
+/** 返回当前展开着上下文面板的会话 id；没有展开的面板时返回 undefined。 */
+function openContextMeterSessionId(dom) {
+    for (const conversation of Array.from(dom.querySelectorAll(`[${CONTEXT_BREAKDOWN_CONVERSATION_ATTRIBUTE}]`))) {
+        const sessionId = conversation.getAttribute(CONTEXT_BREAKDOWN_CONVERSATION_ATTRIBUTE)?.trim();
+        if (sessionId === undefined || sessionId === '')
+            continue;
+        for (const button of Array.from(conversation.querySelectorAll('button'))) {
+            if (button.getAttribute('aria-haspopup') === 'dialog'
+                && button.getAttribute('aria-expanded') === 'true')
+                return sessionId;
+        }
+    }
+    return undefined;
+}
+/** 找出挂在 body 下、带构成明细的上下文面板。 */
+function contextMeterPanels(dom) {
+    const body = dom.body;
+    if (body === undefined || body === null)
+        return [];
+    const panels = [];
+    for (const child of Array.from(body.children)) {
+        if (child.getAttribute('role') !== 'dialog')
+            continue;
+        if (!hasCompositionDetails(child))
+            continue;
+        panels.push(child);
+    }
+    return panels;
+}
+/** 面板的明细是 `dl > div > dt + dd`；普通 `dl` 不会包一层 div。 */
+function hasCompositionDetails(panel) {
+    for (const child of Array.from(panel.children)) {
+        if (child.tagName !== 'DL')
+            continue;
+        for (const row of Array.from(child.children)) {
+            if (row.tagName !== 'DIV')
+                continue;
+            if (row.querySelector('dt') !== null && row.querySelector('dd') !== null)
+                return true;
+        }
+    }
+    return false;
+}
+/** 按 quick-phrase 的既有模式幂等注入插件样式。 */
+function installContextBreakdownStyles(dom) {
+    if (dom === undefined || dom.head === undefined || dom.head === null)
+        return;
+    const existing = Array.from(dom.head.children).some((child) => (child.tagName === 'STYLE' && child.dataset.pluginCss === CONTEXT_BREAKDOWN_STYLE_ID));
+    if (existing)
+        return;
+    const style = dom.createElement('style');
+    style.dataset.plugin = 'codingns4dsh';
+    style.dataset.pluginCss = CONTEXT_BREAKDOWN_STYLE_ID;
+    style.textContent = CONTEXT_BREAKDOWN_STYLE_TEXT;
+    dom.head.appendChild(style);
+}
+//# sourceMappingURL=context-breakdown-dom.js.map

package/data/build/dist/client/dsh-h5-bootstrap.js

@@ -203,7 +203,13 @@ export async function startDshH5BrowserBootstrap(options) {
         current.onClosed((error) => {
             if (stopped || current !== connection)
                 return;
-            debug.log('bootstrap.connection.closed', { generation, error: error?.message ?? 'closed' });
+            const reason = error ?? new Error('WebRTC connection closed');
+            debug.log('bootstrap.connection.closed', { generation, error: reason.message });
+            // 物理线路断开必须立刻让在途请求失败，而不是等重连流程再收尾：
+            // 中继页面上的原生设置 describe 只会一直停在 loading，表现成「模型」页
+            // 空白且没有任何报错，会话列表却因为重连成功而看起来正常。
+            transport.invalidateConnection(reason);
+            session?.close(reason.message);
             reconnectTimer = setTimeout(() => { reconnectTimer = undefined; void reconnect(); }, 50);
         });
     };

package/data/build/dist/client/features/cli-adapters.js

@@ -3,6 +3,8 @@ import { archiveCliSession, callCliRpc, errorMessage, listCliSessions, restoreCl
 import { dshFormRootStyle, dshPopupSurfaceStyle, dshSettingsButtonStyle, dshSettingsListRowStyle, dshThemeColor } from '../theme.js';
 import { useCodingNsTranslator } from '../locale.js';
 import { registerExternalToolStreamUi } from '../external-tool-stream.js';
+import { startContextBreakdownDom } from '../context-breakdown-dom.js';
+import { fetchSessionAdapters, replaceSessionAdapters, sessionAdapterId } from '../session-adapter-cache.js';
 /** 外部 Agent 集成模块。Agent 进程在 Host 运行，浏览器只读取目录和状态。 */
 export const cliAdaptersFeature = {
     descriptor: {
@@ -21,6 +23,15 @@ export const cliAdaptersFeature = {
         },
     },
     start: async (context) => {
+        // 外部 Agent 的上下文由 Agent 自己组装，上下文面板的启发式构成与真实用量
+        // 不同源；对这类适配器的会话隐藏构成明细，只保留百分比与总量。
+        const contextBreakdownDom = startContextBreakdownDom({
+            adapterIdForSession: sessionAdapterId,
+            refreshAdapters: async () => {
+                replaceSessionAdapters(await fetchSessionAdapters(context.services.rpc));
+            },
+        });
+        context.resources.add(() => contextBreakdownDom.dispose());
         const slots = context.services.slots;
         if (slots === undefined)
             return;

package/data/build/dist/client/features/index.d.ts

@@ -39,5 +39,6 @@ export { ReverseProxyPanel } from './reverse-proxy-panel.js';
 export { CliAdaptersPanel } from './cli-adapters.js';
 export { TerminalEnhancementPanel } from './terminal-enhancement-panel.js';
 export { WorkspaceSessionEnhancementPanel } from './workspace-session-enhancement-panel.js';
+export { SubscriptionUsageSettingsDialog } from './subscription-usage-panel.js';
 export type { CodingNsClientFeatureModule, CodingNsClientServices, CodingNsRpcClient, CodingNsRpcResult, FeaturePanelProps, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/data/build/dist/client/features/index.js

@@ -54,4 +54,5 @@ export { ReverseProxyPanel } from './reverse-proxy-panel.js';
 export { CliAdaptersPanel } from './cli-adapters.js';
 export { TerminalEnhancementPanel } from './terminal-enhancement-panel.js';
 export { WorkspaceSessionEnhancementPanel } from './workspace-session-enhancement-panel.js';
+export { SubscriptionUsageSettingsDialog } from './subscription-usage-panel.js';
 //# sourceMappingURL=index.js.map

package/data/build/dist/client/features/subscription-usage-panel.d.ts

@@ -0,0 +1,15 @@
+import type { ReactElement } from 'react';
+import type { FeaturePanelProps } from './types.js';
+/**
+ * 用量查询设置对话框：单次查询超时与自动查询间隔。
+ *
+ * 两项设置由 Host 统一下发给所有适配器读取器；Client 侧所有 Agent 共用同一个
+ * 自动刷新定时器与同一份结果缓存，不区分具体适配器。
+ */
+export declare function SubscriptionUsageSettingsDialog({ services, snapshot, notify, onClose }: {
+    readonly services: FeaturePanelProps['services'];
+    readonly snapshot: FeaturePanelProps['snapshot'];
+    readonly notify: FeaturePanelProps['notify'];
+    readonly onClose: () => void;
+}): ReactElement;
+//# sourceMappingURL=subscription-usage-panel.d.ts.map

package/data/build/dist/client/features/subscription-usage-panel.js

@@ -0,0 +1,117 @@
+import { createElement, useEffect, useState } from 'react';
+import { CODINGNS_SUBSCRIPTION_USAGE_FIELD, SUBSCRIPTION_USAGE_REFRESH_INTERVAL_MINS_LIMITS, SUBSCRIPTION_USAGE_TIMEOUT_SECS_LIMITS, normalizeSubscriptionUsageSettings, } from '../../shared/contracts/config.js';
+import { dshFieldStyle, dshPopupSurfaceStyle, dshSettingsButtonStyle, dshSettingsHelpStyle, dshSettingsListRowStyle, dshSettingsPrimaryButtonStyle, } from '../theme.js';
+import { useCodingNsTranslator } from '../locale.js';
+/**
+ * 用量查询设置对话框：单次查询超时与自动查询间隔。
+ *
+ * 两项设置由 Host 统一下发给所有适配器读取器；Client 侧所有 Agent 共用同一个
+ * 自动刷新定时器与同一份结果缓存，不区分具体适配器。
+ */
+export function SubscriptionUsageSettingsDialog({ services, snapshot, notify, onClose }) {
+    const t = useCodingNsTranslator(services.locale);
+    const value = normalizeSubscriptionUsageSettings(snapshot.value?.subscriptionUsage);
+    const disabled = snapshot.status === 'loading' || !snapshot.writable;
+    const [timeoutText, setTimeoutText] = useState(() => String(value.timeoutSecs));
+    const [intervalText, setIntervalText] = useState(() => String(value.refreshIntervalMins));
+    useEffect(() => {
+        const closeOnEscape = (event) => {
+            if (event.key === 'Escape')
+                onClose();
+        };
+        document.addEventListener('keydown', closeOnEscape);
+        return () => document.removeEventListener('keydown', closeOnEscape);
+    }, [onClose]);
+    const save = () => {
+        const next = normalizeSubscriptionUsageSettings({
+            timeoutSecs: Number(timeoutText),
+            refreshIntervalMins: Number(intervalText),
+        });
+        void services.settings.mutate([
+            { op: 'set', path: [CODINGNS_SUBSCRIPTION_USAGE_FIELD, 'timeoutSecs'], value: next.timeoutSecs },
+            { op: 'set', path: [CODINGNS_SUBSCRIPTION_USAGE_FIELD, 'refreshIntervalMins'], value: next.refreshIntervalMins },
+        ]).then((accepted) => {
+            if (!accepted) {
+                notify({ kind: 'error', message: t('settings.moduleWriteRejected') });
+                return;
+            }
+            notify({ kind: 'success', message: t('subscriptionUsage.saved') });
+            onClose();
+        }).catch((cause) => {
+            notify({ kind: 'error', message: cause instanceof Error ? cause.message : String(cause) });
+        });
+    };
+    return createElement('div', {
+        className: 'codingns4dsh-usage-settings-overlay',
+        role: 'presentation',
+        onPointerDown: onClose,
+        style: usageSettingsOverlayStyle,
+    }, createElement('div', {
+        role: 'dialog',
+        'aria-modal': true,
+        'aria-label': t('subscriptionUsage.dialogTitle'),
+        onPointerDown: (event) => event.stopPropagation(),
+        style: usageSettingsDialogStyle,
+    }, createElement('div', { style: { display: 'grid', gap: 4 } }, createElement('strong', { style: { fontSize: 14, lineHeight: 1.4 } }, t('subscriptionUsage.dialogTitle')), createElement('span', { style: dshSettingsHelpStyle }, t('subscriptionUsage.dialogHint'))), createElement(UsageQueryNumberField, {
+        label: t('subscriptionUsage.timeoutSecs'),
+        value: timeoutText,
+        min: SUBSCRIPTION_USAGE_TIMEOUT_SECS_LIMITS.min,
+        max: SUBSCRIPTION_USAGE_TIMEOUT_SECS_LIMITS.max,
+        disabled,
+        onChange: setTimeoutText,
+    }), createElement(UsageQueryNumberField, {
+        label: t('subscriptionUsage.refreshInterval'),
+        help: t('subscriptionUsage.refreshIntervalHint'),
+        value: intervalText,
+        min: SUBSCRIPTION_USAGE_REFRESH_INTERVAL_MINS_LIMITS.min,
+        max: SUBSCRIPTION_USAGE_REFRESH_INTERVAL_MINS_LIMITS.max,
+        disabled,
+        onChange: setIntervalText,
+    }), createElement('div', { style: { display: 'flex', justifyContent: 'flex-end', gap: 8, paddingTop: 4 } }, createElement('button', {
+        type: 'button',
+        onClick: onClose,
+        style: dshSettingsButtonStyle,
+    }, t('subscriptionUsage.cancel')), createElement('button', {
+        type: 'button',
+        disabled,
+        onClick: save,
+        style: dshSettingsPrimaryButtonStyle,
+    }, t('subscriptionUsage.save')))));
+}
+/** 整数输入行：文本受控，保存时统一夹取到合法区间。 */
+function UsageQueryNumberField({ label, help, value, min, max, disabled, onChange }) {
+    return createElement('div', { style: usageQueryNumberRowStyle }, createElement('span', { style: { minWidth: 0 } }, createElement('strong', { style: { display: 'block', fontSize: 13, lineHeight: 1.4 } }, label), help === undefined ? null : createElement('span', { style: { display: 'block', marginTop: 3, ...dshSettingsHelpStyle } }, help)), createElement('input', {
+        type: 'number',
+        min,
+        max,
+        step: 1,
+        'aria-label': label,
+        value,
+        disabled,
+        onChange: (event) => onChange(event.currentTarget.value),
+        style: usageQueryNumberInputStyle,
+    }));
+}
+const usageSettingsOverlayStyle = {
+    position: 'fixed',
+    inset: 0,
+    zIndex: 1400,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: 20,
+    boxSizing: 'border-box',
+    background: 'rgba(0, 0, 0, 0.35)',
+};
+const usageSettingsDialogStyle = {
+    ...dshPopupSurfaceStyle,
+    width: 'min(100%, 420px)',
+    boxSizing: 'border-box',
+    padding: 16,
+    borderRadius: 12,
+    display: 'grid',
+    gap: 12,
+};
+const usageQueryNumberRowStyle = { ...dshSettingsListRowStyle, justifyContent: 'space-between' };
+const usageQueryNumberInputStyle = { ...dshFieldStyle, flex: '0 0 auto', width: 110, minHeight: 32, boxSizing: 'border-box', padding: '5px 8px', borderRadius: 6, fontSize: 13 };
+//# sourceMappingURL=subscription-usage-panel.js.map

package/data/build/dist/client/features/workspace-session-enhancement-panel.js

@@ -1,10 +1,12 @@
-import { createElement } from 'react';
+import { createElement, useState } from 'react';
 import { CODINGNS_WORKSPACE_SESSION_ENHANCEMENT_FIELD, DEFAULT_WORKSPACE_SESSION_ENHANCEMENT_SETTINGS, } from '../../shared/contracts/config.js';
-import { dshFormRootStyle, dshSettingsHelpStyle, dshSettingsListRowStyle, dshThemeColor, } from '../theme.js';
+import { SubscriptionUsageSettingsDialog } from './subscription-usage-panel.js';
+import { dshFormRootStyle, dshSettingsButtonStyle, dshSettingsHelpStyle, dshSettingsListRowStyle, dshThemeColor, } from '../theme.js';
 import { useCodingNsTranslator } from '../locale.js';
 /** 工作区会话增强的单列设置面板。 */
 export function WorkspaceSessionEnhancementPanel({ services, enabled, snapshot, notify }) {
     const t = useCodingNsTranslator(services.locale);
+    const [usageSettingsOpen, setUsageSettingsOpen] = useState(false);
     const value = snapshot.value?.workspaceSessionEnhancement
         ?? DEFAULT_WORKSPACE_SESSION_ENHANCEMENT_SETTINGS;
     const disabled = !enabled || snapshot.status === 'loading' || !snapshot.writable;
@@ -53,8 +55,10 @@ export function WorkspaceSessionEnhancementPanel({ services, enabled, snapshot,
         disabled,
         onChange: (event) => updateSetting('showWorkspaceHiding', event.currentTarget.checked),
         style: { flex: '0 0 auto', accentColor: dshThemeColor.accent },
-    })), createElement('label', {
+    })), createElement('div', {
         style: dshSettingsListRowStyle,
+    }, createElement('label', {
+        style: { display: 'flex', alignItems: 'center', gap: 12, flex: '1 1 auto', minWidth: 0, cursor: 'pointer' },
     }, createElement('span', { style: { minWidth: 0 } }, createElement('strong', { style: { display: 'block', fontSize: 13, lineHeight: 1.4 } }, t('workspace.showSubscriptionUsage')), createElement('span', { style: { display: 'block', marginTop: 3, ...dshSettingsHelpStyle } }, t('workspace.subscriptionUsageDescription'))), createElement('input', {
         type: 'checkbox',
         role: 'switch',
@@ -63,7 +67,15 @@ export function WorkspaceSessionEnhancementPanel({ services, enabled, snapshot,
         disabled,
         onChange: (event) => updateSetting('showSubscriptionUsage', event.currentTarget.checked),
         style: { flex: '0 0 auto', accentColor: dshThemeColor.accent },
-    })), createElement('label', {
+    })), createElement('button', {
+        type: 'button',
+        'aria-haspopup': 'dialog',
+        'aria-expanded': usageSettingsOpen,
+        'aria-label': t('workspace.subscriptionUsageSettings'),
+        disabled,
+        onClick: () => setUsageSettingsOpen(true),
+        style: dshSettingsButtonStyle,
+    }, t('workspace.subscriptionUsageSettings'))), createElement('label', {
         style: dshSettingsListRowStyle,
     }, createElement('span', { style: { minWidth: 0 } }, createElement('strong', { style: { display: 'block', fontSize: 13, lineHeight: 1.4 } }, t('workspace.showArchivedSessions')), createElement('span', { style: { display: 'block', marginTop: 3, ...dshSettingsHelpStyle } }, t('workspace.archivedSessionsDescription'))), createElement('input', {
         type: 'checkbox',
@@ -93,6 +105,11 @@ export function WorkspaceSessionEnhancementPanel({ services, enabled, snapshot,
         disabled,
         onChange: (event) => updateSetting('rememberConversationRightbarRatio', event.currentTarget.checked),
         style: { flex: '0 0 auto', accentColor: dshThemeColor.accent },
-    })));
+    })), usageSettingsOpen && createElement(SubscriptionUsageSettingsDialog, {
+        services,
+        snapshot,
+        notify,
+        onClose: () => setUsageSettingsOpen(false),
+    }));
 }
 //# sourceMappingURL=workspace-session-enhancement-panel.js.map

package/data/build/dist/client/features/workspace-session-enhancement.js

@@ -1,4 +1,4 @@
-import { DEFAULT_WORKSPACE_SESSION_ENHANCEMENT_SETTINGS } from '../../shared/contracts/config.js';
+import { DEFAULT_WORKSPACE_SESSION_ENHANCEMENT_SETTINGS, normalizeSubscriptionUsageSettings } from '../../shared/contracts/config.js';
 import { clearSessionAdapters, fetchSessionAdapters, replaceSessionAdapters, } from '../session-adapter-cache.js';
 import { startWorkspaceSessionLogoDom } from '../workspace-session-logo-dom.js';
 import { startWorkspaceSessionArchiveDom } from '../workspace-session-archive-dom.js';
@@ -35,6 +35,7 @@ export const workspaceSessionEnhancementFeature = {
         let adapterRefreshTimer;
         let disposeSubscription;
         let disposeQuickPhrases;
+        let lastSubscriptionUsageSignature = null;
         const disableLogo = () => {
             generation += 1;
             logoDom?.dispose();
@@ -81,7 +82,8 @@ export const workspaceSessionEnhancementFeature = {
         const enableSubscription = () => {
             if (disposeSubscription !== undefined || context.services.slots === undefined)
                 return;
-            disposeSubscription = registerSubscriptionSlot(context.services.slots, context.services.rpc);
+            // 查询间隔对所有适配器统一生效：slot 内部的自动刷新定时器读取同一份设置。
+            disposeSubscription = registerSubscriptionSlot(context.services.slots, context.services.rpc, () => (normalizeSubscriptionUsageSettings(context.services.settings.getSnapshot().value?.subscriptionUsage).refreshIntervalMins));
         };
         const disableSubscription = () => {
             disposeSubscription?.();
@@ -168,6 +170,19 @@ export const workspaceSessionEnhancementFeature = {
                 enableRightbarMemory();
             else
                 disableRightbarMemory();
+            // 用量查询间隔变更后立即重挂 slot，让新间隔马上生效，而不是等下一次开关切换。
+            const subscriptionUsageSignature = JSON.stringify(context.services.settings.getSnapshot().value?.subscriptionUsage ?? null);
+            if (lastSubscriptionUsageSignature === null) {
+                lastSubscriptionUsageSignature = subscriptionUsageSignature;
+            }
+            else if (subscriptionUsageSignature !== lastSubscriptionUsageSignature) {
+                lastSubscriptionUsageSignature = subscriptionUsageSignature;
+                if (disposeSubscription !== undefined) {
+                    disableSubscription();
+                    if (showSubscriptionUsage)
+                        enableSubscription();
+                }
+            }
         };
         sync();
         const unsubscribe = context.services.settings.subscribe(sync);