@deepseek-harness-tui/dsh-tui 0.11.1 → 0.11.2

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

@@ -2,7 +2,7 @@ import type { Agent } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import type { ChannelOwner } from './owner.js';
 import type { ChannelState } from './types.js';
-type CompactionState = Pick<ChannelState, 'agentId' | 'cwd' | 'working'>;
+type CompactionState = Pick<ChannelState, 'agentId' | 'cwd' | 'working' | 'compaction' | 'emit'>;
 type Notify = ChannelState['notify'];
 /** Owns the one manual compaction transaction that must settle before a switch. */
 export declare function createManualCompaction(ctx: Context, state: CompactionState, deps: {
@@ -13,6 +13,7 @@ export declare function createManualCompaction(ctx: Context, state: CompactionSt
 }): {
     compact: () => void;
     settle: () => Promise<void>;
+    cancel: () => void;
 };
 export {};
 //# sourceMappingURL=compaction.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAIlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAO9C,KAAK,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC,CAAA;AACxE,KAAK,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;AAEpC,mFAAmF;AACnF,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC,CAAA;IACvD,KAAK,IAAI,KAAK,CAAA;IACd,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACrE,MAAM,EAAE,MAAM,CAAA;CACf;mBAuBmB,IAAI;kBAlBC,OAAO,CAAC,IAAI,CAAC;EAuGvC"}
+{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAIlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAO9C,KAAK,eAAe,GAAG,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,YAAY,GAAG,MAAM,CAAC,CAAA;AAChG,KAAK,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;AAEpC,mFAAmF;AACnF,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC,CAAA;IACvD,KAAK,IAAI,KAAK,CAAA;IACd,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACrE,MAAM,EAAE,MAAM,CAAA;CACf;mBA0BmB,IAAI;kBAlBC,OAAO,CAAC,IAAI,CAAC;kBA4HnB,IAAI;EAQxB"}

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

@@ -5,6 +5,9 @@ import { serviceForAgent } from '../presets.js';
 export function createManualCompaction(ctx, state, deps) {
     let active;
     const cancelled = new WeakSet();
+    /** Aborts the user asked for (Esc / Ctrl+C) rather than an ownership change:
+     *  only those are reported as a cancellation instead of a failure. */
+    const userCancelled = new WeakSet();
     const settle = async () => {
         const transaction = active;
         if (transaction === undefined)
@@ -71,7 +74,17 @@ export function createManualCompaction(ctx, state, deps) {
                     deps.notify(t('compact-while-working'), { color: 'warning' });
                     return;
                 }
-                deps.notify(t('compact-working'));
+                // The status row replaces the old 4s toast: a real compaction runs for
+                // tens of seconds (measured: median ~25s, p90 ~70s), and the toast was
+                // gone for all but the first four of them.
+                const row = {
+                    startedAt: Date.now(),
+                    phase: 'prefill',
+                    outputChars: 0,
+                    cancellable: true,
+                };
+                state.compaction = row;
+                state.emit();
                 try {
                     // Compact the entry agent, never a later binding read after await.
                     const result = await compactService.compactNow(originAgent, controller.signal);
@@ -80,6 +93,11 @@ export function createManualCompaction(ctx, state, deps) {
                     deps.notify(result ? t('compact-done') : t('compact-nothing'));
                 }
                 catch (error) {
+                    if (userCancelled.has(controller)) {
+                        if (isCurrent())
+                            deps.notify(t('compact-cancelled'));
+                        return;
+                    }
                     if (!isCurrent() || cancelled.has(controller))
                         return;
                     if (error.code === 'persistence') {
@@ -99,6 +117,13 @@ export function createManualCompaction(ctx, state, deps) {
             finally {
                 finished = true;
                 releaseOwner();
+                // The durable `compaction/end` event already cleared the row on every
+                // path that reached the host; this covers the ones that never did
+                // (vetoed decision, unavailable service, a throw before the bracket).
+                if (state.compaction?.cancellable === true) {
+                    state.compaction = undefined;
+                    state.emit();
+                }
                 const currentTransaction = active;
                 if (currentTransaction?.controller === controller)
                     active = undefined;
@@ -110,5 +135,13 @@ export function createManualCompaction(ctx, state, deps) {
         if (!finished)
             active = { controller, settled };
     };
-    return { compact, settle };
+    /** Abort the in-flight manual compaction the user asked to stop. */
+    const cancel = () => {
+        const transaction = active;
+        if (transaction === undefined)
+            return;
+        userCancelled.add(transaction.controller);
+        transaction.controller.abort(new Error('user cancelled compaction'));
+    };
+    return { compact, settle, cancel };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"local-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/local-actions.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAC7E,OAAO,EAA+B,KAAK,QAAQ,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEjE,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,GAAG,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IACnC,KAAK,EAAE;QAAE,OAAO,IAAI,OAAO,CAAA;KAAE,CAAA;IAC7B,OAAO,EAAE;QACP,OAAO,IAAI,OAAO,CAAA;QAClB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;QACpC,QAAQ,CAAC,KAAK,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;SAAE,CAAA;KACvE,CAAA;IACD,KAAK,EAAE,YAAY,CAAA;IACnB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,SAAS,EAAE;QAAE,KAAK,IAAI,IAAI,CAAC;QAAC,eAAe,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;QAAC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAA;IAClJ,SAAS,EAAE;QAAE,QAAQ,IAAI,IAAI,CAAA;KAAE,CAAA;IAC/B,IAAI,EAAE;QAAE,QAAQ,IAAI,IAAI,CAAA;KAAE,CAAA;IAC1B,QAAQ,EAAE,OAAO,QAAQ,CAAA;IACzB,SAAS,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAA;KAAE,CAAA;IACrJ,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;iBAIgB,MAAM;aAKV,IAAI;qBAYI,MAAM,SAAS,SAAS,MAAM,EAAE,GAAG,IAAI;4BAKhC,MAAM,GAAG,OAAO;qBAajB,OAAO,CAAC,MAAM,EAAE,CAAC;6BAmBT,MAAM,oBAAoB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;EAqBnF"}
+{"version":3,"file":"local-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/local-actions.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAC7E,OAAO,EAA+B,KAAK,QAAQ,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEjE,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,GAAG,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IACnC,KAAK,EAAE;QAAE,OAAO,IAAI,OAAO,CAAA;KAAE,CAAA;IAC7B,OAAO,EAAE;QACP,OAAO,IAAI,OAAO,CAAA;QAClB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;QACpC,QAAQ,CAAC,KAAK,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;SAAE,CAAA;KACvE,CAAA;IACD,KAAK,EAAE,YAAY,CAAA;IACnB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,SAAS,EAAE;QAAE,KAAK,IAAI,IAAI,CAAC;QAAC,eAAe,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;QAAC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAA;IAClJ,SAAS,EAAE;QAAE,QAAQ,IAAI,IAAI,CAAA;KAAE,CAAA;IAC/B,IAAI,EAAE;QAAE,QAAQ,IAAI,IAAI,CAAA;KAAE,CAAA;IAC1B,QAAQ,EAAE,OAAO,QAAQ,CAAA;IACzB,SAAS,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAA;KAAE,CAAA;IACrJ,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;iBAIgB,MAAM;aAKV,IAAI;qBAYI,MAAM,SAAS,SAAS,MAAM,EAAE,GAAG,IAAI;4BAKhC,MAAM,GAAG,OAAO;qBAajB,OAAO,CAAC,MAAM,EAAE,CAAC;6BAwBT,MAAM,oBAAoB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;EAqBnF"}

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

@@ -70,7 +70,12 @@ export function createLocalActions(deps) {
                     return [t('subagent-none')];
                 return children.map(child => {
                     const id = typeof child.id === 'string' ? child.id : (child.id.value ?? '');
-                    return t('subagent-row', { mode: child.mode === 'continuable' ? t('subagent-resumable') : t('subagent-oneshot'), label: child.label ? `「${child.label}」` : '', activity: child.activity === 'running' ? t('subagent-running') : t('subagent-archived'), id: id.slice(0, 8) });
+                    // The host's non-running activity is not proof that a child was
+                    // archived: continuable children can be idle or temporarily unknown.
+                    // Prefer the live projection when this process still owns the run.
+                    const running = state.subagents.some(sub => sub.agentId === id && sub.status === 'running');
+                    const activity = running || child.activity === 'running' ? t('subagent-running') : t('subagent-unknown');
+                    return t('subagent-row', { mode: child.mode === 'continuable' ? t('subagent-resumable') : t('subagent-oneshot'), label: child.label ? `「${child.label}」` : '', activity, id: id.slice(0, 8) });
                 });
             }
             catch (error) {

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

@@ -1 +1 @@
-{"version":3,"file":"model-switch.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-switch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAQvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,EACjF,KAAK,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,aAAa,GAAG,UAAU,GAAG,OAAO,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,GAAG,MAAM,CAAC,CAAA;AAEhK,uHAAuH;AACvH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IAC3F,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,cAAc,IAAI,IAAI,CAAA;IACtB,cAAc,IAAI,IAAI,CAAA;IACtB,SAAS,IAAI,IAAI,CAAA;IACjB,MAAM,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,IAAI,CAAA;IAC7C,YAAY,IAAI,IAAI,CAAA;IACpB,SAAS,IAAI,IAAI,CAAA;IACjB,eAAe,IAAI,IAAI,CAAA;IACvB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,iBAAiB,IAAI,IAAI,CAAA;IACzB,mBAAmB,IAAI,IAAI,CAAA;IAC3B,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B,IAEa,UAAU,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC,CA4EjE"}
+{"version":3,"file":"model-switch.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-switch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAQvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,EACjF,KAAK,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,aAAa,GAAG,UAAU,GAAG,OAAO,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,GAAG,MAAM,CAAC,CAAA;AAEhK,uHAAuH;AACvH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IAC3F,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,cAAc,IAAI,IAAI,CAAA;IACtB,cAAc,IAAI,IAAI,CAAA;IACtB,SAAS,IAAI,IAAI,CAAA;IACjB,MAAM,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,IAAI,CAAA;IAC7C,YAAY,IAAI,IAAI,CAAA;IACpB,SAAS,IAAI,IAAI,CAAA;IACjB,eAAe,IAAI,IAAI,CAAA;IACvB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,iBAAiB,IAAI,IAAI,CAAA;IACzB,mBAAmB,IAAI,IAAI,CAAA;IAC3B,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B,IAEa,UAAU,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC,CA+EjE"}

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

@@ -8,6 +8,7 @@ import { composePreset, runningPresetOf } from '../presets.js';
 import { reserveNewSession } from '../../sessionMounts.js';
 import { attachSessionToWorkspace } from '../workspace.js';
 import { resetSessionProjection } from './session-reset.js';
+import { childRecordsLineage } from './session-lineage.js';
 /** Model-route adoption transaction. It settles compaction before its fork snapshot and owns the post-commit reset. */
 export function createModelSwitchAction(ctx, state, deps) {
     return async (provider, model) => {
@@ -48,7 +49,10 @@ export function createModelSwitchAction(ctx, state, deps) {
                 runtimeSession: deps.binding.agent.session,
                 inheritedCount: seed.length,
                 cwd: state.cwd,
-                parentSession: deps.binding.agent.session.id,
+                // A session nobody has typed into has no conversation to relate, and
+                // lineage would cost its first real prompt the generated title — the
+                // child stands as its own root instead (session-lineage.ts).
+                parentSession: childRecordsLineage(seed) ? deps.binding.agent.session.id : undefined,
                 agentPreset: composed.agentPreset,
                 agentOptions: { provider, model },
                 setup: composed.setup,

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

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/paths.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAEvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,8CAA8C;AAC9C,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED;4EAC4E;AAC5E,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAG3E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,GAAE,OAAsC,GACtD,OAAO,CAwBT;AAED,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAyBlK;AAED,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,gBAAgB,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAmD5I"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/paths.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAEvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,8CAA8C;AAC9C,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED;4EAC4E;AAC5E,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAG3E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,GAAE,OAAsC,GACtD,OAAO,CAwBT;AAED,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CA+BlK;AAED,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,gBAAgB,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAmD5I"}

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

@@ -59,9 +59,15 @@ export function sessionCwdMatches(stateCwd, headerCwd, caseInsensitive = process
 export async function listPathCandidates(fs, cwd, query, signal, topK) {
     const normalized = query.replaceAll('\\', '/');
     const slash = normalized.lastIndexOf('/');
+    // Keep the user's spelling for the completion result. The normalized form
+    // is only for resolution/ranking; writing it back turns Windows `\\` paths
+    // into `/` paths and makes completion mutate otherwise valid input.
+    const rawSlash = Math.max(query.lastIndexOf('/'), query.lastIndexOf('\\'));
     // `.` / `..` without a trailing separator are whole-directory queries too.
     const bareDir = slash < 0 && (normalized === '.' || normalized === '..' || normalized === '~');
     const directoryPart = slash < 0 ? (bareDir ? `${normalized}/` : '') : normalized.slice(0, slash + 1);
+    const displayDirectoryPart = rawSlash < 0 ? (bareDir ? `${query}/` : '') : query.slice(0, rawSlash + 1);
+    const displaySeparator = displayDirectoryPart.endsWith('\\') ? '\\' : '/';
     const nameQuery = slash < 0 || bareDir ? '' : normalized.slice(slash + 1);
     // `~/` expands against the host home (matches the cwd resolution rules);
     // drive-letter and POSIX-absolute prefixes pass through untouched.
@@ -76,7 +82,7 @@ export async function listPathCandidates(fs, cwd, query, signal, topK) {
         const target = await fs.resolve(expanded);
         const entries = (await fs.listDir(target)).slice().sort((a, b) => a.name.localeCompare(b.name));
         return rankFileCandidates(entries.filter(entry => entry.type === 'file' || entry.type === 'directory').map(entry => {
-            const path = `${directoryPart}${entry.name}${entry.type === 'directory' ? '/' : ''}`;
+            const path = `${displayDirectoryPart}${entry.name}${entry.type === 'directory' ? displaySeparator : ''}`;
             return { id: path, path, displayPath: path, name: entry.name, kind: entry.type, score: 0 };
         }), nameQuery, topK);
     }

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

@@ -1,3 +1,3 @@
 import type { ChannelState } from '../channel/types.js';
-export declare function createPreferences(getState: () => Pick<ChannelState, 'diffLayout' | 'thinkingFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'minimal' | 'emit'>): Pick<ChannelState, 'setDiffLayout' | 'setThinkingFold' | 'setToolBackground' | 'setScrollGutter' | 'setPageMargin' | 'setFoldTerminalCommand' | 'setPromptSessionLabel' | 'setExpandEditor' | 'setSmoothStreaming' | 'setStatusBar' | 'setWhale' | 'setWhaleIdle' | 'setMinimal'>;
+export declare function createPreferences(getState: () => Pick<ChannelState, 'diffLayout' | 'thinkingFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'whaleGirl' | 'splashFont' | 'minimal' | 'emit'>): Pick<ChannelState, 'setDiffLayout' | 'setThinkingFold' | 'setToolBackground' | 'setScrollGutter' | 'setPageMargin' | 'setFoldTerminalCommand' | 'setPromptSessionLabel' | 'setExpandEditor' | 'setSmoothStreaming' | 'setStatusBar' | 'setWhale' | 'setWhaleIdle' | 'setWhaleGirl' | 'setSplashFont' | 'setMinimal'>;
 //# sourceMappingURL=preferences.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"preferences.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/preferences.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,YAAY,EAAE,YAAY,GAAG,cAAc,GAAG,gBAAgB,GAAG,cAAc,GAAG,YAAY,GAAG,qBAAqB,GAAG,oBAAoB,GAAG,cAAc,GAAG,iBAAiB,GAAG,WAAW,GAAG,OAAO,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,eAAe,GAAG,iBAAiB,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,eAAe,GAAG,wBAAwB,GAAG,uBAAuB,GAAG,iBAAiB,GAAG,oBAAoB,GAAG,cAAc,GAAG,UAAU,GAAG,cAAc,GAAG,YAAY,CAAC,CAsGxjB"}
+{"version":3,"file":"preferences.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/preferences.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,YAAY,EAAE,YAAY,GAAG,cAAc,GAAG,gBAAgB,GAAG,cAAc,GAAG,YAAY,GAAG,qBAAqB,GAAG,oBAAoB,GAAG,cAAc,GAAG,iBAAiB,GAAG,WAAW,GAAG,OAAO,GAAG,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,SAAS,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,eAAe,GAAG,iBAAiB,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,eAAe,GAAG,wBAAwB,GAAG,uBAAuB,GAAG,iBAAiB,GAAG,oBAAoB,GAAG,cAAc,GAAG,UAAU,GAAG,cAAc,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,CAAC,CAqHxnB"}

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

@@ -1,4 +1,5 @@
 import { setMinimalMode } from '../../minimalMode.js';
+import { normalizeSplashFont } from '../../components/splashFonts.js';
 import { normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground } from '../../tuiDisplayPrefs.js';
 export function createPreferences(getState) {
     return {
@@ -91,6 +92,21 @@ export function createPreferences(getState) {
             state.whaleIdle = enabled;
             state.emit();
         },
+        setSplashFont(setting) {
+            const state = getState();
+            const normalized = normalizeSplashFont(setting);
+            if (normalized === state.splashFont)
+                return;
+            state.splashFont = normalized;
+            state.emit();
+        },
+        setWhaleGirl(enabled) {
+            const state = getState();
+            if (enabled === state.whaleGirl)
+                return;
+            state.whaleGirl = enabled;
+            state.emit();
+        },
         setMinimal(enabled) {
             const state = getState();
             setMinimalMode(enabled);

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

@@ -6,14 +6,13 @@ import type { SelectionAttachment } from '../../adapter/ports/channel-view.js';
 import type { InputConvergence } from './input-actions.js';
 import type { BackgroundJobStore } from '../jobs.js';
 import type { TuiRendererHost } from '../renderers.js';
-type ProjectionState = Pick<ChannelState, 'rows' | 'thinkingFold' | 'activeToolCount' | 'spinnerMode' | 'goal' | 'contextSegments' | 'tokens' | 'lastUsage' | 'lastUserText' | 'responseChars' | 'tps' | 'cancelPending' | 'working' | 'turnStart' | 'tpsSamples' | 'contextWindow' | 'reasoningEffort' | 'sessionTitle' | 'todos' | 'agentPreset' | 'sessionColor' | 'status' | 'emit'>;
+type ProjectionState = Pick<ChannelState, 'rows' | 'thinkingFold' | 'activeToolCount' | 'spinnerMode' | 'goal' | 'contextSegments' | 'tokens' | 'mainCost' | 'model' | 'lastUsage' | 'lastUserText' | 'responseChars' | 'tps' | 'cancelPending' | 'working' | 'compaction' | 'turnStart' | 'tpsSamples' | 'contextWindow' | 'reasoningEffort' | 'sessionTitle' | 'todos' | 'agentPreset' | 'sessionColor' | 'status' | 'emit'>;
 interface ProjectionDependencies {
     agent(): Agent;
     rowIds: {
         value: number;
     };
     resetContextWarning(): void;
-    pendingTaskDescriptions: string[];
     jobs: Pick<BackgroundJobStore, 'onOutputSeen' | 'onStarted'>;
     inputConvergence: Pick<InputConvergence, 'cancelInFlight'>;
     checkContextWarning(): void;

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

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

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

@@ -4,12 +4,13 @@ import { ARGS_PREVIEW_LIMIT, harnessToolResultView, LOCAL_OUTPUT_LIMIT, prepareR
 import { estimateTokens, isTokenDelta, tokenDeltaChars, usageOutputTokens } from './usage.js';
 import { transcriptImagesOf } from '../transcript-images.js';
 import { isCompactionCheckpointSource, toolResultPayload } from '../compat/messages.js';
-import { isPeakHour } from '../../deepseekPricing.js';
+import { addUsageToCostBuckets, emptyCostBuckets, isPeakHour } from '../../deepseekPricing.js';
 import { t } from '../../i18n.js';
 import { logForDebugging } from '../../utils/debug.js';
 import { cleanRenderText } from '../sanitize.js';
 import { NOTICE_CELLS } from './decisions.js';
 import { markChannelReadDirty } from '../../adapter/channel/read-view.js';
+import { buildQuestionRecord, parseQuestionRecordAnswers, parseQuestionRecordQuestions, } from './question-record.js';
 /** One authoritative reducer for both durable replay and live session events. */
 export function createChannelProjection(state, deps) {
     /** The in-progress assistant text row; `undefined` when no step is streaming. */
@@ -34,6 +35,15 @@ export function createChannelProjection(state, deps) {
     let tpsStep;
     /** Tool cards by callId, so tool/result can settle the running card. */
     const toolCards = new Map();
+    /**
+     * `ask_user_question` calls by callId, holding their raw arguments. The ask
+     * renders as the interactive panel rather than a tool card, so its result
+     * has no card to settle — but the answered record is still a transcript
+     * fact and must come from the durable log (issue #1009), never from the
+     * view. Remembering the call lets `tool/result` derive that record on the
+     * live stream AND on every replay (`/resume`, rewind, model switch).
+     */
+    const askCalls = new Map();
     /**
      * Session events are delivered live and can also be replayed around a
      * reconnect. A repeated sealed message must not create a second assistant
@@ -46,6 +56,11 @@ export function createChannelProjection(state, deps) {
     let openStep;
     let activeAttempt;
     let lastStreamRevision = -1;
+    /** 最近一次 request/header 的模型：durable usage 的模型归属真源。replay
+     *  会按历史请求逐个还原，因此 /model 切换（reset + replay 整个 seed）
+     *  不会把换模型前的用量重估到新模型；旧日志没有 header 时回退
+     *  事件发生时的 state.model（AC-A4）。 */
+    let eventModel;
     const assistantRowsByStep = new Map();
     const lastTextDelta = new Map();
     const stepKey = (turn, step) => `${turn}:${step}`;
@@ -268,6 +283,40 @@ export function createChannelProjection(state, deps) {
         if (folded > 0)
             logForDebugging(`thinking: folded ${folded} reasoning row(s) at turn settle`);
     };
+    /**
+     * Project one answered `ask_user_question` result into the transcript.
+     *
+     * The row shape reuses what `pushLocal` emits (`local` title + one
+     * `local-output` per line), so rendering, preview clipping and the local
+     * rows' fold exemption all keep their existing behavior. A failed ask
+     * renders the log's own error text — never a fabricated answer (the ask
+     * was cancelled/aborted, so no human ever chose anything).
+     */
+    const projectAskResult = (event, rawArguments) => {
+        const append = (record) => {
+            appendRow({ id: deps.rowIds.value, kind: 'local', text: record.title, seq: event.seq });
+            deps.rowIds.value += 1;
+            for (const line of record.lines) {
+                appendRow({
+                    id: deps.rowIds.value,
+                    kind: 'local-output',
+                    text: preview(line, LOCAL_OUTPUT_LIMIT),
+                    seq: event.seq,
+                });
+                deps.rowIds.value += 1;
+            }
+        };
+        if (event.data.error !== undefined || toolResultPayload(event.data.message).isError) {
+            const errorText = toolErrorText(event);
+            append({ title: errorText, lines: [] });
+            return;
+        }
+        const answers = parseQuestionRecordAnswers(textOf(toolResultPayload(event.data.message).content));
+        // No parseable answers (unparseable durable payload, or an older host):
+        // `answers: []` still yields the title, so the transcript shows that a
+        // questionnaire happened instead of dropping the fact silently.
+        append(buildQuestionRecord(parseQuestionRecordQuestions(rawArguments), answers ?? []));
+    };
     /** Recompute the spinner phase from live row/tool state. */
     const updateSpinnerMode = () => {
         if (state.activeToolCount > 0) {
@@ -332,6 +381,7 @@ export function createChannelProjection(state, deps) {
         openStep = undefined;
         activeAttempt = undefined;
         lastStreamRevision = -1;
+        eventModel = undefined;
         assistantRowsByStep.clear();
         lastTextDelta.clear();
         replaying = true;
@@ -438,7 +488,7 @@ export function createChannelProjection(state, deps) {
                 // than disappearing with the other injected context.
                 if (isCompactionCheckpointSource(event.data.source)) {
                     const summary = textOf(event.data.content);
-                    appendRow({ id: deps.rowIds.value, kind: 'notice', text: 'Session summary is ready' });
+                    appendRow({ id: deps.rowIds.value, kind: 'notice', text: t('compact-done') });
                     deps.rowIds.value += 1;
                     if (summary) {
                         appendRow({ id: deps.rowIds.value, kind: 'compact', text: summary });
@@ -646,8 +696,9 @@ export function createChannelProjection(state, deps) {
                     // replays historical events, so a resumed session prices each
                     // request at the rate window it actually ran in — the session cost
                     // estimate never prices the whole session at the current window).
+                    const peak = isPeakHour(new Date(event.time));
                     {
-                        const bucket = isPeakHour(new Date(event.time))
+                        const bucket = peak
                             ? state.tokens.peak
                             : state.tokens.idle;
                         bucket.input += usage.inputTokens ?? 0;
@@ -655,6 +706,24 @@ export function createChannelProjection(state, deps) {
                         bucket.cacheRead += usage.cacheReadTokens ?? 0;
                         bucket.cacheWrite += usage.cacheWriteTokens ?? 0;
                     }
+                    // 主会话费用分桶（DESIGN D2）：与 tokens 同口径，但按事件发生时
+                    // 的模型归属——replay 用 request/header 还原历史请求模型，旧日志
+                    // 回退 channel 模型；换模型不会把历史 token 重估到新模型。
+                    const costInput = usage.inputTokens ?? 0;
+                    const costOutput = usage.outputTokens ?? 0;
+                    const costCacheRead = usage.cacheReadTokens ?? 0;
+                    const costCacheWrite = usage.cacheWriteTokens ?? 0;
+                    if (costInput !== 0 || costOutput !== 0 || costCacheRead !== 0 || costCacheWrite !== 0) {
+                        const model = eventModel ?? state.model;
+                        const cost = state.mainCost[model] ?? emptyCostBuckets();
+                        addUsageToCostBuckets(cost, {
+                            input: costInput,
+                            output: costOutput,
+                            cacheRead: costCacheRead,
+                            cacheWrite: costCacheWrite,
+                        }, peak);
+                        state.mainCost[model] = cost;
+                    }
                     // The most recent request's usage describes the CURRENT context:
                     // input (uncached) + cache hits all occupy the window. Cache hits
                     // also drive the status-line `cache N` readout.
@@ -707,25 +776,21 @@ export function createChannelProjection(state, deps) {
                 // The ask-user-question tool renders as the interactive questionnaire
                 // panel (DSH user-interaction seam), not as a tool card: the model is
                 // parked waiting for the human, so no running card, no active-tool
-                // spinner, no args noise in the transcript. The Q&A summary is pushed
-                // by the TUI once the batch is answered; tool/result for a call with
-                // no card is a no-op below.
-                if (event.data.name === 'ask_user_question')
+                // spinner, no args noise in the transcript. Only the ARGUMENTS are
+                // remembered: the paired tool/result below projects the answered
+                // record from them (issue #1009), so `/resume`, rewind and replay
+                // rebuild it from the persisted log like every other transcript row.
+                if (event.data.name === 'ask_user_question') {
+                    askCalls.set(event.data.callId, event.data.arguments);
                     break;
+                }
                 // The Task tool's plain card is replaced by the live subagent card
                 // (Kimi Code semantics): the delegation itself renders as a subagent
                 // row, so the raw args/result card would only duplicate it. The call
                 // still runs - only its transcript rendering is suppressed.
                 if (isSubagentToolName(event.data.name)) {
-                    try {
-                        const args = JSON.parse(event.data.arguments);
-                        if (typeof args.description === 'string' && args.description)
-                            deps.pendingTaskDescriptions.push(args.description);
-                    }
-                    catch {
-                        // Unparseable args leave the queue untouched; the card falls back
-                        // to the provider label.
-                    }
+                    // The parent-scoped subagent reducer owns pending descriptions,
+                    // including delegations made while this transcript is parked.
                     break;
                 }
                 // Reasoning that led to a tool call is done thinking — fold the
@@ -759,7 +824,19 @@ export function createChannelProjection(state, deps) {
                 break;
             }
             case 'tool/result': {
-                const card = toolCards.get(event.data.message.source.callId);
+                const callId = event.data.message.source.callId;
+                const card = toolCards.get(callId);
+                const askArguments = askCalls.get(callId);
+                // A call with no card is usually an ask_user_question (above) — its
+                // interaction lives in the panel, but its OUTCOME still belongs in
+                // the transcript. Project it from the durable log here: consumed
+                // before the card branch so the two can never both fire, and deleted
+                // so a repeated replay of the same result cannot double the record.
+                if (card === undefined && askArguments !== undefined) {
+                    projectAskResult(event, askArguments);
+                    askCalls.delete(callId);
+                    break;
+                }
                 if (card !== undefined && card.tool !== undefined) {
                     const images = transcriptImages(event.data.message.content);
                     card.images = images.length === 0 ? undefined : images;
@@ -924,6 +1001,12 @@ export function createChannelProjection(state, deps) {
                 if (typeof effort === 'string') {
                     state.reasoningEffort = effort;
                 }
+                // 模型归属真源：该请求的 usage 按这里的 model 计价（replay 时逐请求
+                // 还原；live 时与 state.model 同步更新，AC-A4）。header 缺/空 model
+                // 必须清掉上一条 header 的值——否则后续 usage 会沿用旧模型进错桶；
+                // 归属时再回退 state.model（旧日志没有 header 的既有语义）。
+                const headerModel = event.data.header.config?.model;
+                eventModel = typeof headerModel === 'string' && headerModel !== '' ? headerModel : undefined;
                 const legacySystem = event.data.header.system;
                 if (typeof legacySystem === 'string') {
                     state.contextSegments.system = estimateTokens(legacySystem);
@@ -982,6 +1065,31 @@ export function createChannelProjection(state, deps) {
                     state.sessionColor = typeof data.color === 'string' ? data.color : '';
                     break;
                 }
+                // The compaction bracket is a plugin-appended event pair (not part of
+                // dsh-session's typed map). Opening it here rather than in the manual
+                // path is what makes an AUTOMATIC pressure compaction visible too: the
+                // host writes `compaction/start` before the summarizer runs and
+                // `compaction/end` once the checkpoint is committed or abandoned.
+                // A manual request already installed its own cancellable row, so this
+                // only fills the gap for one this process did not start.
+                if (event.type === 'compaction/start') {
+                    // Replay is settled history, and a process killed between start and
+                    // end leaves an unmatched start in the log: painting a row for it
+                    // would show a compaction that nothing will ever clear.
+                    if (!replaying && state.compaction === undefined) {
+                        state.compaction = {
+                            startedAt: typeof event.time === 'number' ? event.time : Date.now(),
+                            phase: 'prefill',
+                            outputChars: 0,
+                            cancellable: false,
+                        };
+                    }
+                    break;
+                }
+                if (event.type === 'compaction/end') {
+                    state.compaction = undefined;
+                    break;
+                }
                 // Custom plugin events (tuiRenderers seam): a registered renderer
                 // maps the payload to text rows — title as a local row, body as
                 // preview-clipped local-output rows, same shape pushLocal uses.
@@ -1014,11 +1122,13 @@ export function createChannelProjection(state, deps) {
         sealedReasoning.length = 0;
         lastReasoningRow = undefined;
         toolCards.clear();
+        askCalls.clear();
         handledAssistantMessages.clear();
         handledAssistantChunks.clear();
         openStep = undefined;
         activeAttempt = undefined;
         lastStreamRevision = -1;
+        eventModel = undefined;
         assistantRowsByStep.clear();
         lastTextDelta.clear();
         tpsTurn = undefined;

package/lib/types/dsh-adapter/channel/question-record.d.ts

@@ -0,0 +1,76 @@
+/**
+ * Answered-questionnaire transcript record — a PURE fold of the durable
+ * session log (issue #1009).
+ *
+ * `ask_user_question` renders as the interactive panel, not as a tool card,
+ * so its `tool/result` had no renderer at all: the answers lived only in the
+ * current process's view rows (the TUI used to push a summary when the panel
+ * closed). That violated the transcript's source-of-truth rule — `/resume`,
+ * rewind, `loadOlder` and any replay lost the record, and an ask that was
+ * never observed closing produced none at all.
+ *
+ * The record now derives from the same log every other transcript row comes
+ * from: the `tool/call` arguments carry the questions, the `tool/result`
+ * payload carries the answers. Both are parsed at the caller's edge here, so
+ * this module stays pure (no store, no i18n state, no projection imports) and
+ * is directly testable.
+ */
+/**
+ * The parts of a question this fold needs. Structurally compatible with the
+ * harness's `AskUserQuestionItem`, so `src/dsh-adapter/` callers pass the
+ * official type straight through while this module keeps its own shape.
+ */
+export interface QuestionRecordQuestion {
+    readonly question: string;
+}
+/**
+ * One answer as the harness persists it (a subset of
+ * `AskUserQuestionAnswerItem`: the fold matches answers to questions BY ORDER,
+ * mirroring how the panel collects one answer per question).
+ */
+export interface QuestionRecordAnswer {
+    readonly selected: readonly string[];
+    readonly custom?: string;
+}
+/** One answered questionnaire as the transcript renders it. */
+export interface QuestionRecord {
+    /** Local-row title (dictionary text, never hand-written here). */
+    readonly title: string;
+    /** One `· question → answer` line per answered question. */
+    readonly lines: readonly string[];
+}
+/**
+ * Fold one answered questionnaire into its transcript record.
+ *
+ * Tolerant by contract: the projection calls this on durable replay data it
+ * does not control (truncated logs, older hosts, a wizard-shaped caller), and
+ * a throw inside `renderEvent` would abort the whole transcript fold. So a
+ * missing/garbled question list or answer item degrades to a shorter line
+ * instead of raising.
+ *
+ * @param questions - The ask's questions, in the order they were answered.
+ * @param answers - The answers the log recorded for that same ask.
+ * @param options - `redact` masks answer text (local wizards collecting
+ *   secrets such as API keys must never leak into the transcript or an
+ *   `/export` dump); the model-side ask never sets it.
+ * @returns The title line plus its `· question → choice` body lines.
+ */
+export declare function buildQuestionRecord(questions: readonly (QuestionRecordQuestion | undefined)[] | undefined, answers: readonly (QuestionRecordAnswer | undefined)[] | undefined, options?: {
+    redact?: boolean;
+}): QuestionRecord;
+/**
+ * Parse the questions out of a persisted `ask_user_question` `tool/call`
+ * arguments string. Returns `undefined` when the payload is not the
+ * `{ questions: [...] }` object the tool declares, so the caller can fall
+ * back to a title-only record.
+ */
+export declare function parseQuestionRecordQuestions(rawArguments: string | undefined): QuestionRecordQuestion[] | undefined;
+/**
+ * Parse the answers out of a `tool/result` text payload. `dsh-tool-ask-user`
+ * renders its output as one JSON text block — the same bytes the model reads
+ * back — so the durable log is a sufficient source. A failed ask (or any
+ * non-JSON body) yields `undefined`: the caller then renders the log's own
+ * error text instead of fabricating an answer.
+ */
+export declare function parseQuestionRecordAnswers(rawResult: string): QuestionRecordAnswer[] | undefined;
+//# sourceMappingURL=question-record.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"question-record.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/question-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAC1B;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,4DAA4D;IAC5D,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAClC;AAQD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,CAAC,sBAAsB,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,EACtE,OAAO,EAAE,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,EAClE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7B,cAAc,CAyBhB;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,sBAAsB,EAAE,GAAG,SAAS,CAWnH;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,oBAAoB,EAAE,GAAG,SAAS,CAShG"}