dsh-key-usage 0.1.1 → 0.2.0

package/lib/index.js

@@ -37,6 +37,9 @@ export function apply(ctx) {
         },
     });
     ctx.inject(['webServer'], (host) => {
-        host.effect(() => mountKeyUsageRoutes(host.webServer, sessionSource, liveQuota), 'dsh-key-usage: http routes');
+        host.effect(() => mountKeyUsageRoutes(host.webServer, sessionSource, liveQuota, {
+            // workspaceRegistry 用来读官方归档集合（拿不到就回退本地 storages/workspace.json）
+            get: (serviceName) => (typeof ctx.get === 'function' ? ctx.get(serviceName) : undefined),
+        }), 'dsh-key-usage: http routes');
     });
 }

package/lib/routes.js

@@ -20,6 +20,7 @@ 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 { createArchiveSource, createTitleSource } from './session-meta.js';
 import { mergeDailySeries, sessionDayRows, summarizeMergedByProvider, totalsOfMerged, } from './merge.js';
 /** 无会话服务时的兜底数据源，保证台账相关端点照常工作。 */
 export const unavailableSessionSource = {
@@ -62,9 +63,13 @@ function channelPayload(channel) {
         quotaWindowLabel: channel.quotaWindowKey === null ? null : quotaWindowLabel(channel.quotaWindowKey),
     };
 }
