@deepseek-harness-tui/dsh-tui 0.12.0 → 0.14.0

package/lib/types/components/trajectory/Inspector.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from '../../ui.js';
 import { formatDuration } from '../../trajectory/format.js';
+import { t } from '../../i18n.js';
 /**
  * The inspector — full detail for the focused row, in a fixed-height slot.
  *
@@ -25,6 +26,14 @@ export function Inspector({ node, detail, height, width, expanded, scroll, }) {
     // Flatten every section into display lines up front, so paging and
     // clipping operate on one uniform list.
     const lines = [];
+    // 还在等的审批/问卷行没有 durationMs，这里按渲染时刻算已等待时长；
+    // 场景与侧栏都在动画帧上重渲染，这行会随等待走动。
+    if (node.kind === 'approval' && node.status === 'running') {
+        lines.push({ text: t('trajectory-wait-elapsed', { duration: formatDuration(Math.max(0, Date.now() - node.time)) }) });
+    }
+    if (detail.unresolved === true) {
+        lines.push({ text: t('trajectory-inspect-unavailable'), tone: 'dim' });
+    }
     for (const section of detail.sections) {
         // A lone section whose heading repeats the pane title (a message row's
         // `assistant` under `assistant`) spends a line saying nothing.

package/lib/types/components/trajectory/Ledger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Ledger.d.ts","sourceRoot":"","sources":["../../../../src/components/trajectory/Ledger.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAgBjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AA6C1D,wBAAgB,MAAM,CAAC,EACrB,IAAI,EACJ,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,IAAI,EACJ,WAAW,EACX,WAAW,EACX,UAAU,GACX,EAAE;IACD,sCAAsC;IACtC,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAA;IACzB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAA;IACb,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,WAAW,EAAE,MAAM,CAAA;IACnB,kEAAkE;IAClE,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;CACxD,GAAG,KAAK,CAAC,SAAS,CAsKlB"}
+{"version":3,"file":"Ledger.d.ts","sourceRoot":"","sources":["../../../../src/components/trajectory/Ledger.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAgBjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AA6C1D,wBAAgB,MAAM,CAAC,EACrB,IAAI,EACJ,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,IAAI,EACJ,WAAW,EACX,WAAW,EACX,UAAU,GACX,EAAE;IACD,sCAAsC;IACtC,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAA;IACzB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAA;IACb,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,WAAW,EAAE,MAAM,CAAA;IACnB,kEAAkE;IAClE,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;CACxD,GAAG,KAAK,CAAC,SAAS,CA8KlB"}

package/lib/types/components/trajectory/Ledger.js

@@ -125,6 +125,12 @@ export function Ledger({ rows, start, height, cursor, width, tick, arrivalTick,
             const outcome = layout.outcome && node.outcome !== undefined && node.outcome !== ''
                 ? previewText(node.outcome, Math.max(8, Math.floor(layout.detail * 0.3)))
                 : '';
-            return (_jsxs(Box, { flexDirection: "row", width: "100%", height: 1, flexShrink: 0, gap: 1, ...rowEvents, children: [_jsx(Box, { flexShrink: 0, children: _jsxs(Text, { color: spineColor, children: [pointer, spineGlyph(rows, index)] }) }), layout.index && (_jsx(Box, { flexShrink: 0, width: 8, children: _jsx(Text, { color: "subtle", children: formatClock(node.time) }) })), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: isNew ? mix(theme[KIND_FG[node.kind]], theme.text, arriving) : KIND_FG[node.kind], backgroundColor: badgeBg, bold: true, children: badge }) }), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", color: focused ? 'suggestion' : node.seed === true ? 'subtle' : undefined, children: [label, detail === '' ? '' : ' ', _jsx(Text, { color: focused ? 'suggestion' : 'inactive', children: detail }), outcome === '' ? '' : _jsx(Text, { color: "subtle", children: `  → ${outcome}` })] }) }), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: running ? 'success' : heatColor(duration), children: costGlyph(duration) }) }), _jsx(Box, { flexShrink: 0, justifyContent: "flex-end", width: 7, children: _jsx(Text, { color: running ? 'success' : heatColor(duration), children: running ? '…' : duration === undefined ? '' : formatDuration(duration) }) })] }, `${node.seq}:${node.kind}`));
+            return (_jsxs(Box, { flexDirection: "row", width: "100%", height: 1, flexShrink: 0, gap: 1, ...rowEvents, children: [_jsx(Box, { flexShrink: 0, children: _jsxs(Text, { color: spineColor, children: [pointer, spineGlyph(rows, index)] }) }), layout.index && (_jsx(Box, { flexShrink: 0, width: 8, children: _jsx(Text, { color: "subtle", children: formatClock(node.time) }) })), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: isNew ? mix(theme[KIND_FG[node.kind]], theme.text, arriving) : KIND_FG[node.kind], backgroundColor: badgeBg, bold: true, children: badge }) }), _jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate", color: focused ? 'suggestion' : node.seed === true ? 'subtle' : undefined, children: [label, detail === '' ? '' : ' ', _jsx(Text, { color: focused ? 'suggestion' : 'inactive', children: detail }), outcome === '' ? '' : _jsx(Text, { color: "subtle", children: `  → ${outcome}` })] }) }), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: running ? 'success' : heatColor(duration), children: costGlyph(duration) }) }), _jsx(Box, { flexShrink: 0, justifyContent: "flex-end", width: 7, children: _jsx(Text, { color: running ? 'success' : heatColor(duration), children: running
+                                ? node.kind === 'approval'
+                                    ? formatDuration(Math.max(0, Date.now() - node.time))
+                                    : '…'
+                                : duration === undefined
+                                    ? ''
+                                    : formatDuration(duration) }) })] }, `${node.seq}:${node.kind}`));
         }) }));
 }

package/lib/types/components/trajectory/scope.d.ts

@@ -0,0 +1,64 @@
+/**
+ * Trajectory scope — the cross-agent drilldown selector (current agent /
+ * delegating turn / all descendants).
+ *
+ * The scope is a pure value describing WHICH lane's rows the trajectory
+ * surfaces render. `session` is the default and the pre-scope behavior;
+ * the other three kinds are all anchored on one drilldown target agent:
+ *
+ *  - `agent`        that agent's own lane log (its tools, its messages);
+ *  - `parent-turn`  the MAIN lane's rows of the delegating turn — the
+ *                   context the spawn happened in;
+ *  - `descendants`  the agent's whole subtree merged in emission order.
+ *
+ * Pure logic only (no React, no i18n): the surfaces build their chip text
+ * from {@link scopeChipParts} and drive the cycle through {@link drillScopeFrom}
+ * / {@link nextScope}.
+ */
+import type { TrajectoryLane } from '../../dsh-adapter/trajectory/index.js';
+import type { TrajNode } from '../../dsh-adapter/types.js';
+/** Which lane's rows the trajectory surfaces render. */
+export type TrajScope = {
+    readonly kind: 'session';
+} | {
+    readonly kind: 'agent';
+    readonly agentId: string;
+    readonly label: string;
+} | {
+    readonly kind: 'parent-turn';
+    readonly agentId: string;
+    readonly label: string;
+    readonly turn: number;
+} | {
+    readonly kind: 'descendants';
+    readonly agentId: string;
+    readonly label: string;
+};
+/** The lane's display label: its description, else model, else id head. */
+export declare function laneLabelOf(lane: TrajectoryLane): string;
+/**
+ * The lane a ledger row can drill into: a `subagent` descriptor row names
+ * its agent directly (the neutral source stamps `agentId`); the
+ * DELEGATING tool row anchors one through its `callId`.
+ */
+export declare function laneOfNode(node: TrajNode | undefined, lanes: readonly TrajectoryLane[]): TrajectoryLane | undefined;
+/**
+ * The MAIN-lane turn a lane's delegating call landed in — the 父回合 a
+ * drilldown can jump back to. `undefined` when the anchor call never
+ * folded into the main ledger (or the lane registered without a call).
+ */
+export declare function parentTurnOf(lane: TrajectoryLane, mainNodes: readonly TrajNode[]): number | undefined;
+/** Drill INTO the lane a focused row names; `undefined` = not drillable. */
+export declare function drillScopeFrom(node: TrajNode | undefined, lanes: readonly TrajectoryLane[]): TrajScope | undefined;
+/**
+ * The drill key's cycle: 当前 Agent → 父回合 → 全部后代 → 会话. The parent
+ * turn is skipped when it cannot be resolved; a scope whose lane vanished
+ * (a reset) falls straight back to the session.
+ */
+export declare function nextScope(scope: TrajScope, lanes: readonly TrajectoryLane[], mainNodes: readonly TrajNode[]): TrajScope;
+/** The scope chip's i18n key and interpolation params (`undefined` = hide). */
+export declare function scopeChipParts(scope: TrajScope): {
+    readonly key: 'trajectory-view-agent' | 'trajectory-view-parent' | 'trajectory-view-descendants';
+    readonly params: Readonly<Record<string, string | number>>;
+} | undefined;
+//# sourceMappingURL=scope.d.ts.map

