@kenz1117/dsh-ui-usage-billing 1.2.8 → 1.3.0

package/lib/index.js

@@ -300,14 +300,35 @@ function isPeakHour(beijingHour) {
 */
 function tierAt(timeMs) {
 	if (timeMs === null || timeMs === void 0 || !Number.isFinite(timeMs)) return "peak";
+	return tierAtWithBounds(timeMs, TIER_BOUNDARY_MINUTES);
+}
+/** 按给定峰段边界判档：周末全天低谷；工作日分钟数落在任一 [b(i), b(i+1)) 峰段即为高峰。 */
+function tierAtWithBounds(timeMs, bounds) {
 	if (isBeijingWeekend(timeMs)) return "offPeak";
-	return isPeakHour((new Date(timeMs).getUTCHours() + 8) % 24) ? "peak" : "offPeak";
+	const minute = Math.floor(beijingMillisOfDay(timeMs) / 6e4);
+	for (let i = 0; i + 1 < bounds.length; i += 2) {
+		const start = bounds[i] ?? 0;
+		const end = bounds[i + 1] ?? 0;
+		if (minute >= start && minute < end) return "peak";
+	}
+	return "offPeak";
 }
 /** 时刻是否落在北京时间周末（周六/周日）。 */
 function isBeijingWeekend(timeMs) {
 	const day = new Date(timeMs + 8 * 36e5).getUTCDay();
 	return day === 0 || day === 6;
 }
+/** 峰谷切换边界（北京时间的当日分钟数）：09:00 / 12:00 / 14:00 / 18:00。 */
+const TIER_BOUNDARY_MINUTES = [
+	540,
+	720,
+	840,
+	1080
+];
+/** 北京时间的当日毫秒数（0–86,400,000）。 */
+function beijingMillisOfDay(timeMs) {
+	return ((timeMs + 8 * 36e5) % 864e5 + 864e5) % 864e5;
+}
 /**
 * Built-in catalog of current mainstream models as of 2026-08-16, priced from
 * each provider's official price page. Domestic providers are OpenAI-API

package/lib/types/client/live-cost.d.ts

@@ -26,6 +26,7 @@ export interface LiveStats {
     byTurn?: readonly {
         sessionId: string;
         turn: number;
+        model?: string;
         cost: number;
     }[];
 }
@@ -66,6 +67,14 @@ export declare function lowQuotaChips(quotas: readonly QuotaSlice[], threshold?:
     kind: string;
     pct: number;
 }[];
+/**
+ * 当前会话最近一轮的模型（峰谷窗口跟随它）：byTurn 里该会话轮次号最大的 model。
+ * 导出供测试：纯函数。
+ * @param stats - 薄统计切片。
+ * @param sessionId - 当前会话 id。
+ * @returns 该会话最近一轮的归因模型键；无轮次或轮行未带模型时 undefined。
+ */
+export declare function sessionModelOf(stats: LiveStats | null, sessionId: string | undefined): string | undefined;
 /** Props: the framework's session identity plus the owning dock's locale seat. */
 export interface LiveCostBarProps {
     /** Current Session identity supplied by the session-scope standard kit. */

package/lib/types/client/locales.d.ts

@@ -1,5 +1,5 @@
 /** Locale dictionaries for the usage billing surface. */
-export type UsageBillingKey = 'title' | 'cost' | 'todayCost' | 'monthCost' | 'yearCost' | 'monthProjected' | 'liveTurn' | 'liveSession' | 'calls' | 'cacheHitRate' | 'tokens' | 'inputTokens' | 'outputTokens' | 'avgCost' | 'kpiRange' | 'avgRangeToday' | 'avgRange7d' | 'avgRangeWeek' | 'avgRangeMonth' | 'avgRangeAll' | 'trend' | 'trend7d' | 'trend30d' | 'trendMetric' | 'trendMetricCost' | 'trendMetricTokens' | 'trendEmpty' | 'budget' | 'budgetRemain' | 'budgetAmount' | 'budgetSummary' | 'sessions' | 'sessionTitle' | 'lastActive' | 'sessionOverflow' | 'budgetTierBody' | 'models' | 'providerBilling' | 'channelUnknown' | 'actual' | 'pricing' | 'input' | 'output' | 'cacheHit' | 'peak' | 'offPeak' | 'flat' | 'band' | 'close' | 'footer' | 'footerCredit' | 'lastUpdated' | 'noData' | 'todayRate' | 'rateLive' | 'rateBuiltin' | 'promoBadge' | 'promoUntil' | 'promoOpenEnded' | 'pricingTip' | 'pricingUnit' | 'pricingNotes' | 'ubPeak' | 'ubOff' | 'ubStd' | 'peakBand' | 'pricingSource' | 'noteCache' | 'noteBand' | 'noteSource' | 'balance' | 'recharge' | 'rechargeHint' | 'balanceUnconfigured' | 'balanceUnauthorized' | 'balanceUnreachable' | 'uncatalogued' | 'estimatedPricing' | 'balanceDays' | 'balanceLowBody' | 'reconcileDrift' | 'reconcileDismiss' | 'subscriptionNotConfigured' | 'subscriptionUnauthorized' | 'subscriptionUnavailable' | 'subscriptionInvalid' | 'subscriptionRateLimited' | 'subscriptionSession' | 'subscriptionWeekly' | 'subscriptionMonthly' | 'subscriptionBilling' | 'subscriptionRemaining' | 'subscriptionExhausted' | 'subscriptionReset' | 'subscriptionNoApi' | 'floatWindow' | 'floatModeCombined' | 'floatModeSubscription' | 'floatMode' | 'floatTargets' | 'floatWindowHint' | 'floatPrimaryToday' | 'floatPrimaryWeek' | 'floatPrimaryMonth' | 'floatNoTargets' | 'floatNoTargetsHint' | 'cardDisplay' | 'cardDisplayHint' | 'cardMetric' | 'cardMetricMoney' | 'cardMetricTokens' | 'cardSpan' | 'cardSpanDay' | 'cardSpanWeek' | 'cardSpanMonth' | 'triggerMonthTokens' | 'triggerTodayTokens' | 'triggerWeekTokens' | 'subscriptionsStale' | 'staleLedgerNotice' | 'tokenCacheWrite' | 'toolRank' | 'toolName' | 'userPrices' | 'userPricesHint' | 'userPriceSave' | 'userPriceModel' | 'userPriceSource' | 'userPriceSourceHint' | 'userPriceOffPeak' | 'userPriceNormal' | 'userPriceCurrency' | 'userPriceAdd' | 'userPriceRemoveSelected' | 'userPriceSelect' | 'sessionStaleBadge' | 'sessionUntitled' | 'heatmapLess' | 'heatmapMore' | 'currency' | 'currencyCny' | 'currencyUsd' | 'heatmap' | 'rounds' | 'roundsHint' | 'anomaly' | 'model' | 'thModel' | 'thInputMiss' | 'thInputHit' | 'costAbbr' | 'tabOverview' | 'tabTrends' | 'tabProviders' | 'tabPricing' | 'tabSettings' | 'budgetHint' | 'peakAlertHint' | 'peakAlertDescPeak' | 'peakAlertDescOff' | 'export' | 'exportCsvDay' | 'exportCsvSession' | 'exportJson' | 'peakShare' | 'peakSharePerCall' | 'offPeakSavings' | 'perfMax' | 'weekCost' | 'roleCost' | 'roleUser' | 'roleAssistant' | 'roleTool' | 'roleHint' | 'tierPeak' | 'tierOff' | 'tierToPeak' | 'tierToOff' | 'tierAlertEnterPeak' | 'tierAlertEnterOff' | 'peakAlertTitlePeak' | 'peakAlertTitleOff' | 'peakAlert' | 'peakAlertLeadMin' | 'peakAlertPos' | 'peakAlertMode' | 'peakAlertPosCorner' | 'peakAlertPosCenter' | 'peakAlertModePeak' | 'peakAlertModeOff' | 'peakAlertModeBoth' | 'peakAlertWebNotify' | 'peakAlertPreview' | 'planTypeCode' | 'planTypeToken' | 'subscriptionFeePerMonth' | 'triggerToday' | 'triggerMonth' | 'subscriptionTag' | 'free' | 'perfSamples' | 'perfTtft' | 'perfP50' | 'perfP90' | 'perfTps' | 'perfLatency' | 'perfEstimated' | 'perfEmpty' | 'perfTpsUnit' | 'perfTitle' | 'perfHint' | 'perfAll' | 'perfChartEmpty' | 'heatmapYear' | 'heatmapMonth' | 'activeDays' | 'streakDays' | 'subscriptionAutoDetect' | 'pluginAuthor' | 'pluginRepository' | 'pluginNpm' | 'pluginLicense' | 'tabToken' | 'tokenExport' | 'tokenExportCsv' | 'tokenReasoningShare' | 'tokenReasoningShort' | 'tokenIo' | 'tokenPeak' | 'tokenDaily' | 'tokenByModel' | 'tokenMiss' | 'tokenHit' | 'tokenOutput' | 'tokenViewStructure' | 'tokenViewModel' | 'tokenHitShort' | 'tokenMissShort' | 'tokenTotal' | 'tokenShare' | 'usageStatsTool' | 'usageStatsToolHint' | 'balanceGranted' | 'balanceTopped' | 'balanceDaily' | 'balanceDaysLong' | 'balanceDaysUnit' | 'popTodayModel' | 'popNoConsumption' | 'popTitle' | 'popDirectLead' | 'popSubLead' | 'unpricedHint' | 'searchEstimateHint' | 'siteListDisplay' | 'siteListDisplayHint' | 'liveCostBar' | 'liveCostBarHint' | 'liveCostBarPosition' | 'liveCostBarPosBelow' | 'liveCostBarPosAbove' | 'liveCostBarPosToolbar' | 'exportCsvSite' | 'panelRelayQuota' | 'relayBalance' | 'relayNoQuota' | 'relayWindowUsed' | 'relayKindNewApi' | 'relayKindSub2Api' | 'relayKindUnknown';
+export type UsageBillingKey = 'title' | 'cost' | 'todayCost' | 'monthCost' | 'yearCost' | 'monthProjected' | 'liveTurn' | 'liveSession' | 'calls' | 'cacheHitRate' | 'tokens' | 'inputTokens' | 'outputTokens' | 'avgCost' | 'kpiRange' | 'avgRangeToday' | 'avgRange7d' | 'avgRangeWeek' | 'avgRangeMonth' | 'avgRangeAll' | 'trend' | 'trend7d' | 'trend30d' | 'trendMetric' | 'trendMetricCost' | 'trendMetricTokens' | 'trendEmpty' | 'budget' | 'budgetRemain' | 'budgetAmount' | 'budgetSummary' | 'sessions' | 'sessionTitle' | 'lastActive' | 'sessionOverflow' | 'budgetTierBody' | 'models' | 'providerBilling' | 'channelUnknown' | 'directTag' | 'relayTag' | 'unknownTag' | 'planCountUnit' | 'actual' | 'pricing' | 'input' | 'output' | 'cacheHit' | 'peak' | 'offPeak' | 'flat' | 'band' | 'close' | 'footer' | 'footerCredit' | 'lastUpdated' | 'noData' | 'todayRate' | 'rateLive' | 'rateBuiltin' | 'promoBadge' | 'promoUntil' | 'promoOpenEnded' | 'pricingTip' | 'pricingUnit' | 'pricingNotes' | 'ubPeak' | 'ubOff' | 'ubStd' | 'peakBand' | 'pricingSource' | 'noteCache' | 'noteBand' | 'noteSource' | 'balance' | 'recharge' | 'rechargeHint' | 'balanceUnconfigured' | 'balanceUnauthorized' | 'balanceUnreachable' | 'uncatalogued' | 'estimatedPricing' | 'balanceDays' | 'balanceLowBody' | 'reconcileDrift' | 'reconcileDismiss' | 'subscriptionNotConfigured' | 'subscriptionUnauthorized' | 'subscriptionUnavailable' | 'subscriptionInvalid' | 'subscriptionRateLimited' | 'subscriptionSession' | 'subscriptionWeekly' | 'subscriptionMonthly' | 'subscriptionBilling' | 'subscriptionRemaining' | 'subscriptionExhausted' | 'subscriptionReset' | 'subscriptionNoApi' | 'floatWindow' | 'floatModeCombined' | 'floatModeSubscription' | 'floatMode' | 'floatTargets' | 'floatWindowHint' | 'floatPrimaryToday' | 'floatPrimaryWeek' | 'floatPrimaryMonth' | 'floatNoTargets' | 'floatNoTargetsHint' | 'cardDisplay' | 'cardDisplayHint' | 'cardMetric' | 'cardMetricMoney' | 'cardMetricTokens' | 'cardSpan' | 'cardSpanDay' | 'cardSpanWeek' | 'cardSpanMonth' | 'triggerMonthTokens' | 'triggerTodayTokens' | 'triggerWeekTokens' | 'subscriptionsStale' | 'staleLedgerNotice' | 'tokenCacheWrite' | 'toolRank' | 'toolName' | 'userPrices' | 'userPricesHint' | 'userPriceSave' | 'userPriceModel' | 'userPriceSource' | 'userPriceSourceHint' | 'userPriceOffPeak' | 'userPriceNormal' | 'userPriceCurrency' | 'userPriceAdd' | 'userPriceRemoveSelected' | 'userPriceSelect' | 'sessionStaleBadge' | 'sessionUntitled' | 'heatmapLess' | 'heatmapMore' | 'currency' | 'currencyCny' | 'currencyUsd' | 'heatmap' | 'rounds' | 'roundsHint' | 'anomaly' | 'model' | 'thModel' | 'thInputMiss' | 'thInputHit' | 'costAbbr' | 'tabOverview' | 'tabTrends' | 'tabProviders' | 'tabPricing' | 'tabSettings' | 'budgetHint' | 'peakAlertHint' | 'peakAlertDescPeak' | 'peakAlertDescOff' | 'peakAlertDescPeakZhipu' | 'peakAlertDescOffZhipu' | 'export' | 'exportCsvDay' | 'exportCsvSession' | 'exportJson' | 'peakShare' | 'peakSharePerCall' | 'offPeakSavings' | 'perfMax' | 'weekCost' | 'roleCost' | 'roleUser' | 'roleAssistant' | 'roleTool' | 'roleHint' | 'tierPeak' | 'tierOff' | 'tierToPeak' | 'tierToOff' | 'tierAlertEnterPeak' | 'tierAlertEnterOff' | 'tierAlertEnterPeakZhipu' | 'tierAlertEnterOffZhipu' | 'peakAlertTitlePeak' | 'peakAlertTitleOff' | 'peakAlert' | 'peakAlertLeadMin' | 'peakAlertPos' | 'peakAlertMode' | 'peakAlertPosCorner' | 'peakAlertPosCenter' | 'peakAlertModePeak' | 'peakAlertModeOff' | 'peakAlertModeBoth' | 'peakAlertWebNotify' | 'peakAlertPreview' | 'planTypeCode' | 'planTypeToken' | 'subscriptionFeePerMonth' | 'triggerToday' | 'triggerMonth' | 'subscriptionTag' | 'free' | 'perfSamples' | 'perfTtft' | 'perfP50' | 'perfP90' | 'perfTps' | 'perfLatency' | 'perfEstimated' | 'perfEmpty' | 'perfTpsUnit' | 'perfTitle' | 'perfHint' | 'perfAll' | 'perfChartEmpty' | 'heatmapYear' | 'heatmapMonth' | 'activeDays' | 'streakDays' | 'subscriptionAutoDetect' | 'pluginAuthor' | 'pluginRepository' | 'pluginNpm' | 'pluginLicense' | 'tabToken' | 'tokenExport' | 'tokenExportCsv' | 'tokenReasoningShare' | 'tokenReasoningShort' | 'tokenIo' | 'tokenPeak' | 'tokenDaily' | 'tokenByModel' | 'tokenMiss' | 'tokenHit' | 'tokenOutput' | 'tokenViewStructure' | 'tokenViewModel' | 'tokenHitShort' | 'tokenMissShort' | 'tokenTotal' | 'tokenShare' | 'usageStatsTool' | 'usageStatsToolHint' | 'balanceGranted' | 'balanceTopped' | 'balanceDaily' | 'balanceDaysLong' | 'balanceDaysUnit' | 'popTodayModel' | 'popNoConsumption' | 'popTitle' | 'popDirectLead' | 'popSubLead' | 'unpricedHint' | 'searchEstimateHint' | 'siteListDisplay' | 'siteListDisplayHint' | 'liveCostBar' | 'liveCostBarHint' | 'liveCostBarPosition' | 'liveCostBarPosBelow' | 'liveCostBarPosAbove' | 'liveCostBarPosToolbar' | 'exportCsvSite' | 'panelRelayQuota' | 'relayBalance' | 'relayNoQuota' | 'relayWindowUsed' | 'relayKindNewApi' | 'relayKindSub2Api' | 'relayKindUnknown';
 export declare const NS = "usageBilling";
 export declare const zh: Record<UsageBillingKey, string>;
 export declare const en: Record<UsageBillingKey, string>;

package/lib/types/client/peak-alert.d.ts

@@ -6,7 +6,7 @@
  * （默认关闭，用户到面板设置开启）；「同一切换点只提醒一次」由 budget store 的
  * `lastTierSwitchAt` 承担（与原系统通知共用一份去重，避免一条切换提醒弹两次）。
  */
-import { type PriceTierId } from './pricing.ts';
+import { type PriceTierId, type RateChannel } from './pricing.ts';
 /** 提醒模式：只提醒进入峰时 / 只提醒进入平价 / 峰与谷都提醒。 */
 export type PeakAlertMode = 'peak' | 'offPeak' | 'both';
 /** 浮层位置：右下角 / 屏幕居中。 */
@@ -28,22 +28,26 @@ export interface PeakAlertConfig {
 export declare const PEAK_ALERT_KEY = "dsh-billing-peak-alert-v1";
 /** 默认配置：关、2 分钟提前、右下角、开系统通知、峰与谷都提醒。 */
 export declare const DEFAULT_PEAK_ALERT_CONFIG: PeakAlertConfig;
-/** 一次命中：即将进入的档位与该切换时刻。 */
+/** 一次命中：即将进入的档位、该切换时刻与命中的计费通道（决定文案口径）。 */
 export interface PeakAlertHit {
     entering: PriceTierId;
     atMs: number;
+    channel: RateChannel;
 }
 /** 读取本地偏好（缺失/损坏回退默认，字段宽松校验）。 */
 export declare function loadPeakAlertConfig(): PeakAlertConfig;
 /** 保存偏好；存储失败静默（降级为关闭，不影响其它能力）。 */
 export declare function savePeakAlertConfig(config: PeakAlertConfig): void;
 /**
- * 计算是否需要提醒：已启用、距切换不足提前量、按模式过滤、且该切换点未提醒过。
+ * 计算是否需要提醒：已启用、当前计费通道有峰谷窗口、距切换不足提前量、按模式过滤、
+ * 且该切换点未提醒过。通道由调用方按「当前会话最近一轮的模型 + 订阅状态」推导
+ * （rateChannelOf）；none（模型不涉及峰谷）恒不提醒。
  * 导出供测试：纯函数。
  * @param nowMs - 当前时刻（epoch 毫秒）。
  * @param config - 峰谷提醒偏好。
  * @param lastAlertedAt - 上次提醒过的切换点时刻（budget store 的 lastTierSwitchAt）；同点跳过。
- * @returns 命中（含即将进入的档位与切换时刻），否则 null。
+ * @param channel - 当前会话模型的计费通道；none 直接返回 null。
+ * @returns 命中（含即将进入的档位、切换时刻与通道），否则 null。
  */
-export declare function computePeakAlert(nowMs: number, config: PeakAlertConfig, lastAlertedAt: number): PeakAlertHit | null;
+export declare function computePeakAlert(nowMs: number, config: PeakAlertConfig, lastAlertedAt: number, channel: RateChannel): PeakAlertHit | null;
 //# sourceMappingURL=peak-alert.d.ts.map

package/lib/types/client/pricing.d.ts

@@ -204,6 +204,28 @@ export declare function upcomingTierSwitch(nowMs: number, leadMs: number): {
     entering: PriceTierId;
     atMs: number;
 } | null;
+/** 计费通道的峰谷窗口：无窗口 / DeepSeek 按量分时 / 智谱 Coding Plan 积分分时。 */
+export type RateChannel = 'none' | 'deepseek-metered' | 'zhipu-coding-plan';
+/**
+ * 由会话当前模型与订阅状态推断峰谷窗口。DeepSeek 目录模型恒为按量分时；
+ * 智谱模型仅在持有 Z.ai Coding Plan（status ok）时适用积分分时——智谱按量价
+ * 全天统一，不涉及峰谷。其余模型（含未收录）返回 none：不显示档位、不提醒，
+ * 峰谷提示严格跟随当前对话实际使用的模型而非全局规则。
+ * @param modelKey - 当前会话最近一轮的计费目录键（归因模型 key）；无轮次时 undefined。
+ * @param hasZhipuPlan - 是否存在状态正常的 Z.ai Coding Plan 订阅。
+ * @returns 命中的峰谷窗口种类。
+ */
+export declare function rateChannelOf(modelKey: string | undefined, hasZhipuPlan: boolean): RateChannel;
+/** 按计费通道的峰谷倒计时：none 返回 null（调用方据此隐藏档位 UI 与切换预告）。 */
+export declare function channelCountdown(nowMs: number, channel: RateChannel): {
+    tier: PriceTierId;
+    nextSwitchInMs: number;
+} | null;
+/** 按计费通道的切换预告：语义同 upcomingTierSwitch，窗口取自通道；none 恒 null。 */
+export declare function channelUpcomingSwitch(nowMs: number, channel: RateChannel, leadMs: number): {
+    entering: PriceTierId;
+    atMs: number;
+} | null;
 /**
  * 切换倒计时短格式：`1h23m` / `45m` / `3m`。导出供测试：纯函数。
  * @param ms - 剩余毫秒数。

package/lib/types/client/provider-display.d.ts

@@ -24,5 +24,11 @@ export declare function hasCjk(name: string): boolean;
  * @returns 未知路由桶返回 undefined（渲染层用 locale 文案兜底）。
  */
 export declare function channelDisplayName(siteKey: string, lang?: ProviderLang): string | undefined;
+/**
+ * 拆 direct 通道显示名的「直连 · X」前缀，返回路由名 X。
+ * @param displayName - channelDisplayName 的产物；官方直连（DeepSeek 官方）等非 direct 前缀名不匹配。
+ * @returns 非 direct 前缀名返回 undefined，调用方整名显示。
+ */
+export declare function directChannelRoute(displayName: string): string | undefined;
 export {};
 //# sourceMappingURL=provider-display.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kenz1117/dsh-ui-usage-billing",
   "description": "Usage billing dashboard for DeepSeek Harness: sidebar cost metrics plus a full dashboard modal, priced from a current multi-provider catalog with real usage aggregated from session logs.",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "keywords": [
     "deepseek-harness",
     "deepseek",