@deepseek-harness-tui/dsh-tui 0.13.0 → 0.14.1

package/lib/types/dsh-adapter/channel/subagent-transcript.js

@@ -0,0 +1,279 @@
+/**
+ * DSH child transcript source (docs/dsh-child-transcript.md): the DSH
+ * implementation of the backend-neutral `SubagentControl.history` contract,
+ * next to Claude's on-disk child lane. Reads one direct child's own durable
+ * session log through the public persistence range API only
+ * (`ctx.sessionPersistence.open(id, 'read')` + `SessionHandle.read(offset,
+ * length)`) and translates the page through a throwaway DSH translator into
+ * the shared leaf vocabulary. The deprecated Session snapshot-events API and
+ * the raw session-log file readers are not used.
+ *
+ * Read shape (every step bounded and fenced):
+ *  1. ownership: the parent-owned `subagents.listChildren(parentId)` roster
+ *     must name the child; a UI-supplied id is never opened on its own;
+ *  2. durability: when the agents registry still holds the child's exact
+ *     live Session, the public `ctx.sessions.flush(session)` barrier runs
+ *     first (no whenIdle wait, no Agent create/resume); a failed or timed-out
+ *     flush falls back to whatever prefix is already persisted;
+ *  3. windows: the child's own events are `[inheritedEventCount, total)`;
+ *     the fork-inherited prefix is never paged (a seeded header without its
+ *     exact cut fails closed). `total` comes from `stat().eventCount` when
+ *     the host states it, else from bounded single-event tail probes of the
+ *     public range reader (never an unbounded whole-log read + slice);
+ *  4. translation: a fresh translator instance per call; only the leaf
+ *     kinds (`assistant.message` / `tool.call` / `tool.result`) survive,
+ *     each stamped with the child lane's `parentCallId`, so the shared
+ *     fold/page/merge pipeline consumes them exactly like Claude's;
+ *  5. fences: the binding capture (session + generation) is re-checked after
+ *     every await; a parent that moved on discards the page. The handle is
+ *     closed exactly once on every path.
+ */
+import { SESSION_FORMAT_VERSION } from '@deepseek-ai/dsh-session';
+import { textOfBlocks } from '../../channel/projection.js';
+import { toolErrorText } from './transcript.js';
+/**
+ * One page window in source events. Claude pages by 400 SDK messages
+ * (`SUBAGENT_TRANSCRIPT_PAGE`) and the shared "load older" chunk is
+ * `TRANSCRIPT_OLDER_CHUNK = 400`, so DSH pages by 400 SessionEvents and the
+ * neutral cursor stays one unit wide for both backends.
+ */
+export const CHILD_TRANSCRIPT_PAGE_EVENTS = 400;
+/** Span ceiling for the exponential probe (2^24 ≈ 16.7M events). */
+const PROBE_SPAN_MAX = 2 ** 24;
+/**
+ * Tail-probe budget when `stat()` states no `eventCount` (the pinned JSONL
+ * backend does not): exponential-then-binary single-event probes locate the
+ * log end. Every probe reads exactly one event; the count is capped so a
+ * pathological log degrades to "unavailable" instead of scanning. The worst
+ * log under the span ceiling takes 24 exponential hits, one miss and 24
+ * bisection steps.
+ */
+const PROBE_LIMIT = 2 * Math.log2(PROBE_SPAN_MAX) + 1;
+const staleError = () => new Error('dsh-tui: the channel binding changed before the child transcript was read');
+const optionalCount = (value) => typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : undefined;
+/**
+ * Locate the log end with bounded single-event probes of the public range
+ * reader, never an unbounded whole-log read: an event at `offset` proves the
+ * log is longer; exponential steps find an empty
+ * offset, binary search closes on the exact end. `known` must be an offset
+ * whose event exists (the inherited cut boundary was just verified).
+ */
+async function probeLogEnd(handle, known, guard, signal) {
+    const eventAt = async (offset) => {
+        guard();
+        signal?.throwIfAborted();
+        const { events } = await handle.read(offset, 1, signal === undefined ? undefined : { signal });
+        return events.length > 0;
+    };
+    let probes = 0;
+    const step = async (offset) => {
+        if (probes >= PROBE_LIMIT)
+            throw new Error('dsh-tui: the child transcript log exceeds the bounded tail-probe budget');
+        probes += 1;
+        return eventAt(offset);
+    };
+    let present = known;
+    let span = 1;
+    let absent;
+    while (absent === undefined) {
+        const candidate = present + span;
+        if (await step(candidate)) {
+            present = candidate;
+            span *= 2;
+            if (span > PROBE_SPAN_MAX)
+                throw new Error('dsh-tui: the child transcript log exceeds the bounded tail-probe budget');
+            continue;
+        }
+        absent = candidate;
+    }
+    while (absent - present > 1) {
+        const middle = Math.floor((present + absent) / 2);
+        if (await step(middle))
+            present = middle;
+        else
+            absent = middle;
+    }
+    return absent;
+}
+/**
+ * Read one child transcript page: the newest window, or the
+ * `window`-addressed older slice, of the child's own durable events. Null =
+ * the parent's catalog holds no such direct child; a rejection = the read
+ * failed (the transcript view shows "unavailable", never a fabricated empty
+ * page).
+ */
+export async function readChildTranscriptPage(deps, agentId, window) {
+    const capture = deps.capture();
+    if (capture === undefined)
+        throw new Error('dsh-tui: the bound session is not a DSH session');
+    const guard = () => {
+        if (!deps.isCurrent(capture))
+            throw staleError();
+    };
+    const signal = deps.ownerSignal;
+    signal?.throwIfAborted();
+    const service = deps.subagents();
+    if (service?.listChildren === undefined)
+        throw new Error('dsh-tui: the subagents continuation service is unavailable');
+    const persistence = deps.persistence();
+    if (persistence === undefined)
+        throw new Error('dsh-tui: session persistence is unavailable');
+    // 1. ownership: only a child this parent's own catalog names is opened.
+    const roster = await service.listChildren(capture.sessionId, signal);
+    guard();
+    if (!Array.from(roster ?? []).some(entry => entry?.id === agentId))
+        return null;
+    // 2. durability barrier for a still-live child (best effort; when it fails
+    //    the read below sees whatever prefix is already persisted).
+    try {
+        const live = deps.lookupChild(agentId)?.session;
+        const flush = live === undefined || live === null ? undefined : deps.sessionsStore()?.flush(live);
+        if (flush !== undefined) {
+            let timer;
+            const completed = await Promise.race([
+                flush.then(() => true, () => true),
+                new Promise(resolve => { timer = setTimeout(() => resolve(false), 2_000); }),
+            ]);
+            if (!completed)
+                process.stderr.write('dsh-tui: child transcript flush timed out after 2000ms\n');
+            if (timer !== undefined)
+                clearTimeout(timer);
+        }
+    }
+    catch { /* best effort: the read below returns what is on disk */ }
+    guard();
+    // 3. cheap length when the host states it; otherwise bounded tail probes.
+    let statCount;
+    try {
+        statCount = optionalCount((await persistence.stat?.(agentId, signal === undefined ? undefined : { signal }))?.eventCount);
+    }
+    catch { /* stat is an optimization: open/read report the real failures */ }
+    guard();
+    const handle = await persistence.open(agentId, 'read', signal === undefined ? undefined : { signal });
+    try {
+        guard();
+        const header = handle.header ?? {};
+        if (String(header.id ?? '') !== agentId)
+            throw new Error('dsh-tui: the stored child session id does not match the catalog id');
+        if (header.version !== SESSION_FORMAT_VERSION)
+            throw new Error('dsh-tui: the stored child session format is not supported');
+        const statedParent = header.parentSession;
+        if (statedParent !== undefined && statedParent !== null && String(statedParent) !== capture.sessionId) {
+            throw new Error('dsh-tui: the stored child session belongs to another parent');
+        }
+        // The fork-inherited prefix is part of the stored log but not the child's
+        // own history: page from the exact cut only. A seeded header that does
+        // not state its cut fails closed; zero is never assumed.
+        const cut = header.isSeeded === true
+            ? optionalCount(handle.inheritedEventCount)
+            : Math.max(0, optionalCount(handle.inheritedEventCount) ?? 0);
+        if (cut === undefined)
+            throw new Error('dsh-tui: the seeded child log does not state its inherited cut');
+        // The log's total length: `stat().eventCount` when the host states one,
+        // re-verified by a single one-event probe at that offset, because appends
+        // since the stat must not hide the newest page (a grown log falls into
+        // the bounded tail probe). Without a usable count the probe path verifies
+        // the inherited boundary first: the stored log always contains the prefix,
+        // so an empty event at `cut - 1` is corruption, not an empty child.
+        let total;
+        if (statCount !== undefined && statCount >= cut) {
+            guard();
+            signal?.throwIfAborted();
+            const freshness = await handle.read(statCount, 1, signal === undefined ? undefined : { signal });
+            total = freshness.events.length > 0 ? await probeLogEnd(handle, statCount, guard, signal) : statCount;
+        }
+        else {
+            if (cut > 0) {
+                guard();
+                signal?.throwIfAborted();
+                const boundary = await handle.read(cut - 1, 1, signal === undefined ? undefined : { signal });
+                if (boundary.events.length === 0)
+                    throw new Error('dsh-tui: the stored child log is shorter than its inherited cut');
+            }
+            guard();
+            signal?.throwIfAborted();
+            const ownStart = await handle.read(cut, 1, signal === undefined ? undefined : { signal });
+            total = ownStart.events.length > 0 ? await probeLogEnd(handle, cut, guard, signal) : cut;
+        }
+        guard();
+        const own = Math.max(0, total - cut);
+        let start;
+        let length;
+        if (window === undefined) {
+            length = Math.min(CHILD_TRANSCRIPT_PAGE_EVENTS, own);
+            start = cut + own - length;
+        }
+        else {
+            // An older slice: `count` own events ending just before `skipFromStart`
+            // (the pagination bookkeeping of the page already shown).
+            const skip = Math.max(0, Math.min(window.skipFromStart, own));
+            length = Math.max(0, Math.min(window.count, skip));
+            start = cut + skip - length;
+        }
+        const events = length === 0 ? [] : (await handle.read(start, length, signal === undefined ? undefined : { signal })).events;
+        guard();
+        // 4. one throwaway translator per call; only leaf events survive, each
+        //    forced onto the child lane so the shared fold consumes them exactly
+        //    like Claude's replayClaudeSubagentLane output. Nothing here runs the
+        //    channel projector, so no todo/job/goal side effects can fire.
+        const translator = deps.createTranslator();
+        const lane = [];
+        const uuids = [];
+        const pageCalls = new Set();
+        for (const event of events) {
+            const messageId = durableMessageId(event);
+            if (messageId !== undefined)
+                uuids.push(messageId);
+            for (const translated of translator.translateEvent(event)) {
+                if (translated.type === 'tool.call')
+                    pageCalls.add(translated.callId);
+                if (translated.type === 'tool.result' && !pageCalls.has(translated.callId)) {
+                    // Its call sits on an older page, so the translator never saw it
+                    // and left the body out. Keep the body, so whoever pairs this result
+                    // with the call from that page has what the card shows.
+                    lane.push({ ...orphanResult(translated, event), parentCallId: agentId });
+                }
+                else if (translated.type === 'assistant.message' || translated.type === 'tool.call' || translated.type === 'tool.result') {
+                    lane.push({ ...translated, parentCallId: agentId });
+                }
+            }
+        }
+        const skippedFromStart = Math.max(0, start - cut);
+        return {
+            events: lane,
+            // The parent is a verified fact (roster + stored lineage), never inferred.
+            parentAgentId: capture.sessionId,
+            uuids,
+            hasOlder: skippedFromStart > 0,
+            skippedFromStart,
+        };
+    }
+    finally {
+        // Close exactly once on every path; a read handle's close failure must
+        // not discard a page that was already read.
+        await handle.close().catch(() => undefined);
+    }
+}
+/** A result whose call was not on the page, with the body a paired card shows. */
+function orphanResult(result, event) {
+    return result.isError
+        ? { ...result, text: '', errorText: toolErrorText(event) }
+        : { ...result, text: textOfBlocks(result.content) };
+}
+/**
+ * The durable message ids that exist on the DSH wire (the `user/message`
+ * payload id and the `assistant/message` API message id), verbatim. Missing
+ * ids stay missing; nothing fabricates a UUID.
+ */
+function durableMessageId(event) {
+    const type = event.type;
+    if (type === 'user/message') {
+        const id = event.data?.id;
+        return typeof id === 'string' && id !== '' ? id : undefined;
+    }
+    if (type === 'assistant/message') {
+        const id = event.data?.message?.id;
+        return typeof id === 'string' && id !== '' ? id : undefined;
+    }
+    return undefined;
+}