package/lib/types/components/trajectory/scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../../../src/components/trajectory/scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE1D,wDAAwD;AACxD,MAAM,MAAM,SAAS,GACjB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC5E;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzG;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtF,2EAA2E;AAC3E,wBAAgB,WAAW,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAIxD;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,KAAK,EAAE,SAAS,cAAc,EAAE,GAAG,cAAc,GAAG,SAAS,CAKnH;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,QAAQ,EAAE,GAAG,MAAM,GAAG,SAAS,CAMrG;AAED,4EAA4E;AAC5E,wBAAgB,cAAc,CAC5B,IAAI,EAAE,QAAQ,GAAG,SAAS,EAC1B,KAAK,EAAE,SAAS,cAAc,EAAE,GAC/B,SAAS,GAAG,SAAS,CAGvB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,cAAc,EAAE,EAAE,SAAS,EAAE,SAAS,QAAQ,EAAE,GAAG,SAAS,CAYvH;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG;IAChD,QAAQ,CAAC,GAAG,EAAE,uBAAuB,GAAG,wBAAwB,GAAG,6BAA6B,CAAA;IAChG,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAA;CAC3D,GAAG,SAAS,CAOZ"}

package/lib/types/components/trajectory/scope.js

@@ -0,0 +1,88 @@
+/**
+ * Trajectory scope — the cross-agent drilldown selector (current agent /
+ * delegating turn / all descendants).
+ *
+ * The scope is a pure value describing WHICH lane's rows the trajectory
+ * surfaces render. `session` is the default and the pre-scope behavior;
+ * the other three kinds are all anchored on one drilldown target agent:
+ *
+ *  - `agent`        that agent's own lane log (its tools, its messages);
+ *  - `parent-turn`  the MAIN lane's rows of the delegating turn — the
+ *                   context the spawn happened in;
+ *  - `descendants`  the agent's whole subtree merged in emission order.
+ *
+ * Pure logic only (no React, no i18n): the surfaces build their chip text
+ * from {@link scopeChipParts} and drive the cycle through {@link drillScopeFrom}
+ * / {@link nextScope}.
+ */
+/** The lane's display label: its description, else model, else id head. */
+export function laneLabelOf(lane) {
+    if (lane.label !== undefined && lane.label !== '')
+        return lane.label;
+    if (lane.model !== undefined && lane.model !== '')
+        return lane.model;
+    return lane.agentId.slice(0, 8);
+}
+/**
+ * The lane a ledger row can drill into: a `subagent` descriptor row names
+ * its agent directly (the neutral source stamps `agentId`); the
+ * DELEGATING tool row anchors one through its `callId`.
+ */
+export function laneOfNode(node, lanes) {
+    if (node === undefined)
+        return undefined;
+    if (node.agentId !== undefined)
+        return lanes.find(lane => lane.agentId === node.agentId);
+    if (node.callId !== undefined)
+        return lanes.find(lane => lane.callId === node.callId);
+    return undefined;
+}
+/**
+ * The MAIN-lane turn a lane's delegating call landed in — the 父回合 a
+ * drilldown can jump back to. `undefined` when the anchor call never
+ * folded into the main ledger (or the lane registered without a call).
+ */
+export function parentTurnOf(lane, mainNodes) {
+    if (lane.callId === undefined)
+        return undefined;
+    for (const node of mainNodes) {
+        if (node.callId === lane.callId && (node.kind === 'tool' || node.kind === 'subtool'))
+            return node.turn;
+    }
+    return undefined;
+}
+/** Drill INTO the lane a focused row names; `undefined` = not drillable. */
+export function drillScopeFrom(node, lanes) {
+    const lane = laneOfNode(node, lanes);
+    return lane === undefined ? undefined : { kind: 'agent', agentId: lane.agentId, label: laneLabelOf(lane) };
+}
+/**
+ * The drill key's cycle: 当前 Agent → 父回合 → 全部后代 → 会话. The parent
+ * turn is skipped when it cannot be resolved; a scope whose lane vanished
+ * (a reset) falls straight back to the session.
+ */
+export function nextScope(scope, lanes, mainNodes) {
+    if (scope.kind === 'session')
+        return scope;
+    const lane = lanes.find(entry => entry.agentId === scope.agentId);
+    if (lane === undefined)
+        return { kind: 'session' };
+    if (scope.kind === 'agent') {
+        const turn = parentTurnOf(lane, mainNodes);
+        return turn === undefined
+            ? { kind: 'descendants', agentId: lane.agentId, label: laneLabelOf(lane) }
+            : { kind: 'parent-turn', agentId: lane.agentId, label: laneLabelOf(lane), turn };
+    }
+    if (scope.kind === 'parent-turn')
+        return { kind: 'descendants', agentId: lane.agentId, label: laneLabelOf(lane) };
+    return { kind: 'session' };
+}
+/** The scope chip's i18n key and interpolation params (`undefined` = hide). */
+export function scopeChipParts(scope) {
+    switch (scope.kind) {
+        case 'agent': return { key: 'trajectory-view-agent', params: { label: scope.label } };
+        case 'parent-turn': return { key: 'trajectory-view-parent', params: { turn: scope.turn } };
+        case 'descendants': return { key: 'trajectory-view-descendants', params: { label: scope.label } };
+        default: return undefined;
+    }
+}

