dsh-ssh-tui 0.7.1 → 0.7.3

package/lib/terminal-caps.js

@@ -0,0 +1,358 @@
+/**
+ * What the terminal in front of us can actually do.
+ *
+ * `color-depth.ts` answers the palette question; this answers the rest of the
+ * ones that change what we may safely emit: mouse reporting, bracketed paste,
+ * the alternate screen, clipboard writes (OSC 52) and hyperlinks (OSC 8), plus
+ * which family of terminal we are talking to.
+ *
+ * Why it is a module and not a few `if`s: these decisions are made from
+ * environment variables that nobody on the team can test by hand for every
+ * desktop — GNOME Terminal, XFCE Terminal, Konsole, xterm, tmux, the Linux
+ * virtual console, Windows Terminal, a legacy Windows console. So the input is
+ * a parameter, the table is data, and `tests/terminal-caps.test.mjs` pins one
+ * fixture per family on any platform.
+ *
+ * The bias is **not** "assume the best". A capability we claim but the terminal
+ * lacks costs the user something real: `?1000h` on a console that cannot report
+ * SGR coordinates swallows its mouse; OSC 52 where nothing reads it makes
+ * `/copy` look like it worked; the alternate screen on a serial console loses
+ * the scrollback. Where a terminal is known to be marginal, the answer is no,
+ * and `DSH_TUI_TERM_CAPS` is the escape hatch for the user who knows better.
+ *
+ * @module dsh-ssh-tui/terminal-caps
+ */
+import { colorDepth } from './color-depth.js';
+/** Capability names a user may force on or off through `DSH_TUI_TERM_CAPS`. */
+const TOGGLEABLE = ['mouse', 'mouseSgr', 'mouseDrag', 'bracketedPaste', 'alternateScreen', 'osc52', 'osc8', 'title'];
+const TRUTHY = new Set(['1', 'true', 'on', 'yes']);
+const FALSY = new Set(['0', 'false', 'off', 'no']);
+/**
+ * Parse `DSH_TUI_TERM_CAPS`.
+ *
+ * `no-mouse`, `mouse`, `mouse=false` and `mouse = false` all mean what they
+ * look like: the `=` binds first, so the spaced spelling cannot silently invert
+ * into the opposite answer (it did, and `osc52 = false` then *re-enabled* the
+ * clipboard promise). A value outside the two vocabularies, an unknown name or a
+ * bare `no-` is rejected rather than guessed, and the rejects are returned so
+ * `/diag` can show them — this variable is the only feedback channel a user has
+ * when an override does not appear to work.
+ */
+export function parseCapsOverrideReport(raw) {
+    const overrides = {};
+    const ignored = [];
+    // Bind `=` before splitting on whitespace: `mouse = false` must not become the
+    // bare name `mouse` plus two junk tokens, which read as "on".
+    for (const piece of raw.replace(/\s*=\s*/gu, '=').split(/[\s,]+/u)) {
+        const token = piece.trim();
+        if (token === '')
+            continue;
+        const [rawName, rawValue] = token.split('=');
+        const name = (rawName ?? '').trim();
+        const value = rawValue === undefined ? undefined : rawValue.trim().toLowerCase();
+        const negated = name.startsWith('no-');
+        const key = (negated ? name.slice(3) : name);
+        const known = name !== 'no-' && TOGGLEABLE.includes(key);
+        if (!known) {
+            ignored.push(token);
+            continue;
+        }
+        if (negated) {
+            // `no-mouse=false` is not a spelling worth guessing at.
+            if (value !== undefined) {
+                ignored.push(token);
+                continue;
+            }
+            overrides[key] = false;
+            continue;
+        }
+        if (value === undefined || TRUTHY.has(value)) {
+            overrides[key] = true;
+            // Asking for the mouse asks for the whole set the table gives a mouse
+            // terminal: SGR (the only encoding this parser reads, so a bare `mouse`
+            // would otherwise be cleared by the cascade and appear to do nothing) and
+            // held-button motion, without which a drag never arrives. `no-mouseDrag`
+            // on its own still opts out of the drag.
+            if (key === 'mouse' || key === 'mouseSgr') {
+                overrides.mouse = true;
+                overrides.mouseSgr = true;
+                if (overrides.mouseDrag === undefined)
+                    overrides.mouseDrag = true;
+            }
+            continue;
+        }
+        if (FALSY.has(value)) {
+            overrides[key] = false;
+            continue;
+        }
+        ignored.push(token);
+    }
+    return { overrides, ignored };
+}
+/** The overrides alone, for callers that do not report. */
+export function parseCapsOverride(raw) {
+    return parseCapsOverrideReport(raw).overrides;
+}
+/** A version-ish number out of `VTE_VERSION` / `KONSOLE_VERSION`, or undefined. */
+function numericVersion(raw) {
+    const text = (raw ?? '').trim();
+    if (text === '')
+        return undefined;
+    const match = /^(\d+)/u.exec(text);
+    return match === null ? undefined : Number(match[1]);
+}
+/** `true`/`false` from a boolean-ish env value, or undefined when unset. */
+function envFlag(raw) {
+    const text = (raw ?? '').trim().toLowerCase();
+    if (text === '')
+        return undefined;
+    if (['1', 'true', 'on', 'yes'].includes(text))
+        return true;
+    if (['0', 'false', 'off', 'no'].includes(text))
+        return false;
+    return undefined;
+}
+/**
+ * Classify the terminal from the environment.
+ *
+ * Detection is by the markers terminals actually set: Windows Terminal exports
+ * `WT_SESSION`; the VTE family (GNOME Terminal, XFCE Terminal, MATE, Tilix,
+ * Terminator, Guake) exports `VTE_VERSION`; Konsole exports `KONSOLE_VERSION`;
+ * tmux and screen export `TMUX` / `STY` and set a `tmux*` / `screen*` TERM.
+ * Everything else falls back to the TERM name.
+ */
+export function detectTerminalFamily(probe = {}) {
+    const env = probe.env ?? process.env;
+    const platform = probe.platform ?? process.platform;
+    const term = (env.TERM ?? '').trim().toLowerCase();
+    if ((env.TMUX ?? '') !== '' || term.startsWith('tmux')) {
+        return { family: 'tmux', label: `tmux (TERM=${term || 'unset'})` };
+    }
+    if ((env.STY ?? '') !== '' || term.startsWith('screen')) {
+        return { family: 'screen', label: `screen (TERM=${term || 'unset'})` };
+    }
+    if (term === 'dumb')
+        return { family: 'dumb', label: 'dumb terminal (assuming the xterm baseline)' };
+    // `linux` (and the old VT names) are POSIX console names: on Windows they can
+    // only come from a wrapper, and the capabilities they describe — no mouse, no
+    // paste, no alternate screen — are not what the ConPTY behind that wrapper
+    // has. The Windows classification below decides instead.
+    if (platform !== 'win32' && (term === 'linux' || term === 'vt100' || term === 'vt220')) {
+        return { family: 'linux-console', label: 'Linux virtual console' };
+    }
+    const vte = numericVersion(env.VTE_VERSION);
+    if (vte !== undefined) {
+        // VTE is the widget, not the app: name the app when it says so.
+        const program = (env.TERM_PROGRAM ?? '').trim();
+        const app = program !== '' ? program : 'GNOME/XFCE/Fork (VTE)';
+        return { family: 'vte', label: `${app} (VTE ${vte})` };
+    }
+    const konsole = numericVersion(env.KONSOLE_VERSION);
+    if (konsole !== undefined)
+        return { family: 'konsole', label: `Konsole (${konsole})` };
+    if (platform === 'win32') {
+        if ((env.WT_SESSION ?? '').trim() !== '') {
+            return { family: 'windows-terminal', label: 'Windows Terminal' };
+        }
+        // An empty TERM is what PowerShell and cmd.exe report: that is conhost, the
+        // classic console host, and it is the one Windows terminal without OSC 52.
+        // A *named* TERM means something else is driving the console — Git-Bash and
+        // MSYS2 set `xterm-256color`, mintty identifies itself the same way — and
+        // those are xterm-family terminals that do more than conhost, so they fall
+        // through to the TERM matching below rather than being read as conhost.
+        if (term === '')
+            return { family: 'windows-console', label: 'Windows console (conhost)' };
+    }
+    if (term === '') {
+        return platform === 'win32'
+            ? { family: 'windows-console', label: 'Windows console (conhost)' }
+            : { family: 'unknown', label: 'unknown (TERM unset)' };
+    }
+    if (term.includes('xterm') || term.includes('rxvt') || term.includes('alacritty') || term.includes('kitty') || term.includes('wezterm')) {
+        return { family: 'xterm', label: `${term}` };
+    }
+    if (platform === 'win32') {
+        // A Windows host whose TERM names nothing we know (a wrapper handing us
+        // `linux`, or anything else): conhost is what is actually underneath, and
+        // `unknown` would claim bracketed paste and hyperlinks this console lacks.
+        return { family: 'windows-console', label: 'Windows console (conhost)' };
+    }
+    return { family: 'unknown', label: term };
+}
+/**
+ * Every capability for the terminal in front of us.
+ *
+ * `DSH_TUI_TERM_CAPS` overrides individual answers (`no-mouse`, `osc52=false`);
+ * `DSH_TUI_NO_ALT_SCREEN` and `DSH_TUI_OSC8` keep working because they came
+ * first and are documented.
+ */
+export function terminalCapabilities(probe = {}) {
+    const env = probe.env ?? process.env;
+    const platform = probe.platform ?? process.platform;
+    const { family, label } = detectTerminalFamily({ env, platform });
+    const colors = colorDepth(env, platform);
+    const base = {
+        // A terminal that paints nothing is not a terminal we may drive.
+        mouse: false,
+        mouseSgr: false,
+        mouseDrag: false,
+        bracketedPaste: false,
+        alternateScreen: false,
+        osc52: false,
+        osc8: false,
+        title: false,
+    };
+    switch (family) {
+        case 'windows-terminal':
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                // Windows Terminal understands OSC 52 from 1.15 on; it is the only
+                // Windows host that does, conhost never has. Claiming it there is what
+                // makes `/copy` silently useless on the others.
+                osc52: true, osc8: true, title: true,
+            });
+            break;
+        case 'windows-console':
+            Object.assign(base, {
+                // conhost has had VT mouse input since Windows 10 1703, and mouse
+                // reporting is how cards expand, so it stays on — the same trade every
+                // other platform makes. What it genuinely lacks is the OSC pair:
+                // conhost never writes the clipboard and ignores hyperlinks, which is
+                // what `/copy` has to say out loud there.
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                // Bracketed paste reached conhost only in 2022-11 (Windows 11 22H2), and
+                // Windows 10 is still the PowerShell/cmd case this row is about. The
+                // paste path survives without it (a multi-line burst is still treated as
+                // one paste), so under-claiming here costs nothing and the matrix stays
+                // true for the older console.
+                bracketedPaste: false,
+                alternateScreen: true,
+                osc52: false, osc8: false, title: true,
+            });
+            break;
+        case 'vte':
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                // VTE has never implemented OSC 52: the request is still open upstream
+                // (GNOME/vte#125) and the widget only *parses* the sequence. Every VTE
+                // desktop shares the gap — GNOME Terminal, XFCE Terminal, MATE, Tilix,
+                // Terminator, Ptyxis — which made this the single most common terminal
+                // to promise a clipboard write it silently drops. `?` would be kinder
+                // than `no`, but the user cannot tell the difference when pasting.
+                osc52: false,
+                // OSC 8 arrived in VTE 0.50, so long-term distributions can lack it.
+                osc8: (numericVersion(env.VTE_VERSION) ?? 0) >= 5000,
+                title: true,
+            });
+            break;
+        case 'konsole':
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                // Write-only OSC 52 landed in Konsole 24.12 (KDE bug 372116; the patch
+                // was merged 2024-07 and 24.08 missed the cut), and KONSOLE_VERSION is
+                // YYMMDD (`241200` is 24.12) — so Kubuntu 22.04/24.04 and Debian 12 all
+                // ignore the write. 21.12 was Konsole's OSC 8.
+                osc52: (numericVersion(env.KONSOLE_VERSION) ?? 0) >= 241200,
+                osc8: true, title: true,
+            });
+            break;
+        case 'xterm':
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                // xterm gates clipboard writes behind `allowWindowOps`, which defaults
+                // to off in recent builds; assuming it works is how a user ends up with
+                // an empty clipboard and no explanation.
+                osc52: false, osc8: true, title: true,
+            });
+            break;
+        case 'tmux':
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                // tmux forwards OSC 52 only with `set -g set-clipboard on`.
+                osc52: false, osc8: true, title: true,
+            });
+            break;
+        case 'screen':
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                osc52: false, osc8: false, title: true,
+            });
+            break;
+        case 'linux-console':
+            Object.assign(base, {
+                mouse: false, mouseSgr: false, mouseDrag: false,
+                bracketedPaste: false,
+                // Keeping the TUI's own screen here costs the user the console
+                // scrollback they navigate with Shift+PgUp.
+                alternateScreen: false,
+                osc52: false, osc8: false, title: false,
+            });
+            break;
+        case 'dumb':
+            // A terminal that says `dumb` may still be a capable one behind a wrapper
+            // (or a CI pty), and a mode-setting escape it does not understand is
+            // ignored, while *not* sending it silently disables the feature. So the
+            // baseline stands; only the clipboard and hyperlink promises are dropped,
+            // because those are the claims a user cannot verify by looking.
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                osc52: false, osc8: false, title: false,
+            });
+            break;
+        case 'unknown':
+            // Something we cannot name: assume the xterm baseline except for the two
+            // capabilities that cost the user when wrongly claimed.
+            Object.assign(base, {
+                mouse: true, mouseSgr: true, mouseDrag: true,
+                bracketedPaste: true, alternateScreen: true,
+                osc52: false, osc8: true, title: true,
+            });
+            break;
+    }
+    if (envFlag(env.DSH_TUI_NO_ALT_SCREEN) === true)
+        base.alternateScreen = false;
+    const osc8Flag = envFlag(env.DSH_TUI_OSC8);
+    if (osc8Flag !== undefined)
+        base.osc8 = osc8Flag;
+    const override = parseCapsOverrideReport(env.DSH_TUI_TERM_CAPS ?? '');
+    Object.assign(base, override.overrides);
+    if (base.mouse === false) {
+        base.mouseSgr = false;
+        base.mouseDrag = false;
+    }
+    if (base.mouseSgr === false) {
+        // The parser understands SGR reports only (`\x1b[<b;x;yM`); enabling the
+        // legacy X10 encoding would capture the terminal's mouse and deliver events
+        // the TUI drops — dead mouse *and* no native selection. So no SGR means no
+        // mouse. (Asking for the mouse turns SGR on with it — see the parser — so
+        // this only bites when SGR was refused on purpose.)
+        base.mouse = false;
+        base.mouseDrag = false;
+    }
+    return { family, label, colors, ignoredOverrides: override.ignored, ...base };
+}
+/** Mouse-tracking sequences to enable, in one write. Empty when unsupported. */
+export function mouseEnableSequence(caps) {
+    if (!caps.mouse)
+        return '';
+    return `${caps.mouseSgr ? '\x1b[?1006h' : ''}${caps.mouseDrag ? '\x1b[?1002h' : ''}\x1b[?1000h`;
+}
+/** Mouse-tracking sequences to disable. Always safe to emit: `l` on a mode the
+ *  terminal never enabled is ignored, and leaving a mode on is not. */
+export function mouseDisableSequence() {
+    return '\x1b[?1000l\x1b[?1002l\x1b[?1006l';
+}
+/** Bracketed-paste enable/disable, or empty when the terminal lacks it. */
+export function bracketedPasteSequence(caps, on) {
+    if (!caps.bracketedPaste)
+        return '';
+    return on ? '\x1b[?2004h' : '\x1b[?2004l';
+}
+//# sourceMappingURL=terminal-caps.js.map