package/lib/types/dsh-adapter/channel/transcript.d.ts

@@ -1,19 +1,7 @@
 import { type SessionEvent } from '@deepseek-ai/dsh-session';
 import type { ChatRow, ToolResultView, ToolViewPresenter } from './types.js';
-export declare const ARGS_PREVIEW_LIMIT = 160;
-export declare const RESULT_PREVIEW_LIMIT = 240;
-/** Local `!`-command output cap (mirrors the result preview limit). */
-export declare const LOCAL_OUTPUT_LIMIT = 240;
-/**
- * In-memory transcript window cap. Older rows beyond this count are FOLDED:
- * their full-text fields (assistant/reasoning text, tool args/results) are
- * dropped and only the preview/status metadata kept, so a long merge/deploy
- * turn cannot grow the TUI's RAM without bound. The session log remains the
- * complete source of truth (`/export` reads it, `/resume` replays it); the
- * folded row keeps its kind/id so scrolling and selection stay stable.
- */
-export declare const MAX_ROWS = 600;
-export declare function preview(text: string, limit: number): string;
+import { ARGS_PREVIEW_LIMIT, LOCAL_OUTPUT_LIMIT, MAX_ROWS, preview, RESULT_PREVIEW_LIMIT } from '../../channel/transcript.js';
+export { ARGS_PREVIEW_LIMIT, LOCAL_OUTPUT_LIMIT, MAX_ROWS, preview, RESULT_PREVIEW_LIMIT };
 /**
  * Fold the oldest rows beyond the transcript window cap: drop each row's
  * full-text fields (assistant/reasoning text, tool args/results) and keep
@@ -27,7 +15,11 @@ export declare function preview(text: string, limit: number): string;
 export declare function foldRows(rows: ChatRow[], cap: number, cursor?: {
     rows: unknown;
     index: number;
-}): number;
+    head?: unknown;
+}, 
+/** Rows the backend can restore (default: every foldable kind); any
+ *  other row keeps its full text. */
+restorable?: (row: ChatRow) => boolean): number;
 /**
  * Restore folded rows from the session log, newest folded batch first.
  * Rebuilds each folded row's full text from its source events and clears

package/lib/types/dsh-adapter/channel/transcript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/transcript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAG5E,eAAO,MAAM,kBAAkB,MAAM,CAAA;AAErC,eAAO,MAAM,oBAAoB,MAAM,CAAA;AAEvC,uEAAuE;AACvE,eAAO,MAAM,kBAAkB,MAAM,CAAA;AAErC;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,MAAM,CAAA;AAE3B,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,EAAE,EACf,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACxC,MAAM,CAsCR;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,EAAE,iBAAiB,GAAG,MAAM,CA8C5G;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CA+B3E;AAED,gFAAgF;AAChF,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,MAAM,CAEzE;AAED,8EAA8E;AAC9E,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAKpD,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,GACxC,cAAc,GAAG,SAAS,CA4C5B;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,MAAM,CAMxE;AAED,0EAA0E;AAC1E,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,IAAI,CAUxF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY,EAAE,CA2BnF"}
+{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/transcript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAE5E,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAI7H,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAE1F;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,EAAE,EACf,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE;AACzD;qCACqC;AACrC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,GACrC,MAAM,CA4CR;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,EAAE,iBAAiB,GAAG,MAAM,CA8C5G;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CA+B3E;AAED,gFAAgF;AAChF,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,MAAM,CAEzE;AAED,8EAA8E;AAC9E,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAKpD,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,GACxC,cAAc,GAAG,SAAS,CA4C5B;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,MAAM,CAMxE;AAED,0EAA0E;AAC1E,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,IAAI,CAUxF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY,EAAE,CA2BnF"}

package/lib/types/dsh-adapter/channel/transcript.js

@@ -1,22 +1,9 @@
 import { toolResultPayload } from '../compat/messages.js';
 import { markChannelReadDirty } from '../../adapter/channel/read-view.js';
-export const ARGS_PREVIEW_LIMIT = 160;
-export const RESULT_PREVIEW_LIMIT = 240;
-/** Local `!`-command output cap (mirrors the result preview limit). */
-export const LOCAL_OUTPUT_LIMIT = 240;
-/**
- * In-memory transcript window cap. Older rows beyond this count are FOLDED:
- * their full-text fields (assistant/reasoning text, tool args/results) are
- * dropped and only the preview/status metadata kept, so a long merge/deploy
- * turn cannot grow the TUI's RAM without bound. The session log remains the
- * complete source of truth (`/export` reads it, `/resume` replays it); the
- * folded row keeps its kind/id so scrolling and selection stay stable.
- */
-export const MAX_ROWS = 600;
-export function preview(text, limit) {
-    const flat = text.replace(/\s+/g, ' ').trim();
-    return flat.length <= limit ? flat : `${flat.slice(0, limit)}…`;
-}
+import { ARGS_PREVIEW_LIMIT, LOCAL_OUTPUT_LIMIT, MAX_ROWS, preview, RESULT_PREVIEW_LIMIT } from '../../channel/transcript.js';
+// Limits and the preview helper are backend-neutral (src/channel/transcript.ts);
+// re-exported here for the existing importers.
+export { ARGS_PREVIEW_LIMIT, LOCAL_OUTPUT_LIMIT, MAX_ROWS, preview, RESULT_PREVIEW_LIMIT };
 /**
  * Fold the oldest rows beyond the transcript window cap: drop each row's
  * full-text fields (assistant/reasoning text, tool args/results) and keep
@@ -27,7 +14,10 @@ export function preview(text, limit) {
  * a loadOlder() restore is not instantly undone. Returns the number of rows
  * folded.
  */
