dsh-key-usage 0.1.2 → 0.1.4

package/lib/routes.js

@@ -7,10 +7,15 @@
  * - /dsh-key-usage/summary   总览表用的「今日 / 近 30 天」按通道汇总
  * - /dsh-key-usage/sessions  会话用量（来自宿主会话事件折叠）
  * - /dsh-key-usage/projects  项目（工作目录）用量
+ * - /dsh-key-usage/models    模型（provider + model）用量与估算成本
  *
  * 台账已停更时（本机停在 2026-09-30），按天序列会用会话事件补齐缺的日期（见 merge.ts），
  * 并在响应里用 `sessionDates` 标出来源。非本机回环请求一律 403。
  *
+ * 成本口径（四处一致）：台账当天的官方成本 > 用户计费规则 > 台账反推均价 > 无依据（界面显示 —）。
+ * 每个成本单元格都带 `costSource`（official / rule / estimate / none），界面据此打来源角标。
+ * 规则与成本算法见 pricing.ts，规则本体存在宿主设置服务里（本插件不写文件）。
+ *
  * 网络：只有「余额与订阅窗口」会访问各通道**官方**接口（见 live-quota.ts），
  * 失败即回落本地快照；其余端点零外网。
  */
@@ -19,9 +24,13 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { aggregateRange, buildPriceTable, estimateCost, readLedger, } from './ledger.js';
 import { classifyChannels, costModeLabel, extractChannels, quotaWindowLabel, readProviderSnapshots, } from './collect.js';
-import { hoursOfDate, projectRowsOf, sessionRowsOf, } from './sessions.js';
+import { schemeIdOf } from './live-quota.js';
+import { hoursOfDate, modelRowsOf, projectRowsOf, sessionRowsOf, } from './sessions.js';
 import { createArchiveSource, createTitleSource } from './session-meta.js';
+import { readQuotaSnapshots, writeQuotaSnapshots } from './quota-snapshots.js';
 import { mergeDailySeries, sessionDayRows, summarizeMergedByProvider, totalsOfMerged, } from './merge.js';
