dsh-caduceus 0.7.0 → 0.10.5

package/dist/transport/normalize.js

@@ -88,7 +88,9 @@ export function normalizeMessageEvent(raw, botOpenId) {
     if (senderType !== 'user')
         return undefined;
     const message = raw.message;
-    const threadId = firstNonEmpty(message.thread_id, message.root_id);
+    // Only a real thread_id makes a topic. In p2p, root_id can equal the
+    // message id; treating it as threadId produced bogus "topic replies".
+    const threadId = firstNonEmpty(message.thread_id);
     const rootId = firstNonEmpty(message.root_id);
     const mentions = (message.mentions ?? [])
         .map((mention) => mention.id?.open_id)

package/dist/usage.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Token-usage aggregation from a session log (`sessionQuery.readSession`).
+ *
+ * The in-memory StatusTracker still feeds the process card, but `/usage` must
+ * work on a freshly restarted gateway, so it aggregates the durable event log
+ * instead.
+ *
+ * @module dsh-caduceus/usage
+ */
+import type { UsageTotals } from './status.js';
+export interface UsageTurn {
+    readonly turn: number;
+    readonly usage: UsageTotals;
+}
+export interface UsageReport {
+    /** Per-turn totals, ordered by turn descending (newest first). */
+    readonly turns: readonly UsageTurn[];
+    readonly total: UsageTotals;
+}
+/** Aggregate every `assistant/message` usage event, grouped by `data.turn`. */
+export declare function aggregateUsage(events: readonly unknown[]): UsageReport;
+/** Render the three-line usage report; empty log is a distinct state. */
+export declare function renderUsageReport(report: UsageReport): string;

package/dist/usage.js

@@ -0,0 +1,77 @@
+function asRecord(value) {
+    return typeof value === 'object' && value !== null
+        ? value
+        : undefined;
+}
+function usageOf(value) {
+    const record = asRecord(value);
+    if (record === undefined)
+        return undefined;
+    const num = (key) => typeof record[key] === 'number' ? record[key] : 0;
+    const input = num('inputTokens');
+    const output = num('outputTokens');
+    const cacheRead = num('cacheReadTokens');
+    const cacheWrite = num('cacheWriteTokens');
+    const providerTotal = typeof record['totalTokens'] === 'number' ? record['totalTokens'] : 0;
+    if (input === 0 && output === 0 && cacheRead === 0 && cacheWrite === 0 && providerTotal === 0) {
+        return undefined;
+    }
+    const total = providerTotal > 0 ? providerTotal : input + output + cacheRead + cacheWrite;
+    return { input, output, cacheRead, cacheWrite, total };
+}
+function add(total, delta) {
+    return {
+        input: total.input + delta.input,
+        output: total.output + delta.output,
+        cacheRead: total.cacheRead + delta.cacheRead,
+        cacheWrite: total.cacheWrite + delta.cacheWrite,
+        total: total.total + delta.total,
+    };
+}
+const ZERO = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 };
+/** Aggregate every `assistant/message` usage event, grouped by `data.turn`. */
+export function aggregateUsage(events) {
+    const byTurn = new Map();
+    let total = ZERO;
+    for (const event of events) {
+        const row = asRecord(event);
+        if (row?.type !== 'assistant/message')
+            continue;
+        const data = asRecord(row.data);
+        if (data === undefined)
+            continue;
+        const usage = usageOf(data.usage);
+        if (usage === undefined)
+            continue;
+        const turn = typeof data.turn === 'number' ? data.turn : 0;
+        byTurn.set(turn, add(byTurn.get(turn) ?? ZERO, usage));
+        total = add(total, usage);
+    }
+    const turns = [...byTurn.entries()]
+        .sort((left, right) => right[0] - left[0])
+        .map(([turn, usage]) => ({ turn, usage }));
+    return { turns, total };
+}
+function line(label, usage) {
+    return (label +
+        '：输入 ' +
+        usage.input +
+        ' · 输出 ' +
+        usage.output +
+        ' · 缓存命中 ' +
+        usage.cacheRead +
+        ' · 合计 ' +
+        usage.total);
+}
+/** Render the three-line usage report; empty log is a distinct state. */
+export function renderUsageReport(report) {
+    if (report.turns.length === 0)
+        return '会话里还没有用量记录';
+    const current = report.turns[0];
+    const previous = report.turns[1];
+    return [
+        line('本回合', current.usage),
+        previous === undefined ? '上回合：暂无' : line('上回合', previous.usage),
+        line('会话合计', report.total),
+    ].join('\n');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-caduceus",
-  "version": "0.7.0",
+  "version": "0.10.5",
   "description": "Feishu/Lark surface plugin for DeepSeek Harness (dsh): one topic per session, SOUL persona sync, streaming process cards, /status and /doctor.",
   "type": "module",
   "main": "./dist/index.js",