dsh-cost-meter 1.5.9 → 1.5.12

package/README.en.md

@@ -6,7 +6,7 @@
 
 Per-conversation cost · daily totals · OpenCode Go subscription quota display · budget with usage percentage · official account balance · custom provider balance · balance progress bar · history · peak/off-peak pricing hours display (peak hours UTC 01:00–04:00, 06:00–10:00) · one-click price sync from the official docs · Codex-style token usage heat grid · multi-vendor model pricing (built-in 90+ model price catalog with auto-matching) · mainstream Coding Plan quota queries & display (Anthropic / Z.ai / MiniMax / Kimi / OpenRouter / SiliconFlow)
 
-[![version](https://img.shields.io/badge/version-1.5.9-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.12-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 [![npm](https://img.shields.io/npm/v/dsh-cost-meter?label=npm)](https://www.npmjs.com/package/dsh-cost-meter)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -191,22 +191,22 @@ Real captures from an actual DSH sidebar of the period strip and collapsed verti
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell one-click script** (copy the whole line, paste, press Enter; pnpm is provisioned automatically, git is auto-detected — no clone needed; the install chain is **pinned to the release tag `v1.5.9`** — review the script before running):
+**PowerShell one-click script** (copy the whole line, paste, press Enter; pnpm is provisioned automatically, git is auto-detected — no clone needed; the install chain is **pinned to the release tag `v1.5.12`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.9/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.12/install.ps1 | iex
 ```
 
 **Or a plain command line** (the machine must already have pnpm and git; also pinned to the tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.9
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.12
 ```
 
 Without git, use the GitHub tag archive:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.9.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.12.tar.gz
 ```
 
 After installing, **restart** `dsh web` (plugin rows, the Typert manifest and the client bundle are all scanned at startup):

package/README.md

@@ -6,7 +6,7 @@
 
 本会话费用 · 当日费用 · OpenCode Go 订阅额度显示 · 预算与已用百分比 · 官方账户余额 · 自定义 Provider 余额查询(可配任意 HTTP 端点) · 余额三段进度条 · 历史记录 · 峰谷计价时段显示(UTC 01:00–04:00、06:00–10:00 为峰时段) · 官方价格一键同步 · 类 Codex Token 用量热图 · 多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配) · 主流 Coding Plan 额度查询与显示(Anthropic / Z.ai / MiniMax / Kimi / OpenRouter / SiliconFlow 六家)
 
-[![version](https://img.shields.io/badge/version-1.5.9-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.12-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 [![npm](https://img.shields.io/npm/v/dsh-cost-meter?label=npm)](https://www.npmjs.com/package/dsh-cost-meter)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -193,22 +193,22 @@
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.9`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.12`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.9/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.12/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.9
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.12
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.9.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.12.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/backfill.js

@@ -141,7 +141,7 @@ export function listSessionLogs(root) {
  * @param records - readSessionRecords 的输出。
  * @param config - 账本配置(prices / peak* / priceMatch / priceOverrides)。
  * @param wantDates - 只统计这些日期键(YYYY-MM-DD)内的调用;null = 全部。
- * @returns { sessionId, title, days: { date: { providerKey: 桶 } } }。
+ * @returns { sessionId, title, createdAt, days: { date: { providerKey: 桶 } } }。
  */
 export function replaySessionRecords(records, config, wantDates = null) {
   const zeroBuckets = () => ({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0, calls: 0, cost: 0 })
@@ -151,6 +151,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
   }
   let sessionId = ''
   let title = ''
+  let createdAt = 0
   let provider = 'deepseek'
   let model = 'default'
   let last = null
@@ -172,6 +173,8 @@ export function replaySessionRecords(records, config, wantDates = null) {
     if (event === null || typeof event !== 'object') continue
     if (event.type === 'session' && typeof event.id === 'string') {
       sessionId = event.id
+      const created = Number(event.createdAt)
+      if (Number.isFinite(created) && created > 0) createdAt = created
       continue
     }
     // 会话标题(宿主生成的 session/title 事件;同名多次时取最后一次)。
@@ -238,7 +241,7 @@ export function replaySessionRecords(records, config, wantDates = null) {
     shift(sample, 1)
     last = sample
   }
-  return { sessionId, title, days }
+  return { sessionId, title, createdAt, days }
 }
 
 /**
@@ -267,11 +270,11 @@ export async function backfillLegacyLedger(ledger, sessionsRoot) {
       }
     }
   }
-  // 会话标题补齐:任一会话条目缺标题则需扫描(日志里的 session/title 事件是标题权威来源)。
+  // 会话标题/时间戳补齐:任一字段缺失则需扫描(日志里的 session/title / createdAt 是权威来源)。
   let needTitles = false
   for (const day of Object.values(ledger.days ?? {})) {
     for (const session of day?.sessions ?? []) {
-      if (typeof session?.title !== 'string' || session.title.length === 0) {
+      if (typeof session?.title !== 'string' || session.title.length === 0 || !Number.isFinite(Number(session?.at))) {
         needTitles = true
         break
       }
@@ -281,6 +284,7 @@ export async function backfillLegacyLedger(ledger, sessionsRoot) {
   if (needDates.size === 0 && !needTitles) return result
   const bySession = new Map()
   const titles = new Map()
+  const createdAts = new Map()
   let scannedCount = 0
   for (const path of listSessionLogs(sessionsRoot)) {
     // 会话日志多时逐份解压会长时间占住事件循环:每 8 份让出一次,不卡宿主 UI。
@@ -294,6 +298,7 @@ export async function backfillLegacyLedger(ledger, sessionsRoot) {
     }
     if (replayed.sessionId.length === 0) continue
     if (replayed.title.length > 0 && !titles.has(replayed.sessionId)) titles.set(replayed.sessionId, replayed.title)
+    if (replayed.createdAt > 0 && !createdAts.has(replayed.sessionId)) createdAts.set(replayed.sessionId, replayed.createdAt)
     if (needDates.size === 0) continue
     const existing = bySession.get(replayed.sessionId)
     if (existing === undefined) bySession.set(replayed.sessionId, replayed.days)
@@ -372,16 +377,22 @@ export async function backfillLegacyLedger(ledger, sessionsRoot) {
       }
     }
   }
-  // 会话标题补齐:只填缺失的标题,不覆盖已有(幂等;实时新建的会话下次启动补齐)。
-  if (titles.size > 0) {
+  // 会话标题/时间戳补齐:只填缺失字段,不覆盖已有(幂等;实时新建的会话下次启动补齐)。
+  if (titles.size > 0 || createdAts.size > 0) {
     for (const day of Object.values(ledger.days ?? {})) {
       for (const session of day?.sessions ?? []) {
         if (session === null || typeof session !== 'object') continue
-        if (typeof session.title === 'string' && session.title.length > 0) continue
-        const found = titles.get(session.id)
-        if (found === undefined) continue
-        session.title = found
-        result.titles += 1
+        if ((typeof session.title !== 'string' || session.title.length === 0) && titles.size > 0) {
+          const found = titles.get(session.id)
+          if (found !== undefined) {
+            session.title = found
+            result.titles += 1
+          }
+        }
+        if (!Number.isFinite(Number(session.at)) && createdAts.size > 0) {
+          const foundAt = createdAts.get(session.id)
+          if (foundAt !== undefined) session.at = foundAt
+        }
       }
     }
   }

package/lib/client.js

@@ -491,12 +491,18 @@ window.__ModuleLoader__.load({
         historyNoSessions: '该日无会话明细(早期数据或会话日志已清理)',
         historySessionsError: '会话明细加载失败',
         sessionRankTitle: '按会话统计(全部历史)',
-        sessionRankHint: '不按日期分组,全部历史会话按费用降序',
+        sessionRankHint: '不按日期分组,全部历史会话;排序与条数可切换',
         sessionRankEmpty: '暂无会话数据',
         sessionRankLoading: '会话排行加载中…',
         sessionRankError: '会话排行加载失败',
         sessionRankLimit: '显示条数',
         showSessionIdLabel: '会话列表附显会话 ID',
+        sessionRankSort: '排序',
+        sessionSortCostDesc: '费用 高→低',
+        sessionSortCostAsc: '费用 低→高',
+        sessionSortTimeDesc: '时间 新→旧',
+        sessionSortTimeAsc: '时间 旧→新',
+        sessionSortRecent: '实时顺序',
         history: '历史记录',
         usageTitle: 'Token 用量统计',
         usageTotal: '累计 {tokens} tokens · 输入 {input} · 缓存 {cache} · 输出 {output} · {calls} 次调用',
@@ -778,12 +784,18 @@ window.__ModuleLoader__.load({
         historyNoSessions: 'No session details for this day (early data or session logs cleaned)',
         historySessionsError: 'Failed to load session details',
         sessionRankTitle: 'By session (all history)',
-        sessionRankHint: 'All historical sessions sorted by cost, not grouped by date',
+        sessionRankHint: 'All historical sessions, not grouped by date; sort and row count are switchable',
         sessionRankEmpty: 'No session data yet',
         sessionRankLoading: 'Loading session ranking…',
         sessionRankError: 'Failed to load session ranking',
         sessionRankLimit: 'Rows',
         showSessionIdLabel: 'Show session IDs in session lists',
+        sessionRankSort: 'Sort',
+        sessionSortCostDesc: 'Cost high→low',
+        sessionSortCostAsc: 'Cost low→high',
+        sessionSortTimeDesc: 'Time new→old',
+        sessionSortTimeAsc: 'Time old→new',
+        sessionSortRecent: 'Recent order',
         history: 'History',
         usageTitle: 'Token usage stats',
         usageTotal: 'All-time {tokens} tokens · input {input} · cache {cache} · output {output} · {calls} calls',
@@ -1182,6 +1194,10 @@ window.__ModuleLoader__.load({
       if (!Number.isFinite(Number(v))) fail('limit', 'number')
       return Number(v)
     })
+    const sortCodec = codecOf(v => {
+      if (typeof v !== 'string') fail('sort', 'string')
+      return v
+    })
     const topSessionsCodec = codecOf(v => {
       if (v === null || typeof v !== 'object' || Array.isArray(v)) fail('topSessions', 'object')
       return v
@@ -1243,7 +1259,11 @@ window.__ModuleLoader__.load({
         {
           id: 'dsh-cost-meter#costMeter/getTopSessions', service: 'costMeter', namespace: 'costMeter', method: 'getTopSessions',
           invocation: { kind: 'direct' },
-          parameters: [{ name: 'limit', wire: 'limit', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionLimit', schema: limitCodec } }],
+          parameters: [
+            { name: 'limit', wire: 'limit', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionLimit', schema: limitCodec } },
+            { name: 'sort', wire: 'sort', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSort', schema: sortCodec }, acceptsUndefined: true },
+            { name: 'dir', wire: 'dir', source: 'json', codec: { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSortDir', schema: sortCodec }, acceptsUndefined: true },
+          ],
           result: { mode: 'strict', typeSymbol: 'dsh-cost-meter#TopSessions', schema: topSessionsCodec },
         },
       ],
@@ -2335,6 +2355,19 @@ window.__ModuleLoader__.load({
         el('p', { className: 'cm-card-sub' }, props.sub))
     }
 
+    // 历史记录折叠面板(issue #22):三角展开/收起,内部为按天表格(日期行再展开会话明细)。
+    function HistoryPanel(props) {
+      const { state, api } = props
+      const t = makeT(resolveLocale(state.config?.locale))
+      const [open, setOpen] = useState(false)
+      return el('div', { className: 'cm-budget' },
+        el('div', { className: 'cm-budget-head' },
+          el('button', { type: 'button', className: 'cm-collapse-h', 'aria-expanded': String(open), onClick: () => setOpen(!open) },
+            el('span', { className: 'cm-caret' + (open ? ' open' : '') }),
+            el('h3', { className: 'cm-h' }, t('history')))),
+        open ? el('div', { className: 'cm-collapse-body' }, el(HistoryTable, { state, api })) : null)
+    }
+
     function HistoryTable(props) {
       const { state, api } = props
       const t = makeT(resolveLocale(state.config?.locale))
@@ -2394,19 +2427,22 @@ window.__ModuleLoader__.load({
           }))))
     }
 
-    // 按会话统计(issue #22 不分日期视角):全部历史会话按费用降序,默认收起、展开时按需拉取。
+    // 按会话统计(issue #22 不分日期视角):全部历史会话排行,默认收起、展开时按需拉取;排序可切换。
     function SessionRankPanel(props) {
       const { state, api } = props
       const t = makeT(resolveLocale(state.config?.locale))
       const [open, setOpen] = useState(false)
       const [limit, setLimit] = useState(100)
+      // 排序模式:cost-desc / cost-asc / time-desc / time-asc / recent(实时顺序)。
+      const [sortMode, setSortMode] = useState('cost-desc')
       const [rows, setRows] = useState(null)
       const [busy, setBusy] = useState(false)
       const [err, setErr] = useState(false)
-      const load = n => {
+      const load = (n, mode) => {
+        const [sort, dir] = mode === 'recent' ? ['recent', 'desc'] : mode.split('-')
         setBusy(true)
         setErr(false)
-        api.getTopSessions(n)
+        api.getTopSessions(n, sort, dir)
           .then(res => setRows(Array.isArray(res?.sessions) ? res.sessions : []))
           .catch(() => setErr(true))
           .finally(() => setBusy(false))
@@ -2414,13 +2450,17 @@ window.__ModuleLoader__.load({
       const toggle = () => {
         setOpen(o => {
           const next = !o
-          if (next && rows === null && !busy) load(limit)
+          if (next && rows === null && !busy) load(limit, sortMode)
           return next
         })
       }
       const changeLimit = n => {
         setLimit(n)
-        if (open || rows !== null) load(n)
+        if (open || rows !== null) load(n, sortMode)
+      }
+      const changeSort = mode => {
+        setSortMode(mode)
+        if (open || rows !== null) load(limit, mode)
       }
       return el('div', { className: 'cm-budget' },
         el('div', { className: 'cm-budget-head' },
@@ -2429,12 +2469,21 @@ window.__ModuleLoader__.load({
             el('h3', { className: 'cm-h' }, t('sessionRankTitle')))),
         open ? el('div', { className: 'cm-collapse-body' },
           el('p', { className: 'cm-hint' }, t('sessionRankHint')),
-          el('div', { className: 'cm-field', style: { margin: '6px 0' } },
-            el('label', null, t('sessionRankLimit')),
-            el('select', { className: 'cm-input', value: String(limit), onChange: event => changeLimit(Number(event.target.value)) },
-              el('option', { value: '50' }, '50'),
-              el('option', { value: '100' }, '100'),
-              el('option', { value: '200' }, '200'))),
+          el('div', { style: { display: 'flex', gap: '12px', flexWrap: 'wrap', margin: '6px 0' } },
+            el('div', { className: 'cm-field' },
+              el('label', null, t('sessionRankSort')),
+              el('select', { className: 'cm-input', value: sortMode, onChange: event => changeSort(event.target.value) },
+                el('option', { value: 'cost-desc' }, t('sessionSortCostDesc')),
+                el('option', { value: 'cost-asc' }, t('sessionSortCostAsc')),
+                el('option', { value: 'time-desc' }, t('sessionSortTimeDesc')),
+                el('option', { value: 'time-asc' }, t('sessionSortTimeAsc')),
+                el('option', { value: 'recent' }, t('sessionSortRecent')))),
+            el('div', { className: 'cm-field' },
+              el('label', null, t('sessionRankLimit')),
+              el('select', { className: 'cm-input', value: String(limit), onChange: event => changeLimit(Number(event.target.value)) },
+                el('option', { value: '50' }, '50'),
+                el('option', { value: '100' }, '100'),
+                el('option', { value: '200' }, '200')))),
           busy ? el('p', { className: 'cm-empty' }, t('sessionRankLoading'))
             : err ? el('p', { className: 'cm-empty' }, t('sessionRankError'))
               : rows === null || rows.length === 0 ? el('p', { className: 'cm-empty' }, t('sessionRankEmpty'))
@@ -3753,10 +3802,8 @@ window.__ModuleLoader__.load({
         el('div', null,
           el('h3', { className: 'cm-h' }, t('todaySessions')),
           el(TodaySessions, { state, t })),
-        // 历史
-        el('div', null,
-          el('h3', { className: 'cm-h' }, t('history')),
-          el(HistoryTable, { state, api })),
+        // 历史(三角折叠面板;日期行可再展开会话明细)
+        el(HistoryPanel, { state, api }),
         // 按会话统计(全部历史,不分日期;issue #22)
         el(SessionRankPanel, { state, api }),
         // 显示设置
@@ -4183,8 +4230,8 @@ window.__ModuleLoader__.load({
         },
         // 按需拉取某天会话明细(issue #22),返回当日完整记录。
         getDaySessions: async date => call('getDaySessions', [date]),
-        // 跨全部日期按费用降序的会话排行(issue #22 不分日期视角)。
-        getTopSessions: async limit => call('getTopSessions', [limit]),
+        // 跨全部日期的会话排行(issue #22 不分日期视角):支持费用/时间升降序与实时顺序。
+        getTopSessions: async (limit, sort, dir) => call('getTopSessions', [limit, sort, dir]),
         refreshBalance: async () => {
           const result = await costMeter.refreshBalance()
           if (result === null || typeof result !== 'object' || result.ok !== true) {

package/lib/index.js

@@ -18,7 +18,7 @@ import fs from 'node:fs'
 import { join } from 'node:path'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
-import { Ledger, applyConfigPatch, localDayKey, reconcileBalanceDelta, zeroDay } from './store.js'
+import { Ledger, applyConfigPatch, localDayKey, pickBalanceInfo, reconcileBalanceDelta, zeroDay } from './store.js'
 import { backfillLegacyLedger } from './backfill.js'
 import { OFFICIAL_PRICING_URL, normalizePrice, parsePricingHtml, costOf, priceEntryFor, providerPriceEntryFor, buildPriceCatalog } from './pricing.js'
 import { CODING_PLAN_PROVIDERS, CODING_PLAN_PROVIDER_IDS, queryCodingPlan, emptyCustomBalance, queryCustomBalance } from './coding-plans.js'
@@ -467,7 +467,8 @@ async function queryBalance(ctx, locale) {
   })
   if (!response.ok) throw new Error(tmsg(locale, 'balanceHttp', { code: String(response.status) }))
   const data = await response.json()
-  const info = Array.isArray(data?.balance_infos) ? data.balance_infos[0] : undefined
+  // 多币种账号返回 CNY/USD 两条且顺序不稳定(#24/#25):按余额与币种挑选,不固定取首条。
+  const info = pickBalanceInfo(data?.balance_infos)
   if (info === undefined) throw new Error(tmsg(locale, 'balanceNoInfos'))
   const num = value => {
     const parsed = Number(value)
@@ -525,10 +526,13 @@ function buildState(ledger, balance = emptyBalance(), goQuota = emptyGoQuota(),
   const check = stateSchema.safeParse(state)
   if (check.success) return state
   console.warn('[dsh-cost-meter] state 与 codec 漂移,尝试降级恢复可用性:', JSON.stringify(check.error.issues?.slice(0, 3) ?? check.error))
+  // 注意剔除键必须用解构省略而非赋 undefined:priceCatalog 是 schema 声明的
+  // optional 键,显式 undefined 键会被网关 JSON 安全校验拒绝(值合法但属性不安全)。
+  const { priceCatalog: _dropped, ...stateNoCatalog } = state
   const attempts = [
-    { ...state, priceCatalog: undefined },
-    { ...state, priceCatalog: undefined, codingPlans: {} },
-    { ...state, priceCatalog: undefined, codingPlans: {}, balance: emptyBalance(), goQuota: emptyGoQuota(), customBalance: emptyCustomBalance() },
+    stateNoCatalog,
+    { ...stateNoCatalog, codingPlans: {} },
+    { ...stateNoCatalog, codingPlans: {}, balance: emptyBalance(), goQuota: emptyGoQuota(), customBalance: emptyCustomBalance() },
   ]
   for (const fallback of attempts) {
     if (stateSchema.safeParse(fallback).success) return fallback
@@ -909,15 +913,24 @@ function createService(ctx, ledger) {
       return day === undefined ? zeroDay(date) : ledger.copyDay(day)
     },
 
-    // 跨全部日期按费用降序返回前 N 个会话(issue #22 按会话视角,不分日期)。
-    async getTopSessions(limit) {
+    // 跨全部日期返回前 N 个会话(issue #22 按会话视角,不分日期)。
+    // sort:cost(费用) | time(会话创建时间) | recent(实时顺序,即账本/侧边栏顺序);dir:asc | desc。
+    async getTopSessions(limit, sort = 'cost', dir = 'desc') {
       const n = Math.max(1, Math.min(500, Math.floor(Number(limit)) || 100))
+      const sortKey = sort === 'time' || sort === 'recent' ? sort : 'cost'
+      const asc = dir === 'asc'
       const all = []
-      for (const [date, day] of Object.entries(ledger.days)) {
+      const dateKeys = Object.keys(ledger.days)
+      // recent 的降序 = 侧边栏直觉的「新会话在前」:日期倒序 + 每日会话倒序。
+      if (sortKey === 'recent' && !asc) dateKeys.reverse()
+      for (const date of dateKeys) {
+        const day = ledger.days[date]
         if (!Array.isArray(day.sessions)) continue
-        for (const s of day.sessions) {
+        const rows = day.sessions.slice()
+        if (sortKey === 'recent' && !asc) rows.reverse()
+        for (const s of rows) {
           if (s === null || typeof s !== 'object') continue
-          all.push({
+          const row = {
             date,
             id: String(s.id ?? ''),
             input: s.input ?? 0,
@@ -928,10 +941,26 @@ function createService(ctx, ledger) {
             calls: s.calls ?? 0,
             cost: s.cost ?? 0,
             byProviderModel: s.byProviderModel ?? {},
-          })
+          }
+          // title/at 缺席时不得写入 undefined 键:网关对返回值做 JSON 安全校验,
+          // 显式 undefined 属性会被「undefined is not JSON-safe」拒绝,整个 RPC
+          // result-invalid,会话排行面板加载失败(未命名/无时间戳会话即触发)。
+          if (typeof s.title === 'string' && s.title.length > 0) row.title = s.title
+          const at = Number(s.at)
+          if (Number.isFinite(at) && at > 0) row.at = at
+          all.push(row)
         }
       }
-      all.sort((a, b) => b.cost - a.cost)
+      if (sortKey === 'cost') all.sort((a, b) => asc ? a.cost - b.cost : b.cost - a.cost)
+      else if (sortKey === 'time') {
+        // 无时间戳的条目排末尾。
+        all.sort((a, b) => {
+          const ta = Number.isFinite(a.at) ? a.at : asc ? Number.MAX_SAFE_INTEGER : 0
+          const tb = Number.isFinite(b.at) ? b.at : asc ? Number.MAX_SAFE_INTEGER : 0
+          return asc ? ta - tb : tb - ta
+        })
+      }
+      // recent 已按构造顺序排好,不再重排。
       return { sessions: all.slice(0, n) }
     },
   }

package/lib/pricing.js

@@ -248,11 +248,13 @@ export const PROVIDER_MODEL_FAMILIES = {
  * 内置只读目录(含 DeepSeek 当前模型);「挂载」= 把条目复制进可编辑价格表。
  */
 export function buildPriceCatalog() {
-  const catalog = {}
+  const catalog = Object.create(null)
+  const isUnsafeKey = (key) => key === '__proto__' || key === 'constructor' || key === 'prototype'
   const put = (provider, id, entry) => {
     const family = PROVIDER_MODEL_FAMILIES[provider]?.[id] ?? id
-    if (catalog[provider] === undefined) catalog[provider] = {}
-    if (catalog[provider][family] === undefined) catalog[provider][family] = {}
+    if (isUnsafeKey(provider) || isUnsafeKey(family) || isUnsafeKey(id)) return
+    if (catalog[provider] === undefined) catalog[provider] = Object.create(null)
+    if (catalog[provider][family] === undefined) catalog[provider][family] = Object.create(null)
     catalog[provider][family][id] = entry
   }
   for (const [id, entry] of Object.entries(DEFAULT_PRICE_TABLE.models)) put('deepseek', id, entry)
@@ -654,12 +656,12 @@ export function formatMoney(usdCost, display) {
 function decodeEntities(text) {
   return text
     .replace(/ /g, ' ')
-    .replace(/&/g, '&')
     .replace(/&lt;/g, '<')
     .replace(/&gt;/g, '>')
     .replace(/&quot;/g, '"')
     .replace(/&#39;/g, "'")
     .replace(/&mdash;/g, '—')
+    .replace(/&amp;/g, '&')
 }
 
 function stripTags(html) {

package/lib/store.js

@@ -172,6 +172,8 @@ export function sanitizeDays(days) {
       session.id = typeof session.id === 'string' ? session.id : ''
       // 会话标题(由历史回填从会话日志补齐):非字符串一律剔除,防击穿 strict sessionSchema。
       if (typeof session.title !== 'string' || session.title.length === 0) delete session.title
+      // 会话时间戳(实时入账/回填补齐):非正数剔除。
+      if (!Number.isFinite(Number(session.at)) || Number(session.at) <= 0) delete session.at
       session.byProviderModel = session.byProviderModel !== null && typeof session.byProviderModel === 'object' && !Array.isArray(session.byProviderModel)
         ? session.byProviderModel
         : {}
@@ -721,7 +723,9 @@ export class Ledger {
           const ref = parsed.balanceRef
           if (ref !== null && typeof ref === 'object' && typeof ref.date === 'string'
             && Number.isFinite(ref.total) && Number.isFinite(ref.granted) && Number.isFinite(ref.topped)) {
-            balanceRef = { date: ref.date, total: ref.total, granted: ref.granted, topped: ref.topped, at: Number(ref.at) || 0 }
+            // 旧账本无 currency 字段:保留 undefined,与新版首次拉取币种不等,
+            // reconcile 时自然重置基准一次(旧参考点可能录自 USD 0.00 误读,不可信)。
+            balanceRef = { date: ref.date, total: ref.total, granted: ref.granted, topped: ref.topped, currency: typeof ref.currency === 'string' ? ref.currency : undefined, at: Number(ref.at) || 0 }
           }
         }
       }
@@ -797,6 +801,7 @@ export class Ledger {
       let session = sessions.find(s => s.id === sessionId)
       if (session === undefined) {
         session = zeroSession(sessionId)
+        session.at = atMs // 会话首次入账时刻(按会话排行「按时间排序」用)。
         sessions.push(session)
         if (sessions.length > MAX_SESSIONS_PER_DAY) sessions = sessions.slice(-MAX_SESSIONS_PER_DAY)
         day.sessions = sessions
@@ -959,9 +964,10 @@ export class Ledger {
 /**
  * 余额差交叉校验(issue #18 讨论):用官方余额当日变动反推消费,与本地账本今日合计比对。
  * 仅当余额确实减少时才对账——订阅/Coding Plan 消费不动官方余额,若强行用余额差
- * 替代今日费用会把订阅用户全天消费归零;充值/额度结构变动时重置参考点防误判。
- * @param prevRef - 上一参考点({ date, total, granted, topped, at })或 null。
- * @param balance - 本次拉取结果({ totalBalance, grantedBalance, toppedUpBalance })。
+ * 替代今日费用会把订阅用户全天消费归零;充值/额度结构变动时重置参考点防误判;
+ * 参考点与本次拉取的币种不一致时(多币种条目挑选切换/旧账本无币种标记)同样重置。
+ * @param prevRef - 上一参考点({ date, total, granted, topped, currency, at })或 null。
+ * @param balance - 本次拉取结果({ currency, totalBalance, grantedBalance, toppedUpBalance })。
  * @param todayCost - 本地账本今日合计费用。
  * @param dayKey - 本地日期键(YYYY-MM-DD)。
  * @param nowMs - 当前时刻。
@@ -976,12 +982,18 @@ export function reconcileBalanceDelta(prevRef, balance, todayCost, dayKey, nowMs
     total: balance.totalBalance,
     granted: Number.isFinite(balance.grantedBalance) ? balance.grantedBalance : 0,
     topped: Number.isFinite(balance.toppedUpBalance) ? balance.toppedUpBalance : 0,
+    currency: typeof balance.currency === 'string' ? balance.currency : '',
     at: nowMs,
   }
   // 新的一天(或首次/参考点形状异常):打基准,不对账。
   if (prevRef === null || typeof prevRef !== 'object' || prevRef.date !== dayKey) {
     return { ref: snap, event: { kind: 'baseline' } }
   }
+  // 币种变化(#24/#25):选中的条目币种切换(或旧参考点无币种标记)时金额不可比,
+  // 重置基准不对账——否则 USD 0.00 误读会让余额差虚高,触发 drift 误报。
+  if (prevRef.currency !== snap.currency) {
+    return { ref: snap, event: { kind: 'structure-reset' } }
+  }
   // 充值/额度授予变动:充值与授信只会让分项余额增加(消费只会减少),分项变大则旧参考点失效,重置不告警。
   if (snap.granted > prevRef.granted + 0.009 || snap.topped > prevRef.topped + 0.009) {
     return { ref: snap, event: { kind: 'structure-reset' } }
@@ -995,3 +1007,21 @@ export function reconcileBalanceDelta(prevRef, balance, todayCost, dayKey, nowMs
   // ok/drift 都保留当日首次基准,后续拉取继续与早间基线比对。
   return { ref: prevRef, event: { kind: 'ok', spent, todayCost } }
 }
+
+/**
+ * 从官方余额接口的 balance_infos 中挑选要展示的条目(issues #24/#25)。
+ *
+ * 多币种账号同时返回 CNY/USD 两条,且实测两条的排列顺序每次请求不稳定——
+ * 固定取首条会在 USD 排前时读到 0.00,余额在正确值与 0 之间跳变。挑选规则:
+ *  - 优先取「有余额」的条目;同有余额时优先 CNY(开放平台主币种,确定性优先);
+ *  - 全部为零时优先 CNY(未充值/新账号,保证不随返回顺序跳变);
+ *  - 无 CNY 条目时兜底首条(单币种账号行为与旧版一致)。
+ * @param infos - balance_infos 数组(元素含 currency / total_balance 等官方字段)。
+ * @returns 选中的条目,或 undefined(无有效条目,调用方按缺 balance_infos 报错)。
+ */
+export function pickBalanceInfo(infos) {
+  const list = Array.isArray(infos) ? infos.filter(entry => entry !== null && typeof entry === 'object') : []
+  const positive = list.filter(entry => Number(entry.total_balance) > 0)
+  const cnyFirst = entries => entries.find(entry => String(entry.currency).toUpperCase() === 'CNY')
+  return cnyFirst(positive) ?? positive[0] ?? cnyFirst(list) ?? list[0]
+}

package/lib/typert.host.js

@@ -11,6 +11,7 @@ const num = z.number()
 const sessionSchema = z.object({
   id: z.string(),
   title: z.string().optional(),
+  at: num.optional(),
   input: num,
   output: num,
   cacheRead: num,
@@ -254,6 +255,8 @@ const _day$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#DayRecord', sch
 const _date$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#DayKey', schema: z.string() }
 const _topSessions$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#TopSessions', schema: topSessionsSchema }
 const _limit$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionLimit', schema: num }
+const _sort$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSort', schema: z.string() }
+const _dir$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSortDir', schema: z.string() }
 
 export const TYPERT = {
   package: 'dsh-cost-meter',
@@ -355,6 +358,11 @@ export const TYPERT = {
       invocation: { kind: 'direct' },
       parameters: [
         { name: 'limit', wire: 'limit', source: 'json', codec: _limit$codec },
+        // sort/dir 与服务端函数默认值(sort='cost', dir='desc')对应,声明可缺省:
+        // 网关对 args 字段做精确匹配,不声明 acceptsUndefined 时旧客户端单参数调用
+        // 会因 missing "sort"/"dir" 被拒,会话排行面板直接加载失败。
+        { name: 'sort', wire: 'sort', source: 'json', codec: _sort$codec, acceptsUndefined: true },
+        { name: 'dir', wire: 'dir', source: 'json', codec: _dir$codec, acceptsUndefined: true },
       ],
       result: _topSessions$codec,
     },
@@ -435,9 +443,9 @@ export const TYPERT = {
           {
             kind: 'method',
             name: 'getTopSessions',
-            signature: 'getTopSessions(limit: number): TopSessions',
-            summary: '跨全部日期按费用降序返回前 N 个会话(不分日期视角)。Return the top N sessions by cost across all days.',
-            jsDoc: '/**\n * 跨全部日期按费用降序返回前 N 个会话(每条带所属日期;不含今日实时条目之外的去重)。\n * @param limit - 返回条数上限(服务端限制 1-500)。\n * @returns 会话列表(含 date 字段)。\n * Return the top N sessions by cost across all days (each tagged with its date).\n * @param limit - Max rows to return (server clamps to 1-500).\n * @returns Session list with a date field.\n */',
+            signature: 'getTopSessions(limit: number, sort?: string, dir?: string): TopSessions',
+            summary: '跨全部日期按指定排序返回前 N 个会话(不分日期视角)。Return the top N sessions across all days with the given sort.',
+            jsDoc: '/**\n * 跨全部日期返回前 N 个会话(每条带所属日期/标题/创建时刻)。\n * @param limit - 返回条数上限(服务端限制 1-500)。\n * @param sort - cost(费用) | time(创建时间) | recent(实时顺序)。\n * @param dir - asc | desc(默认 desc)。\n * @returns 会话列表(含 date/title/at 字段)。\n * Return the top N sessions across all days (each tagged with date/title/createdAt).\n * @param limit - Max rows to return (server clamps to 1-500).\n * @param sort - cost | time | recent (ledger/sidebar order).\n * @param dir - asc | desc (defaults to desc).\n * @returns Session list with date/title/at fields.\n */',
           },
         ],
         types: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.5.9",
+  "version": "1.5.12",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(6 家)、自定义 Provider 余额查询(可配任意 HTTP 端点)与余额进度条,界面中英双语。Session cost tracking plugin for DeepSeek Harness: per-conversation cost, daily totals, history and official price sync, with multi-vendor model pricing (built-in 90+ model catalog with auto-matching), Coding Plan quota queries & display for 6 vendors, custom provider balance lookup (configurable HTTP endpoint) and balance progress bar, in a bilingual (Chinese/English) UI.",
   "type": "module",
   "main": "lib/index.js",