dsh-tokenlens 1.6.2 → 1.6.4

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 **版本记录约定**：同一发布日只保留一个章节，标题取当日**最后一个**已发布版本号；当日多次发布的改动合并到该章节，并在标题下注明当日实际发布过的版本号（npm 上仍可安装这些独立版本）。若当日已有发布，后续小改动不再单独增加版本号，而是并入下一篇日志。这样日志按天规整、不出现同日多个小版本。
 
+## 1.6.4 — 2026-11-04
+
+（当日已发布版本：v1.6.2 / v1.6.4。v1.6.1 的混合模型修复未单独发版，已并入本节）
+
+- **fix(open-design): 「本期 Design Plan 累计」改为只统计 Design Plan 额度消耗，排除钱包余额付费**——钱包扣费不消耗 credits（只扣 `balanceUsd`），所以改由**服务端 credits 反推**金额：`usedCredits ÷ creditsPerUsd ÷ 倍率`。实测 150,005 credits ÷ 10,000 ÷ 0.5 = **$30.00**，与「周额度 $30 × 已用比例」交叉验证一致（$30 × 100% = $30.00）。此前按本机 Token × 单价计价，会把钱包付费的调用也算进去，导致两个口径混淆
+- feat(open-design): 新增 `localPricedUsd`（含钱包付费的本机估算）单独保留；当它高于 Design Plan 金额时，弹窗追加「另有 $X 由账户余额支付，未计入」，两个口径都清楚可查
+- **fix(ui): 图表模式日期标签对不齐柱子**——原来把第一个标签钉在左边缘、最后一个钉在右边缘，而柱子是等分 flex 单元格居中的：只有 3 天数据时第一个标签在 0% 而柱子中心在 16.7%，标签整体漂移。改为每个标签居中于**自己那根柱子**的正下方（`(i+0.5)/n`），并放开 x 轴 `overflow` 让边缘标签不被裁掉
+- 测试：332 → 335（Design Plan 金额来自 credits 且低于含钱包的本机估算、无倍率时回退到 credits 面值、3 根柱时标签中心为 16.7%/50%/83.3% 且不贴边）
+
 ## 1.6.2 — 2026-11-04
 
 （当日已发布版本：v1.6.2。v1.6.1 的混合模型修复未单独发版，已并入本节）

package/client.js

