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

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

@@ -1 +1 @@
-{"version":3,"file":"model-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAM9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE1E,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEtD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,OAAO,GAAG,iBAAiB,GAAG,cAAc,GAAG,aAAa,GAAG,SAAS,GAAG,MAAM,CAAC,EACzH,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,WAAW,CAAC,CAAA;IAC/C,SAAS,EAAE,iBAAiB,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,IAAI,KAAK,CAAA;IACd,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;;gCA2CsC,OAAO,CAAC,IAAI,CAAC;+BAWpB,IAAI;uBAmBN,OAAO,CAAC;QAAE,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;oBAWjF,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;2BAoBxB,MAAM,GAAG,SAAS,KAAG,IAAI;4BAM1B,IAAI;sBAeV,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;;YAvHnB,MAAM;cAAQ,MAAM;;8BA4HzB,IAAI;0BACR,IAAI;;6BASD,IAAI;;uBAOJ,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;6BAQxB,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EAkChE"}
+{"version":3,"file":"model-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAM9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE1E,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEtD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,OAAO,GAAG,iBAAiB,GAAG,cAAc,GAAG,aAAa,GAAG,SAAS,GAAG,eAAe,GAAG,MAAM,CAAC,EAC3I,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,WAAW,CAAC,CAAA;IAC/C,SAAS,EAAE,iBAAiB,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,IAAI,KAAK,CAAA;IACd,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B;6EACyE;IACzE,mBAAmB,IAAI,IAAI,CAAA;CAC5B;;gCA8DsC,OAAO,CAAC,IAAI,CAAC;+BA+DpB,IAAI;uBAqBN,OAAO,CAAC;QAAE,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;oBAWjF,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;2BAoBxB,MAAM,GAAG,SAAS,KAAG,IAAI;4BAM1B,IAAI;sBAeV,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;;YAhMnB,MAAM;cAAQ,MAAM;;8BAqMzB,IAAI;0BACR,IAAI;;6BASD,IAAI;;uBAOJ,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;6BAQxB,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EAkChE"}

package/lib/types/dsh-adapter/channel/model-actions.js

@@ -1,9 +1,9 @@
 import { ReasoningEffortId } from '@deepseek-ai/dsh-llm';
-import { readEffortPref, resolveEffortDefault, writeEffortPref } from '../../effortPrefs.js';
+import { nearestLowerEffort, readEffortPref, resolveEffortDefault, writeEffortPref } from '../../effortPrefs.js';
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { getLang, t, tOr } from '../../i18n.js';
 import { migratePresetPref, writePresetPref } from '../../presetPrefs.js';
