@deepseek-harness-tui/dsh-tui 0.11.0 → 0.11.2

package/lib/types/dsh-adapter/subagents.js

@@ -1,3 +1,4 @@
+import { addUsageToCostBuckets, cloneCostBuckets, emptyCostBuckets, isDeepSeekOfficialProvider, isPeakHour, priceForModel } from '../deepseekPricing.js';
 import { toolResultPayload } from './compat/messages.js';
 const MAX_OUTPUT_EVENTS = 160;
 const MAX_OUTPUT_LINES = 160;
@@ -6,6 +7,12 @@ export class SubagentActivityStore {
     sessionToAgent = new Map();
     listeners = new Set();
     streams = new Map();
+    /** 会话级 durable usage 费用桶，key = `${provider}\u0000${model}`。 */
+    costByModel = new Map();
+    /** 非官方 provider / 未收录模型的用量副本（只展示 token，不计金额）。 */
+    costUnpriced = emptyCostBuckets();
+    /** 每个 agent 已消费的最大 durable 事件 seq（同一事件重投不重复计费）。 */
+    costSeq = new Map();
     commitLine(agentId, kind, text) {
         const state = this.states.get(agentId);
         if (!state)
@@ -22,28 +29,80 @@ export class SubagentActivityStore {
     }
     onSpawned(agentId, provider = 'subagent', model, info = {}) {
         const existing = this.states.get(agentId);
-        const state = existing ?? {
+        if (!existing) {
+            this.states.set(agentId, {
+                agentId,
+                runId: info.runId ?? agentId,
+                description: info.description ?? `${provider} task`,
+                provider,
+                model: model ?? info.model ?? provider,
+                effort: info.effort,
+                status: 'running',
+                startedAt: info.startedAt ?? Date.now(),
+                local: info.local,
+                parentSessionId: info.parentSessionId,
+                sessionId: info.sessionId,
+                output: [],
+                outputEvents: [],
+                toolCalls: [],
+            });
+            this.notify();
+            return;
+        }
+        // Continuable children re-use one agent id across residency epochs, and a
+        // new epoch announces a NEW runId (the host's `subagent/start` pairing
+        // key). A runId change therefore opens a fresh run: the previous epoch's
+        // terminal state, timing, output and tools must not leak into it. The
+        // same runId re-announced only refreshes display metadata.
+        if (info.runId !== undefined && info.runId !== existing.runId) {
+            this.streams.delete(agentId);
+            existing.runId = info.runId;
+            existing.status = 'running';
+            existing.startedAt = info.startedAt ?? Date.now();
+            existing.completedAt = undefined;
+            existing.endedAt = undefined;
+            existing.stopReason = undefined;
+            existing.summary = undefined;
+            existing.error = undefined;
+            existing.output = [];
+            existing.outputEvents = [];
+            existing.toolCalls = [];
+            existing.tokens = undefined;
+            existing.description = info.description ?? existing.description;
+            existing.local = info.local ?? existing.local;
+            existing.provider = provider;
+            existing.model = model ?? existing.model;
+        }
+        else {
+            existing.provider = provider;
+            existing.model = model ?? existing.model;
+            if (info.description !== undefined)
+                existing.description = info.description;
+            if (info.local !== undefined)
+                existing.local = info.local;
+        }
+        this.notify();
+    }
+    /** Durable discovery (`subagent/catalog`, workflow member events, registry
+     * back-fill): register a child WITHOUT disturbing an already-tracked run.
+     * `live` marks a child the agents registry currently holds, which keeps the
+     * row running; an idle historical child shows as `unknown` (the parent log
+     * alone cannot prove how its last epoch ended). */
+    onDiscovered(agentId, info = {}) {
+        if (this.states.has(agentId))
+            return;
+        this.states.set(agentId, {
             agentId,
-            runId: info.runId ?? agentId,
-            description: info.description ?? 'Subagent task',
-            provider,
-            model: model ?? info.model ?? provider,
-            effort: info.effort,
-            status: 'running',
-            startedAt: info.startedAt ?? Date.now(),
-            local: info.local,
-            parentSessionId: info.parentSessionId,
-            sessionId: info.sessionId,
+            description: info.label ?? `${info.provider ?? 'subagent'} task`,
+            provider: info.provider ?? 'subagent',
+            model: info.model ?? info.provider,
+            status: info.live ? 'running' : 'unknown',
+            startedAt: info.childCreatedAt ?? Date.now(),
+            sessionId: agentId,
             output: [],
             outputEvents: [],
             toolCalls: [],
-        };
-        if (existing) {
-            Object.assign(existing, info, { provider, model: model ?? existing.model, status: existing.status === 'completed' ? existing.status : 'running' });
-        }
-        else {
-            this.states.set(agentId, state);
-        }
+        });
         this.notify();
     }
     linkSession(agentId, session) {
@@ -54,6 +113,7 @@ export class SubagentActivityStore {
             state.sessionId = session;
     }
     getSubagentIdBySession(session) { return this.sessionToAgent.get(session); }
+    has(agentId) { return this.states.has(agentId); }
     appendOutput(agentId, text, kind = 'text') {
         const state = this.states.get(agentId);
         if (!state || !text)
@@ -188,8 +248,12 @@ export class SubagentActivityStore {
             case 'assistant/message': {
                 if (Array.isArray(data.stream))
                     this.settleAssistant(agentId, data.message?.content, data.turn, data.step, ev.seq);
-                if (data.usage)
+                if (data.usage) {
                     this.setTokens(agentId, data.usage);
+                    // durable usage 才进费用累计：live assistant/chunk 的 usage 只更新
+                    // 展示 token（见 setTokens 调用点），两路同时到达也只计这一路。
+                    this.accumulateCost(agentId, data.usage, ev.time, ev.seq);
+                }
                 break;
             }
             case 'assistant/attempt': {
@@ -267,18 +331,87 @@ export class SubagentActivityStore {
         state.tokens = { ...state.tokens, input, output, total: usage.total ?? ((input ?? 0) + (output ?? 0) || undefined) };
         this.notify();
     }
-    onCompleted(agentId, summary, stopReason = 'completed') { this.finish(agentId, 'completed', stopReason, summary); }
-    onFailed(agentId, error) { this.finish(agentId, 'failed', error, undefined); }
-    onCancelled(agentId, reason = 'cancelled', summary) { this.finish(agentId, 'cancelled', reason, summary); }
-    finish(agentId, status, reason, summary) {
+    /** durable usage 的计价字段；全零/非法返回 undefined（不建零桶）。 */
+    costDeltaOf(usage) {
+        if (usage === null || typeof usage !== 'object')
+            return undefined;
+        const value = usage;
+        const count = (raw) => typeof raw === 'number' && Number.isFinite(raw) && raw > 0 ? raw : 0;
+        const delta = {
+            input: count(value.inputTokens ?? value.input),
+            output: count(value.outputTokens ?? value.output),
+            cacheRead: count(value.cacheReadTokens),
+            cacheWrite: count(value.cacheWriteTokens),
+        };
+        if (delta.input === 0 && delta.output === 0 && delta.cacheRead === 0 && delta.cacheWrite === 0)
+            return undefined;
+        return delta;
+    }
+    /** 一笔 durable usage 按发生时刻落 peak/idle 桶，model/provider 取事件
+     *  发生时的子代理身份；非官方/未收录同时进 unpriced 副本。
+     *
+     *  `seq` 是同一 binding 内的事件序号：重放/回放把同一条 durable 事件再投
+     *  一次时只计第一笔（重投即双计会让"并入子代理"的估算凭空变大）。判据与
+     *  `settleAssistant` 的 `settledSeq` 同源但**各自独立**——两处都要消费
+     *  同一个 seq，共用字段会让后消费的那处被前一处挡掉。 */
+    accumulateCost(agentId, usage, time, seq) {
         const state = this.states.get(agentId);
-        if (!state || (state.status !== 'running' && state.status !== 'starting'))
+        const delta = this.costDeltaOf(usage);
+        if (state === undefined || delta === undefined)
+            return;
+        if (typeof seq === 'number') {
+            const consumed = this.costSeq.get(agentId);
+            if (consumed !== undefined && seq <= consumed)
+                return;
+            this.costSeq.set(agentId, seq);
+        }
+        const provider = state.provider ?? 'subagent';
+        const model = state.model ?? provider;
+        const key = `${provider}\u0000${model}`;
+        let entry = this.costByModel.get(key);
+        if (entry === undefined) {
+            entry = { provider, model, buckets: emptyCostBuckets() };
+            this.costByModel.set(key, entry);
+        }
+        const at = typeof time === 'number' ? new Date(time) : new Date();
+        const peak = isPeakHour(at);
+        addUsageToCostBuckets(entry.buckets, delta, peak);
+        if (!isDeepSeekOfficialProvider(provider) || priceForModel(model) === undefined) {
+            addUsageToCostBuckets(this.costUnpriced, delta, peak);
+        }
+    }
+    /** durable 用量的费用快照（深拷贝）：entries 供计价，unpriced 供展示。 */
+    costSnapshot() {
+        return {
+            entries: Array.from(this.costByModel.values()).map(entry => ({
+                provider: entry.provider,
+                model: entry.model,
+                buckets: cloneCostBuckets(entry.buckets),
+            })),
+            unpriced: cloneCostBuckets(this.costUnpriced),
+        };
+    }
+    onCompleted(agentId, summary, stopReason = 'completed', endedAt) { this.finish(agentId, 'completed', stopReason, summary, endedAt); }
+    onFailed(agentId, error, endedAt) { this.finish(agentId, 'failed', error, undefined, endedAt); }
+    onCancelled(agentId, reason = 'cancelled', summary, endedAt) { this.finish(agentId, 'cancelled', reason, summary, endedAt); }
+    finish(agentId, status, reason, summary, endedAt) {
+        const state = this.states.get(agentId);
+        // `unknown` rows (durable discovery: catalog children, workflow members
+        // folded from the log) accept their settlement edge the same as live
+        // rows — a terminal edge is authoritative regardless of how the row was
+        // born. Already-settled rows keep their first outcome.
+        if (!state || (state.status !== 'running' && state.status !== 'starting' && state.status !== 'unknown'))
             return;
+        // A discovered row settling from `unknown` closes at the durable event's
+        // wall time (`agent-end` stamps it), falling back to startedAt when even
+        // that is missing: completedAt must stay a number so the row projection's
+        // durationMs never ticks on a settled row.
+        const discovered = state.status === 'unknown';
         const stream = this.streams.get(agentId);
         if (stream !== undefined)
             this.restoreAttempt(agentId, stream);
         state.status = status;
-        state.completedAt = Date.now();
+        state.completedAt = discovered ? endedAt ?? state.startedAt : Date.now();
         state.endedAt = state.completedAt;
         state.stopReason = reason;
         if (summary)
@@ -289,11 +422,15 @@ export class SubagentActivityStore {
     }
     /** Drop all tracked subagents and session links (session swap: the old
      * session's children were disposed with their parent — nothing may keep
-     * routing events of a session the channel no longer projects). */
+     * routing events of a session the channel no longer projects). The
+     * session-scoped cost buckets reset with them. */
     reset() {
         this.states.clear();
         this.sessionToAgent.clear();
         this.streams.clear();
+        this.costByModel.clear();
+        this.costUnpriced = emptyCostBuckets();
+        this.costSeq.clear();
         this.notify();
     }
     snapshot() { return Array.from(this.states.values()).map(state => ({ ...state, output: [...state.output], outputEvents: [...state.outputEvents], toolCalls: state.toolCalls.map(tool => ({ ...tool })), tokens: state.tokens ? { ...state.tokens } : undefined })); }

package/lib/types/herdr.d.ts

@@ -21,6 +21,8 @@ export interface HerdrIntegrationOptions {
     readonly reportTimeoutMs?: number;
     readonly releaseTimeoutMs?: number;
     readonly retryDelaysMs?: readonly number[];
+    /** Milliseconds. Tests pin this so a later report can jump ahead of another pane reporter. */
+    readonly now?: () => number;
 }
 /** Report this TUI's lifecycle to the owning Herdr pane when Herdr launches it. */
 export declare function attachHerdrIntegration(options: HerdrIntegrationOptions): HerdrIntegration | undefined;

package/lib/types/herdr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"herdr.d.ts","sourceRoot":"","sources":["../../src/herdr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAQxF,UAAU,YAAY;IACpB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,UAAU,aAAa;IACrB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;IAC3C,WAAW,IAAI,OAAO,GAAG,IAAI,CAAA;CAC9B;AAED,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE3F,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IAChC,QAAQ,CAAC,GAAG,CAAC,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC3C;AAkBD,mFAAmF;AACnF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,gBAAgB,GAAG,SAAS,CAgH9B"}
+{"version":3,"file":"herdr.d.ts","sourceRoot":"","sources":["../../src/herdr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAQxF,UAAU,YAAY;IACpB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,UAAU,aAAa;IACrB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;IAC3C,WAAW,IAAI,OAAO,GAAG,IAAI,CAAA;CAC9B;AAED,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE3F,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IAChC,QAAQ,CAAC,GAAG,CAAC,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1C,8FAA8F;IAC9F,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;CAC5B;AAkBD,mFAAmF;AACnF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,gBAAgB,GAAG,SAAS,CAsH9B"}

package/lib/types/herdr.js

@@ -33,7 +33,13 @@ export function attachHerdrIntegration(options) {
             return Promise.reject(new Error('Herdr command could not be started'));
         }
     };
-    let sequence = Date.now() * 1000;
+    const now = options.now ?? Date.now;
+    let sequence = 0;
+    const nextSequence = () => {
+        const clock = now() * 1000;
+        sequence = clock > sequence ? clock : sequence + 1;
+        return String(sequence);
+    };
     let lastConfirmedReport = '';
     let disposed = false;
     let running = false;
@@ -73,7 +79,7 @@ export function attachHerdrIntegration(options) {
                     '--agent', 'dsh-tui',
                     '--state', state,
                     ...(blocked ? ['--message', 'Waiting for user input'] : []),
-                    '--seq', String(++sequence),
+                    '--seq', nextSequence(),
                 ]), reportTimeoutMs);
                 if (disposed)
                     break;
@@ -124,7 +130,7 @@ export function attachHerdrIntegration(options) {
                 'pane', 'release-agent', paneId,
                 '--source', 'custom:dsh-tui',
                 '--agent', 'dsh-tui',
-                '--seq', String(++sequence),
+                '--seq', nextSequence(),
             ]);
             disposePromise = withTimeout(release, releaseTimeoutMs).then(() => undefined);
             return disposePromise;

package/lib/types/history.d.ts

@@ -4,9 +4,14 @@ export type HistoryEntry = {
     /** Unix ms timestamp. */
     ts: number;
 };
+/**
+ * Entry cap for the persisted history. `↑`/`↓` and the Ctrl+R overlay read
+ * the same file, so both depths come from this one number.
+ */
+export declare const HISTORY_LIMIT = 200;
 /**
  * Append an input to the persisted history, deduping the immediately
- * previous entry and capping the file at 200 entries.
+ * previous entry and capping the file at `HISTORY_LIMIT` entries.
  * @param text - Input to persist; blank inputs are ignored.
  * @returns Resolves once this entry is persisted; callers on the input path
  * intentionally discard it because persistence is best-effort.
@@ -17,6 +22,13 @@ export declare function appendHistory(text: string): Promise<void>;
  * @returns The persisted entries in reverse-chronological order.
  */
 export declare function loadHistory(): HistoryEntry[];
+/**
+ * Read the persisted history in the order the composer walks it: oldest
+ * first, so `↑` reaches the newest entry first (the list tail) exactly as it
+ * does for the entries this process pushed itself.
+ * @returns The persisted entries in chronological order.
+ */
+export declare function loadHistoryOldestFirst(): HistoryEntry[];
 /**
  * Stable id for a history entry (keeps React keys distinct across identical texts).
  * @param entry - The history entry to hash.

package/lib/types/history.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/history.ts"],"names":[],"mappings":"AAWA,yCAAyC;AACzC,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,yBAAyB;IACzB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAyHD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQzD;AAED;;;GAGG;AACH,wBAAgB,WAAW,IAAI,YAAY,EAAE,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,SAAI,GAAG,MAAM,CAErE"}
+{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/history.ts"],"names":[],"mappings":"AAWA,yCAAyC;AACzC,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,yBAAyB;IACzB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,MAAM,CAAA;AAuHhC;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQzD;AAED;;;GAGG;AACH,wBAAgB,WAAW,IAAI,YAAY,EAAE,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,YAAY,EAAE,CAEvD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,SAAI,GAAG,MAAM,CAErE"}

package/lib/types/history.js

@@ -7,7 +7,11 @@ import { DATA_DIR } from './utils/paths.js';
 const HISTORY_DIR = DATA_DIR;
 const HISTORY_FILE = join(HISTORY_DIR, 'history.jsonl');
 const HISTORY_LOCK = `${HISTORY_FILE}.lock`;
-const HISTORY_LIMIT = 200;
+/**
+ * Entry cap for the persisted history. `↑`/`↓` and the Ctrl+R overlay read
+ * the same file, so both depths come from this one number.
+ */
+export const HISTORY_LIMIT = 200;
 const LOCK_RETRY_LIMIT = 500;
 const LOCK_RETRY_DELAY_MS = 5;
 const STALE_LOCK_MS = 30_000;
@@ -131,7 +135,7 @@ async function persistEntry(trimmed) {
 let appendChain = Promise.resolve();
 /**
  * Append an input to the persisted history, deduping the immediately
- * previous entry and capping the file at 200 entries.
+ * previous entry and capping the file at `HISTORY_LIMIT` entries.
  * @param text - Input to persist; blank inputs are ignored.
  * @returns Resolves once this entry is persisted; callers on the input path
  * intentionally discard it because persistence is best-effort.
@@ -153,6 +157,15 @@ export function appendHistory(text) {
 export function loadHistory() {
     return loadRaw().reverse();
 }
+/**
+ * Read the persisted history in the order the composer walks it: oldest
+ * first, so `↑` reaches the newest entry first (the list tail) exactly as it
+ * does for the entries this process pushed itself.
+ * @returns The persisted entries in chronological order.
+ */
+export function loadHistoryOldestFirst() {
+    return loadRaw();
+}
 /**
  * Stable id for a history entry (keeps React keys distinct across identical texts).
  * @param entry - The history entry to hash.