@mzzsfy/dsh-usage-dash 0.3.0 → 0.4.0

package/test/store.test.mjs

@@ -81,7 +81,9 @@ function fakeDomain({ failUpdate = () => null } = {}) {
   }
 }
 
-const facilityOf = (domain) => ({ open: async () => domain })
+const facilityOf = (domain, backupDomain) => ({
+  open: async (definition) => (definition?.name === 'usage_stats_backup' ? (backupDomain ?? domain) : domain),
+})
 
 const tokenSample = (time, extra = {}) => ({
   time,
@@ -437,6 +439,61 @@ test('启动时游标非空则既有行保留', async () => {
   assert.equal(domain.rows.size, 1)
 })
 
+test('reset 前自动快照,restore 整体回退到快照态', async () => {
+  const domain = fakeDomain()
+  const backup = fakeDomain()
+  const store = new UsageStore(facilityOf(domain, backup))
+  await store.record(tokenSample(local(2026, 8, 2, 14, 0)))
+  await store.markSeenSessions(['s1', 's2'])
+  assert.equal(store.backupInfo().available, false)
+  await store.reset()
+  assert.equal(domain.rows.size, 0)
+  assert.deepEqual([...(await store.seenSessions())], [])
+  // 快照在清空前生成:行与游标都可回退
+  const info = store.backupInfo()
+  assert.equal(info.available, true)
+  assert.equal(info.rows, 3)
+  assert.equal(info.sessions, 2)
+  const restored = await store.restoreFromBackup()
+  assert.equal(restored.rows, 3)
+  assert.equal(domain.rows.size, 3)
+  assert.deepEqual([...(await store.seenSessions())].sort(), ['s1', 's2'])
+})
+
+test('restore 前先快照当前态:回退动作自身可再回退', async () => {
+  const domain = fakeDomain()
+  const backup = fakeDomain()
+  const store = new UsageStore(facilityOf(domain, backup))
+  await store.record(tokenSample(local(2026, 8, 2, 14, 0)))
+  await store.reset()
+  await store.record(tokenSample(local(2026, 8, 3, 14, 0), { inputTokens: 99 }))
+  await store.flushNow()
+  // 第一轮回退到重建前(有 8/2 数据)
+  await store.restoreFromBackup()
+  const dayRows = await store.rangeRows('D', '2026-08-02', '2026-08-02')
+  assert.equal(dayRows.length, 1)
+  // 第二次回退回到"重建后"(8/3 数据),回退链不断
+  await store.restoreFromBackup()
+  const after = await store.rangeRows('D', '2026-08-03', '2026-08-03')
+  assert.equal(after.length, 1)
+})
+
+test('备份域不可用:重建照常,backupInfo 标记不可用,restore 报错', async () => {
+  const domain = fakeDomain()
+  const facility = {
+    open: async (definition) => {
+      if (definition?.name === 'usage_stats_backup') throw new Error('backup domain unavailable')
+      return domain
+    },
+  }
+  const store = new UsageStore(facility)
+  await store.record(tokenSample(local(2026, 8, 2, 14, 0)))
+  await store.reset()
+  assert.equal(domain.rows.size, 0)
+  assert.equal(store.backupInfo().available, false)
+  await assert.rejects(store.restoreFromBackup(), /backup domain unavailable/)
+})
+
 test('域打开失败进入降级:ready 可等待,操作按调用失败', async () => {
   const store = new UsageStore({ open: () => Promise.reject(new Error('domain already open')) })
   await store.readyPromise()

package/test/turn-tail.test.mjs

@@ -1,4 +1,4 @@
-// 注入点B(S15)纯函数层测试:select 矩阵/模型键回退/单轮行文本/title 口径/文案键/显隐 CSS 镜像
+// 注入点B 纯函数层测试:messageId 反查矩阵/模型键回退/芯片文本/title 口径/文案键/注册与 CSS 镜像
 // client.js 为经典 script bundle(禁 import/export),整文件 IIFE 书挡;经 client-eval 剥壳后整源求值,按顶层声明名收集
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
@@ -10,14 +10,13 @@ const {
   MESSAGES_EN,
   MESSAGES_ZH,
   MODEL_UNROUTED,
-  TURN_TAIL_DATA_KEY,
-  TURN_TAIL_PRIORITY,
-  buildTurnCostLine,
+  buildTurnCostChipText,
   createTranslator,
   matchPrice,
-  selectTurnTokenUsage,
+  turnCostAmountOf,
   turnCostTitleText,
   turnModelOf,
+  turnTokenUsageOfMessage,
 } = core
 
 const zhT = createTranslator(MESSAGES_ZH)
@@ -26,32 +25,70 @@ const enT = createTranslator(MESSAGES_EN)
 // 本地时区固定时钟,与 client.test.mjs 同一刻
 const NOW = new Date(2026, 2, 15, 14, 30, 45)
 
-test('chain 常量锁定:数据键与尝试顺序后试于 deliverables', () => {
-  assert.equal(TURN_TAIL_DATA_KEY, 'turn-tail')
-  assert.equal(TURN_TAIL_PRIORITY, 1)
+const tailNode = (messageId, tokenUsage) => ({
+  kind: 'turn-tail',
+  data: { turn: 1, closing: { finalNode: { seq: 9, messageId } }, tokenUsage },
 })
 
-test('select 从 Turn 位置数据返回 tokenUsage 本体', () => {
+test('反查:matchId 命中返回 tokenUsage 本体', () => {
   const tokenUsage = { uncachedInputTokens: 10, outputTokens: 5, totalTokens: 15 }
-  const owner = { turn: { data: new Map([[TURN_TAIL_DATA_KEY, { tokenUsage }]]) } }
-  assert.equal(selectTurnTokenUsage(owner), tokenUsage)
+  assert.equal(turnTokenUsageOfMessage([tailNode('m-1', tokenUsage)], 'm-1'), tokenUsage)
 })
 
-test('select 数据键缺席或 tokenUsage 缺失返回 null', () => {
-  assert.equal(selectTurnTokenUsage({ turn: { data: new Map([[TURN_TAIL_DATA_KEY, {}]]) } }), null)
-  assert.equal(selectTurnTokenUsage({ turn: { data: new Map() } }), null)
+test('反查:多节点取命中者', () => {
+  const tokenUsage = { uncachedInputTokens: 1, outputTokens: 1, totalTokens: 2 }
+  const nodes = [tailNode('m-0', { uncachedInputTokens: 9, outputTokens: 9, totalTokens: 18 }), tailNode('m-1', tokenUsage)]
+  assert.equal(turnTokenUsageOfMessage(nodes, 'm-1'), tokenUsage)
 })
 
-test('select owner 形状残缺全部 null 不抛', () => {
-  assert.equal(selectTurnTokenUsage({ turn: { data: {} } }), null)
-  assert.equal(selectTurnTokenUsage({ turn: {} }), null)
-  assert.equal(selectTurnTokenUsage({}), null)
-  assert.equal(selectTurnTokenUsage(null), null)
-  assert.equal(selectTurnTokenUsage(undefined), null)
+test('反查:非命中 kind 与 messageId 不误收', () => {
+  const assistant = { kind: 'assistant', messageId: 'm-1', data: { closing: { finalNode: { messageId: 'm-1' } }, tokenUsage: {} } }
+  assert.equal(turnTokenUsageOfMessage([assistant], 'm-1'), null)
+  assert.equal(turnTokenUsageOfMessage([tailNode('m-0', {})], 'm-1'), null)
 })
 
-test('计价模型键取 routes 首个,缺失回退全通配键', () => {
-  assert.equal(turnModelOf({ routes: [{ provider: 'p', model: 'p/m' }] }), 'p/m')
+test('反查:tokenUsage 缺失返回 null', () => {
+  assert.equal(turnTokenUsageOfMessage([{ kind: 'turn-tail', data: { closing: { finalNode: { messageId: 'm-1' } } } }], 'm-1'), null)
+  assert.equal(turnTokenUsageOfMessage([tailNode('m-1', null)], 'm-1'), null)
+})
+
+test('反查:closing.usage 采样回退为聚合形态,可选桶带上', () => {
+  const sampled = { inputTokens: 100, outputTokens: 20, totalTokens: 130, cacheReadTokens: 10 }
+  const node = { kind: 'turn-tail', data: { closing: { finalNode: { seq: 1, messageId: 'm-1' }, usage: sampled } } }
+  assert.deepEqual(turnTokenUsageOfMessage([node], 'm-1'), { uncachedInputTokens: 100, outputTokens: 20, totalTokens: 130, cacheReadTokens: 10 })
+  const bare = { kind: 'turn-tail', data: { closing: { finalNode: { seq: 2, messageId: 'm-2' }, usage: { inputTokens: 1, outputTokens: 1, totalTokens: 2 } } } }
+  assert.deepEqual(turnTokenUsageOfMessage([bare], 'm-2'), { uncachedInputTokens: 1, outputTokens: 1, totalTokens: 2 })
+})
+
+test('反查:非数组与空列表返回 null', () => {
+  assert.equal(turnTokenUsageOfMessage(null, 'm-1'), null)
+  assert.equal(turnTokenUsageOfMessage(undefined, 'm-1'), null)
+  assert.equal(turnTokenUsageOfMessage([], 'm-1'), null)
+})
+
+test('反查:chat 节点表 Map 形态与数组等价', () => {
+  const tokenUsage = { uncachedInputTokens: 10, outputTokens: 5, totalTokens: 15 }
+  const nodes = new Map([
+    ['k1', tailNode('m-0', { uncachedInputTokens: 9, outputTokens: 9, totalTokens: 18 })],
+    ['k2', tailNode('m-1', tokenUsage)],
+  ])
+  assert.equal(turnTokenUsageOfMessage(nodes, 'm-1'), tokenUsage)
+  assert.equal(turnTokenUsageOfMessage(new Map(), 'm-1'), null)
+  assert.equal(turnTokenUsageOfMessage({ size: 0 }, 'm-1'), null)
+})
+
+test('反查:单节点形状残缺跳过不抛,后续命中不受阻', () => {
+  const hostile = { get kind() { throw new Error('boom') } }
+  const tokenUsage = { uncachedInputTokens: 1, outputTokens: 1, totalTokens: 2 }
+  assert.equal(turnTokenUsageOfMessage([hostile, tailNode('m-1', tokenUsage)], 'm-1'), tokenUsage)
+  assert.equal(turnTokenUsageOfMessage([{ kind: 'turn-tail', get data() { throw new Error('boom') } }], 'm-1'), null)
+  assert.equal(turnTokenUsageOfMessage([null, 'x', 42], 'm-1'), null)
+})
+
+test('计价模型键:双全拼两段,仅 model 用裸名,双缺回退全通配键', () => {
+  assert.equal(turnModelOf({ routes: [{ provider: 'p', model: 'm' }] }), 'p/m')
+  assert.equal(turnModelOf({ routes: [{ model: 'm' }] }), 'm')
+  assert.equal(turnModelOf({ routes: [{ provider: 'p' }] }), MODEL_UNROUTED)
   assert.equal(turnModelOf({ routes: [] }), MODEL_UNROUTED)
   assert.equal(turnModelOf({}), MODEL_UNROUTED)
   assert.equal(turnModelOf(null), MODEL_UNROUTED)
@@ -67,46 +104,63 @@ test('routes 缺失模型键命中全通配规则', () => {
   assert.deepEqual(matchPrice(rules, turnModelOf(tokenUsage), NOW), { input: 1, output: 0, cacheRead: 0, cacheWrite: 0 })
 })
 
-test('单轮行四桶全带:摘要含 prompt 三桶费用按价计', () => {
+test('芯片文本四桶全带:prompt 三桶入费用分母按价计', () => {
   const tokenUsage = {
     uncachedInputTokens: 8000, outputTokens: 1000, totalTokens: 10000,
-    cacheReadTokens: 1000, cacheWriteTokens: 0, routes: [{ provider: 'p', model: 'p/m' }],
+    cacheReadTokens: 1000, cacheWriteTokens: 0, routes: [{ provider: 'p', model: 'm' }],
   }
   const price = { input: 1, output: 2, cacheRead: 0, cacheWrite: 0 }
-  assert.equal(buildTurnCostLine(zhT, tokenUsage, price, '¥'), '输入 9K tok · 输出 1K tok · 费用 ≈ ¥0.01')
+  assert.equal(buildTurnCostChipText(zhT, tokenUsage, price, '¥'), '¥0.01')
 })
 
-test('单轮行可选桶缺失按 0 计入摘要与费用', () => {
+test('芯片文本可选桶缺失按 0 计入费用', () => {
   const tokenUsage = { uncachedInputTokens: 8000, outputTokens: 1000, totalTokens: 9000 }
   const price = { input: 1, output: 2, cacheRead: 5, cacheWrite: 5 }
-  assert.equal(buildTurnCostLine(zhT, tokenUsage, price, '¥'), '输入 8K tok · 输出 1K tok · 费用 ≈ ¥0.01')
+  assert.equal(buildTurnCostChipText(zhT, tokenUsage, price, '¥'), '¥0.01')
+})
+
+test('计费额 0 元为 null,正额保留', () => {
+  const tokenUsage = { uncachedInputTokens: 8000, outputTokens: 1000, totalTokens: 9000 }
+  assert.equal(turnCostAmountOf(tokenUsage, { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }), null)
+  assert.equal(turnCostAmountOf(tokenUsage, null), null)
+  assert.equal(turnCostAmountOf(tokenUsage, { input: 1, output: 0, cacheRead: 0, cacheWrite: 0 }), 0.008)
 })
 
-test('单轮行取不到价费用为占位符', () => {
+test('芯片文本取不到价为占位符', () => {
   const tokenUsage = { uncachedInputTokens: 8000, outputTokens: 1000, totalTokens: 9000 }
-  assert.equal(buildTurnCostLine(zhT, tokenUsage, null, ''), '输入 8K tok · 输出 1K tok · 费用 ≈ —')
-  assert.equal(buildTurnCostLine(enT, tokenUsage, null, ''), 'Input 8K tok · Output 1K tok · Cost ≈ —')
+  assert.equal(buildTurnCostChipText(zhT, tokenUsage, null, ''), '—')
+  assert.equal(buildTurnCostChipText(enT, tokenUsage, null, ''), '—')
 })
 
-test('title 估算口径,可选桶未上报追加标注', () => {
-  const full = { uncachedInputTokens: 1, outputTokens: 1, totalTokens: 2, cacheReadTokens: 0, cacheWriteTokens: 0 }
-  assert.equal(turnCostTitleText(zhT, full), '单轮用量按当前费率估算')
+test('title 含 token 摘要与估算口径,可选桶未上报追加标注', () => {
+  const full = { uncachedInputTokens: 8000, outputTokens: 1000, totalTokens: 9000, cacheReadTokens: 0, cacheWriteTokens: 0 }
+  assert.equal(turnCostTitleText(zhT, full), '输入 8K tok · 输出 1K tok,单轮用量按当前费率估算')
   const missing = { uncachedInputTokens: 1, outputTokens: 1, totalTokens: 2 }
-  assert.equal(turnCostTitleText(zhT, missing), '单轮用量按当前费率估算,该提供商未上报此桶')
-  assert.equal(turnCostTitleText(enT, missing), 'Per-turn usage estimated at current rates,Not reported by this provider')
+  assert.equal(turnCostTitleText(zhT, missing), '输入 1 tok · 输出 1 tok,单轮用量按当前费率估算,该提供商未上报此桶')
+  assert.equal(turnCostTitleText(enT, missing), 'Input 1 tok · Output 1 tok,Per-turn usage estimated at current rates,Not reported by this provider')
 })
 
-test('注入点B 文案键 zh/en 值锁定', () => {
-  assert.equal(MESSAGES_ZH['stats.turnCost'], '{summary} · 费用 ≈ {cost}')
-  assert.equal(MESSAGES_EN['stats.turnCost'], '{summary} · Cost ≈ {cost}')
+test('注入点B 文案键 zh/en 值锁定,独立行旧键已删', () => {
+  assert.equal(MESSAGES_ZH['stats.cost'], '费用 ≈ {cost}')
+  assert.equal(MESSAGES_EN['stats.cost'], 'Cost ≈ {cost}')
+  assert.equal(MESSAGES_ZH['turnCostChip'], '{cost}')
+  assert.equal(MESSAGES_EN['turnCostChip'], '{cost}')
+  assert.equal(MESSAGES_ZH['stats.turnCost'], undefined)
+  assert.equal(MESSAGES_EN['stats.turnCost'], undefined)
   assert.equal(MESSAGES_ZH.turnCostTitle, '单轮用量按当前费率估算')
   assert.equal(MESSAGES_EN.turnCostTitle, 'Per-turn usage estimated at current rates')
   assert.equal(MESSAGES_ZH.turnTokensUnreported, '该提供商未上报此桶')
   assert.equal(MESSAGES_EN.turnTokensUnreported, 'Not reported by this provider')
+  assert.equal(MESSAGES_ZH.costDisplayDesc, '在信息栏、趋势悬浮与回合费用芯片中显示按当前费率估算的费用。')
+  assert.equal(MESSAGES_EN.costDisplayDesc, 'Show costs estimated at current rates in the stats line, trend tooltips and the turn cost chip.')
+})
+
+test('注册指向官方动作行槽,turnTail 旧路径移除', () => {
+  assert.ok(CLIENT_SOURCE.includes("ctx.slots.inject('conversation.chat.assistant-actions'"))
+  assert.ok(!CLIENT_SOURCE.includes('conversation.chat.turnTail'))
 })
 
-test('显隐 CSS 镜像官方动作行:历史悬停显现与焦点恢复', () => {
+test('芯片样式:显隐随官方动作行父级,不自绘重复规则', () => {
   assert.ok(CLIENT_SOURCE.includes('.ud-turn-cost{'))
-  assert.ok(CLIENT_SOURCE.includes('@media (hover:hover){[data-actions-reveal=hover] .ud-turn-cost{opacity:0'))
-  assert.ok(CLIENT_SOURCE.includes('[data-actions-reveal=hover]:hover .ud-turn-cost,[data-actions-reveal=hover]:focus-within .ud-turn-cost{opacity:1}'))
+  assert.ok(!CLIENT_SOURCE.includes('[data-actions-reveal=hover] .ud-turn-cost'))
 })