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

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

@@ -4,12 +4,13 @@ import { ARGS_PREVIEW_LIMIT, harnessToolResultView, LOCAL_OUTPUT_LIMIT, prepareR
 import { estimateTokens, isTokenDelta, tokenDeltaChars, usageOutputTokens } from './usage.js';
 import { transcriptImagesOf } from '../transcript-images.js';
 import { isCompactionCheckpointSource, toolResultPayload } from '../compat/messages.js';
-import { isPeakHour } from '../../deepseekPricing.js';
+import { addUsageToCostBuckets, emptyCostBuckets, isPeakHour } from '../../deepseekPricing.js';
 import { t } from '../../i18n.js';
 import { logForDebugging } from '../../utils/debug.js';
 import { cleanRenderText } from '../sanitize.js';
 import { NOTICE_CELLS } from './decisions.js';
 import { markChannelReadDirty } from '../../adapter/channel/read-view.js';
+import { buildQuestionRecord, parseQuestionRecordAnswers, parseQuestionRecordQuestions, } from './question-record.js';
 /** One authoritative reducer for both durable replay and live session events. */
 export function createChannelProjection(state, deps) {
     /** The in-progress assistant text row; `undefined` when no step is streaming. */
@@ -34,6 +35,15 @@ export function createChannelProjection(state, deps) {
     let tpsStep;
     /** Tool cards by callId, so tool/result can settle the running card. */
     const toolCards = new Map();
+    /**
+     * `ask_user_question` calls by callId, holding their raw arguments. The ask
+     * renders as the interactive panel rather than a tool card, so its result
+     * has no card to settle — but the answered record is still a transcript
+     * fact and must come from the durable log (issue #1009), never from the
+     * view. Remembering the call lets `tool/result` derive that record on the
+     * live stream AND on every replay (`/resume`, rewind, model switch).
+     */
+    const askCalls = new Map();
     /**
      * Session events are delivered live and can also be replayed around a
      * reconnect. A repeated sealed message must not create a second assistant
@@ -46,6 +56,11 @@ export function createChannelProjection(state, deps) {
     let openStep;
     let activeAttempt;
     let lastStreamRevision = -1;
+    /** 最近一次 request/header 的模型：durable usage 的模型归属真源。replay
+     *  会按历史请求逐个还原，因此 /model 切换（reset + replay 整个 seed）
+     *  不会把换模型前的用量重估到新模型；旧日志没有 header 时回退
+     *  事件发生时的 state.model（AC-A4）。 */
+    let eventModel;
     const assistantRowsByStep = new Map();
     const lastTextDelta = new Map();
     const stepKey = (turn, step) => `${turn}:${step}`;
@@ -268,6 +283,40 @@ export function createChannelProjection(state, deps) {
         if (folded > 0)
             logForDebugging(`thinking: folded ${folded} reasoning row(s) at turn settle`);
     };
+    /**
+     * Project one answered `ask_user_question` result into the transcript.
+     *
+     * The row shape reuses what `pushLocal` emits (`local` title + one
+     * `local-output` per line), so rendering, preview clipping and the local
+     * rows' fold exemption all keep their existing behavior. A failed ask
+     * renders the log's own error text — never a fabricated answer (the ask
+     * was cancelled/aborted, so no human ever chose anything).
+     */
+    const projectAskResult = (event, rawArguments) => {
+        const append = (record) => {
+            appendRow({ id: deps.rowIds.value, kind: 'local', text: record.title, seq: event.seq });
+            deps.rowIds.value += 1;
+            for (const line of record.lines) {
+                appendRow({
+                    id: deps.rowIds.value,
+                    kind: 'local-output',
+                    text: preview(line, LOCAL_OUTPUT_LIMIT),
+                    seq: event.seq,
+                });
+                deps.rowIds.value += 1;
+            }
+        };
+        if (event.data.error !== undefined || toolResultPayload(event.data.message).isError) {
+            const errorText = toolErrorText(event);
+            append({ title: errorText, lines: [] });
+            return;
+        }
+        const answers = parseQuestionRecordAnswers(textOf(toolResultPayload(event.data.message).content));
+        // No parseable answers (unparseable durable payload, or an older host):
+        // `answers: []` still yields the title, so the transcript shows that a
+        // questionnaire happened instead of dropping the fact silently.
+        append(buildQuestionRecord(parseQuestionRecordQuestions(rawArguments), answers ?? []));
+    };
     /** Recompute the spinner phase from live row/tool state. */
     const updateSpinnerMode = () => {
         if (state.activeToolCount > 0) {
@@ -332,6 +381,7 @@ export function createChannelProjection(state, deps) {
         openStep = undefined;
         activeAttempt = undefined;
         lastStreamRevision = -1;
+        eventModel = undefined;
         assistantRowsByStep.clear();
         lastTextDelta.clear();
         replaying = true;
@@ -438,7 +488,7 @@ export function createChannelProjection(state, deps) {
                 // than disappearing with the other injected context.
                 if (isCompactionCheckpointSource(event.data.source)) {
                     const summary = textOf(event.data.content);
-                    appendRow({ id: deps.rowIds.value, kind: 'notice', text: 'Session summary is ready' });
+                    appendRow({ id: deps.rowIds.value, kind: 'notice', text: t('compact-done') });
                     deps.rowIds.value += 1;
                     if (summary) {
                         appendRow({ id: deps.rowIds.value, kind: 'compact', text: summary });
@@ -646,8 +696,9 @@ export function createChannelProjection(state, deps) {
                     // replays historical events, so a resumed session prices each
                     // request at the rate window it actually ran in — the session cost
                     // estimate never prices the whole session at the current window).
+                    const peak = isPeakHour(new Date(event.time));
                     {
-                        const bucket = isPeakHour(new Date(event.time))
+                        const bucket = peak
                             ? state.tokens.peak
                             : state.tokens.idle;
                         bucket.input += usage.inputTokens ?? 0;
@@ -655,6 +706,24 @@ export function createChannelProjection(state, deps) {
                         bucket.cacheRead += usage.cacheReadTokens ?? 0;
                         bucket.cacheWrite += usage.cacheWriteTokens ?? 0;
                     }
+                    // 主会话费用分桶（DESIGN D2）：与 tokens 同口径，但按事件发生时
+                    // 的模型归属——replay 用 request/header 还原历史请求模型，旧日志
+                    // 回退 channel 模型；换模型不会把历史 token 重估到新模型。
+                    const costInput = usage.inputTokens ?? 0;
+                    const costOutput = usage.outputTokens ?? 0;
+                    const costCacheRead = usage.cacheReadTokens ?? 0;
+                    const costCacheWrite = usage.cacheWriteTokens ?? 0;
+                    if (costInput !== 0 || costOutput !== 0 || costCacheRead !== 0 || costCacheWrite !== 0) {
+                        const model = eventModel ?? state.model;
+                        const cost = state.mainCost[model] ?? emptyCostBuckets();
+                        addUsageToCostBuckets(cost, {
+                            input: costInput,
+                            output: costOutput,
+                            cacheRead: costCacheRead,
+                            cacheWrite: costCacheWrite,
+                        }, peak);
+                        state.mainCost[model] = cost;
+                    }
                     // The most recent request's usage describes the CURRENT context:
                     // input (uncached) + cache hits all occupy the window. Cache hits
                     // also drive the status-line `cache N` readout.
@@ -707,25 +776,21 @@ export function createChannelProjection(state, deps) {
                 // The ask-user-question tool renders as the interactive questionnaire
                 // panel (DSH user-interaction seam), not as a tool card: the model is
                 // parked waiting for the human, so no running card, no active-tool
-                // spinner, no args noise in the transcript. The Q&A summary is pushed
-                // by the TUI once the batch is answered; tool/result for a call with
-                // no card is a no-op below.
-                if (event.data.name === 'ask_user_question')
+                // spinner, no args noise in the transcript. Only the ARGUMENTS are
+                // remembered: the paired tool/result below projects the answered
+                // record from them (issue #1009), so `/resume`, rewind and replay
+                // rebuild it from the persisted log like every other transcript row.
+                if (event.data.name === 'ask_user_question') {
+                    askCalls.set(event.data.callId, event.data.arguments);
                     break;
+                }
                 // The Task tool's plain card is replaced by the live subagent card
                 // (Kimi Code semantics): the delegation itself renders as a subagent
                 // row, so the raw args/result card would only duplicate it. The call
                 // still runs - only its transcript rendering is suppressed.
                 if (isSubagentToolName(event.data.name)) {
-                    try {
-                        const args = JSON.parse(event.data.arguments);
-                        if (typeof args.description === 'string' && args.description)
-                            deps.pendingTaskDescriptions.push(args.description);
-                    }
-                    catch {
-                        // Unparseable args leave the queue untouched; the card falls back
-                        // to the provider label.
-                    }
+                    // The parent-scoped subagent reducer owns pending descriptions,
+                    // including delegations made while this transcript is parked.
                     break;
                 }
                 // Reasoning that led to a tool call is done thinking — fold the
@@ -759,7 +824,19 @@ export function createChannelProjection(state, deps) {
                 break;
             }
             case 'tool/result': {
-                const card = toolCards.get(event.data.message.source.callId);
+                const callId = event.data.message.source.callId;
+                const card = toolCards.get(callId);
+                const askArguments = askCalls.get(callId);
+                // A call with no card is usually an ask_user_question (above) — its
+                // interaction lives in the panel, but its OUTCOME still belongs in
+                // the transcript. Project it from the durable log here: consumed
+                // before the card branch so the two can never both fire, and deleted
+                // so a repeated replay of the same result cannot double the record.
+                if (card === undefined && askArguments !== undefined) {
+                    projectAskResult(event, askArguments);
+                    askCalls.delete(callId);
+                    break;
+                }
                 if (card !== undefined && card.tool !== undefined) {
                     const images = transcriptImages(event.data.message.content);
                     card.images = images.length === 0 ? undefined : images;
@@ -924,6 +1001,12 @@ export function createChannelProjection(state, deps) {
                 if (typeof effort === 'string') {
                     state.reasoningEffort = effort;
                 }
+                // 模型归属真源：该请求的 usage 按这里的 model 计价（replay 时逐请求
+                // 还原；live 时与 state.model 同步更新，AC-A4）。header 缺/空 model
+                // 必须清掉上一条 header 的值——否则后续 usage 会沿用旧模型进错桶；
+                // 归属时再回退 state.model（旧日志没有 header 的既有语义）。
+                const headerModel = event.data.header.config?.model;
+                eventModel = typeof headerModel === 'string' && headerModel !== '' ? headerModel : undefined;
                 const legacySystem = event.data.header.system;
                 if (typeof legacySystem === 'string') {
                     state.contextSegments.system = estimateTokens(legacySystem);
@@ -982,6 +1065,31 @@ export function createChannelProjection(state, deps) {
                     state.sessionColor = typeof data.color === 'string' ? data.color : '';
                     break;
                 }
+                // The compaction bracket is a plugin-appended event pair (not part of
+                // dsh-session's typed map). Opening it here rather than in the manual
+                // path is what makes an AUTOMATIC pressure compaction visible too: the
+                // host writes `compaction/start` before the summarizer runs and
+                // `compaction/end` once the checkpoint is committed or abandoned.
+                // A manual request already installed its own cancellable row, so this
+                // only fills the gap for one this process did not start.
+                if (event.type === 'compaction/start') {
+                    // Replay is settled history, and a process killed between start and
+                    // end leaves an unmatched start in the log: painting a row for it
+                    // would show a compaction that nothing will ever clear.
+                    if (!replaying && state.compaction === undefined) {
+                        state.compaction = {
+                            startedAt: typeof event.time === 'number' ? event.time : Date.now(),
+                            phase: 'prefill',
+                            outputChars: 0,
+                            cancellable: false,
+                        };
+                    }
+                    break;
+                }
+                if (event.type === 'compaction/end') {
+                    state.compaction = undefined;
+                    break;
+                }
                 // Custom plugin events (tuiRenderers seam): a registered renderer
                 // maps the payload to text rows — title as a local row, body as
                 // preview-clipped local-output rows, same shape pushLocal uses.
@@ -1014,11 +1122,13 @@ export function createChannelProjection(state, deps) {
         sealedReasoning.length = 0;
         lastReasoningRow = undefined;
         toolCards.clear();
+        askCalls.clear();
         handledAssistantMessages.clear();
         handledAssistantChunks.clear();
         openStep = undefined;
         activeAttempt = undefined;
         lastStreamRevision = -1;
+        eventModel = undefined;
         assistantRowsByStep.clear();
         lastTextDelta.clear();
         tpsTurn = undefined;

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

@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+/**
+ * The parts of a question this fold needs. Structurally compatible with the
+ * harness's `AskUserQuestionItem`, so `src/dsh-adapter/` callers pass the
+ * official type straight through while this module keeps its own shape.
+ */
+export interface QuestionRecordQuestion {
+    readonly question: string;
+}
+/**
+ * One answer as the harness persists it (a subset of
+ * `AskUserQuestionAnswerItem`: the fold matches answers to questions BY ORDER,
+ * mirroring how the panel collects one answer per question).
+ */
+export interface QuestionRecordAnswer {
+    readonly selected: readonly string[];
+    readonly custom?: string;
+}
+/** One answered questionnaire as the transcript renders it. */
+export interface QuestionRecord {
+    /** Local-row title (dictionary text, never hand-written here). */
+    readonly title: string;
+    /** One `· question → answer` line per answered question. */
+    readonly lines: readonly string[];
+}
+/**
+ * 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 declare function buildQuestionRecord(questions: readonly (QuestionRecordQuestion | undefined)[] | undefined, answers: readonly (QuestionRecordAnswer | undefined)[] | undefined, options?: {
+    redact?: boolean;
+}): QuestionRecord;
+/**
+ * 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 declare function parseQuestionRecordQuestions(rawArguments: string | undefined): QuestionRecordQuestion[] | 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 declare function parseQuestionRecordAnswers(rawResult: string): QuestionRecordAnswer[] | undefined;
+//# sourceMappingURL=question-record.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"question-record.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/question-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAC1B;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,4DAA4D;IAC5D,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAClC;AAQD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,CAAC,sBAAsB,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,EACtE,OAAO,EAAE,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,EAClE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7B,cAAc,CAyBhB;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,sBAAsB,EAAE,GAAG,SAAS,CAWnH;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,oBAAoB,EAAE,GAAG,SAAS,CAShG"}

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-adoption.d.ts

@@ -4,7 +4,7 @@ import type { ChannelState } from './types.js';
 import type { createChannelBinding } from './binding.js';
 import { resetSessionProjection } from './session-reset.js';
 type Binding = ReturnType<typeof createChannelBinding>;
-type AdoptionState = Pick<ChannelState, 'status' | 'agentId' | 'agentPreset' | 'working' | 'emit'>;
+type AdoptionState = Pick<ChannelState, 'status' | 'agentId' | 'sessionId' | 'agentPreset' | 'working' | 'emit'>;
 /**
  * Binding-transaction tails shared by session actions. Construction is inert:
  * callers install the returned operations only after their ChannelState exists.

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

@@ -1 +1 @@
-{"version":3,"file":"session-adoption.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-adoption.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,aAAa,GAAG,IAAI,CACvB,YAAY,EACV,QAAQ,GACR,SAAS,GACT,aAAa,GACb,SAAS,GACT,MAAM,CACT,CAAA;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,EACnE,IAAI,EAAE;IACJ,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/B,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,YAAY,EAAE,GAAG,IAAI,CAAA;IAC7C,YAAY,IAAI,IAAI,CAAA;IACpB,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,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAA;CACzC;+BAQS,WAAW,WACV,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QACjC,SAAS,YAAY,EAAE,eAChB,MAAM,GAAG,SAAS,WACtB,SAAS,KACjB,MAAM;EAwBV"}
+{"version":3,"file":"session-adoption.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-adoption.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,aAAa,GAAG,IAAI,CACvB,YAAY,EACV,QAAQ,GACR,SAAS,GACT,WAAW,GACX,aAAa,GACb,SAAS,GACT,MAAM,CACT,CAAA;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,EACnE,IAAI,EAAE;IACJ,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/B,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,YAAY,EAAE,GAAG,IAAI,CAAA;IAC7C,YAAY,IAAI,IAAI,CAAA;IACpB,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,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAA;CACzC;+BAQS,WAAW,WACV,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QACjC,SAAS,YAAY,EAAE,eAChB,MAAM,GAAG,SAAS,WACtB,SAAS,KACjB,MAAM;EAyBV"}

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

@@ -14,6 +14,7 @@ export function createSessionAdoption(state, deps) {
         resetSessionProjection(state, deps.rowIds, deps.resetProjector, deps.resetSubagents, deps.resetJobs);
         state.status = handle.agent.status;
         state.agentId = handle.agent.id;
+        state.sessionId = handle.agent.session.id;
         state.agentPreset = agentPreset;
         deps.replay(seed);
         deps.settleReplay();

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

@@ -3,7 +3,7 @@ import { resetSessionProjection } from './session-reset.js';
 import type { createChannelBinding } from './binding.js';
 import type { ChannelState, ResumeResult } from './types.js';
 type Binding = ReturnType<typeof createChannelBinding>;
-type LiveAdoptionState = Pick<ChannelState, 'status' | 'agentId' | 'cwd' | 'displayCwd' | 'agentPreset' | 'provider' | 'model' | 'loadedContext' | 'contextWindow' | 'effortLevels' | 'reasoningEffort' | 'tps' | 'tpsSamples' | 'lastUsage' | 'workingActivity' | 'working' | 'emit'> & Parameters<typeof resetSessionProjection>[0];
+type LiveAdoptionState = Pick<ChannelState, 'status' | 'agentId' | 'sessionId' | 'cwd' | 'displayCwd' | 'agentPreset' | 'provider' | 'model' | 'loadedContext' | 'contextWindow' | 'effortLevels' | 'reasoningEffort' | 'tps' | 'tpsSamples' | 'lastUsage' | 'working' | 'emit'> & Parameters<typeof resetSessionProjection>[0];
 /** Adopt an already-live agent, preserving a meaningful previous handle in the background ledger. */
 export declare function createLiveAgentAdoption(state: LiveAdoptionState, deps: {
     binding: Pick<Binding, 'switchTo'>;
@@ -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,KAAK,GACL,YAAY,GACZ,aAAa,GACb,UAAU,GACV,OAAO,GACP,eAAe,GACf,eAAe,GACf,cAAc,GACd,iBAAiB,GACjB,KAAK,GACL,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,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,CAyDpD"}
+{"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,10 +9,20 @@ 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;
         state.cwd = target.session.header.cwd ?? state.cwd;
         state.displayCwd = deps.describeWorkspace(state.cwd).description ?? state.cwd;
         deps.resetIdeSelection();
@@ -42,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;