@kenz1117/dsh-ui-usage-billing 0.9.0 → 0.9.2

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

@@ -1,5 +1,5 @@
 /** Locale dictionaries for the usage billing surface. */
-export type UsageBillingKey = 'billing.title' | 'billing.subtitle' | 'billing.cost' | 'billing.todayCost' | 'billing.monthCost' | 'billing.yearCost' | 'billing.monthProjected' | 'billing.liveTurn' | 'billing.liveSession' | 'billing.totalCost' | 'billing.calls' | 'billing.cacheHitRate' | 'billing.tokens' | 'billing.inputTokens' | 'billing.outputTokens' | 'billing.avgCost' | 'billing.trend' | 'billing.trend7d' | 'billing.trend30d' | 'billing.trendEmpty' | 'billing.budget' | 'billing.sessions' | 'billing.project' | 'billing.lastActive' | 'billing.sessionOverflow' | 'billing.budgetTierBody' | 'billing.models' | 'billing.providerBilling' | 'billing.estimated' | 'billing.actual' | 'billing.pricing' | 'billing.showPricing' | 'billing.hidePricing' | 'billing.pricePerM' | 'billing.input' | 'billing.output' | 'billing.cacheHit' | 'billing.peak' | 'billing.offPeak' | 'billing.flat' | 'billing.peakHours' | 'billing.band' | 'billing.openDashboard' | 'billing.close' | 'billing.lastUpdated' | 'billing.noData' | 'billing.todayRate' | 'billing.rateLive' | 'billing.rateBuiltin' | 'billing.balance' | 'billing.balanceUnconfigured' | 'billing.balanceUnauthorized' | 'billing.balanceUnreachable' | 'billing.uncatalogued' | 'billing.estimatedPricing' | 'billing.balanceDays' | 'billing.balanceLowBody' | 'billing.subscriptions' | 'billing.subscriptionNotConfigured' | 'billing.subscriptionUnauthorized' | 'billing.subscriptionUnavailable' | 'billing.subscriptionInvalid' | 'billing.subscriptionRateLimited' | 'billing.subscriptionSession' | 'billing.subscriptionWeekly' | 'billing.subscriptionMonthly' | 'billing.subscriptionBilling' | 'billing.subscriptionRemaining' | 'billing.subscriptionExhausted' | 'billing.subscriptionReset' | 'billing.subscriptionNoApi' | 'billing.heatmapLess' | 'billing.heatmapMore' | 'billing.currency' | 'billing.currencyCny' | 'billing.currencyUsd' | 'billing.heatmap' | 'billing.rounds' | 'billing.anomaly' | 'billing.workspaces' | 'billing.plan' | 'billing.remaining' | 'billing.unknownModel' | 'billing.model' | 'billing.currentRound' | 'billing.costAbbr' | 'billing.tabOverview' | 'billing.tabTrends' | 'billing.tabProviders' | 'billing.tabDetails' | 'billing.tabPricing' | 'billing.export' | 'billing.exportCsvDay' | 'billing.exportCsvSession' | 'billing.exportJson' | 'billing.peakShare' | 'billing.peakShareHint' | 'billing.weekCost' | 'billing.roleCost' | 'billing.roleUser' | 'billing.roleAssistant' | 'billing.roleTool' | 'billing.roleHint' | 'billing.tierPeak' | 'billing.tierOff' | 'billing.tierToPeak' | 'billing.tierToOff' | 'billing.tierAlertEnterPeak' | 'billing.tierAlertEnterOff' | 'billing.planTypeCode' | 'billing.planTypeToken' | 'billing.subscriptionFeePerMonth';
+export type UsageBillingKey = 'billing.title' | 'billing.subtitle' | 'billing.cost' | 'billing.todayCost' | 'billing.monthCost' | 'billing.yearCost' | 'billing.monthProjected' | 'billing.liveTurn' | 'billing.liveSession' | 'billing.totalCost' | 'billing.calls' | 'billing.cacheHitRate' | 'billing.tokens' | 'billing.inputTokens' | 'billing.outputTokens' | 'billing.avgCost' | 'billing.trend' | 'billing.trend7d' | 'billing.trend30d' | 'billing.trendEmpty' | 'billing.budget' | 'billing.sessions' | 'billing.project' | 'billing.lastActive' | 'billing.sessionOverflow' | 'billing.budgetTierBody' | 'billing.models' | 'billing.providerBilling' | 'billing.estimated' | 'billing.actual' | 'billing.pricing' | 'billing.showPricing' | 'billing.hidePricing' | 'billing.pricePerM' | 'billing.input' | 'billing.output' | 'billing.cacheHit' | 'billing.peak' | 'billing.offPeak' | 'billing.flat' | 'billing.peakHours' | 'billing.band' | 'billing.openDashboard' | 'billing.close' | 'billing.lastUpdated' | 'billing.noData' | 'billing.todayRate' | 'billing.rateLive' | 'billing.rateBuiltin' | 'billing.pricingTip' | 'billing.balance' | 'billing.balanceUnconfigured' | 'billing.balanceUnauthorized' | 'billing.balanceUnreachable' | 'billing.uncatalogued' | 'billing.estimatedPricing' | 'billing.balanceDays' | 'billing.balanceLowBody' | 'billing.subscriptions' | 'billing.subscriptionNotConfigured' | 'billing.subscriptionUnauthorized' | 'billing.subscriptionUnavailable' | 'billing.subscriptionInvalid' | 'billing.subscriptionRateLimited' | 'billing.subscriptionSession' | 'billing.subscriptionWeekly' | 'billing.subscriptionMonthly' | 'billing.subscriptionBilling' | 'billing.subscriptionRemaining' | 'billing.subscriptionExhausted' | 'billing.subscriptionReset' | 'billing.subscriptionNoApi' | 'billing.heatmapLess' | 'billing.heatmapMore' | 'billing.currency' | 'billing.currencyCny' | 'billing.currencyUsd' | 'billing.heatmap' | 'billing.rounds' | 'billing.anomaly' | 'billing.workspaces' | 'billing.plan' | 'billing.remaining' | 'billing.unknownModel' | 'billing.model' | 'billing.currentRound' | 'billing.costAbbr' | 'billing.tabOverview' | 'billing.tabTrends' | 'billing.tabProviders' | 'billing.tabDetails' | 'billing.tabPricing' | 'billing.tabSettings' | 'billing.settingsHead' | 'billing.settingsHint' | 'billing.budgetHint' | 'billing.peakAlertHint' | 'billing.peakAlertDescPeak' | 'billing.peakAlertDescOff' | 'billing.export' | 'billing.exportCsvDay' | 'billing.exportCsvSession' | 'billing.exportJson' | 'billing.peakShare' | 'billing.peakShareHint' | 'billing.weekCost' | 'billing.roleCost' | 'billing.roleUser' | 'billing.roleAssistant' | 'billing.roleTool' | 'billing.roleHint' | 'billing.tierPeak' | 'billing.tierOff' | 'billing.tierToPeak' | 'billing.tierToOff' | 'billing.tierAlertEnterPeak' | 'billing.tierAlertEnterOff' | 'billing.peakAlertTitlePeak' | 'billing.peakAlertTitleOff' | 'billing.peakAlert' | 'billing.peakAlertLeadMin' | 'billing.peakAlertPosCorner' | 'billing.peakAlertPosCenter' | 'billing.peakAlertModePeak' | 'billing.peakAlertModeOff' | 'billing.peakAlertModeBoth' | 'billing.peakAlertWebNotify' | 'billing.peakAlertPreview' | 'billing.planTypeCode' | 'billing.planTypeToken' | 'billing.subscriptionFeePerMonth' | 'billing.triggerToday' | 'billing.triggerMonth' | 'billing.subscriptionIncluded' | 'billing.free' | 'billing.official' | 'billing.thirdParty' | 'billing.officialCost' | 'billing.thirdPartyCost';
 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

