dsh-tokenlens 1.5.1 → 1.5.2

package/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 **版本记录约定**：同一发布日只保留一个章节，标题取当日**最后一个**已发布版本号；当日多次发布的改动合并到该章节，并在标题下注明当日实际发布过的版本号（npm 上仍可安装这些独立版本）。若当日已有发布，后续小改动不再单独增加版本号，而是并入下一篇日志。这样日志按天规整、不出现同日多个小版本。
 
+## 1.5.2 — 2026-11-02
+
+（当日已发布版本：v1.3.5 / v1.3.6 / v1.3.7 / v1.3.8 / v1.3.9 / v1.4.0 / v1.5.0 / v1.5.1 / v1.5.2）
+
+- **fix(open-design): 窗口重置后「已消耗」不归零**——Design Plan 的窗口是**锚定**的（从订阅时间起算，每 5 小时 / 7 天翻篇），但弹窗一直按「最近 5 小时 / 最近 7 天」从本机日志切片，两者根本不是同一区间。于是 5 小时窗口重置后仍把上一轮的量算进来，`已消耗` 居高不下、`预计可消耗` 被放大（实测 96.4% → 7.3% 时估算从 766M 暴涨到 10.1B）
+- **fix(open-design): 7 天窗口存在同一问题**——已一并修复，不是只修 5 小时
+- fix(wire): 窗口对象新增 `startedAt`（上游 `windowStart`），客户端据此按窗口真实 `[startedAt, resetsAt)` 区间累加本机每小时 Token，只统计完整落在区间内的小时；窗口边界落在整点内时不计该小时，宁可少算也不按比例猜
+- fix(ui): 无法确定窗口区间时才回退到原来的滚动桶（旧 Host 没下发 `startedAt`），因此旧版本 Host 仍能工作，不会显示空白
+- 测试：314 → 317（5h 重置后只统计新窗口的回归测试、7d 中途重置的锚点切片、Host 下发 `startedAt`）
+
 ## 1.5.1 — 2026-11-02
 
 （当日已发布版本：v1.3.5 / v1.3.6 / v1.3.7 / v1.3.8 / v1.3.9 / v1.4.0 / v1.5.0 / v1.5.1）

package/PROTOCOL.md

