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

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

@@ -1,76 +1,4 @@
-/**
- * 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;
+/** Re-export for existing importers: the answered-questionnaire record fold
+ *  lives in the backend-neutral channel layer (`src/channel/question-record.ts`). */
+export * from '../../channel/question-record.js';
 //# sourceMappingURL=question-record.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"question-record.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/question-record.ts"],"names":[],"mappings":"AAAA;qFACqF;AACrF,cAAc,kCAAkC,CAAA"}

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

@@ -1,107 +1,3 @@
-/**
- * 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;
-    }
-}
+/** Re-export for existing importers: the answered-questionnaire record fold
+ *  lives in the backend-neutral channel layer (`src/channel/question-record.ts`). */
+export * from '../../channel/question-record.js';

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

@@ -0,0 +1,9 @@
+import type { CoreChannel } from './core/compose.js';
+import type { ChannelLaunchOptions } from './state.js';
+/**
+ * Attach the per-binding wiring to a core whose sessions may serve the
+ * `workingActivity` capability. Called inside `createChannel`'s
+ * construction transaction, before the channel starts.
+ */
+export declare function attachSessionWorkingActivity(core: CoreChannel, options: Pick<ChannelLaunchOptions, 'publishActivity' | 'clearActivity'>): void;
+//# sourceMappingURL=session-activity.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session-activity.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-activity.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,iBAAiB,GAAG,eAAe,CAAC,GACvE,IAAI,CAkBN"}

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

@@ -0,0 +1,42 @@
+/**
+ * The backend-authored working-activity publishing point (the Claude
+ * backend's counterpart of the DSH working-activity plugin's projection):
+ * one subscription per bound session, attached when the session serves the
+ * typed `workingActivity` capability (a DSH session publishes through the
+ * projection instead and never lands here).
+ *
+ * Values are narrowed with `asActivityView` (the same gate the projection
+ * feed applies), so a malformed backend value is dropped instead of
+ * reaching a renderer half-formed. Leaving a session (the next binding,
+ * the channel's release) drops its value, so a stale done card can never
+ * survive a rebind.
+ *
+ * @module dsh-tui/dsh-adapter/channel/session-activity
+ */
+import { asActivityView } from '../activity-store.js';
+/**
+ * Attach the per-binding wiring to a core whose sessions may serve the
+ * `workingActivity` capability. Called inside `createChannel`'s
+ * construction transaction, before the channel starts.
+ */
+export function attachSessionWorkingActivity(core, options) {
+    core.extend({
+        bind: {
+            onBind({ capture, register }) {
+                const session = capture.session;
+                const subscribe = session.capabilities.workingActivity?.subscribe;
+                const publish = options.publishActivity;
+                if (subscribe === undefined || publish === undefined)
+                    return;
+                const sessionId = session.ref.sessionId;
+                register(subscribe(view => {
+                    const narrowed = asActivityView(view);
+                    if (narrowed !== undefined)
+                        publish(sessionId, narrowed);
+                }));
+                // The session went away: its line goes with it.
+                register(() => { options.clearActivity?.(sessionId); });
+            },
+        },
+    });
+}

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

@@ -1,9 +1,9 @@
-import type { AgentHandle } from '@deepseek-ai/dsh-agent';
+import type { AgentSession } from '../../agent/session.js';
 import type { SessionEvent, SessionId } from '@deepseek-ai/dsh-session';
 import type { ChannelState } from './types.js';
-import type { createChannelBinding } from './binding.js';
+import type { DshChannelBinding } from './binding.js';
 import { resetSessionProjection } from './session-reset.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+type Binding = DshChannelBinding;
 type AdoptionState = Pick<ChannelState, 'status' | 'agentId' | 'sessionId' | 'agentPreset' | 'working' | 'emit'>;
 /**
  * Binding-transaction tails shared by session actions. Construction is inert:
@@ -26,7 +26,7 @@ export declare function createSessionAdoption(state: AdoptionState & Parameters<
     clearStagedImages(): void;
     touchSession(sessionId: SessionId): void;
 }): {
-    adoptForkedAgent: (handle: AgentHandle, capture: ReturnType<Binding["capture"]>, seed: readonly SessionEvent[], agentPreset: string | undefined, childId: SessionId) => string;
+    adoptForkedAgent: (candidate: AgentSession, capture: ReturnType<Binding["capture"]>, seed: readonly SessionEvent[], agentPreset: string | undefined, childId: SessionId) => string;
 };
 export {};
 //# sourceMappingURL=session-adoption.d.ts.map

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,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"}
+{"version":3,"file":"session-adoption.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-adoption.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,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;kCAQY,YAAY,WACd,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QACjC,SAAS,YAAY,EAAE,eAChB,MAAM,GAAG,SAAS,WACtB,SAAS,KACjB,MAAM;EA0BV"}

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

@@ -1,3 +1,4 @@
+import { dshHandleOf } from '../backend/session.js';
 import { resetSessionProjection } from './session-reset.js';
 /**
  * Binding-transaction tails shared by session actions. Construction is inert:
@@ -9,7 +10,8 @@ export function createSessionAdoption(state, deps) {
      * The transaction resets only after ownership is committed; setup remains
      * synchronous so subscriptions cannot observe a half-reset projection.
      */