@@ -0,0 +1,49 @@
+/**
+ * 峰谷切换提醒（增强版）纯逻辑：偏好持久化 + 切档前命中判定。
+ *
+ * 参照 dsh-cost-meter 的 peak/off-peak 提醒：在距下次「进入峰时 / 进入平价」
+ * 不足提前量时，弹可视化色条浮层 + 可选的系统通知。偏好经 localStorage 持久化
+ * （默认关闭，用户到面板设置开启）；「同一切换点只提醒一次」由 budget store 的
+ * `lastTierSwitchAt` 承担（与原系统通知共用一份去重，避免一条切换提醒弹两次）。
+ */
+import { type PriceTierId } from './pricing.ts';
+/** 提醒模式：只提醒进入峰时 / 只提醒进入平价 / 峰与谷都提醒。 */
+export type PeakAlertMode = 'peak' | 'offPeak' | 'both';
+/** 浮层位置：右下角 / 屏幕居中。 */
+export type PeakAlertPosition = 'bottom-right' | 'center';
+/** 峰谷提醒偏好。 */
+export interface PeakAlertConfig {
+    /** 总开关：关 = 既不浮层也不系统通知。 */
+    enabled: boolean;
+    /** 提前量（分钟）；1–30。 */
+    leadMin: number;
+    /** 浮层位置。 */
+    position: PeakAlertPosition;
+    /** 是否同步发浏览器系统通知（Notification 授权后生效）。 */
+    webNotify: boolean;
+    /** 提醒模式。 */
+    mode: PeakAlertMode;
+}
+/** 配置持久化 key。 */
+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;
+}
+/** 读取本地偏好（缺失/损坏回退默认，字段宽松校验）。 */
+export declare function loadPeakAlertConfig(): PeakAlertConfig;
+/** 保存偏好；存储失败静默（降级为关闭，不影响其它能力）。 */
+export declare function savePeakAlertConfig(config: PeakAlertConfig): void;
+/**
+ * 计算是否需要提醒：已启用、距切换不足提前量、按模式过滤、且该切换点未提醒过。
+ * 导出供测试：纯函数。
+ * @param nowMs - 当前时刻（epoch 毫秒）。
+ * @param config - 峰谷提醒偏好。
+ * @param lastAlertedAt - 上次提醒过的切换点时刻（budget store 的 lastTierSwitchAt）；同点跳过。
+ * @returns 命中（含即将进入的档位与切换时刻），否则 null。
+ */
+export declare function computePeakAlert(nowMs: number, config: PeakAlertConfig, lastAlertedAt: number): PeakAlertHit | null;
+//# sourceMappingURL=peak-alert.d.ts.map

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