+import { EMPTY_PRICING_VIEW, PRICING_TEMPLATES, displayTokensOf, isOffPeakNow, priceRowsByRules, rowCostsOf, summarizeCoverage, } from './pricing.js';
+import { catalogEntryCount, catalogSources } from './pricing-catalog.js';
 /** 无会话服务时的兜底数据源，保证台账相关端点照常工作。 */
 export const unavailableSessionSource = {
     collect: async () => ({
@@ -35,6 +44,77 @@ export const disabledLiveQuota = {
     refreshIfStale: async () => new Map(),
 };
 const EMPTY_LEDGER = { version: 0, days: {} };
+const SOURCE_RANK = { official: 0, rule: 1, catalog: 2, estimate: 3, none: 4 };
+/** 一天里最弱的那一格决定整天的角标：宁可标弱，也不把估算冒充成规则价。 */
+export function weakestSource(sources) {
+    if (sources.length === 0)
+        return 'none';
+    return sources.reduce((weakest, current) => (SOURCE_RANK[current] > SOURCE_RANK[weakest] ? current : weakest), sources[0]);
+}
+/** 会话侧的模型行 → 计费行（三种视图的 `models[]` 形状一致，用同一份映射）。 */
+export function pricingRowOf(model) {
+    return {
+        provider: model.provider,
+        model: model.model,
+        calls: model.calls,
+        tokens: model.tokens,
+        inputTokens: model.buckets.inputTokens ?? 0,
+        outputTokens: model.buckets.outputTokens ?? 0,
+        cacheReadTokens: model.buckets.cacheReadTokens ?? 0,
+        cacheWriteTokens: model.buckets.cacheWriteTokens ?? 0,
+    };
+}
+/** 台账序列里的模型行 → 计费行（分桶在顶层字段上，不是 `buckets`）。 */
+export function dayModelPricingRow(model) {
+    return {
+        provider: model.provider,
+        model: model.model,
+        calls: model.calls,
+        tokens: model.inputTokens + model.outputTokens + model.cacheReadTokens,
+        inputTokens: model.inputTokens,
+        outputTokens: model.outputTokens,
+        cacheReadTokens: model.cacheReadTokens,
+        cacheWriteTokens: model.cacheWriteTokens ?? 0,
+    };
+}
+/** 24 个小时槽 → 计费行（错峰占比只用得上 token 分桶）。 */
+export function hoursAsPricingRows(hours) {
+    if (hours === null)
+        return null;
+    return hours.map((slot) => ({
+        provider: '',
+        model: '',
+        calls: slot.calls,
+        inputTokens: slot.buckets.inputTokens ?? 0,
+        outputTokens: slot.buckets.outputTokens ?? 0,
+        cacheReadTokens: slot.buckets.cacheReadTokens ?? 0,
+        cacheWriteTokens: slot.buckets.cacheWriteTokens ?? 0,
+    }));
+}
+/** 逐行金额求和；全部为 null（无任何依据）时返回 null，界面据此显示 —。 */
+export function sumOrNull(costs) {
+    let total = 0;
+    let matched = false;
+    for (const entry of costs) {
+        if (entry.cost === null)
+            continue;
+        total += entry.cost;
+        matched = true;
+    }
+    return matched ? Math.round(total * 100) / 100 : null;
+}
+/** 某个通道在指定范围内的成本来源：取该通道所有模型行里最弱的那一格。 */
+export function sourceOfProvider(days, provider, from, to) {
+    const sources = [];
+    for (const day of days) {
+        if (day.date < from || day.date > to)
+            continue;
+        for (const model of day.models)
+            if (model.provider === provider)
+                sources.push(model.costSource);
+    }
+    return sources.length === 0 ? 'none' : weakestSource(sources);
+}
 function sendJson(response, statusCode, body) {
     const payload = JSON.stringify(body);
     response.writeHead(statusCode, { 'Content-Type': 'application/json; charset=utf-8', 'Cache-Control': 'no-cache' });
@@ -63,11 +143,13 @@ function channelPayload(channel) {
         quotaWindowLabel: channel.quotaWindowKey === null ? null : quotaWindowLabel(channel.quotaWindowKey),
     };
 }
-export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessionSource, liveQuota = disabledLiveQuota, hostServices = { get: () => undefined }) {
+export const noPricingSource = { current: () => EMPTY_PRICING_VIEW };
+export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessionSource, liveQuota = disabledLiveQuota, hostServices = { get: () => undefined }, pricingSource = noPricingSource) {
     const ledgerPath = join(dshHomePath(), 'dsh-usage', 'usage-ledger.json');
     const snapshotPath = join(dshHomePath(), 'dsh-usage', 'provider-snapshots.json');
     const titleSource = createTitleSource(join(dshHomePath(), 'storages', 'session_projcache.json'));
     const archiveSource = createArchiveSource(hostServices, join(dshHomePath(), 'storages', 'workspace.json'));
+    const quotaSnapshotPath = join(dshHomePath(), 'dsh-key-usage', 'quota-snapshots.json');
     /** 会话标题与归档状态：宿主服务/缓存文件都拿不到时返回空集合，界面自行回落。 */
     const sessionMeta = () => ({ titles: titleSource.titles(), archived: archiveSource.archived() });
     const loadLedger = () => readLedger(ledgerPath, (path) => {
@@ -79,6 +161,49 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
         }
     }) ?? EMPTY_LEDGER;
     const readSnapshots = () => readProviderSnapshots(snapshotPath).providers;
+    /** 规则每次请求现取：用户在界面上改完立即生效，不需要重启宿主。 */
+    const pricingView = () => {
+        try {
+            return pricingSource.current();
+        }
+        catch {
+            return EMPTY_PRICING_VIEW;
+        }
+    };
+    const averagePriceOf = (priceTable) => (row) => estimateCost([{ provider: row.provider, model: row.model, tokens: displayTokensOf(row) }], priceTable);
+    /**
+     * 给合并序列补成本与来源：台账天保留官方成本（official，不重算），
+     * 会话补位天逐模型按规则估算，规则没命中再回落台账均价。
+     * @param offPeakHours - 单日范围才有的小时槽；给了就按错峰占比加权
+     */
+    const annotateCosts = (days, sessionDates, priceTable, offPeakHours) => {
+        const sessionSet = new Set(sessionDates);
+        const view = pricingView();
+        return days.map((day) => {
+            if (!sessionSet.has(day.date)) {
+                // 台账天带官方账单金额：原样保留，不按规则重算
+                return {
+                    ...day,
+                    costSource: 'official',
+                    models: day.models.map((model) => ({ ...model, costSource: 'official' })),
+                };
+            }
+            const models = day.models.map((model) => {
+                const row = dayModelPricingRow(model);
+                const priced = priceRowsByRules([row], view.config, { hours: offPeakHours })[0];
+                const fallback = estimateCost([{ provider: model.provider, model: model.model, tokens: displayTokensOf(row) }], priceTable);
+                const cost = priced.cost ?? fallback ?? 0;
+                const source = priced.cost !== null ? priced.source : fallback !== null ? 'estimate' : 'none';
+                return { ...model, cost: Math.round(cost * 100) / 100, costSource: source };
+            });
+            return {
+                ...day,
+                cost: Math.round(models.reduce((total, model) => total + model.cost, 0) * 100) / 100,
+                costSource: weakestSource(models.map((model) => model.costSource)),
+                models,
+            };
+        });
+    };
     const loadChannels = (live = new Map()) => {
         // cordis.yml 是应用按需重写的组合产物：插件集变化期间会短暂变成空模板，
         // 因此先读它，取不到再回退到用户 patch 层 cordis.patch.yml。
@@ -128,9 +253,12 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
             const merged = mergeDailySeries(ledgerResult.days, sessionRows, from, to);
             // 单日范围才提供小时细分（来自会话事件，口径与台账不同，见页脚口径说明）
             const hours = from !== '' && from === to ? hoursOfDate(collection.records, from) : null;
+            // 单日有小时槽时按错峰占比加权；跨天拿不到小时分布，只能按标准价（不猜折扣）
+            const days = annotateCosts(merged.days, merged.sessionDates, buildPriceTable(ledger), hoursAsPricingRows(hours));
+            const totals = days.length > 0 ? totalsOfMerged(days) : null;
             sendJson(response, 200, {
-                days: merged.days,
-                totals: merged.days.length > 0 ? totalsOfMerged(merged.days) : null,
+                days,
+                totals: totals === null ? null : { ...totals, costSource: weakestSource(days.map((day) => day.costSource)) },
                 sessionDates: merged.sessionDates,
                 availableFrom: availableFrom ?? null,
                 availableTo: availableTo ?? null,
@@ -155,8 +283,10 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
             const from = earliest > yearAgo ? earliest : yearAgo;
             const to = maxKey(dayKeys[dayKeys.length - 1], sessionDates[sessionDates.length - 1]) ?? from;
             const merged = mergeDailySeries(aggregateRange(ledger, from, to, null).days, sessionRows, from, to);
+            // 与「使用明细」同一口径：会话补位天按规则/均价估算，台账天保留官方成本
+            const days = annotateCosts(merged.days, merged.sessionDates, buildPriceTable(ledger), null);
             sendJson(response, 200, {
-                days: merged.days
+                days: days
                     .map((day) => ({
                     date: day.date,
                     totalTokens: day.inputTokens + day.outputTokens + day.cacheReadTokens,
@@ -186,15 +316,31 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
             const live = url.searchParams.get('fresh') === '1'
                 ? await liveQuota.refreshIfStale(channels, true)
                 : await liveQuota.refreshIfStale(channels);
+            // 实时成功立刻落一份自己的快照：下次失败时回落的是「最近一次成功」，而不是宿主那份十几天前的旧值
+            const succeeded = [];
+            for (const entry of live.values()) {
+                if (!entry.ok)
+                    continue;
+                succeeded.push({
+                    provider: entry.provider,
+                    displayName: channels.find((channel) => channel.provider === entry.provider)?.displayName ?? null,
+                    updatedAt: entry.fetchedAt,
+                    balance: entry.balance,
+                    windows: entry.windows,
+                });
+            }
+            writeQuotaSnapshots(quotaSnapshotPath, succeeded);
+            const ownSnapshots = readQuotaSnapshots(quotaSnapshotPath);
             const snapshots = readSnapshots();
             const providers = channels.map((channel) => {
                 const liveEntry = live.get(channel.provider);
-                const snapshot = snapshots.find((entry) => entry.provider === channel.provider) ?? null;
+                const supported = schemeIdOf(channel.provider) !== null;
                 if (liveEntry !== undefined && liveEntry.ok) {
                     return {
                         provider: channel.provider,
                         displayName: channel.displayName,
                         credential: channel.apiKeyEnv,
+                        supported,
                         source: 'live',
                         fetchedAt: liveEntry.fetchedAt,
                         updatedAt: liveEntry.fetchedAt,
@@ -203,17 +349,27 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
                         plan: liveEntry.windows === null ? null : { windows: liveEntry.windows },
                     };
                 }
+                // 回落顺序：自己的快照与宿主的快照里，取 updatedAt 更新的那一份
+                const own = ownSnapshots.find((entry) => entry.provider === channel.provider) ?? null;
+                const host = snapshots.find((entry) => entry.provider === channel.provider) ?? null;
+                const useOwn = own !== null && (host === null || own.updatedAt >= (host.updatedAt ?? 0));
+                const updatedAt = useOwn ? own.updatedAt : host?.updatedAt ?? null;
+                const fallbackBalance = useOwn ? own.balance : host?.balance ?? null;
+                const fallbackPlan = useOwn
+                    ? (own.windows === null ? null : { windows: own.windows })
+                    : host?.plan ?? null;
                 return {
                     provider: channel.provider,
-                    displayName: snapshot?.displayName ?? channel.displayName,
-                    credential: snapshot?.credential ?? channel.apiKeyEnv,
+                    displayName: host?.displayName ?? channel.displayName,
+                    credential: host?.credential ?? channel.apiKeyEnv,
+                    supported,
                     source: 'snapshot',
                     fetchedAt: null,
-                    updatedAt: snapshot?.updatedAt ?? null,
+                    updatedAt,
                     // 实时失败的原因要透出（未配置凭据 / 网络 / 鉴权），界面据此提示
-                    error: liveEntry?.error ?? (snapshot === null ? 'no-snapshot' : null),
-                    balance: snapshot?.balance ?? null,
-                    plan: snapshot?.plan ?? null,
+                    error: liveEntry?.error ?? (updatedAt === null ? 'no-snapshot' : null),
+                    balance: fallbackBalance,
+                    plan: fallbackPlan,
                 };
             });
             sendJson(response, 200, { providers });
@@ -233,15 +389,17 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
             const knownProviders = channels.map((channel) => channel.provider);
             const sessionRows = sessionDayRows(collection.records, knownProviders);
             const merged = mergeDailySeries(aggregateRange(ledger, monthFrom, today, null).days, sessionRows, monthFrom, today);
-            const todaySummary = summarizeMergedByProvider(merged.days, today, today);
-            const monthSummary = summarizeMergedByProvider(merged.days, monthFrom, today);
+            // 总览的「今日 / 近 30 天」成本必须与使用明细同一口径，否则两页数字对不上
+            const days = annotateCosts(merged.days, merged.sessionDates, buildPriceTable(ledger), null);
+            const todaySummary = summarizeMergedByProvider(days, today, today);
+            const monthSummary = summarizeMergedByProvider(days, monthFrom, today);
             const rows = channels.map((channel) => {
                 const todayRow = todaySummary.find((row) => row.provider === channel.provider);
                 const monthRow = monthSummary.find((row) => row.provider === channel.provider);
                 return {
                     provider: channel.provider,
-                    today: todayRow ?? { provider: channel.provider, calls: 0, tokens: 0, cost: 0 },
-                    month: monthRow ?? { provider: channel.provider, calls: 0, tokens: 0, cost: 0 },
+                    today: { ...todayRow ?? { provider: channel.provider, calls: 0, tokens: 0, cost: 0 }, costSource: sourceOfProvider(days, channel.provider, today, today) },
+                    month: { ...monthRow ?? { provider: channel.provider, calls: 0, tokens: 0, cost: 0 }, costSource: sourceOfProvider(days, channel.provider, monthFrom, today) },
                 };
             });
             sendJson(response, 200, {
@@ -264,14 +422,20 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
             const knownProviders = channels.map((channel) => channel.provider);
             const costModeOf = new Map(channels.map((channel) => [channel.provider, channel.costMode]));
             const { records, coverage } = await sessionSource.collect();
-            const priceTable = buildPriceTable(loadLedger());
+            const ledger = loadLedger();
+            const priceTable = buildPriceTable(ledger);
+            const view = pricingView();
             const meta = sessionMeta();
-            const rows = sessionRowsOf(records, knownProviders, meta).slice(0, limit).map((row) => ({
-                ...row,
-                providerLabel: channels.find((channel) => channel.provider === row.provider)?.displayName ?? row.provider,
-                costMode: row.provider === null ? null : costModeOf.get(row.provider) ?? null,
-                cost: estimateCost(row.models, priceTable),
-            }));
+            const rows = sessionRowsOf(records, knownProviders, meta).slice(0, limit).map((row) => {
+                const costs = rowCostsOf(row.models.map(pricingRowOf), view.config, averagePriceOf(priceTable));
+                return {
+                    ...row,
+                    providerLabel: channels.find((channel) => channel.provider === row.provider)?.displayName ?? row.provider,
+                    costMode: row.provider === null ? null : costModeOf.get(row.provider) ?? null,
+                    cost: costs.length === 0 ? null : sumOrNull(costs),
+                    costSource: costs.length === 0 ? 'none' : weakestSource(costs.map((entry) => entry.source)),
+                };
+            });
             sendJson(response, 200, { rows, coverage, priced: priceTable.size > 0 });
         },
     });
@@ -287,14 +451,97 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
             const knownProviders = channels.map((channel) => channel.provider);
             const { records, coverage } = await sessionSource.collect();
             const priceTable = buildPriceTable(loadLedger());
-            const rows = projectRowsOf(records, knownProviders, sessionMeta()).slice(0, limit).map((row) => ({
-                ...row,
-                dominantProvider: Object.entries(row.providers).sort((first, second) => second[1] - first[1])[0]?.[0] ?? null,
-                cost: estimateCost(row.models, priceTable),
-            }));
+            const view = pricingView();
+            const rows = projectRowsOf(records, knownProviders, sessionMeta()).slice(0, limit).map((row) => {
+                const costs = rowCostsOf(row.models.map(pricingRowOf), view.config, averagePriceOf(priceTable));
+                return {
+                    ...row,
+                    dominantProvider: Object.entries(row.providers).sort((first, second) => second[1] - first[1])[0]?.[0] ?? null,
+                    cost: costs.length === 0 ? null : sumOrNull(costs),
+                    costSource: costs.length === 0 ? 'none' : weakestSource(costs.map((entry) => entry.source)),
+                };
+            });
             sendJson(response, 200, { rows, coverage, priced: priceTable.size > 0 });
         },
     });
+    webServer.register({
+        kind: 'exact',
+        path: '/dsh-key-usage/models',
+        handler: async (request, response) => {
+            if (!requireLoopback(request, response))
+                return;
+            const url = new URL(request.url ?? '/', 'http://localhost');
+            const limit = parseLimit(url.searchParams.get('limit'), 200);
+            const channels = loadChannels();
+            const knownProviders = channels.map((channel) => channel.provider);
+            const costModeOf = new Map(channels.map((channel) => [channel.provider, channel.costMode]));
+            const { records, coverage } = await sessionSource.collect();
+            const priceTable = buildPriceTable(loadLedger());
+            const view = pricingView();
+            const rows = modelRowsOf(records, knownProviders).slice(0, limit).map((row) => {
+                const costs = rowCostsOf([pricingRowOf(row)], view.config, averagePriceOf(priceTable));
+                return {
+                    ...row,
+                    providerLabel: channels.find((channel) => channel.provider === row.provider)?.displayName ?? row.provider,
+                    costMode: costModeOf.get(row.provider) ?? null,
+                    // 与 /sessions 同一口径：用户规则优先，没命中再回落台账反推均价
+                    cost: sumOrNull(costs),
+                    costSource: costs[0]?.source ?? 'none',
+                };
+            });
+            sendJson(response, 200, { rows, coverage, priced: priceTable.size > 0 });
+        },
+    });
+    /**
+     * 计费规则面板：服务端视角的规则、内置模板、设定来源，以及近 30 天的覆盖度与缓存省钱。
+     * 规则本体由客户端经宿主设置服务读写，这里只提供「算出来是什么样」的对照。
+     */
+    webServer.register({
+        kind: 'exact',
+        path: '/dsh-key-usage/pricing',
+        handler: async (request, response) => {
+            if (!requireLoopback(request, response))
+                return;
+            const view = pricingView();
+            const ledger = loadLedger();
+            const channels = loadChannels();
+            const knownProviders = channels.map((channel) => channel.provider);
+            const collection = await sessionSource.collect();
+            const today = dayKeyOf(new Date());
+            const monthFrom = shiftedDayKey(-29);
+            const merged = mergeDailySeries(aggregateRange(ledger, monthFrom, today, null).days, sessionDayRows(collection.records, knownProviders), monthFrom, today);
+            // 覆盖度按「近 30 天出现过的 provider|model」统计，与使用明细的口径一致
+            const priceTable = buildPriceTable(ledger);
+            const usageRows = merged.days.flatMap((day) => day.models.map(dayModelPricingRow));
+            const coverage = summarizeCoverage(usageRows, view.config, averagePriceOf(priceTable));
+            const now = new Date();
+            sendJson(response, 200, {
+                rules: view.config.rules,
+                currency: view.config.currency,
+                writable: view.writable,
+                revision: view.revision,
+                templates: PRICING_TEMPLATES,
+                // 内置官方价目：自动生效、无需套用模板；这里只透出「覆盖了哪些通道 / 来源 / 抓取日期」
+                catalog: {
+                    entries: catalogEntryCount(),
+                    sources: catalogSources(),
+                },
+                offPeakNow: view.config.rules.map((rule) => isOffPeakNow(rule, now)),
+                coverage: {
+                    from: monthFrom,
+                    to: today,
+                    ruleModels: coverage.ruleModels,
+                    catalogModels: coverage.catalogModels,
+                    averagedModels: coverage.averagedModels,
+                    unpricedModels: coverage.unpricedModels,
+                    // 只作参照：界面上的成本按「官方 > 规则 > 内置 > 均价」逐格取值，与这个总额不一定相等
+                    ruleCostByCurrency: coverage.costByCurrency,
+                    savingsByCurrency: coverage.savingsByCurrency,
+                    savingsDetail: coverage.savingsDetail,
+                },
+            });
+        },
+    });
 }
 /**
  * 把实时余额 / 窗口合并进快照数组，供通道状态判定（额度百分比、余额文案）使用。

package/lib/session-usage.js

@@ -57,23 +57,28 @@ function modelOfEvent(event) {
     }
     return null;
 }
-function sampleOfEvent(event) {
-    const turn = event.data?.turn;
-    const step = event.data?.step;
-    const key = Number.isInteger(turn) && Number.isInteger(step) ? `${turn}:${step}` : `seq:${event.seq}`;
-    if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'usage' && event.data.chunk.usage !== undefined) {
-        return { key, usage: event.data.chunk.usage };
-    }
-    if (event.type === 'assistant/message' && event.data?.usage !== undefined) {
-        return { key, usage: event.data.usage };
+/**
+ * 取事件携带的用量样本；与「哪些事件算样本」的口径一一对应（见 docs/01 §3.10）。
+ * 注意 `assistant/attempt` 不认 `data.usage`，只认 `data.stream` 里的样本，与旧实现一致。
+ */
+function usagePayloadOf(event) {
+    const type = event.type;
+    const data = event.data;
+    if (type === 'assistant/chunk') {
+        const chunk = data?.chunk;
+        return chunk?.type === 'usage' && chunk.usage !== undefined ? { usage: chunk.usage } : null;
     }
-    if ((event.type === 'assistant/message' || event.type === 'assistant/attempt') && Array.isArray(event.data?.stream)) {
-        const stream = event.data.stream;
-        for (let index = stream.length - 1; index >= 0; index -= 1) {
-            const record = stream[index];
-            if (record?.type === 'chunk' && record.chunk?.type === 'usage' && record.chunk.usage !== undefined) {
-                return { key, usage: record.chunk.usage };
-            }
+    if (type !== 'assistant/message' && type !== 'assistant/attempt')
+        return null;
+    if (type === 'assistant/message' && data?.usage !== undefined)
+        return { usage: data.usage };
+    const stream = data?.stream;
+    if (!Array.isArray(stream))
+        return null;
+    for (let index = stream.length - 1; index >= 0; index -= 1) {
+        const record = stream[index];
+        if (record?.type === 'chunk' && record.chunk?.type === 'usage' && record.chunk.usage !== undefined) {
+            return { usage: record.chunk.usage };
         }
     }
     return null;
@@ -96,48 +101,64 @@ export function foldSessionEvents(events) {
             if (lastTime === null || time > lastTime)
                 lastTime = time;
         }
-        if (event.type === 'request/header') {
+        // 先按类型分流：整段日志里绝大多数事件与用量无关，不必为它们拼 (turn, step) 键
+        const type = event.type;
+        if (type === 'assistant/chunk' || type === 'assistant/message' || type === 'assistant/attempt') {
+            const payload = usagePayloadOf(event);
+            if (payload === null || time === null)
+                continue;
+            const turn = event.data?.turn;
+            const step = event.data?.step;
+            const baseKey = Number.isInteger(turn) && Number.isInteger(step) ? `${turn}:${step}` : `seq:${event.seq}`;
+            const attempt = attemptCounts.get(baseKey) ?? 0;
+            const sampleKey = `${baseKey}#${attempt}`;
+            const model = modelOfEvent(event) ?? currentModel ?? 'unknown/unknown';
+            samples.set(sampleKey, {
+                key: sampleKey,
+                day: dayKeyOf(time),
+                hour: hourOfTime(time),
+                model,
+                buckets: bucketsOf(payload.usage),
+            });
+            continue;
+        }
+        if (type === 'request/header') {
             const model = modelOfEvent(event);
             if (model !== null)
                 currentModel = model;
+            continue;
         }
-        if (firstPrompt === null && event.type === 'user/message') {
-            firstPrompt = promptTextOf(event);
-        }
-        const turn = event.data?.turn;
-        const step = event.data?.step;
-        const baseKey = Number.isInteger(turn) && Number.isInteger(step) ? `${turn}:${step}` : `seq:${event.seq}`;
-        if (event.type === 'llm/retry-started' && Number.isInteger(turn) && Number.isInteger(step)) {
-            attemptCounts.set(baseKey, (attemptCounts.get(baseKey) ?? 0) + 1);
-        }
-        const sample = sampleOfEvent(event);
-        if (sample === null || time === null)
+        if (type === 'llm/retry-started') {
+            const turn = event.data?.turn;
+            const step = event.data?.step;
+            if (Number.isInteger(turn) && Number.isInteger(step)) {
+                const baseKey = `${turn}:${step}`;
+                attemptCounts.set(baseKey, (attemptCounts.get(baseKey) ?? 0) + 1);
+            }
             continue;
-        const attempt = attemptCounts.get(baseKey) ?? 0;
-        const sampleKey = `${baseKey}#${attempt}`;
-        const model = modelOfEvent(event) ?? currentModel ?? 'unknown/unknown';
-        samples.set(sampleKey, {
-            key: sampleKey,
-            day: dayKeyOf(time),
-            hour: hourOfTime(time),
-            model,
-            buckets: bucketsOf(sample.usage),
-        });
+        }
+        if (firstPrompt === null && type === 'user/message')
+            firstPrompt = promptTextOf(event);
     }
     return { samples, firstTime, lastTime, firstPrompt };
 }
-/** 标题兜底：取 user/message 里第一个非空文本块，压平空白并截断。 */
+/** 标题兜底：取用户消息里第一个非空文本块，压平空白并截断。 */
 function promptTextOf(event) {
-    const message = event.data?.message;
-    if (typeof message !== 'object' || message === null)
+    const data = event.data;
+    if (typeof data !== 'object' || data === null)
         return null;
-    const content = message.content;
-    if (!Array.isArray(content))
+    // `user/message` 的正文在 `data.content`（宿主 dsh-context 就是这么读的），
+    // `assistant/message` 才用 `data.message.content` —— 两种都认，避免形状差异导致标题全空。
+    const direct = data.content;
+    const nested = data.message?.content;
+    const content = Array.isArray(direct) ? direct : Array.isArray(nested) ? nested : null;
+    if (content === null)
         return null;
     for (const block of content) {
-        if (typeof block !== 'object' || block === null)
-            continue;
-        const text = block.text;
+        // 文本块既可能是对象，也可能是裸字符串
+        const text = typeof block === 'string'
+            ? block
+            : typeof block === 'object' && block !== null ? block.text : null;
         if (typeof text !== 'string')
             continue;
         const flat = text.replace(/\s+/g, ' ').trim();