@mjasnikovs/pi-task 0.38.20 → 0.38.21

package/dist/config/register.js

@@ -1,4 +1,4 @@
-import { SettingsList, visibleWidth, wrapTextWithAnsi } from '@earendil-works/pi-tui';
+import { getKeybindings, SettingsList, visibleWidth, wrapTextWithAnsi } from '@earendil-works/pi-tui';
 import { registerBridgeCommand } from '../remote/bridge.js';
 import { readPkgVersion } from '../shared/pkg-version.js';
 import { SEARCH_PROVIDERS, SEARCH_PROVIDER_LABELS, providerForLabel } from '../workers/search-types.js';
@@ -74,22 +74,43 @@ export const SECTIONS = [
     { key: 'checks', title: 'after each task' },
     { key: 'research', title: 'research' },
     { key: 'reasoning', title: 'reasoning' },
-    { key: 'timeouts', title: 'timeouts' },
     { key: 'unattended', title: 'unattended' },
     { key: 'logging', title: 'logging' },
-    { key: 'extensions', title: 'child extensions' }
+    { key: 'extensions', title: 'child extensions' },
+    // Last on purpose. It is the longest block (a fixed timeout plus one row
+    // per live tool, so it grows with the host) and the least often changed —
+    // in front of `unattended` it pushed every short section off the screen.
+    { key: 'timeouts', title: 'timeouts' }
 ];
 /** Marks a header row, so onChange can ignore one and tests can find them. */
 export const SECTION_ID_PREFIX = 'section:';
-/** An inert titled row. No `values` ⇒ SettingsList's Enter handler no-ops on it. */
+/**
+ * An inert titled row. No `values` ⇒ SettingsList's Enter handler no-ops on it,
+ * and {@link SkipInertRows} steps the cursor straight over it.
+ *
+ * Upper case, and styled muted by {@link makeTheme}, because the dashed
+ * lower-case form it replaces was the same case, colour and weight as the
+ * setting labels underneath it — eight headings that read as nine more rows.
+ */
 function sectionHeader(title) {
     return {
         id: SECTION_ID_PREFIX + title,
-        label: `── ${title} ──`,
+        label: title.toUpperCase(),
         description: '',
         currentValue: ''
     };
 }
+/**
+ * A blank row between two sections.
+ *
+ * `SettingsList` renders exactly one line per item, so the only way to put air
+ * above a heading is to hand it an empty row. It carries the header prefix so
+ * everything that already treats a header as scenery — the inert check, the
+ * cursor skip, the headless rendering — covers it with no second rule.
+ */
+function sectionGap(title) {
+    return { id: `${SECTION_ID_PREFIX}gap:${title}`, label: '', description: '', currentValue: '' };
+}
 /**
  * The shared pair for a boolean setting: shown as on/off, stored as a boolean.
  * Every non-enum row uses this, so a boolean cannot be given a bespoke parser by
@@ -345,7 +366,7 @@ export function applyReasoningLevel(cfg, group, chosen) {
 /** Overlay width; the list gets `- 4` of it, the description `- 4` again. */
 const OVERLAY_WIDTH = 68;
 /** Settings rows shown at once before the list scrolls. */
