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

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

@@ -1,5 +1,6 @@
 import { randomUUID } from 'node:crypto';
 import { rememberImagePath, transcriptImageFromAttachment } from '../transcript-images.js';
+import { probeImageSize, adaptImageForAdmission, withinDimensionLimits } from '../../utils/imageResize.js';
 import { mentionAttachments } from './mentions.js';
 /** Every visible composer placeholder token, in source order. */
 export const COMPOSER_IMAGE_TOKEN = /\[Image #\d+\]/gu;
@@ -45,6 +46,24 @@ export function firstStaleComposerToken(text, ordered) {
  *  content-addressed and durable; this map only connects editable
  *  placeholders to them. */
 const STAGED_IMAGE_LIMIT = 128;
+/** Failure text for a refusal the ingress gate can state before the store:
+ *  every reason except a missing sharp describes an image the deployment
+ *  would reject anyway, so the paste is refused with the cause named. */
+function admissionFailure(outcome, context) {
+    switch (outcome.reason) {
+        case 'sharp-missing':
+            return context.probe !== null
+                ? `image is ${context.probe.width}×${context.probe.height} (over ${context.limits.maxImageDimension}px) and sharp is unavailable to resample it`
+                : `${context.mediaType} is not accepted by this profile and sharp is unavailable to convert it`;
+        case 'animated-unsupported':
+            return `resizing or converting this animated image cannot keep its frames (${outcome.detail})`;
+        default:
+            return `image could not be decoded to resize or convert it (${outcome.detail})`;
+    }
+}
+/** A store-reported pixel dimension, or the gate's own value when the store
+ *  reported none (lean attachment fakes in the verify scripts). */
+const positiveOr = (value, fallback) => typeof value === 'number' && value > 0 ? value : fallback;
 /**
  * Owns the editable-composer image capabilities: the session epoch, the
  * capability map, its preview facades and the `[Image #N]` compatibility
@@ -121,16 +140,78 @@ export function createComposerImages(ctx, owner, deps) {
         if (generation !== stagedImageEpoch) {
             throw new Error('the session changed while the image was being staged');
         }
-        if (!attachments.imageLimits.mediaTypes.includes(input.mediaType)) {
-            throw new Error(`${input.mediaType} images are not accepted by this profile`);
-        }
         if (input.data.byteLength > attachments.imageLimits.maxImageBytes) {
             throw new Error(`image exceeds this profile's per-image size limit`);
         }
+        // Ingress adaptation (issue #938): the store admits by media type, byte
+        // budget and the per-side / total pixel caps, and refuses on all of them
+        // when the bytes reach it. Measure and re-encode HERE instead, while the
+        // paste can still be explained to the user. Admission is judged against
+        // the pair this gate HANDS OVER (the store may normalize further on its
+        // own — that step is outside this feature), and both triggers are
+        // size-independent:
+        //   * a source media type the profile does not accept is converted, so a
+        //     small PNG is never refused while a large one succeeds;
+        //   * a probe-recognized image inside the caps skips sharp entirely;
+        //   * an unrecognized format is decoded for measurement (never trusted by
+        //     byte budget alone — the #432 gap);
+        //   * with sharp absent the image goes to the store unchanged ONLY while
+        //     it is still admissible as-is — an accepted format whose size the
+        //     probe could not prove fits (upstream stays the backstop); a measured
+        //     oversize, a decode failure, an unaccepted format or a multi-frame
+        //     image this gate would have to re-encode is reported now instead of
+        //     becoming a token that dies at save time.
+        // The runtime guards keep older attachment fakes (whose imageLimits
+        // predate the dimension fields) on the legacy synchronous path.
+        const dimensionCap = attachments.imageLimits.maxImageDimension;
+        const pixelCap = attachments.imageLimits.maxImagePixels;
+        let mediaType = input.mediaType;
+        let data = input.data;
+        let adapted;
+        if (typeof dimensionCap === 'number' && typeof pixelCap === 'number'
+            && Number.isFinite(dimensionCap) && Number.isFinite(pixelCap)) {
+            const dimensionLimits = { maxImageDimension: dimensionCap, maxImagePixels: pixelCap };
+            const probe = probeImageSize(data);
+            const sourceAccepted = attachments.imageLimits.mediaTypes.includes(mediaType);
+            // Only a probe-measured oversize is *known* to be refused by the store;
+            // an unmeasurable image may well be admissible, which is what keeps the
+            // sharp-less degradation a degradation rather than a guess.
+            const knownOversize = probe !== null && !withinDimensionLimits(probe, dimensionLimits);
+            if (!sourceAccepted || probe === null || knownOversize) {
+                const outcome = await adaptImageForAdmission(data, mediaType, dimensionLimits, attachments.imageLimits.mediaTypes);
+                if (outcome.kind === 'adapted') {
+                    // outcome.mediaType comes from the accepted list inside the gate, so
+                    // it is one of the profile's media types at runtime — narrowing,
+                    // not trusting.
+                    mediaType = outcome.mediaType;
+                    data = outcome.data;
+                    adapted = outcome;
+                    if (data.byteLength > attachments.imageLimits.maxImageBytes) {
+                        throw new Error(`image still exceeds this profile's per-image size limit after resampling`);
+                    }
+                }
+                else if (outcome.kind === 'unavailable') {
+                    // Degrade ONLY when the paste is still admissible as-is: an accepted
+                    // format whose size the probe could not prove fits. Everything else
+                    // (measured oversize, unaccepted format, decode failure, animation
+                    // that cannot survive) is a refusal we can state now.
+                    const degraded = outcome.reason === 'sharp-missing' && sourceAccepted && !knownOversize;
+                    if (!degraded)
+                        throw new Error(admissionFailure(outcome, { probe, mediaType, limits: dimensionLimits }));
+                }
+            }
+        }
+        // What the store will actually see: an accepted media type, inside the
+        // byte cap. A media type can still be unaccepted here only when the
+        // adaptation did not run (legacy limits) or could not produce one.
+        if (!attachments.imageLimits.mediaTypes.includes(mediaType)) {
+            throw new Error(`${mediaType} images are not accepted by this profile`);
+        }
         // The source path is TUI-side display metadata; the store only sees the
-        // fields its contract names.
+        // fields its contract names. mediaType/data may be the adapted pair from
+        // the ingress gate above.
         const { path, ...stored } = input;
-        const attachment = await attachments.saveImage(stored);
+        const attachment = await attachments.saveImage({ ...stored, mediaType, data });
         // A session change (/new, resume, rewind, model switch, background)
         // cleared the maps while the save was in flight: the durable object is
         // harmless, but the OLD session's capability must not reach the new one.
@@ -151,7 +232,23 @@ export function createComposerImages(ctx, owner, deps) {
                 break;
             deleteStagedImage(oldest);
         }
-        return { stageId };
+        // The adjustment travels with the capability so the composer can say what
+        // happened instead of letting a rewritten image reach the store silently.
+        // Its numbers come from the STORE's own report, not from what this gate
+        // handed over: the store normalizes further (dimensions, and the media type
+        // too), and a notice quoting the gate's numbers would contradict the
+        // preview card the user is looking at.
+        const adjustment = adapted === undefined ? undefined : {
+            sourceMediaType: input.mediaType,
+            mediaType: attachment.mediaType,
+            width: positiveOr(attachment.width, adapted.width),
+            height: positiveOr(attachment.height, adapted.height),
+            resized: adapted.resized
+                || positiveOr(attachment.width, adapted.width) !== adapted.width
+                || positiveOr(attachment.height, adapted.height) !== adapted.height,
+            flattened: adapted.flattened,
+        };
+        return adjustment === undefined ? { stageId } : { stageId, adjustment };
     };
     return {
         stagedImageGeneration() {
@@ -195,6 +292,8 @@ export function createComposerImages(ctx, owner, deps) {
             return {
                 maxImageBytes: limits.maxImageBytes,
                 maxImagesPerMessage: limits.maxImagesPerMessage,
+                maxImageDimension: limits.maxImageDimension,
+                maxImagePixels: limits.maxImagePixels,
             };
         },
         clearStagedImages() {

package/lib/types/dsh-adapter/channel/context-bookkeeping.d.ts

@@ -5,6 +5,14 @@ export declare function createContextBookkeeping(state: () => {
     tokens: {
         input: number;
     };
+    /** Last turn's billed token shape; the honest numerator for the
+     * context-low warning (input alone misses cached reads/writes, which
+     * resumed sessions replay back at full size). */
+    lastUsage: {
+        input: number;
+        cacheRead: number;
+        cacheWrite: number;
+    } | undefined;
     pending: PendingMessage[];
     emit(): void;
 }, notify: (text: string, options: {

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

@@ -1 +1 @@
-{"version":3,"file":"context-bookkeeping.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/context-bookkeeping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAElE,+EAA+E;AAC/E,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM;IACX,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,IAAI,IAAI,IAAI,CAAA;CACb,EACD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,EACnF,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,EAC3C,mBAAmB,EAAE,MAAM;;;;+BAwBK,IAAI;+BArBJ,IAAI;4BAUL;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAA;KAAE,aAAa,cAAc,CAAC,WAAW,CAAC,KAAG,IAAI;gCAK7G,MAAM,KAAG,IAAI;EAQjD"}
+{"version":3,"file":"context-bookkeeping.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/context-bookkeeping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAElE,+EAA+E;AAC/E,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM;IACX,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB;;qDAEiD;IACjD,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAA;IAC/E,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,IAAI,IAAI,IAAI,CAAA;CACb,EACD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,EACnF,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,EAC3C,mBAAmB,EAAE,MAAM;;;;+BAyBK,IAAI;+BAtBJ,IAAI;4BAWL;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAA;KAAE,aAAa,cAAc,CAAC,WAAW,CAAC,KAAG,IAAI;gCAK7G,MAAM,KAAG,IAAI;EAQjD"}

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

@@ -3,9 +3,10 @@ export function createContextBookkeeping(state, notify, lowContextText, warningB
     const warning = { value: false };
     const checkContextWarning = () => {
         const channel = state();
-        if (warning.value || channel.contextWindow === undefined)
+        if (warning.value || channel.contextWindow === undefined || channel.lastUsage === undefined)
             return;
-        const remaining = channel.contextWindow - channel.tokens.input;
+        const used = channel.lastUsage.input + channel.lastUsage.cacheRead + channel.lastUsage.cacheWrite;
+        const remaining = channel.contextWindow - used;
         if (remaining >= warningBufferTokens)
             return;
         warning.value = true;

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>;