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

package/lib/types/dsh-adapter/channel/ide-selection.d.ts

@@ -0,0 +1,58 @@
+import type { ChannelSelection, SelectionAttachment } from '../../adapter/ports/channel-view.js';
+import type { MentionExpansion, MentionFs } from './types.js';
+/**
+ * Escape a path for reuse inside a quoted `<attached-file path="…">` attribute:
+ * POSIX filenames are legal with `"`, `&`, `<`, `>` — a raw interpolated path
+ * could break out of the attribute or smuggle markup into the model-facing
+ * block. `&` first so the replacements themselves are not re-escaped.
+ */
+export declare function escapeSnippetAttr(value: string): string;
+/**
+ * Build the `<attached-file path="…" selection>` block for an IDE selection:
+ * coordinates arrive 0-based inclusive from the extension and convert to
+ * sliceLines' 1-based; an endLine past EOF clamps to the last line (the model
+ * receives every remaining line), while a startLine past EOF yields undefined
+ * — the caller silently skips instead of attaching an empty or stale block.
+ * An empty selection is rejected here too so the guard cannot be bypassed.
+ */
+export declare function buildSelectionBlock(selection: ChannelSelection, content: string): {
+    text: string;
+    lines: number;
+} | undefined;
+/**
+ * Append the selection's attached-file block to a message's content. Returns
+ * what was attached ({lines, path}) or undefined when there is nothing to
+ * attach — no selection, or an unresolvable/unreadable file. The caller
+ * passes the ENQUEUE-time snapshot (and its fs handle) so a selection made
+ * after submit can never attach to the wrong message.
+ *
+ * Protocol 2 carries the editor buffer's own `text` (unsaved edits
+ * included): when present it is attached VERBATIM and the filesystem is not
+ * touched — reading the disk copy would hand the model a version the user
+ * never saw (maintainer review round 3). The disk read remains only as the
+ * protocol-1 fallback.
+ */
+export declare function attachIdeSelection(blocks: MentionExpansion['blocks'], cwd: string, selection: ChannelSelection | undefined, fs: MentionFs | undefined): Promise<SelectionAttachment | undefined>;
+/**
+ * Derive the transcript indicator from the DURABLE user-message content:
+ * the `<attached-file path="…" selection count="N">` block the submit path
+ * appended is part of the persisted event, so a replayed session can rebuild
+ * the "Selected N lines from <file>" line even though the in-memory
+ * message-id → attachment map starts empty (maintainer review round 3: the
+ * session log is the source of truth — the indicator must not depend on
+ * process-local state).
+ */
+export declare function replaySelectionAttachment(content: readonly unknown[] | undefined): SelectionAttachment | undefined;
+/**
+ * Bounded map from a submitted message id → what its selection attached.
+ * The delivery path remembers at submit; the transcript projection reads it
+ * when the durable `user/message` event lands (the event carries the same
+ * message id) to stamp the row's indicator. FIFO-capped like the other
+ * row-keyed caches — ids grow monotonically and a miss only loses the
+ * indicator, never the attachment itself.
+ */
+export declare function createSelectionAttachments(): {
+    remember(messageId: string, info: SelectionAttachment): void;
+    take(messageId: string): SelectionAttachment | undefined;
+};
+//# sourceMappingURL=ide-selection.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ide-selection.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/ide-selection.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AAEhG,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAuB7D;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD;AAyCD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,MAAM,GACd;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAc7C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAClC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,gBAAgB,GAAG,SAAS,EACvC,EAAE,EAAE,SAAS,GAAG,SAAS,GACxB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAoC1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,GACtC,mBAAmB,GAAG,SAAS,CA8BjC;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,IAAI;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAA;IAC5D,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAA;CACzD,CAeA"}

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

