dsh-tokenlens 1.6.6 → 1.7.0

package/CHANGELOG.md

@@ -4,9 +4,27 @@
 
 **版本记录约定**：同一发布日只保留一个章节，标题取当日**最后一个**已发布版本号；当日多次发布的改动合并到该章节，并在标题下注明当日实际发布过的版本号（npm 上仍可安装这些独立版本）。若当日已有发布，后续小改动不再单独增加版本号，而是并入下一篇日志。这样日志按天规整、不出现同日多个小版本。
 
-## 1.6.6 — 2026-11-05
+## 1.7.0 — 2026-11-06
 
-（当日已发布版本：v1.6.5 / v1.6.6）
+（当日已发布版本：v1.6.5 / v1.6.6 / v1.6.7 / v1.7.0）
+
+- **fix(ui): 弹窗改为 portal 到 `<body>`，恢复视口居中**——DSH 0.2.2-rc.1 里 `conversation.input.overlay` 槽位的祖先建立了包含块（transform / filter / contain），`position: fixed` 因此相对「对话区」解析，弹窗只能贴在对话区底部。改用 `react-dom` 的 `createPortal` 挂到 `document.body`，彻底脱离该祖先链。`react-dom` 缺失时（含 Node 测试环境）自动回退为原地渲染，绝不抛错
+- **fix(ui): 芯片悬停不再让整个对话区闪烁**——芯片同时设置了原生 `title` 与平台 `Tooltip`，两者在悬停时互相抢占/释放，造成区域反复重绘。现在只保留平台 `Tooltip`（文案一致，`aria-label` 保留），移除冗余的原生 `title`
+- **feat(ui): 新增「输出速度（TPS）」趋势图**，位于明细下方、独占整行——输出 Token ÷ 模型自身耗时（`step/start` → `assistant/message`）。工具调用发生在消息之后，因此等待时间不被计入；输出 Token 含思考 Token，弹窗提示已说明
+- feat(stats): Host 侧新增 `speed` 序列（顶层为全 Harness 合计，每个 provider 行另有自己的序列，跟随作用域切换）；按天聚合 `{day, outputTokens, seconds, tps, steps}`，无正耗时的日期直接跳过而不是给出无限速率。缓存 schema 升至 6，首次会重扫
+- **fix(stats): 「最近X天」封顶 30 天**——此前 provider 首次出现超过 30 天时会报「最近90天」，而同期所有其他数字与图表都只覆盖 30 天。现在 `effectiveDays` 封顶 30，且 `sinceEffective` 在超窗时改用 30 天桶，保证**标签与数字描述同一区间**；`daily` 序列尾部由 120 天收敛为 30 天
+- 测试：357 → 363（TPS 配对与未配对步骤跳过、零耗时日期跳过、provider 作用域序列、30 天封顶与标签/数据一致、弹窗 portal 与无 react-dom 回退、TPS 图表与空态）
+
+## 1.7.0 之前的同日版本见下方各节
+
+## 1.6.7 — 2026-11-05
+
+（当日已发布版本：v1.6.5 / v1.6.6 / v1.6.7）
+
+- **fix(commandcode): 用实时窗口用量校正滞后的 `usage summary`**——`/alpha/usage/summary` 是聚合接口，比滚动窗口**滞后几美分**（实测 summary `$1.1248` vs 实时 `$1.2802`），直接拿它反推会让额度偏小、百分比偏低约 0.2 个百分点。现在取「summary 与实时窗口用量」中的**最大值**作为本期消费下界——summary 提供锚点，实时窗口只会把估计值推向真值。实测修正后月额度精确回到 **$70.00**、百分比 `1.85%`，与该平台控制台一致
+- fix(commandcode): **仅在 summary 存在时才用窗口用量校正**——没有 summary 就没有锚点，此时周窗口可能并不覆盖整个账期，用它反推会把额度放大、百分比压向 0，因此该情况仍保持 `null`
+
+### v1.6.6 同日内容
 
 - **feat(commandcode): 补上月用量百分比**——该平台付费套餐**不下发** `monthlyCreditsGranted`（额度分母），此前月窗口只能是 `unknown`。现在同时读 `GET /alpha/usage/summary`（控制台自己用的那个接口），用两个字段反推额度：`grant = credits.monthlyCredits（余额）+ totalMonthlyCredits（本期消费）`。实测 `69.1272003646 + 0.8727996354 = 70.0000000000`（多时点复核均精确 70），与控制台前端内置的 `totalCredits: 70` 一致
 - feat(commandcode): 月窗口因此同时具备**已用 / 额度 / 百分比 / 重置时间**（`$0.99 / $70.00 · 1.4%`），与 5 小时、每周两个窗口口径一致