@@ -78,6 +78,7 @@ from `dsh-app://app/` and forwards non-asset paths to the Host).
   "windows": {                               // canonical ids, display order
     "rolling": { "id": "rolling", "percent": 8, "status": "ok",
                  "resetsAt": "2026-10-25T11:31:25.000Z", "remainingMs": 123456,
+                 "startedAt": "2026-10-25T06:31:25.000Z",   // v1.5.2, when reported
                  "used": 0.5, "cap": 2.5, "unit": "USD" } | null,
     "weekly":  { … } | null,
     "monthly": { … } | null
@@ -200,6 +201,13 @@ Rules:
 - The model picker emits `deepseek-official` / `deepseek-account`, never a bare
   `deepseek`: the Host aliases `deepseek-official` onto the `deepseek` adapter.
   A provider without an adapter answers `unsupported-provider`.
+- **`startedAt` (v1.5.2) is the window instance's own start**, not "now minus the
+  window length". Design Plan windows are anchored to the subscription time
+  (`resetMode: "anchored_recurring"`), so a window can begin at 09:53 and reset at
+  14:53 regardless of the current clock. A client that wants to describe a window
+  in local tokens MUST sum the interval `[startedAt, resetsAt)`; using a trailing
+  "last N hours" slice mixes in the previous window and keeps reporting consumed
+  tokens after a reset. Omitted when the upstream reports no `windowStart`.
 - **Plan capacity vs local usage (v3 split):** the snapshot above is the
   server-side **plan capacity** (provider-native units). `used` / `cap` / `unit`
   appear only for providers that report their allowance in a native unit

package/README.md

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

package/client.js

@@ -993,6 +993,10 @@ window.__ModuleLoader__.load({
         status: typeof raw.status === 'string' && raw.status !== '' ? raw.status : 'unknown',
         resetsAt: typeof raw.resetsAt === 'string' ? raw.resetsAt : null,
         remainingMs: Number.isFinite(raw.remainingMs) ? raw.remainingMs : null,
+        // v1.5.2: the window instance's own start (an anchored Design Plan window
+        // does not begin "N hours ago"), so the local token slice is aligned with
+        // the allowance the percentage describes.
+        startedAt: typeof raw.startedAt === 'string' ? raw.startedAt : null,
         // Provider-native capacity (e.g. Command Code USD): shown only when all
         // three fields are usable, so an unsized window never renders "$undefined".
         used: numberOrNull(raw.used),
@@ -1680,7 +1684,72 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * The `{short, full}` labels of a provider (v0.10.0).
+     * Local tokens spent inside one allowance window (v1.5.2).
+     *
+     * A Design Plan window is ANCHORED: it starts at the subscription anchor and
+     * resets every N hours, so it is not "the last N hours" (the old behaviour,
+     * which kept showing pre-reset consumption after a reset and inflated the
+     * estimated quota ~13x). The window's own `startedAt` / `resetsAt` bound the
+     * slice, folded from the per-day, per-provider hour histograms.
+     *
+     * @returns the token total, or `null` when the range cannot be resolved (an
+     *   old Host without `startedAt`, or no histogram), in which case the caller
+     *   falls back to the rolling bucket.
+     */
+    function localTokensInWindow(stats, statsRow, providerId, window) {
+      if (stats === null || statsRow === null || window === null) return null
+      const startMs = typeof window.startedAt === 'string' ? Date.parse(window.startedAt) : NaN
+      const endMs = typeof window.resetsAt === 'string' ? Date.parse(window.resetsAt) : NaN
+      if (!Number.isFinite(startMs) || !Number.isFinite(endMs) || endMs <= startMs) return null
+      const daily = stats.daily
+      if (!Array.isArray(daily) || daily.length === 0) return null
+      let total = null
+      for (const entry of daily) {
+        // A day bucket only contributes whole hours through `hours`; resolve the
+        // day's local midnight, then walk its 24 slots.
+        const dayStartMs = localDayStartMs(entry.day)
+        if (!Number.isFinite(dayStartMs)) continue
+        const providerHours = entry.providers?.[providerId]?.hours ?? null
+        const hours = Array.isArray(providerHours) ? providerHours : null
+        if (hours === null) continue
+        for (let slot = 0; slot < hours.length && slot < 24; slot += 1) {
+          const hourStart = dayStartMs + slot * 3600000
+          const hourEnd = hourStart + 3600000
+          // An hour counts only when the whole slot lies inside the window; a
+          // window boundary mid-hour would otherwise need a proportional guess.
+          if (hourStart < startMs || hourEnd > endMs) continue
+          total = (total ?? 0) + (Number.isFinite(hours[slot]) ? hours[slot] : 0)
+        }
+      }
+      return total
+    }
+
+    /** Local midnight (epoch ms) of a `YYYY-MM-DD` day key, or NaN. */
+    function localDayStartMs(day) {
+      if (typeof day !== 'string') return Number.NaN
+      const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(day)
+      if (match === null) return Number.NaN
+      const ms = new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3])).getTime()
+      return Number.isFinite(ms) ? ms : Number.NaN
+    }
+
+    /**
+     * The local tokens consumed inside one allowance window.
+     *
+     * Prefers the window-anchored slice; falls back to the rolling provider
+     * bucket only when the window bounds are unavailable (an older Host).
+     */
+    function windowLocalUsed(stats, statsRow, providerId, window) {
+      const anchored = localTokensInWindow(stats, statsRow, providerId, window)
+      if (anchored !== null) return anchored
+      const id = window?.id ?? ''
+      if (id === 'rolling') return statsRow?.fiveHours?.total ?? 0
+      if (id === 'weekly') return statsRow?.last7Days?.total ?? 0
+      if (id === 'monthly') return statsRow?.last30Days?.total ?? 0
+      return 0
+    }
+
+    /** The `{short, full}` labels of a provider (v0.10.0).
      *
      * Wire labels cached from the providers payload win, then the local catalog,
      * then the snapshot / raw id. Both fields are always usable strings, so the
@@ -3829,7 +3898,7 @@ window.__ModuleLoader__.load({
     }
 
     /** One allowance-window row: label + percent, bar, reset countdown, status. */