-    const adoptForkedAgent = (handle, capture, seed, agentPreset, childId) => deps.binding.adopt(handle, capture, (previous, disposePrevious) => {
+    const adoptForkedAgent = (candidate, capture, seed, agentPreset, childId) => deps.binding.adopt(candidate, capture, (previous, disposePrevious) => {
+        const handle = dshHandleOf(candidate);
         const sourceSessionId = String(previous.agent.session.id);
         resetSessionProjection(state, deps.rowIds, deps.resetProjector, deps.resetSubagents, deps.resetJobs);
         state.status = handle.agent.status;

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

@@ -3,7 +3,7 @@ import type { Context } from '@deepseek-ai/cordis';
 import { type Session } from '@deepseek-ai/dsh-session';
 import type { ChannelOwner } from './owner.js';
 import type { ChannelState } from './types.js';
-type ForkState = Pick<ChannelState, 'working' | 'cwd' | 'provider' | 'model' | 'sessionTitle'>;
+type ForkState = Pick<ChannelState, 'working' | 'cwd' | 'provider' | 'model' | 'modelDisplay' | 'sessionTitle'>;
 /** Create a detached `/fork` copy without adopting it into the foreground. */
 export declare function createForkSessionAction(ctx: Context, state: ForkState, deps: {
     owner: Pick<ChannelOwner, 'current'>;

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

@@ -1 +1 @@
-{"version":3,"file":"session-fork.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-fork.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAa,KAAK,OAAO,EAAqB,MAAM,0BAA0B,CAAA;AASrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC,CAAA;AAE9F,8EAA8E;AAC9E,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,IAAI,OAAO,CAAA;IACjB,oBAAoB,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC,CAAA;CACrH,SAEgB,OAAO,CAAC,OAAO,CAAC,CAqFlC"}
+{"version":3,"file":"session-fork.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-fork.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAa,KAAK,OAAO,EAAqB,MAAM,0BAA0B,CAAA;AAUrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,GAAG,cAAc,CAAC,CAAA;AAE/G,8EAA8E;AAC9E,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,IAAI,OAAO,CAAA;IACjB,oBAAoB,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC,CAAA;CACrH,SAEgB,OAAO,CAAC,OAAO,CAAC,CAqFlC"}

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

@@ -1,6 +1,7 @@
 import { SessionId } from '@deepseek-ai/dsh-session';
 import { randomUUID } from 'node:crypto';
 import { t } from '../../i18n.js';
+import { WORKING_GATE_NOTICES } from '../../commands.js';
 import { resolveDshProfileName } from '../../update.js';
 import { appendSessionTitle, liveSessionCreateOptions, sliceLiveSessionSeed } from '../compat/index.js';
 import { composePreset, runningPresetOf } from '../presets.js';
@@ -16,7 +17,7 @@ export function createForkSessionAction(ctx, state, deps) {
             return false;
         }
         if (state.working) {
-            deps.notify(t('fork-while-working'), { color: 'warning' });
+            deps.notify(t(WORKING_GATE_NOTICES.fork), { color: 'warning' });
             return false;
         }
         await deps.settleCompaction();

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

@@ -1,12 +1,16 @@
 import type { Agent, AgentHandle } from '@deepseek-ai/dsh-agent';
+import type { AgentSession } from '../../agent/session.js';
 import { resetSessionProjection } from './session-reset.js';
-import type { createChannelBinding } from './binding.js';
+import type { DshChannelBinding } from './binding.js';
 import type { ChannelState, ResumeResult } from './types.js';
-type Binding = ReturnType<typeof createChannelBinding>;
-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];
+type Binding = DshChannelBinding;
+type LiveAdoptionState = Pick<ChannelState, 'status' | 'agentId' | 'sessionId' | 'cwd' | 'displayCwd' | 'agentPreset' | 'provider' | 'model' | 'loadedContext' | 'contextWindow' | 'effortLevels' | 'reasoningEffort' | 'tps' | 'tpsSamples' | 'lastUsage' | 'turnUsage' | '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'>;
+    /** Wrap the target (and the parked handle this channel owns for it, if
+     *  any) as the session handed to the binding. */
+    openSession(agent: Agent, handle: AgentHandle | undefined): AgentSession;
     backgroundHandles: Map<string, AgentHandle>;
     rowIds: {
         value: number;

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,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"}
+{"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;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAM1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE5D,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,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,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;qDACiD;IACjD,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,CAAA;IACxE,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,CA8DpD"}

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

@@ -6,7 +6,7 @@ import { runningPresetOf } from '../presets.js';
 import { resetSessionProjection } from './session-reset.js';
 /** Adopt an already-live agent, preserving a meaningful previous handle in the background ledger. */
 export function createLiveAgentAdoption(state, deps) {
-    return async (target) => deps.binding.switchTo(target, deps.backgroundHandles.get(String(target.id)), (committed, disposePrevious) => {
+    return async (target) => deps.binding.switchTo(deps.openSession(target, deps.backgroundHandles.get(String(target.id))), (committed, disposePrevious) => {
         const previousHandle = committed.handle;
         const previousSessionId = String(committed.agent.session.id);
         const keepPrevious = previousHandle !== undefined

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

@@ -1,3 +1,4 @@
+import type { DshChannelBinding } from './binding.js';
 import type { Agent } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import { writeResumeTarget } from '../../sessionHistory.js';
@@ -14,15 +15,7 @@ declare module '@deepseek-ai/dsh-llm' {
         };
     }
 }
-type Capture = {
-    readonly agent: Agent;
-    readonly generation: number;
-};
-type Binding = {
-    readonly agent: Agent;
-    capture(): Capture;
-    isCurrent(capture: Capture): boolean;
-};
+type Binding = Pick<DshChannelBinding, 'agent' | 'capture' | 'isCurrent'>;
 /** Session-scoped metadata, persistence queries, and tool-less LLM reads. */
 export declare function createSessionMetadataActions(ctx: Context, deps: {
     owner: Pick<ChannelOwner, 'current' | 'signal'>;

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":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAoE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAK7H,OAAO,EAAoE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG5H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAmB,MAAM,YAAY,CAAA;AAKnE,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAU,gBAAgB;QACxB,aAAa,EAAE;YAAE,IAAI,EAAE,aAAa,CAAA;SAAE,CAAA;QACtC,eAAe,EAAE;YAAE,IAAI,EAAE,eAAe,CAAA;SAAE,CAAA;KAC3C;CACF;AAID,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AACrE,KAAK,OAAO,GAAG;IACb,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,OAAO,IAAI,OAAO,CAAA;IAClB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;CACrC,CAAA;AAED,6EAA6E;AAC7E,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IAC/D,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAA;IAC/C,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,IAAI,MAAM,CAAA;IAClB,KAAK,IAAI,MAAM,CAAA;IACf,IAAI,IAAI,IAAI,CAAA;IACZ,YAAY,IAAI,MAAM,CAAA;IACtB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxC,oBAAoB,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,GAAG,IAAI,CAAA;IAC3D,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG;QAAE,QAAQ,CAAC,OAAO,EAAE;YAAE,KAAK,EAAE,KAAK,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC;YAAE,MAAM,EAAE,SAAS;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,WAAW,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAC;gBAAC,UAAU,EAAE,OAAO,CAAA;aAAE,EAAE,CAAC;YAAC,QAAQ,EAAE,OAAO,CAAA;SAAE,CAAC,CAAA;KAAE,GAAG,SAAS,CAAA;IAC/N,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAC9D;0BAW4B,SAAS,cAAc,EAAE,GAAG,SAAS;gCASvB,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,cAAc,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,KAAK,IAAI,KAAG,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC;gCAwBpI,MAAM;;;;;;;8BA6BD,MAAM,KAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;6BAsD/C,MAAM,YAAY;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;4BAqB7E;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;;;;;;;;;;;;2BAuBjE,MAAM,KAAG,IAAI;6BASX,MAAM,KAAG,IAAI;+BAQL,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;iCASvB,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EAcnF"}
+{"version":3,"file":"session-metadata.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAoE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAK7H,OAAO,EAAoE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG5H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAmB,MAAM,YAAY,CAAA;AAKnE,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAU,gBAAgB;QACxB,aAAa,EAAE;YAAE,IAAI,EAAE,aAAa,CAAA;SAAE,CAAA;QACtC,eAAe,EAAE;YAAE,IAAI,EAAE,eAAe,CAAA;SAAE,CAAA;KAC3C;CACF;AAKD,KAAK,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC,CAAA;AAEzE,6EAA6E;AAC7E,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IAC/D,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAA;IAC/C,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,IAAI,MAAM,CAAA;IAClB,KAAK,IAAI,MAAM,CAAA;IACf,IAAI,IAAI,IAAI,CAAA;IACZ,YAAY,IAAI,MAAM,CAAA;IACtB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxC,oBAAoB,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,GAAG,IAAI,CAAA;IAC3D,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG;QAAE,QAAQ,CAAC,OAAO,EAAE;YAAE,KAAK,EAAE,KAAK,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC;YAAE,MAAM,EAAE,SAAS;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,WAAW,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAC;gBAAC,UAAU,EAAE,OAAO,CAAA;aAAE,EAAE,CAAC;YAAC,QAAQ,EAAE,OAAO,CAAA;SAAE,CAAC,CAAA;KAAE,GAAG,SAAS,CAAA;IAC/N,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAC9D;0BAW4B,SAAS,cAAc,EAAE,GAAG,SAAS;gCASvB,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,cAAc,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,KAAK,IAAI,KAAG,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC;gCAwBpI,MAAM;;;;;;;8BA6BD,MAAM,KAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;6BAsD/C,MAAM,YAAY;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;4BAqB7E;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;;;;;;;;;;;;2BAuBjE,MAAM,KAAG,IAAI;6BASX,MAAM,KAAG,IAAI;+BAQL,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;iCASvB,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EAcnF"}

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' | 'mainCost' | 'subagentCost' | 'responseChars' | 'activeToolCount' | 'lastUserText' | 'working' | 'compaction' | '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' | 'turnUsage' | 'contextSegments' | 'costReport'
 /** Staged "Send to Chat" contexts belong to the composer that staged them:
  *  an adopted session must never carry the previous conversation's chips
  *  (or hand its model a panel context the user staged elsewhere). */

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,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;AACnB;;qEAEqE;GACnE,kBAAkB,CACrB,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,CA4CN"}
+{"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,WAAW,GACX,iBAAiB,GACjB,YAAY;AACd;;qEAEqE;GACnE,kBAAkB,CACrB,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,CAgDN"}

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

@@ -40,6 +40,10 @@ export function resetSessionProjection(state, rowIds, resetProjector, resetSubag
     state.tps = undefined;
     state.tpsSamples = [];
     state.lastUsage = undefined;
+    // The last turn's ledger belongs to the old session just as much.
+    state.turnUsage = undefined;
+    // A backend-reported cost belongs to the session that reported it.
+    state.costReport = undefined;
     state.attachedContexts = [];
     state.contextSegments = {
         system: 0,

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

@@ -2,17 +2,14 @@ import type { Agent, AgentHandle } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import { type SessionEvent } from '@deepseek-ai/dsh-session';
 import { resetSessionProjection } from './session-reset.js';
-import type { createChannelBinding } from './binding.js';
+import type { DshChannelBinding } from './binding.js';
 import type { ChannelOwner } from './owner.js';
 import { type AdapterRuntimeOptions } from '../../adapter/kernel/runtime.js';
 import type { ChannelState, ResumeResult } from './types.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+import type { NewSessionOpener } from './core/session-switch.js';
+type Binding = DshChannelBinding;
 type ResumeState = Pick<ChannelState, 'working' | 'status' | 'agentId' | 'sessionId' | 'cwd' | 'displayCwd' | 'agentPreset' | 'provider' | 'model' | 'loadedContext' | 'contextWindow' | 'effortLevels' | 'reasoningEffort' | 'working' | 'emit'> & Parameters<typeof resetSessionProjection>[0];
-export type NewSessionTarget = {
-    /** Internal guarded workspace handoff; never exposed on ChannelUi.newSession(). */
-    readonly cwd: string;
-    readonly displayCwd?: string;
-};
+export type { NewSessionTarget } from './core/session-switch.js';
 /** Persisted-session and fresh-session foreground actions. */
 export declare function createSessionResumeActions(ctx: Context, state: ResumeState, options: {
     configuredPreset?: string;
@@ -59,8 +56,6 @@ export declare function createSessionResumeActions(ctx: Context, state: ResumeSt
 }): {
     resumeInto: (sessionId: string, kind: "resume" | "agent-view", keepCurrent: boolean) => Promise<ResumeResult>;
     resumeTo: (sessionId: string) => Promise<ResumeResult>;
-    newSession: () => Promise<boolean>;
-    newSessionWithTarget: (target?: NewSessionTarget) => Promise<boolean>;
+    newSessionOpener: NewSessionOpener;
 };
-export {};
 //# sourceMappingURL=session-resume.d.ts.map

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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"}