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

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

@@ -10,6 +10,12 @@ import { attachIdeSelection } from './ide-selection.js';
 import { mentionAttachments, mentionFs } from './mentions.js';
 /** Input FIFO, staged attachments and decision notice timers share one lifetime. */
 export function createInputDelivery(ctx, owner, binding, state, notify, trackPending, untrackPending, composer, selection, rememberSelection, 
+/** The fs surface to use when the host mounts no `fs` service (a non-DSH
+ *  composition reads the local disk); absent = no fallback. */
+fallbackFs, 
+/** The in-memory image store of a session that takes images itself (the
+ *  `images` capability); absent / undefined = the DSH attachments service. */
+localImages, 
 /**
  * Take-and-clear the staged "Send to Chat" contexts for the submission being
  * enqueued (side-panel §6.7). Optional so a bare embedder/fixture that owns
@@ -23,6 +29,12 @@ consumeAttachedContexts) {
      * through this chain to keep the send order FIFO.
      */
     let inputChain = Promise.resolve();
+    /** Monotonic: inputs that entered the FIFO, and how many of them have
+     *  left it (delivered, dropped or failed). `/new` compares them. */
+    let dispatched = 0;
+    let settled = 0;
+    /** The texts still in the FIFO, oldest first (a switch names the parked one). */
+    const inFlight = [];
     /**
      * Attached-context registry (issue #842): `deliverUserText(..., attach)`
      * records the model-facing companion message under the DELIVERED user
@@ -76,27 +88,33 @@ consumeAttachedContexts) {
         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;
+    /** Stale fence: the submission belongs to the session it was typed in (the
+     *  bound session object plus the binding generation every adoption
+     *  advances; works for any backend, no DSH agent needed). */
+    const current = (origin) => owner.current() && binding.session === origin.session && state().agentBindingGeneration === origin.generation;
     /** D-6: bind the submission to the session it was typed in AT ENQUEUE
      *  TIME. The FIFO chain may park this task behind a slow predecessor
      *  while the user /new's away — capturing the agent at run time would
      *  adopt the NEW session as this text's origin and deliver the old
      *  conversation's words into it. */
-    const captureOrigin = () => ({
-        agent: binding.agent,
-        agentId: state().agentId,
-        generation: state().agentBindingGeneration,
-        cwd: state().cwd,
-        fs: mentionFs(ctx),
-        attachments: mentionAttachments(ctx),
-        stagedImages: composer.snapshot(),
-        selection: selection(),
-        // Consumed (not merely read): the snapshot and the clear are one step, so
-        // the chips leave with the submission that owns them and a second,
-        // faster-typed message can never re-attach the same context.
-        attachedContexts: consumeAttachedContexts?.() ?? [],
-    });
+    const captureOrigin = () => {
+        const local = localImages?.();
+        return {
+            session: binding.session,
+            agentId: state().agentId,
+            generation: state().agentBindingGeneration,
+            cwd: state().cwd,
+            fs: mentionFs(ctx) ?? fallbackFs?.(),
+            attachments: local ?? mentionAttachments(ctx),
+            ...(local === undefined ? {} : { localImages: local }),
+            stagedImages: composer.snapshot(),
+            selection: selection(),
+            // Consumed (not merely read): the snapshot and the clear are one step, so
+            // the chips leave with the submission that owns them and a second,
+            // faster-typed message can never re-attach the same context.
+            attachedContexts: consumeAttachedContexts?.() ?? [],
+        };
+    };
     /**
      * Expand the text's `@` mentions and deliver ONE user message: the typed
      * text stays the first content block (the transcript bubble renders it —
@@ -137,19 +155,27 @@ consumeAttachedContexts) {
         if (selectionAttached !== undefined)
             rememberSelection(message.id, selectionAttached);
         // 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.
+        // the submit so the pre-step listener can find it. A throwing submit
+        // 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.
+        // Track BEFORE the submit: a synchronous throw inside it rolls the
+        // preview back; otherwise the backend's pending changes retire it once
+        // the message is claimed or discarded.
         trackPending({ id: message.id, text, images }, placement);
         try {
-            if (placement === 'steer')
-                origin.agent.steer(message);
-            else
-                origin.agent.followup(message);
+            // The message id IS the clientMessageId every ledger above keys on; the
+            // DSH session delivers this exact message (steer/followup).
+            // A session that takes images itself reads them through their
+            // in-memory facades, in block order.
+            const local = origin.localImages;
+            const images = local === undefined ? undefined : expansion.blocks.flatMap(block => {
+                if (block.type !== 'image')
+                    return [];
+                const view = local.facade(block.attachment);
+                return view === undefined ? [] : [view];
+            });
+            await origin.session.submit({ text, blocks: message.content, clientMessageId: message.id, native: message, ...(images === undefined || images.length === 0 ? {} : { images }) }, placement);
         }
         catch (error) {
             if (attach !== undefined)
@@ -242,9 +268,9 @@ consumeAttachedContexts) {
      * words to the new session.
      */
     const runUserTextDecision = async (text, placement, images, origin, attach) => {
-        // Stale detection compares the AGENT REFERENCE, not the id: session ids
+        // Stale detection compares the SESSION 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
+        // fresh session), so an id check has an ABA hole. Both origin values are
         // ENQUEUE-time captures (see dispatchUserText): a decision parked behind
         // a slow predecessor must still be judged against the session its text
         // was typed in, not whichever session is live when it finally runs.
@@ -296,10 +322,15 @@ consumeAttachedContexts) {
     const dispatchUserText = (text, placement, images = [], attach) => {
         const origin = captureOrigin();
         const capturedImages = composer.captureDraftImages(text, images);
+        dispatched += 1;
+        inFlight.push(text);
         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);
+        }).finally(() => {
+            settled += 1;
+            inFlight.shift();
         });
     };
     /** Public companion for callers that own a line but not a draft (skill
@@ -318,6 +349,13 @@ consumeAttachedContexts) {
     };
     return {
         dispatchUserText,
+        /** Inputs dispatched so far, and whether any is still in the FIFO (a
+         *  parked decision, an `@` read, an IDE-selection read). */
+        activity: () => ({
+            dispatched,
+            unsettled: settled < dispatched,
+            ...(inFlight[0] === undefined ? {} : { parked: inFlight[0] }),
+        }),
         deliverUserText: deliverUserTextNow,
         claimAttachments,
         retireAttachment,

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