package/README.en.md

@@ -144,7 +144,7 @@ Host bridge route: `/api/tokenlens`; agent tool: `tokenlens_usage`.
 
 ## Development
 
-Node.js ≥ 24, zero runtime dependencies: `node --test` runs the 355 tests.
+Node.js ≥ 24, zero runtime dependencies: `node --test` runs the 363 tests.
 
 Release: `node scripts/bump-version.mjs <version> "<note>"` updates `package.json`, `PLUGIN_VERSION` and `CHANGELOG.md`; see [CONTRIBUTING.md](CONTRIBUTING.md) and [SECURITY.md](SECURITY.md).
 

package/README.md

@@ -445,7 +445,7 @@ Host 半注册 `tokenlens_usage`，参数 `action`（默认 `snapshot`）与可
 
 ## 验证
 
-- `node --test`：**355 个自动化用例**，覆盖 Host 数据层、供应商适配器（含小米 MiMo 控制台 Cookie 适配器、Command Code 月度额度反推）、统计折叠、各 harness 读取、Design Plan 周期账本与额度计价、窗口锚点切片、工作区自动识别、插件集成与浏览器端渲染 / 交互。
+- `node --test`：**363 个自动化用例**，覆盖 Host 数据层、供应商适配器（含小米 MiMo 控制台 Cookie 适配器、Command Code 月度额度反推）、统计折叠、各 harness 读取、Design Plan 周期账本与额度计价、TPS 速度序列、窗口锚点切片、工作区自动识别、插件集成与浏览器端渲染 / 交互。
 - 在真实环境中验证过 **5 个 harness** 的数据源；本机统计与独立的 SQLite 查询、独立的日志解析逐项对账（差额为 0），跨 harness 合并与供应商映射算术自洽。
 - 供应商接口按各官方文档与参考客户端行为验证；未配置凭据时 chip 静默隐藏，接口异常时按可重试错误降级。
 

package/client.js

