@deepseek-harness-tui/dsh-tui 0.14.0 → 0.15.0

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

@@ -5,12 +5,13 @@ import { clearResumeTarget, writeResumeTarget, touchAgentViewSession, touchSessi
 import { mountFailureText } from '../../sessions/resumeFailure.js';
 import { t } from '../../i18n.js';
 import { readModelPref } from '../../modelPrefs.js';
-import { migratePresetPref, readPresetPref } from '../../presetPrefs.js';
+import { migratePresetPref, presetOverrideFromEnv, readPresetPref } from '../../presetPrefs.js';
 import { agentViewHasTurns } from '../agent-view.js';
 import { occupancyOf, readSessionOwners, reserveMount, reserveNewSession, } from '../../sessionMounts.js';
 import { ensureLegacySessionEventTypes } from '../compat/index.js';
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { composePreset, resolvePersistedPreset, resolvePersistedRoute } from '../presets.js';
+import { createFreshAgent } from '../fresh-agent.js';
 import { attachSessionToWorkspace } from '../workspace.js';
 import { createDshSession, dshHandleOf } from '../backend/session.js';
 import { resetSessionProjection } from './session-reset.js';
@@ -84,9 +85,11 @@ export function createSessionResumeActions(ctx, state, options, deps) {
             try {
                 candidate = await deps.binding.prepare(adoption, async () => createDshSession(ctx, await agents.resume({
                     resumeSessionId: SessionId(sessionId),
+                    // The session's own recorded route is what it actually ran, so it
+                    // outranks the static cordis.yml route (the deployment default).
                     agentOptions: {
-                        provider: explicitRoute?.provider ?? persistedRoute?.provider,
-                        model: explicitRoute?.model ?? persistedRoute?.model,
+                        provider: persistedRoute?.provider ?? explicitRoute?.provider,
+                        model: persistedRoute?.model ?? explicitRoute?.model,
                     },
                     ...(composed.setup === undefined ? {} : { setup: composed.setup }),
                 })));
@@ -128,7 +131,7 @@ export function createSessionResumeActions(ctx, state, options, deps) {
                 // Reset the input FIFO and pending-decision indicators BEFORE the first
                 // emit (main's bind → clear → refresh order); see the /new tail.
                 deps.clearStagedImages();
-                resetAndBind(handle, composed.agentPreset, explicitRoute ?? recordedModelRoute(snapshotLiveSessionEvents(handle.agent.session)), true);
+                resetAndBind(handle, composed.agentPreset, recordedModelRoute(snapshotLiveSessionEvents(handle.agent.session)) ?? explicitRoute, true);
                 writeResumeTarget(sessionId);
                 touchSession(sessionId);
                 state.emit();
@@ -342,8 +345,12 @@ export function createSessionResumeActions(ctx, state, options, deps) {
             if (!current())
                 return undefined;
             const sessionId = SessionId(randomUUID());
-            const presetPref = options.configuredPreset === undefined ? readPresetPref() : undefined;
-            const composed = await composePreset(ctx, options.configuredPreset ?? presetPref);
+            // Preset precedence for a session created from inside the TUI: the
+            // DSH_TUI_PRESET launch instruction, the persisted `/preset` choice,
+            // then the cordis.yml default.
+            const presetOverride = presetOverrideFromEnv();
+            const presetPref = readPresetPref();
+            const composed = await composePreset(ctx, presetOverride ?? presetPref ?? options.configuredPreset);
             if (!current())
                 return undefined;
             const resolved = resolveModelRoute({ provider: options.configuredProvider, model: options.configuredModel }, readModelPref(), { provider: options.provider, model: options.model });
@@ -352,7 +359,7 @@ export function createSessionResumeActions(ctx, state, options, deps) {
             const route = validated.route;
             if (!current())
                 return undefined;
-            if (!migratePresetPref(presetPref, composed.agentPreset)) {
+            if (presetOverride === undefined && !migratePresetPref(presetPref, composed.agentPreset)) {
                 deps.notify(t('preset-switched-pref-failed', { id: composed.agentPreset ?? presetPref ?? 'unknown' }), { color: 'warning' });
             }
             if (validated.rejected !== undefined) {
@@ -366,7 +373,7 @@ export function createSessionResumeActions(ctx, state, options, deps) {
                 // has been told about yet, and the publisher would not name it until
                 // its next beat.
                 async reserve() { reservation = await reserveCreatedSession(sessionId); },
-                open: async (cwd) => createDshSession(ctx, await agents.create({
+                open: async (cwd) => createDshSession(ctx, await createFreshAgent(ctx, agents, {
                     sessionId,
                     meta: { cwd, ...(composed.agentPreset === undefined ? {} : { agentPreset: composed.agentPreset }) },
                     agentOptions: route,

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

@@ -1 +1 @@
-{"version":3,"file":"session-rewind.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-rewind.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAUvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEvD,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,KAAK,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,CAAC,CAAA;AAgB/E,4EAA4E;AAC5E,wBAAgB,oBAAoB,CAClC,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,CAAC,CAAA;IACjF,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,YAAY,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,MAAM,CAAA;IAC9K,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1F,IAEa,KAAK,OAAO,EAAE,OAAM,MAAM,GAAG,IAAW,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsGhF"}
+{"version":3,"file":"session-rewind.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-rewind.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAYvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEvD,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,KAAK,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,CAAC,CAAA;AAgB/E,4EAA4E;AAC5E,wBAAgB,oBAAoB,CAClC,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,CAAC,CAAA;IACjF,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,YAAY,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,MAAM,CAAA;IAC9K,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1F,IAEa,KAAK,OAAO,EAAE,OAAM,MAAM,GAAG,IAAW,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiHhF"}

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

@@ -3,9 +3,11 @@ import { randomUUID } from 'node:crypto';
 import { t } from '../../i18n.js';
 import { createDshSession, dshHandleOf } from '../backend/session.js';
 import { liveSessionCreateOptions, liveSessionOffset, sliceLiveSessionSeed, snapshotLiveSessionEvents } from '../compat/index.js';
+import { createFreshAgent, isUnstoredFreshSession } from '../fresh-agent.js';
 import { dispatchTuiDecision } from '../extension-events.js';
 import { normalizeRewindDoneSummary } from './decisions.js';
 import { composePreset, runningPresetOf } from '../presets.js';
+import { holdsNoConversation, latestPolicyFacts, replayPolicyFacts } from '../session-seed.js';
 import { attachSessionToWorkspace } from '../workspace.js';
 import { reserveNewSession } from '../../sessionMounts.js';
 async function waitForTurnEnd(session, fromSeq, timeoutMs) {
@@ -52,45 +54,57 @@ export function createRewindToAction(ctx, state, deps) {
             if (event.type === 'turn/end')
                 break;
         }
+        const source = deps.binding.agent.session;
         let seed;
+        let cut;
+        const neverUsed = isUnstoredFreshSession(source);
         try {
             if (boundary < 0)
                 throw new Error('cannot rewind to the very first message');
-            // Slice the SOURCE snapshot through an inclusive seq. Never
-            // sessions.fork(): that registers a real child whose snapshot includes
-            // child-owned session/end-seed, so snapshot.length is not the inherited
-            // cut. agents.create owns the new session id.
-            seed = sliceLiveSessionSeed(deps.binding.agent.session, boundary);
+            cut = neverUsed ? snapshotLiveSessionEvents(source) : sliceLiveSessionSeed(source, boundary);
+            seed = neverUsed || holdsNoConversation(cut) ? [] : cut;
         }
         catch (error) {
             deps.notify(t('rewind-fork-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'error' });
             return null;
         }
-        const composed = await composePreset(ctx, runningPresetOf(deps.binding.agent.session));
+        // A policy-only cut starts fresh; seeded creation would publish it immediately.
+        const cutHoldsNoConversation = seed.length === 0;
+        const policyFacts = cutHoldsNoConversation ? latestPolicyFacts(cut) : [];
+        const composed = await composePreset(ctx, runningPresetOf(source));
         // Announce the id before the factory: the rewind creates the child's log
         // here, and the publisher only learns the id from the registry on its next
         // beat.
         const { reservation } = await reserveNewSession(String(childId));
         let candidate;
         try {
-            candidate = await deps.binding.prepare(adoption, async () => createDshSession(ctx, await agents.create(liveSessionCreateOptions({
-                sessionId: childId,
-                seed,
-                runtimeSession: deps.binding.agent.session,
-                inheritedCount: seed.length,
-                cwd: state.cwd,
-                parentSession: deps.binding.agent.session.id,
-                agentPreset: composed.agentPreset,
-                agentOptions: { provider: state.provider, model: state.model },
-                setup: async (agentCtx, agent) => {
-                    // The cut keeps pre-turn inbox insertions but drops their claims.
-                    // Newer hosts replay those inherited splices, so cancel the restored
-                    // queue durably in the CHILD before publication or preset setup.
-                    // Clearing only state.pending would hide, not revoke, the old work.
-                    agent.inbox.clear();
-                    return composed.setup?.(agentCtx, agent);
-                },
-            }))));
+            const create = () => cutHoldsNoConversation
+                ? createFreshAgent(ctx, agents, {
+                    sessionId: childId,
+                    meta: { cwd: state.cwd, ...(composed.agentPreset === undefined ? {} : { agentPreset: composed.agentPreset }) },
+                    agentOptions: { provider: state.provider, model: state.model },
+                    setup: composed.setup,
+                })
+                : agents.create(liveSessionCreateOptions({
+                    sessionId: childId,
+                    seed,
+                    runtimeSession: source,
+                    inheritedCount: seed.length,
+                    cwd: state.cwd,
+                    parentSession: source.id,
+                    agentPreset: composed.agentPreset,
+                    agentOptions: { provider: state.provider, model: state.model },
+                    setup: async (agentCtx, agent) => {
+                        agent.inbox.clear();
+                        return composed.setup?.(agentCtx, agent);
+                    },
+                }));
+            candidate = await deps.binding.prepare(adoption, async () => {
+                const handle = await create();
+                if (cutHoldsNoConversation)
+                    replayPolicyFacts(handle.agent.session, policyFacts);
+                return createDshSession(ctx, handle);
+            });
         }
         catch {
             reservation.abandon();

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

@@ -1 +1 @@
-{"version":3,"file":"session-tree-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-tree-actions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAU1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,KAAK,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,CAAC,CAAA;AAYnF,+GAA+G;AAC/G,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC,CAAA;IACjF,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,YAAY,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,MAAM,CAAA;IAC9K,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CACnG,IAEa,WAAW,MAAM,EAAE,KAAK,MAAM,EAAE,OAAM,QAAQ,GAAG,MAAiB,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyH1G"}
+{"version":3,"file":"session-tree-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/session-tree-actions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAY1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,KAAK,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,OAAO,CAAC,CAAA;AAYnF,+GAA+G;AAC/G,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC,CAAA;IACjF,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,YAAY,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,MAAM,CAAA;IAC9K,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CACnG,IAEa,WAAW,MAAM,EAAE,KAAK,MAAM,EAAE,OAAM,QAAQ,GAAG,MAAiB,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoI1G"}

package/lib/types/dsh-adapter/channel/session-tree-actions.js

@@ -5,7 +5,9 @@ import { createDshSession, dshHandleOf } from '../backend/session.js';
 import { appendInterruptedTurnEnd, liveSessionCreateOptions, liveSessionOffset, snapshotLiveSessionEvents } from '../compat/index.js';
 import { readPersistedSession } from '../compat/persistence.js';
 import { closeLiveForkTurn } from '../compat/liveSession.js';
+import { createFreshAgent, isUnstoredFreshSession } from '../fresh-agent.js';
 import { composePreset, resolvePersistedPreset, runningPresetOf } from '../presets.js';
+import { holdsNoConversation, latestPolicyFacts, replayPolicyFacts } from '../session-seed.js';
 import { attachSessionToWorkspace } from '../workspace.js';
 import { reserveNewSession } from '../../sessionMounts.js';
 import { forkTarget, rewindTarget, turnUserText } from '../sessionTree.js';
@@ -81,7 +83,12 @@ export function createTreeRewindAction(ctx, state, deps) {
             deps.notify(t('rewind-settling'), { color: 'error' });
             return null;
         }
-        const seed = sourceEvents.filter(event => event.seq <= target.boundary);
+        const cut = sourceEvents.filter(event => event.seq <= target.boundary);
+        const neverUsed = forkFromLive && isUnstoredFreshSession(entrySession);
+        const seed = neverUsed || holdsNoConversation(cut) ? [] : cut;
+        // A policy-only cut starts fresh; seeded creation would publish it immediately.
+        const cutHoldsNoConversation = seed.length === 0;
+        const policyFacts = cutHoldsNoConversation ? latestPolicyFacts(cut) : [];
         const inheritedCount = seed.length;
         const closeAfterCreate = target.closeTurn !== undefined && entrySession.header?.version >= 3;
         if (target.closeTurn !== undefined && !closeAfterCreate) {
@@ -92,29 +99,36 @@ export function createTreeRewindAction(ctx, state, deps) {
         const { reservation } = await reserveNewSession(String(childId));
         let candidate;
         try {
-            candidate = await deps.binding.prepare(adoption, async () => createDshSession(ctx, await agents.create(liveSessionCreateOptions({
-                sessionId: childId,
-                seed,
-                runtimeSession: entrySession,
-                inheritedCount,
-                cwd: sourceCwd,
-                parentSession: SessionId(sessionId),
-                agentPreset: composed.agentPreset,
-                agentOptions: { provider: state.provider, model: state.model },
-                setup: closeAfterCreate || mode === 'rewind' ? async (agentCtx, agent) => {
-                    // V3 requires seed.length === inheritedEventCount. The constructor
-                    // inserts the inherited marker, then these closers belong to the
-                    // child and persist before publication, without falsifying the cut.
-                    if (closeAfterCreate)
-                        closeLiveForkTurn(agent.session, target.closeTurn);
-                    // Re-editing starts with no historical pending work. Cancel through
-                    // the child's Inbox so a later resume cannot resurrect the queue.
-                    // A plain fork deliberately keeps its separate semantics.
-                    if (mode === 'rewind')
-                        agent.inbox.clear();
-                    return composed.setup?.(agentCtx, agent);
-                } : composed.setup,
-            }))));
+            const create = () => cutHoldsNoConversation
+                ? createFreshAgent(ctx, agents, {
+                    sessionId: childId,
+                    meta: { cwd: sourceCwd, ...(composed.agentPreset === undefined ? {} : { agentPreset: composed.agentPreset }) },
+                    agentOptions: { provider: state.provider, model: state.model },
+                    setup: composed.setup,
+                })
+                : agents.create(liveSessionCreateOptions({
+                    sessionId: childId,
+                    seed,
+                    runtimeSession: entrySession,
+                    inheritedCount,
+                    cwd: sourceCwd,
+                    parentSession: SessionId(sessionId),
+                    agentPreset: composed.agentPreset,
+                    agentOptions: { provider: state.provider, model: state.model },
+                    setup: closeAfterCreate || mode === 'rewind' ? async (agentCtx, agent) => {
+                        if (closeAfterCreate)
+                            closeLiveForkTurn(agent.session, target.closeTurn);
+                        if (mode === 'rewind')
+                            agent.inbox.clear();
+                        return composed.setup?.(agentCtx, agent);
+                    } : composed.setup,
+                }));
+            candidate = await deps.binding.prepare(adoption, async () => {
+                const handle = await create();
+                if (cutHoldsNoConversation)
+                    replayPolicyFacts(handle.agent.session, policyFacts);
+                return createDshSession(ctx, handle);
+            });
         }
         catch {
             reservation.abandon();

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

@@ -1,4 +1,4 @@
-import type { Context } from '@deepseek-ai/cordis';
+import type { ServiceLookup } from './channel-host.js';
 import type { ChannelState } from '../channel/types.js';
-export declare function createSettingsHosts(ctx: Context, assertActive?: () => void): Pick<ChannelState, 'settingsHost' | 'providerSetup' | 'oauthProviderStatuses' | 'backendAuth'>;
+export declare function createSettingsHosts(ctx: ServiceLookup, assertActive?: () => void): Pick<ChannelState, 'settingsHost' | 'providerSetup' | 'oauthProviderStatuses' | 'backendAuth'>;
 //# sourceMappingURL=settings-host.d.ts.map

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

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

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

@@ -27,6 +27,7 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                         applies: descriptor.applies,
                         value: descriptor.value,
                         user: descriptor.user,
+                        warning: descriptor.warning,
                     }));
                 },
                 write(ns, ops, expectedRevision) {

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

@@ -13,8 +13,31 @@ import { type BrandSetting } from '../../branding.js';
 import type { ChannelState } from './types.js';
 /** The DSH backend's user-facing name (capability snapshot default). */
 export declare const DSH_BACKEND_LABEL = "DSH";
+/** The settled startup open (`ChannelLaunchOptions.startup`). */
+export interface ChannelStartup {
+    readonly session: AgentSession;
+    readonly history: readonly AgentEvent[];
+    readonly route?: {
+        readonly provider: string;
+        readonly model: string;
+    };
+    readonly agentPreset?: string;
+}
+/**
+ * A startup open that failed for a reason `/new` cannot fix (the in-process
+ * DSH kernel's composition failed: there is no DSH to open a session on).
+ * Its `hint` replaces the failure row's `/new` hint (`startup-open-failed-hint`).
+ */
+export declare class StartupOpenError extends Error {
+    readonly hint: string;
+    constructor(message: string, hint: string, options?: {
+        cause?: unknown;
+    });
+}
 /** Launch configuration belongs to channel construction, not the composition root. */
 export interface ChannelLaunchOptions {
+    /** Host notification effect with the last settled reply's preview, when present. */
+    onTaskComplete?: (preview?: string) => void;
     model: string;
     cwd: string;
     provider: string;
@@ -55,6 +78,11 @@ export interface ChannelLaunchOptions {
      *  `'dsh-tui'` (direct `createChannel` embedders and fixtures). */
     settingsNs?: string;
     diffLayout?: 'auto' | 'split' | 'unified';
+    /** Seed the upstream auto-retry policy (upstream-retry.ts) on the
+     *  llm-pi-ai route the bound session actually uses, when that route
+     *  declares no retryPolicy. Absent means enabled (the Config schema's
+     *  default); false opts out without touching settings. */
+    upstreamRetry?: boolean;
     thinkingFold?: 'preview' | 'full';
     jobGroupFold?: JobGroupFoldMode;
     toolBackground?: ToolBackground;
@@ -120,6 +148,14 @@ export interface ChannelLaunchOptions {
     /** The startup session's durable history, read before construction so
      *  the first bind paints it ahead of any live event. */
     initialHistory?: readonly AgentEvent[];
+    /** The `/settings` service (../tui-settings.ts); absent → the host's `settings`. */
+    settingsService?: unknown;
+    /**
+     * The startup session still opening: the channel starts on a placeholder
+     * (`ready` false) and `start()` adopts the real one once this settles; a
+     * rejection stays on the placeholder and `/new` retries. `route`/`agentPreset` override the construction options.
+     */
+    startup?: Promise<ChannelStartup>;
     /** How a user re-enters a session of this backend from a shell (the
      *  `/fork` notice); absent → the in-TUI `/resume` hint. */
     resumeCommand?: (sessionId: string) => string;
@@ -149,5 +185,5 @@ export declare function createInitialChannelView(options: ChannelLaunchOptions,
     sessionId: string;
     mode: ChannelState['mode'];
     cwdDescription: string;
-}): Pick<ChannelState, 'effortLevels' | 'version' | 'rows' | 'status' | 'sessionTitle' | 'sessionColor' | 'agentId' | 'sessionId' | 'agentBindingGeneration' | 'model' | 'modelDisplay' | 'provider' | 'tokens' | 'cwd' | 'displayCwd' | 'gitBranch' | 'working' | 'compaction' | 'cancelPending' | 'spinnerMode' | 'responseChars' | 'activeToolCount' | 'turnStart' | 'lastUserText' | 'notifications' | 'contextWindow' | 'reasoningEffort' | 'mode' | 'modeIndex' | 'activityFrames' | 'configuredProvider' | 'configuredModel' | 'configuredPreset' | 'configuredActivityFrames' | 'configuredLang' | 'diffLayout' | 'thinkingFold' | 'jobGroupFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'turnUsageRow' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'splashFont' | 'brand' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'statusBar' | 'whale' | 'whaleIdle' | 'whaleGirl' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'agentPreset' | 'goal' | 'todos' | 'loadedContext' | 'pending' | 'commandList' | 'lastUsage' | 'turnUsage' | 'tps' | 'tpsSamples' | 'contextSegments' | 'mainCost' | 'subagentCost' | 'subagents' | 'backgroundJobs' | 'selection'>;
+}): Pick<ChannelState, 'effortLevels' | 'version' | 'ready' | 'startupFailure' | 'rows' | 'status' | 'sessionTitle' | 'sessionColor' | 'agentId' | 'sessionId' | 'agentBindingGeneration' | 'model' | 'modelDisplay' | 'provider' | 'tokens' | 'cwd' | 'displayCwd' | 'gitBranch' | 'working' | 'compaction' | 'cancelPending' | 'spinnerMode' | 'responseChars' | 'activeToolCount' | 'turnStart' | 'lastUserText' | 'notifications' | 'contextWindow' | 'reasoningEffort' | 'mode' | 'modeIndex' | 'activityFrames' | 'configuredProvider' | 'configuredModel' | 'configuredPreset' | 'configuredActivityFrames' | 'configuredLang' | 'diffLayout' | 'thinkingFold' | 'jobGroupFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'turnUsageRow' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'splashFont' | 'brand' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'statusBar' | 'whale' | 'whaleIdle' | 'whaleGirl' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'agentPreset' | 'goal' | 'todos' | 'loadedContext' | 'pending' | 'commandList' | 'lastUsage' | 'turnUsage' | 'tps' | 'tpsSamples' | 'contextSegments' | 'mainCost' | 'subagentCost' | 'subagents' | 'backgroundJobs' | 'selection'>;
 //# sourceMappingURL=state.d.ts.map

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

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

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

@@ -4,6 +4,19 @@ import { normalizeSplashFont } from '../../components/splashFonts.js';
 import { normalizeBrandSetting } from '../../branding.js';
 /** The DSH backend's user-facing name (capability snapshot default). */
 export const DSH_BACKEND_LABEL = 'DSH';
+/**
+ * A startup open that failed for a reason `/new` cannot fix (the in-process
+ * DSH kernel's composition failed: there is no DSH to open a session on).
+ * Its `hint` replaces the failure row's `/new` hint (`startup-open-failed-hint`).
+ */
+export class StartupOpenError extends Error {
+    hint;
+    constructor(message, hint, options) {
+        super(message, options);
+        this.hint = hint;
+        this.name = 'StartupOpenError';
+    }
+}
 /**
  * Neutral observable fields only. Behaviour is assembled explicitly by the
  * composition root after each specialist owner exists, so this factory cannot
@@ -11,7 +24,7 @@ export const DSH_BACKEND_LABEL = 'DSH';
  */
 export function createInitialChannelView(options, input) {
     return {
-        effortLevels: undefined, version: 0, rows: [], selection: undefined, status: 'starting', sessionTitle: '', sessionColor: '',
+        effortLevels: undefined, version: 0, ready: options.startup === undefined, startupFailure: undefined, rows: [], selection: undefined, status: 'starting', sessionTitle: '', sessionColor: '',
         agentId: input.agentId, sessionId: input.sessionId, agentBindingGeneration: 0, model: options.model, modelDisplay: undefined, provider: options.provider,
         tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, peak: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, idle: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 } },
         cwd: options.cwd, displayCwd: input.cwdDescription, gitBranch: undefined, working: false,

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

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

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

@@ -3,6 +3,12 @@ import { markChannelReadDirty } from '../../adapter/channel/read-view.js';
 import { agentMessageFailureOf, agentMessageTextOf, agentRelaySourceOf, foldAgentMessage } from '../../agent/messages.js';
 import { SubagentActivityStore } from '../subagents.js';
 import { isSubagentToolName } from './projection-helpers.js';
+/**
+ * Bound the retained description text. Evicting an older term does not cancel
+ * its pending spawn: a separate count keeps those unmatched starts from
+ * consuming a later delegation's title without retaining unbounded text.
+ */
+const MAX_PENDING_TASK_DESCRIPTIONS = 32;
 /**
  * Keep each parked parent's reducer alive, including session links and the
  * stream attempt/settlement cursor. A display snapshot cannot resume either
@@ -158,7 +164,7 @@ export function createSubagentProjection(getState, deps) {
         dropRows: () => active.dropRows(),
         park, restore,
         forget(agent) { parked.delete(agent); },
-        dispose() { parked.clear(); active.store.reset(); active.dropRows(); active.pendingTaskDescriptions.length = 0; },
+        dispose() { parked.clear(); active.reset(); },
         reset() { active = make(); activeParent = deps.agent(); restored = false; getState().subagents = []; getState().subagentCost = []; },
     };
 }
@@ -187,7 +193,9 @@ function createSessionSubagentProjection(getState, deps) {
      *  oldest first, folded by durable message id. */
     const agentMessages = [];
     const rowsByAgentId = new Map();
+    /** Empty entries reserve starts whose ambiguous description was discarded. */
     const pendingTaskDescriptions = [];
+    let evictedDescriptionCount = 0;
     /** Workflow member identity: `tool-workflow/agent-end` carries no childId,
      * so member starts remember `runId:seq` → agentId for their settlement. */
     const workflowMembers = new Map();
@@ -262,12 +270,27 @@ function createSessionSubagentProjection(getState, deps) {
             observedAt: eventTime(event) ?? Date.now(),
         });
     };
+    /** A child session's own descriptor can beat the host's spawn edge. With no
+     *  row to attribute it to the label would be lost for good — an external
+     *  child never gets a catalog to re-state it — so park it under the session
+     *  id (the child id the host links rows by) for the row born later to adopt. */
+    const rememberEarlyLabel = (session, event) => {
+        if (event.type !== 'subagent/descriptor')
+            return;
+        const sessionId = session?.id;
+        const label = event.data?.label;
+        if (typeof sessionId !== 'string' || sessionId === '')
+            return;
+        store.holdKeyedLabel(sessionId, label);
+    };
     const onSessionEvent = (session, event) => {
         let id = store.getSubagentIdBySession(session);
         if (id === undefined)
             id = backfillSessionLink(session);
-        if (id === undefined)
+        if (id === undefined) {
+            rememberEarlyLabel(session, event);
             return false;
+        }
         if (event.type === 'user/message')
             noteChildRelay(id, event);
         store.onSessionEvent(id, event);
@@ -397,8 +420,13 @@ function createSessionSubagentProjection(getState, deps) {
             if (!historical && typeof data.name === 'string' && isSubagentToolName(data.name) && typeof data.arguments === 'string') {
                 try {
                     const args = JSON.parse(data.arguments);
-                    if (typeof args.description === 'string' && args.description)
+                    if (typeof args.description === 'string' && args.description) {
+                        if (pendingTaskDescriptions.length >= MAX_PENDING_TASK_DESCRIPTIONS) {
+                            pendingTaskDescriptions.shift();
+                            evictedDescriptionCount += 1;
+                        }
                         pendingTaskDescriptions.push(args.description);
+                    }
                 }
                 catch { /* malformed arguments do not describe a child */ }
             }
@@ -469,11 +497,43 @@ function createSessionSubagentProjection(getState, deps) {
             return;
         // The fact that the host spawned a child is authoritative even when its
         // optional discovery seam is absent, unloading, or throws.
+        // The queue is keyed by nothing, so only a NEW run may consume a term from
+        // it: a re-announced edge for the same runId (a continuable epoch's
+        // refresh) must leave the queue alone, or every later row shifts by one.
+        // An edge without a run key is itself such a refresh (the store's epoch
+        // rule) — only a real, different key opens a new epoch.
+        const knownRunId = store.runIdOf(info.id);
+        // A row that does not exist yet is a fresh run even when the edge carries
+        // no run key: the store's refresh rule is about a row it already tracks,
+        // and treating the first edge of an untracked child as a refresh would
+        // skip its term and hand that term to the next spawn instead.
+        const freshRun = !store.has(info.id)
+            || (info.runId !== undefined && (knownRunId === undefined || knownRunId !== info.runId));
+        // A queued term is a first-frame guess; `subagent/catalog`'s childId-keyed
+        // label is the authority and corrects it in the store (describeFromLabel).
+        // A row a keyed label already settled still consumes the term here — the
+        // store drops it instead of applying it, so the FIFO stays aligned.
+        //
+        // The queue carries no childId, so a term is only usable while exactly one
+        // delegation is outstanding. With two or more, any pick is a coin flip
+        // that puts a concurrent child's name on this card until its keyed label
+        // arrives. Discard the text, but retain every unmatched start slot: a new
+        // call can arrive before the rest of this batch starts. Forgetting those
+        // slots would let an older start consume that new call's title.
+        let description;
+        if (freshRun) {
+            if (evictedDescriptionCount + pendingTaskDescriptions.length > 1)
+                pendingTaskDescriptions.fill('');
+            if (evictedDescriptionCount > 0)
+                evictedDescriptionCount -= 1;
+            else
+                description = pendingTaskDescriptions.shift() || undefined;
+        }
         store.onSpawned(info.id, info.provider || 'subagent', info.provider, {
-            runId: info.runId ?? info.id,
+            ...(freshRun ? { runId: info.runId } : {}),
             local: info.local,
             startedAt: Date.now(),
-            description: pendingTaskDescriptions.shift(),
+            ...(description === undefined ? {} : { description, descriptionFromQueue: true }),
         });
         cardedIds.add(info.id);
         try {
@@ -585,6 +645,6 @@ function createSessionSubagentProjection(getState, deps) {
         },
     };
     const dropRows = () => { streamDirty = false; rowsByAgentId.clear(); };
-    const reset = () => { dropRows(); cardedIds.clear(); workflowMembers.clear(); pendingTaskDescriptions.length = 0; agentMessages.length = 0; store.reset(); getState().subagents = []; getState().subagentCost = []; };
+    const reset = () => { dropRows(); cardedIds.clear(); workflowMembers.clear(); pendingTaskDescriptions.length = 0; evictedDescriptionCount = 0; agentMessages.length = 0; store.reset(); getState().subagents = []; getState().subagentCost = []; };
     return { store, control, pendingTaskDescriptions, agentMessages, onSessionEvent, onStreamFrame, onParentEvent, bootstrapFromLog, onStart, onEnd, syncNow, flush, dropRows, reset, submitPrompt };
 }

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

@@ -0,0 +1,6 @@
+import type { AgentEvent, AgentEventMeta } from '../../agent/events.js';
+import type { ChannelOwner } from './owner.js';
+import type { ChannelState } from './types.js';
+/** Notify once a successful live turn has settled with no automatic follow-up. */
+export declare function createTaskCompletion(state: ChannelState, owner: ChannelOwner, notify: (preview?: string) => void): (batch: readonly AgentEvent[], meta: AgentEventMeta, current: () => boolean) => void;
+//# sourceMappingURL=task-completion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"task-completion.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/task-completion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAKvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,kFAAkF;AAClF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,IAmBvG,OAAO,SAAS,UAAU,EAAE,EAAE,MAAM,cAAc,EAAE,SAAS,MAAM,OAAO,KAAG,IAAI,CAwC1F"}