@@ -8,9 +8,10 @@
  * through the exchange rate, never domestic ones.
  *
  * Google-style two-band billing is modeled per model: Gemini's Flex tier
- * prices spare-capacity traffic at -50%; DeepSeek V4 splits peak
- * (09:00-12:00 / 14:00-18:00 Beijing) at 2x the off-peak rate. The estimator
- * mixes both bands by a configured peak share ({@link DEFAULT_PEAK_SHARE}).
+ * prices spare-capacity traffic at -50%; DeepSeek splits peak
+ * (weekdays 09:00-12:00 / 14:00-18:00 Beijing) at 2x the off-peak rate —
+ * weekends (Sat/Sun, Beijing) are charged at the off-peak rate all day.
+ * The estimator mixes both bands by a configured peak share ({@link DEFAULT_PEAK_SHARE}).
  */
 import type { LivePricing } from '../pricing-shared.ts';
 /**
@@ -58,13 +59,15 @@ export type PriceTierId = 'peak' | 'offPeak';
 /** 成本显示币种：人民币（国内模型直价）/ 美元（国外模型直价或换算显示）。 */
 export type CostCurrency = 'cny' | 'usd';
 /**
- * 高峰时段判定（北京时间，UTC+8，无夏令时）：09:00–12:00、14:00–18:00。
+ * 工作日高峰时段判定（北京时间，UTC+8，无夏令时）：09:00–12:00、14:00–18:00。
+ * 周末（周六/周日）北京全天为低谷，不调用本函数判定峰/平。
  * @param beijingHour - 北京时间的小时数（0–23）。
  */
 export declare function isPeakHour(beijingHour: number): boolean;
 /**
  * 由时刻（epoch 毫秒）推断计费时段；时刻未知/非法时按高峰计（保守：未知
  * 时刻不低估成本，与社区 dsh-usage-chart 的 tierAt 语义一致）。
+ * 周末（北京时间周六/周日）全天不区分峰谷，统一按低谷价。
  * @param timeMs - Unix epoch 毫秒；null/undefined/NaN 视为未知。
  */
 export declare function tierAt(timeMs: number | null | undefined): PriceTierId;
@@ -166,6 +169,23 @@ export declare const MODEL_CATALOG: readonly ModelEntry[];
  * 解析，两侧共用一份映射，避免同一模型两侧不一致导致「未收录」。
  */
 export declare const MODEL_KEY_ALIASES: Readonly<Record<string, string>>;