-import { resolveCompatiblePreset, rosterOf } from '../preset-resolution.js';
+import { presetDisplayId, resolveCompatiblePreset, rosterOf } from '../preset-resolution.js';
 /**
  * Route metadata, effort preference and preset/model catalog actions.
  * This owns the async catalog caches and their generation fences; callers only
@@ -13,6 +13,9 @@ export function createModelActions(ctx, state, deps) {
     const { owner, selection, notify } = deps;
     const llmRuntime = ctx.get('llm');
     let preferredEffort = deps.initialEffort ?? readEffortPref();
+    // Last fallback notice shown for a (preferred → applied) pair: bind fires on
+    // every session switch, so an unchanged downgrade must not re-toast.
+    let lastEffortFallbackNotice;
     // State construction cannot call this factory yet; seed the visible value
     // before the root starts binding or exposes the completed ChannelState.
     state.reasoningEffort = preferredEffort;
@@ -27,11 +30,28 @@ export function createModelActions(ctx, state, deps) {
     });
     const effortCurrent = (capture) => owner.current() && deps.binding.isCurrent(capture.binding) &&
         state.provider === capture.provider && state.model === capture.model && effortOperation === capture.operation;
+    /** Route-level metadata shared by every resolveModelInfo consumer. The
+     * context window follows the route, not the binding: a resume rebuilds
+     * the binding (effortCurrent goes false) while the capacity answer for
+     * the same provider/model is still the live truth, so this runs before
+     * any effort freshness gate. Lifetime is the one fence it keeps: the
+     * answer crosses an await, so a Channel released while the lookup was in
+     * flight must neither write into its dead state nor re-arm the
+     * context-low warning through checkContextWarning. */
+    const applyRouteMetadata = (capture, info) => {
+        if (!owner.current())
+            return;
+        if (state.provider === capture.provider && state.model === capture.model && info.context !== undefined) {
+            state.contextWindow = info.context.contextWindow;
+            deps.checkContextWarning();
+        }
+    };
     const resolveEfforts = async (capture) => {
         if (llmRuntime === undefined || typeof llmRuntime.resolveModelInfo !== 'function')
             return 'unavailable';
         try {
             const info = await llmRuntime.resolveModelInfo(capture.provider, capture.model);
+            applyRouteMetadata(capture, info);
             if (!effortCurrent(capture))
                 return 'stale';
             const efforts = info.reasoning?.efforts ?? [];
@@ -55,9 +75,62 @@ export function createModelActions(ctx, state, deps) {
         // This same binding-time lookup is the route's initial tier refresh even
         // without a stored preference. Do not make a separate competing refresh
         // operation that could invalidate the selected preference completion.
-        if (preferredEffort === undefined || !resolved.efforts.some(effort => effort.id === preferredEffort))
+        if (preferredEffort === undefined)
             return;
-        selection.current = { provider: capture.provider, model: capture.model, reasoningEffort: ReasoningEffortId(preferredEffort) };
+        const available = resolved.efforts.map(effort => effort.id);
+        // Exact hit applies silently; a miss falls back to the nearest LOWER tier
+        // the route offers (never up), and both miss paths notify exactly once
+        // per (preferred → applied) pair — bind fires on every session switch,
+        // so an unchanged downgrade must not re-toast.
+        const applied = nearestLowerEffort(preferredEffort, available);
+        if (applied === undefined) {
+            if (lastEffortFallbackNotice?.preferred !== preferredEffort || lastEffortFallbackNotice.applied !== undefined) {
+                lastEffortFallbackNotice = { preferred: preferredEffort, applied: undefined };
+                notify(t('effort-preference-unsupported', { preferred: preferredEffort }), { color: 'warning' });
+            }
+            // Nothing is pinned, so the ROUTE's model default is what actually ships
+            // and the readout (status line, /effort status) must say so. Every switch
+            // tail clears it before this runs (session-resume.ts / model-switch.ts /
+            // session-live-adoption.ts / background-action.ts), but a resumed log's
+            // replayed `request/header` can leave an older tier behind — neither blank
+            // nor "last route's tier" is the truth. Only the readout moves: pinning
+            // the default into selection.current would put a tier the user never chose
+            // onto the wire, which is exactly what "never up" forbids.
+            const shipped = resolved.defaultEffort;
+            if (state.reasoningEffort !== shipped) {
+                state.reasoningEffort = shipped;
+                state.emit();
+            }
+            // An effort pin installed earlier (an exact hit, /effort <id>) survives
+            // every path that is NOT a bind: /settings' effortDefault hands the level
+            // straight to setDefaultEffort → applyPreferredEffort (plugin.ts:804 →
+            // setDefaultEffort above), which never resets selection.current — the four
+            // switch tails that do are all on the bind side. Leaving it would put the
+            // OLD tier back on the wire while the readout above announces the model
+            // default. Drop the effort only: the provider/model half of the pin is
+            // this route's, not the stale tier's. No emit — setDefaultEffort reaches
+            // here through that same non-bind path, and nothing UI-visible reads this
+            // ref (it is the router's ModelSelectionRef, not the IDE ChannelSelection
+            // the status line shows); the readout above already emits when it moves.
+            if (selection.current?.reasoningEffort !== undefined) {
+                selection.current = { provider: capture.provider, model: capture.model };
+            }
+            return;
+        }
+        // Dedupe gates ONLY the toast: bind resets selection.current on every
+        // session switch, so the pin below must re-apply unconditionally — an
+        // early return here would ship the model default from the second session
+        // on (review C1). The status line shows the tier that actually ships.
+        const fresh = lastEffortFallbackNotice?.preferred !== preferredEffort || lastEffortFallbackNotice.applied !== applied;
+        if (applied !== preferredEffort && fresh) {
+            lastEffortFallbackNotice = { preferred: preferredEffort, applied };
+            notify(t('effort-preference-downgraded', { preferred: preferredEffort, applied }), { color: 'warning' });
+        }
+        if (applied === preferredEffort)
+            lastEffortFallbackNotice = undefined;
+        state.reasoningEffort = applied;
+        selection.current = { provider: capture.provider, model: capture.model, reasoningEffort: ReasoningEffortId(applied) };
+        state.emit();
     };
     const refreshEffortLevels = () => {
         if (llmRuntime === undefined || typeof llmRuntime.resolveModelInfo !== 'function')
@@ -65,7 +138,10 @@ export function createModelActions(ctx, state, deps) {
         const capture = captureEffort();
         const generation = ++effortLevelsGeneration;
         void llmRuntime.resolveModelInfo(capture.provider, capture.model).then(info => {
-            if (!effortCurrent(capture) || generation !== effortLevelsGeneration)
+            if (generation !== effortLevelsGeneration)
+                return;
+            applyRouteMetadata(capture, info);
+            if (!effortCurrent(capture))
                 return;
             state.effortLevels = (info.reasoning?.efforts ?? []).map(level => level.id);
             state.emit();
@@ -192,7 +268,7 @@ export function createModelActions(ctx, state, deps) {
             return [];
         const localized = getLang() === 'en';
         try {
-            return (await presets.list()).map(preset => ({ id: preset.id, ...(preset.name === undefined ? {} : { name: localized ? tOr(`preset-name-${preset.id}`, preset.name) : preset.name }), ...(preset.description === undefined ? {} : { description: localized ? tOr(`preset-desc-${preset.id}`, preset.description) : preset.description }), ...(preset.broken === undefined ? {} : { broken: preset.broken }), isDefault: preset.id === presets.defaultId }));
+            return (await presets.list()).map(preset => ({ id: preset.id, ...(preset.name === undefined ? {} : { name: localized ? tOr(`preset-name-${presetDisplayId(preset.id)}`, preset.name) : preset.name }), ...(preset.description === undefined ? {} : { description: localized ? tOr(`preset-desc-${presetDisplayId(preset.id)}`, preset.description) : preset.description }), ...(preset.broken === undefined ? {} : { broken: preset.broken }), isDefault: preset.id === presets.defaultId }));
         }
         catch {
             return [];

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

@@ -1 +1 @@
-{"version":3,"file":"model-switch.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-switch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAOvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,EACjF,KAAK,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,aAAa,GAAG,UAAU,GAAG,OAAO,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,GAAG,MAAM,CAAC,CAAA;AAElJ,uHAAuH;AACvH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IAC3F,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,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,mBAAmB,IAAI,IAAI,CAAA;IAC3B,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B,IAEa,UAAU,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC,CAgEjE"}
+{"version":3,"file":"model-switch.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-switch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAQvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,EACjF,KAAK,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,aAAa,GAAG,UAAU,GAAG,OAAO,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,GAAG,MAAM,CAAC,CAAA;AAElJ,uHAAuH;AACvH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IAC3F,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,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,mBAAmB,IAAI,IAAI,CAAA;IAC3B,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B,IAEa,UAAU,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC,CA4EjE"}

package/lib/types/dsh-adapter/channel/model-switch.js

@@ -5,6 +5,7 @@ import { writeModelPref } from '../../modelPrefs.js';
 import { touchSession } from '../../sessionHistory.js';
 import { liveSessionCreateOptions, sliceLiveSessionSeed } from '../compat/index.js';
 import { composePreset, runningPresetOf } from '../presets.js';
+import { reserveNewSession } from '../../sessionMounts.js';
 import { attachSessionToWorkspace } from '../workspace.js';
 import { resetSessionProjection } from './session-reset.js';
 /** Model-route adoption transaction. It settles compaction before its fork snapshot and owns the post-commit reset. */
@@ -34,6 +35,10 @@ export function createModelSwitchAction(ctx, state, deps) {
             return false;
         }
         const childId = SessionId(randomUUID());
+        // Announce the id before the factory: from the moment `agents.create`
+        // returns this process holds the only write handle on a log the publisher
+        // will not name until its next beat.
+        const { reservation } = await reserveNewSession(String(childId));
         const composed = await composePreset(ctx, runningPresetOf(deps.binding.agent.session));
         let handle;
         try {
@@ -50,6 +55,7 @@ export function createModelSwitchAction(ctx, state, deps) {
             })));
         }
         catch (error) {
+            reservation.abandon();
             deps.notify(t('model-switch-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'error', timeoutMs: 8000 });
             return false;
         }
@@ -61,38 +67,50 @@ export function createModelSwitchAction(ctx, state, deps) {
         }
         if (!deps.binding.isCurrent(adoption) || !deps.owner.current()) {
             await deps.binding.abandon(handle);
+            reservation.abandon();
             return false;
         }
-        return deps.binding.adopt(handle, adoption, (_previous, disposePrevious) => {
-            resetSessionProjection(state, deps.rowIds, deps.resetProjector, deps.resetSubagents, deps.resetJobs);
-            state.status = handle.agent.status;
-            state.agentId = handle.agent.id;
-            state.agentPreset = composed.agentPreset;
-            state.provider = provider;
-            state.model = model;
-            state.contextWindow = undefined;
-            state.effortLevels = undefined;
-            state.reasoningEffort = undefined;
-            deps.dropModelCompletion();
-            deps.replay(seed);
-            deps.settleReplay();
-            state.working = handle.agent.status === 'running';
-            // Reset the input FIFO and pending-decision indicators BEFORE the first
-            // emit: a submit from a session-changed subscriber must not chain onto
-            // the replaced session's parked promise (main's bind → clear → refresh
-            // order).
-            deps.clearStagedImages();
-            deps.bindAgent();
-            deps.onModelSwitch(model);
-            deps.refreshCommands();
-            void deps.refreshLoadedContext();
-            void deps.refreshSkillCommands();
-            touchSession(childId);
-            state.emit();
-            disposePrevious('dispose');
-            if (!writeModelPref(provider, model))
-                deps.notify(t('model-pref-write-failed'), { color: 'warning' });
-            return true;
-        });
+        let committed = false;
+        try {
+            const result = deps.binding.adopt(handle, adoption, (_previous, disposePrevious) => {
+                resetSessionProjection(state, deps.rowIds, deps.resetProjector, deps.resetSubagents, deps.resetJobs);
+                state.status = handle.agent.status;
+                state.agentId = handle.agent.id;
+                state.agentPreset = composed.agentPreset;
+                state.provider = provider;
+                state.model = model;
+                state.contextWindow = undefined;
+                state.effortLevels = undefined;
+                state.reasoningEffort = undefined;
+                deps.dropModelCompletion();
+                deps.replay(seed);
+                deps.settleReplay();
+                state.working = handle.agent.status === 'running';
+                // Reset the input FIFO and pending-decision indicators BEFORE the first
+                // emit: a submit from a session-changed subscriber must not chain onto
+                // the replaced session's parked promise (main's bind → clear → refresh
+                // order).
+                deps.clearStagedImages();
+                deps.bindAgent();
+                deps.onModelSwitch(model);
+                deps.refreshCommands();
+                void deps.refreshLoadedContext();
+                void deps.refreshSkillCommands();
+                touchSession(childId);
+                state.emit();
+                disposePrevious('dispose');
+                if (!writeModelPref(provider, model))
+                    deps.notify(t('model-pref-write-failed'), { color: 'warning' });
+                return true;
+            });
+            committed = true;
+            return result;
+        }
+        finally {
+            if (committed)
+                reservation.settle();
+            else
+                reservation.abandon();
+        }
     };
 }

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

@@ -2,6 +2,7 @@ import type { Agent, AssistantStreamFrame } from '@deepseek-ai/dsh-agent';
 import type { SessionEvent } from '@deepseek-ai/dsh-session';
 import type { ContentBlock } from '@deepseek-ai/dsh-llm';
 import type { ChannelState, ToolCallView, ToolResultView, ToolsRegistryLike } from './types.js';
+import type { SelectionAttachment } from '../../adapter/ports/channel-view.js';
 import type { InputConvergence } from './input-actions.js';
 import type { BackgroundJobStore } from '../jobs.js';
 import type { TuiRendererHost } from '../renderers.js';
@@ -22,6 +23,9 @@ interface ProjectionDependencies {
     /** DSH attachment service, resolved at call time (a late-mounted provider
      *  must still serve images for rows projected earlier). */
     attachments(): unknown;
+    /** What a submitted message's IDE selection attached (keyed by the message
+     *  id the durable event carries), for the user row's indicator line. */
+    selectionAttached(messageId: string): SelectionAttachment | undefined;
 }
 /** One authoritative reducer for both durable replay and live session events. */
 export declare function createChannelProjection(state: ProjectionState, deps: ProjectionDependencies): {

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

@@ -1 +1 @@
-{"version":3,"file":"projection.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAwB,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AACrH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAYtD,KAAK,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,iBAAiB,GAAG,aAAa,GAAG,MAAM,GAAG,iBAAiB,GAAG,QAAQ,GAAG,WAAW,GAAG,cAAc,GAAG,eAAe,GAAG,KAAK,GAAG,eAAe,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,GAAG,eAAe,GAAG,iBAAiB,GAAG,cAAc,GAAG,OAAO,GAAG,aAAa,GAAG,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAA;AACxX,UAAU,sBAAsB;IAC/B,KAAK,IAAI,KAAK,CAAA;IACd,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,mBAAmB,IAAI,IAAI,CAAA;IAC3B,uBAAuB,EAAE,MAAM,EAAE,CAAA;IACjC,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,WAAW,CAAC,CAAA;IAC5D,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;IAC1D,mBAAmB,IAAI,IAAI,CAAA;IAC3B,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B;+DAC2D;IAC3D,WAAW,IAAI,OAAO,CAAA;CACtB;AACD,iFAAiF;AACjF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB;iBA6+BxE,IAAI;2BAxpBQ,SAAS,YAAY,EAAE,KAAG,IAAI;yBAiGhC,YAAY,KAAG,IAAI;+BAxBb,oBAAoB,KAAG,IAAI;2BAtKjC,IAAI;6BAgBF,IAAI;4BA/IH,MAAM,WAAW,MAAM,KAAG,YAAY,GAAG,SAAS;8BAYhD,MAAM,WAAW,MAAM,QAAQ,YAAY,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,KAAG,cAAc,GAAG,SAAS;sBAwBvG,SAAS,YAAY,EAAE,GAAG,SAAS,KAAG,MAAM;2BASvC,SAAS,YAAY,EAAE,GAAG,SAAS,KAAG,MAAM;EA21B3E"}
+{"version":3,"file":"projection.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAwB,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AACrH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AAE9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAatD,KAAK,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,iBAAiB,GAAG,aAAa,GAAG,MAAM,GAAG,iBAAiB,GAAG,QAAQ,GAAG,WAAW,GAAG,cAAc,GAAG,eAAe,GAAG,KAAK,GAAG,eAAe,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,GAAG,eAAe,GAAG,iBAAiB,GAAG,cAAc,GAAG,OAAO,GAAG,aAAa,GAAG,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAA;AACxX,UAAU,sBAAsB;IAC/B,KAAK,IAAI,KAAK,CAAA;IACd,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,mBAAmB,IAAI,IAAI,CAAA;IAC3B,uBAAuB,EAAE,MAAM,EAAE,CAAA;IACjC,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,WAAW,CAAC,CAAA;IAC5D,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;IAC1D,mBAAmB,IAAI,IAAI,CAAA;IAC3B,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B;+DAC2D;IAC3D,WAAW,IAAI,OAAO,CAAA;IACtB;4EACwE;IACxE,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAA;CACrE;AACD,iFAAiF;AACjF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB;iBAi/BxE,IAAI;2BAhqBQ,SAAS,YAAY,EAAE,KAAG,IAAI;yBAiGhC,YAAY,KAAG,IAAI;+BAxBb,oBAAoB,KAAG,IAAI;2BAtKjC,IAAI;6BAgBF,IAAI;4BA3IH,MAAM,WAAW,MAAM,KAAG,YAAY,GAAG,SAAS;8BAYhD,MAAM,WAAW,MAAM,QAAQ,YAAY,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,KAAG,cAAc,GAAG,SAAS;sBAoBvG,SAAS,YAAY,EAAE,GAAG,SAAS,KAAG,MAAM;2BASvC,SAAS,YAAY,EAAE,GAAG,SAAS,KAAG,MAAM;EAm2B3E"}

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

@@ -1,7 +1,9 @@
+import { replaySelectionAttachment } from './ide-selection.js';
 import { isSubagentToolName, parseJobOutputId, toolCommandOf, BACKGROUND_START_ACK, todoPanelItems } from './projection-helpers.js';
 import { ARGS_PREVIEW_LIMIT, harnessToolResultView, LOCAL_OUTPUT_LIMIT, prepareReplayEvents, preview, RESULT_PREVIEW_LIMIT, toolErrorText } from './transcript.js';
 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 { t } from '../../i18n.js';
 import { logForDebugging } from '../../utils/debug.js';
@@ -150,12 +152,8 @@ export function createChannelProjection(state, deps) {
             const tool = toolsRegistry?.get(name, deps.agent());
             if (tool?.presentResult === undefined)
                 return undefined;
-            const block = data.message.content[0];
-            // oxlint-disable-next-line typescript/no-unnecessary-condition -- durable session data may not match type
-            const content = block !== undefined && block.type === 'tool-result' ? block.content : [];
             return tool.presentResult(JSON.parse(rawArgs), {
-                content,
-                isError: block?.isError === true,
+                ...toolResultPayload(data.message),
                 ...(data.meta !== undefined ? { meta: data.meta } : {}),
             });
         }
@@ -436,13 +434,9 @@ export function createChannelProjection(state, deps) {
         }
         switch (event.type) {
             case 'user/message': {
-                // Compaction checkpoint: `source = { kind: 'plugin', plugin:
-                // 'compact' }` (dsh-compact's COMPACT_CHECKPOINT_SOURCE). Render the
-                // framed summary after /compact as a Divider title + a summary row
-                // that defaults folded (`compact` kind) instead of skipping it like
-                // other injected context.
-                if (event.data.source.kind === 'plugin' &&
-                    event.data.source.plugin === 'compact') {
+                // Both legacy and V4 checkpoints render as a folded summary rather
+                // 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' });
                     deps.rowIds.value += 1;
@@ -494,11 +488,22 @@ export function createChannelProjection(state, deps) {
                 const text = firstTextOf(event.data.content);
                 const images = transcriptImages(event.data.content);
                 if (text || images.length > 0) {
+                    // IDE selection indicator: the delivery path remembered what this
+                    // message attached; the durable event carries the same message id.
+                    // On replay (session resumed in a NEW process) the in-memory map
+                    // starts empty, so the indicator falls back to the durable content
+                    // itself — the `<attached-file … selection>` block IS part of the
+                    // persisted event, and the session log is the source of truth
+                    // (maintainer review round 3: the indicator used to vanish after a
+                    // restart because nothing re-derived it from the event).
+                    const selectionAttached = deps.selectionAttached(event.data.id)
+                        ?? replaySelectionAttachment(event.data.content);
                     appendRow({
                         id: deps.rowIds.value,
                         kind: 'user',
                         text,
                         ...(images.length === 0 ? {} : { images }),
+                        ...(selectionAttached === undefined ? {} : { selectionAttached }),
                         seq: event.seq,
                     });
                     state.lastUserText = text || t('transcript-image-message', { count: images.length });
@@ -759,8 +764,8 @@ export function createChannelProjection(state, deps) {
                     const images = transcriptImages(event.data.message.content);
                     card.images = images.length === 0 ? undefined : images;
                     card.tool.durationMs = Math.max(0, Date.now() - card.tool.startedAt);
-                    const failure = event.data.error;
-                    if (failure !== undefined) {
+                    const payload = toolResultPayload(event.data.message);
+                    if (event.data.error !== undefined || payload.isError) {
                         card.tool.status = 'error';
                         const errorText = toolErrorText(event);
                         card.tool.errorText = errorText;
@@ -768,9 +773,7 @@ export function createChannelProjection(state, deps) {
                     }
                     else {
                         card.tool.status = 'ok';
-                        const block = event.data.message.content[0];
-                        // oxlint-disable-next-line typescript/no-unnecessary-condition -- durable session data may not match type
-                        const result = block !== undefined && block.type === 'tool-result' ? textOf(block.content) : '';
+                        const result = textOf(payload.content);
                         card.tool.resultFull = result || undefined;
                         card.tool.resultText = result ? preview(result, RESULT_PREVIEW_LIMIT) : undefined;
                         // The tool's own settled-state view (applied diff, terminal
@@ -865,7 +868,10 @@ export function createChannelProjection(state, deps) {
                 }
                 const reason = event.data.reason;
                 if (reason.kind === 'completed') {
-                    deps.checkContextWarning();
+                    // Replay drains a resumed session's history through the projector;
+                    // its totals describe the past, not a live context-low state.
+                    if (!replaying)
+                        deps.checkContextWarning();
                     break;
                 }
                 if (reason.kind === 'aborted' || reason.kind === 'interrupted') {
@@ -887,7 +893,11 @@ export function createChannelProjection(state, deps) {
                 const detail = reason.kind === 'error' ? cleanRenderText(reason.error.message, NOTICE_CELLS) : '';
                 appendRow({ id: deps.rowIds.value, kind: 'notice', text: `turn ${reason.kind}${detail ? ` · ${detail}` : ''}` });
                 deps.rowIds.value += 1;
-                deps.notify(t('turn-failed', { detail: detail ? ` · ${detail}` : '' }), { color: 'error', timeoutMs: 8000 });
+                // Historical failure notices belong to the transcript row above;
+                // re-raising them as a live toast on every /resume re-alarmes the
+                // user over a turn that already ended.
+                if (!replaying)
+                    deps.notify(t('turn-failed', { detail: detail ? ` · ${detail}` : '' }), { color: 'error', timeoutMs: 8000 });
                 break;
             }
             case 'request/context':

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

@@ -1 +1 @@
-{"version":3,"file":"reports.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/reports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAInD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAU5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,+EAA+E;AAC/E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IACtD,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,IAAI;QAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAA;IACjE,OAAO,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAA;IACjF,GAAG,IAAI,MAAM,CAAA;IACb,KAAK,IAAI,MAAM,CAAA;IACf,QAAQ,IAAI,MAAM,CAAA;IAClB,aAAa,IAAI,MAAM,GAAG,SAAS,CAAA;IACnC,YAAY,IAAI,MAAM,CAAA;IACtB,OAAO,EAAE,qBAAqB,CAAA;IAC9B,UAAU,IAAI,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;CAChD;;qBAcuB,MAAM,EAAE;yBAkCJ,MAAM,GAAG,IAAI;yBAsCb,MAAM,GAAG,QAAQ,GAAG,IAAI;sBAY3B,MAAM,EAAE;wBAmCJ,MAAM,KAAG,MAAM,EAAE;EAM7C"}
+{"version":3,"file":"reports.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/reports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAInD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAU5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG9C,+EAA+E;AAC/E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IACtD,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,IAAI;QAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAA;IACjE,OAAO,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAA;IACjF,GAAG,IAAI,MAAM,CAAA;IACb,KAAK,IAAI,MAAM,CAAA;IACf,QAAQ,IAAI,MAAM,CAAA;IAClB,aAAa,IAAI,MAAM,GAAG,SAAS,CAAA;IACnC,YAAY,IAAI,MAAM,CAAA;IACtB,OAAO,EAAE,qBAAqB,CAAA;IAC9B,UAAU,IAAI,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;CAChD;;qBAcuB,MAAM,EAAE;yBA2BJ,MAAM,GAAG,IAAI;yBAmCb,MAAM,GAAG,QAAQ,GAAG,IAAI;sBAY3B,MAAM,EAAE;wBAmCJ,MAAM,KAAG,MAAM,EAAE;EAM7C"}

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

@@ -10,6 +10,7 @@ import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { getHostGrantStore } from '../host-grants.js';
 import { getHostFacade } from '../plugin-host.js';
 import { pluginsInfoLines } from '../plugins-info.js';
+import { toolResultText } from './transcript.js';
 /** Local reports and filesystem actions, fenced to the originating binding. */
 export function createReportActions(ctx, deps) {
     const current = (capture) => deps.owner.current() && deps.current(capture);
@@ -57,12 +58,6 @@ export function createReportActions(ctx, deps) {
         }
         return '';
     };
-    const textOf = (content) => (content ?? []).flatMap(block => {
-        if (block === null || typeof block !== 'object')
-            return [];
-        const record = block;
-        return record.type === 'text' && typeof record.text === 'string' ? [record.text] : [];
-    }).join('').trim();
     const exportSession = () => {
         const capture = deps.capture();
         const agent = capture.agent;
@@ -90,12 +85,9 @@ export function createReportActions(ctx, deps) {
                     parts.push(`${t('export-tool-section', { name: event.data.name })}\n\n\`\`\`json\n${event.data.arguments}\n\`\`\`\n`);
                     break;
                 case 'tool/result': {
-                    const block = event.data.message.content[0];
-                    if (block?.type === 'tool-result') {
-                        const text = textOf(block.content);
-                        if (text)
-                            parts.push(`${t('export-result-section')}\n\n\`\`\`\n${text}\n\`\`\`\n`);
-                    }
+                    const text = toolResultText(event);
+                    if (text)
+                        parts.push(`${t('export-result-section')}\n\n\`\`\`\n${text}\n\`\`\`\n`);
                     break;
                 }
             }

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;AAOrF,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,CAmElC"}
+{"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"}

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

@@ -5,6 +5,8 @@ import { resolveDshProfileName } from '../../update.js';
 import { appendSessionTitle, liveSessionCreateOptions, sliceLiveSessionSeed } from '../compat/index.js';
 import { composePreset, runningPresetOf } from '../presets.js';
 import { attachSessionToWorkspace } from '../workspace.js';
+import { reserveMount } from '../../sessionMounts.js';
+import { mountFailureText } from '../../sessions/resumeFailure.js';
 /** Create a detached `/fork` copy without adopting it into the foreground. */
 export function createForkSessionAction(ctx, state, deps) {
     return async () => {
@@ -32,6 +34,18 @@ export function createForkSessionAction(ctx, state, deps) {
             return false;
         }
         const forkComposed = await composePreset(ctx, runningPresetOf(source));
+        // Reserve BEFORE the factory, and hold it past `detached.release()`.
+        //
+        // A forked child is driven by this process for the whole creation and then
+        // written to once more AFTER the handle is gone (`appendSessionTitle`
+        // below), so "the handle was disposed" is not the moment this process stops
+        // touching the log. The reservation covers both, and is given back at the
+        // end: a fork is a standalone session the user resumes separately, not one
+        // this terminal keeps mounted.
+        const reserved = await reserveMount(String(childId));
+        if (!reserved.ok && reserved.reason !== 'occupied')
+            deps.notify(mountFailureText(reserved), { color: 'warning', timeoutMs: 8000 });
+        const reservation = reserved.ok ? reserved.reservation : { settle: () => { }, abandon: () => { } };
         let detached;
         try {
             detached = await deps.createDetachedHandle(() => agents.create(liveSessionCreateOptions({
@@ -49,11 +63,13 @@ export function createForkSessionAction(ctx, state, deps) {
             })));
         }
         catch {
+            reservation.abandon();
             deps.notify(t('fork-create-failed'), { color: 'error' });
             return false;
         }
         if (!deps.owner.current()) {
             await detached.release();
+            reservation.abandon();
             return false;
         }
         try {
@@ -64,6 +80,7 @@ export function createForkSessionAction(ctx, state, deps) {
         }
         if (!deps.owner.current()) {
             await detached.release();
+            reservation.abandon();
             return false;
         }
         try {
@@ -72,8 +89,15 @@ export function createForkSessionAction(ctx, state, deps) {
         catch (error) {
             ctx.logger.warn('dsh-tui: forked session dispose failed: %o', error);
         }
-        const sourceTitle = state.sessionTitle.trim();
-        appendSessionTitle(String(childId), `Fork: ${sourceTitle === '' ? String(source.id).slice(0, 8) : sourceTitle}`);
+        try {
+            const sourceTitle = state.sessionTitle.trim();
+            appendSessionTitle(String(childId), `Fork: ${sourceTitle === '' ? String(source.id).slice(0, 8) : sourceTitle}`);
+        }
+        finally {
+            // The offline title write is the last touch; from here the fork is the
+            // user's to resume somewhere else.
+            reservation.abandon();
+        }
         const profile = resolveDshProfileName();
         const boot = profile === undefined ? 'dsh --config cordis.yml' : `dsh --profile ${profile}`;
         const command = process.platform === 'win32'

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

@@ -25,6 +25,9 @@ export declare function createLiveAgentAdoption(state: LiveAdoptionState, deps:
     refreshLoadedContext(): Promise<void>;
     refreshSkillCommands(): Promise<void>;
     clearStagedImages(): void;
+    /** Drop the live IDE selection: the adopted session's cwd differs from
+     *  the one the selection was made in. */
+    resetIdeSelection(): void;
     notifySessionSwitched(kind: 'agent-view', sessionId: string, previousSessionId: string): void;
     notifyAgentView(): void;
 }): (target: Agent) => Promise<ResumeResult>;

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,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,CAwDpD"}
+{"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"}

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

@@ -15,6 +15,7 @@ export function createLiveAgentAdoption(state, deps) {
         state.agentId = target.id;
         state.cwd = target.session.header.cwd ?? state.cwd;
         state.displayCwd = deps.describeWorkspace(state.cwd).description ?? state.cwd;
+        deps.resetIdeSelection();
         deps.refreshGitBranch();
         state.agentPreset = runningPresetOf(target.session);
         const route = recordedModelRoute(snapshotLiveSessionEvents(target.session));

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

@@ -4,6 +4,16 @@ import { writeResumeTarget } from '../../sessionHistory.js';
 import { type SessionSummary } from '../sessions/index.js';
 import type { ChannelOwner } from './owner.js';
 import type { CredentialStatus } from './types.js';
+declare module '@deepseek-ai/dsh-llm' {
+    interface MessageSourceMap {
+        'dsh-tui-btw': {
+            kind: 'dsh-tui-btw';
+        };
+        'dsh-tui-recap': {
+            kind: 'dsh-tui-recap';
+        };
+    }
+}
 type Capture = {
     readonly agent: Agent;
     readonly generation: number;

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;AAE5H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAmB,MAAM,YAAY,CAAA;AAKnE,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;wBAMgC,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC;gCAa/B,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;4BAkB7E;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;;;;;;;;;;;;2BAuBjE,MAAM,KAAG,IAAI;6BAOX,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,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;AAE5H,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;wBAMgC,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC;gCAa/B,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;4BAkB7E;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;;;;;;;;;;;;2BAuBjE,MAAM,KAAG,IAAI;6BAOX,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-metadata.js

@@ -124,7 +124,7 @@ export function createSessionMetadataActions(ctx, deps) {
             stream: llm.stream.bind(llm),
             options: llmRequest(capture, [
                 ...capture.agent.session.deriveMessages(),
-                createUserMessage({ content: [{ type: 'text', text: wrapSideQuestion(question) }], source: { kind: 'plugin', plugin: 'dsh-tui/btw' } }),
+                createUserMessage({ content: [{ type: 'text', text: wrapSideQuestion(question) }], 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)
@@ -148,7 +148,7 @@ export function createSessionMetadataActions(ctx, deps) {
         const outcome = await runSideQuestion({
             stream: llm.stream.bind(llm),
             options: llmRequest(capture, [
-                createUserMessage({ content: [{ type: 'text', text: wrapRecapPrompt(activity) }], source: { kind: 'plugin', plugin: 'dsh-tui/recap' } }),
+                createUserMessage({ content: [{ type: 'text', text: wrapRecapPrompt(activity) }], source: { kind: 'dsh-tui-recap' } }),
             ], false, signal),
             onText: delta => { if (current(capture) && !options?.signal?.aborted)
                 options?.onText?.(delta); },