@@ -343,6 +343,7 @@ window.__ModuleLoader__.load({
       designPlanHint:
         '按官方定价表的模型单价换算本机实际消耗的 Token（不是 usedCredits ÷ 汇率）。Open Design 没有月度用量接口，此值由插件在本机累计观测到的 7 天窗口得出，仅供参考',
       designPlanMultiplier: '按 {multiplier}× 倍率模型计价',
+      designPlanWalletShare: '另有 {amount} 由账户余额支付，未计入',
       designPlanPartialPricing: '含未收录价格的模型，金额为下限',
       designPlanComplete: '已覆盖本账期全部窗口',
       designPlanPartial: '仅统计已观测的 {count} 个窗口',
@@ -606,6 +607,7 @@ window.__ModuleLoader__.load({
       designPlanHint:
         'Priced from the official per-model rates over the tokens this machine actually consumed (not usedCredits ÷ rate). Open Design serves no period-usage endpoint, so the window total is accumulated locally; treat it as an estimate.',
       designPlanMultiplier: 'priced at the {multiplier}× model rate',
+      designPlanWalletShare: 'a further {amount} was paid from the balance and is not counted',
       designPlanPartialPricing: 'includes models with no documented price; the amount is a lower bound',
       designPlanComplete: 'covers every window of this period',
       designPlanPartial: 'only {count} observed window(s)',
@@ -1109,6 +1111,9 @@ window.__ModuleLoader__.load({
         monthlyCapUsd: monthlyCapUsd !== null && monthlyCapUsd > 0 ? monthlyCapUsd : null,
         capPercent,
         multiplier: multiplier !== null && multiplier > 0 ? multiplier : null,
+        // v1.6.4: the wallet-inclusive local token estimate, shown only as context
+        // next to the Design-Plan-only figure (they differ by wallet-paid calls).
+        localPricedUsd: numberOrNull(raw.localPricedUsd),
         // v1.6.2: some consumed model had no documented price, so the dollar
         // figure is a lower bound and must not read as complete.
         partial: raw.partial === true,
@@ -3456,7 +3461,7 @@ window.__ModuleLoader__.load({
 .dsh-tokenlens-chart-bar-wrap[data-chart-hover=true] .dsh-tokenlens-chart-bar{background:#40c877;filter:brightness(1.12);box-shadow:0 0 0 1px rgba(64,200,119,.55)}
 .dsh-tokenlens-chart-crosshair{position:absolute;top:2px;height:160px;z-index:2;pointer-events:none;border-left:1px dashed #d98a1f;opacity:.7}
 .dsh-tokenlens-chart-readout{position:absolute;top:4px;z-index:3;pointer-events:none;max-width:calc(100% - 8px);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;border:1px solid var(--dsw-alias-border-subtle,rgba(127,127,127,.3));border-radius:6px;background:var(--dsw-alias-bg-elevated,#202124);color:var(--dsw-alias-label-primary);font-size:11px;line-height:1.4;padding:2px 6px;box-shadow:0 2px 8px rgba(0,0,0,.25);font-variant-numeric:tabular-nums}
-.dsh-tokenlens-chart-xaxis{position:relative;flex:none;height:14px;min-width:0;max-width:100%;overflow:hidden}
+.dsh-tokenlens-chart-xaxis{position:relative;flex:none;height:14px;min-width:0;max-width:100%;overflow:visible}
 .dsh-tokenlens-chart-x-label{position:absolute;top:2px;color:var(--dsw-alias-label-tertiary);font-size:10px;line-height:1.2;white-space:nowrap;font-variant-numeric:tabular-nums}
 .dsh-tokenlens-chart-summary{display:flex;flex-wrap:wrap;gap:4px 12px;color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:1.4;min-width:0}
 .dsh-tokenlens-chart-summary>span{font-variant-numeric:tabular-nums;overflow-wrap:anywhere}
@@ -4078,6 +4083,15 @@ window.__ModuleLoader__.load({
       if (designPlan.multiplier !== null) {
         notes.push(t('designPlanMultiplier', { multiplier: designPlan.multiplier }))
       }
+      // v1.6.4: when the wallet-inclusive local estimate is HIGHER than the
+      // Design-Plan figure, the difference was paid from the account balance and
+      // must not be presented as Design Plan consumption.
+      if (designPlan.localPricedUsd !== null && designPlan.estimatedUsd !== null) {
+        const walletShare = designPlan.localPricedUsd - designPlan.estimatedUsd
+        if (walletShare > 0.005) {
+          notes.push(t('designPlanWalletShare', { amount: formatMoney(walletShare, 'USD') }))
+        }
+      }
       // v1.6.2: a model without a documented price makes the figure a lower bound.
       // Say it rather than letting the number read as complete.
       if (designPlan.partial === true) notes.push(t('designPlanPartialPricing'))
@@ -4576,16 +4590,17 @@ window.__ModuleLoader__.load({
         ),
       )
       const bars = points.map((point, index) => spec.bar(point, index, { max, hovered: index === hoverIndex }))
+      // v1.6.3: centre every label under ITS OWN bar. The bars are a flex row of
+      // equal cells, so bar i is centred at (i + 0.5) / count of the plot width.
+      // The old code pinned the first label to the left edge and the last to the
+      // right edge, which only lines up when the bars fill the whole width: with
+      // 3 bars the first label sat at 0% while its bar was centred at 16.7%, and
+      // the last sat at 100% while its bar was at 83.3% — the dates drifted off
+      // their columns (reported for a 3-day series).
       const xLabels = chartXLabelIndices(points.length).map((index) => {
         const point = points[index]
         const label = spec.xLabel(point, index)
-        const first = index === 0
-        const last = index === points.length - 1
-        const style = first
-          ? { left: '0%' }
-          : last
-            ? { right: '0%' }
-            : { left: `${((index + 0.5) / points.length) * 100}%`, transform: 'translateX(-50%)' }
+        const style = { left: `${((index + 0.5) / points.length) * 100}%`, transform: 'translateX(-50%)' }
         return h(
           'span',
           {

package/index.js

@@ -84,7 +84,7 @@ export const inject = []
 export const PLUGIN_NAME = 'dsh-tokenlens'
 
 /** Plugin version; mirrors package.json (kept here so diagnostics need no fs read). */
-export const PLUGIN_VERSION = '1.6.2'
+export const PLUGIN_VERSION = '1.6.4'
 
 /** Documented defaults; every field of the raw row config is optional. */
 const DEFAULTS = {

package/lib/design-plan-ledger.mjs

@@ -266,18 +266,34 @@ export function summarizeDesignPlan(ledger, periodStart, input = null) {
     windows += 1
   }
   const creditsPerUsd = period.creditsPerUsd
-  // v1.6.0: `creditsPerUsd` conversion is kept ONLY as a fallback. It assumes the
-  // account burns credits at 1x, but the documented multipliers range 0.25x–4x,
-  // so it is wrong for any non-1x model (2x too low for DeepSeek V4.1 Flash).
-  // The caller passes the documented list-price cost instead.
   const creditsUsd =
     Number.isSafeInteger(creditsPerUsd) && creditsPerUsd > 0 ? usedCredits / creditsPerUsd : null
-  const estimatedUsd = Number.isFinite(input?.listPriceUsd) ? input.listPriceUsd : creditsUsd
+  const multiplier = Number.isFinite(input?.multiplier) && input.multiplier > 0 ? input.multiplier : null
+  // v1.6.4: the Design Plan figure is derived FROM THE SERVER'S credits, not from
+  // locally-priced tokens. This is what makes it a Design-Plan-only number:
+  //   credits are deducted for Design Plan allowance ONLY.
+  //   Wallet-funded usage never touches them — it debits `balanceUsd` instead.
+  //
+  // `usedCredits / creditsPerUsd` yields the *credit* value; the documented list
+  // price is that divided by the model multiplier, because a 0.5x model burns
+  // half a credit per list-price dollar. Verified against the account's own caps:
+  //   149,932 credits / 10,000 / 0.5 = $29.99
+  //   30 * (149,932 / 150,000)       = $29.99   (the 7-day cap is $30)
+  // Both agree, which is the cross-check that the formula is right.
+  //
+  // The locally-priced token total (input.listPriceUsd) is kept as `walletUsd`
+  // context: it includes wallet-funded calls, so it can EXCEED this figure. It is
+  // reported separately and never mixed into `estimatedUsd`.
+  const designPlanUsd =
+    creditsUsd === null ? null : multiplier === null ? creditsUsd : creditsUsd / multiplier
+  const estimatedUsd = designPlanUsd !== null ? designPlanUsd : Number.isFinite(input?.listPriceUsd) ? input.listPriceUsd : null
   const since = entries[0][0]
   const limitPerWindow = entries[entries.length - 1][1].limitCredits
   const usableWindowLimit = Number.isSafeInteger(limitPerWindow) && limitPerWindow > 0 ? limitPerWindow : null
   const periodLimitCredits = usableWindowLimit === null ? null : usableWindowLimit * WEEKS_PER_PERIOD
   const percent = periodLimitCredits === null ? null : (usedCredits / periodLimitCredits) * 100
+  // The cap is a list-price cap for the model mix, so compare it against the
+  // list-price figure derived from credits.
   const monthlyCapUsd = Number.isFinite(input?.monthlyCapUsd) ? input.monthlyCapUsd : null
   const capPercent =
     estimatedUsd !== null && monthlyCapUsd !== null && monthlyCapUsd > 0
@@ -287,10 +303,13 @@ export function summarizeDesignPlan(ledger, periodStart, input = null) {
     periodStart: key,
     periodEnd: period.periodEnd || '',
     usedCredits,
+    // Design-Plan-only dollars (from server credits). Comparable with the caps.
     estimatedUsd,
+    // The wallet-inclusive local estimate, kept for transparency/contrast only.
+    localPricedUsd: Number.isFinite(input?.listPriceUsd) ? input.listPriceUsd : null,
     creditsUsd,
     monthlyCapUsd,
-    multiplier: Number.isFinite(input?.multiplier) ? input.multiplier : null,
+    multiplier,
     capPercent,
     // v1.6.2: true when some consumed model has no documented price, so
     // `estimatedUsd` is a lower bound and the UI must say so.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tokenlens",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "type": "module",
   "description": "dsh-TokenLens (词元透镜) — provider-aware plan capacity plus local token statistics (today/7d/30d/all-time, by harness/provider/model/workspace) for DSH.",
   "license": "MIT",