+/**
+ * 模型 id 归一化：小写、去括号附注（如 `gpt5.6 luna(go)` 只看主体）、再去所有
+ * 非字母数字分隔符（空格 / 横杠 / 点 / 下划线）。用于日志里的模型 id 与计费
+ * 目录键做宽松匹配，提升「大小写/分隔符差异导致未收录」的识别率。
+ * @param id - 原始模型 id（日志或目录键）。
+ * @returns 归一化键（字母数字小写串）。
+ */
+export declare function canonModelId(id: string): string;
+/**
+ * 解析真实日志模型 id → 计费目录键。先精确别名映射（既有行为）；未命中时做
+ * 归一化匹配（忽略大小写/分隔符/括号附注），命中内置目录 / 别名目标 / 兜底键 /
+ * models.dev 补充键即返回其真实键；完全未知时保持原样（回退 other，不计费）。
+ * 供聚合层折叠与客户端渲染共用，两侧一致。
+ * @param id - 真实模型 id（日志里出现的形式）。
+ * @returns 计费目录键。
+ */
+export declare function resolveCatalogKey(id: string): string;
 /** Lookup a model by its stats key; falls back to the generic `other` entry. */
 export declare function modelOf(key: string): ModelEntry;
 /**
@@ -221,6 +241,16 @@ export declare function formatMoney(amount: number, currency?: CostCurrency): st
  * zero): CNY for domestic models, USD for overseas ones.
  */
 export declare function formatUnitPrice(price: number, currency?: 'CNY' | 'USD'): string;
+/**
+ * 把一条「每百万 token」单价从原生币种换算到目标展示币种（按 USD→CNY 汇率）。
+ * 汇率缺失/非法时回退原值，避免 0 汇率把价格算没。
+ * @param price - 原生币种单价。
+ * @param native - 模型原生币种。
+ * @param target - 用户当前展示币种。
+ * @param rate - USD→CNY 汇率（1 USD = rate CNY）。
+ * @returns 换算到目标币种的单价；同币种或汇率不可用时原值。
+ */
+export declare function convertUnitPrice(price: number, native: 'CNY' | 'USD', target: CostCurrency, rate: number): number;
 /** Format a large token count with B/M/K suffix. */
 export declare function formatTokens(value: number): string;
 /** Format a percentage. */

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

@@ -0,0 +1,21 @@
+/**
+ * 厂商显示名本地化：界面文案已随币种切换中英文，但厂商名（如「智谱 AI」/
+ * 「阿里通义」/「月之暗面」）散落在 PROVIDER_ALIASES、MODEL_CATALOG、
+ * SUBSCRIPTION_DISPLAY_NAMES、balance 等多个数据层，且这些中文名同时充当
+ * 匹配与分组的 key。为不改动任何数据层/匹配逻辑，这里只提供一张「中文厂商名
+ * → 英文显示名」的映射表（大写字面量作为 key，非中文/未收录名原样返回），
+ * 供 JSX 渲染层在做语言切换时调用。
+ */
+type ProviderLang = 'zh' | 'en';
+/**
+ * 把厂商显示名按界面语言本地化：中文名映射成英文，其余（已是英文 / 未收录 /
+ * 未知）原样返回。仅在渲染层调用，不影响数据层的中文 key 匹配。
+ * @param name - 数据层返回的厂商显示名（多为中文）。
+ * @param lang - 当前界面语言（跟随币种）。
+ * @returns 本地化后的显示名。
+ */
+export declare function localizeProviderName(name: string, lang: ProviderLang): string;
+/** 判断一个厂商显示名是否包含中文（用于测试/守卫：保证映射覆盖完整）。 */
+export declare function hasCjk(name: string): boolean;
+export {};
+//# sourceMappingURL=provider-display.d.ts.map

package/lib/types/subscriptions.d.ts

@@ -11,7 +11,7 @@
  * "no quota API" marker rather than hidden. API keys come from the `llm-pi-ai`
  * settings namespace (`apiKeyEnv` refs) resolved through the credentials seam.
  */
