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

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

@@ -45,6 +45,7 @@ export class SubagentActivityStore {
                 output: [],
                 outputEvents: [],
                 toolCalls: [],
+                ...(info.parentAgentId === undefined ? {} : { parentAgentId: info.parentAgentId }),
             });
             this.notify();
             return;
@@ -72,6 +73,10 @@ export class SubagentActivityStore {
             existing.local = info.local ?? existing.local;
             existing.provider = provider;
             existing.model = model ?? existing.model;
+            // A late parent fact heals an unknown one; never rewrites a known
+            // parent (the same once-only rule the channel store applies).
+            if (info.parentAgentId !== undefined && existing.parentAgentId === undefined)
+                existing.parentAgentId = info.parentAgentId;
         }
         else {
             existing.provider = provider;
@@ -80,6 +85,8 @@ export class SubagentActivityStore {
                 existing.description = info.description;
             if (info.local !== undefined)
                 existing.local = info.local;
+            if (info.parentAgentId !== undefined && existing.parentAgentId === undefined)
+                existing.parentAgentId = info.parentAgentId;
         }
         this.notify();
     }

package/lib/types/dsh-adapter/themes.d.ts

@@ -9,7 +9,7 @@
 import { Context, Service } from '@deepseek-ai/cordis';
 import { type ThemeColorKey, type Theme } from '../theme.js';
 /** The built-in palette a runtime theme overlays. */
-export type TuiThemeBase = 'light' | 'dark' | 'dark-ansi';
+export type TuiThemeBase = 'light' | 'dark' | 'dark-ansi' | 'claude-dark' | 'claude-paper' | 'codex-lavender' | 'codex-paper';
 /** Plugin-facing runtime theme declaration. */
 export interface TuiThemeDescriptor {
     readonly name: string;

package/lib/types/dsh-adapter/themes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"themes.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/themes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAgBtD,OAAO,EAOL,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,aAAa,CAAA;AAEpB,qDAAqD;AACrD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,GAAG,WAAW,CAAA;AAEzD,+CAA+C;AAC/C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;CACnE;AAED,6EAA6E;AAC7E,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;CAC1C;AAED,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAAA;IACpD,WAAW,IAAI,SAAS,oBAAoB,EAAE,CAAA;IAC9C,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAAA;IACxC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,SAAS,EAAE,eAAe,CAAA;KAC3B;CACF;AAuKD,uDAAuD;AACvD,qBAAa,eAAgB,SAAQ,OAAO;gBAC9B,GAAG,EAAE,OAAO;IA2DxB;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,kBAAkB,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,IAAI;CAoFzE;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAO5F;AAED,eAAe,eAAe,CAAA"}
+{"version":3,"file":"themes.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/themes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAgBtD,OAAO,EAOL,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,aAAa,CAAA;AAEpB,qDAAqD;AACrD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAAG,cAAc,GAAG,gBAAgB,GAAG,aAAa,CAAA;AAE7H,+CAA+C;AAC/C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;CACnE;AAED,6EAA6E;AAC7E,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;CAC1C;AAED,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAAA;IACpD,WAAW,IAAI,SAAS,oBAAoB,EAAE,CAAA;IAC9C,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAAA;IACxC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,SAAS,EAAE,eAAe,CAAA;KAC3B;CACF;AAuKD,uDAAuD;AACvD,qBAAa,eAAgB,SAAQ,OAAO;gBAC9B,GAAG,EAAE,OAAO;IA2DxB;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,kBAAkB,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,IAAI;CAoFzE;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAO5F;AAED,eAAe,eAAe,CAAA"}

package/lib/types/dsh-adapter/trajectory/agent-source.d.ts

