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

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

@@ -5,8 +5,9 @@ import { appendSessionTitle, deleteSessionLog, userTitleData } from '../compat/i
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { collectRecentActivity, parseRecapResponse, RECAP_RECENT_CHARS, wrapRecapPrompt } from '../recap.js';
 import { listSummaries, locateSession, previewSession } from '../sessions/index.js';
-import { openStepToolCallIds, runSideQuestion, splitUnresolvedToolCalls, wrapSideQuestion } from '../sideQuestion.js';
-import { readListingSnapshot } from '../sessions/snapshot.js';
+import { openStepToolCallIds, runAsSideBranch, runSideQuestion, splitUnresolvedToolCalls, wrapSideQuestion } from '../sideQuestion.js';
+import { beginListingSnapshot, readListingSnapshot } from '../sessions/snapshot.js';
+import { createSessionListing } from './session-listing.js';
 import { isUserInvocable } from '@deepseek-ai/dsh-skill';
 const PREVIEW_ENTRIES = 8;
 /** Session-scoped metadata, persistence queries, and tool-less LLM reads. */
@@ -14,7 +15,6 @@ export function createSessionMetadataActions(ctx, deps) {
     const current = (capture) => deps.owner.current() && deps.binding.isCurrent(capture);
     const persistence = () => ctx.get('sessionPersistence');
     const withOwnerSignal = (signal) => signal === undefined ? deps.owner.signal : AbortSignal.any([signal, deps.owner.signal]);
-    let listingGeneration = 0;
     let lastListing;
     const remember = (source, rows) => {
         lastListing = { source: source.identity ?? source, rows };
@@ -29,32 +29,58 @@ export function createSessionMetadataActions(ctx, deps) {
             ? lastListing.rows
             : readListingSnapshot(source);
     };
-    const listSessions = async (onEnriched, onPartial) => {
-        const generation = ++listingGeneration;
-        const capture = deps.binding.capture();
-        const source = persistence();
-        if (!source) {
-            if (current(capture))
-                deps.setPersistedSessions([]);
-            return [];
-        }
-        let summaries = [];
-        summaries = await listSummaries(source, deps.owner.signal, enriched => {
-            if (!current(capture) || generation !== listingGeneration)
-                return;
-            summaries = summaries.map(row => row.id === enriched.id ? enriched : row);
+    const listing = createSessionListing({
+        owner: deps.owner,
+        capture: () => {
+            const capture = deps.binding.capture();
+            const source = persistence();
+            const identity = source?.identity;
+            const cwd = deps.cwd?.();
+            return () => {
+                const liveSource = persistence();
+                // Legacy hosts may return a new service wrapper on every lookup;
+                // only the provider's explicit identity is stable across proxies.
+                return current(capture) && (liveSource !== undefined) === (source !== undefined)
+                    && liveSource?.identity === identity && deps.cwd?.() === cwd;
+            };
+        },
+        async read(listingCurrent, onEnriched, onPartial) {
+            const source = persistence();
+            if (!source) {
+                if (listingCurrent())
+                    deps.setPersistedSessions([]);
+                return [];
+            }
+            let summaries = [];
+            summaries = await listSummaries(source, deps.owner.signal, enriched => {
+                if (!listingCurrent())
+                    return;
+                summaries = summaries.map(row => row.id === enriched.id ? enriched : row);
+                remember(source, summaries);
+                deps.setPersistedSessions(summaries);
+                onEnriched(enriched);
+            }, rows => {
+                if (listingCurrent())
+                    onPartial(rows);
+            }, deps.cwd?.());
+            if (!listingCurrent())
+                return [];
             remember(source, summaries);
             deps.setPersistedSessions(summaries);
-            onEnriched?.(enriched);
-        }, rows => {
-            if (current(capture) && generation === listingGeneration)
-                onPartial?.(rows);
-        });
-        if (!current(capture) || generation !== listingGeneration)
-            return [];
-        remember(source, summaries);
-        deps.setPersistedSessions(summaries);
-        return summaries;
+            return summaries;
+        },
+    });
+    const saveMutation = (rows) => {
+        listing.invalidate();
+        const source = persistence();
+        if (source === undefined)
+            return;
+        // Revoke a pending scan's disk write even before any complete cache exists.
+        const save = beginListingSnapshot(source);
+        if (rows === undefined)
+            return;
+        remember(source, rows);
+        save(rows);
     };
     const preview = async (sessionId) => {
         const capture = deps.binding.capture();
@@ -152,7 +178,8 @@ export function createSessionMetadataActions(ctx, deps) {
         // /btw can land mid-step; see splitUnresolvedToolCalls.
         const running = openStepToolCallIds(snapshotLiveSessionEvents(capture.agent.session));
         const history = splitUnresolvedToolCalls(capture.agent.session.deriveMessages(), running);
-        const outcome = await runSideQuestion({
+        const agents = ctx.get('agents');
+        const outcome = await runAsSideBranch(agents, capture.agent, () => runSideQuestion({
             stream: llm.stream.bind(llm),
             options: llmRequest(capture, [
                 ...history.messages,
@@ -162,7 +189,7 @@ export function createSessionMetadataActions(ctx, deps) {
             onText: delta => { if (current(capture) && !options?.signal?.aborted)
                 options?.onText?.(delta); },
             signal,
-        });
+        }));
         return current(capture) ? outcome : { answer: null };
     };
     const recapRecent = async (options) => {
@@ -198,6 +225,7 @@ export function createSessionMetadataActions(ctx, deps) {
         // Live rename: the same strict-reader-required payload the offline append
         // writes — a `{ title }`-only event made the log unopenable (issue #1006).
         capture.agent.session.append('session/title', userTitleData(title));
+        saveMutation(cachedSessions()?.map(row => row.id === capture.agent.session.id ? { ...row, title: { text: title, source: 'renamed' } } : row));
         deps.setSessionTitle(title);
         deps.emit();
     };
@@ -216,6 +244,7 @@ export function createSessionMetadataActions(ctx, deps) {
             return false;
         if (deleteSessionLog(sessionId) !== 'deleted' || !current(capture))
             return false;
+        saveMutation(cachedSessions()?.filter(row => row.id !== sessionId));
         forgetSession(sessionId);
         deps.forgetAgentView(sessionId);
         if (readResumeTarget() === sessionId)
@@ -232,11 +261,12 @@ export function createSessionMetadataActions(ctx, deps) {
         }
         if (appendSessionTitle(sessionId, title) !== 'appended' || !current(capture))
             return false;
+        saveMutation(cachedSessions()?.map(row => row.id === sessionId ? { ...row, title: { text: title, source: 'renamed' } } : row));
         touchSession(sessionId);
         return true;
     };
     return {
-        cachedSessions, listSessions, previewSession: preview, listSkills, describeCredential,
+        cachedSessions, listSessions: listing.listSessions, previewSession: preview, listSkills, describeCredential,
         sideQuestion, recapRecent, setResumeTarget: writeResumeTarget,
         renameSession, setSessionColor, deleteSession, renameSessionTo,
     };

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

@@ -32,8 +32,8 @@ export function resetSessionProjection(state, rowIds, resetProjector, resetSubag
     state.activeToolCount = 0;
     state.lastUserText = '';
     state.working = false;
-    // The adoption path settles any in-flight compaction before it takes the
-    // new session over; a row that survived it would describe the old one.
+    // Progress belongs to the old foreground. A parked manual transaction is
+    // still live and restores its own row when that agent is bound again.
     state.compaction = undefined;
     state.cancelPending = false;
     state.spinnerMode = 'requesting';

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

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

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();
@@ -289,6 +292,13 @@ export function createSessionResumeActions(ctx, state, options, deps) {
             reservation?.abandon();
             return { ok: false, reason: 'cancelled' };
         }
+        // Settle the transaction of the session being LEFT — the foreground
+        // binding, not the target. With one transaction per live agent this is
+        // exactly the two behaviors the switch needs: returning to a session that
+        // is compacting in the background leaves the fresh foreground (which owns
+        // nothing) untouched, so the compaction survives; navigating to a
+        // DIFFERENT session still settles the one left behind, so a compaction
+        // never keeps running invisibly after a plain switch.
         await deps.settleCompaction();
         if (!deps.binding.isCurrent(adoption) || deps.binding.agent.session !== entrySession) {
             reservation?.abandon();
@@ -342,8 +352,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 +366,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 +380,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,7 @@
-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'>;
+import type { SettingsNamespaceView, TuiSettingsSection } from '../../adapter/ports/channel-settings.js';
+/** Forms over the host's web settings; provider selection remains owned by DSH. */
+export declare function webSettingsSections(ctx: ServiceLookup, namespaces: readonly SettingsNamespaceView[]): TuiSettingsSection[];
+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;AAIvD,OAAO,KAAK,EAAE,qBAAqB,EAA8C,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AASpJ,mFAAmF;AACnF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,qBAAqB,EAAE,GAAG,kBAAkB,EAAE,CAsG1H;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,GAAE,MAAM,IAAsB,GAAG,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,eAAe,GAAG,uBAAuB,GAAG,aAAa,CAAC,CA2VlM"}