@@ -40,6 +40,19 @@ window.__ModuleLoader__.load({
     // words in the shell's module table, so they need no `dsh.client.external`.
     const primitives = require('@deepseek-ai/dsh-client-ui-primitives')
     const { Modal, Button, Tooltip, IconRefreshOutlineRegular } = primitives
+    // v1.7.0: the dialog is portalled to <body>. Rendering it inside the
+    // `conversation.input.overlay` slot stopped reaching the viewport in DSH
+    // 0.2.2-rc.1: an ancestor there establishes a containing block (transform /
+    // filter / contain), so `position: fixed` resolved against the conversation
+    // area and the dialog could only appear at its bottom. `createPortal` escapes
+    // that ancestor entirely. Tolerated as optional so a Host without react-dom
+    // (and the Node test harness) simply renders inline as before.
+    let ReactDOM = null
+    try {
+      ReactDOM = require('react-dom')
+    } catch {
+      ReactDOM = null
+    }
 
     const h = React.createElement
 
@@ -215,6 +228,11 @@ window.__ModuleLoader__.load({
       statsProviderFallback: '当前供应商（{provider}）没有本机记录，显示全部 Harness 合计',
       statsDshTotalLabel: 'DSH 合计',
       statsLast30Days: '最近30天',
+      statsSpeedTitle: '输出速度（TPS）',
+      statsSpeedHint: '输出 Token ÷ 模型自身耗时（step 开始到消息返回）；不含工具调用等待，但输出含思考 Token',
+      statsSpeedTotal: '均值 {tps} tok/s',
+      statsSpeedEmpty: '暂无可计算的速度样本（需要 step 计时数据）',
+      statsSpeedBarTitle: '{date} · {tps} tok/s（{tokens} 输出 ÷ {seconds}s）',
       statsLast7Days: '最近7天',
       stats7DaysShort: '7天',
       statsDaysShort: '{n}天',
@@ -484,6 +502,12 @@ window.__ModuleLoader__.load({
       statsProviderFallback: 'No local records for the current provider ({provider}) — showing all-harness totals',
       statsDshTotalLabel: 'DSH total',
       statsLast30Days: 'Last 30 days',
+      statsSpeedTitle: 'Output speed (TPS)',
+      statsSpeedHint:
+        'Output tokens ÷ the model’s own request time (step start to message); tool waits excluded, reasoning tokens included',
+      statsSpeedTotal: 'avg {tps} tok/s',
+      statsSpeedEmpty: 'No speed samples yet (needs step timing data)',
+      statsSpeedBarTitle: '{date} · {tps} tok/s ({tokens} output ÷ {seconds}s)',
       statsLast7Days: 'Last 7 days',
       stats7DaysShort: '7d',
       statsDaysShort: '{n}d',
@@ -1523,6 +1547,8 @@ window.__ModuleLoader__.load({
         // v0.22.1: only subscription-backed providers use the 最近X天 window.
         subscribed: entry.subscribed === true,
         harnesses,
+        // v1.7.0: this provider's own output-speed series.
+        speed: normalizeSpeed(entry.speed),
       }
     }
 
@@ -1557,6 +1583,38 @@ window.__ModuleLoader__.load({
     }
 
     /** The whole stats payload, or null. Handles v1/v2 (DSH-ish) and v3 (provider-scoped). */
+    /**
+     * One output-speed (TPS) series (v1.7.0): `{byDay, total}` or null.
+     *
+     * `tps` is output tokens over the model's own request time, so a day whose
+     * `seconds` is not positive is dropped rather than shown as an infinite rate.
+     */
+    function normalizeSpeed(raw) {
+      if (raw === null || typeof raw !== 'object' || Array.isArray(raw)) return null
+      const byDay = Array.isArray(raw.byDay)
+        ? raw.byDay
+            .filter((entry) => entry !== null && typeof entry === 'object' && typeof entry.day === 'string')
+            .map((entry) => ({
+              day: entry.day,
+              outputTokens: numberOrNull(entry.outputTokens) ?? 0,
+              seconds: numberOrNull(entry.seconds) ?? 0,
+              tps: numberOrNull(entry.tps),
+              steps: numberOrNull(entry.steps) ?? 0,
+            }))
+            .filter((entry) => entry.tps !== null && entry.tps >= 0)
+        : []
+      const totalRaw = raw.total !== null && typeof raw.total === 'object' ? raw.total : {}
+      return {
+        byDay,
+        total: {
+          outputTokens: numberOrNull(totalRaw.outputTokens) ?? 0,
+          seconds: numberOrNull(totalRaw.seconds) ?? 0,
+          tps: numberOrNull(totalRaw.tps),
+          steps: numberOrNull(totalRaw.steps) ?? 0,
+        },
+      }
+    }
+
     function normalizeStats(raw) {
       if (raw === null || typeof raw !== 'object') return null
       const version = Number.isFinite(raw.version) ? raw.version : 1
@@ -1684,6 +1742,8 @@ window.__ModuleLoader__.load({
         workspaces,
         // v0.24.0 daily series for the chart mode (may be empty on old Hosts).
         daily,
+        // v1.7.0: output-speed (TPS) series across every harness.
+        speed: normalizeSpeed(raw.speed),
         zcode,
       }
     }
@@ -3874,7 +3934,10 @@ window.__ModuleLoader__.load({
             {
               type: 'button',
               className: 'dsh-tokenlens-chip',
-              title: t('chipHint'),
+              // v1.7.0: no native `title` here. Setting both a native title and
+              // the platform Tooltip made the two compete on hover (the native
+              // one stole/released hover as it appeared), which flickered the
+              // surrounding conversation area. The Tooltip carries the same text.
               'aria-label': t('chipHint'),
               'aria-haspopup': 'dialog',
               onClick: () => openDialog(sessionId),
@@ -3909,7 +3972,8 @@ window.__ModuleLoader__.load({
             {
               type: 'button',
               className: 'dsh-tokenlens-chip',
-              title: label,
+              // v1.7.0: same as the normal chip — only the platform Tooltip, so
+              // the native and platform tooltips cannot compete on hover.
               'aria-label': label,
               'aria-haspopup': 'dialog',
               ...(needsConfig ? { 'data-needs-config': 'true' } : {}),
@@ -4976,6 +5040,30 @@ window.__ModuleLoader__.load({
       store.set({ showDetails: store.get().showDetails !== true })
     }
 
+    /**
+     * Detach `node` from the slot's ancestor chain by rendering it into <body>
+     * (v1.7.0).
+     *
+     * The `conversation.input.overlay` slot lives inside the conversation area,
+     * and in DSH 0.2.2-rc.1 an ancestor there establishes a containing block, so
+     * the overlay's `position: fixed` resolved against that ancestor and the
+     * dialog could only appear at the bottom of the conversation. Portalling
+     * detaches it so it centres on the viewport. Returns the node unchanged when
+     * react-dom or a DOM is unavailable (the Node test harness), so the rendered
+     * tree keeps its shape there.
+     */
+    function portalize(node) {
+      const canPortal =
+        ReactDOM !== null &&
+        typeof ReactDOM.createPortal === 'function' &&
+        typeof document !== 'undefined' &&
+        document !== null &&
+        document.body !== undefined &&
+        document.body !== null
+      if (!canPortal) return node
+      return ReactDOM.createPortal(node, document.body)
+    }
+
     /**
      * The dialog shell: a fixed overlay with an explicitly sized panel.
      *
@@ -5007,15 +5095,18 @@ window.__ModuleLoader__.load({
           /* closing must never throw */
         }
       }
-      return h(
-        'div',
-        {
-          className: 'dsh-tokenlens-overlay',
-          role: 'presentation',
-          onMouseDown: (event) => {
-            if (event.target === event.currentTarget) close()
+      // v1.7.0: portal to <body> so the overlay centres on the viewport instead
+      // of resolving `position: fixed` against the conversation area.
+      return portalize(
+        h(
+          'div',
+          {
+            className: 'dsh-tokenlens-overlay',
+            role: 'presentation',
+            onMouseDown: (event) => {
+              if (event.target === event.currentTarget) close()
+            },
           },
-        },
         h(
           'div',
           {
@@ -5042,6 +5133,7 @@ window.__ModuleLoader__.load({
           h('div', { className: 'dsh-tokenlens-modal-body' }, children),
           footer === undefined || footer === null ? null : h('div', { className: 'dsh-tokenlens-modal-foot' }, footer),
         ),
+        ),
       )
     }
 
@@ -5959,6 +6051,83 @@ window.__ModuleLoader__.load({
       )
     }
 
+    /**
+     * The output-speed (TPS) trend card (v1.7.0), shown under 明细.
+     *
+     * `tps` is output tokens over the model's OWN request time (`step/start` to
+     * `assistant/message`), so the step's tool calls do not dilute it — but
+     * reasoning tokens are included in "output", which the hint says.
+     */
+    function buildSpeedSection(state, ctx, t) {
+      const stats = ctx.stats
+      const scoped = ctx.providerScoped ? ctx.currentRow?.speed ?? null : stats?.speed ?? null
+      const series = scoped === null || scoped === undefined ? null : scoped
+      const byDay = series === null ? [] : series.byDay
+      const head = h(
+        'div',
+        { key: 'head', className: 'dsh-tokenlens-section-head' },
+        h(
+          'span',
+          { className: 'dsh-tokenlens-section-title' },
+          Icon('chart', 14),
+          t('statsSpeedTitle'),
+        ),
+        series !== null && series.total.tps !== null
+          ? h(
+              'span',
+              { className: 'dsh-tokenlens-hint', 'data-speed-total': String(series.total.tps) },
+              t('statsSpeedTotal', { tps: series.total.tps.toFixed(1) }),
+            )
+          : null,
+      )
+      const body =
+        byDay.length === 0
+          ? h(
+              'div',
+              { key: 'empty', className: 'dsh-tokenlens-chart-empty', 'data-speed-empty': 'true' },
+              h('span', { key: 'hint', className: 'dsh-tokenlens-hint' }, t('statsSpeedEmpty')),
+            )
+          : (() => {
+              const max = Math.max(...byDay.map((entry) => entry.tps ?? 0), 1)
+              const bars = byDay.map((entry, index) => {
+                const tps = entry.tps ?? 0
+                const height = Math.max(2, Math.round((tps / max) * 1000) / 10)
+                return h(
+                  'div',
+                  {
+                    key: `speed-${entry.day}-${index}`,
+                    className: 'dsh-tokenlens-chart-bar-wrap',
+                    'data-speed-day': entry.day,
+                    'data-speed-tps': String(tps),
+                    title: t('statsSpeedBarTitle', {
+                      date: entry.day,
+                      tps: tps.toFixed(1),
+                      tokens: formatTokensPrecise(entry.outputTokens),
+                      seconds: entry.seconds.toFixed(1),
+                    }),
+                  },
+                  h('div', {
+                    className: 'dsh-tokenlens-chart-bar',
+                    style: { height: `${height}%` },
+                    'aria-hidden': 'true',
+                  }),
+                )
+              })
+              return h(
+                'div',
+                { key: 'bars', className: 'dsh-tokenlens-chart-plot', 'data-speed-plot': 'true' },
+                h('div', { key: 'row', className: 'dsh-tokenlens-chart-bars' }, bars),
+              )
+            })()
+      return h(
+        'div',
+        { key: 'speed', className: 'dsh-tokenlens-section', 'data-speed-section': 'true' },
+        head,
+        h('div', { key: 'hint', className: 'dsh-tokenlens-subtitle' }, t('statsSpeedHint')),
+        body,
+      )
+    }
+
     function buildStatsDetails(state, ctx, t) {
       const { stats, hasMonth } = ctx
       if (stats === null) return null
@@ -7422,6 +7591,12 @@ window.__ModuleLoader__.load({
           { key: 'row-details', className: 'dsh-tokenlens-chart-layout-row' },
           buildStatsDetails(state, statsCtx, t),
         ),
+        // v1.7.0: the output-speed trend sits under 明细, as its own full-width row.
+        h(
+          'div',
+          { key: 'row-speed', className: 'dsh-tokenlens-chart-layout-row' },
+          buildSpeedSection(state, statsCtx, t),
+        ),
       )
       const body = [buildManageButton(state, t), statsArea]
       const displayVersion = currentPluginVersionOf(state)

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.6'
+export const PLUGIN_VERSION = '1.7.0'
 
 /** Documented defaults; every field of the raw row config is optional. */
 const DEFAULTS = {

package/lib/providers.mjs

@@ -549,14 +549,27 @@ export function parseCommandCode({ credits, subscription, whoami, usageSummary }
   // meter jump while the account did not move, so it never does that here.
   const summary = usageSummary !== null && typeof usageSummary === 'object' ? usageSummary : {}
   const periodSpend = toNumber(summary.totalMonthlyCredits) ?? toNumber(summary.totalCredits)
+  // `/alpha/usage/summary` is an aggregate and LAGS the live windows by up to a
+  // few cents (observed $1.12 vs $1.28 live), which would understate the derived
+  // grant and therefore the percentage. When the summary is present it anchors
+  // the period, and a rolling window's `used` — always a subset of the period —
+  // can then only raise the estimate towards the truth, so the largest of them is
+  // taken. WITHOUT the summary the windows are NOT usable this way: a weekly
+  // window that does not cover the whole period would inflate the grant and drive
+  // the percentage towards zero, so that case stays `null`.
+  const liveWindowSpend =
+    periodSpend === null
+      ? []
+      : [toNumber(limits.fiveHour?.used), toNumber(limits.weekly?.used)].filter((value) => value !== null)
+  const spend = periodSpend === null ? null : Math.max(periodSpend, ...liveWindowSpend)
   const reportedGrant = toNumber(credit.monthlyCreditsGranted)
   const granted =
     reportedGrant !== null && reportedGrant > 0
       ? reportedGrant
-      : remaining !== null && periodSpend !== null
-        ? remaining + periodSpend
+      : remaining !== null && spend !== null
+        ? remaining + spend
         : null
-  const monthlyUsed = granted !== null && remaining !== null ? Math.max(0, granted - remaining) : periodSpend
+  const monthlyUsed = granted !== null && remaining !== null ? Math.max(0, granted - remaining) : spend
   const monthlyPercent =
     granted !== null && granted > 0 && monthlyUsed !== null
       ? normalizePercent((monthlyUsed / granted) * 100)

package/lib/usage-stats.mjs

@@ -61,7 +61,17 @@ const DECODES_CONCATENATED_FRAMES = (() => {
 const SESSION_FILE = 'session.v4.jsonl.zstd'
 
 /** Cache schema version; a mismatch discards the cache. */
-const CACHE_VERSION = 5
+const CACHE_VERSION = 6
+
+/**
+ * How many days the daily series (and therefore the 图表 mode and the
+ * 最近X天 provider window) may cover (v1.7.0).
+ *
+ * The wire used to carry 120 days, so a provider first seen months ago reported
+ * 最近90天 while every other figure and the charts described 30. One span now
+ * governs all of them.
+ */
+export const DAILY_SERIES_DAYS = 30
 
 /** What the numbers are, by provider id (display fallback; config can override). */
 const PROVIDER_LABELS = {
@@ -235,6 +245,11 @@ export function foldSession(records) {
   const models = Object.create(null)
   const hours = Object.create(null)
   const workspaces = Object.create(null)
+  // v1.7.0: output-speed (TPS) samples. A step's model time is
+  // `assistant/message.time − step/start.time`: the step's tool calls are emitted
+  // AFTER the message, so they do not dilute it.
+  const speed = Object.create(null)
+  const stepStarts = new Map()
   let latestTime = 0
   let sessionCwd = null
   const session = { seeded: false, subagent: false, createdAt: null, id: null, inheritedEvents: 0 }
@@ -267,6 +282,17 @@ export function foldSession(records) {
       continue
     }
     if (boundarySeq !== null && Number.isSafeInteger(record.seq) && record.seq <= boundarySeq) continue
+    // v1.7.0: remember when each step's model request started, so the matching
+    // `assistant/message` can be turned into a duration.
+    if (record.type === 'step/start') {
+      const turn = record.data?.turn
+      const step = record.data?.step
+      const startedAt = typeof record.time === 'number' && Number.isFinite(record.time) ? record.time : null
+      if (startedAt !== null && Number.isSafeInteger(turn) && Number.isSafeInteger(step)) {
+        stepStarts.set(`${turn}:${step}`, startedAt)
+      }
+      continue
+    }
     const usage = usageOf(record)
     if (usage === null) continue
     const time = typeof record.time === 'number' && Number.isFinite(record.time) ? record.time : null
@@ -301,6 +327,23 @@ export function foldSession(records) {
     const dayProvider = (dayBucket.providers[attributedProvider] ??= emptyBucket())
     addBucket(dayProvider, usage)
     addBucket((providers[attributedProvider] ??= emptyBucket()), usage)
+    // v1.7.0: one speed sample per completed step.
+    if (record.type === 'assistant/message' && usage.output > 0) {
+      const turn = record.data?.turn
+      const step = record.data?.step
+      const startedAt = Number.isSafeInteger(turn) && Number.isSafeInteger(step)
+        ? stepStarts.get(`${turn}:${step}`)
+        : undefined
+      const elapsedMs = startedAt === undefined ? null : time - startedAt
+      if (elapsedMs !== null && elapsedMs > 0) {
+        const daySpeed = (speed[day] ??= { providers: Object.create(null) })
+        const slot = (daySpeed.providers[attributedProvider] ??= { output: 0, seconds: 0, steps: 0 })
+        slot.output += usage.output
+        slot.seconds += elapsedMs / 1000
+        slot.steps += 1
+        stepStarts.delete(`${turn}:${step}`)
+      }
+    }
     const modelKey = `${attributedProvider}/${attributedModel}`
     const modelBucket = (models[modelKey] ??= {
       provider: attributedProvider,
@@ -318,7 +361,7 @@ export function foldSession(records) {
       if (Number(key) < cutoff) delete hours[key]
     }
   }
-  return { days, providers, models, hours, workspaces, session }
+  return { days, providers, models, hours, workspaces, session, speed }
 }
 
 /** Merge one file's folded contribution into an aggregate being built. */
@@ -329,6 +372,16 @@ function mergeFold(aggregate, fold) {
       addBucket((target.providers[provider] ??= emptyBucket()), bucket)
     }
   }
+  // v1.7.0: merge the speed samples the same way as the token buckets.
+  for (const [day, daySpeed] of Object.entries(fold.speed ?? {})) {
+    const target = (aggregate.speed[day] ??= { providers: Object.create(null) })
+    for (const [provider, slot] of Object.entries(daySpeed.providers ?? {})) {
+      const into = (target.providers[provider] ??= { output: 0, seconds: 0, steps: 0 })
+      into.output += slot.output
+      into.seconds += slot.seconds
+      into.steps += slot.steps
+    }
+  }
   for (const [provider, bucket] of Object.entries(fold.providers ?? {})) {
     addBucket((aggregate.providers[provider] ??= emptyBucket()), bucket)
   }
@@ -507,7 +560,18 @@ export function createUsageStats(input) {
     const modelsAggregate = Object.create(null)
     const hoursAggregate = Object.create(null)
     const workspacesAggregate = Object.create(null)
+    // v1.7.0: `speedAggregate[day].providers[providerId] = {output, seconds, steps}`
+    const speedAggregate = Object.create(null)
     for (const entry of Object.values(cache.files)) {
+      for (const [day, daySpeed] of Object.entries(entry.speed ?? {})) {
+        const target = (speedAggregate[day] ??= { providers: Object.create(null) })
+        for (const [provider, slot] of Object.entries(daySpeed.providers ?? {})) {
+          const into = (target.providers[provider] ??= { output: 0, seconds: 0, steps: 0 })
+          into.output += typeof slot.output === 'number' ? slot.output : 0
+          into.seconds += typeof slot.seconds === 'number' ? slot.seconds : 0
+          into.steps += typeof slot.steps === 'number' ? slot.steps : 0
+        }
+      }
       for (const [day, dayBucket] of Object.entries(entry.days ?? {})) {
         const target = (daysAggregate[day] ??= { providers: Object.create(null) })
         for (const [provider, bucket] of Object.entries(dayBucket.providers ?? {})) {
@@ -725,6 +789,8 @@ export function createUsageStats(input) {
       providers,
       models: models.slice(0, 12),
       daily,
+      // v1.7.0: raw per-day output-speed samples for the wire builder below.
+      speed: speedAggregate,
       scan,
     }
   }
@@ -789,6 +855,8 @@ export function createUsageStats(input) {
         models: fold.models,
         hours: fold.hours,
         workspaces: fold.workspaces,
+        // v1.7.0: per-day output-speed samples (CACHE_VERSION 6).
+        speed: fold.speed,
       }
       nextFiles[path] = entry
       scanned += 1
@@ -1259,7 +1327,10 @@ export function createUsageStats(input) {
     }
     const daily = [...dailyMap.entries()]
       .sort(([left], [right]) => left.localeCompare(right))
-      .slice(-120)
+      // v1.7.0: 30 days, matching the 最近30天 bucket and the 最近X天 label. The
+      // series used to carry 120 days, so the 图表 mode could plot a wider window
+      // than the 数据 mode described.
+      .slice(-DAILY_SERIES_DAYS)
       .map(([day, entry]) => {
         const providers = Object.create(null)
         for (const [providerId, slot] of entry.providers) {
@@ -1292,15 +1363,77 @@ export function createUsageStats(input) {
       return Math.max(1, Math.round((end - start) / dayMs) + 1)
     }
     const providers = [...providerMap.values()].sort((a, b) => b.allTime.total - a.allTime.total)
+    /**
+     * Build one output-speed series (v1.7.0).
+     *
+     * `tps` is output tokens over the summed model time of the steps that
+     * produced them, so it describes generation speed rather than wall clock:
+     * the tool calls of a step are emitted after its `assistant/message` and are
+     * therefore excluded. A day with no positive duration is dropped instead of
+     * being given an infinite rate.
+     */
+    const speedSeries = (providerId) => {
+      const source = dsh.speed ?? {}
+      const byDay = []
+      let output = 0
+      let seconds = 0
+      let steps = 0
+      for (const day of Object.keys(source).sort()) {
+        if (day < thirtyStart) continue
+        let dayOutput = 0
+        let daySeconds = 0
+        let daySteps = 0
+        for (const [id, slot] of Object.entries(source[day].providers ?? {})) {
+          if (providerId !== null && id !== providerId) continue
+          dayOutput += slot.output
+          daySeconds += slot.seconds
+          daySteps += slot.steps
+        }
+        if (daySeconds <= 0 || dayOutput <= 0) continue
+        byDay.push({
+          day,
+          outputTokens: dayOutput,
+          seconds: Math.round(daySeconds * 10) / 10,
+          tps: Math.round((dayOutput / daySeconds) * 10) / 10,
+          steps: daySteps,
+        })
+        output += dayOutput
+        seconds += daySeconds
+        steps += daySteps
+      }
+      return {
+        byDay,
+        total: {
+          outputTokens: output,
+          seconds: Math.round(seconds * 10) / 10,
+          tps: seconds > 0 ? Math.round((output / seconds) * 10) / 10 : null,
+          steps,
+        },
+      }
+    }
     for (const provider of providers) {
       const effectiveDay = firstDays.get(provider.providerId) ?? todayDay
       provider.effectiveDay = effectiveDay
-      provider.effectiveDays = dayCount(effectiveDay, todayDay)
-      // A provider has no records before its effective day, so the all-time
-      // bucket is exactly the since-effective window.
-      provider.sinceEffective = cloneBucket(provider.allTime)
+      // v1.7.0: the 最近X天 window is capped at the same 30 days the charts and
+      // the 最近30天 bucket use. A provider first seen 90 days ago used to report
+      // 最近90天 while every other figure on the page covered 30.
+      const fullDays = dayCount(effectiveDay, todayDay)
+      const cappedDays = Math.min(DAILY_SERIES_DAYS, fullDays)
+      provider.effectiveDays = cappedDays
+      // The label and the numbers must describe the SAME span. When the real
+      // history is longer than the cap, the since-effective bucket is therefore
+      // the 30-day one rather than all-time (which would carry older records
+      // under a 最近30天 label).
+      provider.sinceEffective =
+        cappedDays < fullDays ? cloneBucket(provider.last30Days) : cloneBucket(provider.allTime)
+      // v1.7.0: each provider row carries its own output-speed series so the
+      // chart can follow the same scope switch as the token sections.
+      provider.speed = speedSeries(provider.providerId)
       for (const harness of Object.values(provider.harnesses ?? {})) {
-        harness.sinceEffective = cloneBucket(harness.allTime)
+        harness.sinceEffective =
+          cappedDays < fullDays && harness.last30Days !== undefined
+            ? cloneBucket(harness.last30Days)
+            : cloneBucket(harness.allTime)
       }
     }
     return {
@@ -1315,6 +1448,8 @@ export function createUsageStats(input) {
       allTime,
       workspaces,
       providers,
+      // v1.7.0: output-speed (TPS) series across every harness.
+      speed: speedSeries(null),
       harnesses,
       models: dsh.models,
       daily,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tokenlens",
-  "version": "1.6.6",
+  "version": "1.7.0",
   "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",