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

package/lib/types/dsh-adapter/channel/input-delivery.js

@@ -14,6 +14,59 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
      * through this chain to keep the send order FIFO.
      */
     let inputChain = Promise.resolve();
+    /**
+     * Attached-context registry (issue #842): `deliverUserText(..., attach)`
+     * records the model-facing companion message under the DELIVERED user
+     * message's id. The resident `agent/pre-step` listener below claims an entry
+     * exactly once — on the step that admits its user message — and appends it
+     * AFTER `next()`'s batch, the same shape and order as dsh-tool-skill's
+     * gesture boundary. The map is emptied on claim, on inbox discard and on
+     * channel release (owner.own below).
+     */
+    const attachedByMessageId = new Map();
+    /** Claim the batch's registered attachments, deleting each entry so a later
+     *  step can never append it a second time. */
+    const claimAttachments = (messages) => {
+        if (attachedByMessageId.size === 0)
+            return [];
+        const attached = [];
+        for (const message of messages) {
+            const context = attachedByMessageId.get(message.id);
+            if (context === undefined)
+                continue;
+            attachedByMessageId.delete(message.id);
+            attached.push(context);
+        }
+        return attached;
+    };
+    /** Drop an attachment whose user message will never be claimed (inbox discard). */
+    const retireAttachment = (messageId) => {
+        attachedByMessageId.delete(messageId);
+    };
+    /**
+     * Resident `agent/pre-step` listener (D3/D4): `await next()` lets every
+     * later transform run first; the waterfall applies AFTER-next transforms in
+     * registration order, so registering at channel construction keeps this
+     * append LAST (范例: presets/liangshen/instruction-hint.mjs). A rejected
+     * step never claims — no context message without its admitted user line —
+     * and a released owner returns the decision untouched. One `owner.own`
+     * lifetime covers both the subscription and the whole registry (D5).
+     */
+    const disposePreStep = ctx.on('agent/pre-step', async (_payload, next) => {
+        const decision = await next();
+        if (decision.kind === 'reject')
+            return decision;
+        if (!owner.current())
+            return decision;
+        const attached = claimAttachments(decision.messages);
+        if (attached.length === 0)
+            return decision;
+        return { ...decision, messages: [...decision.messages, ...attached] };
+    });
+    owner.own(() => {
+        disposePreStep();
+        attachedByMessageId.clear();
+    });
     /** D-6 fence: the submission belongs to the session it was typed in. */
     const current = (origin) => owner.current() && binding.agent === origin.agent && state().agentBindingGeneration === origin.generation;
     /** D-6: bind the submission to the session it was typed in AT ENQUEUE
@@ -36,7 +89,7 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
      * never the file dump) and each resolved reference appends a model-facing
      * attachment block. The pending preview tracks the typed text.
      */
-    const deliverUserText = async (text, placement, images, origin) => {
+    const deliverUserText = async (text, placement, images, origin, attach) => {
         const orderedImages = orderedComposerImages(text, images, origin.stagedImages);
         // A `[Image #N]` placeholder whose staging was evicted (FIFO cap) or
         // whose draft capability was lost (history/rewind/session switch) would
@@ -58,6 +111,11 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
             content: expansion.blocks,
             source: { kind: 'user' },
         });
+        // The message is real from here on: remember its attached context BEFORE
+        // the agent call so the pre-step listener can find it (D6). A throwing
+        // followup/steer rolls both the pending preview and this entry back.
+        if (attach !== undefined)
+            attachedByMessageId.set(message.id, attach);
         // Track BEFORE the agent call: a synchronous throw inside
         // followup/steer rolls the preview back; otherwise the inbox events
         // retire it once the message is claimed or discarded.
@@ -69,6 +127,8 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
                 origin.agent.followup(message);
         }
         catch (error) {
+            if (attach !== undefined)
+                attachedByMessageId.delete(message.id);
             untrackPending(message.id);
             throw error;
         }
