dsh-key-usage 0.1.1 → 0.1.3

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,53 @@ export function sessionRowsOf(records, knownProviders) {
     }))
         .sort((first, second) => (second.lastTime ?? 0) - (first.lastTime ?? 0));
 }
-export function projectRowsOf(records, knownProviders) {
+export function modelRowsOf(records, knownProviders) {
+    const byModel = new Map();
+    for (const record of records) {
+        const sessionLastTime = record.summary.lastTime;
+        for (const model of attributedModels(record.summary.models, knownProviders)) {
+            const key = model.provider + '|' + model.model;
+            let accumulator = byModel.get(key);
+            if (accumulator === undefined) {
+                accumulator = {
+                    provider: model.provider, model: model.model, calls: 0,
+                    inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, sessionCount: 0, lastTime: null,
+                };
+                byModel.set(key, accumulator);
+            }
+            accumulator.calls += model.calls;
+            accumulator.inputTokens += model.buckets.inputTokens;
+            accumulator.outputTokens += model.buckets.outputTokens;
+            accumulator.cacheReadTokens += model.buckets.cacheReadTokens;
+            accumulator.sessionCount += 1;
+            // 会话事件只有会话级时间戳，「最近活跃」只能取用到该模型的最晚会话时间，是近似值
+            if (sessionLastTime !== null && (accumulator.lastTime === null || sessionLastTime > accumulator.lastTime)) {
+                accumulator.lastTime = sessionLastTime;
+            }
+        }
+    }
+    return [...byModel.values()]
+        .map((accumulator) => {
+        const displayTokens = accumulator.inputTokens + accumulator.outputTokens + accumulator.cacheReadTokens;
+        return {
+            provider: accumulator.provider,
+            model: accumulator.model,
+            calls: accumulator.calls,
+            tokens: displayTokens,
+            cacheHitRate: displayTokens > 0 ? Math.round(accumulator.cacheReadTokens / displayTokens * 1000) / 10 : null,
+            sessionCount: accumulator.sessionCount,
+            lastTime: accumulator.lastTime,
+            buckets: {
+                inputTokens: accumulator.inputTokens,
+                outputTokens: accumulator.outputTokens,
+                cacheReadTokens: accumulator.cacheReadTokens,
+            },
+        };
+    })
+        .sort((first, second) => second.tokens - first.tokens);
+}
+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 +268,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 +279,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 +312,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,8 +1,9 @@
 {
   "name": "dsh-key-usage",
   "description": "DeepSeek Harness 侧边栏「使用情况」：按通道展示用量明细、活跃热力图、项目/会话用量与官方余额/配额（实时优先，失败回落快照）",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "license": "MIT",
+  "packageManager": "pnpm@10.32.1",
   "type": "module",
   "keywords": [
     "deepseek",
@@ -45,9 +46,14 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
+    "build": "tsc -p tsconfig.server.json && tsdown && node scripts/normalize-client-banner.mjs",
     "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"
+    "build:server": "tsc -p tsconfig.server.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "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/quota-snapshots.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",
+    "verify": "npm run typecheck && npm run build && npm run check && npm run test",
+    "pack:dry": "npm pack --dry-run"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1"