package/lib/terminal-caps.js.map

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

package/lib/tool-present.js

@@ -3,7 +3,7 @@
  */
 import { SIDE_BY_SIDE_GUTTER, diffHunks, diffLayout, diffLines, sideBySideRows, wordDiffSpans, } from './line-diff.js';
 import { t } from './i18n/index.js';
-import { jobAlias } from './job-label.js';
+import { jobAlias, looksLikeOpaqueId } from './job-label.js';
 import { padToWidth, sliceCodePoints, truncate, wrap } from './term-text.js';
 import { firstString, parseJsonArgs, scalarText } from './json-args.js';
 import { parsePlanTodos, planTitleFromMarkdown, todoProgressBar, todoProgressLabel, todoSummary, askSummary, TODO_STATUS_MARK, todoItemKind, planMarkdownFromArgs, } from './plan.js';
@@ -63,18 +63,37 @@ export function countDiffLines(hunks) {
     }
     return total;
 }
-/** Added / removed line counts for a diff (`oldText: null` means a new file). */
+/**
+ * Added / removed line counts for a diff (`oldText: null` means a new file).
+ *
+ * The counts are the *diff's*, not the operands': a three-line snippet with one
+ * changed line is `+1 -1`, not `+3 -3`. Counting whole operands made the card
+ * header disagree with everything under it — the footer and, since the columns
+ * got their colour back, the coloured rows themselves said one line had changed
+ * while the header claimed the entire snippet had.
+ *
+ * The LCS behind `diffLines` is not free, and a paint asks for this stat on
+ * every edit card it draws, so the answer is memoized on the hunk array — the
+ * same array the row keeps for its whole life.
+ */
+const diffStatCache = new WeakMap();
 export function countDiffAddDel(hunks) {
-    const stat = { add: 0, del: 0 };
     if (hunks === undefined)
-        return stat;
+        return { add: 0, del: 0 };
+    const cached = diffStatCache.get(hunks);
+    if (cached !== undefined)
+        return { ...cached };
+    const stat = { add: 0, del: 0 };
     for (const hunk of hunks) {
-        stat.add += hunk.newText === '' ? 0 : hunk.newText.split('\n').length;
-        if (hunk.oldText !== null) {
-            stat.del += hunk.oldText === '' ? 0 : hunk.oldText.split('\n').length;
+        for (const line of diffLines(hunk.oldText ?? '', hunk.newText)) {
+            if (line.kind === 'add')
+                stat.add += 1;
+            else if (line.kind === 'del')
+                stat.del += 1;
         }
     }
-    return stat;
+    diffStatCache.set(hunks, stat);
+    return { ...stat };
 }
 /**
  * Per-file change counts for the compact view's collapsed line.
@@ -234,7 +253,7 @@ const TOOL_TITLE_KEYS = [
     'web_search', 'web_fetch',
 ];
 export function toolTitle(name) {
-    if (name === '' || name.startsWith('call-'))
+    if (name === '' || looksLikeOpaqueId(name))
         return t('card.tool');
     return t(`toolTitle.${name}`, undefined, name === 'tool' ? t('card.tool') : name);
 }
@@ -569,10 +588,12 @@ export function renderToolDiff(diffs, maxLines, width) {
 /**
  * The diff rows with the two columns of a wide terminal.
  *
- * A paired row is neutral rather than styled as an addition or a removal: it is
- * both, and styling it as one would mislabel half of it. The `-`/`+` markers
- * inside each column carry the meaning, and the emphasis still marks the
- * characters that differ.
+ * A paired row is a removal on the left and an addition on the right at the
+ * same time, so it carries one role *per column* (`columns`) instead of one kind
+ * for the row — the painter colours each side on its own and leaves the gutter
+ * alone. A row with a single side is wholly that change, and a context row,
+ * which reads the same on both sides, stays neutral. The `-`/`+` markers inside
+ * each column still carry the meaning on a terminal without colour.
  */
 function paintHunksSideBySide(perHunk, context, width) {
     const column = Math.max(20, Math.floor((width - 2 - SIDE_BY_SIDE_GUTTER.length) / 2));
@@ -594,10 +615,21 @@ function paintHunksSideBySide(perHunk, context, width) {
                     ...row.leftSpans,
                     ...row.rightSpans.map(span => ({ start: span.start + column + SIDE_BY_SIDE_GUTTER.length, end: span.end + column + SIDE_BY_SIDE_GUTTER.length })),
                 ];
+                // A side with no line of its own gets no colour: a removal is red where
+                // the removal is, an addition green where the addition is, and the
+                // blank half of a one-sided change stays neutral instead of turning the
+                // whole row into a bar with nothing in it.
+                const columns = [
+                    ...(row.context || row.left === '' ? [] : [{ start: 0, end: column, kind: 'diff-del' }]),
+                    ...(row.context || row.right === ''
+                        ? []
+                        : [{ start: column + SIDE_BY_SIDE_GUTTER.length, end: text.length, kind: 'diff-add' }]),
+                ];
                 rows.push({
-                    kind: row.context ? 'tool-result' : 'tool-result',
+                    kind: 'tool-result',
                     text,
                     ...(spans.length === 0 ? {} : { spans }),
+                    ...(columns.length === 0 ? {} : { columns }),
                 });
             }
         }