@aiwayds/dsh-tui-pi 0.1.1 → 0.4.0

package/lib/tui.js

@@ -20,13 +20,25 @@
  */
 import { Container, matchesKey, ProcessTerminal, ScrollView, Spacer, Text, TuiAltScreen, VStack, } from '@earendil-works/pi-tui';
 import { CwdBorderEditor } from "./editor.js";
-import { ansiFg, RESET, resolveTheme } from "./theme/index.js";
+import { mergeKeyBindings, resolveKeyAction } from "./keymap.js";
+import { ansiBg, ansiFg, RESET, resolveTheme } from "./theme/index.js";
 export function startTui(options = {}) {
     const terminal = new ProcessTerminal();
     const tui = new TuiAltScreen(terminal, true);
     // Mutable theme ref: `applyTheme` swaps it and every later read (handle
     // getter, baked closures below) observes the new bundle on the next call.
     let themeRef = resolveTheme(process.env, options.themePreference ?? 'auto');
+    // App-owned canvas: every rendered row is painted with the palette's
+    // canvas background (patched pi-tui — see setCanvasBackground), so a theme
+    // switch recolors the WHOLE screen, not only the surfaces that paint their
+    // own bg. Without it the terminal default background shows through the
+    // unpainted rows and "freezes" on switch — most visible inside cmux/gostty,
+    // where the pane background belongs to the multiplexer. DSH_TUI_TRANSPARENT=1
+    // opts back into the old see-through canvas for users who want their
+    // terminal theme to stay visible.
+    const paintCanvas = process.env.DSH_TUI_TRANSPARENT !== '1';
+    if (paintCanvas)
+        tui.setCanvasBackground(ansiBg(themeRef.palette.canvas));
     // ------------------------------------------------------------- component tree --
     // Live Todos widget, pinned ABOVE the chat input: a plain Container with
     // auto height — it renders zero rows while empty and grows to its
@@ -45,6 +57,9 @@ export function startTui(options = {}) {
     let editor = new CwdBorderEditor(tui, themeRef.editor, process.cwd(), {
         infoColor: text => ansiFg(themeRef.palette.fgMuted) + text + RESET,
     });
+    // User keybindings overrides — mutable so `/hotkeys` can live-apply a
+    // write without restarting the TUI (see `setKeyBindings`).
+    let keyBindingsRef = options.keyBindings;
     // External wiring that must survive editor rebuilds.
     let autocompleteProvider;
     let branchProvider;
@@ -74,6 +89,10 @@ export function startTui(options = {}) {
     editor.onSubmit = (text) => {
         if (text.trim() === '')
             return;
+        // Record the submitted message for Up/Down browse before dispatching —
+        // covers both the real path and the smoke-test fallback echo path. The
+        // editor's own `submitValue()` never calls `addToHistory` in pi-tui 0.84.2.
+        editor.addToHistory(text);
         if (options.onSubmit !== undefined) {
             options.onSubmit(text);
             return;
@@ -94,12 +113,23 @@ export function startTui(options = {}) {
      */
     function rebuildEditor() {
         const text = editor.getText();
+        // Preserve the Up/Down browse history AND the mid-browse cursor/draft
+        // across a theme-swap rebuild: the rebuild fires asynchronously (settings
+        // watch, CSI 997 terminal-follow) — precisely while the user may be sitting
+        // mid-browse with a pre-browse draft saved in the base. Copies `history`
+        // and `browse` so the swap restores exactly where the user was.
+        const history = editor.getHistory();
+        const browse = editor.getBrowseState();
         const hadFocus = editor.focused;
         const next = new CwdBorderEditor(tui, themeRef.editor, process.cwd(), {
             infoColor: text => ansiFg(themeRef.palette.fgMuted) + text + RESET,
         });
         next.setText(text);
         next.onSubmit = editor.onSubmit;
+        // `addToHistory` unshifts, so reseed oldest→newest to land in the same
+        // order on the new instance; then restore the browse cursor/draft.
+        next.reseedHistory(history);
+        next.restoreBrowseState(browse);
         if (autocompleteProvider !== undefined)
             next.setAutocompleteProvider(autocompleteProvider);
         if (branchProvider !== undefined)
@@ -140,6 +170,8 @@ export function startTui(options = {}) {
             if (theme === themeRef)
                 return;
             themeRef = theme;
+            if (paintCanvas)
+                tui.setCanvasBackground(ansiBg(theme.palette.canvas));
             rebuildEditor();
             tui.requestRender();
         },
@@ -155,21 +187,92 @@ export function startTui(options = {}) {
             permissionProvider = provider;
             editor.setPermissionProvider(provider);
         },
+        setKeyBindings(bindings) {
+            keyBindingsRef = bindings;
+        },
     };
     // ------------------------------------------------------------- input & focus --
     tui.setFocus(editor);
+    /**
+     * App-level key dispatch — the pi interrupt chain (see keymap.ts):
+     * popup/overlay first (a popup closes itself and never stops the running
+     * task), then the editor's autocomplete, then the running agent — where a
+     * DOUBLE Esc within `DOUBLE_PRESS_MS` stops the whole task (parent +
+     * subagents; the first press only arms the stop window) — and finally the
+     * empty-editor double-press windows. Every decision is delegated to the
+     * pure `resolveKeyAction`; the listener only composes live state, advances
+     * the double-press timestamps, and reports whether the key was consumed.
+     * `matchesKey('escape')` is true for the lone ESC byte `\x1b` — and,
+     * because legacy terminal Ctrl+[ sends the same byte, for Ctrl+[ too
+     * (pi-tui keys.js normalizes both to `escape`).
+     */
+    let lastEscPress = 0;
+    let lastRunningEscPress = 0;
+    let lastCtrlCPress = 0;
+    let lastOverlayEscPress = 0;
+    const isRunning = options.isRunning ?? (() => false);
+    const getRunningAgents = options.getRunningAgents ?? (() => 0);
     tui.addInputListener((data) => {
-        if (matchesKey(data, 'ctrl+c')) {
-            if (options.onInterrupt !== undefined) {
-                options.onInterrupt();
+        const now = Date.now();
+        const action = resolveKeyAction(data, {
+            running: isRunning(),
+            overlayOpen: tui.hasOverlay(),
+            editorHasText: editor.getText() !== '',
+            autocompleteOpen: editor.isShowingAutocomplete(),
+            runningAgents: getRunningAgents(),
+            lastEscPress,
+            lastRunningEscPress,
+            lastCtrlCPress,
+            lastOverlayEscPress,
+        }, now, keyBindingsRef);
+        // Advance the double-press windows for the keys this chain owns. Two
+        // separate Esc windows keep their own clocks: the running-stop arm
+        // (`interrupt-arm-stop` -> `interrupt-cancel`) and the idle double-Esc
+        // (`interrupt-arm` -> `interrupt-double`), so an Esc that armed a stop
+        // never pops /session once the turn settles inside the window, and vice
+        // versa. A fired stop re-arms the running clock at the cancel timestamp:
+        // lashes of held-key Esc after the cancel land <80ms later and resolve as
+        // swallowable `key-repeat` instead of re-noticing another arm. Esc
+        // `key-repeat` never advances an Esc window - a held key must not arm or
+        // complete an Esc double press. A popup-owned Esc (`overlay-esc`) arms
+        // ONLY the post-popup guard clock - never the stop/idle windows.
+        if (action.kind === 'interrupt-arm' || action.kind === 'interrupt-double') {
+            lastEscPress = now;
+        }
+        else if (action.kind === 'interrupt-arm-stop' || action.kind === 'interrupt-cancel') {
+            lastRunningEscPress = now;
+        }
+        else if (action.kind === 'overlay-esc') {
+            lastOverlayEscPress = now;
+        }
+        // The ctrl+c clock advances on EVERY arrival (press, swallowed repeat,
+        // popup-owned - anything but a key-release) so the quit gap measures
+        // CONSECUTIVE key events: a held key's repeats keep the gap small and can
+        // never reach the QUIT_MIN_GAP_MS floor (see resolveCtrlC in keymap.ts).
+        if (action.kind !== 'key-release' && matchesKey(data, mergeKeyBindings(keyBindingsRef).ctrlC)) {
+            lastCtrlCPress = now;
+        }
+        // Pass-through outcomes (popup, autocomplete, unbound keys) let the
+        // focused component handle the key; inert swallows (key-release,
+        // overlay-esc, esc-after-overlay) go nowhere; actionable ones
+        // (key-repeat included, so the executor can abort a pending quit
+        // confirmation on it) go to the caller.
+        if (action.kind !== 'overlay' && action.kind !== 'autocomplete-close' && action.kind !== 'noop'
+            && action.kind !== 'key-release' && action.kind !== 'overlay-esc' && action.kind !== 'esc-after-overlay') {
+            if (options.onKeyAction !== undefined) {
+                options.onKeyAction(action);
             }
-            else {
+            else if (action.kind === 'ctrl-c-cancel' || action.kind === 'ctrl-c-clear'
+                || action.kind === 'ctrl-c-quit' || action.kind === 'ctrl-d-quit') {
+                // Smoke-test fallback: any Ctrl+C family press, or an empty-editor
+                // Ctrl+D, exits - Ctrl+C behaves like the pre-keymap build. (key-repeat
+                // deliberately excluded: no terminal is attached in smoke mode, but a
+                // repeat must never be an exit path by itself.)
                 handle.dispose();
                 process.exit(130);
             }
-            return { consume: true };
         }
-        return undefined;
+        return action.consumes ? { consume: true } : undefined;
     });
     tui.setLayoutRoot(root);
     try {

package/lib/tui.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui.js","sourceRoot":"","sources":["../src/tui.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tui.js","sourceRoot":"","sources":["../src/tui.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwayds/dsh-tui-pi",
-  "version": "0.1.1",
+  "version": "0.4.0",
   "description": "pi-style terminal UI for DeepSeek Harness (dsh) — pi-tui look & feel, dsh slash commands, GitHub light/dark themes, powerline footer",
   "type": "module",
   "main": "lib/index.js",
@@ -18,23 +18,22 @@
     "cordis.patch.yml",
     "patches",
     "pnpm-workspace.yaml",
+    "scripts",
     "templates",
     "README.md",
     "LICENSE"
   ],
   "scripts": {
+    "postinstall": "node scripts/link-dsh-closure.mjs",
     "build": "tsc -p tsconfig.json",
     "check": "tsc --noEmit -p tsconfig.json",
     "pretest": "npm run build",
     "test": "node --test test/*.test.mjs"
   },
   "dependencies": {
-    "@deepseek-ai/dsh-client-schema-form": "0.1.0-rc.6",
     "@earendil-works/pi-tui": "0.84.2"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
-    "@deepseek-ai/schemastery": "3.18.1",
     "@types/node": "^24.0.0",
     "typescript": "~5.9.0"
   },

package/patches/@earendil-works__pi-tui.patch

@@ -1,8 +1,54 @@
+diff --git a/dist/components/editor.d.ts b/dist/components/editor.d.ts
+index a6fedc9e3b36d066e34860d040db6df47d88c432..f4d9afd8bc64f5ce5aafa06bb1aa8db3338c4f7d 100644
+--- a/dist/components/editor.d.ts
++++ b/dist/components/editor.d.ts
+@@ -24,6 +24,8 @@ export interface TextChunk {
+ export declare function wordWrapLine(line: string, maxWidth: number, preSegmented?: Intl.SegmentData[]): TextChunk[];
+ export interface EditorTheme {
+     borderColor: (str: string) => string;
++    /** Optional style for the editor's input text rows. Absent → the terminal default foreground is used (invisible on an app-painted dark canvas). */
++    textColor?: (str: string) => string;
+     selectList: SelectListTheme;
+ }
+ export interface EditorOptions {
 diff --git a/dist/components/editor.js b/dist/components/editor.js
-index 4786b46932b65785cfbd2304610ca77ccead910a..e0e4e39c3be8e5d4d828621ad2d3d8768984add8 100644
+index 4786b46932b65785cfbd2304610ca77ccead910a..93c5f7e1596a0b567cf9fc59600c16596a60e567 100644
 --- a/dist/components/editor.js
 +++ b/dist/components/editor.js
-@@ -463,14 +463,20 @@ export class Editor {
+@@ -433,13 +433,13 @@ export class Editor {
+                     const afterGraphemes = [...this.segment(after, "grapheme")];
+                     const firstGrapheme = afterGraphemes[0]?.segment || "";
+                     const restAfter = after.slice(firstGrapheme.length);
+-                    const cursor = `\x1b[7m${firstGrapheme}\x1b[0m`;
++                    const cursor = `\x1b[7m${firstGrapheme}\x1b[27m`;
+                     displayText = before + marker + cursor + restAfter;
+                     // lineVisibleWidth stays the same - we're replacing, not adding
+                 }
+                 else {
+                     // Cursor is at the end - add highlighted space
+-                    const cursor = "\x1b[7m \x1b[0m";
++                    const cursor = "\x1b[7m \x1b[27m";
+                     displayText = before + marker + cursor;
+                     lineVisibleWidth = lineVisibleWidth + 1;
+                     // If cursor overflows content width into the padding, flag it
+@@ -451,8 +451,14 @@ export class Editor {
+             // Calculate padding based on actual visible width
+             const padding = " ".repeat(Math.max(0, contentWidth - lineVisibleWidth));
+             const lineRightPadding = cursorInPadding ? rightPadding.slice(1) : rightPadding;
+-            // Render the line (no side borders, just horizontal lines above and below)
+-            result.push(`${leftPadding}${displayText}${padding}${lineRightPadding}`);
++            // Render the line (no side borders, just horizontal lines above and below).
++            // The theme's optional textColor styles the input rows — without it they
++            // fall back to the terminal default foreground, which is invisible on an
++            // app-painted dark canvas. Applied per line; the cursor's reverse-video
++            // closes with ESC[27m (reverse off, not full reset) so the themed
++            // foreground survives past a mid-text cursor.
++            const styledText = this.theme.textColor ? this.theme.textColor(displayText) : displayText;
++            result.push(`${leftPadding}${styledText}${padding}${lineRightPadding}`);
+         }
+         // Render bottom border (with scroll indicator if more content below)
+         const linesBelow = layoutLines.length - (this.scrollOffset + visibleLines.length);
+@@ -463,14 +469,20 @@ export class Editor {
          else {
              result.push(horizontal.repeat(width));
          }
@@ -70,3 +116,161 @@ index 2e9231150951c3d3f3e13ac8ae8d623f06d38d5d..d5c8859ecd08fe4eccdc3cfca8ac7a32
      }
      getPrimaryColumnWidth() {
          const { min, max } = this.getPrimaryColumnBounds();
+diff --git a/dist/index.d.ts b/dist/index.d.ts
+index 50b5aeb61f12011642978bc2c31d8a2eb36d17d3..28b70df8001dc6b78056c408bdd6016f34f44e46 100644
+--- a/dist/index.d.ts
++++ b/dist/index.d.ts
+@@ -25,7 +25,7 @@ export { ProcessTerminal, type Terminal } from "./terminal.ts";
+ export { parseOsc11BackgroundColor, parseTerminalColorSchemeReport, type RgbColor, type TerminalColorScheme, } from "./terminal-colors.ts";
+ export { allocateImageId, type CellDimensions, calculateImageRows, deleteAllKittyImages, deleteKittyImage, detectCapabilities, encodeITerm2, encodeKitty, getCapabilities, getCellDimensions, getGifDimensions, getImageDimensions, getJpegDimensions, getPngDimensions, getWebpDimensions, hyperlink, type ImageDimensions, type ImageProtocol, type ImageRenderOptions, imageFallback, renderImage, resetCapabilitiesCache, setCapabilities, setCellDimensions, type TerminalCapabilities, } from "./terminal-image.ts";
+ export { type Component, Container, CURSOR_MARKER, compositeTuiLine, type Focusable, isFocusable, isViewportTUI, type OverlayAnchor, type OverlayHandle, type OverlayMargin, type OverlayOptions, type OverlayUnfocusOptions, type SizeValue, type TUI, type TuiInputListener, type TuiInputListenerResult, type TuiMode, type TuiStopOptions, type ViewportTUI, } from "./tui.ts";
+-export { TuiAltScreen, type TuiAltScreenOptions } from "./tui-alt-screen.ts";
++export { paintCanvasRow, TuiAltScreen, type TuiAltScreenOptions } from "./tui-alt-screen.ts";
+ export { TuiMainScreen, type TuiMainScreenRenderState } from "./tui-main-screen.ts";
+ export { getOsc8LinkAtColumn, sliceByColumn, stripTerminalSequences, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from "./utils.ts";
+ //# sourceMappingURL=index.d.ts.map
+
+diff --git a/dist/index.js b/dist/index.js
+index 97acf774699dded9c5e490f2441a93ec05b73be5..80a1abf6ac515c4df22e3bf78fc0504d50ad6dd4 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -35,7 +35,7 @@ export { parseOsc11BackgroundColor, parseTerminalColorSchemeReport, } from "./te
+ // Terminal image support
+ export { allocateImageId, calculateImageRows, deleteAllKittyImages, deleteKittyImage, detectCapabilities, encodeITerm2, encodeKitty, getCapabilities, getCellDimensions, getGifDimensions, getImageDimensions, getJpegDimensions, getPngDimensions, getWebpDimensions, hyperlink, imageFallback, renderImage, resetCapabilitiesCache, setCapabilities, setCellDimensions, } from "./terminal-image.js";
+ export { Container, CURSOR_MARKER, compositeTuiLine, isFocusable, isViewportTUI, } from "./tui.js";
+-export { TuiAltScreen } from "./tui-alt-screen.js";
++export { paintCanvasRow, TuiAltScreen } from "./tui-alt-screen.js";
+ export { TuiMainScreen } from "./tui-main-screen.js";
+ // Utilities
+ export { getOsc8LinkAtColumn, sliceByColumn, stripTerminalSequences, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from "./utils.js";
+diff --git a/dist/tui-alt-screen.d.ts b/dist/tui-alt-screen.d.ts
+index 848119411c1ff2885b8d1efe97f2f297bd4cd470..96422839632a71e6382a1fc6fcd9b43e7b435609 100644
+--- a/dist/tui-alt-screen.d.ts
++++ b/dist/tui-alt-screen.d.ts
+@@ -1,5 +1,11 @@
+ import type { Terminal } from "./terminal.ts";
+ import { type Component, TuiBase, type TuiStopOptions, VIEWPORT_TUI, type ViewportTUI } from "./tui.ts";
++/**
++ * Paint one screen row with a canvas background SGR: prefix the row with the
++ * bg code, re-inject it after every SGR that clears the background, and pad
++ * to the full row width so the erase-line remainder carries the color too.
++ */
++export declare function paintCanvasRow(line: string, background: string, width: number): string;
+ export interface TuiAltScreenOptions {
+     /** Number of logical lines moved for each mouse-wheel event. */
+     wheelScrollLines?: number;
+@@ -57,11 +63,20 @@ export declare class TuiAltScreen extends TuiBase implements ViewportTUI {
+     private readonly openUrl?;
+     private readonly onRightClickPaste?;
+     private readonly copySelection?;
++    private canvasBackground?;
+     constructor(terminal: Terminal, showHardwareCursor?: boolean, logDirectory?: string, options?: TuiAltScreenOptions);
+     get viewportTop(): number;
+     get isFollowingOutput(): boolean;
+     setLayoutRoot(component: Component | undefined): void;
+     render(width: number): string[];
++    /**
++     * Paint every rendered row with a canvas background SGR (e.g.
++     * "\x1b[48;2;13;17;23m"). `undefined` restores the transparent default
++     * (the terminal background shows through). The code is re-injected after
++     * every SGR that clears the background and rows are padded to the full
++     * width, so the whole screen carries the color — image rows excepted.
++     */
++    setCanvasBackground(background: string | undefined): void;
+     protected getMountedRoots(): readonly Component[];
+     private getPrimaryScrollView;
+     protected beforeTerminalStart(): void;
+diff --git a/dist/tui-alt-screen.js b/dist/tui-alt-screen.js
+index 4edcf845ba7866782a8ec7219508a2dce0073a91..338f2b29e7ba926399f3d663b0b79669c8ac6c13 100644
+--- a/dist/tui-alt-screen.js
++++ b/dist/tui-alt-screen.js
+@@ -21,6 +21,51 @@ const END_SYNCHRONIZED_OUTPUT = "\x1b[?2026l";
+ const OSC133_ZONE_PREFIX = /^(?:\x1b\]133;[ABC](?:\x07|\x1b\\))+/;
+ const OSC133_PROMPT_START = /^\x1b\]133;A(?:\x07|\x1b\\)/;
+ const PAGE_SCROLL_OVERLAP = 4;
++const CSI_PATTERN = /\x1b\[[0-9;:]*[A-Za-z]/g;
++/**
++ * True when an SGR sequence resets the background to the terminal default:
++ * a full reset (empty params or param 0) or the explicit default-bg param 49.
++ * Intentional background sets (48/4…, 48;2;…) do not clear, so they win.
++ */
++function sgrClearsBackground(sequence) {
++    const params = sequence.slice(2, -1);
++    if (params === "") return true;
++    // A color-set (3x foreground / 4x background — ANSI 30-37/40-47, truecolor
++    // 38;2/48;2, 256-color 38;5/48;5) never clears the background, even when a
++    // channel is 0: 48;2;0;121;107 (teal) would otherwise read the 0 as the
++    // reset param and re-inject the canvas over the segment. (49 alone — bg →
++    // default — IS a clear and falls through to the loop below.)
++    if (/^(?:3[0-7]|38;|4[0-8]|48;)/.test(params)) return false;
++    for (const param of params.split(";")) {
++        const code = param === "" ? 0 : Number.parseInt(param, 10);
++        if (Number.isNaN(code)) continue;
++        if (code === 0 || code === 49) return true;
++    }
++    return false;
++}
++/**
++ * Paint one screen row with a canvas background SGR: prefix the row with the
++ * bg code, re-inject it after every SGR that clears the background, and pad
++ * to the full row width so the erase-line remainder carries the color too.
++ * Image rows are the caller's responsibility (they must stay untouched).
++ */
++export function paintCanvasRow(line, background, width) {
++    let painted = background;
++    let last = 0;
++    for (const match of line.matchAll(CSI_PATTERN)) {
++        const sequence = match[0];
++        painted += line.slice(last, match.index);
++        painted += sequence;
++        if (sequence.endsWith("m") && sgrClearsBackground(sequence)) {
++            painted += background;
++        }
++        last = match.index + sequence.length;
++    }
++    painted += line.slice(last);
++    const pad = width - visibleWidth(line);
++    if (pad > 0) painted += " ".repeat(pad);
++    return `${painted}\x1b[0m`;
++}
+ const MAX_CACHED_OFFSCREEN_KITTY_IMAGES = 16;
+ const MAX_CACHED_OFFSCREEN_KITTY_TRANSMISSION_BYTES = 32 * 1024 * 1024;
+ const MAX_CACHED_OFFSCREEN_KITTY_DECODED_BYTES = 64 * 1024 * 1024;
+@@ -64,6 +109,7 @@ export class TuiAltScreen extends TuiBase {
+     openUrl;
+     onRightClickPaste;
+     copySelection;
++    canvasBackground;
+     constructor(terminal, showHardwareCursor, logDirectory, options = {}) {
+         super(terminal, showHardwareCursor, logDirectory);
+         this.implicitDocument = {
+@@ -100,6 +146,18 @@ export class TuiAltScreen extends TuiBase {
+     render(width) {
+         return this.layoutRoot?.render(width) ?? super.render(width);
+     }
++    /**
++     * Paint every rendered row with a canvas background SGR (e.g.
++     * "\x1b[48;2;13;17;23m"). `undefined` restores the transparent default
++     * (the terminal background shows through). The code is re-injected after
++     * every SGR that clears the background and rows are padded to the full
++     * width, so the whole screen carries the color — image rows excepted.
++     */
++    setCanvasBackground(background) {
++        if (this.canvasBackground === background) return;
++        this.canvasBackground = background;
++        this.requestRender();
++    }
+     getMountedRoots() {
+         return this.layoutRoot ? [this.layoutRoot] : this.children;
+     }
+@@ -1099,6 +1157,10 @@ export class TuiAltScreen extends TuiBase {
+                 return line;
+             return sliceByColumn(line, 0, width, true);
+         });
++        if (this.canvasBackground !== undefined) {
++            const canvasBackground = this.canvasBackground;
++            screen = screen.map((line) => (isImageLine(line) ? line : paintCanvasRow(line, canvasBackground, width)));
++        }
+         const fullRedraw = this.previousScreen.length === 0 || this.previousScreenWidth !== width || this.previousScreenHeight !== height;
+         const imagesNeedRedraw = screen.some((line, row) => line !== this.previousScreen[row] && (isImageLine(line) || isImageLine(this.previousScreen[row] ?? "")));
+         const redrawImages = fullRedraw || imagesNeedRedraw;

package/scripts/dev-install.mjs

@@ -0,0 +1,87 @@
+#!/usr/bin/env node
+/**
+ * Dev loop: build → pack → install into a dsh profile — the same flow a real
+ * user gets (`dsh plugin add <tarball>`), no `link:` mount, no live-repo
+ * resolution at runtime.
+ *
+ * Usage:  node scripts/dev-install.mjs [profile]
+ *         (profile defaults to "tui")
+ *
+ * Steps:
+ *   1. `pnpm build`  — emit lib/ from src/.
+ *   2. `pnpm pack`   — produce <name>-<version>.tgz in the repo root.
+ *   3. In ~/.dsh/profiles/<profile>: remove the two installed copies of the
+ *      plugin (bundle name `dsh-tui-pi` + scoped `@aiwayds/dsh-tui-pi`), then
+ *      `pnpm install`. The file: tarball deps are reinstalled from the fresh
+ *      tarball (pnpm does NOT re-read a changed tarball while the node_modules
+ *      entry exists — the remove is what forces the refresh).
+ *
+ * The profile's package.json must declare BOTH keys pointing at the tarball:
+ *   "dsh-tui-pi":        "file:<repo>/<name>-<version>.tgz"   (bundle resolution)
+ *   "@aiwayds/dsh-tui-pi": "file:<repo>/<name>-<version>.tgz" (loader import)
+ * and pnpm-workspace.yaml must carry the pi-tui patchedDependencies (see
+ * ~/.dsh/profiles/tui/pnpm-workspace.yaml).
+ *
+ * After installing: restart dsh (or /reload inside the TUI) to load the new
+ * copy.
+ */
+
+import { execFileSync } from 'node:child_process'
+import { existsSync, readFileSync, rmSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const repoRoot = dirname(dirname(fileURLToPath(import.meta.url)))
+const profileName = process.argv[2] ?? 'tui'
+const profileDir = join(homedir(), '.dsh', 'profiles', profileName)
+
+function run(cmd, args, cwd) {
+  console.log(`$ ${cmd} ${args.join(' ')}`)
+  execFileSync(cmd, args, { cwd, stdio: 'inherit' })
+}
+
+if (!existsSync(join(profileDir, 'package.json'))) {
+  console.error(`[dev-install] profile not found: ${profileDir}`)
+  process.exit(1)
+}
+
+// 1. build
+run('pnpm', ['build'], repoRoot)
+
+// 2. pack
+run('pnpm', ['pack'], repoRoot)
+const manifest = JSON.parse(readFileSync(join(repoRoot, 'package.json'), 'utf8'))
+// pnpm packs scoped packages as <scope>-<name>-<version>.tgz (@aiwayds/dsh-tui-pi
+// → aiwayds-dsh-tui-pi-0.2.0.tgz).
+const tarballName = `${manifest.name.replace(/^@/, '').replace('/', '-')}-${manifest.version}.tgz`
+const tarball = join(repoRoot, tarballName)
+if (!existsSync(tarball)) {
+  console.error(`[dev-install] tarball not produced: ${tarball}`)
+  process.exit(1)
+}
+console.log(`[dev-install] tarball: ${tarball}`)
+
+// B3: the profile's file: deps must reference THIS tarball. After a version
+// bump the profile still points at the old <name>-<oldversion>.tgz — installing
+// would silently load the stale package. Fail loudly instead.
+const profileManifest = JSON.parse(readFileSync(join(profileDir, 'package.json'), 'utf8'))
+for (const key of ['dsh-tui-pi', '@aiwayds/dsh-tui-pi']) {
+  const ref = profileManifest.dependencies?.[key]
+  if (typeof ref !== 'string' || !ref.includes(tarballName)) {
+    console.error(
+      `[dev-install] profile ${profileName} dependency "${key}" does not reference ${tarballName} ` +
+      `(got: ${ref}); update ~/.dsh/profiles/${profileName}/package.json first.`,
+    )
+    process.exit(1)
+  }
+}
+
+// 3. refresh the profile's installed copies (remove forces reinstall of the
+//    changed file: tarball — pnpm skips re-reading it while the entry exists)
+for (const dir of ['dsh-tui-pi', join('@aiwayds', 'dsh-tui-pi')]) {
+  rmSync(join(profileDir, 'node_modules', dir), { recursive: true, force: true })
+}
+run('pnpm', ['install'], profileDir)
+
+console.log(`[dev-install] installed into ${profileName} — restart dsh (or /reload) to load the new copy.`)

package/scripts/link-dsh-closure.mjs

@@ -0,0 +1,85 @@
+/**
+ * Postinstall linker: point every `node_modules/@deepseek-ai/*` entry at the
+ * global dsh closure.
+ *
+ * Why this exists: dsh-tui-pi is a plugin that runs *inside* the installed
+ * dsh CLI, and its source imports the `@deepseek-ai/*` packages (cordis,
+ * dsh-session, dsh-settings, schemastery, …). Those packages are **not**
+ * resolvable from the public npm registry in a usable way (their rc.6
+ * versions live only in the dsh install's own node_modules), so the repo
+ * resolves them from the *global dsh closure* —
+ * `$(realpath $(which dsh))/node_modules/@deepseek-ai` — via plain symlinks.
+ *
+ * The contract: ALL `@deepseek-ai/*` resolve to that single closure instance,
+ * so there is exactly one `@deepseek-ai/cordis` in the type graph. Declaring
+ * any of them in package.json made `pnpm install` create a second local copy
+ * in `.pnpm`, which broke the cordis `declare module` augmentation
+ * (`Property 'settings' does not exist on type 'Context'`), so they must stay
+ * *undeclared*. pnpm then treats the closure links as extraneous — and, as
+ * it prunes entries it once managed, the links can still disappear after an
+ * install. This script re-creates them on every `pnpm install` (postinstall).
+ *
+ * It is a no-op (exit 0) when no global dsh install is found — a dev machine
+ * without dsh simply cannot typecheck against dsh types.
+ */
+
+import { execFileSync } from 'node:child_process'
+import { existsSync, mkdirSync, readdirSync, realpathSync, rmSync, symlinkSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const repoRoot = dirname(dirname(fileURLToPath(import.meta.url)))
+// Guard: this postinstall is a dev-machine convenience for THIS repo. A
+// published tarball carries scripts/ but no src/, and must never touch a
+// consumer's node_modules (it would delete their @deepseek-ai packages and
+// replace them with symlinks into their global dsh closure). pnpm ≥10 blocks
+// dependency lifecycle scripts by default, but npm would run this — exit
+// silently outside the repo.
+if (!existsSync(join(repoRoot, 'src'))) {
+  process.exit(0)
+}
+const scopeDir = join(repoRoot, 'node_modules', '@deepseek-ai')
+
+/** The global dsh package's own `node_modules/@deepseek-ai` closure dir. */
+function findDshClosure() {
+  // 1) Follow the `dsh` bin — the most faithful pointer to the installed CLI
+  //    (`/opt/homebrew/bin/dsh` → …/lib/bin.js → pkg dir → its node_modules).
+  try {
+    const bin = execFileSync('which', ['dsh'], { encoding: 'utf8' }).trim()
+    if (bin !== '') {
+      const real = realpathSync(bin)
+      const closure = join(dirname(dirname(real)), 'node_modules', '@deepseek-ai')
+      if (existsSync(join(closure, 'cordis'))) return closure
+    }
+  } catch { /* dsh not on PATH */ }
+  // 2) Fall back to the global node_modules root.
+  try {
+    const root = execFileSync('npm', ['root', '-g'], { encoding: 'utf8' }).trim()
+    const closure = join(root, '@deepseek-ai', 'dsh', 'node_modules', '@deepseek-ai')
+    if (existsSync(join(closure, 'cordis'))) return closure
+  } catch { /* npm unavailable */ }
+  return undefined
+}
+
+const closure = findDshClosure()
+if (closure === undefined) {
+  console.warn('[link-dsh-closure] global dsh not found — skipping @deepseek-ai links (dev without dsh)')
+  process.exit(0)
+}
+
+mkdirSync(scopeDir, { recursive: true })
+let linked = 0
+for (const name of readdirSync(closure)) {
+  const target = join(scopeDir, name)
+  const source = join(closure, name)
+  try {
+    // Replace any existing entry (stale symlink, or a local .pnpm copy a
+    // previous install created) with the closure link.
+    rmSync(target, { recursive: true, force: true })
+    symlinkSync(source, target, 'junction')
+    linked++
+  } catch (error) {
+    console.warn(`[link-dsh-closure] failed to link ${name}: ${(error instanceof Error ? error.message : String(error))}`)
+  }
+}
+console.log(`[link-dsh-closure] linked ${linked} @deepseek-ai/* packages from ${closure}`)

package/templates/agents/ArtyDuck.md

@@ -0,0 +1,11 @@
+---
+name: ArtyDuck
+display_name: 艺术鸭
+description: "多模态识别"
+color: yellow
+model: minimax-cn/MiniMax-M3
+deep: 0
+thinking: high
+---
+
+你是艺术家,支持多模态模型,理解世界.