package/lib/types/components/trajectory/useTrajectoryScope.d.ts

@@ -0,0 +1,42 @@
+/**
+ * The scope state + scoped data plane shared by the trajectory scene and
+ * the side panel.
+ *
+ * The hook owns three things the two surfaces would otherwise drift on:
+ *
+ * - the lane roster, read tolerantly (trajectoryLanes is an optional
+ *   capability — a source without lane attribution offers no filter);
+ * - the scoped node list + event snapshot every downstream region
+ *   (query, wave, ledger, inspector, hotspot) renders from — ONE
+ *   substitution point, so a scoped view can never show the session's
+ *   wave over the lane's ledger;
+ * - the lane fold itself, kept incremental per scope exactly the way Chat
+ *   keeps the main one: extended during render against the lane snapshot's
+ *   prefix identity, refolded from scratch when the scope switches.
+ */
+import { type RawTrajEvent, type TrajBuild, type TrajectoryLane } from '../../dsh-adapter/trajectory/index.js';
+import type { TrajNode } from '../../dsh-adapter/types.js';
+import type { ChannelUi } from '../../adapter/channel/ui-policy.js';
+import { type TrajScope } from './scope.js';
+/** One scoped data plane: the rows to render and the log to inspect from. */
+export interface ScopedTrajectory {
+    readonly nodes: readonly TrajNode[];
+    readonly events: readonly RawTrajEvent[];
+    /**
+     * The scoped build the aggregators read. For lane scopes this is the
+     * lane's own incremental build; for parent-turn a derived view over the
+     * main build (its nodes filtered, its timing slots shared); for session
+     * the main build itself, untouched.
+     */
+    readonly build: TrajBuild;
+}
+export declare function useTrajectoryScope(channel: ChannelUi | undefined, build: TrajBuild): {
+    readonly scope: TrajScope;
+    readonly lanes: readonly TrajectoryLane[];
+    readonly scoped: ScopedTrajectory;
+    /** The drill key / chip click: drill from a focused row, or cycle. */
+    drill(node: TrajNode | undefined): void;
+    /** Esc's first layer: true when a non-session scope consumed the press. */
+    popScope(): boolean;
+};
+//# sourceMappingURL=useTrajectoryScope.d.ts.map

