@linxin666/dsh-usage 0.4.5 → 0.4.6

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

@@ -1,6 +1,6 @@
 /**
- * The Whale-yuan voucher (鲸元券): the DeepSeek official family's retained
- * ledger totals stamped onto the banknote artwork as a denomination, ready
+ * The Whale-yuan voucher (鲸元券): the mint family's retained ledger totals
+ * stamped onto the banknote artwork as a denomination, ready
  * to save or share. The canvas copy is deliberately locale-neutral (digits,
  * latin captions, ISO dates) so the exported image needs no dictionary;
  * everything user-facing around it lives in the section's locales. The pure
@@ -11,11 +11,11 @@
 import type { UsageWindowSummary } from '../core/types.ts';
 /** The facts stamped onto one voucher. */
 export interface VoucherData {
-    /** DeepSeek official family total tokens over the retained window. */
+    /** Mint family (DeepSeek official + MiMo) total tokens over the retained window. */
     tokens: number;
     /** Provider calls that reported usage. */
     calls: number;
-    /** Fold-time spend estimate in CNY (the only priced family). */
+    /** Fold-time spend estimate in CNY; only the priced family contributes. */
     cost: number;
     /** Retained window bounds (local date keys, inclusive). */
     from: string;
@@ -28,12 +28,30 @@ export declare function faceValue(tokens: number): number;
 /** Local calendar day (`YYYY-MM-DD`) for an epoch ms timestamp. */
 export declare function formatDay(ms: number): string;
 /**
- * Sum the DeepSeek official family rows out of a usage window (both the
- * `deepseek` catalog alias and the live `deepseek-official` route fold into
- * one voucher). Undefined when the window is absent (older host) or the
- * family has no usage — a zero-token note mints nothing.
+ * Provider route ids minted beside the DeepSeek official family: the MiMo
+ * gateway, which a profile may run as its default route and which the ledger
+ * records under its own route id. The bank counts the tokens a profile spends,
+ * not only the ones DeepSeek bills. Route ids rather than adapter families
+ * because minting is an accounting decision that must never widen the
+ * credential or probing paths — the same split `isDeepSeekProviderRoute()`
+ * keeps against `adapterFor()` (issue #1772). An empty list mints exactly the
+ * official family, which is how a profile that never runs MiMo behaves.
  */
-export declare function deepseekVoucherData(window: UsageWindowSummary | undefined): VoucherData | undefined;
+export declare const EXTRA_MINT_ROUTE_IDS: readonly string[];
+/** Whether one provider route's ledger rows mint whale yuan. */
+export declare function mintsWhaleYuan(provider: string): boolean;
+/**
+ * Sum the mint family's rows out of a usage window: the whole DeepSeek
+ * official family (the `deepseek` catalog alias, the live `deepseek-official`
+ * route and the signed-in `deepseek-account` route all fold into one voucher)
+ * plus {@link EXTRA_MINT_ROUTE_IDS}. Undefined when the window is absent
+ * (older host) or the family has no usage — a zero-token note mints nothing.
+ *
+ * Only the priced family contributes `cost`: MiMo ships no price book, so it
+ * mints tokens and calls while the spend line keeps reporting the official
+ * family's fold-time estimate (and the observed-balance watch above it).
+ */
+export declare function voucherData(window: UsageWindowSummary | undefined): VoucherData | undefined;
 /** Banknote denomination: full digits with thousands separators. */
 export declare function formatDenomination(value: number): string;
 /** Deterministic serial number flavor: the face value mod 1e9, zero-padded. */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-usage",
   "description": "Usage statistics plugin for the dsh web GUI: per-provider balance and coding-plan quota detection plus a live token usage ledger, with a compact price glance card above the sidebar's Settings row",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "icon": "icon.svg",
   "type": "module",
   "engines": {
@@ -87,7 +87,7 @@
     "url": "https://github.com/zhu1090093659/dsh-web.git"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json && tsdown",
+    "build": "tsc -b tsconfig.build.json && tsdown",
     "watch": "tsdown --watch",
     "test": "vitest run",
     "typecheck": "tsc --noEmit && tsc -p tsconfig.test.json --pretty false"

package/src/client/UsageSectionCard.tsx

@@ -15,7 +15,7 @@ import { t } from './locales.ts'
 import styles from './usage.module.css'
 import { isDeepSeekProviderRoute } from '../core/adapters.ts'
 import { deepseekPeriodAt } from '../core/pricing.ts'
-import { deepseekVoucherData, drawVoucher, faceValue, formatDay, formatDenomination, loadVoucherArt } from './voucher.ts'
+import { voucherData, drawVoucher, faceValue, formatDay, formatDenomination, loadVoucherArt } from './voucher.ts'
 import type { ObservedSpendView, ProviderSnapshotView, UsageDayView, UsageOverviewView, UsageProviderSummary, UsageTokenTotals, UsageWindowSummary } from '../core/types.ts'
 
 /** The settings fields this section edits (immediate-apply semantics). */
@@ -550,18 +550,18 @@ function totalOf(totals: UsageTokenTotals): number {
 }
 
 /**
- * The Token 银行 card: the DeepSeek official family's retained-ledger usage
- * minted onto the whale-yuan note at 1,000,000 tokens per whale yuan. The
- * window is the whole retained ledger by default (the host's aggregate,
- * falling back to the 30-day trend when an older host serves no `all`) or the
- * single day the user picked; the spend line prefers the official balance
- * watch (whole window only) and falls back to the fold-time estimate; the
- * artwork draw failure degrades to an error line and never takes the section
- * down.
+ * The Token 银行 card: the mint family's (DeepSeek official + MiMo)
+ * retained-ledger usage minted onto the whale-yuan note at 1,000,000 tokens
+ * per whale yuan. The window is the whole retained ledger by default (the
+ * host's aggregate, falling back to the 30-day trend when an older host serves
+ * no `all`) or the single day the user picked; the spend line prefers the
+ * official balance watch (whole window only) and falls back to the fold-time
+ * estimate, which only the priced family feeds; the artwork draw failure
+ * degrades to an error line and never takes the section down.
  */
 function VoucherCard(props: { window?: UsageWindowSummary; observedSpend?: ObservedSpendView; loading?: boolean; error?: string }): ReactNode {
   const { window: ledger, observedSpend, loading, error } = props
-  const data = deepseekVoucherData(ledger)
+  const data = voucherData(ledger)
   const canvasRef = useRef<HTMLCanvasElement | null>(null)
   const [drawError, setDrawError] = useState<string | undefined>(undefined)
   const dataKey = data === undefined ? '' : `${data.from}|${data.to}|${data.tokens}|${data.calls}|${data.cost}`

package/src/client/locales.ts

@@ -57,8 +57,8 @@ export const zh = {
   'usage.config.pollIntervalSec': '轮询间隔（秒）',
   'usage.config.saveFailed': '保存失败：设置未被接受。',
   'usage.bank.title': '鲸元券',
-  'usage.bank.hint': '官方 API 每消耗 100 万 tokens 铸造 1 鲸元；保存或分享这张票券。',
-  'usage.bank.noUsage': '暂无 DeepSeek 官方用量数据（统计自插件启用起）',
+  'usage.bank.hint': 'DeepSeek 官方 API 与 MiMo 每消耗 100 万 tokens 铸造 1 鲸元；保存或分享这张票券。',
+  'usage.bank.noUsage': '暂无 DeepSeek 官方 / MiMo 用量数据（统计自插件启用起）',
   'usage.bank.minted': '累计铸造 {minted} 鲸元（{tokens} tokens）',
   'usage.bank.spend.observed': '官方余额实测花费 ¥{cost}（自 {since} 起）',
   'usage.bank.spend.estimated': '消费估算：约 ¥{cost}',
@@ -124,8 +124,8 @@ export const en: Record<UsageKey, string> = {
   'usage.config.pollIntervalSec': 'Poll interval (seconds)',
   'usage.config.saveFailed': 'Save failed: the deployment did not accept the setting.',
   'usage.bank.title': 'Whale-yuan voucher',
-  'usage.bank.hint': 'Every 1,000,000 tokens spent on the official API mint one whale yuan; save or share the note.',
-  'usage.bank.noUsage': 'No official DeepSeek usage yet (counting starts when the plugin is enabled)',
+  'usage.bank.hint': 'Every 1,000,000 tokens spent on the DeepSeek official API or on MiMo mint one whale yuan; save or share the note.',
+  'usage.bank.noUsage': 'No DeepSeek official or MiMo usage yet (counting starts when the plugin is enabled)',
   'usage.bank.minted': 'Minted {minted} whale yuan ({tokens} tokens)',
   'usage.bank.spend.observed': 'Spent ¥{cost} observed on the official balance (watching since {since})',
   'usage.bank.spend.estimated': 'Estimated spend: about ¥{cost}',

package/src/client/voucher.ts

@@ -1,6 +1,6 @@
 /**
- * The Whale-yuan voucher (鲸元券): the DeepSeek official family's retained
- * ledger totals stamped onto the banknote artwork as a denomination, ready
+ * The Whale-yuan voucher (鲸元券): the mint family's retained ledger totals
+ * stamped onto the banknote artwork as a denomination, ready
  * to save or share. The canvas copy is deliberately locale-neutral (digits,
  * latin captions, ISO dates) so the exported image needs no dictionary;
  * everything user-facing around it lives in the section's locales. The pure
@@ -16,11 +16,11 @@ import { VOUCHER_ART_DATA_URL } from './voucher-art.generated.ts'
 
 /** The facts stamped onto one voucher. */
 export interface VoucherData {
-  /** DeepSeek official family total tokens over the retained window. */
+  /** Mint family (DeepSeek official + MiMo) total tokens over the retained window. */
   tokens: number
   /** Provider calls that reported usage. */
   calls: number
-  /** Fold-time spend estimate in CNY (the only priced family). */
+  /** Fold-time spend estimate in CNY; only the priced family contributes. */
   cost: number
   /** Retained window bounds (local date keys, inclusive). */
   from: string
@@ -44,21 +44,43 @@ export function formatDay(ms: number): string {
 }
 
 /**
- * Sum the DeepSeek official family rows out of a usage window (both the
- * `deepseek` catalog alias and the live `deepseek-official` route fold into
- * one voucher). Undefined when the window is absent (older host) or the
- * family has no usage — a zero-token note mints nothing.
+ * Provider route ids minted beside the DeepSeek official family: the MiMo
+ * gateway, which a profile may run as its default route and which the ledger
+ * records under its own route id. The bank counts the tokens a profile spends,
+ * not only the ones DeepSeek bills. Route ids rather than adapter families
+ * because minting is an accounting decision that must never widen the
+ * credential or probing paths — the same split `isDeepSeekProviderRoute()`
+ * keeps against `adapterFor()` (issue #1772). An empty list mints exactly the
+ * official family, which is how a profile that never runs MiMo behaves.
  */
-export function deepseekVoucherData(window: UsageWindowSummary | undefined): VoucherData | undefined {
+export const EXTRA_MINT_ROUTE_IDS: readonly string[] = ['mimo']
+
+/** Whether one provider route's ledger rows mint whale yuan. */
+export function mintsWhaleYuan(provider: string): boolean {
+  return isDeepSeekProviderRoute(provider) || EXTRA_MINT_ROUTE_IDS.includes(provider)
+}
+
+/**
+ * Sum the mint family's rows out of a usage window: the whole DeepSeek
+ * official family (the `deepseek` catalog alias, the live `deepseek-official`
+ * route and the signed-in `deepseek-account` route all fold into one voucher)
+ * plus {@link EXTRA_MINT_ROUTE_IDS}. Undefined when the window is absent
+ * (older host) or the family has no usage — a zero-token note mints nothing.
+ *
+ * Only the priced family contributes `cost`: MiMo ships no price book, so it
+ * mints tokens and calls while the spend line keeps reporting the official
+ * family's fold-time estimate (and the observed-balance watch above it).
+ */
+export function voucherData(window: UsageWindowSummary | undefined): VoucherData | undefined {
   if (window === undefined) return undefined
   let tokens = 0
   let calls = 0
   let cost = 0
   for (const row of window.providers) {
-    if (!isDeepSeekProviderRoute(row.provider)) continue
+    if (!mintsWhaleYuan(row.provider)) continue
     tokens += totalTokens(row.totals)
     calls += row.totals.calls
-    cost += row.totals.cost
+    if (isDeepSeekProviderRoute(row.provider)) cost += row.totals.cost
   }
   if (tokens <= 0) return undefined
   return { tokens, calls, cost, from: window.from, to: window.to }