@@ -1,7 +1,11 @@
-import { type ForegroundShell } from '../compat/shell.js';
-import { type foldBack as FoldBack } from './transcript.js';
+import type { foldBack as FoldBack } from './transcript.js';
 import type { ChannelState, ToolViewPresenter } from './types.js';
-/** Owns local-only transcript mutations, shell output, and live subagent queries. */
+export { setActivityFrames } from './core/local-actions.js';
+/**
+ * The DSH halves of the local actions (the backend-neutral ones live in
+ * core/local-actions.ts): restoring folded rows from the DSH session log,
+ * and the live subagent roster query.
+ */
 export declare function createLocalActions(deps: {
     ctx: {
         get(name: string): unknown;
@@ -14,41 +18,15 @@ export declare function createLocalActions(deps: {
         isCurrent(capture: unknown): boolean;
         readonly agent: {
             session: unknown;
-            followup(message: unknown): void;
         };
     };
     state: ChannelState;
-    rowIds: {
-        value: number;
-    };
-    projector: {
-        reset(): void;
-        presentCallView: NonNullable<ToolViewPresenter>['call'];
-        presentResultView: NonNullable<ToolViewPresenter>['result'];
-    };
-    subagents: {
-        dropRows(): void;
-    };
-    jobs: {
-        dropRows(): void;
-    };
+    presenters: ToolViewPresenter;
     foldBack: typeof FoldBack;
-    workspace: {
-        describe(cwd: string): {
-            kind: string;
-            badge: string;
-            label: string;
-        };
-        commandShell(cwd: string): Promise<ForegroundShell | undefined>;
-    };
-    shell?: ForegroundShell;
-    notify: ChannelState['notify'];
 }): {
+    /** The history slicer behind "load earlier": restores folded rows from
+     *  the durable DSH log (the core emits when anything came back). */
     loadOlder(): number;
-    clear(): void;
-    pushLocal(title: string, lines: readonly string[]): void;
-    setActivityFrames(name: string): boolean;
     listSubagents(): Promise<string[]>;
-    runLocalCommand(command: string, includeInContext: boolean): Promise<void>;
 };
 //# sourceMappingURL=local-actions.d.ts.map

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;6BAwBT,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":"AAEA,OAAO,KAAK,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D;;;;GAIG;AACH,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,CAAA;SAAE,CAAA;KACrC,CAAA;IACD,KAAK,EAAE,YAAY,CAAA;IACnB,UAAU,EAAE,iBAAiB,CAAA;IAC7B,QAAQ,EAAE,OAAO,QAAQ,CAAA;CAC1B;IAIG;wEACoE;iBACvD,MAAM;qBAGI,OAAO,CAAC,MAAM,EAAE,CAAC;EAyB3C"}

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

@@ -1,61 +1,19 @@
-import { createUserMessage } from '@deepseek-ai/dsh-llm';
-import { markChannelReadDirty } from '../../adapter/channel/read-view.js';
-import { writeActivityFrames } from '../../activityPrefs.js';
-import { isPresetName, normalizeActivityPreset } from '../../components/activityFrames.js';
 import { t } from '../../i18n.js';
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
-import { runForegroundShell } from '../compat/shell.js';
-import { LOCAL_OUTPUT_LIMIT, preview } from './transcript.js';
-/** Owns local-only transcript mutations, shell output, and live subagent queries. */
+export { setActivityFrames } from './core/local-actions.js';
+/**
+ * The DSH halves of the local actions (the backend-neutral ones live in
+ * core/local-actions.ts): restoring folded rows from the DSH session log,
+ * and the live subagent roster query.
+ */
 export function createLocalActions(deps) {
-    const { ctx, owner, binding, state, rowIds, projector, subagents, jobs, foldBack, workspace, shell, notify } = deps;
+    const { ctx, owner, binding, state, foldBack } = deps;
     const current = (capture) => owner.current() && binding.isCurrent(capture);
     return {
+        /** The history slicer behind "load earlier": restores folded rows from
+         *  the durable DSH log (the core emits when anything came back). */
         loadOlder() {
-            const restored = foldBack(state.rows, snapshotLiveSessionEvents(binding.agent.session), { call: projector.presentCallView, result: projector.presentResultView });
-            if (restored > 0)
-                state.emit();
-            return restored;
-        },
-        clear() {
-            state.rows.length = 0;
-            markChannelReadDirty(state.rows);
-            rowIds.value = 0;
-            projector.reset();
-            subagents.dropRows();
-            jobs.dropRows();
-            state.activeToolCount = 0;
-            state.responseChars = 0;
-            state.rows.push({ id: rowIds.value++, kind: 'notice', text: 'Session cleared' });
-            state.emit();
-        },
-        pushLocal(title, lines) {
-            state.rows.push({ id: rowIds.value++, kind: 'local', text: title });
-            for (const line of lines)
-                state.rows.push({ id: rowIds.value++, kind: 'local-output', text: preview(line, LOCAL_OUTPUT_LIMIT) });
-            state.emit();
-        },
-        setActivityFrames(name) {
-            // A retired preset id normalizes to the current default, so the
-            // in-memory state, the persisted preference and the toast agree instead
-            // of diverging until restart.
-            const preset = normalizeActivityPreset(name) ?? name;
-            if (!isPresetName(preset)) {
-                notify(t('unknown-activity-preset', { name }), { color: 'error' });
-                return false;
-            }
-            if (preset === state.activityFrames) {
-                notify(t('activity-indicator-already', { name: preset }), { color: 'success' });
-                return true;
-            }
-            if (!writeActivityFrames(preset)) {
-                notify(t('activity-pref-write-failed'), { color: 'error' });
-                return false;
-            }
-            state.activityFrames = preset;
-            state.emit();
-            notify(t('activity-indicator-switched', { name: preset }));
-            return true;
+            return foldBack(state.rows, snapshotLiveSessionEvents(binding.agent.session), deps.presenters);
         },
         async listSubagents() {
             const service = ctx.get('subagents');
@@ -84,31 +42,5 @@ export function createLocalActions(deps) {
                 return [t('subagent-query-failed', { err: error instanceof Error ? error.message : String(error) })];
             }
         },
-        async runLocalCommand(command, includeInContext) {
-            const capture = binding.capture();
-            const cwd = state.cwd;
-            const target = workspace.describe(cwd);
-            state.rows.push({ id: rowIds.value++, kind: 'local', text: command, executionTarget: target.kind === 'local' ? target.badge : `${target.badge} · ${target.label}` });
-            state.emit();
-            let output = '(no output)';
-            const executor = await workspace.commandShell(cwd) ?? shell;
-            if (!current(capture))
-                return;
-            if (executor) {
-                try {
-                    const result = await runForegroundShell(executor, { command, workdir: cwd, timeoutMs: 30000 });
-                    output = result.stdout.text.trim() || result.stderr.text.trim() || (result.timedOut ? '(timed out)' : '(no output)');
-                }
-                catch (error) {
-                    output = error instanceof Error ? error.message : String(error);
-                }
-            }
-            if (!current(capture))
-                return;
-            state.rows.push({ id: rowIds.value++, kind: 'local-output', text: preview(output, LOCAL_OUTPUT_LIMIT) });
-            state.emit();
-            if (includeInContext)
-                binding.agent.followup(createUserMessage({ content: [{ type: 'text', text: `<bash-stdout>\n${output}\n</bash-stdout>` }], source: { kind: 'user' } }));
-        },
     };
 }

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

@@ -0,0 +1,3 @@
+import type { MentionFs } from './types.js';
+export declare function createLocalFs(): MentionFs;
+//# sourceMappingURL=local-fs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"local-fs.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/local-fs.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAE3C,wBAAgB,aAAa,IAAI,SAAS,CAiCzC"}

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

@@ -0,0 +1,46 @@
+/**
+ * Local-disk fallback for the `fs` service surface the channel reads
+ * (`@` mention expansion, file completion). A DSH composition mounts the
+ * host's fs service (which may be remote); a session served by another
+ * backend may run without it, and its working directory is then the local
+ * disk this process sees. Read-only: nothing here writes.
+ */
+import { open, readdir, readFile, stat } from 'node:fs/promises';
+import { resolve } from 'node:path';
+export function createLocalFs() {
+    return {
+        resolve: path => Promise.resolve({ displayPath: resolve(path) }),
+        async stat(target) {
+            try {
+                const info = await stat(target.displayPath);
+                return { type: info.isFile() ? 'file' : info.isDirectory() ? 'directory' : 'other' };
+            }
+            catch {
+                return undefined;
+            }
+        },
+        readText: target => readFile(target.displayPath, 'utf8'),
+        async readBytes(target, signal, maxBytes) {
+            signal?.throwIfAborted();
+            const handle = await open(target.displayPath, 'r');
+            try {
+                const size = (await handle.stat()).size;
+                if (size > maxBytes)
+                    throw new Error(`dsh-tui: ${target.displayPath} exceeds ${maxBytes} bytes`);
+                const buffer = new Uint8Array(size);
+                await handle.read(buffer, 0, size, 0);
+                return buffer;
+            }
+            finally {
+                await handle.close();
+            }
+        },
+        async listDir(target) {
+            const entries = await readdir(target.displayPath, { withFileTypes: true });
+            return entries.map(entry => ({
+                name: entry.name,
+                type: entry.isFile() ? 'file' : entry.isDirectory() ? 'directory' : 'other',
+            }));
+        },
+    };
+}

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

@@ -4,8 +4,8 @@ import type { SessionEvent } from '@deepseek-ai/dsh-session';
 import { type SessionModeSpec } from '../../sessionModes.js';
 import { type AdapterRuntimeOptions } from '../../adapter/kernel/runtime.js';
 import type { ChannelState } from './types.js';
-import type { createChannelBinding } from './binding.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+import type { DshChannelBinding } from './binding.js';
+type Binding = DshChannelBinding;
 type ModeState = Pick<ChannelState, 'mode' | 'modeIndex' | 'emit'>;
 /**
  * Fail-soft reporting for a session-mode write. The mutation path reaches
@@ -33,7 +33,7 @@ export declare function createModeActions(ctx: Context, state: ModeState, deps:
 }): {
     refreshMode: () => void;
     cycleMode: () => Promise<void>;
-    applyMode: (spec: SessionModeSpec, capture?: import("./binding.js").BindingCapture) => Promise<void>;
+    applyMode: (spec: SessionModeSpec, capture?: import("./binding.js").DshBindingCapture) => Promise<void>;
     onSessionEvent: (session: Agent["session"], event: SessionEvent) => void;
 };
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"mode-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/mode-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAsB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAExD,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;AAElE;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC9B,WAAW,EAAE,MAAM,IAAI,EACvB,KAAK,EAAE,OAAO,GACb,IAAI,CAUN;AAED,iHAAiH;AACjH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE;QAAE,OAAO,IAAI,OAAO,CAAA;KAAE,CAAA;IAC7B,OAAO,EAAE,qBAAqB,CAAA;IAC9B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC,CAAA;IACzD,YAAY,EAAE,SAAS,eAAe,EAAE,CAAA;IACxC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAChF,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;uBA8DqB,IAAI;qBA4JE,OAAO,CAAC,IAAI,CAAC;sBA1EV,eAAe,sDAA0B,OAAO,CAAC,IAAI,CAAC;8BAuFpD,KAAK,CAAC,SAAS,CAAC,SAAS,YAAY,KAAG,IAAI;EA4B9E"}
+{"version":3,"file":"mode-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/mode-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAsB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAErD,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;AAElE;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC9B,WAAW,EAAE,MAAM,IAAI,EACvB,KAAK,EAAE,OAAO,GACb,IAAI,CAUN;AAED,iHAAiH;AACjH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE;QAAE,OAAO,IAAI,OAAO,CAAA;KAAE,CAAA;IAC7B,OAAO,EAAE,qBAAqB,CAAA;IAC9B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC,CAAA;IACzD,YAAY,EAAE,SAAS,eAAe,EAAE,CAAA;IACxC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAChF,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;uBA8DqB,IAAI;qBA4JE,OAAO,CAAC,IAAI,CAAC;sBA1EV,eAAe,yDAA0B,OAAO,CAAC,IAAI,CAAC;8BAuFpD,KAAK,CAAC,SAAS,CAAC,SAAS,YAAY,KAAG,IAAI;EA4B9E"}

package/lib/types/dsh-adapter/channel/mode-permission-actions.d.ts

@@ -1,12 +1,12 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { Agent } from '@deepseek-ai/dsh-agent';
 import { type SessionModeSpec } from '../../sessionModes.js';
-import type { createChannelBinding } from './binding.js';
+import type { DshChannelBinding } from './binding.js';
 import { createModeActions } from './mode-actions.js';
 import { type PermissionIdentity } from './mode-permission.js';
 import type { PermissionModeRoster } from './mode-roster.js';
 import type { ChannelState } from './types.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+type Binding = DshChannelBinding;
 type ModeState = Pick<ChannelState, 'mode' | 'modeIndex' | 'emit'>;
 type ModeCapture = ReturnType<Binding['capture']>;
 /** The composition seam `createModeActions` owns; this factory forwards every

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

@@ -1 +1 @@
-{"version":3,"file":"mode-permission-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/mode-permission-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAInD,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAA2B,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAkD,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9G,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;AAClE,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;AACjD;gDACgD;AAChD,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;AAmEjE;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,IAAI,CACR,kBAAkB,EAClB,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,cAAc,GAAG,wBAAwB,GAAG,QAAQ,CACvF,GAAG;IACF,MAAM,EAAE,oBAAoB,CAAA;IAC5B;;8DAE0D;IAC1D,cAAc,CAAC,EAAE;QAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;CAC/D,GACA;IACD,WAAW,IAAI,IAAI,CAAA;IACnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,SAAS,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACtE,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;IACtD,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACnD,UAAU,EAAE,kBAAkB,CAAA;CAC/B,CAqIA"}
+{"version":3,"file":"mode-permission-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/mode-permission-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAInD,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAA2B,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAkD,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9G,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAChC,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;AAClE,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;AACjD;gDACgD;AAChD,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;AAmEjE;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,IAAI,CACR,kBAAkB,EAClB,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,cAAc,GAAG,wBAAwB,GAAG,QAAQ,CACvF,GAAG;IACF,MAAM,EAAE,oBAAoB,CAAA;IAC5B;;8DAE0D;IAC1D,cAAc,CAAC,EAAE;QAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;CAC/D,GACA;IACD,WAAW,IAAI,IAAI,CAAA;IACnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,SAAS,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACtE,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;IACtD,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACnD,UAAU,EAAE,kBAAkB,CAAA;CAC/B,CAqIA"}

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

@@ -1,11 +1,11 @@
 import type { Context } from '@deepseek-ai/cordis';
 import { type LlmModelInfo } from '@deepseek-ai/dsh-llm';
 import type { Agent, ModelSelectionRef } from '@deepseek-ai/dsh-agent';
-import type { CommandCompletionNode } from '../../commands.js';
-import type { createChannelBinding } from './binding.js';
+import { type CommandCompletionNode } from '../../commands.js';
+import type { DshChannelBinding } from './binding.js';
 import type { ChannelOwner } from './owner.js';
 import type { ChannelState, EffortOption, PresetOption } from './types.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+type Binding = DshChannelBinding;
 /**
  * Route metadata, effort preference and preset/model catalog actions.
  * This owns the async catalog caches and their generation fences; callers only

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

@@ -1 +1 @@
-{"version":3,"file":"model-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAM9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE1E,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEtD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,OAAO,GAAG,iBAAiB,GAAG,cAAc,GAAG,aAAa,GAAG,SAAS,GAAG,eAAe,GAAG,MAAM,CAAC,EAC3I,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,WAAW,CAAC,CAAA;IAC/C,SAAS,EAAE,iBAAiB,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,IAAI,KAAK,CAAA;IACd,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B;6EACyE;IACzE,mBAAmB,IAAI,IAAI,CAAA;CAC5B;;gCA8DsC,OAAO,CAAC,IAAI,CAAC;+BA+DpB,IAAI;uBAqBN,OAAO,CAAC;QAAE,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;oBAWjF,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;2BAoBxB,MAAM,GAAG,SAAS,KAAG,IAAI;4BAM1B,IAAI;sBAeV,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;;YAhMnB,MAAM;cAAQ,MAAM;;8BAqMzB,IAAI;0BACR,IAAI;;6BASD,IAAI;;uBAOJ,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;6BAQxB,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EAkChE"}
+{"version":3,"file":"model-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/model-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACtE,OAAO,EAAwB,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAMpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE1E,KAAK,OAAO,GAAG,iBAAiB,CAAA;AAEhC;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,OAAO,GAAG,iBAAiB,GAAG,cAAc,GAAG,aAAa,GAAG,SAAS,GAAG,eAAe,GAAG,MAAM,CAAC,EAC3I,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,WAAW,CAAC,CAAA;IAC/C,SAAS,EAAE,iBAAiB,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,IAAI,KAAK,CAAA;IACd,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B;6EACyE;IACzE,mBAAmB,IAAI,IAAI,CAAA;CAC5B;;gCA+FsC,OAAO,CAAC,IAAI,CAAC;+BA+DpB,IAAI;uBAqBN,OAAO,CAAC;QAAE,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;oBAWjF,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;2BAoBxB,MAAM,GAAG,SAAS,KAAG,IAAI;4BAM1B,IAAI;sBAeV,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;;YA9NnB,MAAM;cAAQ,MAAM;;8BAmOzB,IAAI;0BACR,IAAI;;6BASD,IAAI;;uBAOJ,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;6BAQxB,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EAkChE"}

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

@@ -1,5 +1,6 @@
 import { ReasoningEffortId } from '@deepseek-ai/dsh-llm';
-import { nearestLowerEffort, readEffortPref, resolveEffortDefault, writeEffortPref } from '../../effortPrefs.js';
+import { WORKING_GATE_NOTICES } from '../../commands.js';
+import { nearestLowerEffort, readEffortPref, resolveEffortDefault, writeEffortPref, STANDARD_EFFORT_LADDER } from '../../effortPrefs.js';
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { getLang, t, tOr } from '../../i18n.js';
 import { migratePresetPref, writePresetPref } from '../../presetPrefs.js';
@@ -46,6 +47,38 @@ export function createModelActions(ctx, state, deps) {
             deps.checkContextWarning();
         }
     };
+    /** Localized label of a standard ladder tier (the claude-effort-* family
+     * is the repo's existing vocabulary for these five names). */
+    const STANDARD_EFFORT_LABEL_KEYS = {
+        low: 'claude-effort-low',
+        medium: 'claude-effort-medium',
+        high: 'claude-effort-high',
+        xhigh: 'claude-effort-xhigh',
+        max: 'claude-effort-max',
+    };
+    const standardEffortLabel = (id) => {
+        const key = STANDARD_EFFORT_LABEL_KEYS[id];
+        return key === undefined ? id : tOr(key, id);
+    };
+    /** The standard ladder as picker options, resolved per call so a language
+     * switch relabels tiers with no cache to invalidate. */
+    const standardEffortOptions = () => STANDARD_EFFORT_LADDER.map(id => ({ id, name: standardEffortLabel(id) }));
+    /** Effort tiers for one route-metadata answer. A row that declares
+     * reasoning support without a tier list (`reasoning: true`, or an object
+     * whose `efforts` is absent, as pi-ai zai rows for glm-5.3* do) gets the
+     * standard ladder: the kernel accepts the standard ids and validates at
+     * set time, and offering nothing would hide tiers the route does run.
+     * An explicit `efforts: []` means the route supports none and is kept
+     * as is, like any declared list; `reasoning` absent/false offers nothing. */
+    const tiersOf = (reasoning) => {
+        if (reasoning === true)
+            return standardEffortOptions();
+        if (reasoning === undefined || reasoning === false)
+            return [];
+        if (reasoning.efforts !== undefined)
+            return reasoning.efforts;
+        return standardEffortOptions();
+    };
     const resolveEfforts = async (capture) => {
         if (llmRuntime === undefined || typeof llmRuntime.resolveModelInfo !== 'function')
             return 'unavailable';
@@ -54,9 +87,9 @@ export function createModelActions(ctx, state, deps) {
             applyRouteMetadata(capture, info);
             if (!effortCurrent(capture))
                 return 'stale';
-            const efforts = info.reasoning?.efforts ?? [];
+            const efforts = tiersOf(info.reasoning);
             state.effortLevels = efforts.map(level => level.id);
-            return { efforts, defaultEffort: info.reasoning?.defaultEffort };
+            return { efforts, defaultEffort: typeof info.reasoning === 'object' && info.reasoning !== null ? info.reasoning.defaultEffort : undefined };
         }
         catch (error) {
             if (!effortCurrent(capture))
@@ -143,7 +176,7 @@ export function createModelActions(ctx, state, deps) {
             applyRouteMetadata(capture, info);
             if (!effortCurrent(capture))
                 return;
-            state.effortLevels = (info.reasoning?.efforts ?? []).map(level => level.id);
+            state.effortLevels = tiersOf(info.reasoning).map(level => level.id);
             state.emit();
         }).catch(() => undefined);
     };
@@ -281,7 +314,7 @@ export function createModelActions(ctx, state, deps) {
             return false;
         }
         if (state.working) {
-            notify(t('preset-agent-running'), { color: 'warning' });
+            notify(t(WORKING_GATE_NOTICES.preset), { color: 'warning' });
             return false;
         }
         const capture = deps.binding.capture();

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

@@ -1,10 +1,10 @@
 import type { Context } from '@deepseek-ai/cordis';
 import { type SessionEvent } from '@deepseek-ai/dsh-session';
-import type { createChannelBinding } from './binding.js';
+import type { DshChannelBinding } from './binding.js';
 import type { ChannelOwner } from './owner.js';
 import { resetSessionProjection } from './session-reset.js';
 import type { ChannelState } from './types.js';
-type Binding = ReturnType<typeof createChannelBinding>;
+type Binding = DshChannelBinding;
 type SwitchState = Parameters<typeof resetSessionProjection>[0] & Pick<ChannelState, 'cwd' | 'working' | 'status' | 'agentId' | 'sessionId' | 'agentPreset' | 'provider' | 'model' | 'contextWindow' | 'effortLevels' | 'reasoningEffort' | 'emit'>;
 /** Model-route adoption transaction. It settles compaction before its fork snapshot and owns the post-commit reset. */
 export declare function createModelSwitchAction(ctx: Context, state: SwitchState, deps: {

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;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"}
+{"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;AAWvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,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,iBAAiB,CAAA;AAChC,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,CAgFjE"}

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

@@ -1,8 +1,10 @@
 import { randomUUID } from 'node:crypto';
 import { SessionId } from '@deepseek-ai/dsh-session';
 import { t } from '../../i18n.js';
+import { WORKING_GATE_NOTICES } from '../../commands.js';
 import { writeModelPref } from '../../modelPrefs.js';
 import { touchSession } from '../../sessionHistory.js';
+import { createDshSession, dshHandleOf } from '../backend/session.js';
 import { liveSessionCreateOptions, sliceLiveSessionSeed } from '../compat/index.js';
 import { composePreset, runningPresetOf } from '../presets.js';
 import { reserveNewSession } from '../../sessionMounts.js';
@@ -14,7 +16,7 @@ export function createModelSwitchAction(ctx, state, deps) {
     return async (provider, model) => {
         const adoption = deps.binding.capture();
         if (state.working) {
-            deps.notify(t('model-switch-while-working'), { color: 'warning' });
+            deps.notify(t(WORKING_GATE_NOTICES.model), { color: 'warning' });
             return false;
         }
         const agents = ctx.get('agents');
@@ -41,9 +43,9 @@ export function createModelSwitchAction(ctx, state, deps) {
         // will not name until its next beat.
         const { reservation } = await reserveNewSession(String(childId));
         const composed = await composePreset(ctx, runningPresetOf(deps.binding.agent.session));
-        let handle;
+        let candidate;
         try {
-            handle = await deps.binding.prepare(adoption, () => agents.create(liveSessionCreateOptions({
+            candidate = await deps.binding.prepare(adoption, async () => createDshSession(ctx, await agents.create(liveSessionCreateOptions({
                 sessionId: childId,
                 seed,
                 runtimeSession: deps.binding.agent.session,
@@ -56,7 +58,7 @@ export function createModelSwitchAction(ctx, state, deps) {
                 agentPreset: composed.agentPreset,
                 agentOptions: { provider, model },
                 setup: composed.setup,
-            })));
+            }))));
         }
         catch (error) {
             reservation.abandon();
@@ -70,13 +72,14 @@ export function createModelSwitchAction(ctx, state, deps) {
             deps.notify(t('model-switch-attach-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'warning', timeoutMs: 8000 });
         }
         if (!deps.binding.isCurrent(adoption) || !deps.owner.current()) {
-            await deps.binding.abandon(handle);
+            await deps.binding.abandon(candidate);
             reservation.abandon();
             return false;
         }
+        const handle = dshHandleOf(candidate);
         let committed = false;
         try {
-            const result = deps.binding.adopt(handle, adoption, (_previous, disposePrevious) => {
+            const result = deps.binding.adopt(candidate, adoption, (_previous, disposePrevious) => {
                 resetSessionProjection(state, deps.rowIds, deps.resetProjector, deps.resetSubagents, deps.resetJobs);
                 state.status = handle.agent.status;
                 state.agentId = handle.agent.id;