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

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

@@ -12,6 +12,7 @@ import { ensureLegacySessionEventTypes } from '../compat/index.js';
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { composePreset, resolvePersistedPreset, resolvePersistedRoute } from '../presets.js';
 import { attachSessionToWorkspace } from '../workspace.js';
+import { createDshSession, dshHandleOf } from '../backend/session.js';
 import { resetSessionProjection } from './session-reset.js';
 import { assertCapabilityShadowPolicy } from '../../adapter/kernel/runtime.js';
 /** Persisted-session and fresh-session foreground actions. */
@@ -79,24 +80,25 @@ export function createSessionResumeActions(ctx, state, options, deps) {
             const composed = await composePreset(ctx, await resolvePersistedPreset(ctx, SessionId(sessionId)));
             const explicitRoute = explicitModelRoute({ provider: options.configuredProvider, model: options.configuredModel });
             const persistedRoute = await resolvePersistedRoute(ctx, SessionId(sessionId));
-            let handle;
+            let candidate;
             try {
-                handle = await deps.binding.prepare(adoption, () => agents.resume({
+                candidate = await deps.binding.prepare(adoption, async () => createDshSession(ctx, await agents.resume({
                     resumeSessionId: SessionId(sessionId),
                     agentOptions: {
                         provider: explicitRoute?.provider ?? persistedRoute?.provider,
                         model: explicitRoute?.model ?? persistedRoute?.model,
                     },
                     ...(composed.setup === undefined ? {} : { setup: composed.setup }),
-                }));
+                })));
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
                 deps.notify(t('resume-failed', { err: message }), { color: 'error', timeoutMs: 8000 });
                 return { ok: false, reason: 'failed', error: message };
             }
+            const handle = dshHandleOf(candidate);
             if (!deps.binding.isCurrent(adoption)) {
-                await deps.binding.abandon(handle);
+                await deps.binding.abandon(candidate);
                 return { ok: false, reason: 'cancelled' };
             }
             try {
@@ -106,14 +108,14 @@ export function createSessionResumeActions(ctx, state, options, deps) {
                 deps.notify(t('resume-attach-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'warning', timeoutMs: 8000 });
             }
             if (entrySession !== undefined && (!deps.owner.current() || deps.binding.agent.session !== entrySession)) {
-                await deps.binding.abandon(handle);
+                await deps.binding.abandon(candidate);
                 deps.notify(t('resume-session-changed'), { color: 'error' });
                 return { ok: false, reason: 'failed', error: 'live session changed during resume' };
             }
             // `adopt` is a transaction: it revokes the candidate and disposes it when
             // the tail fails, and it can also refuse before the tail ever runs. Only a
             // normal return is a commit, which is what the outer finally keys on.
-            const result = deps.binding.adopt(handle, adoption, (committedBinding, disposePrevious) => {
+            const result = deps.binding.adopt(candidate, adoption, (committedBinding, disposePrevious) => {
                 const previousSessionId = String(committedBinding.agent.session.id);
                 const keepPrevious = keepCurrent && committedBinding.handle !== undefined
                     && (committedBinding.handle.agent.status === 'running' || agentViewHasTurns(snapshotLiveSessionEvents(committedBinding.handle.agent.session)));
@@ -311,130 +313,89 @@ export function createSessionResumeActions(ctx, state, options, deps) {
             return deps.adoptLive(live);
         return resume(sessionId, 'agent-view', true, adoption, entrySession, reservation);
     };
-    const newSessionWithTarget = async (target) => {
+    /**
+     * How a DSH `/new` opens its fresh session: the capability shadow gate,
+     * the agents service, compaction settled first, the preset and validated
+     * model route, the cross-process mount reservation, `agents.create`,
+     * workspace ownership, and the DSH half of the adoption tail. The
+     * transaction itself (working check, veto, prepare/adopt, the re-check
+     * after a slow open) lives in core/session-switch.ts.
+     */
+    const newSessionOpener = {
+        // An input still in the FIFO when /new adopts is stale-dropped (with a
+        // notice), never delivered to either session; that is the DSH contract.
+        dropsParkedInputs: true,
         // The typed workspace target seam still creates a real Agent/session; it
         // must pass the same shadow policy gate as the public /new action.
-        assertCapabilityShadowPolicy('host.channel.actions.new-session', deps.runtime.mode, deps.runtime.slices);
-        const adoption = deps.binding.capture();
-        const targetCwd = target?.cwd ?? state.cwd;
-        const targetDisplayCwd = target?.displayCwd;
-        const current = () => deps.owner.current() && deps.binding.isCurrent(adoption);
-        if (state.working) {
-            deps.notify(t('new-session-while-working'), { color: 'warning' });
-            return false;
-        }
-        const agents = ctx.get('agents');
-        if (!agents) {
+        assertAllowed: () => assertCapabilityShadowPolicy('host.channel.actions.new-session', deps.runtime.mode, deps.runtime.slices),
+        available() {
+            if (ctx.get('agents') !== undefined)
+                return true;
             deps.notify(t('new-session-unavailable'), { color: 'error' });
             return false;
-        }
-        let sessionId;
-        let composed;
-        let route;
-        try {
-            if (await deps.sessionSwitchVetoed('new') || !current())
-                return false;
+        },
+        async plan(target, current) {
+            const agents = ctx.get('agents');
+            if (agents === undefined)
+                throw new Error(t('new-session-unavailable'));
             await deps.settleCompaction();
             if (!current())
-                return false;
-            sessionId = SessionId(randomUUID());
+                return undefined;
+            const sessionId = SessionId(randomUUID());
             const presetPref = options.configuredPreset === undefined ? readPresetPref() : undefined;
-            composed = await composePreset(ctx, options.configuredPreset ?? presetPref);
+            const composed = await composePreset(ctx, options.configuredPreset ?? presetPref);
             if (!current())
-                return false;
+                return undefined;
             const resolved = resolveModelRoute({ provider: options.configuredProvider, model: options.configuredModel }, readModelPref(), { provider: options.provider, model: options.model });
             const llm = ctx.get('llm');
             const validated = await validateModelRoute(llm, resolved, { provider: options.provider, model: options.model });
-            route = validated.route;
+            const route = validated.route;
             if (!current())
-                return false;
+                return undefined;
             if (!migratePresetPref(presetPref, composed.agentPreset)) {
                 deps.notify(t('preset-switched-pref-failed', { id: composed.agentPreset ?? presetPref ?? 'unknown' }), { color: 'warning' });
             }
             if (validated.rejected !== undefined) {
                 deps.notify(t('model-route-invalid', { provider: validated.rejected.provider, model: validated.rejected.model, fallback: `${route.provider}/${route.model}` }), { color: 'warning', timeoutMs: 8000 });
             }
-        }
-        catch (error) {
-            if (current()) {
-                const message = error instanceof Error ? error.message : String(error);
-                deps.notify(t('new-session-failed', { err: message }), { color: 'error', timeoutMs: 8000 });
-            }
-            return false;
-        }
-        // Reserve BEFORE the factory runs: the moment `agents.create` returns, this
-        // process holds the only write handle on a log no peer has been told about
-        // yet, and the publisher would not name it until its next beat.
-        const reservation = await reserveCreatedSession(sessionId);
-        let handle;
-        try {
-            handle = await deps.binding.prepare(adoption, () => agents.create({
-                sessionId,
-                meta: { cwd: targetCwd, ...(composed.agentPreset === undefined ? {} : { agentPreset: composed.agentPreset }) },
-                agentOptions: route,
-                ...(composed.setup === undefined ? {} : { setup: composed.setup }),
-            }));
-        }
-        catch (error) {
-            reservation.abandon();
-            if (current()) {
-                const message = error instanceof Error ? error.message : String(error);
-                deps.notify(t('new-session-failed', { err: message }), { color: 'error', timeoutMs: 8000 });
-            }
-            return false;
-        }
-        if (!current()) {
-            await deps.binding.abandon(handle);
-            reservation.abandon();
-            return false;
-        }
-        try {
-            await attachSessionToWorkspace(ctx, targetCwd, sessionId);
-        }
-        catch (error) {
-            if (current())
-                deps.notify(t('new-session-attach-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'warning', timeoutMs: 8000 });
-        }
-        if (!current()) {
-            await deps.binding.abandon(handle);
-            reservation.abandon();
-            return false;
-        }
-        // Do not catch this synchronous commit tail. A post-commit setup failure
-        // is owned by binding.adopt(), which revokes the new live handle and must
-        // reject its caller rather than masquerade as an ordinary precommit false.
-        let committed = false;
-        try {
-            const result = deps.binding.adopt(handle, adoption, (committedBinding, disposePrevious) => {
-                const previousSessionId = String(committedBinding.agent.session.id);
-                // The target only becomes shared channel state inside the successful
-                // adoption tail. A losing prepared handle therefore cannot publish or
-                // roll back another workspace's cwd.
-                state.cwd = targetCwd;
-                state.displayCwd = targetDisplayCwd ?? deps.describeWorkspace(targetCwd).description ?? targetCwd;
-                deps.resetIdeSelection();
-                // Reset the input FIFO and the pending-decision indicators BEFORE the
-                // first emit: a submit enqueued from a session-changed subscriber must
-                // land on a fresh chain instead of behind the replaced session's parked
-                // promise (main's bind → clear → refresh order).
-                deps.clearStagedImages();
-                resetAndBind(handle, composed.agentPreset, route, false);
-                clearResumeTarget();
-                touchSession(handle.agent.id);
-                disposePrevious('dispose');
-                deps.notifySessionSwitched('new', String(handle.agent.id), previousSessionId);
-                return true;
-            });
-            committed = true;
-            return result;
-        }
-        finally {
-            if (committed)
-                reservation.settle();
-            else
-                reservation.abandon();
-        }
+            const targetCwd = target.cwd;
+            let reservation;
+            return {
+                // Reserve before the factory runs: the moment `agents.create`
+                // returns, this process holds the only write handle on a log no peer
+                // 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({
+                    sessionId,
+                    meta: { cwd, ...(composed.agentPreset === undefined ? {} : { agentPreset: composed.agentPreset }) },
+                    agentOptions: route,
+                    ...(composed.setup === undefined ? {} : { setup: composed.setup }),
+                })),
+                async attach(_candidate, isCurrent) {
+                    try {
+                        await attachSessionToWorkspace(ctx, targetCwd, sessionId);
+                    }
+                    catch (error) {
+                        if (isCurrent())
+                            deps.notify(t('new-session-attach-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'warning', timeoutMs: 8000 });
+                    }
+                },
+                adopt(candidate) {
+                    const handle = dshHandleOf(candidate);
+                    resetAndBind(handle, composed.agentPreset, route, false);
+                    clearResumeTarget();
+                    touchSession(handle.agent.id);
+                    return String(handle.agent.id);
+                },
+                finish(committed) {
+                    if (committed)
+                        reservation?.settle();
+                    else
+                        reservation?.abandon();
+                },
+            };
+        },
     };
-    const newSession = () => newSessionWithTarget();
-    return { resumeInto, resumeTo, newSession, newSessionWithTarget };
+    return { resumeInto, resumeTo, newSessionOpener };
 }

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

@@ -1,10 +1,10 @@
-import type { AgentHandle } from '@deepseek-ai/dsh-agent';
+import type { AgentSession } from '../../agent/session.js';
 import type { Context } from '@deepseek-ai/cordis';
 import { SessionId, type SessionEvent } from '@deepseek-ai/dsh-session';
-import type { createChannelBinding } from './binding.js';
+import type { DshChannelBinding } from './binding.js';
 import type { ChannelOwner } from './owner.js';
 import type { ChannelState, ChatRow } from './types.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+type Binding = DshChannelBinding;
 type RewindState = Pick<ChannelState, 'working' | 'cwd' | 'provider' | 'model'>;
 /** Rewind a selected transcript row into a prepared, binding-owned fork. */
 export declare function createRewindToAction(ctx: Context, state: RewindState, deps: {
@@ -12,7 +12,7 @@ export declare function createRewindToAction(ctx: Context, state: RewindState, d
     binding: Pick<Binding, 'agent' | 'capture' | 'prepare' | 'isCurrent' | 'abandon'>;
     settleCompaction(): Promise<void>;
     notify: ChannelState['notify'];
-    adoptForkedAgent(handle: AgentHandle, capture: ReturnType<Binding['capture']>, seed: readonly SessionEvent[], agentPreset: string | undefined, childId: SessionId): string;
+    adoptForkedAgent(candidate: AgentSession, capture: ReturnType<Binding['capture']>, seed: readonly SessionEvent[], agentPreset: string | undefined, childId: SessionId): string;
     notifySessionSwitched(kind: 'rewind', sessionId: string, previousSessionId: string): void;
 }): (row: ChatRow, mode?: string | null) => Promise<string | null>;
 export {};

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":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AASvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEvD,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,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,MAAM,EAAE,WAAW,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;IAC1K,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;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"}

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

@@ -1,6 +1,7 @@
 import { SessionId } from '@deepseek-ai/dsh-session';
 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 { dispatchTuiDecision } from '../extension-events.js';
 import { normalizeRewindDoneSummary } from './decisions.js';
@@ -70,9 +71,9 @@ export function createRewindToAction(ctx, state, deps) {
         // here, and the publisher only learns the id from the registry on its next
         // beat.
         const { reservation } = await reserveNewSession(String(childId));
-        let handle;
+        let candidate;
         try {
-            handle = await deps.binding.prepare(adoption, () => agents.create(liveSessionCreateOptions({
+            candidate = await deps.binding.prepare(adoption, async () => createDshSession(ctx, await agents.create(liveSessionCreateOptions({
                 sessionId: childId,
                 seed,
                 runtimeSession: deps.binding.agent.session,
@@ -89,7 +90,7 @@ export function createRewindToAction(ctx, state, deps) {
                     agent.inbox.clear();
                     return composed.setup?.(agentCtx, agent);
                 },
-            })));
+            }))));
         }
         catch {
             reservation.abandon();
@@ -97,7 +98,7 @@ export function createRewindToAction(ctx, state, deps) {
             return null;
         }
         if (!deps.binding.isCurrent(adoption)) {
-            await deps.binding.abandon(handle);
+            await deps.binding.abandon(candidate);
             reservation.abandon();
             return null;
         }
@@ -108,7 +109,7 @@ export function createRewindToAction(ctx, state, deps) {
             deps.notify(t('rewind-attach-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'warning', timeoutMs: 8000 });
         }
         if (!deps.owner.current()) {
-            await deps.binding.abandon(handle);
+            await deps.binding.abandon(candidate);
             reservation.abandon();
             return null;
         }
@@ -116,7 +117,7 @@ export function createRewindToAction(ctx, state, deps) {
         // now drives, so the reservation hands over to the registry. It THROWS when
         // the adoption transaction revokes the candidate, so it is guarded.
         try {
-            const sourceSessionId = deps.adoptForkedAgent(handle, adoption, snapshotLiveSessionEvents(handle.agent.session), composed.agentPreset, childId);
+            const sourceSessionId = deps.adoptForkedAgent(candidate, adoption, snapshotLiveSessionEvents(dshHandleOf(candidate).agent.session), composed.agentPreset, childId);
             reservation.settle();
             try {
                 void dispatchTuiDecision(ctx, 'tui/rewind-done', {

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

@@ -1,10 +1,10 @@
-import type { AgentHandle } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import { SessionId, type SessionEvent } from '@deepseek-ai/dsh-session';
-import type { createChannelBinding } from './binding.js';
+import type { AgentSession } from '../../agent/session.js';
+import type { DshChannelBinding } from './binding.js';
 import type { ChannelOwner } from './owner.js';
 import type { ChannelState } from './types.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+type Binding = DshChannelBinding;
 type TreeRewindState = Pick<ChannelState, 'working' | 'cwd' | 'provider' | 'model'>;
 /** Rewind or fork a selected tree node; loading foreign family logs stays in this persistence adapter seam. */
 export declare function createTreeRewindAction(ctx: Context, state: TreeRewindState, deps: {
@@ -12,7 +12,7 @@ export declare function createTreeRewindAction(ctx: Context, state: TreeRewindSt
     binding: Pick<Binding, 'agent' | 'capture' | 'isCurrent' | 'prepare' | 'abandon'>;
     settleCompaction(): Promise<void>;
     notify: ChannelState['notify'];
-    adoptForkedAgent(handle: AgentHandle, capture: ReturnType<Binding['capture']>, seed: readonly SessionEvent[], agentPreset: string | undefined, childId: SessionId): string;
+    adoptForkedAgent(candidate: AgentSession, capture: ReturnType<Binding['capture']>, seed: readonly SessionEvent[], agentPreset: string | undefined, childId: SessionId): string;
     notifySessionSwitched(kind: 'rewind' | 'fork', sessionId: string, previousSessionId: string): void;
 }): (sessionId: string, seq: number, mode?: "rewind" | "fork") => Promise<string | null>;
 export {};

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":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAUvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,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,MAAM,EAAE,WAAW,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;IAC1K,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;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"}

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

@@ -1,6 +1,7 @@
 import { SessionId } from '@deepseek-ai/dsh-session';
 import { randomUUID } from 'node:crypto';
 import { t } from '../../i18n.js';
+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';
@@ -89,9 +90,9 @@ export function createTreeRewindAction(ctx, state, deps) {
         // Announce the id before the factory: the child's log is created here, and
         // the publisher only learns the id from the registry on its next beat.
         const { reservation } = await reserveNewSession(String(childId));
-        let handle;
+        let candidate;
         try {
-            handle = await deps.binding.prepare(adoption, () => agents.create(liveSessionCreateOptions({
+            candidate = await deps.binding.prepare(adoption, async () => createDshSession(ctx, await agents.create(liveSessionCreateOptions({
                 sessionId: childId,
                 seed,
                 runtimeSession: entrySession,
@@ -113,7 +114,7 @@ export function createTreeRewindAction(ctx, state, deps) {
                         agent.inbox.clear();
                     return composed.setup?.(agentCtx, agent);
                 } : composed.setup,
-            })));
+            }))));
         }
         catch {
             reservation.abandon();
@@ -121,7 +122,7 @@ export function createTreeRewindAction(ctx, state, deps) {
             return null;
         }
         if (!deps.binding.isCurrent(adoption)) {
-            await deps.binding.abandon(handle);
+            await deps.binding.abandon(candidate);
             reservation.abandon();
             return null;
         }
@@ -132,16 +133,16 @@ export function createTreeRewindAction(ctx, state, deps) {
             deps.notify(t('rewind-attach-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'warning', timeoutMs: 8000 });
         }
         if (!deps.owner.current() || deps.binding.agent.session !== entrySession) {
-            await deps.binding.abandon(handle);
+            await deps.binding.abandon(candidate);
             reservation.abandon();
             deps.notify(t('rewind-session-changed'), { color: 'error' });
             return null;
         }
-        const replay = closeAfterCreate || mode === 'rewind' ? snapshotLiveSessionEvents(handle.agent.session) : seed;
+        const replay = closeAfterCreate || mode === 'rewind' ? snapshotLiveSessionEvents(dshHandleOf(candidate).agent.session) : seed;
         // `adoptForkedAgent` is the commit, and it THROWS when the adoption
         // transaction revokes the candidate.
         try {
-            const sourceSessionId = deps.adoptForkedAgent(handle, adoption, replay, composed.agentPreset, childId);
+            const sourceSessionId = deps.adoptForkedAgent(candidate, adoption, replay, composed.agentPreset, childId);
             reservation.settle();
             deps.notifySessionSwitched(mode === 'fork' ? 'fork' : 'rewind', String(childId), sourceSessionId);
             return restoredText;

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

@@ -1,4 +1,4 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { ChannelState } from '../channel/types.js';
-export declare function createSettingsHosts(ctx: Context, assertActive?: () => void): Pick<ChannelState, 'settingsHost' | 'providerSetup' | 'oauthProviderStatuses'>;
+export declare function createSettingsHosts(ctx: Context, 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,CAAC,CA+T5K"}
+{"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"}

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

@@ -166,6 +166,10 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                             ? stored.models.filter((model) => typeof model === 'object' && model !== null)
                             : undefined;
                         const models = modelEntries?.flatMap(entry => typeof entry.id === 'string' ? [entry.id] : []);
+                        const overrides = stored.modelOverrides;
+                        const modelOverrides = typeof overrides === 'object' && overrides !== null && !Array.isArray(overrides)
+                            ? Object.fromEntries(Object.entries(overrides).filter((entry) => typeof entry[1] === 'object' && entry[1] !== null && !Array.isArray(entry[1])))
+                            : undefined;
                         return [{
                                 route,
                                 ref,
@@ -178,6 +182,7 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                                 ...(modelEntries !== undefined && modelEntries.length > 0
                                     ? { modelEntries }
                                     : {}),
+                                ...(modelOverrides !== undefined ? { modelOverrides } : {}),
                             }];
                     });
                 },
@@ -255,6 +260,9 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                 },
             };
         },
+        // The DSH session's sign-in is the DSH credentials `/login` reports; a
+        // non-DSH composition overrides this with its backend's own.
+        backendAuth: () => undefined,
         async oauthProviderStatuses() {
             // Same optional seam the wizard's OAuth branch reads: absent plugin →
             // undefined, and `/login` renders exactly its pre-plugin lines.

package/lib/types/dsh-adapter/channel/skill-catalog.d.ts

@@ -13,12 +13,16 @@ export declare function createSkillCatalog(ctx: Context, deps: {
     cwd(): string;
     setCommands(commands: LocalCommand[]): void;
     commandDescriptions(name: string): LocalizedDescriptions | undefined;
+    /** Whether a turn is currently running. A skill gesture typed mid-turn
+     *  must stay IMMEDIATE (steer at the next step boundary) instead of
+     *  degrading into a turn-end followup (issue #1072). */
+    working(): boolean;
     /** Submit a user line through the channel's delivery pipeline. The
      *  fallback skill path rides this same entry point and attaches the
      *  rendered body, so the line stays a plain user message (fence, pending
      *  preview and `@` expansion included) and the body is appended to that
      *  message's step batch — never a turn of its own. */
-    deliverUserText(text: string, placement: 'followup', attach?: UserMessage): void;
+    deliverUserText(text: string, placement: 'steer' | 'followup', attach?: UserMessage): void;
 }): {
     start: () => void;
     release: () => void;

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

@@ -1 +1 @@
-{"version":3,"file":"skill-catalog.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/skill-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE/D,OAAO,EAA8E,KAAK,YAAY,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAI7J,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAKxD,oFAAoF;AACpF,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,CAAA;IAC5C,cAAc,EAAE,cAAc,GAAG,SAAS,CAAA;IAC1C,KAAK,IAAI,KAAK,CAAA;IACd,GAAG,IAAI,MAAM,CAAA;IACb,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAA;IAC3C,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAAA;IACpE;;;;0DAIsD;IACtD,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;CACjF;iBA4JiB,IAAI;mBARF,IAAI;2BAhII,IAAI;mDAoDwB,OAAO,CAAC,IAAI,CAAC;yBAtDzC,KAAK,KAAG,aAAa,GAAG,SAAS;yBADjC,KAAK,KAAG;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;EA+JlE"}
+{"version":3,"file":"skill-catalog.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/skill-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE/D,OAAO,EAA8E,KAAK,YAAY,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAI7J,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAKxD,oFAAoF;AACpF,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,CAAA;IAC5C,cAAc,EAAE,cAAc,GAAG,SAAS,CAAA;IAC1C,KAAK,IAAI,KAAK,CAAA;IACd,GAAG,IAAI,MAAM,CAAA;IACb,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAA;IAC3C,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAAA;IACpE;;4DAEwD;IACxD,OAAO,IAAI,OAAO,CAAA;IAClB;;;;0DAIsD;IACtD,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,UAAU,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;CAC3F;iBA4JiB,IAAI;mBARF,IAAI;2BAhII,IAAI;mDAoDwB,OAAO,CAAC,IAAI,CAAC;yBAtDzC,KAAK,KAAG,aAAa,GAAG,SAAS;yBADjC,KAAK,KAAG;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;EA+JlE"}

package/lib/types/dsh-adapter/channel/skill-catalog.js

@@ -150,7 +150,7 @@ export function createSkillCatalog(ctx, deps) {
                         if (tools?.get('skill', invoker) !== undefined) {
                             if (!deps.owner.current() || invoker !== deps.agent())
                                 return { kind: 'error', text: t('skill-unavailable', { name }) };
-                            deps.deliverUserText(`/${name}${rawInput}`, 'followup');
+                            deps.deliverUserText(`/${name}${rawInput}`, deps.working() ? 'steer' : 'followup');
                             return { kind: 'success' };
                         }
                         const skill = await registryFor(invoker)?.get(name, { ...viewOptions(invoker), signal });
@@ -163,7 +163,7 @@ export function createSkillCatalog(ctx, deps) {
                         // listener appends the body AFTER the admitted batch — the same
                         // shape/order as dsh-tool-skill's gesture boundary (#842).
                         const bodyMessage = createUserMessage({ content: [{ type: 'text', text: renderSkillContent(skill) }], source: { kind: 'skill-invocation', name, form: 'instructions' } });
-                        deps.deliverUserText(`/${name}${rawInput}`, 'followup', bodyMessage);
+                        deps.deliverUserText(`/${name}${rawInput}`, deps.working() ? 'steer' : 'followup', bodyMessage);
                         return { kind: 'success' };
                     },
                 });