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

package/lib/types/dsh-adapter/channel/question-record.js

@@ -0,0 +1,107 @@
+/**
+ * Answered-questionnaire transcript record — a PURE fold of the durable
+ * session log (issue #1009).
+ *
+ * `ask_user_question` renders as the interactive panel, not as a tool card,
+ * so its `tool/result` had no renderer at all: the answers lived only in the
+ * current process's view rows (the TUI used to push a summary when the panel
+ * closed). That violated the transcript's source-of-truth rule — `/resume`,
+ * rewind, `loadOlder` and any replay lost the record, and an ask that was
+ * never observed closing produced none at all.
+ *
+ * The record now derives from the same log every other transcript row comes
+ * from: the `tool/call` arguments carry the questions, the `tool/result`
+ * payload carries the answers. Both are parsed at the caller's edge here, so
+ * this module stays pure (no store, no i18n state, no projection imports) and
+ * is directly testable.
+ */
+import { t } from '../../i18n.js';
+/** Truncate a long answer line for the transcript summary. */
+function clip(text, max = 140) {
+    if (text.length <= max)
+        return text;
+    return `${text.slice(0, max)}…`;
+}
+/**
+ * Fold one answered questionnaire into its transcript record.
+ *
+ * Tolerant by contract: the projection calls this on durable replay data it
+ * does not control (truncated logs, older hosts, a wizard-shaped caller), and
+ * a throw inside `renderEvent` would abort the whole transcript fold. So a
+ * missing/garbled question list or answer item degrades to a shorter line
+ * instead of raising.
+ *
+ * @param questions - The ask's questions, in the order they were answered.
+ * @param answers - The answers the log recorded for that same ask.
+ * @param options - `redact` masks answer text (local wizards collecting
+ *   secrets such as API keys must never leak into the transcript or an
+ *   `/export` dump); the model-side ask never sets it.
+ * @returns The title line plus its `· question → choice` body lines.
+ */
+export function buildQuestionRecord(questions, answers, options) {
+    const list = questions ?? [];
+    const lines = list.flatMap((question, index) => {
+        const answer = answers?.[index];
+        if (question === undefined || question === null || answer === undefined || answer === null)
+            return [];
+        // The question text comes from durable args too — a garbled entry must
+        // not turn into the string "undefined" in the transcript.
+        const prompt = typeof question.question === 'string' ? question.question : '';
+        const selected = Array.isArray(answer.selected) ? answer.selected : [];
+        if (prompt === '' && selected.length === 0 && (answer.custom ?? '') === '')
+            return [];
+        const text = options?.redact === true
+            ? '••••••'
+            : (() => {
+                const labels = selected.join('、');
+                const custom = answer.custom ?? '';
+                return custom !== ''
+                    ? labels === '' ? custom : `${labels}：${custom}`
+                    : labels;
+            })();
+        return `· ${prompt} → ${clip(text)}`;
+    });
+    return {
+        title: t('questionnaire-answered', { total: list.length }),
+        lines,
+    };
+}
+/**
+ * Parse the questions out of a persisted `ask_user_question` `tool/call`
+ * arguments string. Returns `undefined` when the payload is not the
+ * `{ questions: [...] }` object the tool declares, so the caller can fall
+ * back to a title-only record.
+ */
+export function parseQuestionRecordQuestions(rawArguments) {
+    try {
+        const parsed = JSON.parse(rawArguments ?? '');
+        if (typeof parsed !== 'object' || parsed === null)
+            return undefined;
+        const questions = parsed.questions;
+        return Array.isArray(questions) ? questions : undefined;
+    }
+    catch {
+        // Unparseable arguments are historical/foreign data, not a program bug:
+        // degrade to a title-only record rather than aborting the transcript fold.
+        return undefined;
+    }
+}
+/**
+ * Parse the answers out of a `tool/result` text payload. `dsh-tool-ask-user`
+ * renders its output as one JSON text block — the same bytes the model reads
+ * back — so the durable log is a sufficient source. A failed ask (or any
+ * non-JSON body) yields `undefined`: the caller then renders the log's own
+ * error text instead of fabricating an answer.
+ */
+export function parseQuestionRecordAnswers(rawResult) {
+    try {
+        const parsed = JSON.parse(rawResult);
+        if (typeof parsed !== 'object' || parsed === null)
+            return undefined;
+        const answers = parsed.answers;
+        return Array.isArray(answers) ? answers : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}

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

@@ -0,0 +1,42 @@
+/**
+ * Lineage decision consulted by `/model` only.
+ *
+ * `/rewind` and the `/tree` branch also re-create the live session as a child,
+ * but they always record `parentSession` and do not call this helper. A blank
+ * log cannot reach them (`boundary < 0`). This module is not their gate.
+ *
+ * The decision is load-bearing beyond grouping. Upstream's automatic session
+ * title only ever runs on a session WITHOUT a parent: `dsh-session-title`
+ * schedules its provider on the first human message under
+ * `session.header.parentSession === undefined`, and a session that already has
+ * one is never offered a generated title again — a fork keeps the title it
+ * inherited, and only an explicit `ctx.sessionTitle.refresh()` retries, which
+ * no TUI surface calls. A route switch on a session nobody has typed into
+ * would therefore cost that user the title of their first real prompt, leaving
+ * the deterministic fallback instead (a mid-word truncation of the prompt at
+ * `fallbackMaxBytes`).
+ *
+ * A session with no human message has no conversation for the lineage to
+ * describe, so its replacement stands as its own root — the same independent-
+ * conversation choice `/fork` already makes (`session-fork.ts`), for the same
+ * reason. The seeded prefix is unaffected either way: the child still inherits
+ * the source's session scaffolding verbatim.
+ *
+ * @module
+ */
+import type { SessionEvent } from '@deepseek-ai/dsh-session';
+/**
+ * Whether a re-created child must record the session it replaces as its parent.
+ *
+ * A `user/message` whose `source` is the person at the keyboard is a human turn
+ * whether or not it carries text (an image-only prompt is still a prompt), so
+ * its session is a conversation the lineage must describe. A user-role message
+ * from any other producer — a plugin injection, an instruction snapshot, a
+ * skill catalogue — is not: the child stays in the same family rather than
+ * being promoted to a root on a technicality.
+ *
+ * @param seed - the exact events the child inherits.
+ * @returns whether the child records `parentSession`.
+ */
+export declare function childRecordsLineage(seed: readonly SessionEvent[]): boolean;
+//# sourceMappingURL=session-lineage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session-lineage.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-lineage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,YAAY,EAAE,GAAG,OAAO,CAE1E"}

package/lib/types/dsh-adapter/channel/session-lineage.js

@@ -0,0 +1,51 @@
+/**
+ * Lineage decision consulted by `/model` only.
+ *
+ * `/rewind` and the `/tree` branch also re-create the live session as a child,
+ * but they always record `parentSession` and do not call this helper. A blank
+ * log cannot reach them (`boundary < 0`). This module is not their gate.
+ *
+ * The decision is load-bearing beyond grouping. Upstream's automatic session
+ * title only ever runs on a session WITHOUT a parent: `dsh-session-title`
+ * schedules its provider on the first human message under
+ * `session.header.parentSession === undefined`, and a session that already has
+ * one is never offered a generated title again — a fork keeps the title it
+ * inherited, and only an explicit `ctx.sessionTitle.refresh()` retries, which
+ * no TUI surface calls. A route switch on a session nobody has typed into
+ * would therefore cost that user the title of their first real prompt, leaving
+ * the deterministic fallback instead (a mid-word truncation of the prompt at
+ * `fallbackMaxBytes`).
+ *
+ * A session with no human message has no conversation for the lineage to
+ * describe, so its replacement stands as its own root — the same independent-
+ * conversation choice `/fork` already makes (`session-fork.ts`), for the same
+ * reason. The seeded prefix is unaffected either way: the child still inherits
+ * the source's session scaffolding verbatim.
+ *
+ * @module
+ */
+/**
+ * Whether a re-created child must record the session it replaces as its parent.
+ *
+ * A `user/message` whose `source` is the person at the keyboard is a human turn
+ * whether or not it carries text (an image-only prompt is still a prompt), so
+ * its session is a conversation the lineage must describe. A user-role message
+ * from any other producer — a plugin injection, an instruction snapshot, a
+ * skill catalogue — is not: the child stays in the same family rather than
+ * being promoted to a root on a technicality.
+ *
+ * @param seed - the exact events the child inherits.
+ * @returns whether the child records `parentSession`.
+ */
+export function childRecordsLineage(seed) {
+    return seed.some(isHumanMessage);
+}
+/** One message the person at the keyboard sent, by `source.kind` alone. */
+function isHumanMessage(event) {
+    if (event.type !== 'user/message')
+        return false;
+    // Durable data: the source is a merge-extensible sum type whose members are
+    // declared by their producers, so narrow instead of trusting the union.
+    const source = event.data.source;
+    return source?.kind === 'user';
+}

package/lib/types/dsh-adapter/channel/session-live-adoption.d.ts

@@ -13,6 +13,8 @@ export declare function createLiveAgentAdoption(state: LiveAdoptionState, deps:
     };
     resetProjector(): void;
     resetSubagents(): void;
+    restoreSubagents(agent: Agent): void;
+    parkSubagents(agent: Agent): void;
     resetJobs(): void;
     replay(events: readonly import('@deepseek-ai/dsh-session').SessionEvent[]): void;
     settleReplay(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"session-live-adoption.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-live-adoption.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAMhE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE5D,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,iBAAiB,GAAG,IAAI,CAC3B,YAAY,EACV,QAAQ,GACR,SAAS,GACT,WAAW,GACX,KAAK,GACL,YAAY,GACZ,aAAa,GACb,UAAU,GACV,OAAO,GACP,eAAe,GACf,eAAe,GACf,cAAc,GACd,iBAAiB,GACjB,KAAK,GACL,YAAY,GACZ,WAAW,GACX,SAAS,GACT,MAAM,CACT,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAA;AAEhD,qGAAqG;AACrG,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,IAAI,EAAE;IACJ,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IAClC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IAC3C,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,cAAc,IAAI,IAAI,CAAA;IACtB,cAAc,IAAI,IAAI,CAAA;IACtB,SAAS,IAAI,IAAI,CAAA;IACjB,MAAM,CAAC,MAAM,EAAE,SAAS,OAAO,0BAA0B,EAAE,YAAY,EAAE,GAAG,IAAI,CAAA;IAChF,YAAY,IAAI,IAAI,CAAA;IACpB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxD,gBAAgB,IAAI,IAAI,CAAA;IACxB,SAAS,IAAI,IAAI,CAAA;IACjB,eAAe,IAAI,IAAI,CAAA;IACvB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,iBAAiB,IAAI,IAAI,CAAA;IACzB;6CACyC;IACzC,iBAAiB,IAAI,IAAI,CAAA;IACzB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7F,eAAe,IAAI,IAAI,CAAA;CACxB,IAEa,QAAQ,KAAK,KAAG,OAAO,CAAC,YAAY,CAAC,CA0DpD"}
+{"version":3,"file":"session-live-adoption.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-live-adoption.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAMhE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE5D,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,iBAAiB,GAAG,IAAI,CAC3B,YAAY,EACV,QAAQ,GACR,SAAS,GACT,WAAW,GACX,KAAK,GACL,YAAY,GACZ,aAAa,GACb,UAAU,GACV,OAAO,GACP,eAAe,GACf,eAAe,GACf,cAAc,GACd,iBAAiB,GACjB,KAAK,GACL,YAAY,GACZ,WAAW,GACX,SAAS,GACT,MAAM,CACT,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAA;AAEhD,qGAAqG;AACrG,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,IAAI,EAAE;IACJ,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IAClC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IAC3C,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,cAAc,IAAI,IAAI,CAAA;IACtB,cAAc,IAAI,IAAI,CAAA;IACtB,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;IACpC,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;IACjC,SAAS,IAAI,IAAI,CAAA;IACjB,MAAM,CAAC,MAAM,EAAE,SAAS,OAAO,0BAA0B,EAAE,YAAY,EAAE,GAAG,IAAI,CAAA;IAChF,YAAY,IAAI,IAAI,CAAA;IACpB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACxD,gBAAgB,IAAI,IAAI,CAAA;IACxB,SAAS,IAAI,IAAI,CAAA;IACjB,eAAe,IAAI,IAAI,CAAA;IACvB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,iBAAiB,IAAI,IAAI,CAAA;IACzB;6CACyC;IACzC,iBAAiB,IAAI,IAAI,CAAA;IACzB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7F,eAAe,IAAI,IAAI,CAAA;CACxB,IAEa,QAAQ,KAAK,KAAG,OAAO,CAAC,YAAY,CAAC,CA+DpD"}

package/lib/types/dsh-adapter/channel/session-live-adoption.js

@@ -9,8 +9,17 @@ export function createLiveAgentAdoption(state, deps) {
     return async (target) => deps.binding.switchTo(target, deps.backgroundHandles.get(String(target.id)), (committed, disposePrevious) => {
         const previousHandle = committed.handle;
         const previousSessionId = String(committed.agent.session.id);
+        const keepPrevious = previousHandle !== undefined
+            && previousHandle.agent !== target
+            && (previousHandle.agent.status === 'running' || agentViewHasTurns(snapshotLiveSessionEvents(previousHandle.agent.session)));
+        // Registry attachment borrows an Agent without taking its upstream
+        // handle. Leaving that view must retain its projection independently
+        // of whether this channel can transfer or dispose the handle.
+        if (committed.agent !== target && (previousHandle === undefined || keepPrevious))
+            deps.parkSubagents(committed.agent);
         deps.backgroundHandles.delete(String(target.id));
         resetSessionProjection(state, deps.rowIds, deps.resetProjector, deps.resetSubagents, deps.resetJobs);
+        deps.restoreSubagents(target);
         state.status = target.status;
         state.agentId = target.id;
         state.sessionId = target.session.id;
@@ -43,9 +52,6 @@ export function createLiveAgentAdoption(state, deps) {
         writeResumeTarget(String(target.id));
         touchSession(target.id);
         state.emit();
-        const keepPrevious = previousHandle !== undefined
-            && previousHandle.agent !== target
-            && (previousHandle.agent.status === 'running' || agentViewHasTurns(snapshotLiveSessionEvents(previousHandle.agent.session)));
         if (previousHandle !== undefined && previousHandle.agent !== target) {
             if (keepPrevious) {
                 deps.backgroundHandles.set(previousSessionId, previousHandle);

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

@@ -54,7 +54,8 @@ export declare function createSessionMetadataActions(ctx: Context, deps: {
         cwd: string;
     };
 }): {
-    listSessions: () => Promise<readonly SessionSummary[]>;
+    cachedSessions: () => readonly SessionSummary[] | undefined;
+    listSessions: (onEnriched?: (summary: SessionSummary) => void, onPartial?: (rows: readonly SessionSummary[]) => void) => Promise<readonly SessionSummary[]>;
     previewSession: (sessionId: string) => Promise<import("../sessions/types.js").PreviewEntry[]>;
     listSkills: () => Promise<{
         name: string;

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

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

package/lib/types/dsh-adapter/channel/session-metadata.js

@@ -5,7 +5,8 @@ import { appendSessionTitle, deleteSessionLog, userTitleData } from '../compat/i
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { collectRecentActivity, parseRecapResponse, RECAP_RECENT_CHARS, wrapRecapPrompt } from '../recap.js';
 import { listSummaries, locateSession, previewSession } from '../sessions/index.js';
-import { runSideQuestion, wrapSideQuestion } from '../sideQuestion.js';
+import { openStepToolCallIds, runSideQuestion, splitUnresolvedToolCalls, wrapSideQuestion } from '../sideQuestion.js';
+import { readListingSnapshot } from '../sessions/snapshot.js';
 import { isUserInvocable } from '@deepseek-ai/dsh-skill';
 const PREVIEW_ENTRIES = 8;
 /** Session-scoped metadata, persistence queries, and tool-less LLM reads. */
@@ -13,7 +14,23 @@ export function createSessionMetadataActions(ctx, deps) {
     const current = (capture) => deps.owner.current() && deps.binding.isCurrent(capture);
     const persistence = () => ctx.get('sessionPersistence');
     const withOwnerSignal = (signal) => signal === undefined ? deps.owner.signal : AbortSignal.any([signal, deps.owner.signal]);
-    const listSessions = async () => {
+    let listingGeneration = 0;
+    let lastListing;
+    const remember = (source, rows) => {
+        lastListing = { source: source.identity ?? source, rows };
+    };
+    const cachedSessions = () => {
+        const source = persistence();
+        if (source === undefined)
+            return undefined;
+        // Providers without a durable scope still keep same-instance reopen fast.
+        // A replaced service never inherits this in-memory view.
+        return lastListing?.source === (source.identity ?? source)
+            ? lastListing.rows
+            : readListingSnapshot(source);
+    };
+    const listSessions = async (onEnriched, onPartial) => {
+        const generation = ++listingGeneration;
         const capture = deps.binding.capture();
         const source = persistence();
         if (!source) {
@@ -21,9 +38,21 @@ export function createSessionMetadataActions(ctx, deps) {
                 deps.setPersistedSessions([]);
             return [];
         }
-        const summaries = await listSummaries(source);
-        if (!current(capture))
+        let summaries = [];
+        summaries = await listSummaries(source, deps.owner.signal, enriched => {
+            if (!current(capture) || generation !== listingGeneration)
+                return;
+            summaries = summaries.map(row => row.id === enriched.id ? enriched : row);
+            remember(source, summaries);
+            deps.setPersistedSessions(summaries);
+            onEnriched?.(enriched);
+        }, rows => {
+            if (current(capture) && generation === listingGeneration)
+                onPartial?.(rows);
+        });
+        if (!current(capture) || generation !== listingGeneration)
             return [];
+        remember(source, summaries);
         deps.setPersistedSessions(summaries);
         return summaries;
     };
@@ -120,11 +149,14 @@ export function createSessionMetadataActions(ctx, deps) {
         if (!llm)
             return { answer: null, error: t('btw-llm-unavailable') };
         const signal = withOwnerSignal(options?.signal);
+        // /btw can land mid-step; see splitUnresolvedToolCalls.
+        const running = openStepToolCallIds(snapshotLiveSessionEvents(capture.agent.session));
+        const history = splitUnresolvedToolCalls(capture.agent.session.deriveMessages(), running);
         const outcome = await runSideQuestion({
             stream: llm.stream.bind(llm),
             options: llmRequest(capture, [
-                ...capture.agent.session.deriveMessages(),
-                createUserMessage({ content: [{ type: 'text', text: wrapSideQuestion(question) }], source: { kind: 'dsh-tui-btw' } }),
+                ...history.messages,
+                createUserMessage({ content: [{ type: 'text', text: wrapSideQuestion(question, history.pending) }], source: { kind: 'dsh-tui-btw' } }),
             ], true, signal),
             // Do not let an old session append streamed UI facts after a switch.
             onText: delta => { if (current(capture) && !options?.signal?.aborted)
@@ -204,7 +236,7 @@ export function createSessionMetadataActions(ctx, deps) {
         return true;
     };
     return {
-        listSessions, previewSession: preview, listSkills, describeCredential,
+        cachedSessions, listSessions, previewSession: preview, listSkills, describeCredential,
         sideQuestion, recapRecent, setResumeTarget: writeResumeTarget,
         renameSession, setSessionColor, deleteSession, renameSessionTo,
     };

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

@@ -1,5 +1,5 @@
 import type { ChannelState } from './types.js';
-export type SessionResetState = Pick<ChannelState, 'rows' | 'todos' | 'pending' | 'goal' | 'sessionTitle' | 'sessionColor' | 'tokens' | 'responseChars' | 'activeToolCount' | 'lastUserText' | 'working' | 'cancelPending' | 'spinnerMode' | 'tps' | 'tpsSamples' | 'lastUsage' | 'contextSegments'>;
+export type SessionResetState = Pick<ChannelState, 'rows' | 'todos' | 'pending' | 'goal' | 'sessionTitle' | 'sessionColor' | 'tokens' | 'mainCost' | 'subagentCost' | 'responseChars' | 'activeToolCount' | 'lastUserText' | 'working' | 'compaction' | 'cancelPending' | 'spinnerMode' | 'tps' | 'tpsSamples' | 'lastUsage' | 'contextSegments'>;
 /**
  * Reset the projection facts shared by every foreground session adoption.
  * Target-specific route, cwd, preset, loaded-context and status fields stay

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

@@ -1 +1 @@
-{"version":3,"file":"session-reset.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-reset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,YAAY,EACV,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,GACN,cAAc,GACd,cAAc,GACd,QAAQ,GACR,eAAe,GACf,iBAAiB,GACjB,cAAc,GACd,SAAS,GACT,eAAe,GACf,aAAa,GACb,KAAK,GACL,YAAY,GACZ,WAAW,GACX,iBAAiB,CACpB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EACzB,cAAc,EAAE,MAAM,IAAI,EAC1B,cAAc,EAAE,MAAM,IAAI,EAC1B,SAAS,EAAE,MAAM,IAAI,GACpB,IAAI,CAoCN"}
+{"version":3,"file":"session-reset.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-reset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,YAAY,EACV,MAAM,GACN,OAAO,GACP,SAAS,GACT,MAAM,GACN,cAAc,GACd,cAAc,GACd,QAAQ,GACR,UAAU,GACV,cAAc,GACd,eAAe,GACf,iBAAiB,GACjB,cAAc,GACd,SAAS,GACT,YAAY,GACZ,eAAe,GACf,aAAa,GACb,KAAK,GACL,YAAY,GACZ,WAAW,GACX,iBAAiB,CACpB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EACzB,cAAc,EAAE,MAAM,IAAI,EAC1B,cAAc,EAAE,MAAM,IAAI,EAC1B,SAAS,EAAE,MAAM,IAAI,GACpB,IAAI,CA2CN"}

package/lib/types/dsh-adapter/channel/session-reset.js

@@ -24,10 +24,17 @@ export function resetSessionProjection(state, rowIds, resetProjector, resetSubag
         peak: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
         idle: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
     };
+    // 会话级费用累计与 tokens 同生命周期：换会话/换模型/rewind 一律清零后
+    // 由 replay 重建（模型切换的 replay 会按 request/header 还原各请求模型）。
+    state.mainCost = {};
+    state.subagentCost = [];
     state.responseChars = 0;
     state.activeToolCount = 0;
     state.lastUserText = '';
     state.working = false;
+    // The adoption path settles any in-flight compaction before it takes the
+    // new session over; a row that survived it would describe the old one.
+    state.compaction = undefined;
     state.cancelPending = false;
     state.spinnerMode = 'requesting';
     state.tps = undefined;

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

@@ -35,6 +35,7 @@ export declare function createSessionResumeActions(ctx: Context, state: ResumeSt
     };
     resetProjector(): void;
     resetSubagents(): void;
+    parkSubagents(agent: Agent): void;
     resetJobs(): void;
     replay(events: readonly SessionEvent[]): void;
     settleReplay(): void;

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

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

package/lib/types/dsh-adapter/channel/session-resume.js

@@ -115,6 +115,10 @@ export function createSessionResumeActions(ctx, state, options, deps) {
             // normal return is a commit, which is what the outer finally keys on.
             const result = deps.binding.adopt(handle, adoption, (committedBinding, disposePrevious) => {
                 const previousSessionId = String(committedBinding.agent.session.id);
+                const keepPrevious = keepCurrent && committedBinding.handle !== undefined
+                    && (committedBinding.handle.agent.status === 'running' || agentViewHasTurns(snapshotLiveSessionEvents(committedBinding.handle.agent.session)));
+                if (keepCurrent && (committedBinding.handle === undefined || keepPrevious))
+                    deps.parkSubagents(committedBinding.agent);
                 state.cwd = handle.agent.session.header.cwd ?? state.cwd;
                 state.displayCwd = deps.describeWorkspace(state.cwd).description ?? state.cwd;
                 deps.resetIdeSelection();
@@ -126,8 +130,6 @@ export function createSessionResumeActions(ctx, state, options, deps) {
                 writeResumeTarget(sessionId);
                 touchSession(sessionId);
                 state.emit();
-                const keepPrevious = keepCurrent && committedBinding.handle !== undefined
-                    && (committedBinding.handle.agent.status === 'running' || agentViewHasTurns(snapshotLiveSessionEvents(committedBinding.handle.agent.session)));
                 if (committedBinding.handle !== undefined) {
                     if (keepPrevious) {
                         deps.backgroundHandles.set(previousSessionId, committedBinding.handle);

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

@@ -1 +1 @@
-{"version":3,"file":"settings-host.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/settings-host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAMvD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,GAAE,MAAM,IAAsB,GAAG,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,eAAe,GAAG,uBAAuB,CAAC,CAqT5K"}
+{"version":3,"file":"settings-host.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/settings-host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAMvD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,GAAE,MAAM,IAAsB,GAAG,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,eAAe,GAAG,uBAAuB,CAAC,CA+T5K"}

package/lib/types/dsh-adapter/channel/settings-host.js

@@ -137,6 +137,7 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                     if (providers === undefined || typeof providers !== 'object' || providers === null)
                         return [];
                     const catalog = catalogMembers();
+                    const resolvedSection = settingsValue(settings, 'llm-pi-ai');
                     return Object.entries(providers).flatMap(([route, profile]) => {
                         // The settings section is user-editable, so a `providers.<route>`
                         // entry may be null or a scalar; skip anything that is not a plain
@@ -152,6 +153,12 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                         const api = typeof stored.api === 'string' && stored.api !== ''
                             ? stored.api
                             : undefined;
+                        const resolved = resolvedSection?.providers?.[route];
+                        const headers = typeof resolved === 'object' && resolved !== null
+                            ? resolved.headers
+                            : undefined;
+                        const hasCustomHeaders = typeof headers === 'object' && headers !== null
+                            && !Array.isArray(headers) && Object.keys(headers).length > 0;
                         // Keep the raw model entries: a model-list re-selection must
                         // rewrite kept ids with their stored objects, so per-model fields
                         // this wizard never learned about survive the edit.
@@ -166,6 +173,7 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                                 shadowed: ref !== '' && process.env[ref] !== undefined,
                                 ...(baseURL !== undefined ? { baseURL } : {}),
                                 ...(api !== undefined ? { api } : {}),
+                                ...(hasCustomHeaders ? { hasCustomHeaders: true } : {}),
                                 ...(models !== undefined ? { models } : {}),
                                 ...(modelEntries !== undefined && modelEntries.length > 0
                                     ? { modelEntries }

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

@@ -1,6 +1,7 @@
 import type { AgentHandle } from '@deepseek-ai/dsh-agent';
 import type { SessionModeSpec } from '../../sessionModes.js';
 import { type PageMarginSetting, type ScrollGutterMode, type StatusBarConfig, type ToolBackground } from '../../tuiDisplayPrefs.js';
+import { type SplashFontSetting } from '../../components/splashFonts.js';
 import type { ChannelState } from './types.js';
 /** Launch configuration belongs to channel construction, not the composition root. */
 export interface ChannelLaunchOptions {
@@ -14,6 +15,12 @@ export interface ChannelLaunchOptions {
      *  read to render its line before the next event lands. */
     seedActivity?: (session: unknown) => void;
     activityFrames?: string;
+    /** Settings namespace this boot registered its section under: the Config
+     *  owner's Loader id (`resolveSettingsNamespace`), which is NOT always the
+     *  plugin name. Read sites look the TUI's section up by it, so passing the
+     *  literal `'dsh-tui'` here would silently miss custom mounts. Absent →
+     *  `'dsh-tui'` (direct `createChannel` embedders and fixtures). */
+    settingsNs?: string;
     diffLayout?: 'auto' | 'split' | 'unified';
     thinkingFold?: 'preview' | 'full';
     toolBackground?: ToolBackground;
@@ -26,6 +33,12 @@ export interface ChannelLaunchOptions {
     statusBar?: Partial<StatusBarConfig>;
     whale?: boolean;
     whaleIdle?: boolean;
+    /** Big-text face (settings `dsh-tui.splashFont`); absent → `daily`, the
+     *  date rotation. Junk normalizes to `daily` (see `normalizeSplashFont`). */
+    splashFont?: SplashFontSetting;
+    /** Maid portrait for the header splash (settings `dsh-tui.whaleGirl`;
+     * off by default). */
+    whaleGirl?: boolean;
     minimal?: boolean;
     contextBar?: boolean;
     configuredPreset?: string;
@@ -47,5 +60,5 @@ export declare function createInitialChannelView(options: ChannelLaunchOptions,
     sessionId: string;
     mode: ChannelState['mode'];
     cwdDescription: string;
-}): Pick<ChannelState, 'effortLevels' | 'version' | 'rows' | 'status' | 'sessionTitle' | 'sessionColor' | 'agentId' | 'sessionId' | 'agentBindingGeneration' | 'model' | 'provider' | 'tokens' | 'cwd' | 'displayCwd' | 'gitBranch' | 'working' | 'cancelPending' | 'spinnerMode' | 'responseChars' | 'activeToolCount' | 'turnStart' | 'lastUserText' | 'notifications' | 'contextWindow' | 'reasoningEffort' | 'mode' | 'modeIndex' | 'activityFrames' | 'configuredProvider' | 'configuredModel' | 'configuredPreset' | 'configuredActivityFrames' | 'configuredLang' | 'diffLayout' | 'thinkingFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'minimal' | 'activityEnabled' | 'contextBarEnabled' | 'agentPreset' | 'goal' | 'todos' | 'loadedContext' | 'pending' | 'commandList' | 'lastUsage' | 'tps' | 'tpsSamples' | 'contextSegments' | 'subagents' | 'backgroundJobs' | 'selection'>;
+}): Pick<ChannelState, 'effortLevels' | 'version' | 'rows' | 'status' | 'sessionTitle' | 'sessionColor' | 'agentId' | 'sessionId' | 'agentBindingGeneration' | 'model' | 'provider' | 'tokens' | 'cwd' | 'displayCwd' | 'gitBranch' | 'working' | 'compaction' | 'cancelPending' | 'spinnerMode' | 'responseChars' | 'activeToolCount' | 'turnStart' | 'lastUserText' | 'notifications' | 'contextWindow' | 'reasoningEffort' | 'mode' | 'modeIndex' | 'activityFrames' | 'configuredProvider' | 'configuredModel' | 'configuredPreset' | 'configuredActivityFrames' | 'configuredLang' | 'diffLayout' | 'thinkingFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'splashFont' | 'minimal' | 'activityEnabled' | 'contextBarEnabled' | 'statusBar' | 'whale' | 'whaleIdle' | 'whaleGirl' | 'minimal' | 'activityEnabled' | 'contextBarEnabled' | 'agentPreset' | 'goal' | 'todos' | 'loadedContext' | 'pending' | 'commandList' | 'lastUsage' | 'tps' | 'tpsSamples' | 'contextSegments' | 'mainCost' | 'subagentCost' | 'subagents' | 'backgroundJobs' | 'selection'>;
 //# sourceMappingURL=state.d.ts.map

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

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

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

@@ -1,5 +1,6 @@
 import { normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground } from '../../tuiDisplayPrefs.js';
 import { normalizeActivityPreset } from '../../components/activityFrames.js';
+import { normalizeSplashFont } from '../../components/splashFonts.js';
 /**
  * Neutral observable fields only. Behaviour is assembled explicitly by the
  * composition root after each specialist owner exists, so this factory cannot
@@ -11,6 +12,7 @@ export function createInitialChannelView(options, input) {
         agentId: input.agentId, sessionId: input.sessionId, agentBindingGeneration: 0, model: options.model, provider: options.provider,
         tokens: { 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 } },
         cwd: options.cwd, displayCwd: input.cwdDescription, gitBranch: undefined, working: false,
+        compaction: undefined,
         cancelPending: false, spinnerMode: 'requesting', responseChars: 0, activeToolCount: 0,
         turnStart: 0, lastUserText: '', notifications: [], contextWindow: undefined,
         reasoningEffort: options.effort, mode: input.mode, modeIndex: 0,
@@ -22,10 +24,13 @@ export function createInitialChannelView(options, input) {
         pageMargin: normalizePageMargin(options.pageMargin), foldTerminalCommand: options.foldTerminalCommand === true,
         promptSessionLabel: options.promptSessionLabel === true, expandEditor: options.expandEditor !== false,
         smoothStreaming: options.smoothStreaming !== false, statusBar: normalizeStatusBar(options.statusBar),
-        whale: options.whale !== false, whaleIdle: options.whaleIdle !== false, minimal: options.minimal === true, activityEnabled: options.activity !== false,
+        whale: options.whale !== false, whaleIdle: options.whaleIdle !== false, whaleGirl: options.whaleGirl === true, splashFont: normalizeSplashFont(options.splashFont), minimal: options.minimal === true, activityEnabled: options.activity !== false,
         contextBarEnabled: options.contextBar !== false, agentPreset: options.agentPreset, goal: undefined,
         todos: [], loadedContext: undefined, pending: [], commandList: [], lastUsage: undefined,
         tps: undefined, tpsSamples: [], contextSegments: { system: 0, prompt: 0, assistant: 0, thinking: 0, tools: 0 },
+        // 费用估算输入：主会话按模型分桶 + 子代理快照。与 tokens 并行累计，
+        // tokens 的既有语义/显示不变（DESIGN D2）。
+        mainCost: {}, subagentCost: [],
         subagents: [], backgroundJobs: [],
     };
 }