-export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessionSource, liveQuota = disabledLiveQuota) {
+export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessionSource, liveQuota = disabledLiveQuota, hostServices = { get: () => undefined }) {
     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 sessionMeta = () => ({ titles: titleSource.titles(), archived: archiveSource.archived() });
     const loadLedger = () => readLedger(ledgerPath, (path) => {
         try {
             return readFileSync(path, 'utf8');
@@ -260,7 +265,8 @@ export function mountKeyUsageRoutes(webServer, sessionSource = unavailableSessio
             const costModeOf = new Map(channels.map((channel) => [channel.provider, channel.costMode]));
             const { records, coverage } = await sessionSource.collect();
             const priceTable = buildPriceTable(loadLedger());
-            const rows = sessionRowsOf(records, knownProviders).slice(0, limit).map((row) => ({
+            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,
@@ -281,7 +287,7 @@ 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).slice(0, limit).map((row) => ({
+            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),

package/lib/session-meta.js

@@ -0,0 +1,101 @@
+/**
+ * 会话标题与归档状态的本地来源。
+ *
+ * - **标题**：宿主把「会话标题」存在投影缓存 `$DSH_HOME/storages/session_projcache.json`
+ *   的 `tables.sessions.<id>.rows.title.val`；只有被宿主投影过的会话才有，
+ *   其余由 `session-usage.ts` 折叠出的「首条用户提问」兜底。
+ * - **归档**：优先读宿主只读服务 `workspaceRegistry.archivedSessionIds`（官方接口）；
+ *   服务不可用时回退 `$DSH_HOME/storages/workspace.json` 的 `global.archivedSessionIds`。
+ *
+ * 两个文件都是普通 JSON，只读、不写；解析失败一律退化为「没有数据」，不影响统计。
+ */
+import { readFileSync, statSync } from 'node:fs';
+/** 宿主会话 id 两种写法（`session-<uuid>` / 裸 `<uuid>`）统一成裸 uuid 便于比对。 */
+export function normalizeSessionId(id) {
+    const lowered = id.toLowerCase();
+    return lowered.startsWith('session-') ? lowered.slice('session-'.length) : lowered;
+}
+function readJson(path, readText) {
+    const text = readText(path);
+    if (text === null)
+        return null;
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return null;
+    }
+}
+/** 读取 `session_projcache.json` 里的会话标题表（按 mtime 缓存，避免每次请求都解析 2 MB JSON）。 */
+export function createTitleSource(cachePath, readText = (path) => {
+    try {
+        return readFileSync(path, 'utf8');
+    }
+    catch {
+        return null;
+    }
+}) {
+    let cache = null;
+    return {
+        titles: () => {
+            let mtimeMs = 0;
+            try {
+                mtimeMs = statSync(cachePath).mtimeMs;
+            }
+            catch {
+                return new Map();
+            }
+            if (cache !== null && cache.mtimeMs === mtimeMs)
+                return cache.value;
+            const value = parseTitles(readJson(cachePath, readText));
+            cache = { mtimeMs, value };
+            return value;
+        },
+    };
+}
+/** 从投影缓存文档里取出 id → 标题（结构不符时返回空表）。 */
+export function parseTitles(document) {
+    const titles = new Map();
+    const sessions = document?.tables?.sessions;
+    if (typeof sessions !== 'object' || sessions === null)
+        return titles;
+    for (const [id, entry] of Object.entries(sessions)) {
+        const value = entry?.rows?.title?.val;
+        if (typeof value !== 'string')
+            continue;
+        const trimmed = value.trim();
+        if (trimmed !== '')
+            titles.set(normalizeSessionId(id), trimmed);
+    }
+    return titles;
+}
+/** 归档会话 id 集合（归一后用于比对）。 */
+export function createArchiveSource(host, workspacePath, readText = (path) => {
+    try {
+        return readFileSync(path, 'utf8');
+    }
+    catch {
+        return null;
+    }
+}) {
+    const fromFile = () => {
+        const document = readJson(workspacePath, readText);
+        const ids = document?.global?.archivedSessionIds;
+        return new Set(Array.isArray(ids) ? ids.filter((id) => typeof id === 'string').map(normalizeSessionId) : []);
+    };
+    return {
+        archived: () => {
+            // 先用宿主官方只读 getter；拿不到再读文件（两者都是权威数据，getter 优先）
+            try {
+                const registry = host.get('workspaceRegistry');
+                if (registry !== null && registry !== undefined && Array.isArray(registry.archivedSessionIds)) {
+                    return new Set(registry.archivedSessionIds.filter((id) => typeof id === 'string').map(normalizeSessionId));
+                }
+            }
+            catch {
+                // 落到文件
+            }
+            return fromFile();
+        },
+    };
+}

package/lib/session-usage.js

@@ -86,6 +86,8 @@ export function foldSessionEvents(events) {
     let currentModel = null;
     let firstTime = null;
     let lastTime = null;
+    // 会话标题在宿主侧只对有投影的会话可见，其余用「首条用户提问」兜底
+    let firstPrompt = null;
     for (const event of events) {
         const time = typeof event.time === 'number' ? event.time : null;
         if (time !== null) {
@@ -99,6 +101,9 @@ export function foldSessionEvents(events) {
             if (model !== null)
                 currentModel = model;
         }
+        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}`;
@@ -119,7 +124,28 @@ export function foldSessionEvents(events) {
             buckets: bucketsOf(sample.usage),
         });
     }
-    return { samples, firstTime, lastTime };
+    return { samples, firstTime, lastTime, firstPrompt };
+}
+/** 标题兜底：取 user/message 里第一个非空文本块，压平空白并截断。 */
+function promptTextOf(event) {
+    const message = event.data?.message;
+    if (typeof message !== 'object' || message === null)
+        return null;
+    const content = message.content;
+    if (!Array.isArray(content))
+        return null;
+    for (const block of content) {
+        if (typeof block !== 'object' || block === null)
+            continue;
+        const text = block.text;
+        if (typeof text !== 'string')
+            continue;
+        const flat = text.replace(/\s+/g, ' ').trim();
+        if (flat === '')
+            continue;
+        return flat.length > 60 ? flat.slice(0, 60) + '…' : flat;
+    }
+    return null;
 }
 /**
  * 缓存命中率（百分数，一位小数）：`cacheRead / (input + output + cacheRead)`。
@@ -187,6 +213,7 @@ export function summarizeSession(fold) {
         cacheHitRate: cacheHitRateOf(totals),
         firstTime: fold.firstTime,
         lastTime: fold.lastTime,
+        firstPrompt: fold.firstPrompt,
         primaryModelKey: models.length > 0 ? models[0].key : null,
         days,
         models,

package/lib/sessions.js

@@ -6,6 +6,7 @@
  * 服务缺失或读取失败时降级为空结果 + coverage 说明，绝不影响台账相关的其它端点。
  */
 import { attributeModelKey, foldSessionEvents, summarizeSession, } from './session-usage.js';
+import { normalizeSessionId } from './session-meta.js';
 /**
  * 一次最多折叠的会话数：按更新时间倒序取，避免首次请求扫全量历史。
  * 本机会话约 120 个 / 143 MB，取 200 覆盖全量；折叠结果按 revision 缓存，
@@ -192,11 +193,15 @@ function attributedModels(models, knownProviders) {
         };
     });
 }
-export function sessionRowsOf(records, knownProviders) {
+export function sessionRowsOf(records, knownProviders, meta = {}) {
+    const titles = meta.titles ?? new Map();
+    const archived = meta.archived ?? new Set();
     return records
         .map((record) => ({
         id: record.id,
-        title: record.title,
+        // 标题优先级：宿主投影缓存的标题 → 会话头自带字段 → 首条用户提问 → 界面回落成短 id
+        title: titles.get(normalizeSessionId(record.id)) ?? record.title ?? record.summary.firstPrompt ?? null,
+        archived: archived.has(normalizeSessionId(record.id)),
         workspace: record.workspace,
         provider: record.summary.primaryModelKey === null ? null : attributeModelKey(record.summary.primaryModelKey, knownProviders).provider,
         firstTime: record.summary.firstTime,
@@ -209,7 +214,8 @@ export function sessionRowsOf(records, knownProviders) {
     }))
         .sort((first, second) => (second.lastTime ?? 0) - (first.lastTime ?? 0));
 }
-export function projectRowsOf(records, knownProviders) {
+export function projectRowsOf(records, knownProviders, meta = {}) {
+    const archived = meta.archived ?? new Set();
     const byWorkspace = new Map();
     for (const record of records) {
         const workspace = record.workspace ?? '未归属工作区';
@@ -217,7 +223,7 @@ export function projectRowsOf(records, knownProviders) {
         if (accumulator === undefined) {
             accumulator = {
                 workspace, calls: 0, tokens: 0, cacheReadTokens: 0, inputTokens: 0, outputTokens: 0, cacheWriteTokens: 0,
-                sessionCount: 0, lastTime: null, providers: new Map(), models: new Map(),
+                sessionCount: 0, archivedSessionCount: 0, lastTime: null, providers: new Map(), models: new Map(),
             };
             byWorkspace.set(workspace, accumulator);
         }
@@ -228,6 +234,8 @@ export function projectRowsOf(records, knownProviders) {
         accumulator.cacheReadTokens += record.summary.buckets.cacheReadTokens;
         accumulator.cacheWriteTokens += record.summary.buckets.cacheWriteTokens;
         accumulator.sessionCount += 1;
+        if (archived.has(normalizeSessionId(record.id)))
+            accumulator.archivedSessionCount += 1;
         const lastTime = record.summary.lastTime;
         if (lastTime !== null && (accumulator.lastTime === null || lastTime > accumulator.lastTime))
             accumulator.lastTime = lastTime;
@@ -259,6 +267,7 @@ export function projectRowsOf(records, knownProviders) {
             tokens: accumulator.tokens,
             cacheHitRate: displayTokens > 0 ? Math.round(accumulator.cacheReadTokens / displayTokens * 1000) / 10 : null,
             sessionCount: accumulator.sessionCount,
+            archivedSessionCount: accumulator.archivedSessionCount,
             lastTime: accumulator.lastTime,
             providers: Object.fromEntries(accumulator.providers),
             models: [...accumulator.models.values()].sort((first, second) => second.tokens - first.tokens),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-key-usage",
   "description": "DeepSeek Harness 侧边栏「使用情况」：按通道展示用量明细、活跃热力图、项目/会话用量与官方余额/配额（实时优先，失败回落快照）",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "license": "MIT",
   "type": "module",
   "keywords": [
@@ -46,8 +46,8 @@
   },
   "scripts": {
     "build:client": "tsdown && node scripts/normalize-client-banner.mjs",
-    "check": "node --check lib/index.js && node --check lib/ledger.js && node --check lib/collect.js && node --check lib/routes.js && node --check lib/sessions.js && node --check lib/session-usage.js && node --check lib/merge.js && node --check lib/live-quota.js",
-    "test": "node test/ledger.test.mjs && node test/collect.test.mjs && node test/channels.test.mjs && node test/session-usage.test.mjs && node test/sessions.test.mjs && node test/merge.test.mjs && node test/live-quota.test.mjs && node test/routes.test.mjs"
+    "check": "node --check lib/index.js && node --check lib/ledger.js && node --check lib/collect.js && node --check lib/routes.js && node --check lib/sessions.js && node --check lib/session-usage.js && node --check lib/session-meta.js && node --check lib/merge.js && node --check lib/live-quota.js",
+    "test": "node test/ledger.test.mjs && node test/collect.test.mjs && node test/channels.test.mjs && node test/session-usage.test.mjs && node test/session-meta.test.mjs && node test/sessions.test.mjs && node test/merge.test.mjs && node test/live-quota.test.mjs && node test/routes.test.mjs"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1"