-export function foldRows(rows, cap, cursor) {
+export function foldRows(rows, cap, cursor, 
+/** Rows the backend can restore (default: every foldable kind); any
+ *  other row keeps its full text. */
+restorable) {
     const excess = rows.length - cap;
     if (excess <= 0) {
         if (cursor !== undefined)
@@ -38,10 +28,14 @@ export function foldRows(rows, cap, cursor) {
     // folded/restored exemptions are permanent, so everything below a cursor
     // over the SAME array identity needs no re-inspection. emit/emitStream
     // fold on every frame during streaming — a full rescan of a long window
-    // there was the O(rows) per-frame term of long-session streaming.
-    const from = cursor === undefined ? 0 : cursor.rows === rows ? cursor.index : 0;
-    if (cursor !== undefined)
+    // there was the O(rows) per-frame term of long-session streaming. Rows
+    // prepended ahead of the window (older history) shift every index: a new
+    // head restarts the pass.
+    const from = cursor === undefined ? 0 : cursor.rows === rows && cursor.head === rows[0] ? cursor.index : 0;
+    if (cursor !== undefined) {
         cursor.rows = rows;
+        cursor.head = rows[0];
+    }
     if (excess <= from)
         return 0;
     let folded = 0;
@@ -50,6 +44,8 @@ export function foldRows(rows, cap, cursor) {
             continue;
         if (row.kind !== 'user' && row.kind !== 'assistant' && row.kind !== 'reasoning' && row.kind !== 'tool')
             continue;
+        if (restorable !== undefined && !restorable(row))
+            continue;
         row.folded = true;
         folded += 1;
         if (row.kind === 'tool' && row.tool) {

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

@@ -1,6 +1,6 @@
 import type { ChannelUi } from '../../adapter/ports/channel-ui.js';
-import type { ChatRow, ToolCallView, ToolResultView, NotificationItem, TodoPanelItem, PendingMessage } from '../../adapter/ports/channel-view.js';
-export type { ChatRow, ToolRow, ToolCallView, ToolFileDiff, ToolResultView, SubagentRow, JobGroupRow, JobRow, TokenUsage, TokenBucket, CostTokenBuckets, SessionCostByModel, SubagentCostEntry, NotificationItem, ChannelGoal, TodoPanelItem, LoadedContext, LoadedContextEntry, LoadedContextFile, LoadedContextSkill, LoadedContextTool, PendingMessage, SubagentControl, JobControl, StagedImageInput, StagedImageAdjustment, StagedImageHandle, ComposerImageRef, ComposerSubmission, ExternalCommandOutcome, TranscriptImage, ResumeResult, EffortOption, PermissionPresetSnapshot, PermissionPresetAvailability, PermissionPresetOption, PermissionPresetCurrent, PresetOption, SkillInfo, CredentialStatus, AgentViewRow, AgentViewStatus, AgentViewDispatchResult, BackgroundResult } from '../../adapter/ports/channel-view.js';
+import type { RawTrajEvent, ChatRow, ToolCallView, ToolResultView, NotificationItem, TodoPanelItem, PendingMessage, TrajectorySource } from '../../adapter/ports/channel-view.js';
+export type { ChatRow, ToolRow, ToolCallView, ToolFileDiff, ToolResultView, SubagentRow, JobGroupRow, JobRow, TokenUsage, TokenBucket, CostTokenBuckets, SessionCostByModel, SubagentCostEntry, NotificationItem, ChannelGoal, TodoPanelItem, LoadedContext, LoadedContextEntry, LoadedContextFile, LoadedContextSkill, LoadedContextTool, PendingMessage, SubagentControl, SubagentTranscriptView, JobControl, StagedImageInput, StagedImageAdjustment, StagedImageHandle, ComposerImageRef, ComposerSubmission, ExternalCommandOutcome, TranscriptImage, ResumeResult, EffortOption, PermissionPresetSnapshot, PermissionPresetAvailability, PermissionPresetOption, PermissionPresetCurrent, PresetOption, SkillInfo, CredentialStatus, AgentViewRow, AgentViewStatus, AgentViewDispatchResult, BackgroundResult, BackendModeOption, BackendChannelOption, TrajectorySource } from '../../adapter/ports/channel-view.js';
 import { type ContentBlock, type StreamChunk } from '@deepseek-ai/dsh-llm';
 import { type SessionEvent } from '@deepseek-ai/dsh-session';
 import { type BackgroundJobState } from '../jobs.js';
@@ -12,7 +12,7 @@ export type SideQuestionLlm = {
 };
 export type PermissionPresetService = {
     names?: unknown;
-    current?: (events: readonly SessionEvent[]) => unknown;
+    current?: (events: readonly RawTrajEvent[]) => unknown;
     optionOf?: (name: string) => unknown;
 };
 export type ChannelImageBlock = Extract<ContentBlock, {
@@ -36,16 +36,23 @@ export interface ToolViewPresenter {
     result(name: string, rawArgs: string, data: SessionEvent<'tool/result'>['data']): ToolResultView | undefined;
 }
 /** Raw host implementation; the renderer receives ChannelUi instead. */
-export interface Channel extends Omit<ChannelUi, 'pluginScene' | 'traceEvents'> {
+export interface Channel extends Omit<ChannelUi, 'pluginScene' | 'traceEvents' | 'trajectorySource' | 'trajectoryLaneEvents'> {
     readonly pluginScene: TuiSceneDescriptor | undefined;
-    traceEvents(): readonly SessionEvent[];
+    traceEvents(): readonly RawTrajEvent[];
+    /** The mounted trajectory source's three-state report (see ChannelUi). */
+    trajectorySource(): TrajectorySource;
+    /** Lane drilldown reads (see ChannelUi). */
+    trajectoryLanes(): readonly import('../../adapter/ports/channel-view.js').TrajectoryLane[];
+    trajectoryLaneEvents(agentId: string, descendants?: boolean): readonly RawTrajEvent[];
+    /** Localized mounted-source label (see ChannelUi). */
+    trajectoryBackendLabel(): string;
     releaseContributions(): void;
 }
 type MutableChannelView = {
     -readonly [K in keyof ChannelUi]: ChannelUi[K];
 };
 /** Internal writable store; command signatures are owned once by ChannelUi. */
-export interface ChannelState extends Omit<MutableChannelView, 'rows' | 'notifications' | 'todos' | 'pending' | 'tpsSamples' | 'subagents' | 'backgroundJobs' | 'pluginScene' | 'traceEvents'> {
+export interface ChannelState extends Omit<MutableChannelView, 'rows' | 'notifications' | 'todos' | 'pending' | 'tpsSamples' | 'subagents' | 'backgroundJobs' | 'pluginScene' | 'traceEvents' | 'trajectorySource'> {
     rows: ChatRow[];
     notifications: NotificationItem[];
     /** Per-turn tps samples (sparkline history), oldest first. */
@@ -87,7 +94,9 @@ export interface ChannelState extends Omit<MutableChannelView, 'rows' | 'notific
     /** See {@link Channel.releaseContributions}. */
     releaseContributions(): void;
     /** Live session event log (see the public Channel type, `/trace`). */
-    traceEvents(): readonly SessionEvent[];
+    traceEvents(): readonly RawTrajEvent[];
+    /** The mounted trajectory source's three-state report (see ChannelUi). */
+    trajectorySource(): TrajectorySource;
 }
 export type FileSuggestionFs = {
     resolve(path: string): Promise<{

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

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

package/lib/types/dsh-adapter/channel/usage.d.ts

@@ -1,30 +1,10 @@
 import { type StreamChunk } from '@deepseek-ai/dsh-llm';
-import type { TokenUsage } from './types.js';
-/** 全零 token 累计（新会话 / 复位用）。 */
-export declare function emptyTokenUsage(): TokenUsage;
-/**
- * Context-bar token estimate for model-visible text: a per-code-point weighted
- * count by script class (see the rates above), rounded up.
- *
- * Pure and deterministic: non-negative, zero only for the empty string, and
- * monotonic — appending characters never lowers the result. A single call on
- * pure ASCII input is exactly the old `ceil(length / 4)` (there is an explicit
- * fast path), so per-message English numbers are unchanged; note that a caller
- * which used to sum characters and round once now rounds per call, so summing
- * this estimator over messages can differ from the legacy total by at most one
- * token per call (ASCII-only sums included). ANSI escapes are NOT stripped: they
- * are ASCII, and the provider tokenizes the literal message bytes rather than
- * the rendered cells.
- *
- * @param text - Model-visible text (a prompt, an assistant block, a tool
- *   result); widths are irrelevant here, this counts characters, not cells.
- * @returns The estimated token count (0 for empty input).
- */
-export declare function estimateTokens(text: string): number;
+import { emptyTokenUsage, estimateTokens } from '../../channel/usage.js';
+export { emptyTokenUsage, estimateTokens };
 /** Whether one stream chunk advances the first-token/decode boundary. */
 export declare function isTokenDelta(chunk: StreamChunk): boolean;
 /** Character payload of one token-bearing stream delta for the live fallback. */
 export declare function tokenDeltaChars(chunk: StreamChunk): number;
-/** Provider output count when usable; durable imports may predate strict validation. */
+/** DSH-shaped (`outputTokens`) output count when usable; durable imports may predate strict validation. */
 export declare function usageOutputTokens(usage: unknown): number | undefined;
 //# sourceMappingURL=usage.d.ts.map

package/lib/types/dsh-adapter/channel/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/usage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,8BAA8B;AAC9B,wBAAgB,eAAe,IAAI,UAAU,CAS5C;AA+DD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAqBnD;AAED,yEAAyE;AACzE,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAUxD;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAU1D;AAED,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAMpE"}
+{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/usage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAIxE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,CAAA;AAE1C,yEAAyE;AACzE,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAUxD;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAU1D;AAED,2GAA2G;AAC3G,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAMpE"}

package/lib/types/dsh-adapter/channel/usage.js

@@ -1,113 +1,7 @@
-/** 全零 token 累计（新会话 / 复位用）。 */
-export function emptyTokenUsage() {
-    return {
-        input: 0,
-        output: 0,
-        cacheRead: 0,
-        cacheWrite: 0,
-        peak: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-        idle: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    };
-}
-/*
- * Script-class rates for the context bar's local token estimate.
- *
- * pi-nano-context's original `text.length / 4` is an English heuristic: BPE
- * vocabularies pack roughly four ASCII characters into one token, but CJK text
- * runs ~1–1.5 characters per token (one ideograph is one or two tokens), so the
- * English rate under-counted Chinese/Korean/Japanese sessions by ~3x — the
- * segmented bar, its hover breakdown and everything derived from these numbers
- * were squeezed flat against the real occupancy reading (issue #1170).
- *
- * These are ESTIMATES, not metering: no tokenizer is consulted, and the guess
- * cannot see the provider vocabulary, the request envelope (role markers, tool
- * JSON, image blocks) or a cached prefix that the next request will not resend
- * in full. The authoritative occupancy is the harness `contextPressure`
- * projection (`projectedTokens ?? pressureTokens`, see
- * `dsh-adapter/context-occupancy.ts`); these numbers only describe what the
- * segmented bar is made of and must never be summed into that total.
- */
-/** ASCII, including control bytes and ANSI escapes: ~4 characters per token. */
-const CHARS_PER_TOKEN_ASCII = 4;
-/** CJK ideographs, kana, Hangul, Bopomofo, Yi, CJK punctuation and full-width
- *  forms: ~1.4 characters per token (the midpoint of the measured 1–1.5 band). */
-const CHARS_PER_TOKEN_CJK = 1.4;
-/** Everything else — accented Latin, Cyrillic, Greek, Arabic, Hebrew, Thai,
- *  Devanagari, emoji — deliberately conservative at 2 characters per token:
- *  denser scripts (Thai, Devanagari) and multi-token emoji clusters still come
- *  out low, while lighter ones are over-counted rather than under-counted. */
-const CHARS_PER_TOKEN_OTHER = 2;
-/** Cheapest possible "does this text need script classification at all" test. */
-const NON_ASCII_RE = /[^\x00-\x7f]/;
-/**
- * Whether one code point belongs to a script BPE vocabularies pack at roughly
- * one token per character or two. Emoji are deliberately excluded (they land in
- * the `OTHER` rate): they are not East Asian wide *text*, and a ZWJ cluster is
- * several code points the tokenizer may charge several tokens for.
- */
-function isDenseScript(codePoint) {
-    return ((codePoint >= 0x1100 && codePoint <= 0x11ff) // Hangul Jamo
-        || (codePoint >= 0x2e80 && codePoint <= 0x303f) // CJK radicals … CJK symbols and punctuation
-        || (codePoint >= 0x3040 && codePoint <= 0x33ff) // kana, Bopomofo, Hangul compat jamo, enclosed/compat CJK
-        || (codePoint >= 0x3400 && codePoint <= 0x4dbf) // CJK unified ideographs extension A
-        || (codePoint >= 0x4e00 && codePoint <= 0x9fff) // CJK unified ideographs
-        || (codePoint >= 0xa000 && codePoint <= 0xa4cf) // Yi syllables and radicals
-        || (codePoint >= 0xa960 && codePoint <= 0xa97f) // Hangul Jamo Extended-A
-        || (codePoint >= 0xac00 && codePoint <= 0xd7af) // Hangul syllables
-        || (codePoint >= 0xd7b0 && codePoint <= 0xd7ff) // Hangul Jamo Extended-B
-        || (codePoint >= 0xf900 && codePoint <= 0xfaff) // CJK compatibility ideographs
-        || (codePoint >= 0xfe30 && codePoint <= 0xfe4f) // CJK compatibility forms
-        || (codePoint >= 0xfe50 && codePoint <= 0xfe6f) // small form variants (CJK punctuation variants)
-        || (codePoint >= 0xff00 && codePoint <= 0xff60) // full-width forms
-        || (codePoint >= 0xff61 && codePoint <= 0xffdc) // half-width kana, half-width Hangul, half-width CJK punctuation
-        || (codePoint >= 0xffe0 && codePoint <= 0xffe6) // full-width signs
-        || (codePoint >= 0x1f200 && codePoint <= 0x1f2ff) // enclosed ideographic supplement
-        || (codePoint >= 0x20000 && codePoint <= 0x3fffd) // CJK extensions B–G
-    );
-}
-/**
- * Context-bar token estimate for model-visible text: a per-code-point weighted
- * count by script class (see the rates above), rounded up.
- *
- * Pure and deterministic: non-negative, zero only for the empty string, and
- * monotonic — appending characters never lowers the result. A single call on
- * pure ASCII input is exactly the old `ceil(length / 4)` (there is an explicit
- * fast path), so per-message English numbers are unchanged; note that a caller
- * which used to sum characters and round once now rounds per call, so summing
- * this estimator over messages can differ from the legacy total by at most one
- * token per call (ASCII-only sums included). ANSI escapes are NOT stripped: they
- * are ASCII, and the provider tokenizes the literal message bytes rather than
- * the rendered cells.
- *
- * @param text - Model-visible text (a prompt, an assistant block, a tool
- *   result); widths are irrelevant here, this counts characters, not cells.
- * @returns The estimated token count (0 for empty input).
- */
-export function estimateTokens(text) {
-    if (text === '')
-        return 0;
-    // Fast path: ASCII-only text is exactly the legacy rate, and the regex scan
-    // keeps the overwhelmingly common English case cheaper than a code-point walk.
-    if (!NON_ASCII_RE.test(text))
-        return Math.ceil(text.length / CHARS_PER_TOKEN_ASCII);
-    let ascii = 0;
-    let dense = 0;
-    let other = 0;
-    for (const character of text) {
-        // `for…of` walks code points, so a surrogate pair (emoji, CJK extension B+)
-        // counts once instead of twice.
-        const codePoint = character.codePointAt(0) ?? 0;
-        if (codePoint < 0x80)
-            ascii += 1;
-        else if (isDenseScript(codePoint))
-            dense += 1;
-        else
-            other += 1;
-    }
-    return Math.ceil(ascii / CHARS_PER_TOKEN_ASCII
-        + dense / CHARS_PER_TOKEN_CJK
-        + other / CHARS_PER_TOKEN_OTHER);
-}
+import { emptyTokenUsage, estimateTokens } from '../../channel/usage.js';
+// The neutral helpers live with the shared projector (src/channel/usage.ts);
+// re-exported here for the existing importers.
+export { emptyTokenUsage, estimateTokens };
 /** Whether one stream chunk advances the first-token/decode boundary. */
 export function isTokenDelta(chunk) {
     switch (chunk.type) {
@@ -132,7 +26,7 @@ export function tokenDeltaChars(chunk) {
             return 0;
     }
 }
-/** Provider output count when usable; durable imports may predate strict validation. */
+/** DSH-shaped (`outputTokens`) output count when usable; durable imports may predate strict validation. */
 export function usageOutputTokens(usage) {
     if (typeof usage !== 'object' || usage === null)
         return undefined;