mindweave 2.3.1 → 2.4.1

package/dist/cli/framebuffer/writer.js

@@ -33,8 +33,25 @@
  * write contains anything printable once its escape sequences are removed.
  */
 import { Screen } from "./screen.js";
+import { applyFrameOverlay, hasFrameOverlay, publishScreen, setOverlayRepaint } from "./overlay.js";
 import { parseFrame } from "./parse.js";
 import { paint } from "./paint.js";
+import { caretCell, onCaretMoved, parkAt, HIDE } from "../caretPark.js";
+/**
+ * Synchronized output (DECSET 2026): hold the frame back until it is complete.
+ *
+ * The painter walks the cursor across the screen laying its runs down, and a terminal
+ * draws every intermediate state — including the cursor at each stop. The first attempt
+ * at hiding that streak HID THE CURSOR around each paint, which meant switching it off
+ * and on again on every keystroke: the caret visibly blinked out whenever anything was
+ * typed. This is the mechanism meant for the job. The terminal buffers between the two
+ * markers and presents once, so nothing intermediate is ever shown and the cursor never
+ * has to be taken away.
+ *
+ * Unsupported terminals ignore both as unknown modes and simply paint as they used to.
+ */
+const SYNC_START = "[?2026h";
+const SYNC_END = "[?2026l";
 /**
  * The prefix Ink puts before a frame to remove the previous one:
  * `\x1b[2K` (erase line) and `\x1b[1A` (cursor up) repeated, then `\x1b[G`.
@@ -44,6 +61,14 @@ import { paint } from "./paint.js";
  * exactly the work being saved.
  */
 const ERASE_PREFIX = /^(?:\x1b\[2K(?:\x1b\[1A)?)+\x1b\[G/;
+/**
+ * A write with nothing in it but erasing — Ink clearing the screen on a narrowing resize.
+ *
+ * Every alternative matched is an erase, or the cursor move that walks between the rows
+ * being erased. A sequence that also DRAWS cannot match: painted output carries absolute
+ * cursor positioning and text, and neither is in this set.
+ */
+const ERASE_ONLY = /^(?:\x1b\[2K|\x1b\[1A|\x1b\[G)+$/;
 /** Any escape sequence, for deciding whether a write carries visible content. */
 const ANY_ESCAPE = /\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[[\]()#;?]*[0-9;]*[A-Za-z]|\x1b./g;
 /**
@@ -69,18 +94,103 @@ function fullRepaintMs() {
  * lands mid-burst: every frame cancels and re-arms it.
  */
 const IDLE_REPAINT_MS = 400;
+/**
+ * Whether the framebuffer is doing anything at all.
+ *
+ * Module level rather than per wrapper, because there is exactly one wrapper in a
+ * process (index.ts hands it to `render()`) and the switch is reached from the command
+ * that flips screen modes, which has no access to it.
+ */
+let enabled = true;
+/** Called when the framebuffer is switched back on, so it forgets the screen. */
+let onReenable = null;
+/** Called when the framebuffer stands down, so nothing it armed can still fire. */
+let onDisable = null;
+/**
+ * Turn the diffing renderer on or off.
+ *
+ * Switching ON throws away the model of the screen, and that is not optional: while it
+ * was off the terminal was scrolling and printing on its own, so every cell the model
+ * remembers is a guess about a screen that has moved. Without this the first frame after
+ * a switch back would diff against a fiction and paint almost nothing.
+ */
+export function setFramebufferEnabled(on) {
+    if (enabled === on)
+        return;
+    enabled = on;
+    if (on)
+        onReenable?.();
+    else
+        onDisable?.();
+}
+/** Whether frames are currently being diffed. */
+export function framebufferEnabled() {
+    return enabled;
+}
 /**
  * Wrap `real` so Ink's frames are diffed before they reach it.
  *
  * `onFrame` is called after each frame with what it cost, so the perf log can report
  * the saving without this module knowing anything about logging.
  */
+/**
+ * The cursor instruction to append to a frame: parked at the caret, or hidden.
+ *
+ * The position comes from the LAYOUT (see caretPark.ts), not from the painted cells, so
+ * it does not depend on the frame at all — only on the layout the frame was built from.
+ * Hidden when nothing declares a caret, which is every screen that is not an input.
+ */
+function caretTail() {
+    // Nothing at all while stood down, and this is the invariant rather than a tidy-up.
+    //
+    // `parkAt` is an ABSOLUTE move — row N of the viewport. That is right when the app
+    // owns the screen and catastrophic when it does not: in the inline shell the caret's
+    // measured y is its row within the LIVE REGION, a handful of rows tall at the bottom
+    // of a terminal full of scrollback, so row N addresses somewhere near the top of the
+    // window, in the middle of the conversation. The cursor lands there, and everything
+    // that follows — the shell's own prompt after the process exits, most visibly — is
+    // printed over the transcript.
+    //
+    // Stated here, at the single point the absolute move is produced, so no future caller
+    // has to remember it. Empty and NOT `HIDE`: while stood down the caret belongs to Ink,
+    // which shows the terminal's real cursor at the input, and hiding it would take away
+    // the caret the inline shell types with.
+    if (!enabled)
+        return "";
+    const cell = caretCell();
+    return cell ? parkAt(cell) : HIDE;
+}
 export function framebufferStdout(real, onFrame) {
     // The grid currently on the terminal, and the one being built for this frame. Two
     // long-lived buffers, swapped — never reallocated per frame, which is the whole
     // reason the cell data is in typed arrays.
     let onScreen = new Screen(real.columns ?? 80, real.rows ?? 24);
     let pending = new Screen(onScreen.width, onScreen.height);
+    // The last frame as it was BEFORE any overlay tinted it. Only kept up to date while an
+    // overlay is installed, which is what lets a highlight move without a new frame: the
+    // clean copy is re-tinted at the new position rather than the tinted one being undone.
+    const clean = new Screen(onScreen.width, onScreen.height);
+    /** Whether `clean` actually holds the frame that is on screen. False until a frame has
+     *  been drawn WITH an overlay installed — which is the usual state, since an overlay is
+     *  installed long after the first frame. Re-tinting from a `clean` that was never filled
+     *  would repaint the screen as blanks. */
+    let cleanValid = false;
+    /**
+     * The last write that carried a frame, kept whether or not the framebuffer is on.
+     *
+     * Recorded while STOOD DOWN too, and that is the point: a shell switch renders the new
+     * shell before the effect that moves the terminal runs, so the frame for the shell
+     * being entered is written while this is still standing aside. It is the only copy of
+     * that frame anyone has — Ink will not write it again, having already written it — so
+     *  paints from here. See there.
+     */
+    let lastFrameData = "";
+    /** The cursor instruction already on the terminal. Re-sending an identical one would
+     *  put bytes on the wire for a frame where nothing changed, which is the one thing this
+     *  renderer promises never to do. */
+    let lastCursor = "";
+    /** The cursor instruction the terminal is actually showing, for the change check. */
+    let lastShown = "";
     const repaintEvery = fullRepaintMs();
     /** When every cell was last written, which is what bounds how long a disagreement
      *  with the real terminal can survive. */
@@ -99,8 +209,14 @@ export function framebufferStdout(real, onFrame) {
      * `Tools(session)s, ask_user, create_skill,`.
      */
     function syncSize() {
-        const w = real.columns ?? onScreen.width;
-        const h = real.rows ?? onScreen.height;
+        // A LIVE query where the platform has one (`getWindowSize`), because `real.rows` /
+        // `real.columns` are getters that on Windows can return a size cached at the last
+        // resize event — an event that frequently never fires. Sized from the cached getter,
+        // the grid stayed small while the frame above it grew, so the paint clipped to the
+        // old height and the bottom of the screen went stale.
+        const win = real.getWindowSize?.();
+        const w = win ? win[0] : real.columns ?? onScreen.width;
+        const h = win ? win[1] : real.rows ?? onScreen.height;
         if (w === onScreen.width && h === onScreen.height)
             return false;
         onScreen.resize(w, h);
@@ -132,6 +248,43 @@ export function framebufferStdout(real, onFrame) {
         onScreen.invalidate();
         lastFull = Date.now();
     }
+    // Coming back from the inline shell: the terminal has been scrolling and printing on
+    // its own, so nothing the model believes about the screen is still true. Forget all of
+    // it, and forget the cursor instruction too — the next frame has to send one whatever
+    // it says, since the cursor is wherever the other shell left it.
+    onReenable = () => {
+        invalidate();
+        lastCursor = "";
+        lastShown = "";
+        cleanValid = false;
+        // And PAINT the frame again, because otherwise nobody will.
+        //
+        // The order a shell switch actually happens in is the whole reason this is needed.
+        // React renders the new shell first and Ink writes that frame immediately — while
+        // the framebuffer is still stood down, so it goes to the terminal untouched and
+        // lands on the screen being left behind. Only then does the effect run: the
+        // alternate screen is entered, which is blank, and this is switched back on. Ink is
+        // now holding output identical to what it just wrote, so it writes nothing more, and
+        // nothing else is scheduled to. The result is an empty alternate screen that stays
+        // empty until something unrelated happens to cause a render.
+        //
+        // Re-feeding the last frame through the ordinary write path is what closes that gap.
+        // It is the same bytes Ink produced for the shell being entered — React had already
+        // rendered it — and going through `fbWrite` means it is parsed, diffed against the
+        // just-invalidated model, and painted exactly like any other frame, rather than
+        // through a second copy of that logic that could drift from it.
+        if (lastFrameData !== "")
+            fbWrite(lastFrameData);
+    };
+    // Going the other way: disarm the repaint the last frame of this shell armed. The
+    // guards inside it make firing harmless, but a timer whose only possible outcome is
+    // to do nothing is one that should not be running — and cancelling it is what makes
+    // "stood down means silent" true by construction rather than by three checks agreeing.
+    onDisable = () => {
+        if (idle)
+            clearTimeout(idle);
+        idle = undefined;
+    };
     /**
      * Re-assert the model onto the terminal outside of any frame.
      *
@@ -140,6 +293,16 @@ export function framebufferStdout(real, onFrame) {
      * nothing, and the two swap back exactly as they do on a normal frame.
      */
     function repaintNow() {
+        // Stood down: the terminal is not ours to repaint. Everything below addresses cells
+        // absolutely, so re-asserting a model of a screen we no longer own would stamp the
+        // last full-screen frame over whatever the inline shell has printed since.
+        //
+        // The guard is here as well as on the timer that arms this, because the timer can
+        // already be in flight when the switch happens — it is armed by the last frame of
+        // the previous shell and fires a moment later, which is exactly the window this
+        // used to go wrong in.
+        if (!enabled)
+            return;
         if (onScreen.width === 0 || onScreen.height === 0)
             return;
         pending.copyFrom(onScreen);
@@ -148,9 +311,110 @@ export function framebufferStdout(real, onFrame) {
         const previous = onScreen;
         onScreen = pending;
         pending = previous;
-        if (escape !== "")
-            real.write(escape);
+        // The grids were swapped, so the object anything outside is holding is now the
+        // scratch buffer — and `invalidate()` above filled that one with a sentinel no
+        // character can equal. Republishing is what stops a reader seeing it.
+        publishScreen(onScreen);
+        // Re-park the cursor, unconditionally.
+        //
+        // A repaint moves the cursor wherever its last run ended, so the position sent with
+        // the previous frame is no longer where the cursor is — the dedup must be bypassed
+        // rather than trusted. Skipping this left the cursor sitting in the bottom-right
+        // corner, still visible, a fraction of a second after every burst of frames settled.
+        // Bracketed for the same reason as a frame: a repaint writes every cell, so the
+        // cursor would otherwise be seen travelling the whole screen.
+        lastCursor = caretTail();
+        lastShown = lastCursor;
+        const painted = escape === "" ? lastCursor : SYNC_START + escape + lastCursor + SYNC_END;
+        if (painted !== "")
+            real.write(painted);
+    }
+    /**
+     * Re-tint the frame already on screen and write the difference.
+     *
+     * This is what makes a drag cheap. Moving a selection changes no layout, so React
+     * produces no new frame and there would otherwise be nothing to repaint. Re-tinting the
+     * CLEAN copy (rather than trying to undo the tint on the screen grid) means the new
+     * highlight is computed from scratch every time, so it cannot accumulate or leave a
+     * cell inverted after the pointer has moved off it. The diff then writes only the cells
+     * whose highlight actually changed, which is a couple of short runs.
+     */
+    function refreshOverlay() {
+        // Stood down: same reason as `repaintNow`. There is no selection layer in the inline
+        // shell, so this has nothing to re-tint there in any case.
+        if (!enabled)
+            return;
+        if (!hasFrameOverlay())
+            return;
+        if (onScreen.width === 0 || onScreen.height === 0)
+            return;
+        if (clean.width !== onScreen.width || clean.height !== onScreen.height) {
+            clean.resize(onScreen.width, onScreen.height);
+            cleanValid = false;
+        }
+        // The first re-tint after an overlay is installed has no clean copy to work from,
+        // because the frame on screen was drawn before there was anything to keep one for.
+        // That frame IS clean, though: nothing has tinted it yet. Taking it as the baseline
+        // is what stops this repainting the screen as blanks.
+        if (!cleanValid) {
+            clean.copyFrom(onScreen);
+            cleanValid = true;
+        }
+        pending.copyFrom(clean);
+        applyFrameOverlay(pending);
+        const escape = paint(onScreen, pending, 1);
+        const previous = onScreen;
+        onScreen = pending;
+        pending = previous;
+        publishScreen(onScreen);
+        // Re-park the cursor, unconditionally.
+        //
+        // A repaint moves the cursor wherever its last run ended, so the position sent with
+        // the previous frame is no longer where the cursor is — the dedup must be bypassed
+        // rather than trusted. Skipping this left the cursor sitting in the bottom-right
+        // corner, still visible, a fraction of a second after every burst of frames settled.
+        // Bracketed for the same reason as a frame: a repaint writes every cell, so the
+        // cursor would otherwise be seen travelling the whole screen.
+        lastCursor = caretTail();
+        lastShown = lastCursor;
+        const painted = escape === "" ? lastCursor : SYNC_START + escape + lastCursor + SYNC_END;
+        if (painted !== "")
+            real.write(painted);
     }
+    setOverlayRepaint(refreshOverlay);
+    /**
+     * Park the cursor when the caret moves but NO frame follows.
+     *
+     * Ink writes nothing when its output is unchanged, and typing a space at the end of a
+     * line produces exactly that: the trailing blank is indistinguishable from the padding
+     * beside it. The cursor was then the only thing that had moved, and nothing carried it
+     * — so it sat a character behind until the after-burst repaint corrected it, which is
+     * the pause that felt like the caret arriving late.
+     *
+     * Deferred by a microtask so the layout is settled and, more importantly, so a frame
+     * that IS about to be written gets there first: it carries the same position, and the
+     * change check below then makes this a no-op rather than a second write.
+     */
+    let parkQueued = false;
+    onCaretMoved(() => {
+        if (parkQueued)
+            return;
+        parkQueued = true;
+        queueMicrotask(() => {
+            parkQueued = false;
+            // Stood down. This path writes to the terminal directly rather than through
+            // `fbWrite`, so the check has to be repeated here: in the inline shell the cursor
+            // belongs to Ink, and an absolute move would drop it somewhere in the scrollback.
+            if (!enabled)
+                return;
+            const parked = caretTail();
+            if (parked === lastShown)
+                return;
+            lastShown = parked;
+            lastCursor = parked;
+            real.write(parked);
+        });
+    });
     /** Arm the after-the-burst repaint. Unref'd: a screen touch-up must never be the
      *  reason the process is still alive. */
     function armIdleRepaint() {
@@ -177,6 +441,57 @@ export function framebufferStdout(real, onFrame) {
      * only `write` is ours. Nothing has to be enumerated, so nothing can be forgotten.
      */
     const fbWrite = (data, callback) => {
+        // Stood down. Everything Ink writes goes straight to the terminal, untouched.
+        //
+        // The inline shell (see `screenMode.ts`) does not own the screen: its committed
+        // output IS the terminal's scrollback, written once and scrolled by the terminal
+        // itself. Every single thing this renderer does is wrong there. It strips the
+        // erase-lines prefix, which is how Ink rewrites its live region; it diffs against
+        // a grid the height of the window, when the real content is taller and moving; and
+        // it parks the cursor absolutely, when in that mode the cursor belongs to Ink.
+        //
+        // A flag rather than a second stdout, because the stream is handed to `render()`
+        // once and Ink holds it for the life of the process. `/screen` has to be able to
+        // change its mind without unmounting the app.
+        // Stood down. Everything Ink writes goes straight to the terminal, untouched —
+        // INCLUDING the cursor move and show that Ink appends when a component has asked
+        // for a position through `useCursor` (see PromptInput). That suffix is how the
+        // caret exists at all in the inline shell, so nothing here may add to a frame or
+        // take anything from it.
+        if (!enabled) {
+            // Remembered on the way past, because this is where the frame for the shell
+            // being ENTERED goes: React renders it before the effect that moves the
+            // terminal runs, so it is written while this is still standing aside. Ink will
+            // not produce it a second time, so `onReenable` paints from what is kept here.
+            // Only writes that carry cells — a bare control sequence is not a frame.
+            if (data.replace(ANY_ESCAPE, "").trim() !== "")
+                lastFrameData = data;
+            return real.write(data, callback);
+        }
+        // A write that is NOTHING BUT AN ERASE. Swallowed, and this is the whole reason a
+        // narrowing resize used to flicker.
+        //
+        // Ink clears the screen itself whenever the terminal gets narrower, to stop its own
+        // re-renders overlapping. It writes that erase on its own, unsynchronized — measured
+        // here, twenty-one `erase line` sequences in one write with no content — and only
+        // then lays the new frame out. Forwarded, it does exactly what it says: the screen
+        // goes blank, and stays blank for as long as the relayout takes. Dragging an edge is
+        // one of those per event, which is the flicker.
+        //
+        // Nothing is lost by dropping it. The erase exists to stop stale rows showing
+        // through a partial redraw, and that cannot happen here: a resize invalidates the
+        // model below, so the next frame writes EVERY cell, and it goes out wrapped in
+        // synchronized-update markers — the terminal holds the old picture until the whole
+        // new one has arrived, then swaps in one step. That is strictly better than erasing,
+        // because the old frame stays readable the entire time instead of a blank screen.
+        //
+        // Ink's own bookkeeping is untouched: `clear()` still runs and still resets its line
+        // count, so it remains consistent with what it believes. Only the bytes are dropped,
+        // and the screen was never Ink's to erase while this is switched on.
+        if (ERASE_ONLY.test(data)) {
+            callback?.(null);
+            return true;
+        }
         const body = data.replace(ERASE_PREFIX, "");
         const bare = body.replace(ANY_ESCAPE, "");
         // Nothing at all once the escapes are gone: a pure control sequence, not a frame.
@@ -213,6 +528,21 @@ export function framebufferStdout(real, onFrame) {
         // not the tail of what used to be there.
         pending.clear();
         parseFrame(pending, body);
+        // A selection highlight is added HERE, to the finished frame, and never reaches
+        // React. `clean` keeps the untinted frame so the highlight can be moved without a
+        // re-render (see `refreshOverlay`); it is only maintained while something is
+        // actually tinting, so a session that never drags pays nothing for it.
+        if (hasFrameOverlay()) {
+            if (clean.width !== pending.width || clean.height !== pending.height) {
+                clean.resize(pending.width, pending.height);
+            }
+            clean.copyFrom(pending);
+            cleanValid = true;
+            applyFrameOverlay(pending);
+        }
+        else {
+            cleanValid = false;
+        }
         const escape = paint(onScreen, pending, 1);
         // Swap rather than copy. Both grids are the same shape and `pending` is fully
         // rewritten at the start of every frame, so the old on-screen grid is free to
@@ -220,17 +550,38 @@ export function framebufferStdout(real, onFrame) {
         const previous = onScreen;
         onScreen = pending;
         pending = previous;
+        publishScreen(onScreen);
         onFrame?.({ inBytes: data.length, outBytes: escape.length });
         // Put the screen beyond doubt once this burst of frames stops. During a burst it
         // is only ever cancelled and re-armed, so it costs nothing until things settle.
         armIdleRepaint();
-        if (escape === "") {
+        // The caret is the TERMINAL's own cursor, parked AFTER the frame it belongs to.
+        //
+        // Last, and it has to be last: the painter moves the cursor all over the screen to
+        // lay its runs down, so a position chosen before it finishes ends up wherever the
+        // final run happened to leave off. Appended to the same write for the same reason —
+        // a separate write could interleave and leave the cursor mid-paint.
+        const parked = caretTail();
+        lastCursor = parked;
+        // A frame that PAINTED must always re-park, even when the caret has not moved.
+        //
+        // Painting walks the cursor to wherever the last run ended, so the instruction being
+        // unchanged does not mean the cursor is still where it was put. Skipping it left the
+        // caret stranded at the end of whatever was repainted — a rotating tip line was
+        // enough to take it away, with nothing to bring it back until the next keystroke.
+        //
+        // The change check only applies when NOTHING was painted, which is the case it was
+        // for: writing zero bytes for a frame where nothing happened.
+        const out = escape === "" ? (parked === lastShown ? "" : parked) : SYNC_START + escape + parked + SYNC_END;
+        if (out !== "")
+            lastShown = parked;
+        if (out === "") {
             // Nothing changed. Writing zero bytes is the correct output, but the caller
             // may be waiting on the callback, so it still has to be settled.
             callback?.(null);
             return true;
         }
-        return real.write(escape, callback);
+        return real.write(out, callback);
     };
     return new Proxy(real, {
         get(target, prop, receiver) {

package/dist/cli/framebuffer/writer.js.map

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

package/dist/cli/groupReveal.js

@@ -35,9 +35,19 @@ export function groupSettled(queueAfterFront) {
  * queued behind it, so the row arrives already carrying its diff/output instead
  * of appearing as a bare `Update(home.html)` that grows a body a beat later.
  *
- * Same principle as the group hold above, and the same absence of a timer. The
- * caller releases the hold when the stream ends (no further event can arrive) or
- * when the user flushes with Esc.
+ * Same principle as the group hold above — but NOT the same absence of a timer,
+ * and that difference was a real failure. A group is a burst of local reads that
+ * resolve in milliseconds; a standalone call can be a release build. Held
+ * with no limit, its row was invisible for as long as the command ran: the last
+ * thing on screen stayed the tool before it, and an agent quietly building for
+ * ten minutes was indistinguishable from an agent that had hung. Reported as a
+ * hang, and it was not one.
+ *
+ * So the hold has a deadline. Past it the row is shown bare and its body arrives
+ * when the result does — the two-stage reveal this exists to avoid, accepted
+ * deliberately, because it is strictly better than showing nothing at all. The
+ * deadline is set well past any local tool, so a read or an edit still arrives
+ * whole and nothing about the calm case changes.
  */
 export function resultQueued(toolId, queue) {
     return queue.some((a) => a.type === "toolEnd" && a.toolId === toolId);
@@ -48,4 +58,20 @@ export function resultQueued(toolId, queue) {
 export function planGroupReveal(settled, flushing) {
     return settled || flushing ? "flush" : "hold";
 }
+/**
+ * How long a standalone tool row may be held waiting for its own result.
+ *
+ * Comfortably past any tool that touches only this machine — a read, an edit, a
+ * search all resolve in single-digit milliseconds — so the calm case is unchanged
+ * and those rows still arrive carrying their body. Comfortably short of the point
+ * where a person starts wondering whether anything is happening.
+ */
+export const STANDALONE_HOLD_MS = 600;
+/** Whether a held standalone row may be shown now (pure). */
+export function planStandaloneReveal(input) {
+    const { resultQueued, flushing, streamDone, heldForMs } = input;
+    if (resultQueued || flushing || streamDone)
+        return "reveal";
+    return heldForMs >= STANDALONE_HOLD_MS ? "reveal" : "hold";
+}
 //# sourceMappingURL=groupReveal.js.map

package/dist/cli/groupReveal.js.map

@@ -1 +1 @@
-{"version":3,"file":"groupReveal.js","sourceRoot":"","sources":["../../src/cli/groupReveal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH;yDACyD;AACzD,MAAM,UAAU,aAAa,CAAC,CAAoC;IAChE,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;AAC9E,CAAC;AAED;qEACqE;AACrE,MAAM,UAAU,YAAY,CAAC,eAA6D;IACxF,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,KAAmD;IAC9F,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;AACxE,CAAC;AAID;;iEAEiE;AACjE,MAAM,UAAU,eAAe,CAAC,OAAgB,EAAE,QAAiB;IACjE,OAAO,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAChD,CAAC"}
+{"version":3,"file":"groupReveal.js","sourceRoot":"","sources":["../../src/cli/groupReveal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH;yDACyD;AACzD,MAAM,UAAU,aAAa,CAAC,CAAoC;IAChE,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;AAC9E,CAAC;AAED;qEACqE;AACrE,MAAM,UAAU,YAAY,CAAC,eAA6D;IACxF,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,KAAmD;IAC9F,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;AACxE,CAAC;AAID;;iEAEiE;AACjE,MAAM,UAAU,eAAe,CAAC,OAAgB,EAAE,QAAiB;IACjE,OAAO,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAChD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAEtC,6DAA6D;AAC7D,MAAM,UAAU,oBAAoB,CAAC,KAUpC;IACC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAChE,IAAI,YAAY,IAAI,QAAQ,IAAI,UAAU;QAAE,OAAO,QAAQ,CAAC;IAC5D,OAAO,SAAS,IAAI,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7D,CAAC"}

package/dist/cli/inputView.js

@@ -13,6 +13,7 @@
  * off-by-one lives: a word break silently drops the space it broke on, so the rendered
  * text is shorter than the source it came from.
  */
+import { findTextColumn } from "./wordEdit.js";
 /**
  * Greedy word-wrap that remembers offsets (pure).
  *
@@ -102,4 +103,48 @@ export function inputView(value, cursor, width, maxRows) {
         hiddenBelow: all.length - (first + cap),
     };
 }
+/**
+ * The buffer offset a click at (clickX, clickY) landed on, or null when the click cannot
+ * be placed with confidence.
+ *
+ * A mouse report gives a terminal row and column; this has to turn that into a position
+ * in the text. The obvious route — work out where the box was laid out and subtract — is
+ * the one thing that must not be done here: the layout is decided by flex at render time,
+ * the box has a marker on its first row and continuations on the rest, and any arithmetic
+ * that duplicates that becomes wrong the day one of them changes. A wrong answer is not a
+ * missing feature, it is a cursor that jumps somewhere the user did not click.
+ *
+ * So it reads the screen instead. `gridRowAt(y)` returns what was actually PAINTED on
+ * row y, and a view row is located by finding its own text there; the difference between
+ * where the text starts and where the click landed is the column, with no assumption
+ * about borders, padding or the prompt marker.
+ *
+ * A neighbouring row is checked as well, because two rows of a message can read the same
+ * and matching the wrong one would place the caret a line away. Anything that does not
+ * resolve returns null and the caller does nothing.
+ */
+export function clickToOffset(rows, cursorRow, cursorCol, gridRowAt, width, clickX, clickY) {
+    // A painted row IS the row: the caret takes no column of its own. It is the TERMINAL
+    // cursor now, parked after the frame (see caretPark.ts), so nothing is inserted into
+    // the text and what was rendered matches the buffer exactly.
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
+        const col = findTextColumn(gridRowAt(clickY), width, row.text);
+        if (col < 0)
+            continue;
+        // Confirm with a neighbour: view rows are contiguous on screen, so the row above (or
+        // below, for the first) must be where this match implies it is.
+        if (i > 0) {
+            if (findTextColumn(gridRowAt(clickY - 1), width, rows[i - 1].text) < 0)
+                continue;
+        }
+        else if (rows.length > 1) {
+            if (findTextColumn(gridRowAt(clickY + 1), width, rows[1].text) < 0)
+                continue;
+        }
+        const within = Math.max(0, Math.min(row.text.length, clickX - col));
+        return row.start + within;
+    }
+    return null;
+}
 //# sourceMappingURL=inputView.js.map

package/dist/cli/inputView.js.map

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

package/dist/cli/keyManager.js

@@ -12,14 +12,24 @@
  */
 import { allProviders } from "../drivers/registry.js";
 import { activeSlot, keyHint, keysFor, nextFreeSlot } from "./keyStore.js";
-/** Every provider, with how many keys it holds. */
+import { orderProviders } from "./pickerOrder.js";
+/**
+ * Every provider, with how many keys it holds, in display order.
+ *
+ * Ordered the way /provider is: the default first, then the ones you have a key for,
+ * then the rest, each group alphabetical — so the providers you can actually use are at
+ * the top of the list rather than scattered down it. The default is the first provider
+ * the registry lists (the one a fresh project opens on).
+ */
 export function providerRows(env = process.env) {
-    return allProviders().map((p) => ({
+    const rows = allProviders().map((p) => ({
         id: p.id,
         label: p.label,
         apiKeyEnv: p.apiKeyEnv,
         count: keysFor(p.apiKeyEnv, env).length,
     }));
+    const defaultId = allProviders()[0]?.id ?? "";
+    return orderProviders(rows, (r) => r.count > 0, defaultId);
 }
 /** One provider's keys, in slot order. */
 export function keyRowsFor(provider, env = process.env) {