package/lib/types/components/trajectory/useTrajectoryScope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useTrajectoryScope.d.ts","sourceRoot":"","sources":["../../../../src/components/trajectory/useTrajectoryScope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAqC,KAAK,YAAY,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACjJ,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAA;AACnE,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,YAAY,CAAA;AAKtE,6EAA6E;AAC7E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAA;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAC1B;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG;IACpF,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,cAAc,EAAE,CAAA;IACzC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACjC,sEAAsE;IACtE,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAA;IACvC,2EAA2E;IAC3E,QAAQ,IAAI,OAAO,CAAA;CACpB,CAqEA"}

package/lib/types/components/trajectory/useTrajectoryScope.js

@@ -0,0 +1,86 @@
+/**
+ * The scope state + scoped data plane shared by the trajectory scene and
+ * the side panel.
+ *
+ * The hook owns three things the two surfaces would otherwise drift on:
+ *
+ * - the lane roster, read tolerantly (trajectoryLanes is an optional
+ *   capability — a source without lane attribution offers no filter);
+ * - the scoped node list + event snapshot every downstream region
+ *   (query, wave, ledger, inspector, hotspot) renders from — ONE
+ *   substitution point, so a scoped view can never show the session's
+ *   wave over the lane's ledger;
+ * - the lane fold itself, kept incremental per scope exactly the way Chat
+ *   keeps the main one: extended during render against the lane snapshot's
+ *   prefix identity, refolded from scratch when the scope switches.
+ */
+import React from 'react';
+import { emptyTrajectory, extendTrajectory } from '../../dsh-adapter/trajectory/index.js';
+import { drillScopeFrom, nextScope } from './scope.js';
+const NO_EVENTS = [];
+const NO_LANES = [];
+export function useTrajectoryScope(channel, build) {
+    const [scope, setScope] = React.useState({ kind: 'session' });
+    // The roster rebuilds when the main build grows (lanes register on
+    // subagent.start, which appends to the main log) — the same staleness
+    // contract every other per-render read follows.
+    const lanes = React.useMemo(
+    // oxlint-disable-next-line react-hooks/exhaustive-deps
+    () => (channel !== undefined && typeof channel.trajectoryLanes === 'function' ? channel.trajectoryLanes() : NO_LANES), [channel, build]);
+    /** The lane fold, keyed by scope so a switch refolds from scratch. */
+    const laneBuildRef = React.useRef({ key: '', build: null });
+    // The parent-turn view is derived from the main build; memoized so the
+    // animation tick does not refilter the ledger and invalidate every
+    // aggregate keyed on the scoped build.
+    const parentTurn = scope.kind === 'parent-turn' ? scope.turn : undefined;
+    const parentTurnBuild = React.useMemo(() => {
+        if (parentTurn === undefined)
+            return undefined;
+        const filtered = build.nodes.filter(node => node.turn === parentTurn);
+        return { source: build.source, nodes: filtered, timing: build.timing, counts: build.counts, state: build.state };
+    }, [build, parentTurn]);
+    let nodes = build.nodes;
+    let events = NO_EVENTS;
+    let scopedBuild = build;
+    if (scope.kind === 'agent' || scope.kind === 'descendants') {
+        const descendants = scope.kind === 'descendants';
+        const key = scope.agentId + ':' + (descendants ? 'd' : 'a');
+        if (laneBuildRef.current.key !== key)
+            laneBuildRef.current = { key, build: null };
+        // Per-render incremental extend (the lane's events grow without the
+        // main build changing — a memo keyed on the main build would never see
+        // the tail; Chat's own main fold follows the same render-time pattern).
+        const snapshot = channel !== undefined && typeof channel.trajectoryLaneEvents === 'function'
+            ? channel.trajectoryLaneEvents(scope.agentId, descendants)
+            : NO_EVENTS;
+        laneBuildRef.current.build = extendTrajectory(laneBuildRef.current.build, snapshot);
+        scopedBuild = laneBuildRef.current.build ?? emptyTrajectory();
+        nodes = scopedBuild.nodes;
+        events = snapshot;
+    }
+    else if (parentTurnBuild !== undefined) {
+        // The main lane's rows of the delegating turn: a derived view (the
+        // timing slots stay the main build's — keyed turn:step, they answer
+        // this turn's TTFT/decode questions exactly).
+        nodes = parentTurnBuild.nodes;
+        events = (channel?.traceEvents?.() ?? NO_EVENTS);
+        scopedBuild = parentTurnBuild;
+    }
+    else {
+        events = (channel?.traceEvents?.() ?? NO_EVENTS);
+    }
+    const drill = React.useCallback((node) => {
+        setScope(previous => {
+            if (previous.kind === 'session')
+                return drillScopeFrom(node, lanes) ?? previous;
+            return nextScope(previous, lanes, build.nodes);
+        });
+    }, [lanes, build]);
+    const popScope = React.useCallback(() => {
+        if (scope.kind === 'session')
+            return false;
+        setScope({ kind: 'session' });
+        return true;
+    }, [scope]);
+    return { scope, lanes, scoped: { nodes, events, build: scopedBuild }, drill, popScope };
+}