@@ -156,7 +216,7 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
      * stale text with a notice instead of sending the old conversation's
      * words to the new session.
      */
-    const runUserTextDecision = async (text, placement, images, origin) => {
+    const runUserTextDecision = async (text, placement, images, origin, attach) => {
         // Stale detection compares the AGENT REFERENCE, not the id: session ids
         // are reusable (A → /new → /resume A lands back on the same id with a
         // fresh agent), so an id check has an ABA hole. Both origin values are
@@ -198,7 +258,7 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
             text = decision.text.trim();
         }
         try {
-            await deliverUserText(text, placement, images, origin);
+            await deliverUserText(text, placement, images, origin, attach);
         }
         catch (error) {
             // The FIFO must survive a failed expansion/send: surface it, then let
@@ -208,18 +268,20 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
             notify(t('send-failed', { err: message }), { color: 'error' });
         }
     };
-    const dispatchUserText = (text, placement, images = []) => {
+    const dispatchUserText = (text, placement, images = [], attach) => {
         const origin = captureOrigin();
         const capturedImages = composer.captureDraftImages(text, images);
-        inputChain = inputChain.then(() => runUserTextDecision(text, placement, capturedImages, origin)).catch((error) => {
+        inputChain = inputChain.then(() => runUserTextDecision(text, placement, capturedImages, origin, attach)).catch((error) => {
             // The chain must survive a failed decision: log, then continue with
             // the next queued submission.
             ctx.logger.warn('dsh-tui: tui/input dispatch failed: %o', error);
         });
     };
     /** Public companion for callers that own a line but not a draft (skill
-     *  registrations): same decision pass and FIFO as a typed submit. */
-    const deliverUserTextNow = (text, placement, images = []) => dispatchUserText(text, placement, images);
+     *  registrations): same decision pass and FIFO as a typed submit. The
+     *  optional `attach` is registered by `deliverUserText` only once its user
+     *  message is real, then appended at the end of that message's step batch. */
+    const deliverUserTextNow = (text, placement, images = [], attach) => dispatchUserText(text, placement, images, attach);
     /** Main's `clearStagedImages`: revoke capabilities AND release the FIFO so
      *  a task parked on the replaced session cannot wedge the new one, and drop
      *  every pending-decision indicator owned by the session being replaced. */
@@ -232,6 +294,8 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
     return {
         dispatchUserText,
         deliverUserText: deliverUserTextNow,
+        claimAttachments,
+        retireAttachment,
         withDecisionPending,
         clearStagedImages,
         stageImage: (input) => composer.stageImage(input),

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

@@ -1 +1 @@
-{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/permissions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAE3G,eAAO,MAAM,wBAAwB,WAAW,CAAA;AAEhD,eAAO,MAAM,4BAA4B,MAAM,CAAA;AAE/C,eAAO,MAAM,mCAAmC,MAAM,CAAA;AAEtD;;gFAEgF;AAChF,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;IACtE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;IACnC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;CAClD;AAED,iDAAiD;AACjD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAA;CAChD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED,oEAAoE;AACpE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,uBAAuB,GAAG,SAAS,CAE7F;AAED;;iFAEiF;AACjF,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,wBAAwB,GAAG,wBAAwB,CAQ3G;AAED,wBAAgB,6BAA6B,IAAI,SAAS,sBAAsB,EAAE,CAkBjF;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,wBAAwB,CAU5G;AAED,wBAAgB,mCAAmC,IAAI,wBAAwB,CAE9E;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,GAAG,SAAS,CAclG;AAED;;;0CAG0C;AAC1C,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,sBAAsB,EAAE,CAwBhG;AAED;;;wCAGwC;AACxC,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,GACf,wBAAwB,CAqE1B"}
+{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/permissions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAE3G,eAAO,MAAM,wBAAwB,WAAW,CAAA;AAEhD,eAAO,MAAM,4BAA4B,MAAM,CAAA;AAE/C,eAAO,MAAM,mCAAmC,MAAM,CAAA;AAEtD;;gFAEgF;AAChF,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;IACtE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;IACnC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;CAClD;AAED,iDAAiD;AACjD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAA;CAChD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED,oEAAoE;AACpE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,uBAAuB,GAAG,SAAS,CAE7F;AAED;;iFAEiF;AACjF,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,wBAAwB,GAAG,wBAAwB,CAQ3G;AAED,wBAAgB,6BAA6B,IAAI,SAAS,sBAAsB,EAAE,CAkBjF;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,wBAAwB,CAU5G;AAED,wBAAgB,mCAAmC,IAAI,wBAAwB,CAE9E;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,GAAG,SAAS,CAclG;AAED;;;0CAG0C;AAC1C,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,sBAAsB,EAAE,CAwBhG;AAED;;;wCAGwC;AACxC,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,GACf,wBAAwB,CAyE1B"}

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

@@ -80,16 +80,16 @@ export function normalizePermissionPresetOption(value) {
  *  bundles (see `canonicalPresetFor`). */
 export function permissionBundlesFromService(service) {
     const runtime = permissionPresetRuntime(service);
-    const resolve = runtime?.resolve;
-    if (typeof resolve !== 'function')
+    if (runtime === undefined || typeof runtime.resolve !== 'function')
         return [];
-    const names = Array.isArray(runtime?.names) ? runtime.names : [];
+    const names = Array.isArray(runtime.names) ? runtime.names : [];
     const bundles = [];
     for (const name of names) {
         if (typeof name !== 'string')
             continue;
         try {
-            const spec = resolve(name);
+            // The registry resolves atoms on instance state; never detach `resolve`.
+            const spec = runtime.resolve(name);
             if (!isRecord(spec))
                 continue;
             const sandbox = spec.sandbox;
@@ -115,12 +115,15 @@ export function permissionPresetSnapshotFromService(service, subject) {
         return unavailablePermissionPresetSnapshot();
     try {
         const capturedNames = Array.isArray(runtime.names) ? runtime.names : [];
-        const current = runtime.current;
-        const optionOf = runtime.optionOf;
         if (capturedNames.length === 0)
             return unavailablePermissionPresetSnapshot();
-        if (typeof current !== 'function' || typeof optionOf !== 'function')
+        if (typeof runtime.current !== 'function' || typeof runtime.optionOf !== 'function') {
             return unavailablePermissionPresetSnapshot();
+        }
+        // Readback lives on the registry instance; bind so the calls below keep
+        // reaching it through the same object instead of a detached reference.
+        const current = runtime.current.bind(runtime);
+        const optionOf = runtime.optionOf.bind(runtime);
         const names = [];
         for (const name of capturedNames) {
             if (typeof name !== 'string' || name.trim() === '' || name === PERMISSION_PRESET_CUSTOM || names.includes(name)) {

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;AAQvE,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,CAiFhF"}
+{"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;AAQvE,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,CAwFhF"}

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

@@ -76,7 +76,14 @@ export function createRewindToAction(ctx, state, deps) {
                 parentSession: deps.binding.agent.session.id,
                 agentPreset: composed.agentPreset,
                 agentOptions: { provider: state.provider, model: state.model },
-                setup: composed.setup,
+                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);
+                },
             })));
         }
         catch {
@@ -97,7 +104,7 @@ export function createRewindToAction(ctx, state, deps) {
             await deps.binding.abandon(handle);
             return null;
         }
-        const sourceSessionId = deps.adoptForkedAgent(handle, adoption, seed, composed.agentPreset, childId);
+        const sourceSessionId = deps.adoptForkedAgent(handle, adoption, snapshotLiveSessionEvents(handle.agent.session), composed.agentPreset, childId);
         try {
             void dispatchTuiDecision(ctx, 'tui/rewind-done', {
                 text: row.text,

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;AASvE,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,CAwG1G"}
+{"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;AASvE,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,CA4G1G"}

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

@@ -96,11 +96,17 @@ export function createTreeRewindAction(ctx, state, deps) {
                 parentSession: SessionId(sessionId),
                 agentPreset: composed.agentPreset,
                 agentOptions: { provider: state.provider, model: state.model },
-                setup: closeAfterCreate ? async (agentCtx, agent) => {
+                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.
-                    closeLiveForkTurn(agent.session, target.closeTurn);
+                    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,
             })));
@@ -124,7 +130,7 @@ export function createTreeRewindAction(ctx, state, deps) {
             deps.notify(t('rewind-session-changed'), { color: 'error' });
             return null;
         }
-        const replay = closeAfterCreate ? snapshotLiveSessionEvents(handle.agent.session) : seed;
+        const replay = closeAfterCreate || mode === 'rewind' ? snapshotLiveSessionEvents(handle.agent.session) : seed;
         const sourceSessionId = deps.adoptForkedAgent(handle, adoption, replay, composed.agentPreset, childId);
         deps.notifySessionSwitched(mode === 'fork' ? 'fork' : 'rewind', String(childId), sourceSessionId);
         return restoredText;

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

@@ -1,5 +1,6 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { Agent } from '@deepseek-ai/dsh-agent';
+import { type UserMessage } from '@deepseek-ai/dsh-llm';
 import type { CommandRuntime } from '@deepseek-ai/dsh-commands';
 import { type LocalCommand, type LocalizedDescriptions } from '../../commands.js';
 import type { ChannelOwner } from './owner.js';
@@ -12,12 +13,17 @@ export declare function createSkillCatalog(ctx: Context, deps: {
     cwd(): string;
     setCommands(commands: LocalCommand[]): void;
     commandDescriptions(name: string): LocalizedDescriptions | undefined;
-    deliverUserText(text: string, placement: 'followup'): void;
+    /** 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;
 }): {
     start: () => void;
     release: () => void;
     refreshCommands: () => void;
-    refreshSkillCommands: () => Promise<void>;
+    refreshSkillCommands: (fromRetry?: boolean) => Promise<void>;
     registryFor: (agent: Agent) => SkillRegistry | undefined;
     viewOptions: (agent: Agent) => {
         scope: Agent;

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;AAEnD,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;AAIxD,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,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI,CAAA;CAC3D;iBA8HiB,IAAI;mBARF,IAAI;2BA3GI,IAAI;gCAkDO,OAAO,CAAC,IAAI,CAAC;yBApDxB,KAAK,KAAG,aAAa,GAAG,SAAS;yBADjC,KAAK,KAAG;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;EA0IlE"}
+{"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"}

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

@@ -5,13 +5,23 @@ import { t } from '../../i18n.js';
 import { serviceForAgent } from '../presets.js';
 import { hasCommandErrorCode, mapCommandError } from '../command-errors.js';
 const SKILL_COMMAND_RETRY_MS = 800;
+const MAX_SKILL_RETRY_ATTEMPTS = 3;
 /** Owns the merged catalog, host registrations, retry timer and all skill reads. */
 export function createSkillCatalog(ctx, deps) {
     let commandListSeq = 0;
+    let skillCommandSeq = 0;
     let lastGoodSkills;
     const registrations = new Map();
     const refused = new Set();
     let retry;
+    let retryAttempts = 0;
+    let released = false;
+    const resetRetry = () => {
+        if (retry !== undefined)
+            clearTimeout(retry);
+        retry = undefined;
+        retryAttempts = 0;
+    };
     const viewOptions = (agent) => ({ scope: agent, cwd: deps.cwd() });
     const registryFor = (agent) => serviceForAgent(ctx, agent, 'skills');
     const refreshCommands = () => {
@@ -57,16 +67,18 @@ export function createSkillCatalog(ctx, deps) {
                 restore();
                 return;
             }
-            const withSkills = [...merged];
+            // Cache the observation, not the delta: registered skills are already
+            // in merged on later reads. Local/host collisions still win on restore.
+            const skills = [];
             for (const skill of observation.skills) {
-                if (isUserInvocable(skill) && !withSkills.some(command => command.name === skill.name)) {
-                    withSkills.push({ name: skill.name, description: skill.description, skill: true });
+                if (isUserInvocable(skill) && !skills.some(command => command.name === skill.name)) {
+                    skills.push({ name: skill.name, description: skill.description, skill: true });
                 }
             }
-            const added = withSkills.slice(merged.length);
-            lastGoodSkills = { agent: target, commands: added };
+            lastGoodSkills = { agent: target, commands: skills };
+            const added = skills.filter(entry => !merged.some(command => command.name === entry.name));
             if (added.length > 0 && deps.owner.current() && target === deps.agent())
-                deps.setCommands(withSkills);
+                deps.setCommands([...merged, ...added]);
         }).catch((error) => {
             if (!deps.owner.current() || token !== commandListSeq || target !== deps.agent())
                 return;
@@ -74,9 +86,14 @@ export function createSkillCatalog(ctx, deps) {
             restore();
         });
     };
-    const refreshSkillCommands = async () => {
-        if (!deps.owner.current() || deps.commandService === undefined)
+    const refreshSkillCommands = async (fromRetry = false) => {
+        if (released || !deps.owner.current() || deps.commandService === undefined)
             return;
+        // Explicit refreshes (including skills/change and agent swaps) supersede
+        // the old ladder. Only the timer continuation consumes the same budget.
+        if (!fromRetry)
+            resetRetry();
+        const token = ++skillCommandSeq;
         const target = deps.agent();
         const registry = registryFor(target);
         if (registry === undefined)
@@ -86,15 +103,27 @@ export function createSkillCatalog(ctx, deps) {
             observation = await registry.snapshot(viewOptions(target));
         }
         catch (error) {
-            if (deps.owner.current())
+            if (deps.owner.current() && token === skillCommandSeq && target === deps.agent())
                 ctx.logger.warn('skill commands: catalog read failed: %o', error);
             return;
         }
-        if (!deps.owner.current() || target !== deps.agent())
+        if (!deps.owner.current() || token !== skillCommandSeq || target !== deps.agent())
+            return;
+        if (!observation.complete) {
+            if (retry === undefined && retryAttempts < MAX_SKILL_RETRY_ATTEMPTS) {
+                const delay = SKILL_COMMAND_RETRY_MS * 2 ** retryAttempts++;
+                retry = setTimeout(() => {
+                    retry = undefined;
+                    if (token === skillCommandSeq && target === deps.agent())
+                        void refreshSkillCommands(true);
+                }, delay);
+                retry.unref?.();
+            }
+            // Partial reads cannot revoke callable handlers or replace descriptions.
+            // Keep the last-good registrations until an authoritative observation.
             return;
-        if (!observation.complete && retry === undefined) {
-            retry = setTimeout(() => { retry = undefined; void refreshSkillCommands(); }, SKILL_COMMAND_RETRY_MS);
         }
+        resetRetry();
         const wanted = new Map(observation.skills
             .filter(isUserInvocable)
             .filter(skill => parseCommandName(`/${skill.name}`)?.name === skill.name)
@@ -129,7 +158,12 @@ export function createSkillCatalog(ctx, deps) {
                             return { kind: 'error', text: t('skill-unavailable', { name }) };
                         if (!deps.owner.current() || invoker !== deps.agent())
                             return { kind: 'error', text: t('skill-unavailable', { name }) };
-                        invoker.followup(createUserMessage({ content: [{ type: 'text', text: renderSkillContent(skill) }], source: { kind: 'skill-invocation', name, form: 'instructions' } }));
+                        // No `skill` tool: deliver the gesture as the user's own line and
+                        // attach the rendered body. The channel's resident pre-step
+                        // 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);
                         return { kind: 'success' };
                     },
                 });
@@ -144,14 +178,12 @@ export function createSkillCatalog(ctx, deps) {
             }
         }
     };
-    let released = false;
     const release = () => {
         if (released)
             return;
         released = true;
-        if (retry !== undefined)
-            clearTimeout(retry);
-        retry = undefined;
+        skillCommandSeq += 1;
+        resetRetry();
         for (const entry of registrations.values())
             entry.dispose();
         registrations.clear();

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

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/channel.ts"],"names":[],"mappings":"AAUA,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AA0BxF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,KAAK,KAAK,EAAqE,MAAM,wBAAwB,CAAA;AAuCtH,OAAO,KAAK,EAAyE,YAAY,EAA8T,MAAM,oBAAoB,CAAA;AAgCzb,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAkBnD;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,OAAO,EACZ,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,oBAAoB,GAC5B,YAAY,CAUd;AAk3BD,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,YAAY,EAAE,cAAc,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACryB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/channel.ts"],"names":[],"mappings":"AAUA,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AA0BxF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,KAAK,KAAK,EAAqE,MAAM,wBAAwB,CAAA;AAwCtH,OAAO,KAAK,EAAyE,YAAY,EAA8T,MAAM,oBAAoB,CAAA;AAgCzb,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAkBnD;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,OAAO,EACZ,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,oBAAoB,GAC5B,YAAY,CAUd;AAs3BD,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,YAAY,EAAE,cAAc,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACryB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA"}

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

@@ -235,7 +235,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
     const { warning: contextWarning, resetContextWarning, checkContextWarning, trackPending, untrackPending } = bookkeeping;
     const composer = createComposerImages(ctx, owner, { generation: () => state.agentBindingGeneration });
     const inputDelivery = createInputDelivery(ctx, owner, binding, () => state, (...args) => notify(...args), trackPending, untrackPending, composer);
-    const { dispatchUserText, deliverUserText, withDecisionPending, clearStagedImages } = inputDelivery;
+    const { dispatchUserText, deliverUserText, retireAttachment, withDecisionPending, clearStagedImages } = inputDelivery;
     /**
      * The `tui/session-switch` decision event (pi's `session_before_switch`),
      * fired before `/new` or `/resume` replaces the live session (rewind has
@@ -475,7 +475,9 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         cwd: () => state.cwd,
         setCommands(commands) { state.commandList = commands; state.emit(); },
         commandDescriptions: name => commandTrees?.descriptions(name),
-        deliverUserText,
+        // Attached-context pass-through (T03 consumes the third parameter in the
+        // fallback branch): the skill catalog never loses the FIFO/decision fence.
+        deliverUserText: (text, placement, attach) => deliverUserText(text, placement, [], attach),
     });
     const skillViewOptions = skillCatalog.viewOptions;
     const skillRegistryFor = skillCatalog.registryFor;
@@ -649,6 +651,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         subagents: subagentProjection,
         agentView,
         messageObserver,
+        retireAttachment,
     });
     const bindAgent = bindingEvents.bind;
     const sessionAdoption = createSessionAdoption(state, {

package/lib/types/dsh-adapter/compat/liveSession.d.ts

@@ -47,9 +47,11 @@ export interface LiveSessionSeedMetadata {
  * Create-time seed ownership fields. Every copied source prefix is inherited
  * state for domain projections, even when `/fork` deliberately omits
  * `parentSession` so the copy is presented as an independent root. The exact
- * cut prevents schedule/inbox/subagent projections from replaying copied
- * history as child-owned events. A child snapshot length cannot reliably be
- * used as that cut because construction may append `session/end-seed`.
+ * cut distinguishes copied history from child-owned events. Not every
+ * projection skips inherited events: newer inbox folds restore pending input
+ * from them, so rewind must cancel that work through the child's Inbox API.
+ * A child snapshot length cannot reliably be used as the cut because
+ * construction may append `session/end-seed`.
  */
 export declare function liveSessionSeedMetadata(session: unknown, inheritedCount: number): LiveSessionSeedMetadata;
 /** Close an open turn with the `turn/end` shape a real user cancellation writes. */

package/lib/types/dsh-adapter/compat/liveSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liveSession.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/liveSession.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAoChF;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,YAAY,EAAE,CAWnF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAI1D;AAMD;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAQlF;AAED,iFAAiF;AACjF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG;IAC1D,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CACxC,CAcA;AASD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CA4BxF;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;QAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAC5B,CAAA;IACD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CACtC;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,GACrB,uBAAuB,CAQzB;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CASjF;AAED,qFAAqF;AACrF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAoBtE;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAC7B,QAAQ,CAAC,IAAI,EAAE,SAAS,YAAY,EAAE,CAAA;IACtC,4EAA4E;IAC5E,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,CAAA;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAA;IACzD,QAAQ,CAAC,KAAK,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAA;CAC7C;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,wBAAwB,GAAG,kBAAkB,CAiB9F"}
+{"version":3,"file":"liveSession.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/liveSession.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAoChF;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,YAAY,EAAE,CAWnF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAI1D;AAMD;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAQlF;AAED,iFAAiF;AACjF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG;IAC1D,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CACxC,CAcA;AASD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CA4BxF;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;QAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAC5B,CAAA;IACD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CACtC;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,GACrB,uBAAuB,CAQzB;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CASjF;AAED,qFAAqF;AACrF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAoBtE;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAC7B,QAAQ,CAAC,IAAI,EAAE,SAAS,YAAY,EAAE,CAAA;IACtC,4EAA4E;IAC5E,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,CAAA;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAA;IACzD,QAAQ,CAAC,KAAK,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAA;CAC7C;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,wBAAwB,GAAG,kBAAkB,CAiB9F"}

package/lib/types/dsh-adapter/compat/liveSession.js

@@ -148,9 +148,11 @@ export function sliceLiveSessionSeed(session, boundary) {
  * Create-time seed ownership fields. Every copied source prefix is inherited
  * state for domain projections, even when `/fork` deliberately omits
  * `parentSession` so the copy is presented as an independent root. The exact
- * cut prevents schedule/inbox/subagent projections from replaying copied
- * history as child-owned events. A child snapshot length cannot reliably be
- * used as that cut because construction may append `session/end-seed`.
+ * cut distinguishes copied history from child-owned events. Not every
+ * projection skips inherited events: newer inbox folds restore pending input
+ * from them, so rewind must cancel that work through the child's Inbox API.
+ * A child snapshot length cannot reliably be used as the cut because
+ * construction may append `session/end-seed`.
  */
 export function liveSessionSeedMetadata(session, inheritedCount) {
     if (usesIsSeeded(session)) {

package/lib/types/dsh-adapter/sessions/digest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"digest.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/digest.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE3E,6EAA6E;AAC7E,eAAO,MAAM,iBAAiB,QAAY,CAAA;AAC1C,+EAA+E;AAC/E,eAAO,MAAM,eAAe,MAAM,CAAA;AAClC,+EAA+E;AAC/E,eAAO,MAAM,iBAAiB,QAAa,CAAA;AAqG3C;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CA+CtE;AAID,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;IACxC,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAC7B;AA2GD,sEAAsE;AACtE,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAgCjE;AAyCD;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAS/B;AAED,iFAAiF;AACjF,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiB7B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,CAyB1E"}
+{"version":3,"file":"digest.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/digest.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE3E,6EAA6E;AAC7E,eAAO,MAAM,iBAAiB,QAAY,CAAA;AAC1C,+EAA+E;AAC/E,eAAO,MAAM,eAAe,MAAM,CAAA;AAClC,+EAA+E;AAC/E,eAAO,MAAM,iBAAiB,QAAa,CAAA;AAwG3C;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAyDtE;AAID,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;IACxC,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAC7B;AA2GD,sEAAsE;AACtE,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAgCjE;AA8CD;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAS/B;AAED,iFAAiF;AACjF,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiB7B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,CAyB1E"}