@@ -0,0 +1,84 @@
+/**
+ * The backend-neutral trajectory source: an incremental fold of the shared
+ * AgentEvent vocabulary into the raw-event envelope the trajectory
+ * projection already consumes.
+ *
+ * `/trace` and the trajectory panel fold {@link RawTrajEvent}s, the DSH
+ * session log's vocabulary. A session without that log (Claude) still
+ * streams the same AgentEvents every backend translator emits, so this
+ * module translates them for any composition that has no raw log. The
+ * channel reports 'empty' until the first mapped event and 'supported'
+ * from then on; 'unsupported' is left for a composition with no source.
+ *
+ * ## The mapping table
+ *
+ * | AgentEvent | Raw event | Notes |
+ * |---|---|---|
+ * | `turn.start`/`turn.end` | `turn/start`/`turn/end` | turn-level usage rides the close, backfilled by the fold only when no message of the turn carried usage (no double counting). |
+ * | `step.start`/`step.end` | `step/start`/`step/end` | no timestamps in the vocabulary → trace clock, marked `observed`. |
+ * | attempt supersede / `api-retry` notice | `llm/retry` (+ `llm/retry-started` on the next attempt) | one row per retry attempt; backoff delay is unknown to the vocabulary → 0. |
+ * | `assistant.delta` (text/reasoning/tool-args) | `assistant/chunk` | first/last-chunk timing for TTFT and decode. |
+ * | `assistant.delta` (`reasoning-tokens`) | — (estimate) | accumulated per attempt; surfaces as a thinking row when the settled message carries no reasoning text. |
+ * | `assistant.message` | `assistant/message` | message-level usage (the authoritative token count) attaches to the first row exactly once. |
+ * | `tool.call`/`tool.result` | `tool/call`/`tool/result` | paired by `callId`; args/result stay references (the inspector re-reads lazily). |
+ * | `tool.progress` | — | consumed; a running row's spinner is already live, an elapsed echo would add a row per poll. |
+ * | `tool.output` | — | consumed; live output is display-only, the settled result carries the record. |
+ * | `permission.request`/`settled` | `approval/asked`/`approval/decided` | paired by `requestId`; the asked payload also records the wait-detail fields (source identity, offered options). |
+ * | `question.request`/`settled` | `approval/asked`/`approval/decided` | the questionnaire as an approval-shaped bracket; the asked payload carries a bounded question snapshot. |
+ * | `compaction.start`/`end` | `compaction/start`/`compaction/end` | `removed` derived from pre/post tokens when both are known. |
+ * | `subagent.start` | `subagent/descriptor` | the child lane's presence row (carrying `agentId` as the drilldown anchor); the child's own assistant/tool traffic is folded into a SEPARATE per-agent lane log (below), never into the main ledger — the delegating tool bracket already spans it there — and subagent usage never enters the parent's token totals. |
+ * | `user.message` | `user/message` | human prompts as user rows, injected/goal/compaction output as context rows. |
+ * | `todo.write` | `todo/write` | parity with the DSH row. |
+ *
+ * ## Lanes (cross-agent drilldown)
+ *
+ * The vocabulary marks child-lane traffic ONLY through `parentCallId` (the
+ * delegating tool call). `subagent.start` registers that call id against the
+ * child's `agentId`; afterwards every parentCallId-carrying event folds
+ * into that agent's own raw-event log instead of the main one. The main
+ * lane's output is therefore byte-identical to the pre-lane fold — child
+ * traffic was already skipped there — while `lanes()` / `laneEvents()` /
+ * `descendantEvents()` expose the child logs the trajectory's scope filter
+ * (当前 Agent / 父回合 / 全部后代) refolds on demand. A second
+ * `subagent.start` for the same anchor call (a backend that learns the
+ * child's own id late) re-keys the lane and keeps the earlier events: they
+ * are adopted by the new id, in seq order.
+ *
+ * ## Clocks, identity, immutability
+ *
+ * Events without a timestamp take the trace clock (`Date.now` at receipt)
+ * and carry `data.observed = true` so the inspector can mark the row's time
+ * as an observation rather than a backend fact. `seq` is this source's own
+ * monotonic counter: durable `seq`s the vocabulary carries are used ONLY for
+ * deduplication (a reconnect may replay a durable chunk), never as envelope
+ * identity — the envelope stays monotonic in emission order for the
+ * inspector's binary search. Emitted events and payloads are frozen. The
+ * current attempt's tail chunk may be replaced in a new snapshot; older
+ * snapshots remain unchanged. Merged descendants rebuild when a lane changes.
+ */
+import type { AgentEvent } from '../../agent/events.js';
+import type { RawTrajEvent } from './guards.js';
+import type { TrajectoryLane } from './types.js';
+/** The neutral source a backend-neutral composition mounts. */
+export interface AgentTrajectorySource {
+    /** Fold one stream event (live or replayed) into the raw-event log. */
+    observe(event: AgentEvent, replaying: boolean): void;
+    /** Forget everything: a session swap or an in-place conversation reset. */
+    reset(): void;
+    /** The raw-event snapshot (`traceEvents()`'s return). */
+    events(): readonly RawTrajEvent[];
+    /** Every registered child lane, in registration order (drilldown roster). */
+    lanes(): readonly TrajectoryLane[];
+    /** One lane's raw-event snapshot. */
+    laneEvents(agentId: string): readonly RawTrajEvent[];
+    /** The agent's subtree merged in emission order (agent + all descendants). */
+    descendantEvents(agentId: string): readonly RawTrajEvent[];
+}
+/**
+ * Create the source. `clock` is injectable so regressions can pin the
+ * observation timestamps; it defaults to `Date.now`.
+ */
+export declare function createAgentTrajectorySource(options?: {
+    readonly clock?: () => number;
+}): AgentTrajectorySource;
+//# sourceMappingURL=agent-source.d.ts.map

package/lib/types/dsh-adapter/trajectory/agent-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-source.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/trajectory/agent-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,+DAA+D;AAC/D,MAAM,WAAW,qBAAqB;IACpC,uEAAuE;IACvE,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI,CAAA;IACpD,2EAA2E;IAC3E,KAAK,IAAI,IAAI,CAAA;IACb,yDAAyD;IACzD,MAAM,IAAI,SAAS,YAAY,EAAE,CAAA;IACjC,6EAA6E;IAC7E,KAAK,IAAI,SAAS,cAAc,EAAE,CAAA;IAClC,qCAAqC;IACrC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,YAAY,EAAE,CAAA;IACpD,8EAA8E;IAC9E,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,YAAY,EAAE,CAAA;CAC3D;AAkED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,MAAM,CAAA;CAAE,GAAG,qBAAqB,CAqf9G"}