-const MAX_VISIBLE = 9;
+const MAX_VISIBLE = 11;
 /**
  * Tallest body the settings list can render, so {@link BorderedBox} can pad
  * every frame to it and hold the border still. Mirrors SettingsList's own
@@ -356,9 +377,19 @@ export function settingsBodyHeight(descriptions, maxVisible, wrapWidth) {
     const tallestDescription = Math.max(0, ...descriptions.map(d => wrapTextWithAnsi(d, wrapWidth).length));
     return 1 + maxVisible + 1 + 1 + tallestDescription + 1 + 1;
 }
-function makeTheme(theme) {
+function makeTheme(theme, isHeader) {
     return {
-        label: (text, selected) => selected ? theme.fg('accent', theme.bold(text)) : theme.fg('text', text),
+        label: (text, selected) => {
+            // Headers are scenery, so they are rendered quieter than the rows
+            // they title rather than louder. `isHeader` is asked by text
+            // because SettingsListTheme only ever sees the padded label —
+            // matching on the text is what keeps the styling in one place
+            // instead of pre-colouring the string back in panelItems, which
+            // has no theme to colour it with.
+            if (isHeader(text))
+                return theme.fg('muted', theme.bold(text));
+            return selected ? theme.fg('accent', theme.bold(text)) : theme.fg('text', text);
+        },
         // A filled/hollow dot makes the on/off column scannable at a glance
         // without reading a word on every row. Enum values (an engine name, a
         // duration) are real content, so they stay readable rather than muted.
@@ -376,6 +407,70 @@ function makeTheme(theme) {
         hint: text => theme.fg('dim', text)
     };
 }
+/** The arrow key SettingsList moves down on, under the default bindings. */
+const DOWN_KEY = '\x1b[B';
+/**
+ * Moves the cursor over the section headers and the blank rows between them.
+ *
+ * Those rows are decoration: they carry no `values`, so Enter already does
+ * nothing on them. Without this they were still stops on the way down — with a
+ * heading AND a blank line per section that is sixteen dead keypresses in a
+ * thirty-row menu, and the panel opens with the cursor parked on a heading that
+ * has no description to show.
+ *
+ * It drives the list through its own public `handleInput` — pressing the very
+ * key the user pressed, N times — rather than reaching for the private
+ * `selectedIndex`. The mirror it keeps cannot drift: with search off and no
+ * submenus, up and down are the only two things that move that index.
+ */
+class SkipInertRows {
+    list;
+    selectable;
+    index = 0;
+    constructor(list, 
+    /** True where a row can be selected, in the list's own order. */
+    selectable) {
+        this.list = list;
+        this.selectable = selectable;
+        // The first row is a header, so the panel would open on it. Only
+        // synthesise the keypress if it is actually bound to "down" — feeding
+        // a key the list ignores would move the mirror and not the cursor.
+        if (!getKeybindings().matches(DOWN_KEY, 'tui.select.down'))
+            return;
+        while (this.index < selectable.length && !selectable[this.index]) {
+            this.list.handleInput(DOWN_KEY);
+            this.index++;
+        }
+    }
+    render(width) {
+        return this.list.render(width);
+    }
+    invalidate() {
+        this.list.invalidate();
+    }
+    handleInput(data) {
+        const kb = getKeybindings();
+        const step = kb.matches(data, 'tui.select.down') ? 1
+            : kb.matches(data, 'tui.select.up') ? -1
+                : 0;
+        if (step === 0) {
+            this.list.handleInput(data);
+            return;
+        }
+        const n = this.selectable.length;
+        let target = this.index;
+        for (let moved = 1; moved <= n; moved++) {
+            target = (target + step + n) % n;
+            if (this.selectable[target]) {
+                for (let i = 0; i < moved; i++)
+                    this.list.handleInput(data);
+                this.index = target;
+                return;
+            }
+        }
+        // Every row is scenery. Nothing to select, so nothing to move.
+    }
+}
 /**
  * Builds the framed settings panel. Split out of the command handler so the
  * exact component the overlay shows can be rendered to a string in a test or a
@@ -392,8 +487,10 @@ export function createSettingsPanel(items, theme,
  * beside seven rows still claiming `inherit` — which is what it did.
  */
 onChange, onCancel) {
-    const list = new SettingsList(items, MAX_VISIBLE, makeTheme(theme), (id, newValue) => onChange(id, newValue, list), onCancel);
-    return new BorderedBox(list, CONFIG_TITLE, s => theme.fg('borderMuted', s), s => theme.fg('accent', theme.bold(s)), settingsBodyHeight(items.map(i => i.description), MAX_VISIBLE, OVERLAY_WIDTH - 8));
+    // A row with no `values` is a header or the blank line above one.
+    const headerLabels = new Set(items.filter(i => i.values === undefined).map(i => i.label));
+    const list = new SettingsList(items, MAX_VISIBLE, makeTheme(theme, label => headerLabels.has(label.trimEnd())), (id, newValue) => onChange(id, newValue, list), onCancel);
+    return new BorderedBox(new SkipInertRows(list, items.map(i => (i.values?.length ?? 0) > 0)), CONFIG_TITLE, s => theme.fg('borderMuted', s), s => theme.fg('accent', theme.bold(s)), settingsBodyHeight(items.map(i => i.description), MAX_VISIBLE, OVERLAY_WIDTH - 8));
 }
 /** The full settings row list for the current config, in menu order. */
 export function panelItems(cfg, installed, tools = []) {
@@ -421,6 +518,8 @@ export function panelItems(cfg, installed, tools = []) {
         // all, so with nothing installed the heading would otherwise sit alone.
         if (rows.length === 0)
             continue;
+        if (out.length > 0)
+            out.push(sectionGap(title));
         out.push(sectionHeader(title), ...rows);
     }
     return out;
@@ -449,8 +548,13 @@ async function handleTaskConfig(_args, ctx, getTools = () => []) {
         // Built from panelItems, not a second hand-written walk of the same
         // tables: the two renderings used to be able to disagree about what a
         // setting said, and a headless run is the one place nobody would notice.
-        const lines = panelItems(cfg, installed, tools).map(i => i.values === undefined ?
-            `[${i.label.replace(/─/g, '').trim()}]`
+        const lines = panelItems(cfg, installed, tools)
+            // The blank rows between sections are there to give the TUI air.
+            // One line of `|`-joined text has none to give, and an empty label
+            // would print as a stray `[]`.
+            .filter(i => i.label !== '')
+            .map(i => i.values === undefined ?
+            `[${i.label.trim()}]`
             : `${i.label.padEnd(22)} ${i.currentValue}`);
         ctx.ui.notify(lines.join('  |  '), 'info');
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mjasnikovs/pi-task",
-    "version": "0.38.20",
+    "version": "0.38.21",
     "description": "Deterministic task planning and spec-orchestration for local models — crash-safe /task pipelines with verify/enforce gates, a real-time remote web view, and web/docs/fetch/worker subagent tools.",
     "type": "module",
     "main": "./dist/index.js",