-    function buildWindowRow(id, window, state, now, t, statsRow = null) {
+    function buildWindowRow(id, window, state, now, t, statsRow = null, stats = null, snapshotProviderId = '') {
       const label = rowLabel(id, t)
       const level = window === null ? 'unknown' : levelOf(window.percent, window.status)
       const percentText = formatPercent(window?.percent ?? null, t)
@@ -3838,14 +3907,10 @@ window.__ModuleLoader__.load({
       // v0.30.13: local-token consumption + estimated consumable quota. The used
       // number comes from the selected provider's local stats buckets; the quota
       // is only an estimate derived from the provider-reported percentage.
-      const localUsed =
-        id === 'rolling'
-          ? statsRow?.fiveHours?.total ?? 0
-          : id === 'weekly'
-            ? statsRow?.last7Days?.total ?? 0
-            : id === 'monthly'
-              ? statsRow?.last30Days?.total ?? 0
-              : 0
+      // v1.5.2: slice from the window's OWN bounds, so a reset window starts from
+      // zero instead of replaying the previous window's consumption.
+      const providerId = statsRow?.providerId ?? snapshotProviderId ?? ''
+      const localUsed = windowLocalUsed(stats, statsRow, providerId, window)
       const percent = window !== null && Number.isFinite(window.percent) ? window.percent : null
       const quota = percent !== null && percent > 0 && localUsed > 0 ? localUsed / (percent / 100) : null
       // v0.30.13 follow-up: the estimate is INLINE on the existing reset line
@@ -5372,7 +5437,9 @@ window.__ModuleLoader__.load({
           const balanceRow = buildCapacityBalanceRow(snapshot.balance, t)
           const designPlanRow = buildDesignPlanRow(snapshot.designPlan, t)
           if (snapshot.windows !== null) {
-            const rows = WINDOW_ORDER.map((id) => buildWindowRow(id, snapshot.windows[id], state, now, t, statsRow))
+            const rows = WINDOW_ORDER.map((id) =>
+              buildWindowRow(id, snapshot.windows[id], state, now, t, statsRow, stats, snapshot.provider.id),
+            )
             if (balanceRow !== null) rows.push(balanceRow)
             if (designPlanRow !== null) rows.push(designPlanRow)
             section.push(h('div', { key: 'rows', className: 'dsh-tokenlens-rows' }, rows))

package/index.js

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

package/lib/providers.mjs

@@ -344,12 +344,17 @@ export function makeWindow(id, input, now) {
   const used = toNumber(input?.used)
   const cap = toNumber(input?.cap)
   const unit = typeof input?.unit === 'string' && input.unit !== '' ? input.unit : undefined
+  // v1.5.2: the upstream window's own start instant, when the provider reports
+  // one. The client slices its local token counters from here so the numbers it
+  // shows describe THIS window rather than an arbitrary trailing period.
+  const startMs = parseTimestamp(input?.windowStart)
   return {
     id,
     percent,
     status: typeof input?.status === 'string' && input.status !== '' ? input.status : 'unknown',
     resetsAt: resetsMs === null ? null : new Date(resetsMs).toISOString(),
     remainingMs: resetsMs === null ? null : Math.max(0, resetsMs - now),
+    ...(startMs === null ? {} : { startedAt: new Date(startMs).toISOString() }),
     ...(used === null ? {} : { used }),
     ...(cap === null ? {} : { cap }),
     ...(used === null || cap === null || unit === undefined ? {} : { unit }),
@@ -843,6 +848,10 @@ export function parseOpenDesignUsage(payload, workspaceId, now = Date.now()) {
       status: 'ok',
       resetsAt:
         typeof row.resetsAt === 'string' || typeof row.resetsAt === 'number' ? row.resetsAt : undefined,
+      // v1.5.2: the ACTUAL start of this window instance. Design Plan windows are
+      // anchored to the subscription time and reset every N hours, so the local
+      // token counters must slice from here — not from a naive "last N hours".
+      windowStart: typeof row.windowStart === 'string' ? row.windowStart : undefined,
     }
   }
   const windows = windowSet(inputs, now)

package/package.json

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