@@ -0,0 +1,226 @@
+/**
+ * IDE selection consumption: turn a live editor-selection snapshot into the
+ * model-facing `<attached-file … selection>` block. Protocol 2 pushes carry
+ * the editor buffer's own selection text — that is attached verbatim; the
+ * disk read below remains only as the protocol-1 fallback, and every failure
+ * mode is silent (an IDE-side extra must never block a send).
+ *
+ * The block builder never goes through text parsing (unlike `@`-mentions):
+ * selection paths may contain spaces no tokenizer could survive. It reuses
+ * the same line-slice semantics and size-cap policy as mention attachments.
+ */
+import { isAbsolute, join } from 'node:path';
+import { MENTION_MAX_FILE_CHARS } from './mentions.js';
+/**
+ * Slice `content` into the 1-based inclusive [`startLine`, `endLine`] range.
+ * Returns undefined for malformed ranges (non-safe integers, zero/negative
+ * start, inverted) and for a start past EOF — counted against REAL lines: a
+ * trailing newline splits into a phantom final element that is not a line.
+ */
+function sliceLines(content, startLine, endLine) {
+    const end = endLine ?? startLine;
+    if (!Number.isSafeInteger(startLine) || startLine < 1)
+        return undefined;
+    if (!Number.isSafeInteger(end) || end < startLine)
+        return undefined;
+    const lines = content.split('\n');
+    // A trailing newline splits into a phantom final element that is not a line.
+    if (lines.length > 1 && lines[lines.length - 1] === '')
+        lines.pop();
+    if (startLine > lines.length)
+        return undefined;
+    return lines.slice(startLine - 1, end).join('\n');
+}
+/**
+ * Escape a path for reuse inside a quoted `<attached-file path="…">` attribute:
+ * POSIX filenames are legal with `"`, `&`, `<`, `>` — a raw interpolated path
+ * could break out of the attribute or smuggle markup into the model-facing
+ * block. `&` first so the replacements themselves are not re-escaped.
+ */
+export function escapeSnippetAttr(value) {
+    return value.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+/**
+ * Format the attached-file block from an ALREADY-SLICED body: cap it like
+ * @-mention attachments (same MENTION_MAX_FILE_CHARS policy, same visible
+ * truncation marker) and count the lines the model gets — the truncated body,
+ * not the request (review round 3).
+ *
+ * `allowEmpty` keeps a selection that covers ONE blank line: the body is
+ * legitimately empty there while the badge still says "1 line selected", and
+ * dropping the block made the footer and the transcript disagree (review
+ * round 7). Callers pass it only for a single-line range that really exists.
+ */
+function cappedSelectionBlock(path, sliced, allowEmpty = false) {
+    if (sliced === '' && !allowEmpty)
+        return undefined;
+    let body = sliced;
+    let attached = sliced;
+    if (body.length > MENTION_MAX_FILE_CHARS) {
+        attached = body.slice(0, MENTION_MAX_FILE_CHARS);
+        body = `${attached}\n[… truncated]`;
+    }
+    // `count` is the number of lines in the attached BODY — the truncation
+    // marker line is not counted (it rides on top of the cap and the live
+    // indicator reports the same number). It exists so the replay path never has
+    // to GUESS that number from the body tail: a selection whose last line is
+    // literally `[… truncated]` used to lose one line when the indicator was
+    // rebuilt from the persisted event (fuzz rounds found 46/400 such bodies).
+    // Deliberately NOT `lines`: @-mention attachments already use `lines="2-4"`
+    // for the REQUESTED range, and overloading the key with a count would make
+    // the two block flavours read alike.
+    const lines = attached.split('\n').length;
+    return {
+        text: `<attached-file path="${escapeSnippetAttr(path)}" selection count="${lines}">\n${body}\n</attached-file>`,
+        lines,
+    };
+}
+/**
+ * Build the `<attached-file path="…" selection>` block for an IDE selection:
+ * coordinates arrive 0-based inclusive from the extension and convert to
+ * sliceLines' 1-based; an endLine past EOF clamps to the last line (the model
+ * receives every remaining line), while a startLine past EOF yields undefined
+ * — the caller silently skips instead of attaching an empty or stale block.
+ * An empty selection is rejected here too so the guard cannot be bypassed.
+ */
+export function buildSelectionBlock(selection, content) {
+    if (selection.isEmpty)
+        return undefined;
+    // 0-based inclusive [start, end] → 1-based inclusive [start+1, end+1].
+    // sliceLines clamps an oversized end itself (Array#slice bounds); a start
+    // past EOF returns undefined and the whole attach is silently dropped.
+    const sliced = sliceLines(content, selection.startLine + 1, selection.endLine + 1);
+    if (sliced === undefined)
+        return undefined;
+    // sliceLines returning '' (not undefined) means the requested line EXISTS and
+    // is blank — a single blank line is a real selection the badge reports.
+    return cappedSelectionBlock(selection.path, sliced, selection.startLine === selection.endLine);
+}
+/**
+ * Append the selection's attached-file block to a message's content. Returns
+ * what was attached ({lines, path}) or undefined when there is nothing to
+ * attach — no selection, or an unresolvable/unreadable file. The caller
+ * passes the ENQUEUE-time snapshot (and its fs handle) so a selection made
+ * after submit can never attach to the wrong message.
+ *
+ * Protocol 2 carries the editor buffer's own `text` (unsaved edits
+ * included): when present it is attached VERBATIM and the filesystem is not
+ * touched — reading the disk copy would hand the model a version the user
+ * never saw (maintainer review round 3). The disk read remains only as the
+ * protocol-1 fallback.
+ */
+export async function attachIdeSelection(blocks, cwd, selection, fs) {
+    if (selection === undefined || selection.isEmpty)
+        return undefined;
+    if (selection.text !== undefined) {
+        // Protocol 2: `text` is the editor's OWN text for the selection
+        // (document.getText(selection)) — the ABSOLUTE document coordinates ride
+        // along for the badge/indicator, but they must NOT slice this string:
+        // it already contains exactly the selected lines, so anything not
+        // starting at line 0 would be mis-cut or dropped entirely (review
+        // round 4). Attach it verbatim with the shared size cap. A full-line
+        // selection ends at column 0 of the NEXT line, so getText hands back a
+        // trailing '\n' — strip that one terminator or the body grows a phantom
+        // blank line and the indicator over-counts by one (review round 5).
+        let text = selection.text;
+        if (text.endsWith('\n'))
+            text = text.slice(0, -1);
+        // Triple-clicking ONE blank line hands back "\n": after the strip the body
+        // is empty but a line WAS selected (the footer badge says so) — keep the
+        // block so the indicator and the badge agree instead of attaching nothing.
+        const block = cappedSelectionBlock(selection.path, text, selection.text !== '');
+        if (block === undefined)
+            return undefined;
+        blocks.push({ type: 'text', text: block.text });
+        return { lines: block.lines, path: selection.path };
+    }
+    if (fs === undefined)
+        return undefined;
+    try {
+        const absolute = isAbsolute(selection.path) ? selection.path : join(cwd, selection.path);
+        const target = await fs.resolve(absolute);
+        const info = await fs.stat(target);
+        if (info?.type !== 'file')
+            return undefined;
+        const content = await fs.readText(target);
+        const block = buildSelectionBlock(selection, content);
+        if (block === undefined)
+            return undefined;
+        blocks.push({ type: 'text', text: block.text });
+        return { lines: block.lines, path: selection.path };
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Derive the transcript indicator from the DURABLE user-message content:
+ * the `<attached-file path="…" selection count="N">` block the submit path
+ * appended is part of the persisted event, so a replayed session can rebuild
+ * the "Selected N lines from <file>" line even though the in-memory
+ * message-id → attachment map starts empty (maintainer review round 3: the
+ * session log is the source of truth — the indicator must not depend on
+ * process-local state).
+ */
+export function replaySelectionAttachment(content) {
+    if (content === undefined)
+        return undefined;
+    for (const block of content) {
+        if (block === null || typeof block !== 'object')
+            continue;
+        const text = block.text;
+        if (block.type !== 'text' || typeof text !== 'string')
+            continue;
+        const opened = /^<attached-file path="([^"]+)" selection(?: count="(\d+)")?>\n/.exec(text);
+        if (opened === null)
+            continue;
+        let closed = text.slice(opened[0].length);
+        if (closed.endsWith('</attached-file>'))
+            closed = closed.slice(0, -'</attached-file>'.length);
+        // The builder writes `body\n</attached-file>` — strip the newline the
+        // close tag rode on, or every body counts one phantom line.
+        if (closed.endsWith('\n'))
+            closed = closed.slice(0, -1);
+        const lines = closed.split('\n').length;
+        // `count` is authoritative when present (the builder always writes it).
+        // Blocks persisted before it existed fall back to the old tail heuristic,
+        // which misreads a body whose last line is literally the truncation marker.
+        const counted = opened[2] === undefined ? undefined : Number(opened[2]);
+        return {
+            lines: counted ?? (closed.endsWith('\n[… truncated]') ? lines - 1 : lines),
+            // Reverse escapeSnippetAttr so the replayed indicator shows the path
+            // exactly as the live one did (`&` first so entities are not re-baked).
+            path: opened[1]
+                .replace(/&lt;/g, '<')
+                .replace(/&gt;/g, '>')
+                .replace(/&quot;/g, '"')
+                .replace(/&amp;/g, '&'),
+        };
+    }
+    return undefined;
+}
+/**
+ * Bounded map from a submitted message id → what its selection attached.
+ * The delivery path remembers at submit; the transcript projection reads it
+ * when the durable `user/message` event lands (the event carries the same
+ * message id) to stamp the row's indicator. FIFO-capped like the other
+ * row-keyed caches — ids grow monotonically and a miss only loses the
+ * indicator, never the attachment itself.
+ */
+export function createSelectionAttachments() {
+    const byMessageId = new Map();
+    return {
+        remember(messageId, info) {
+            byMessageId.set(messageId, info);
+            while (byMessageId.size > 128) {
+                const oldest = byMessageId.keys().next().value;
+                if (oldest === undefined)
+                    break;
+                byMessageId.delete(oldest);
+            }
+        },
+        take(messageId) {
+            return byMessageId.get(messageId);
+        },
+    };
+}

package/lib/types/dsh-adapter/channel/input-delivery.d.ts

@@ -3,6 +3,7 @@ import type { Agent } from '@deepseek-ai/dsh-agent';
 import { type UserMessage } from '@deepseek-ai/dsh-llm';
 import { type ComposerImages } from './composer-images.js';
 import type { ChannelOwner } from './owner.js';
+import type { ChannelSelection, SelectionAttachment } from '../../adapter/ports/channel-view.js';
 import type { ChannelImageBlock, ChannelState, ComposerImageRef, MentionAttachments, MentionFs, PendingMessage, StagedImageInput } from './types.js';
 /** One submission's enqueue-time world: the session it was typed in, the
  *  services that resolve its references, and the capabilities live then. */
@@ -14,6 +15,10 @@ interface UserTextOrigin {
     readonly fs: MentionFs | undefined;
     readonly attachments: MentionAttachments | undefined;
     readonly stagedImages: ReadonlyMap<string, ChannelImageBlock['attachment']>;
+    /** Live editor selection AT ENQUEUE (undefined = none). Captured here so a
+     *  selection made while the FIFO or mention expansion parks the delivery
+     *  can never attach to this message. */
+    readonly selection: ChannelSelection | undefined;
 }
 /** Input FIFO, staged attachments and decision notice timers share one lifetime. */
 export declare function createInputDelivery(ctx: Context, owner: ChannelOwner, binding: {
@@ -22,7 +27,7 @@ export declare function createInputDelivery(ctx: Context, owner: ChannelOwner, b
     id: string;
     text: string;
     images?: readonly ComposerImageRef[];
-}, placement: PendingMessage['placement']) => void, untrackPending: (id: string) => void, composer: ComposerImages): {
+}, placement: PendingMessage['placement']) => void, untrackPending: (id: string) => void, composer: ComposerImages, selection: () => ChannelSelection | undefined, rememberSelection: (messageId: string, info: SelectionAttachment) => void): {
     dispatchUserText: (text: string, placement: PendingMessage["placement"], images?: readonly ComposerImageRef[], attach?: UserMessage) => void;
     deliverUserText: (text: string, placement: PendingMessage["placement"], images?: readonly ComposerImageRef[], attach?: UserMessage) => void;
     claimAttachments: (messages: readonly UserMessage[]) => UserMessage[];

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

@@ -1 +1 @@
-{"version":3,"file":"input-delivery.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/input-delivery.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;AAI1E,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAA;AAI7B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EACV,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACT,cAAc,EACd,gBAAgB,EACjB,MAAM,YAAY,CAAA;AAEnB;4EAC4E;AAC5E,UAAU,cAAc;IACtB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,EAAE,SAAS,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;CAC5E;AAED,oFAAoF;AACpF,wBAAgB,mBAAmB,CAClC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;CAAE,EACrE,KAAK,EAAE,MAAM,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,SAAS,GAAG,wBAAwB,CAAC,EAC7E,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC9B,YAAY,EAAE,CAAC,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,EAAE,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,KAAK,IAAI,EAC3I,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,EACpC,QAAQ,EAAE,cAAc;6BA4Qf,MAAM,aACD,cAAc,CAAC,WAAW,CAAC,WAC9B,SAAS,gBAAgB,EAAE,WAC1B,WAAW,KACnB,IAAI;4BAcC,MAAM,aACD,cAAc,CAAC,WAAW,CAAC,WAC9B,SAAS,gBAAgB,EAAE,WAC1B,WAAW,KACnB,IAAI;iCA5Q6B,SAAS,WAAW,EAAE,KAAG,WAAW,EAAE;kCAarC,MAAM,KAAG,IAAI;0BAiIrB,CAAC,QAAQ,MAAM,WAAW,OAAO,CAAC,CAAC,CAAC,WAAW,cAAc,KAAG,OAAO,CAAC,CAAC,CAAC;6BAkIzE,IAAI;wBAaZ,gBAAgB,KAAG,OAAO,CAAC,MAAM,CAAC;wBACpC,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;;EAGzE"}
+{"version":3,"file":"input-delivery.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/input-delivery.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;AAI1E,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAA;AAK7B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AAChG,OAAO,KAAK,EACV,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACT,cAAc,EACd,gBAAgB,EACjB,MAAM,YAAY,CAAA;AAEnB;4EAC4E;AAC5E,UAAU,cAAc;IACtB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,EAAE,SAAS,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAA;IAC3E;;4CAEwC;IACxC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACjD;AAED,oFAAoF;AACpF,wBAAgB,mBAAmB,CAClC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;CAAE,EACrE,KAAK,EAAE,MAAM,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,SAAS,GAAG,wBAAwB,CAAC,EAC7E,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC9B,YAAY,EAAE,CAAC,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,EAAE,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,KAAK,IAAI,EAC3I,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,EACpC,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,MAAM,gBAAgB,GAAG,SAAS,EAC7C,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,KAAK,IAAI;6BAkRhE,MAAM,aACD,cAAc,CAAC,WAAW,CAAC,WAC9B,SAAS,gBAAgB,EAAE,WAC1B,WAAW,KACnB,IAAI;4BAcC,MAAM,aACD,cAAc,CAAC,WAAW,CAAC,WAC9B,SAAS,gBAAgB,EAAE,WAC1B,WAAW,KACnB,IAAI;iCAlR6B,SAAS,WAAW,EAAE,KAAG,WAAW,EAAE;kCAarC,MAAM,KAAG,IAAI;0BAuIrB,CAAC,QAAQ,MAAM,WAAW,OAAO,CAAC,CAAC,CAAC,WAAW,cAAc,KAAG,OAAO,CAAC,CAAC,CAAC;6BAkIzE,IAAI;wBAaZ,gBAAgB,KAAG,OAAO,CAAC,MAAM,CAAC;wBACpC,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;;EAGzE"}

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

@@ -5,9 +5,10 @@ import { dispatchTuiDecision } from '../extension-events.js';
 import { firstStaleComposerToken, formatMissingReference, orderedComposerImages, } from './composer-images.js';
 import { expandComposerMentions } from './composer-mentions.js';
 import { normalizeInputDecision } from './decisions.js';
+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) {
+export function createInputDelivery(ctx, owner, binding, state, notify, trackPending, untrackPending, composer, selection, rememberSelection) {
     /**
      * `@` file mentions (issue #15): expansion reads files asynchronously, so
      * every user-text delivery (submit / steer / interrupt-requeue) funnels
@@ -82,6 +83,7 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
         fs: mentionFs(ctx),
         attachments: mentionAttachments(ctx),
         stagedImages: composer.snapshot(),
+        selection: selection(),
     });
     /**
      * Expand the text's `@` mentions and deliver ONE user message: the typed
@@ -107,10 +109,16 @@ export function createInputDelivery(ctx, owner, binding, state, notify, trackPen
             notify(t('ext-stale-dropped'), { color: 'warning', timeoutMs: 4000 });
             return;
         }
+        // IDE selection consumption: append the ENQUEUE-time selection as its own
+        // attached-file block — direct construction, never text parsing, failures
+        // silently skipped (an IDE-side extra must never block a send).
+        const selectionAttached = await attachIdeSelection(expansion.blocks, origin.cwd, origin.selection, origin.fs);
         const message = createUserMessage({
             content: expansion.blocks,
             source: { kind: 'user' },
         });
+        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.

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

@@ -1,21 +1,6 @@
+import { type ForegroundShell } from '../compat/shell.js';
 import { type foldBack as FoldBack } from './transcript.js';
 import type { ChannelState, ToolViewPresenter } from './types.js';
-type Shell = {
-    resolve(request: {
-        command: string;
-        workdir?: string;
-        timeoutMs: number;
-    }): unknown;
-    run(spec: unknown): Promise<{
-        stdout: {
-            text: string;
-        };
-        stderr: {
-            text: string;
-        };
-        timedOut: boolean;
-    }>;
-};
 /** Owns local-only transcript mutations, shell output, and live subagent queries. */
 export declare function createLocalActions(deps: {
     ctx: {
@@ -54,9 +39,9 @@ export declare function createLocalActions(deps: {
             badge: string;
             label: string;
         };
-        commandShell(cwd: string): Promise<Shell | undefined>;
+        commandShell(cwd: string): Promise<ForegroundShell | undefined>;
     };
-    shell?: Shell;
+    shell?: ForegroundShell;
     notify: ChannelState['notify'];
 }): {
     loadOlder(): number;
@@ -66,5 +51,4 @@ export declare function createLocalActions(deps: {
     listSubagents(): Promise<string[]>;
     runLocalCommand(command: string, includeInContext: boolean): Promise<void>;
 };
-export {};
 //# 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,EAA+B,KAAK,QAAQ,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEjE,KAAK,KAAK,GAAG;IACX,OAAO,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAA;IACnF,GAAG,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,MAAM,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;CACvG,CAAA;AAED,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,KAAK,GAAG,SAAS,CAAC,CAAA;KAAE,CAAA;IAC3I,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,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;6BAmBT,MAAM,oBAAoB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;EAqBnF"}

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

@@ -4,6 +4,7 @@ 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 function createLocalActions(deps) {
@@ -90,7 +91,7 @@ export function createLocalActions(deps) {
                 return;
             if (executor) {
                 try {
-                    const result = await executor.run(executor.resolve({ command, workdir: cwd, timeoutMs: 30000 }));
+                    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) {

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

@@ -11,13 +11,16 @@ type Binding = ReturnType<typeof createChannelBinding>;
  * This owns the async catalog caches and their generation fences; callers only
  * compose its surface into ChannelState after the state has been constructed.
  */
-export declare function createModelActions(ctx: Context, state: Pick<ChannelState, 'provider' | 'model' | 'reasoningEffort' | 'effortLevels' | 'agentPreset' | 'working' | 'emit'>, deps: {
+export declare function createModelActions(ctx: Context, state: Pick<ChannelState, 'provider' | 'model' | 'reasoningEffort' | 'effortLevels' | 'agentPreset' | 'working' | 'contextWindow' | 'emit'>, deps: {
     owner: Pick<ChannelOwner, 'current'>;
     binding: Pick<Binding, 'capture' | 'isCurrent'>;
     selection: ModelSelectionRef;
     initialEffort?: string;
     agent(): Agent;
     notify: ChannelState['notify'];
+    /** Re-check the context-low warning after a refreshed route metadata
+     * answer carries a newer contextWindow than the session started with. */
+    checkContextWarning(): void;
 }): {
     selection: ModelSelectionRef;
     applyPreferredEffort: () => Promise<void>;

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,MAAM,CAAC,EACzH,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;CAC/B;;gCA2CsC,OAAO,CAAC,IAAI,CAAC;+BAWpB,IAAI;uBAmBN,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;;YAvHnB,MAAM;cAAQ,MAAM;;8BA4HzB,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,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"}

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

@@ -1,9 +1,9 @@
 import { ReasoningEffortId } from '@deepseek-ai/dsh-llm';
-import { readEffortPref, resolveEffortDefault, writeEffortPref } from '../../effortPrefs.js';
+import { nearestLowerEffort, readEffortPref, resolveEffortDefault, writeEffortPref } from '../../effortPrefs.js';
 import { snapshotLiveSessionEvents } from '../compat/liveSession.js';
 import { getLang, t, tOr } from '../../i18n.js';
 import { migratePresetPref, writePresetPref } from '../../presetPrefs.js';
-import { resolveCompatiblePreset, rosterOf } from '../preset-resolution.js';
+import { presetDisplayId, resolveCompatiblePreset, rosterOf } from '../preset-resolution.js';
 /**
  * Route metadata, effort preference and preset/model catalog actions.
  * This owns the async catalog caches and their generation fences; callers only
@@ -13,6 +13,9 @@ export function createModelActions(ctx, state, deps) {
     const { owner, selection, notify } = deps;
     const llmRuntime = ctx.get('llm');
     let preferredEffort = deps.initialEffort ?? readEffortPref();
+    // Last fallback notice shown for a (preferred → applied) pair: bind fires on
+    // every session switch, so an unchanged downgrade must not re-toast.
+    let lastEffortFallbackNotice;
     // State construction cannot call this factory yet; seed the visible value
     // before the root starts binding or exposes the completed ChannelState.
     state.reasoningEffort = preferredEffort;
@@ -27,11 +30,28 @@ export function createModelActions(ctx, state, deps) {
     });
     const effortCurrent = (capture) => owner.current() && deps.binding.isCurrent(capture.binding) &&
         state.provider === capture.provider && state.model === capture.model && effortOperation === capture.operation;
+    /** Route-level metadata shared by every resolveModelInfo consumer. The
+     * context window follows the route, not the binding: a resume rebuilds
+     * the binding (effortCurrent goes false) while the capacity answer for
+     * the same provider/model is still the live truth, so this runs before
+     * any effort freshness gate. Lifetime is the one fence it keeps: the
+     * answer crosses an await, so a Channel released while the lookup was in
+     * flight must neither write into its dead state nor re-arm the
+     * context-low warning through checkContextWarning. */
+    const applyRouteMetadata = (capture, info) => {
+        if (!owner.current())
+            return;
+        if (state.provider === capture.provider && state.model === capture.model && info.context !== undefined) {
+            state.contextWindow = info.context.contextWindow;
+            deps.checkContextWarning();
+        }
+    };
     const resolveEfforts = async (capture) => {
         if (llmRuntime === undefined || typeof llmRuntime.resolveModelInfo !== 'function')
             return 'unavailable';
         try {
             const info = await llmRuntime.resolveModelInfo(capture.provider, capture.model);
+            applyRouteMetadata(capture, info);
             if (!effortCurrent(capture))
                 return 'stale';
             const efforts = info.reasoning?.efforts ?? [];
@@ -55,9 +75,62 @@ export function createModelActions(ctx, state, deps) {
         // This same binding-time lookup is the route's initial tier refresh even
         // without a stored preference. Do not make a separate competing refresh
         // operation that could invalidate the selected preference completion.
-        if (preferredEffort === undefined || !resolved.efforts.some(effort => effort.id === preferredEffort))
+        if (preferredEffort === undefined)
             return;
-        selection.current = { provider: capture.provider, model: capture.model, reasoningEffort: ReasoningEffortId(preferredEffort) };
+        const available = resolved.efforts.map(effort => effort.id);
+        // Exact hit applies silently; a miss falls back to the nearest LOWER tier
+        // the route offers (never up), and both miss paths notify exactly once
+        // per (preferred → applied) pair — bind fires on every session switch,
+        // so an unchanged downgrade must not re-toast.
+        const applied = nearestLowerEffort(preferredEffort, available);
+        if (applied === undefined) {
+            if (lastEffortFallbackNotice?.preferred !== preferredEffort || lastEffortFallbackNotice.applied !== undefined) {
+                lastEffortFallbackNotice = { preferred: preferredEffort, applied: undefined };
+                notify(t('effort-preference-unsupported', { preferred: preferredEffort }), { color: 'warning' });
+            }
+            // Nothing is pinned, so the ROUTE's model default is what actually ships
+            // and the readout (status line, /effort status) must say so. Every switch
+            // tail clears it before this runs (session-resume.ts / model-switch.ts /
+            // session-live-adoption.ts / background-action.ts), but a resumed log's
+            // replayed `request/header` can leave an older tier behind — neither blank
+            // nor "last route's tier" is the truth. Only the readout moves: pinning
+            // the default into selection.current would put a tier the user never chose
+            // onto the wire, which is exactly what "never up" forbids.
+            const shipped = resolved.defaultEffort;
+            if (state.reasoningEffort !== shipped) {
+                state.reasoningEffort = shipped;
+                state.emit();
+            }
+            // An effort pin installed earlier (an exact hit, /effort <id>) survives
+            // every path that is NOT a bind: /settings' effortDefault hands the level
+            // straight to setDefaultEffort → applyPreferredEffort (plugin.ts:804 →
+            // setDefaultEffort above), which never resets selection.current — the four
+            // switch tails that do are all on the bind side. Leaving it would put the
+            // OLD tier back on the wire while the readout above announces the model
+            // default. Drop the effort only: the provider/model half of the pin is
+            // this route's, not the stale tier's. No emit — setDefaultEffort reaches
+            // here through that same non-bind path, and nothing UI-visible reads this
+            // ref (it is the router's ModelSelectionRef, not the IDE ChannelSelection
+            // the status line shows); the readout above already emits when it moves.
+            if (selection.current?.reasoningEffort !== undefined) {
+                selection.current = { provider: capture.provider, model: capture.model };
+            }
+            return;
+        }
+        // Dedupe gates ONLY the toast: bind resets selection.current on every
+        // session switch, so the pin below must re-apply unconditionally — an
+        // early return here would ship the model default from the second session
+        // on (review C1). The status line shows the tier that actually ships.
+        const fresh = lastEffortFallbackNotice?.preferred !== preferredEffort || lastEffortFallbackNotice.applied !== applied;
+        if (applied !== preferredEffort && fresh) {
+            lastEffortFallbackNotice = { preferred: preferredEffort, applied };
+            notify(t('effort-preference-downgraded', { preferred: preferredEffort, applied }), { color: 'warning' });
+        }
+        if (applied === preferredEffort)
+            lastEffortFallbackNotice = undefined;
+        state.reasoningEffort = applied;
+        selection.current = { provider: capture.provider, model: capture.model, reasoningEffort: ReasoningEffortId(applied) };
+        state.emit();
     };
     const refreshEffortLevels = () => {
         if (llmRuntime === undefined || typeof llmRuntime.resolveModelInfo !== 'function')
@@ -65,7 +138,10 @@ export function createModelActions(ctx, state, deps) {
         const capture = captureEffort();
         const generation = ++effortLevelsGeneration;
         void llmRuntime.resolveModelInfo(capture.provider, capture.model).then(info => {
-            if (!effortCurrent(capture) || generation !== effortLevelsGeneration)
+            if (generation !== effortLevelsGeneration)
+                return;
+            applyRouteMetadata(capture, info);
+            if (!effortCurrent(capture))
                 return;
             state.effortLevels = (info.reasoning?.efforts ?? []).map(level => level.id);
             state.emit();
@@ -192,7 +268,7 @@ export function createModelActions(ctx, state, deps) {
             return [];
         const localized = getLang() === 'en';
         try {
-            return (await presets.list()).map(preset => ({ id: preset.id, ...(preset.name === undefined ? {} : { name: localized ? tOr(`preset-name-${preset.id}`, preset.name) : preset.name }), ...(preset.description === undefined ? {} : { description: localized ? tOr(`preset-desc-${preset.id}`, preset.description) : preset.description }), ...(preset.broken === undefined ? {} : { broken: preset.broken }), isDefault: preset.id === presets.defaultId }));
+            return (await presets.list()).map(preset => ({ id: preset.id, ...(preset.name === undefined ? {} : { name: localized ? tOr(`preset-name-${presetDisplayId(preset.id)}`, preset.name) : preset.name }), ...(preset.description === undefined ? {} : { description: localized ? tOr(`preset-desc-${presetDisplayId(preset.id)}`, preset.description) : preset.description }), ...(preset.broken === undefined ? {} : { broken: preset.broken }), isDefault: preset.id === presets.defaultId }));
         }
         catch {
             return [];

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

@@ -5,7 +5,7 @@ import type { ChannelOwner } from './owner.js';
 import { resetSessionProjection } from './session-reset.js';
 import type { ChannelState } from './types.js';
 type Binding = ReturnType<typeof createChannelBinding>;
-type SwitchState = Parameters<typeof resetSessionProjection>[0] & Pick<ChannelState, 'cwd' | 'working' | 'status' | 'agentId' | 'agentPreset' | 'provider' | 'model' | 'contextWindow' | 'effortLevels' | 'reasoningEffort' | 'emit'>;
+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: {
     owner: Pick<ChannelOwner, 'current'>;
@@ -25,7 +25,6 @@ export declare function createModelSwitchAction(ctx: Context, state: SwitchState
     refreshSkillCommands(): Promise<void>;
     clearStagedImages(): void;
     dropModelCompletion(): void;
-    onModelSwitch(model: string): void;
     notify: ChannelState['notify'];
 }): (provider: string, model: string) => Promise<boolean>;
 export {};

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;AAOvE,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,aAAa,GAAG,UAAU,GAAG,OAAO,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,GAAG,MAAM,CAAC,CAAA;AAElJ,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,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B,IAEa,UAAU,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC,CAgEjE"}
+{"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"}