package/lib/types/components/workspaces/HomeWorkspaceRow.d.ts

@@ -14,13 +14,15 @@ import type { ContextMenuEvent } from '../../ink/events/context-menu-event.js';
  * session rows resolve them: a row must be exactly two lines at every terminal
  * width, and a wrapped row destroys the alignment a list is scanned by.
  */
-export declare function HomeWorkspaceRow({ title, path, home, sessionCount, present, selected, focused, width, onSelect, onMenu, }: {
+export declare function HomeWorkspaceRow({ title, path, home, sessionCount, historyOnly, present, selected, focused, width, onSelect, onMenu, }: {
     title: string;
     /** Canonical directory path recorded in the ledger. */
     path: string;
     /** Home directory, for collapsing the path to `~`. */
     home: string;
     sessionCount: number;
+    /** Derived from session history, without a workspace registration. */
+    historyOnly?: boolean;
     /** False when the recorded directory no longer exists. */
     present: boolean;
     /** Whether this workspace's sessions are the ones on the right. */

package/lib/types/components/workspaces/HomeWorkspaceRow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HomeWorkspaceRow.d.ts","sourceRoot":"","sources":["../../../../src/components/workspaces/HomeWorkspaceRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAGvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AAG9E;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,OAAO,EACP,KAAK,EACL,QAAQ,EACR,MAAM,GACP,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAA;IACZ,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAA;IAChB,mEAAmE;IACnE,QAAQ,EAAE,OAAO,CAAA;IACjB,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,uEAAuE;IACvE,QAAQ,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;IAClC,mDAAmD;IACnD,MAAM,CAAC,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAA;CACvC,GAAG,KAAK,CAAC,SAAS,CAuClB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,KAAK,EACL,MAAM,GACP,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;CACjC,GAAG,KAAK,CAAC,SAAS,CAoBlB"}
+{"version":3,"file":"HomeWorkspaceRow.d.ts","sourceRoot":"","sources":["../../../../src/components/workspaces/HomeWorkspaceRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAGvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AAG9E;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,WAAmB,EACnB,OAAO,EACP,QAAQ,EACR,OAAO,EACP,KAAK,EACL,QAAQ,EACR,MAAM,GACP,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAA;IACZ,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,sEAAsE;IACtE,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAA;IAChB,mEAAmE;IACnE,QAAQ,EAAE,OAAO,CAAA;IACjB,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,uEAAuE;IACvE,QAAQ,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;IAClC,mDAAmD;IACnD,MAAM,CAAC,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAA;CACvC,GAAG,KAAK,CAAC,SAAS,CAwClB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,KAAK,EACL,MAAM,GACP,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;CACjC,GAAG,KAAK,CAAC,SAAS,CAoBlB"}

package/lib/types/components/workspaces/HomeWorkspaceRow.js

@@ -16,7 +16,7 @@ import { formatProject, spreadRow, truncateWidth } from '../../sessions/format.j
  * session rows resolve them: a row must be exactly two lines at every terminal
  * width, and a wrapped row destroys the alignment a list is scanned by.
  */
-export function HomeWorkspaceRow({ title, path, home, sessionCount, present, selected, focused, width, onSelect, onMenu, }) {
+export function HomeWorkspaceRow({ title, path, home, sessionCount, historyOnly = false, present, selected, focused, width, onSelect, onMenu, }) {
     const [hovered, setHovered] = useState(false);
     const body = Math.max(8, width - 4);
     // The presence marker leads the badge on purpose: `spreadRow` may truncate
@@ -25,7 +25,8 @@ export function HomeWorkspaceRow({ title, path, home, sessionCount, present, sel
     // the pane, the missing directory is not).
     const count = t('home-sessions-count', { n: sessionCount });
     const badge = present ? count : `${t('home-workspace-missing')} · ${count}`;
-    const heading = spreadRow(`${selected ? '▣' : '▢'} ${title}`, `${selected ? '✓ ' : ''}${badge}`, body);
+    const name = historyOnly ? `${t('supervisor-history-only')} · ${title}` : title;
+    const heading = spreadRow(`${selected ? '▣' : '▢'} ${name}`, `${selected ? '✓ ' : ''}${badge}`, body);
     const detail = formatProject(path, home);
     // The cursor (green) outranks the selection ring (green); both outrank the
     // idle colour. Blue is not part of this ladder at all — see the background.

package/lib/types/customTheme.d.ts

@@ -21,7 +21,7 @@
  */
 import { type Theme, type ThemeColorKey } from './theme.js';
 /** The base palettes a user theme may overlay. */
-export declare const THEME_BASE_NAMES: readonly ["light", "dark", "dark-ansi"];
+export declare const THEME_BASE_NAMES: readonly ["light", "dark", "dark-ansi", "claude-dark", "claude-paper", "codex-lavender", "codex-paper"];
 export type ThemeBase = (typeof THEME_BASE_NAMES)[number];
 /** The directory user theme files live in (~/.dsh-tui/themes). */
 export declare const CUSTOM_THEME_DIR: string;
@@ -96,11 +96,9 @@ export declare function buildTheme(spec: CustomThemeSpec): Theme;
  */
 export declare function resolveCustomTheme(name: string): Theme | undefined;
 /**
- * Whether a name selects a usable theme: a built-in palette, the `auto`
- * pseudo-theme, or a valid user theme file. Used for DSH_TUI_THEME /
- * persisted-preference validation and the runtime /theme switch.
- * @param name - Candidate theme name.
- * @returns True when the theme resolves.
+ * Availability from this module's static view: built-ins, `auto`, a valid user
+ * theme file. Runtime (plugin) themes belong to theme.isThemeAvailable(); the
+ * callers here are the static verification scripts.
  */
 export declare function isThemeAvailable(name: string): boolean;
 /** Drop the resolved-theme cache and name index (tests, or after themes change on disk). */

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

@@ -1 +1 @@
-{"version":3,"file":"customTheme.d.ts","sourceRoot":"","sources":["../../src/customTheme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,EAML,KAAK,KAAK,EACV,KAAK,aAAa,EACnB,MAAM,YAAY,CAAA;AAGnB,kDAAkD;AAClD,eAAO,MAAM,gBAAgB,yCAA0C,CAAA;AACvE,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAEzD,kEAAkE;AAClE,eAAO,MAAM,gBAAgB,QAA2B,CAAA;AAExD,6EAA6E;AAC7E,MAAM,MAAM,eAAe,GAAG;IAC5B,uFAAuF;IACvF,IAAI,EAAE,MAAM,CAAA;IACZ,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAA;IACnB,gDAAgD;IAChD,IAAI,EAAE,SAAS,CAAA;IACf,oEAAoE;IACpE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACtB,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAuCD,wEAAwE;AACxE,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAE9D;AAED,oEAAoE;AACpE,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAUjE;AAMD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,eAAe,GAAG,SAAS,CAwE7B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,GAAG,GAAE,MAAyB,GAC7B,eAAe,GAAG,SAAS,CAQ7B;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAyB,GAAG,eAAe,EAAE,CAclF;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CAEvD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAWlE;AAcD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGtD;AAED,4FAA4F;AAC5F,wBAAgB,qBAAqB,IAAI,IAAI,CAI5C"}
+{"version":3,"file":"customTheme.d.ts","sourceRoot":"","sources":["../../src/customTheme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,EAOL,KAAK,KAAK,EACV,KAAK,aAAa,EACnB,MAAM,YAAY,CAAA;AAGnB,kDAAkD;AAClD,eAAO,MAAM,gBAAgB,yGAA0G,CAAA;AACvI,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAEzD,kEAAkE;AAClE,eAAO,MAAM,gBAAgB,QAA2B,CAAA;AAExD,6EAA6E;AAC7E,MAAM,MAAM,eAAe,GAAG;IAC5B,uFAAuF;IACvF,IAAI,EAAE,MAAM,CAAA;IACZ,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAA;IACnB,gDAAgD;IAChD,IAAI,EAAE,SAAS,CAAA;IACf,oEAAoE;IACpE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACtB,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAuCD,wEAAwE;AACxE,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAE9D;AAED,oEAAoE;AACpE,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAUjE;AAMD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,eAAe,GAAG,SAAS,CAwE7B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,GAAG,GAAE,MAAyB,GAC7B,eAAe,GAAG,SAAS,CAQ7B;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAyB,GAAG,eAAe,EAAE,CAclF;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CAEvD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAWlE;AAcD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGtD;AAED,4FAA4F;AAC5F,wBAAgB,qBAAqB,IAAI,IAAI,CAI5C"}

package/lib/types/customTheme.js

@@ -21,10 +21,10 @@
  */
 import { readdirSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { getTheme, AUTO_THEME_NAME, isThemeColorKey, normalizeThemeKey, isRetiredThemeKey, } from './theme.js';
+import { getTheme, AUTO_THEME_NAME, isBuiltInThemeName, isThemeColorKey, normalizeThemeKey, isRetiredThemeKey, } from './theme.js';
 import { DATA_DIR } from './utils/paths.js';
 /** The base palettes a user theme may overlay. */
-export const THEME_BASE_NAMES = ['light', 'dark', 'dark-ansi'];
+export const THEME_BASE_NAMES = ['light', 'dark', 'dark-ansi', 'claude-dark', 'claude-paper', 'codex-lavender', 'codex-paper'];
 /** The directory user theme files live in (~/.dsh-tui/themes). */
 export const CUSTOM_THEME_DIR = join(DATA_DIR, 'themes');
 // #rgb / #rrggbb / #rrggbbaa
@@ -262,14 +262,12 @@ function indexCustomThemeNames() {
     nameIndexed = true;
 }
 /**
- * Whether a name selects a usable theme: a built-in palette, the `auto`
- * pseudo-theme, or a valid user theme file. Used for DSH_TUI_THEME /
- * persisted-preference validation and the runtime /theme switch.
- * @param name - Candidate theme name.
- * @returns True when the theme resolves.
+ * Availability from this module's static view: built-ins, `auto`, a valid user
+ * theme file. Runtime (plugin) themes belong to theme.isThemeAvailable(); the
+ * callers here are the static verification scripts.
  */
 export function isThemeAvailable(name) {
-    if (name === AUTO_THEME_NAME || isThemeBase(name))
+    if (name === AUTO_THEME_NAME || isBuiltInThemeName(name))
         return true;
     return resolveCustomTheme(name) !== undefined;
 }

package/lib/types/deepseekPricing.d.ts

@@ -17,9 +17,9 @@
 export type CnyPerMillion = readonly [number, number];
 /** 一个官方模型的完整价目（人民币/百万 tokens）。 */
 export interface DeepSeekModelPrice {
-    /** 输入（缓存未命中，含写入缓存部分）。 */
+    /** 输入（缓存未命中）单价；缓存写入量按此价另计。 */
     inputMiss: CnyPerMillion;
-    /** 输入（缓存命中）。 */
+    /** 输入（缓存命中）单价。 */
     inputHit: CnyPerMillion;
     /** 输出。 */
     output: CnyPerMillion;
@@ -63,11 +63,12 @@ export interface CostTokenBuckets {
 }
 /**
  * 估算本会话花费拆分（人民币，元）：高峰桶按高峰价、空闲桶按空闲价。
- * 公式（每桶）：(input − cacheRead) × 输入未命中价 + cacheRead × 输入命中价
- * + output × 输出价；cacheWrite 不单独计价（写入缓存的 token 已计入 input
- * 的未命中部分）。模型未收录或所有 token 均为零时返回 undefined（调用方
- * 不显示金额）。这是**估算**，不是账单——定价可能变动，以 DeepSeek 平台
- * 账单为准。
+ * 公式（每桶）：input × 输入未命中价 + cacheRead × 输入命中价
+ * + cacheWrite × 输入未命中价 + output × 输出价。DSH 的 TokenUsage 契约里
+ * 这四个计数是**互斥分项**——input 即未命中输入，缓存读/写各自另计——所以
+ * 四项直接相加，不做 input 与 cacheRead 之间的抵扣。模型未收录或所有 token
+ * 均为零时返回 undefined（调用方不显示金额）。这是**估算**，不是账单——
+ * 定价可能变动，以 DeepSeek 平台账单为准。
  * @param tokens - 按计价时段分桶的会话累计 token。
  * @param model - 当前模型 id（前缀匹配价目）。
  */
@@ -88,8 +89,8 @@ export declare function emptyCostBuckets(): CostTokenBuckets;
 export declare function cloneCostBuckets(buckets: CostTokenBuckets): CostTokenBuckets;
 /**
  * 把一笔 usage 按计价时段累加进分桶（in-place）。durable 事件按发生时刻
- * 落桶，峰/谷单价不同；cacheRead/cacheWrite 作为分项保留（cacheRead 计价
- * 时按命中价，见 costSplit）。
+ * 落桶，峰/谷单价不同；四个计数按 DSH 的 TokenUsage 契约互斥累加
+ * （cacheRead 计价时按命中价、cacheWrite 按未命中价，见 costSplit）。
  */
 export declare function addUsageToCostBuckets(buckets: CostTokenBuckets, usage: CostUsageDelta, peak: boolean): void;
 /** 一笔待计价用量：provider 决定官方与否，model 查价目，buckets 为峰谷分桶。 */

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

@@ -1 +1 @@
-{"version":3,"file":"deepseekPricing.d.ts","sourceRoot":"","sources":["../../src/deepseekPricing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deepseekPricing.d.ts","sourceRoot":"","sources":["../../src/deepseekPricing.ts"],"names":[],"mappings":"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"}

package/lib/types/deepseekPricing.js

@@ -94,9 +94,11 @@ function costSplit(tokens, price) {
     const costOf = (bucket, rateIndex) => {
         const input = Math.max(0, bucket.input);
         const output = Math.max(0, bucket.output);
-        const cacheRead = Math.max(0, Math.min(input, bucket.cacheRead));
-        return (input - cacheRead) * price.inputMiss[rateIndex]
+        const cacheRead = Math.max(0, bucket.cacheRead);
+        const cacheWrite = Math.max(0, bucket.cacheWrite);
+        return input * price.inputMiss[rateIndex]
             + cacheRead * price.inputHit[rateIndex]
+            + cacheWrite * price.inputMiss[rateIndex]
             + output * price.output[rateIndex];
     };
     return {
@@ -106,11 +108,12 @@ function costSplit(tokens, price) {
 }
 /**
  * 估算本会话花费拆分（人民币，元）：高峰桶按高峰价、空闲桶按空闲价。
- * 公式（每桶）：(input − cacheRead) × 输入未命中价 + cacheRead × 输入命中价
- * + output × 输出价；cacheWrite 不单独计价（写入缓存的 token 已计入 input
- * 的未命中部分）。模型未收录或所有 token 均为零时返回 undefined（调用方
- * 不显示金额）。这是**估算**，不是账单——定价可能变动，以 DeepSeek 平台
- * 账单为准。
+ * 公式（每桶）：input × 输入未命中价 + cacheRead × 输入命中价
+ * + cacheWrite × 输入未命中价 + output × 输出价。DSH 的 TokenUsage 契约里
+ * 这四个计数是**互斥分项**——input 即未命中输入，缓存读/写各自另计——所以
+ * 四项直接相加，不做 input 与 cacheRead 之间的抵扣。模型未收录或所有 token
+ * 均为零时返回 undefined（调用方不显示金额）。这是**估算**，不是账单——
+ * 定价可能变动，以 DeepSeek 平台账单为准。
  * @param tokens - 按计价时段分桶的会话累计 token。
  * @param model - 当前模型 id（前缀匹配价目）。
  */
@@ -152,8 +155,8 @@ export function cloneCostBuckets(buckets) {
 }
 /**
  * 把一笔 usage 按计价时段累加进分桶（in-place）。durable 事件按发生时刻
- * 落桶，峰/谷单价不同；cacheRead/cacheWrite 作为分项保留（cacheRead 计价
- * 时按命中价，见 costSplit）。
+ * 落桶，峰/谷单价不同；四个计数按 DSH 的 TokenUsage 契约互斥累加
+ * （cacheRead 计价时按命中价、cacheWrite 按未命中价，见 costSplit）。
  */
 export function addUsageToCostBuckets(buckets, usage, peak) {
     const bucket = peak ? buckets.peak : buckets.idle;
@@ -162,11 +165,15 @@ export function addUsageToCostBuckets(buckets, usage, peak) {
     bucket.cacheRead += usage.cacheRead ?? 0;
     bucket.cacheWrite += usage.cacheWrite ?? 0;
 }
-/** 分桶里的计价 token 总数（input 含 cacheRead，与既有显示口径一致）。 */
+/**
+ * 分桶里的计价 token 总数（两桶合计）：DSH 的 TokenUsage 契约里四个计数是
+ * **互斥分项**（input 只含未命中输入，缓存读/写各自另计），故四项全量相加。
+ */
 function bucketTokenTotal(buckets) {
     const peak = buckets.peak ?? EMPTY_TOTALS;
     const idle = buckets.idle ?? EMPTY_TOTALS;
-    return peak.input + peak.output + idle.input + idle.output;
+    return peak.input + peak.output + peak.cacheRead + peak.cacheWrite
+        + idle.input + idle.output + idle.cacheRead + idle.cacheWrite;
 }
 /**
  * 多模型桶计价纯函数：逐条目查价求和，金额按 scope 拆成主会话/子代理，