-import type { SubscriptionPlanConfig, SubscriptionQuota } from './pricing-shared.ts';
+import type { SubscriptionPlanConfig, SubscriptionQuota, SubscriptionWindow } from './pricing-shared.ts';
 /** 订阅适配器需要的凭据（来自 llm-pi-ai 设置命名空间）。 */
 export interface SubscriptionKeys {
     /** Kimi For Coding API key。 */
@@ -20,6 +20,10 @@ export interface SubscriptionKeys {
     zaiApiKey: string;
     /** OpenCode Go API key。 */
     opencodeApiKey: string;
+    /** MiniMax Token Plan API key。 */
+    minmaxApiKey: string;
+    /** OpenRouter API key（credits 已用%）。 */
+    openrouterApiKey: string;
     /** Z.ai 区域（global / bigmodel-cn）。 */
     zaiRegion: 'global' | 'bigmodel-cn';
 }
@@ -46,6 +50,21 @@ export declare function isSubscriptionProviderId(providerId: string): boolean;
 export declare function identifySubscriptionPlans(providers: Record<string, {
     apiKeyEnv?: string;
 } | undefined> | undefined): IdentifiedSubscriptionPlan[];
+/**
+ * 解析 MiniMax Token Plan `/v1/token_plan/remains` 响应。取 general(或 MiniMax-M*)
+ * 一行抽出 5h/7d 窗口(total_count 常为 0,以 remaining_percent 为准),不按模型拆条。
+ * 导出供测试:纯函数。
+ * @param body - 接口响应 JSON。
+ * @returns 窗口列表;无可用窗口时为空数组。
+ */
+export declare function parseMiniMaxRemains(body: unknown): SubscriptionWindow[];
+/**
+ * 解析 OpenRouter `/api/v1/credits` 响应:已用% = total_usage / total_credits。
+ * 导出供测试:纯函数。
+ * @param body - 接口响应 JSON。
+ * @returns 窗口列表;无有效额度时为 []。
+ */
+export declare function parseOpenRouterCredits(body: unknown): SubscriptionWindow[];
 /**
  * Collect quota for the given plans concurrently (adapter-backed plans only;
  * identified plans without an adapter are surfaced by the caller as "no

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": "0.9.0",
+  "version": "0.9.2",
   "publishConfig": {
     "access": "public"
   },
@@ -47,42 +47,42 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-api-remotes": "*",
-    "@deepseek-ai/dsh-atomic-write": "*",
-    "@deepseek-ai/dsh-client-connection": "*",
-    "@deepseek-ai/dsh-host-webserver": "*",
-    "@deepseek-ai/dsh-client-locale": "*",
-    "@deepseek-ai/dsh-client-runtime": "*",
-    "@deepseek-ai/dsh-client-ui-conversation": "*",
-    "@deepseek-ai/dsh-client-ui-sidebar": "*",
-    "@deepseek-ai/dsh-client-ui-primitives": "*",
-    "@deepseek-ai/dsh-client-ui-slots": "*",
-    "@deepseek-ai/dsh-credentials": "*",
-    "@deepseek-ai/dsh-invariants": "*",
-    "@deepseek-ai/dsh-llm": "*",
-    "@deepseek-ai/dsh-session": "*",
-    "@deepseek-ai/dsh-session-persistence": "*",
-    "@deepseek-ai/dsh-settings": "*",
-    "@deepseek-ai/dsh-tools": "*",
-    "@deepseek-ai/schemastery": "*",
-    "@deepseek-ai/cordis": "*",
+    "@deepseek-ai/dsh-api-remotes": "workspace:^",
+    "@deepseek-ai/dsh-atomic-write": "workspace:^",
+    "@deepseek-ai/dsh-client-connection": "workspace:^",
+    "@deepseek-ai/dsh-host-webserver": "workspace:^",
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-conversation": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
+    "@deepseek-ai/dsh-credentials": "workspace:^",
+    "@deepseek-ai/dsh-invariants": "workspace:^",
+    "@deepseek-ai/dsh-llm": "workspace:^",
+    "@deepseek-ai/dsh-session": "workspace:^",
+    "@deepseek-ai/dsh-session-persistence": "workspace:^",
+    "@deepseek-ai/dsh-settings": "workspace:^",
+    "@deepseek-ai/dsh-tools": "workspace:^",
+    "@deepseek-ai/schemastery": "workspace:^",
+    "@deepseek-ai/cordis": "workspace:^",
     "react": "^18.2.0"
   },
   "dependencies": {
     "clsx": "^2.1.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-client-locale": "*",
-    "@deepseek-ai/dsh-client-runtime": "*",
-    "@deepseek-ai/dsh-client-test-runtime": "*",
-    "@deepseek-ai/dsh-client-ui-conversation": "*",
-    "@deepseek-ai/dsh-client-ui-primitives": "*",
-    "@deepseek-ai/dsh-client-ui-slots": "*",
-    "@deepseek-ai/dsh-client-web-react": "*",
-    "@deepseek-ai/dsh-invariants": "*",
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-test-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-conversation": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
+    "@deepseek-ai/dsh-client-web-react": "workspace:^",
+    "@deepseek-ai/dsh-invariants": "workspace:^",
     "@testing-library/react": "^16.1.0",
     "@types/react": "~18.3.1",
-    "@deepseek-ai/cordis": "*",
+    "@deepseek-ai/cordis": "workspace:^",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },