@sagmans/dsh-tui 0.2.0 → 0.3.0

package/lib/ui/markdown.d.ts

@@ -1,4 +1,5 @@
 import { type MarkdownTheme } from '@earendil-works/pi-tui';
+import type { MermaidTransform } from './mermaid.ts';
 /** Parsed messages kept for redraws; everything above this is cold transcript. */
 export declare const MARKDOWN_CACHE_LIMIT = 64;
 /**
@@ -10,9 +11,17 @@ export declare const MARKDOWN_CACHE_LIMIT = 64;
  */
 export declare class MarkdownRenderer {
     private readonly theme;
+    private readonly mermaid?;
     private readonly parsed;
-    constructor(theme: MarkdownTheme);
-    render(text: string, width: number): string[];
+    constructor(theme: MarkdownTheme, mermaid?: MermaidTransform | undefined);
+    render(text: string, width: number, live?: boolean): string[];
+    /**
+     * The parse options this renderer installs, absent when nothing transforms.
+     *
+     * The flag is captured rather than read per call: the component caches the
+     * rows it drew, so the value that built it is the only one it could honour.
+     */
+    private options;
     /**
      * Drop parsed messages after a theme change.
      *

package/lib/ui/markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/ui/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAErE,kFAAkF;AAClF,eAAO,MAAM,oBAAoB,KAAK,CAAA;AAEtC;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8B;gBAExB,KAAK,EAAE,aAAa;IAEjD,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAgB7C;;;;;;OAMG;IACH,UAAU,IAAI,IAAI;CAInB"}
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/ui/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAC3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAEpD,kFAAkF;AAClF,eAAO,MAAM,oBAAoB,KAAK,CAAA;AAEtC;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAiB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAF5E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8B;gBAExB,KAAK,EAAE,aAAa,EAAmB,OAAO,CAAC,EAAE,gBAAgB,YAAA;IAE9F,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,UAAQ,GAAG,MAAM,EAAE;IAqB3D;;;;;OAKG;IACH,OAAO,CAAC,OAAO;IAMf;;;;;;OAMG;IACH,UAAU,IAAI,IAAI;CAInB"}

package/lib/ui/markdown.js

@@ -10,27 +10,46 @@ export const MARKDOWN_CACHE_LIMIT = 64;
  */
 export class MarkdownRenderer {
     theme;
+    mermaid;
     parsed = new Map();
-    constructor(theme) {
+    constructor(theme, mermaid) {
         this.theme = theme;
+        this.mermaid = mermaid;
     }
-    render(text, width) {
-        let message = this.parsed.get(text);
+    render(text, width, live = false) {
+        // A streaming reply can settle on the very text it last streamed, and the
+        // two renderings are not the same: only a settled one may report what a
+        // drawing lost, and a mode may draw one and withhold the other. The flag is
+        // part of a message's identity for the same reason the text is.
+        const key = live ? `live\u0000${text}` : `settled\u0000${text}`;
+        let message = this.parsed.get(key);
         if (message === undefined) {
             if (this.parsed.size >= MARKDOWN_CACHE_LIMIT) {
                 const oldest = this.parsed.keys().next();
                 if (oldest.done !== true)
                     this.parsed.delete(oldest.value);
             }
-            message = new Markdown(text, 0, 0, this.theme);
+            message = new Markdown(text, 0, 0, this.theme, undefined, this.options(live));
         }
         else {
             // Reinserting keeps a message that is still on screen from ageing out.
-            this.parsed.delete(text);
+            this.parsed.delete(key);
         }
-        this.parsed.set(text, message);
+        this.parsed.set(key, message);
         return message.render(Math.max(1, Math.floor(width)));
     }
+    /**
+     * The parse options this renderer installs, absent when nothing transforms.
+     *
+     * The flag is captured rather than read per call: the component caches the
+     * rows it drew, so the value that built it is the only one it could honour.
+     */
+    options(live) {
+        const mermaid = this.mermaid;
+        if (mermaid === undefined)
+            return undefined;
+        return { transform: (markdown, availableWidth) => mermaid(markdown, availableWidth, live) };
+    }
     /**
      * Drop parsed messages after a theme change.
      *

package/lib/ui/markdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/ui/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAsB,MAAM,wBAAwB,CAAA;AAErE,kFAAkF;AAClF,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAA;AAEtC;;;;;;GAMG;AACH,MAAM,OAAO,gBAAgB;IAGE;IAFZ,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAA;IAErD,YAA6B,KAAoB;QAApB,UAAK,GAAL,KAAK,CAAe;IAAG,CAAC;IAErD,MAAM,CAAC,IAAY,EAAE,KAAa;QAChC,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACnC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,oBAAoB,EAAE,CAAC;gBAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAA;gBACxC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;oBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC5D,CAAC;YACD,OAAO,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAChD,CAAC;aAAM,CAAC;YACN,uEAAuE;YACvE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACvD,CAAC;IAED;;;;;;OAMG;IACH,UAAU;QACR,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,CAAC,UAAU,EAAE,CAAA;QAChE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IACrB,CAAC;CACF"}
+{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/ui/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA4C,MAAM,wBAAwB,CAAA;AAG3F,kFAAkF;AAClF,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAA;AAEtC;;;;;;GAMG;AACH,MAAM,OAAO,gBAAgB;IAGE;IAAuC;IAFnD,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAA;IAErD,YAA6B,KAAoB,EAAmB,OAA0B;QAAjE,UAAK,GAAL,KAAK,CAAe;QAAmB,YAAO,GAAP,OAAO,CAAmB;IAAG,CAAC;IAElG,MAAM,CAAC,IAAY,EAAE,KAAa,EAAE,IAAI,GAAG,KAAK;QAC9C,0EAA0E;QAC1E,wEAAwE;QACxE,4EAA4E;QAC5E,gEAAgE;QAChE,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAA;QAC/D,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAClC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,oBAAoB,EAAE,CAAC;gBAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAA;gBACxC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;oBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC5D,CAAC;YACD,OAAO,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;QAC/E,CAAC;aAAM,CAAC;YACN,uEAAuE;YACvE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAC7B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACvD,CAAC;IAED;;;;;OAKG;IACK,OAAO,CAAC,IAAa;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAA;QAC3C,OAAO,EAAE,SAAS,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE,CAAA;IAC7F,CAAC;IAED;;;;;;OAMG;IACH,UAAU;QACR,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,CAAC,UAAU,EAAE,CAAA;QAChE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IACrB,CAAC;CACF"}

package/lib/ui/mermaid.d.ts

@@ -0,0 +1,44 @@
+import type { MermaidMode } from '../theme-settings.ts';
+import type { TuiTheme } from '../theme.ts';
+/** Drawings kept before the oldest is laid out again; a streaming reply redraws per delta. */
+export declare const MERMAID_CACHE_LIMIT = 32;
+/**
+ * The largest source this surface lays out.
+ *
+ * Layout is synchronous and happens inside a frame, and a streaming reply asks
+ * for it again on every delta, so past this the frame costs more than the
+ * drawing is worth and the source stays. Well above what the renderer's own
+ * node cap can fill, so no drawing a reader actually sees is kept out.
+ */
+export declare const MERMAID_MAX_SOURCE: number;
+export interface MermaidOptions {
+    readonly theme: TuiTheme;
+    /** Read per render, so a settings edit reaches a session that is already on screen. */
+    readonly mode: () => MermaidMode;
+}
+/**
+ * Rewrite one message's markdown, with `live` telling a streaming reply from a settled one.
+ *
+ * The width is the columns the message actually has, and a drawing that needs
+ * more than that is left as source rather than truncated: a mutilated diagram
+ * is worse than the text a reader can still read.
+ */
+export type MermaidTransform = (markdown: string, availableWidth: number, live: boolean) => string;
+/**
+ * Draw a reply's mermaid fences as terminal art.
+ *
+ * Replacements are spliced into the message at the offsets the lexer reported,
+ * never rebuilt from the tokens: lexing can decide something is not worth a
+ * token — a duplicate reference definition, for one — and a message that merely
+ * mentions mermaid would then change under a reader who asked for nothing. Text
+ * the transform does not draw is copied through byte for byte.
+ *
+ * A fence is replaced before the markdown is parsed, because that is the only
+ * moment the source is still whole: once tokens are flowing the drawing's rows
+ * would be re-wrapped as prose and lose the spacing they are made of. Each row
+ * is therefore emitted as an inline code span, which the markdown renderer
+ * keeps verbatim, and rows are separated by hard breaks so a diagram survives
+ * as one block instead of one paragraph.
+ */
+export declare function createMermaidTransform(options: MermaidOptions): MermaidTransform;
+//# sourceMappingURL=mermaid.d.ts.map

package/lib/ui/mermaid.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../../src/ui/mermaid.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAQ3C,8FAA8F;AAC9F,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,QAAY,CAAA;AA8B3C,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;IACxB,uFAAuF;IACvF,QAAQ,CAAC,IAAI,EAAE,MAAM,WAAW,CAAA;CACjC;AAED;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,MAAM,CAAA;AAgElG;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,gBAAgB,CAkEhF"}

package/lib/ui/mermaid.js

@@ -0,0 +1,178 @@
+import { Marked, visibleWidth } from '@earendil-works/pi-tui';
+import { render } from 'lovely-mermaid';
+/** The one fence language that asks for a drawing. */
+const MERMAID_FENCE_LANG = 'mermaid';
+/** The cheap guard before lexing; case-insensitive because a fence may shout. */
+const MERMAID_MENTION = /mermaid/iu;
+/** Drawings kept before the oldest is laid out again; a streaming reply redraws per delta. */
+export const MERMAID_CACHE_LIMIT = 32;
+/**
+ * The largest source this surface lays out.
+ *
+ * Layout is synchronous and happens inside a frame, and a streaming reply asks
+ * for it again on every delta, so past this the frame costs more than the
+ * drawing is worth and the source stays. Well above what the renderer's own
+ * node cap can fill, so no drawing a reader actually sees is kept out.
+ */
+export const MERMAID_MAX_SOURCE = 32 * 1024;
+/** What ends a row without starting a paragraph; two trailing spaces are CommonMark's hard break. */
+const HARD_BREAK = '  \n';
+/** An empty code span has no height, so a blank row stands on a non-breaking space. */
+const BLANK_ROW = '\u00a0';
+const WARNING_LEAD = 'Mermaid diagram not rendered: ';
+const WARNING_MORE = ' (+';
+/** A backtick run inside a row needs a longer delimiter, and a row may hold one inside a label. */
+const BACKTICK_RUN = /`+/gu;
+/**
+ * Which element each run of a drawing is, as the token that draws it.
+ *
+ * The renderer reports what a run *is* and never a colour, so this table is the
+ * only place that relates a diagram to the theme; everything else works with
+ * roles. Author-assigned classes are deliberately not consulted: a reader's
+ * theme is the surface's, not the diagram's.
+ */
+const ROLE_TOKEN = {
+    border: 'markdown.diagram.border',
+    text: 'markdown.diagram.text',
+    edge: 'markdown.diagram.edge',
+    edgeLabel: 'markdown.diagram.edgeLabel',
+    title: 'markdown.diagram.title',
+};
+function isMermaidFence(token) {
+    // The info string may carry more than the language, and a fence may shout.
+    return token.type === 'code' && token.lang?.trim().split(/\s+/, 1)[0]?.toLowerCase() === MERMAID_FENCE_LANG;
+}
+/** One drawing row as the code span that keeps its spacing. */
+function codeSpan(row) {
+    const content = row === '' ? BLANK_ROW : row;
+    let longest = 0;
+    // Iterated, not spread: a row can carry more runs than a call holds arguments.
+    for (const run of content.matchAll(BACKTICK_RUN)) {
+        if (run[0].length > longest)
+            longest = run[0].length;
+    }
+    const fence = '`'.repeat(longest + 1);
+    // A row that starts or ends with a backtick would otherwise be read as the delimiter itself.
+    const padding = content.startsWith('`') || content.endsWith('`') ? ' ' : '';
+    return `${fence}${padding}${content}${padding}${fence}`;
+}
+/**
+ * The columns a drawing really occupies.
+ *
+ * The renderer measures with its own tables, and they are not always the
+ * terminal's: a halfwidth kana plus a combining mark counts one column there
+ * and two on screen. The rows are what the reader gets, so the rows decide.
+ */
+function drawnWidth(art) {
+    let widest = 0;
+    for (const row of art.plain) {
+        const columns = visibleWidth(row);
+        if (columns > widest)
+            widest = columns;
+    }
+    return widest;
+}
+function warningText(art) {
+    const first = art.warnings[0] ?? '';
+    const rest = art.warnings.length - 1;
+    return `${WARNING_LEAD}${first}${rest > 0 ? `${WARNING_MORE}${rest} more)` : ''}`;
+}
+/**
+ * Lay out each distinct source once.
+ *
+ * A streaming reply asks for the same fences again on every delta, and laying
+ * out a diagram is the expensive half of drawing it; the other half is styling
+ * runs, which stays per call so a theme swap needs no invalidation.
+ */
+function artCache() {
+    const drawn = new Map();
+    return source => {
+        if (drawn.has(source))
+            return drawn.get(source) ?? null;
+        const art = render(source);
+        if (drawn.size >= MERMAID_CACHE_LIMIT) {
+            const oldest = drawn.keys().next();
+            if (oldest.done !== true)
+                drawn.delete(oldest.value);
+        }
+        drawn.set(source, art);
+        return art;
+    };
+}
+/**
+ * Draw a reply's mermaid fences as terminal art.
+ *
+ * Replacements are spliced into the message at the offsets the lexer reported,
+ * never rebuilt from the tokens: lexing can decide something is not worth a
+ * token — a duplicate reference definition, for one — and a message that merely
+ * mentions mermaid would then change under a reader who asked for nothing. Text
+ * the transform does not draw is copied through byte for byte.
+ *
+ * A fence is replaced before the markdown is parsed, because that is the only
+ * moment the source is still whole: once tokens are flowing the drawing's rows
+ * would be re-wrapped as prose and lose the spacing they are made of. Each row
+ * is therefore emitted as an inline code span, which the markdown renderer
+ * keeps verbatim, and rows are separated by hard breaks so a diagram survives
+ * as one block instead of one paragraph.
+ */
+export function createMermaidTransform(options) {
+    const parser = new Marked();
+    const draw = artCache();
+    /**
+     * The block a body becomes, held apart from the text on either side.
+     *
+     * Once drawn, the rows are a paragraph, so a blank line on each side is what
+     * stops them joining the prose before them or turning a `---` after them into
+     * a heading underline. Source that was not drawn is already a block of its own
+     * and is left exactly as written.
+     */
+    function isolated(body, before, after) {
+        const lead = before === '' || before.endsWith('\n\n') ? '' : '\n';
+        return `${lead}${body}${after === '' ? '\n' : '\n\n'}`;
+    }
+    /** What one fence becomes: art, or its source with the reason it stayed source. */
+    function fenceBlock(token, before, after, availableWidth, live) {
+        if (token.text.length > MERMAID_MAX_SOURCE)
+            return token.raw;
+        const art = draw(token.text);
+        // A settled drawing that lost part of its source is worth reporting whether
+        // or not it would have fit, because the reader is looking at the source.
+        if (!live && art !== null && art.warnings.length > 0) {
+            const reason = options.theme.style('markdown.diagram.warning', warningText(art));
+            return isolated(`${token.raw}\n${codeSpan(reason)}`, before, after);
+        }
+        if (art === null || drawnWidth(art) > availableWidth)
+            return token.raw;
+        const rows = art.styled.map(row => row
+            .map(span => (span.role === 'none' ? span.text : options.theme.style(ROLE_TOKEN[span.role], span.text)))
+            .join(''));
+        return isolated(rows.map(codeSpan).join(HARD_BREAK), before, after);
+    }
+    return (markdown, availableWidth, live) => {
+        const mode = options.mode();
+        // A reply that is still arriving is only drawn in streaming mode; the other
+        // modes wait for the settled text, which is also the only text whose losses
+        // are worth reporting.
+        if (mode === 'off' || (live && mode !== 'streaming'))
+            return markdown;
+        // Lexing is the cost this guard avoids: no fence can be present without the word.
+        if (!MERMAID_MENTION.test(markdown))
+            return markdown;
+        let out = '';
+        let cursor = 0;
+        for (const token of parser.lexer(markdown)) {
+            const at = markdown.indexOf(token.raw, cursor);
+            // A lexer that rewrote its own input cannot be spliced back into it, and
+            // the message is worth more than the drawing: it stays as written.
+            if (at < 0)
+                return markdown;
+            const body = isMermaidFence(token)
+                ? fenceBlock(token, out, markdown.slice(at + token.raw.length), availableWidth, live)
+                : token.raw;
+            out += markdown.slice(cursor, at) + body;
+            cursor = at + token.raw.length;
+        }
+        return out + markdown.slice(cursor);
+    };
+}
+//# sourceMappingURL=mermaid.js.map

package/lib/ui/mermaid.js.map

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

package/lib/ui/picker.d.ts

@@ -1,4 +1,6 @@
+import { type Keymap } from '../input/actions.ts';
 import type { StoredSession } from '../agent/history.ts';
+import { type ModelChoice, type ModelRoute } from '../agent/model.ts';
 import { type PresetSummary } from '../agent/presets.ts';
 /** One selectable row of the picker. */
 export interface PickerRow {
@@ -34,10 +36,15 @@ export type PickerAction = {
  * window stays around the cursor instead, and the counts say what is hidden.
  */
 export declare const PICKER_WINDOW = 12;
-/** The hint lines a list uses when it is empty and when it holds rows. */
+/**
+ * The hint lines a list uses when it is empty and when it holds rows.
+ *
+ * Read at paint time rather than built once, because a settings edit while the
+ * list is open moves the keys the hint names.
+ */
 export interface PickerHints {
-    readonly empty: string;
-    readonly listed: string;
+    readonly empty: () => string;
+    readonly listed: () => string;
 }
 /** Human age of a session, so a list of ids becomes a list of moments. */
 export declare function describeAge(createdAt: number, now: number): string;
@@ -59,6 +66,8 @@ export declare class ListPicker<Row> {
     /** Extra text the filter matches besides the row's own label. */
     private readonly haystackOf;
     private readonly hints;
+    /** The keys in force, read per press so a settings edit lands on the next key. */
+    private readonly keys;
     private cursor;
     private filter;
     private note;
@@ -66,8 +75,10 @@ export declare class ListPicker<Row> {
     /** The value a pick settles on. */
     idOf: (row: Row) => string, describe: (row: Row) => PickerRow, 
     /** Extra text the filter matches besides the row's own label. */
-    haystackOf: (row: Row) => string, hints: PickerHints);
-    /** Rows matching the typed filter, in the order they were listed. */
+    haystackOf: (row: Row) => string, hints: PickerHints, 
+    /** The keys in force, read per press so a settings edit lands on the next key. */
+    keys: () => Keymap);
+    /** Rows matching the typed filter, best match first. */
     visible(): readonly Row[];
     /**
      * Say why the row under the cursor cannot be taken.
@@ -89,7 +100,7 @@ export declare class ListPicker<Row> {
  * first paint would make opening the picker as slow as the slowest session.
  */
 export declare class SessionPicker extends ListPicker<StoredSession> {
-    constructor(sessions: readonly StoredSession[], titles: () => ReadonlyMap<string, string>, now?: () => number);
+    constructor(sessions: readonly StoredSession[], titles: () => ReadonlyMap<string, string>, now: (() => number) | undefined, keys: () => Keymap);
 }
 /**
  * One agent preset chosen by key press.
@@ -98,7 +109,18 @@ export declare class SessionPicker extends ListPicker<StoredSession> {
  * the picker is open is present or gone without reopening it.
  */
 export declare class PresetPicker extends ListPicker<PresetSummary> {
-    constructor(presets: () => readonly PresetSummary[], currentId: () => string | undefined);
+    constructor(presets: () => readonly PresetSummary[], currentId: () => string | undefined, keys: () => Keymap);
+}
+/**
+ * One configured model route chosen by key press.
+ *
+ * Rows are the caller's and are re-read on every key and paint, so a provider
+ * whose model list arrives after the picker opened appears in it without
+ * reopening, and the filter the reader already typed applies to those late
+ * rows too.
+ */
+export declare class ModelPicker extends ListPicker<ModelRoute> {
+    constructor(routes: () => readonly ModelRoute[], current: () => ModelChoice | undefined, keys: () => Keymap);
 }
 /**
  * The pick id that clears an explicit effort.
@@ -135,6 +157,6 @@ export declare function effortChoices(efforts: readonly {
  * cannot change while the list owns the keyboard.
  */
 export declare class EffortPicker extends ListPicker<EffortChoice> {
-    constructor(choices: () => readonly EffortChoice[], heading: string);
+    constructor(choices: () => readonly EffortChoice[], heading: string, keys: () => Keymap);
 }
 //# sourceMappingURL=picker.d.ts.map

package/lib/ui/picker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["../../src/ui/picker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"picker.d.ts","sourceRoot":"","sources":["../../src/ui/picker.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAGpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAqC,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACxG,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExE,wCAAwC;AACxC,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC1B;AAED,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,mFAAmF;IACnF,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,QAAQ,CAAC,IAAI,EAAE,SAAS,SAAS,EAAE,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,qEAAqE;IACrE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,6BAA6B;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED,iDAAiD;AACjD,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAA;AAE/B;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,KAAK,CAAA;AAE/B;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,MAAM,CAAA;CAC9B;AAMD,0EAA0E;AAC1E,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMlE;AAED;;;;;;;;GAQG;AACH,qBAAa,UAAU,CAAC,GAAG;IAMvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,mCAAmC;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,iEAAiE;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,IAAI;IAdvB,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,IAAI,CAAoB;gBAGb,MAAM,EAAE,MAAM,SAAS,GAAG,EAAE,EAC5B,OAAO,EAAE,MAAM,MAAM;IACtC,mCAAmC;IAClB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,EAC1B,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,SAAS;IAClD,iEAAiE;IAChD,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,EAChC,KAAK,EAAE,WAAW;IACnC,kFAAkF;IACjE,IAAI,EAAE,MAAM,MAAM;IAGrC,wDAAwD;IACxD,OAAO,IAAI,SAAS,GAAG,EAAE;IAYzB;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAIvC,2EAA2E;IAC3E,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAqCjD,IAAI,IAAI,UAAU;CAkBnB;AAED;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,UAAU,CAAC,aAAa,CAAC;gBAExD,QAAQ,EAAE,SAAS,aAAa,EAAE,EAClC,MAAM,EAAE,MAAM,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACzC,GAAG,GAAE,MAAM,MAAM,aAAmB,EACpC,IAAI,EAAE,MAAM,MAAM;CAyBrB;AAED;;;;;GAKG;AACH,qBAAa,YAAa,SAAQ,UAAU,CAAC,aAAa,CAAC;gBAEvD,OAAO,EAAE,MAAM,SAAS,aAAa,EAAE,EACvC,SAAS,EAAE,MAAM,MAAM,GAAG,SAAS,EACnC,IAAI,EAAE,MAAM,MAAM;CAerB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,UAAU,CAAC,UAAU,CAAC;gBACzC,MAAM,EAAE,MAAM,SAAS,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,MAAM;CAmB5G;AAED;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,KAAK,CAAA;AAE5C,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,wEAAwE;IACxE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC1B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,SAAS;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACjG,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,SAAS,YAAY,EAAE,CAezB;AAED;;;;;;GAMG;AACH,qBAAa,YAAa,SAAQ,UAAU,CAAC,YAAY,CAAC;gBAC5C,OAAO,EAAE,MAAM,SAAS,YAAY,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,MAAM;CAsBxF"}

package/lib/ui/picker.js

@@ -1,4 +1,8 @@
 import { matchesKey } from '@earendil-works/pi-tui';
+import { hintKeys, matchesAction, moveHint } from "../input/actions.js";
+import { pastedText } from "../input.js";
+import { matchScore } from "../input/match.js";
+import { describeModelRoute, modelRouteKey } from "../agent/model.js";
 import { describePreset } from "../agent/presets.js";
 /**
  * Rows the picker shows at once.
@@ -38,6 +42,7 @@ export class ListPicker {
     describe;
     haystackOf;
     hints;
+    keys;
     cursor = 0;
     filter = '';
     note;
@@ -45,20 +50,29 @@ export class ListPicker {
     /** The value a pick settles on. */
     idOf, describe, 
     /** Extra text the filter matches besides the row's own label. */
-    haystackOf, hints) {
+    haystackOf, hints, 
+    /** The keys in force, read per press so a settings edit lands on the next key. */
+    keys) {
         this.source = source;
         this.heading = heading;
         this.idOf = idOf;
         this.describe = describe;
         this.haystackOf = haystackOf;
         this.hints = hints;
+        this.keys = keys;
     }
-    /** Rows matching the typed filter, in the order they were listed. */
+    /** Rows matching the typed filter, best match first. */
     visible() {
-        const needle = this.filter.trim().toLowerCase();
+        const needle = this.filter.trim();
         if (needle === '')
             return this.source();
-        return this.source().filter(row => this.haystackOf(row).toLowerCase().includes(needle));
+        // Ties keep the order the caller listed them in, so rows do not shuffle
+        // under the cursor while the reader is still typing.
+        return this.source()
+            .map(row => ({ row, score: matchScore(needle, this.haystackOf(row)) }))
+            .filter((entry) => entry.score !== undefined)
+            .sort((left, right) => right.score - left.score)
+            .map(entry => entry.row);
     }
     /**
      * Say why the row under the cursor cannot be taken.
@@ -74,17 +88,20 @@ export class ListPicker {
     handleKey(data) {
         this.note = undefined;
         const rows = this.visible();
-        if (matchesKey(data, 'escape'))
+        // A picker owns the keyboard while it is open, so the interrupt key has to
+        // mean "leave this list" here: swallowing it would strand the reader.
+        const keys = this.keys();
+        if (matchesAction(keys, 'picker.cancel', data))
             return { kind: 'cancel' };
-        if (matchesKey(data, 'enter')) {
+        if (matchesAction(keys, 'picker.confirm', data)) {
             const chosen = rows[Math.min(this.cursor, Math.max(0, rows.length - 1))];
             return chosen === undefined ? undefined : { kind: 'pick', id: this.idOf(chosen) };
         }
-        if (matchesKey(data, 'up')) {
+        if (matchesAction(keys, 'picker.up', data)) {
             this.cursor = Math.max(0, this.cursor - 1);
             return undefined;
         }
-        if (matchesKey(data, 'down')) {
+        if (matchesAction(keys, 'picker.down', data)) {
             this.cursor = Math.min(Math.max(0, rows.length - 1), this.cursor + 1);
             return undefined;
         }
@@ -98,8 +115,9 @@ export class ListPicker {
             this.cursor = 0;
             return undefined;
         }
-        if (data.length === 1 && data >= ' ') {
-            this.filter += data;
+        const text = pastedText(data) ?? (data.length === 1 && data >= ' ' ? data : undefined);
+        if (text !== undefined) {
+            this.filter += text;
             this.cursor = 0;
         }
         return undefined;
@@ -119,7 +137,7 @@ export class ListPicker {
             above: start,
             below: Math.max(0, rows.length - start - window.length),
             filter: this.filter,
-            hint: rows.length === 0 ? this.hints.empty : this.hints.listed,
+            hint: rows.length === 0 ? this.hints.empty() : this.hints.listed(),
         };
     }
 }
@@ -131,7 +149,7 @@ export class ListPicker {
  * first paint would make opening the picker as slow as the slowest session.
  */
 export class SessionPicker extends ListPicker {
-    constructor(sessions, titles, now = () => Date.now()) {
+    constructor(sessions, titles, now = () => Date.now(), keys) {
         const labelOf = (session) => titles().get(session.id) ?? session.id;
         super(() => sessions, () => `resume a session · ${sessions.length} stored`, session => session.id, session => ({
             label: labelOf(session),
@@ -143,9 +161,9 @@ export class SessionPicker extends ListPicker {
             // The card marks the row under the cursor, which the list decides.
             current: false,
         }), session => [labelOf(session), session.id, session.cwd ?? ''].join(' '), {
-            empty: 'nothing matches · backspace to widen · esc cancel',
-            listed: '↑↓ move · enter open · esc cancel · type to filter',
-        });
+            empty: () => `nothing matches · backspace to widen · ${hintKeys(keys(), 'picker.cancel')} cancel`,
+            listed: () => `${moveHint(keys(), 'picker.up', 'picker.down')} move · ${hintKeys(keys(), 'picker.confirm')} open · ${hintKeys(keys(), 'picker.cancel')} cancel · type to filter`,
+        }, keys);
     }
 }
 /**
@@ -155,11 +173,33 @@ export class SessionPicker extends ListPicker {
  * the picker is open is present or gone without reopening it.
  */
 export class PresetPicker extends ListPicker {
-    constructor(presets, currentId) {
+    constructor(presets, currentId, keys) {
         super(presets, () => `agent preset · ${presets().length} available`, preset => preset.id, preset => describePreset(preset, currentId()), preset => [preset.id, preset.name ?? '', preset.description ?? ''].join(' '), {
-            empty: 'nothing matches · backspace to widen · esc cancel',
-            listed: '↑↓ move · enter switch · esc cancel · type to filter',
-        });
+            empty: () => `nothing matches · backspace to widen · ${hintKeys(keys(), 'picker.cancel')} cancel`,
+            listed: () => `${moveHint(keys(), 'picker.up', 'picker.down')} move · ${hintKeys(keys(), 'picker.confirm')} switch · ${hintKeys(keys(), 'picker.cancel')} cancel · type to filter`,
+        }, keys);
+    }
+}
+/**
+ * One configured model route chosen by key press.
+ *
+ * Rows are the caller's and are re-read on every key and paint, so a provider
+ * whose model list arrives after the picker opened appears in it without
+ * reopening, and the filter the reader already typed applies to those late
+ * rows too.
+ */
+export class ModelPicker extends ListPicker {
+    constructor(routes, current, keys) {
+        super(routes, () => {
+            const chosen = current();
+            if (chosen === undefined)
+                return 'model · no route in use';
+            const effort = chosen.reasoningEffort === undefined ? '' : ` (${chosen.reasoningEffort})`;
+            return `model · current ${chosen.provider}/${chosen.model}${effort}`;
+        }, route => modelRouteKey(route), route => describeModelRoute(route, current()), route => [route.provider, route.model, route.name].join(' '), {
+            empty: () => `nothing matched · /model <provider>/<model> takes any id · backspace to widen · ${hintKeys(keys(), 'picker.cancel')} cancel`,
+            listed: () => `${moveHint(keys(), 'picker.up', 'picker.down')} move · ${hintKeys(keys(), 'picker.confirm')} switch · ${hintKeys(keys(), 'picker.cancel')} cancel · type to filter`,
+        }, keys);
     }
 }
 /**
@@ -200,7 +240,7 @@ export function effortChoices(efforts, effective) {
  * cannot change while the list owns the keyboard.
  */
 export class EffortPicker extends ListPicker {
-    constructor(choices, heading) {
+    constructor(choices, heading, keys) {
         super(choices, () => heading, choice => choice.id, choice => ({
             label: choice.name,
             description: [
@@ -210,9 +250,9 @@ export class EffortPicker extends ListPicker {
             ].filter(part => part !== undefined && part !== '').join(' · ') || undefined,
             current: choice.current,
         }), choice => [choice.name, choice.id, choice.description ?? ''].join(' '), {
-            empty: 'nothing matches · backspace to widen · esc cancel',
-            listed: '↑↓ move · enter apply · esc cancel · type to filter',
-        });
+            empty: () => `nothing matches · backspace to widen · ${hintKeys(keys(), 'picker.cancel')} cancel`,
+            listed: () => `${moveHint(keys(), 'picker.up', 'picker.down')} move · ${hintKeys(keys(), 'picker.confirm')} apply · ${hintKeys(keys(), 'picker.cancel')} cancel · type to filter`,
+        }, keys);
     }
 }
 //# sourceMappingURL=picker.js.map