@hncode/hncode 0.5.6 → 0.6.1

package/src/tui.js

@@ -20,7 +20,7 @@ import cp from 'node:child_process';
 import {
   C, TRUECOLOR, blockCursor, showCursor, hideCursor, alternateScreen, clearScreen, clearAndSetBg, setTheme, setLightBackground, currentTheme, THEME_NAMES, THEME_LABELS, isLightTheme, hasTheme, lerpColor, bgRgb,
 } from './colors.js';
-import { copyText, readText, warmClipboard, readClipboardContentAsync, cleanupPastedImages, stopClipboardHelper } from './clipboard.js';
+import { copyText, readText, warmClipboard, readClipboardContentAsync, readClipboardTextOnly, imageUrlFromClipboardText, cleanupPastedImages, stopClipboardHelper } from './clipboard.js';
 import { visualWidth, estimateTokens, estimateTokensFloat, estimateMessagesTokens, estimateMessageTokens, messageTokens, expandTabs } from './term.js';
 // The picker is composited onto the frame as a cell layer rather than assigned over
 // The picker is composited onto the frame as a cell layer rather than assigned over
@@ -58,7 +58,15 @@ import { resolveProvider, resolveModelArg, addProvider, removeProvider, addModel
 import { pluginCommands, renderWidgets, runHooks, runPatch, runPatchSync, runKeybindsSync, pluginKeybinds, setPluginLoggerTui } from './plugin.js';
 import { OTHER_LABEL, SUPPLEMENT_LABEL } from './tools/ask-user-question.js';
 import { render as renderTodos } from './tools/todo.js';
+import { renderLatex } from './latex.js';
+import { measureTex, encodeTexImage, TEX_MAX_ROWS } from './tex/index.js';
+import { isImageRow, imageBytes, parseImageRow, encodeImageRow as encodeImageRowHelper } from './image-row.js';
+import { createScreen, pools as screenPools } from './screen.js';
+import { paintRows, screenToRows } from './screen-paint.js';
+import { diffScreens, placementKey, placementRows, setImageRegenerator } from './screen-diff.js';
+import { render as renderMermaid, sourceBox as mermaidSourceBox, toAnsi as mermaidAnsi } from './mermaid/index.js';
 import { getTool, toolNames } from './tools/index.js';
+import { installGoalStore, getGoal } from './tools/goal.js';
 import { decideFromRules, describeRules, selfTestRules, describeSelfTest } from './permissions.js';
 import { isDestructiveCommand as shellIsDestructiveCommand, isReadOnlyCommand as shellIsReadOnlyCommand } from './shell-safety.js';
 import { usdRate, syncRate, convert, normalizeCurrency, SUPPORTED_CURRENCIES } from './fx.js';
@@ -427,7 +435,7 @@ export const TIPS = [
   'Queued messages wait for the turn to finish',
   '/steer injects a message into the running turn',
   'Ctrl+R reloads the current session from disk',
-  'Alt+R re-fetches the provider\'s model list',
+  'Alt+R re-fetches the provider\'s model list',
   '/help shows available commands at any time',
   '/undo rolls back the transcript AND the files',
   '/fork copies the session so you can branch',
@@ -552,8 +560,8 @@ export function reducedMotionOn(state) {
  * tool, a thinking preview) gets the same treatment from one place.
  */
 export function spinnerFrame(state, tick) {
-  if (reducedMotionOn(state)) {
-    const t = tick !== undefined ? tick : (state && state.spin) || 0;
+  if (reducedMotionOn(state)) {
+    const t = tick !== undefined ? tick : (state && state.spin) || 0;
     return { glyph: REDUCED_MOTION_DOT, dim: Math.floor(t / (REDUCED_MOTION_CYCLE_MS / 80)) % 2 === 1 };
   }
   const n = SPINNER.length;
@@ -647,7 +655,7 @@ export function sweepPulse(dist, half, edge = 'cosine', flat = 0) {
  * glint is a point travelling along the row, not a wash sweeping over it. It stops at one rather than
  * shrinking to zero because a two-character row still needs something to see.
  */
-export const LIGHT_FRACTION = 1 / 4;
+export const LIGHT_FRACTION = 1 / 4;
 
 /**
  * Milliseconds per unit of `state.spin`.
@@ -679,7 +687,7 @@ export function lightWidth(n) {
  * palettes: the peak moves one letter at a time, and the row reads as a lamp travelling rather than as a
  * single pixel flashing.
  */
-export const TAIL_CHARS = 4;
+export const TAIL_CHARS = 4;
 
 
 /**
@@ -694,7 +702,7 @@ export const TAIL_CHARS = 4;
  */
 function totalHalf(n) {
   const want = lightWidth(n) + 2 * TAIL_CHARS;
-  const capped = Math.min(want, Math.max(2, n - 1));
+  const capped = Math.min(want, Math.max(2, n - 1));
   return capped / 2;
 }
 
@@ -713,44 +721,44 @@ function coreHalf(n) {
  *
  * At 30fps a frame is 33ms, which is what makes the crossing in `CROSS_MS` six frames long.
  */
-export const ANIM_FPS = 30;
+export const ANIM_FPS = 30;
 export const FRAME_MS = 1000 / ANIM_FPS;
 
 /**
  * How long one step of the light lasts, in milliseconds.
  *
- * FIXED at 80ms — fast enough that a sweep reads as motion, slow enough that the eye is not chasing it.
- *
- * It followed the output rate for a while. That was tried and dropped: a model writing slowly got a
- * sweep so slow it looked stuck, a fast one got a blur, and the same row changed pace between turns for
- * no reason the reader could see. One rate is calmer and predictable, which is what an ambient
- * indicator needs to be.
+ * FIXED at 80ms — fast enough that a sweep reads as motion, slow enough that the eye is not chasing it.
+ *
+ * It followed the output rate for a while. That was tried and dropped: a model writing slowly got a
+ * sweep so slow it looked stuck, a fast one got a blur, and the same row changed pace between turns for
+ * no reason the reader could see. One rate is calmer and predictable, which is what an ambient
+ * indicator needs to be.
+ */
+export const STEP_MS = 65;
+
+/**
+ * The step for a TOOL name, slower than the Working row's.
+ *
+ * A tool name is short — `Read` is four characters — so at the Working row's rate the light crosses it in
+ * 560ms and the row is dark for the rest of the cycle. On screen that reads as a single flash, not as
+ * movement. 150ms per character gives a four-character name a 1.4s round: slow enough to follow, still
+ * obviously running.
+ */
+const TOOL_STEP_MS = 150;
+
+/**
+ * How long the light stays on one character, from how fast tokens are arriving.
+ *
+ * `tps` is output tokens per second for the step in flight. A fast stream should look fast — the row
+ * keeping a leisurely 50ms step while tokens pour in reads as the animation lagging behind the text it
+ * is supposed to accompany.
+ *
+ * The clamp is the important half. Under about 10 tok/s the model is thinking more than writing and the
+ * sweep slows down so it does not look frantic over a trickle; above about 80 tok/s it is a wall of text
+ * and the light moves quickly but never strobes. 28ms is just under a 33ms render frame, so a step is
+ * always painted at least once; 200ms is slow enough to read as deliberate without looking stuck.
  */
-export const STEP_MS = 65;
-
-/**
- * The step for a TOOL name, slower than the Working row's.
- *
- * A tool name is short — `Read` is four characters — so at the Working row's rate the light crosses it in
- * 560ms and the row is dark for the rest of the cycle. On screen that reads as a single flash, not as
- * movement. 150ms per character gives a four-character name a 1.4s round: slow enough to follow, still
- * obviously running.
- */
-const TOOL_STEP_MS = 150;
-
-/**
- * How long the light stays on one character, from how fast tokens are arriving.
- *
- * `tps` is output tokens per second for the step in flight. A fast stream should look fast — the row
- * keeping a leisurely 50ms step while tokens pour in reads as the animation lagging behind the text it
- * is supposed to accompany.
- *
- * The clamp is the important half. Under about 10 tok/s the model is thinking more than writing and the
- * sweep slows down so it does not look frantic over a trickle; above about 80 tok/s it is a wall of text
- * and the light moves quickly but never strobes. 28ms is just under a 33ms render frame, so a step is
- * always painted at least once; 200ms is slow enough to read as deliberate without looking stuck.
- */
-
+
 
 
 
@@ -765,32 +773,39 @@ const TOOL_STEP_MS = 150;
  * ended; `lightMargin` takes the larger of the two.
  */
 const ENTRY_EXIT_CHARS = 10;
-/**
- * The margin for a row of `n` characters: the target ten, or the light's half-width if that is larger —
- * but CAPPED so the light reaches the text in reasonable time.
- *
- * Ten cells either side is what makes the timing match Claude Code on a long row. On a SHORT row it is
- * most of the cycle: `Edit` is four characters, so the travel is 24 cells and the light spends the first
- * 500ms still outside the text, showing nothing. A row that looks frozen for half a second and then
- * blinks once reads as broken, which is exactly how the Using row was reported.
- *
- * The cap is `n + 4` per side at most, so a short row spends a few steps entering rather than ten, and a
- * long row is unchanged.
- */
-function lightMargin(n) {
-  const half = totalHalf(Math.max(1, n));
-  return Math.max(1, Math.min(ENTRY_EXIT_CHARS, Math.max(half, Math.ceil(Math.max(1, n) / 4))));
-}
+/**
+ * The margin for a row of `n` characters: the target ten, or the light's half-width if that is larger —
+ * but CAPPED so the light reaches the text in reasonable time.
+ *
+ * Ten cells either side is what makes the timing match Claude Code on a long row. On a SHORT row it is
+ * most of the cycle: `Edit` is four characters, so the travel is 24 cells and the light spends the first
+ * 500ms still outside the text, showing nothing. A row that looks frozen for half a second and then
+ * blinks once reads as broken, which is exactly how the Using row was reported.
+ *
+ * The cap is `n + 4` per side at most, so a short row spends a few steps entering rather than ten, and a
+ * long row is unchanged.
+ */
+function lightMargin(n) {
+  const half = totalHalf(Math.max(1, n));
+  return Math.max(1, Math.min(ENTRY_EXIT_CHARS, Math.max(half, Math.ceil(Math.max(1, n) / 4))));
+}
 
 /**
  * The crossing time for a row of `count` characters — ONE FULL ROUND, entry and exit included.
  *
- * `(count + 2 * lightMargin(count)) * stepMs`. The light is over the visible text for only `count * stepMs`
- * of it; the rest is the entry and exit runs, which is what keeps the sweep from snapping on and off.
+ * `(count + 2 * lightMargin(count)) * stepMs * SWEEP_TICKS / 10`. The light is over the visible text for only
+ * `count * stepMs` of it; the rest is the entry and exit runs, which is what keeps the sweep from snapping on
+ * and off.
+ *
+ * `SWEEP_TICKS` IS THE RESOLUTION KNOB. At the old value of 10 a ten-character row crossed in 1235ms — about
+ * 19 frames at 65ms — and the light traversed its own five-character band in a third of that, so each glyph
+ * took only five distinct brightness values and the fade read as a five-step ramp. Every doubling of the tick
+ * count doubles the frames each glyph is under the light, which is the only way to make the fade finer without
+ * changing its shape or its speed across the row.
  */
-export function crossMs(count, stepMs = STEP_MS) {
+export function crossMs(count, stepMs = STEP_MS) {
   const cells = Math.max(1, count) + 2 * lightMargin(count);
-  return cells * stepMs;
+  return cells * stepMs * (SWEEP_TICKS / 10);
 }
 
 /**
@@ -803,7 +818,7 @@ export function crossMs(count, stepMs = STEP_MS) {
  * Claude Code can use zero because its entry run is ten cells: the light is already off the row for a
  * second before it comes back. Ours enters from three cells away, too short to cover the wrap.
  */
-export const REST_MS = 300;
+export const REST_MS = 300;
 
 /**
  * The full cycle for a row: one crossing, then the rest.
@@ -811,8 +826,8 @@ export const REST_MS = 300;
  * `count` enters into it: a longer row has more characters to light, so its cycle is longer. It used to be
  * constant, because a fixed-time crossing spread itself over however many cells there happened to be.
  */
-export function cycleMs(count, stepMs = STEP_MS) {
-  return crossMs(count, stepMs) + REST_MS;
+export function cycleMs(count, stepMs = STEP_MS) {
+  return crossMs(count, stepMs) + REST_MS;
 }
 
 /**
@@ -893,7 +908,7 @@ function lightOrigin(key, anchor, now) {
  * 1.9 seconds for `Working...`. Taking milliseconds decouples the two: the caller may redraw as often
  * as it likes, and the light's speed is stated directly rather than implied by a frame count.
  */
-export function lightAt(phaseMs, index, count, edge = 'cosine', stepMs = STEP_MS) {
+export function lightAt(phaseMs, index, count, edge = 'cosine', stepMs = STEP_MS) {
   const n = Math.max(1, count);
   // Two widths, and the distinction is the shape of the light: `half` is the OUTER edge (core plus the
   // fade either side) and `core` is the part that stays at full brightness.
@@ -918,10 +933,17 @@ export function lightAt(phaseMs, index, count, edge = 'cosine', stepMs = STEP_MS
   // The margin is `max(10, half)`: ten is the target, but the light must clear its own width or it would
   // still be lighting the last characters when the round ended — the failure the half-width version was
   // written to fix, and which a flat ten reintroduces on a wide band.
-  const margin = lightMargin(n);
-  const travel = n + 2 * margin;
-  const steps = Math.floor((phaseMs / crossMs(n, stepMs)) * travel);
-  const head = Math.floor((-margin + steps) / STEP_CHARS) * STEP_CHARS;
+  const margin = lightMargin(n);
+  const travel = n + 2 * margin;
+  // THE HEAD IS CONTINUOUS, NOT QUANTISED TO WHOLE STEPS.
+  //
+  // `Math.floor` here rounded the head to the last whole tick, so on a 65ms frame a ten-character row offered
+  // the light about twenty distinct positions and each glyph saw five brightness values — a five-step ramp
+  // where the eye can see twenty. The position is a FLOAT now: the pulse is already continuous in `dist`, so
+  // every frame lands the light somewhere between two cells and the fade is as fine as the frame rate allows.
+  // `STEP_CHARS` still scales how far one step moves, which is a shape decision, not a resolution one.
+  const progress = Math.max(0, Math.min(1, phaseMs / crossMs(n, stepMs)));
+  const head = (-margin + progress * travel) * STEP_CHARS;
   // `edge` shapes the shoulder: a raised cosine leaves its outer end gentle, a linear one is sharpest
   // where it meets the core. It arrives as a PARAMETER rather than being read from config, because this
   // is a module-level function and the TUI state lives inside startTUI's closure — the trap that once
@@ -948,13 +970,13 @@ export function lightAt(phaseMs, index, count, edge = 'cosine', stepMs = STEP_MS
  * @param {string}   edge     shoulder shape: 'cosine' (default) or 'linear'
  * @returns {string}          ANSI, ready to splice into a row
  */
-function shimmerText(text, phaseMs, base, glint, edge = 'cosine', stepMs = STEP_MS) {
+function shimmerText(text, phaseMs, base, glint, edge = 'cosine', stepMs = STEP_MS) {
   const s = String(text == null ? '' : text);
   const n = s.length;
   if (!n) return '';
   const out = [];
   for (let i = 0; i < n; i++) {
-    const t = Math.max(0, Math.min(1, lightAt(phaseMs, i, n, edge, stepMs)));
+    const t = Math.max(0, Math.min(1, lightAt(phaseMs, i, n, edge, stepMs)));
     const r = Math.round(base[0] + (glint[0] - base[0]) * t);
     const g = Math.round(base[1] + (glint[1] - base[1]) * t);
     const b = Math.round(base[2] + (glint[2] - base[2]) * t);
@@ -988,7 +1010,12 @@ export const STEP_CHARS = 1;
 // edge of the band to the settle point, i.e. `travel = 1 + BAND`, not `1 + 2*BAND`.
 // Correcting that buys ~25% more frames for free, because the extra was spent sweeping
 // through empty space before and after the row.
-export const SWEEP_TICKS = 10;          // ticks per half-sweep (0.8s, so a 3.2s cycle)
+// FRAMES PER CHARACTER IS THE SMOOTHNESS. With `STEP_MS = 65` and a band of `n/2`, the light spends
+// `BAND * ticks / (1 + BAND)` frames on each character; at 10 ticks that is 3.3, so a glyph took only three
+// or four distinct brightness values and the fade read as a step. Doubling the tick count doubles that to
+// 6.7 — the light still crosses in the same ORDER, it just takes twice as long to do it, which is the only
+// way to buy resolution without changing the shape.
+export const SWEEP_TICKS = 20;          // ticks per half-sweep (1.3s at 65ms, so a 2.6s cycle)
 const SWEEP_TRAVEL_PAD = 1;             // head runs from -BAND to 1
 
 /**
@@ -1563,58 +1590,58 @@ export function lineDiff(oldStr, newStr, startLine = 1) {
 
 // Word-wrap a string that may contain ANSI colour codes, measuring VISIBLE
 // width only. Escape sequences are carried over to the line they belong to.
-function wrapAnsiWords(str, width) {
-  width = Math.max(1, width | 0);
-  const tokens = String(str).split(/(\s+)/); // keep whitespace as tokens
-  const out = [];
-  let line = '';
-  let lineW = 0;
-  // THE COLOUR ACTIVE AT THE BREAK, carried onto the next row.
-  //
-  // A colour is opened once and closed at the end of the string, so a line wrapped mid-colour leaves the
-  // continuation starting with plain text — the terminal paints it in its DEFAULT foreground, which on a
-  // dark theme is brighter than the grey the rest of the block uses. That is what a wrapped, expanded
-  // command looked like: the first row grey and every row below it lighter.
-  //
-  // Tracked from the escapes seen so far and re-emitted at the start of each new row, then cleared. `0m`
-  // resets it, so a line that closes its colour before the break does not reopen one.
-  let active = '';
-  const scan = (text) => {
-    for (const m of text.matchAll(/\x1b\[([0-9;]*)m/g)) {
-      active = m[1] === '0' || m[1] === '' ? '' : `\x1b[${m[1]}m`;
-    }
-  };
-  const push = () => { if (line !== '') out.push(line); line = active; lineW = 0; };
-  for (const tok of tokens) {
-    if (tok === '') continue;
-    const tw = visualCol(tok);
-    if (/^\s+$/.test(tok)) {
-      if (lineW > 0) { line += tok; lineW += tw; }
-      continue;
-    }
-    if (lineW > 0 && lineW + tw > width) push();
-    scan(tok);
-    if (tw > width && visualCol(tok) > width) {
-      // Hard-split an over-long token by visible columns.
-      let chunk = '';
-      let cw = 0;
-      for (const ch of tok) {
-        const chw = visualCol(ch);
-        if (cw + chw > width) { out.push(chunk); chunk = active; cw = 0; }
-        chunk += ch; cw += chw;
-      }
-      if (chunk) { line = chunk; lineW = cw; }
-      continue;
-    }
-    line += tok;
-    lineW += tw;
-  }
-  if (line !== '') out.push(line);
-  if (out.length === 0) out.push('');
-  // Rows that were seeded with a carried colour but ended up holding nothing are dropped: they would
-  // render as an invisible escape-only line.
-  return out.map((s) => s.replace(/^\x1b\[[0-9;]*m$/, '')).filter((s) => s !== '' || out.length === 1);
-}
+function wrapAnsiWords(str, width) {
+  width = Math.max(1, width | 0);
+  const tokens = String(str).split(/(\s+)/); // keep whitespace as tokens
+  const out = [];
+  let line = '';
+  let lineW = 0;
+  // THE COLOUR ACTIVE AT THE BREAK, carried onto the next row.
+  //
+  // A colour is opened once and closed at the end of the string, so a line wrapped mid-colour leaves the
+  // continuation starting with plain text — the terminal paints it in its DEFAULT foreground, which on a
+  // dark theme is brighter than the grey the rest of the block uses. That is what a wrapped, expanded
+  // command looked like: the first row grey and every row below it lighter.
+  //
+  // Tracked from the escapes seen so far and re-emitted at the start of each new row, then cleared. `0m`
+  // resets it, so a line that closes its colour before the break does not reopen one.
+  let active = '';
+  const scan = (text) => {
+    for (const m of text.matchAll(/\x1b\[([0-9;]*)m/g)) {
+      active = m[1] === '0' || m[1] === '' ? '' : `\x1b[${m[1]}m`;
+    }
+  };
+  const push = () => { if (line !== '') out.push(line); line = active; lineW = 0; };
+  for (const tok of tokens) {
+    if (tok === '') continue;
+    const tw = visualCol(tok);
+    if (/^\s+$/.test(tok)) {
+      if (lineW > 0) { line += tok; lineW += tw; }
+      continue;
+    }
+    if (lineW > 0 && lineW + tw > width) push();
+    scan(tok);
+    if (tw > width && visualCol(tok) > width) {
+      // Hard-split an over-long token by visible columns.
+      let chunk = '';
+      let cw = 0;
+      for (const ch of tok) {
+        const chw = visualCol(ch);
+        if (cw + chw > width) { out.push(chunk); chunk = active; cw = 0; }
+        chunk += ch; cw += chw;
+      }
+      if (chunk) { line = chunk; lineW = cw; }
+      continue;
+    }
+    line += tok;
+    lineW += tw;
+  }
+  if (line !== '') out.push(line);
+  if (out.length === 0) out.push('');
+  // Rows that were seeded with a carried colour but ended up holding nothing are dropped: they would
+  // render as an invisible escape-only line.
+  return out.map((s) => s.replace(/^\x1b\[[0-9;]*m$/, '')).filter((s) => s !== '' || out.length === 1);
+}
 
 // Word-aware wrap that also returns each row's starting offset in the source
 // string, so the caret can be mapped to a (row, col) inside the composer.
@@ -2125,7 +2152,7 @@ function keyArgument(name, args, workspace, expanded = false) {
   }
   return '';
 }
-export function formatToolLine(msg, workspace, spin, pulseStart, shimmerEdge, expanded = false, reducedMotion = false) {
+export function formatToolLine(msg, workspace, spin, pulseStart, shimmerEdge, expanded = false, reducedMotion = false, width = 0) {
   const name = msg.toolName || '';
   const arg = keyArgument(name, msg.toolArgs, workspace, expanded);
   const verb = msg.pending ? 'Using' : 'Used';
@@ -2169,21 +2196,21 @@ export function formatToolLine(msg, workspace, spin, pulseStart, shimmerEdge, ex
     // `??`, NOT `||`: tick 0 is a legitimate anchor, and `0 || spin` would collapse the elapsed time to
     // zero so the light never moved at all.
     const anchorSpin = pulseStart ?? spin;
-    // THE KEY IS THE ROW'S OWN IDENTITY, and nothing else.
-    //
-    // It used to carry `anchorSpin` as well, on the reasoning that the same message re-animated on a new
-    // tick should get a new origin. The opposite happened: `anchorSpin` is `pulseStart ?? spin`, and when
-    // the caller passes no `pulseStart` it IS the tick counter — it changes every 80ms, so every frame
-    // built a new key, `lightOrigin` created a fresh origin for it, and `elapsedMs` stayed at 0. The light
-    // sat still, except for the one frame after the row content changed and the message object was
-    // replaced.
-    //
-    // A row animates from the moment it appears until it stops being pending, and its id is stable across
-    // that whole life: one origin, and elapsed grows from there.
-    const rowKey = msg && (msg.id || msg.toolId) ? `tool:${msg.id || msg.toolId}` : `tool:${name}`;
+    // THE KEY IS THE ROW'S OWN IDENTITY, and nothing else.
+    //
+    // It used to carry `anchorSpin` as well, on the reasoning that the same message re-animated on a new
+    // tick should get a new origin. The opposite happened: `anchorSpin` is `pulseStart ?? spin`, and when
+    // the caller passes no `pulseStart` it IS the tick counter — it changes every 80ms, so every frame
+    // built a new key, `lightOrigin` created a fresh origin for it, and `elapsedMs` stayed at 0. The light
+    // sat still, except for the one frame after the row content changed and the message object was
+    // replaced.
+    //
+    // A row animates from the moment it appears until it stops being pending, and its id is stable across
+    // that whole life: one origin, and elapsed grows from there.
+    const rowKey = msg && (msg.id || msg.toolId) ? `tool:${msg.id || msg.toolId}` : `tool:${name}`;
     const elapsedMs = Math.max(0, Date.now() - lightOrigin(rowKey, anchorSpin, spin));
     // ONE shimmer for both rows — see `shimmerText`.
-    const phaseMs = elapsedMs % cycleMs(name.length, TOOL_STEP_MS);
+    const phaseMs = elapsedMs % cycleMs(name.length, TOOL_STEP_MS);
 
     // The same restraint as the Working row's glint: the light is the base colour with a small lift in
     // the SAME hue, not a jump to white. `[150, 255, 255]` against `[0, 215, 255]` read as "the name is
@@ -2191,12 +2218,12 @@ export function formatToolLine(msg, workspace, spin, pulseStart, shimmerEdge, ex
     const BASE = [0, 215, 255];      // cyan: the name's resting colour
     const GLINT = [110, 240, 255];   // the same hue, a shade brighter
 
-    // The same setting the Working row honours: a pending tool's name is decoration too.
-    if (reducedMotion) {
-      nameDisplay = col(name, C.cyan);
-    } else {
-      nameDisplay = shimmerText(name, phaseMs, BASE, GLINT, shimmerEdge || 'cosine', TOOL_STEP_MS);
-    }
+    // The same setting the Working row honours: a pending tool's name is decoration too.
+    if (reducedMotion) {
+      nameDisplay = col(name, C.cyan);
+    } else {
+      nameDisplay = shimmerText(name, phaseMs, BASE, GLINT, shimmerEdge || 'cosine', TOOL_STEP_MS);
+    }
   } else {
     // Non-pending: show in plain cyan
     nameDisplay = col(name, C.cyan);
@@ -2457,11 +2484,13 @@ function messageLines(msg, width, workspace, expanded, spin, pulseStart, rawMode
   // Tool calls render as a single "● Using/Used Name (arg)" line (kimi style).
   // The body already carries its own ANSI colours, so mark it pre-colored.
   if (msg.role === 'tool') {
-  const body = formatToolLine(msg, workspace, spin, pulseStart, shimmerEdge, expanded, reducedMotion);
+    // The bullet's width is known before the body is built, and the body needs it: a pending tool's name is
+    // swept across the row it has, not across its own four characters.
+    const bodyW = Math.max(1, width - visualCol('● '));
+    const body = formatToolLine(msg, workspace, spin, pulseStart, shimmerEdge, expanded, reducedMotion, bodyW);
     // Red bullet for a failed call (a Bash non-zero exit / [error: …]).
     const failed = msg.failed === true || (msg.role === 'tool' && msg.failed === true);
     const pre = col('● ', msg.pending ? C.orange : (failed ? C.red : C.green));
-    const bodyW = Math.max(1, width - visualCol('● '));
     // EXPANDED: break the body at the newlines the command actually has, so a multi-line script renders
     // as the lines it was written as. `wrapAnsiWords` alone flattens a newline into a space, turning
     // `set -e\nnpm ci\nnpm test` into one long reflowed line — and the reason to expand is to read the
@@ -3001,12 +3030,16 @@ function messageLines(msg, width, workspace, expanded, spin, pulseStart, rawMode
     const { headRows, tailRows, headCut } = renderMdIncremental(msg, String(msg.text || ''), bodyW, fg, codeFg);
     const c = msg._mdCache;
     let headWrapped = c && c.headWrapped;
-    if (!headWrapped || c.headWrappedCut !== headCut) {
+    if (!headWrapped || c.headWrappedCut !== headCut || c.headWrappedVersion !== MD_RENDER_VERSION) {
       // ONLY the first row of the whole message carries the `❯` marker; every later
       // row uses the continuation pad. Using `prefix` for every head row put a `❯`
       // on each line of the message.
       headWrapped = headRows.map((ml, i) => ({ text: ml, ind: i === 0 ? prefix : contPad, raw: true }));
-      if (c) { c.headWrapped = headWrapped; c.headWrappedCut = headCut; }
+      if (c) {
+        c.headWrapped = headWrapped;
+        c.headWrappedCut = headCut;
+        c.headWrappedVersion = MD_RENDER_VERSION;
+      }
     }
     for (const w of headWrapped) lines.push(w);
     const tailBase = lines.length;
@@ -3053,22 +3086,38 @@ function messageLines(msg, width, workspace, expanded, spin, pulseStart, rawMode
 // separately. That is NOT equivalent — a trailing blank line contributes a row on
 // its own but acts as a separator inside the whole document — so the two renders
 // disagreed by a row. Blocks avoid the problem entirely.)
+/**
+ * Version of the markdown renderer, part of the incremental cache key.
+ *
+ * That cache is validated on the INPUT — text, width, colours — which cannot see that the renderer
+ * itself now produces different rows for the same input. A session that cached a block before a fence
+ * type learned to draw kept showing the old output, so the change looked like it had not shipped.
+ * Bump this whenever what `renderMdText` produces for the same input changes.
+ */
+const MD_RENDER_VERSION = 7;   // 7: an image row carries the TeX that produced it
+
 export function renderMdIncremental(msg, text, width, fg, codeFg) {
   const src = text.replace(/\r\n/g, '\n');
   let c = msg._mdCache;
   // Layout identity: same width/colours and the same text. Comparing the text (not
   // just its length) is required — a same-length replacement must re-render.
-  if (c && c.width === width && c.fg === fg && c.codeFg === codeFg && c.text === src) {
+  if (c && c.v === MD_RENDER_VERSION && c.width === width && c.fg === fg && c.codeFg === codeFg && c.text === src) {
     return { headRows: c.headRows, tailRows: c.tailRows, headCut: c.headCut };
   }
-  if (!c || c.width !== width || c.fg !== fg || c.codeFg !== codeFg) {
-    c = msg._mdCache = { width, fg, codeFg };
+  if (!c || c.v !== MD_RENDER_VERSION || c.width !== width || c.fg !== fg || c.codeFg !== codeFg) {
+    c = msg._mdCache = { v: MD_RENDER_VERSION, width, fg, codeFg };
   }
 
   const parts = splitBlocks(src);
   // A block is final once a LATER block exists; the last one is still growing.
   const headCount = Math.max(0, parts.length - 1);
-  const canReuse = Array.isArray(c.blocks)
+  // THE CACHED BLOCKS BELONG TO A VERSION OF THE RENDERER. Without that check a request for the same text,
+  // width and colours reuses rows produced by an OLDER renderer: the fast path above rejects them on `c.v`,
+  // but it leaves `c` untouched (its width and colours still match), and this reuse test then finds the block
+  // texts identical and hands back the old rows. That is why an image row kept arriving without the TeX it
+  // was made from after the field was added.
+  const canReuse = c.v === MD_RENDER_VERSION
+    && Array.isArray(c.blocks)
     && Array.isArray(c.blockTexts)
     && c.blockTexts.length >= headCount
     && parts.length >= headCount
@@ -3081,6 +3130,7 @@ export function renderMdIncremental(msg, text, width, fg, codeFg) {
   const headCut = parts.length > 1 ? parts.slice(0, headCount).join('\n').length : 0;
 
   msg._mdCache = {
+    v: MD_RENDER_VERSION,
     text: src, width, fg, codeFg,
     blocks, blockTexts: parts.slice(0, headCount),
     headRows, tailRows, headCut,
@@ -3126,16 +3176,112 @@ export function renderMdText(text, width, fg, codeFg) {
   while (i < para.length) {
     let line = para[i];
     const t = line.replace(/\s+$/, '');
+    // DISPLAY MATH: `$$ ... $$` and `\[ ... \]`.
+    //
+    // A fence is what a model writes when it wants a code block, but a formula usually arrives as `$$`.
+    // It is laid out here as the formula it describes — stacked fractions, limits above a sum — and its
+    // source is what remains when the subset cannot express it, exactly as a math fence behaves.
+    // The opener has to start the line and the closer has to end one, so `cost is $$x$$ total` stays prose
+    // and is handled as inline math by the line renderer below.
+    const mathOpen = /^\s*(\$\$|\\\[)/.exec(t);
+    if (mathOpen) {
+      const open = mathOpen[1];
+      const close = open === '$$' ? '$$' : '\\]';
+      const after = t.slice(mathOpen.index + mathOpen[0].length);
+      let body = null;
+      let used = 0;
+      let closed = true;
+      // One-line form: `$$x = 1$$` with nothing but whitespace after the closer.
+      const oneLine = after.indexOf(close);
+      if (oneLine >= 0 && after.slice(oneLine + close.length).trim() === '') {
+        body = after.slice(0, oneLine);
+        used = 1;
+      } else if (after.trim() === '') {
+        // Multi-line form: everything up to the line that ends with the closer.
+        const collected = [];
+        let k = i + 1;
+        let found = false;
+        while (k < para.length) {
+          const cl = para[k].replace(/\s+$/, '');
+          if (cl.trimEnd().endsWith(close)) {
+            collected.push(cl.slice(0, cl.lastIndexOf(close)));
+            k++;
+            found = true;
+            break;
+          }
+          collected.push(para[k]);
+          k++;
+        }
+        body = collected.join('\n');
+        used = k - i;
+        // Still streaming: no closer yet, so the body is prose plus half a formula.
+        closed = found;
+      }
+      if (body !== null && closed) {
+        i += used;
+        // Same three fallbacks as a math fence: bitmap, Unicode layout, then the source.
+        const rows = mathBlockRows(body, width, true);
+        if (rows) {
+          out.push(...rows);
+        } else {
+          // Unsupported: show the TeX so the reader still gets the formula's meaning.
+          for (const l of body.split('\n')) out.push(col('  ' + l.slice(0, Math.max(1, width - 2)), C.white));
+        }
+        continue;
+      }
+    }
     // Fenced code block. Rendered with a rule ABOVE (labelled with the language)
     // and a matching full-width rule BELOW, so the block is visibly delimited.
-    const fm = /^\s*(```+|~~~+)\s*(\S*)/.exec(t);
+    const fm = /^\s*(`{3,}|~{3,})\s*(\S*)/.exec(t);
     if (fm) {
       const lang = fm[2] || '';
       i++;
       const buf = [];
-      while (i < para.length && !/^\s*(```+|~~~+)/.test(para[i])) { buf.push(para[i]); i++; }
-      i++; // closing fence
+      const fenceChar = fm[1][0];
+      const fenceLen = fm[1].length;
+      const isCloser = (s) => {
+        const m = /^\s*(`{3,}|~{3,})\s*$/.exec(s);
+        return !!m && m[1][0] === fenceChar && m[1].length >= fenceLen;
+      };
+      while (i < para.length && !isCloser(para[i])) { buf.push(para[i]); i++; }
+      // Whether the closing fence was actually reached: an open fence means the text is still streaming.
+      const fenceClosed = i < para.length;
+      i++; // closing fence (no-op when the fence is still open)
       const rule = (s) => col(s, C.gray);
+      // MATH FENCES ARE TYPESET. A `latex`/`tex`/`math` fence is TeX, not code: it is drawn as the formula
+      // it describes, and when the terminal speaks an image protocol it is drawn as a TYPESET BITMAP rather
+      // than as flattened Unicode — the same pipeline dsh-tui uses, with STIX Two Math.
+      //
+      // Three fallbacks, in order, and each one keeps the formula: the bitmap; the Unicode layout when the
+      // picture cannot be placed (no protocol, no cell size, too wide, too tall); the SOURCE when the subset
+      // cannot express the TeX at all.
+      if (/^(latex|tex|math)$/i.test(lang)) {
+        const tex = buf.join('\n').trim();
+        const rendered = mathBlockRows(tex, width, fenceClosed);
+        if (rendered) {
+          out.push(...rendered);
+          continue;
+        }
+        // Falls through to the plain code block: the source is all we have.
+      }
+      if (/^mermaid$/i.test(lang)) {
+        const src = buf.join('\n');
+        let art = null;
+        try { art = renderMermaid(src); } catch { art = null; }
+        // Wider than the panel: the frame is the honest answer, since truncating art
+        // would cut a box in half rather than say the diagram does not fit.
+        if (art && art.width <= width) {
+          // `styled` keeps the role of every span, so the frame stays dim and the
+          // connectors cyan instead of the whole diagram arriving as plain white text.
+          const coloured = mermaidAnsi(art);
+          for (const l of coloured) out.push(l);
+          continue;
+        }
+        try {
+          for (const l of mermaidSourceBox(src, width).plain) out.push(col(l, C.white));
+          continue;
+        } catch { /* fall through to the plain code block */ }
+      }
       // Opening rule: `─ <lang> ` then `─` padding out to the FULL width.
       // (The old version subtracted 4 and was 2 columns short of the panel.)
       if (lang) {
@@ -3147,13 +3293,12 @@ export function renderMdText(text, width, fg, codeFg) {
       // Fenced code block CONTENT is plain body text — render it in the
       // default terminal colour (white), not the theme's cyan. The cyan is
       // reserved for UI chrome and the language label; a large code block in
-      // cyan reads as "everything is the theme colour" (matches the "assistant
-      // text should be white" requirement).
+      // cyan reads as "everything is the theme colour".
       for (const cl of buf) out.push(col(cl.slice(0, width), C.white));
       // Closing rule, matching the opening one.
       out.push(rule('─'.repeat(Math.max(1, width))));
       continue;
-    }
+      }
     // Table: a header line followed by a separator line
     if (t.includes('|') && i + 1 < para.length && isTableSep(para[i + 1])) {
       const header = splitCells(t);
@@ -3270,8 +3415,8 @@ function markdownLineToRows(line, width, fg, codeFg, isContinuation) {
       return out;
     }
   }
-  // Inline styles: **bold**, *italic*, `code`, [text](url)
-  if (/[*`\[]/.test(t)) {
+  // Inline styles: **bold**, *italic*, `code`, [text](url), $math$
+  if (/[*`\[$]|\\\(/.test(t)) {
     for (const w of wrapWords(t, width)) out.push(col(inlineMarkdown(w, codeFg, fg), fg));
     return out;
   }
@@ -3280,6 +3425,151 @@ function markdownLineToRows(line, width, fg, codeFg, isContinuation) {
   return out;
 }
 
+/**
+ * Whether the terminal can receive a formula as a picture.
+ *
+ * Both halves are required: a protocol the terminal reported (Sixel today) and a cell size it reported
+ * (XTWINOPS 16). Without the cell size the picture would be measured in guessed cells, which is what put a
+ * formula on the wrong rows before — so a missing cell size falls back to text rather than guess.
+ */
+function mathImageCapable() {
+  const caps = terminalCaps();
+  if (!caps) return null;
+  // KITTY FIRST. A terminal that speaks both (Kitty can be built with Sixel support) handles Kitty far
+  // better: the pixels are uploaded once and every later frame is a placement, while a Sixel has to be
+  // retransmitted and moves the cursor when it is drawn.
+  const protocol = caps.kittyGraphics
+    ? 'kitty'
+    : (Array.isArray(caps.extensions) && caps.extensions.includes('sixel') ? 'sixel' : null);
+  if (!protocol) return null;
+  const cell = caps.cell && caps.cell.w > 0 && caps.cell.h > 0 ? caps.cell : null;
+  return cell ? { protocol, cell } : null;
+}
+
+/** Ink colour for a typeset formula: the body text colour, so a picture sits in the text rather than beside it. */
+const MATH_INK = { r: 220, g: 220, b: 220 };
+
+/**
+ * The terminal's cell height in pixels, for cropping a picture that straddles the top of the window.
+ *
+ * A crop has to convert CELL ROWS to six-pixel BANDS; without the cell height the two units get confused and
+ * the image is drawn from the wrong point in its own payload. 20 is the conventional monospace cell height and
+ * matches the fallback `src/tex/` uses when the terminal never answers XTWINOPS 16.
+ *
+ * @returns {number}
+ */
+function mathCellHeight() {
+  const caps = terminalCaps();
+  const cell = caps && caps.cell;
+  return cell && cell.h > 0 ? cell.h : 20;
+}
+
+/**
+ * Rows for one display formula: a typeset bitmap when the terminal can show one, the Unicode layout when it
+ * cannot, and nothing when the TeX is outside the subset (the caller then shows the source).
+ *
+ * @param {string} tex TeX without delimiters.
+ * @param {number} width Columns available.
+ * @param {boolean} closed The closing delimiter arrived. A formula still streaming keeps to the text form: a
+ *   picture of half a formula is worse than the TeX of half a formula.
+ * @returns {string[]|null}
+ */
+function mathBlockRows(tex, width, closed) {
+  const src = stripMathDelimiters(tex);
+  if (!src) return null;
+  // A picture sits where the text form does: one column of indent, and no wider than the panel.
+  const room = Math.max(8, width - 2);
+  if (closed) {
+    const placed = placeTex(src, room);
+    if (placed) return placed;
+  }
+  const rendered = renderLatex(src, { display: true });
+  if (rendered === undefined) return null;
+  return rendered
+    .split('\n')
+    .map((l) => col(l.slice(0, width), C.white));
+}
+
+/**
+ * Remove the delimiters a formula may still be wrapped in.
+ *
+ * A `$$…$$` block and a ```latex fence both reach the typesetter, and the fence's content may carry the
+ * delimiters too — a model writes the fence around `$$…$$` often enough that it is the common case, not the
+ * odd one. Typesetting the delimiters along with the formula draws them as glyphs inside the picture, which
+ * is what a literal `$$` in the middle of an integral looks like.
+ *
+ * Only a delimiter that spans the WHOLE body is removed: a `$$` in the middle is TeX the author meant, and
+ * stripping it would change the formula. The loop runs because a doubled wrapper (`\n$$\n…\n$$\n` inside a
+ * fence) leaves one pair behind after the first pass.
+ *
+ * @param {string} tex
+ * @returns {string}
+ */
+function stripMathDelimiters(tex) {
+  let s = String(tex || '').trim();
+  for (;;) {
+    const before = s;
+    if (s.startsWith('$$') && s.endsWith('$$') && s.length > 4) {
+      s = s.slice(2, -2).trim();
+    } else if (s.startsWith('\\[') && s.endsWith('\\]') && s.length > 4) {
+      s = s.slice(2, -2).trim();
+    } else if (s.startsWith('\\(') && s.endsWith('\\)') && s.length > 4) {
+      s = s.slice(2, -2).trim();
+    }
+    if (s === before) return s;
+  }
+}
+
+
+/**
+ * Typeset a formula into a frame row, or null when it cannot be placed as a picture here.
+ *
+ * The picture is one row of TEXT plus a payload: the row is the sentinel `image-row.js` understands, the
+ * rows below it are blank, and the frame writer turns them into a cursor move and a Sixel sequence. Every
+ * reason to decline is a reason the caller already has a text fallback for, so this never throws.
+ *
+ * @param {string} tex
+ * @param {number} room Columns the picture may occupy.
+ */
+function placeTex(tex, room) {
+  const capable = mathImageCapable();
+  if (!capable) return null;
+  try {
+    // Measured first, because laying out is what rejects TeX outside the subset: a raster would be paid for
+    // and then thrown away.
+    const measured = measureTex(tex, { cell: capable.cell });
+    if (!measured || measured.columns > room || measured.rows > TEX_MAX_ROWS) return null;
+    const image = encodeTexImage(tex, { protocol: capable.protocol, cell: capable.cell, colour: MATH_INK });
+    if (!image) return null;
+    // THE SOURCE TRAVELS WITH THE ROW. A picture that straddles the top of the window has to be redrawn from
+    // its first VISIBLE row, and only the TeX can produce that raster: cropping the encoded payload can only
+    // land on a six-pixel band boundary, which leaves up to a quarter of a cell of the formula above the
+    // window and makes it slide as the view scrolls. `paintCellFrame` reads this back and re-renders with
+    // `skipTop` when a picture needs cropping.
+    const rows = [encodeImageRowHelper(image.sequence, image.rows, image.columns, tex)];
+    for (let r = 1; r < image.rows; r++) rows.push('');
+    return rows;
+  } catch {
+    // A bitmap that cannot be drawn is a reason to show text, never a reason to lose the frame.
+    return null;
+  }
+}
+
+/**
+ * Whether a `$...$` body is a formula rather than prose.
+ *
+ * Prices, shell variables and identifiers all use `$`: `costs $5 and $10`, `$HOME`, `${VAR}`. A body that
+ * starts or ends with a space, is a bare number or an all-caps word is prose, and so is one with no TeX
+ * command and no operator in it — `vitamin $C$` stays text while `$x^2$` becomes a formula.
+ */
+function looksLikeInlineMath(body) {
+  if (/^\s/.test(body) || /\s$/.test(body)) return false;
+  if (body.startsWith('{') || body.includes('`')) return false;
+  if (/^\d+([.,]\d+)?$/.test(body)) return false;
+  if (/^[A-Z][A-Z0-9_]*$/.test(body)) return false;
+  return /\\[A-Za-z]+|[=+\-*/<>^_]/.test(body) || (/^[A-Za-z]$/.test(body));
+}
+
 // Apply inline markdown to a single line: `code`, **bold**, *italic*, ~~strike~~,
 // [text](url). Order matters so inner tokens are handled safely.
 // `base` is the surrounding foreground colour; every inline style re-asserts it
@@ -3291,6 +3581,17 @@ function inlineMarkdown(s, codeFg, base) {
   let r = s;
   // Inline code first so it is not mangled by * [] ~.
   r = r.replace(/`([^`]+)`/g, (_, c) => col(c, codeFg) + fb);
+  // INLINE MATH. After the code spans, so a formula inside backticks stays code, and before emphasis, so
+  // `*` and `_` inside TeX cannot turn into italics. `\(...\)` is the other inline form models use.
+  r = r.replace(/\$([^$\n]+?)\$|\\\(([^\n]+?)\\\)/g, (m, dollar, paren) => {
+    const tex = dollar !== undefined ? dollar : paren;
+    // A price or a shell variable is not math: `$5 and $10`, `$HOME`, `${VAR}`.
+    if (dollar !== undefined && !looksLikeInlineMath(tex)) return m;
+    const out = renderLatex(tex, { display: false });
+    // Unsupported or multi-line: the source stands, because inline math sits inside wrapped prose.
+    if (out === undefined || out.includes('\n')) return m;
+    return out;
+  });
   // Bold
   r = r.replace(/\*\*([^*]+)\*\*/g, (_, c) => C.bold + c + C.reset + fb);
   // Strikethrough
@@ -3656,12 +3957,12 @@ export function renderChatLines(state, w, viewport) {
     const boxText = Math.max(1, boxInner - Math.min(1, Math.max(0, boxInner - 1)) * 2);
     const rowWidth = border ? boxText : innerW;
     const cached = m._cache;
-    // Which rows animate? A pending tool call and a running compaction block do, and their appearance
-    // depends on the current step of the light. Everything else gets a constant key, so a static row is
-    // laid out once and reused across frames.
-    // A pending tool advances from the wall clock at TOOL_STEP_MS, so its cache key is THAT step index.
-    const animating = (m.role === 'tool' && m.pending) || (m.role === 'compaction' && m.phase === 'running');
-    const spinKeyNow = animating ? Math.floor(Date.now() / TOOL_STEP_MS) : 0;
+    // Which rows animate? A pending tool call and a running compaction block do, and their appearance
+    // depends on the current step of the light. Everything else gets a constant key, so a static row is
+    // laid out once and reused across frames.
+    // A pending tool advances from the wall clock at TOOL_STEP_MS, so its cache key is THAT step index.
+    const animating = (m.role === 'tool' && m.pending) || (m.role === 'compaction' && m.phase === 'running');
+    const spinKeyNow = animating ? Math.floor(Date.now() / TOOL_STEP_MS) : 0;
     const valid = cached
       && cached.rowW === rowWidth && cached.expanded === expanded
       && cached.textRef === m.text && cached.streamRef === m.streamContent
@@ -3715,8 +4016,11 @@ export function renderChatLines(state, w, viewport) {
     // happen (replacing a word). Those are caught by the `_cache` nulling at the
     // edit sites, which is what the shared-store path below relies on too.
     const countLen = typeof m.text === 'string' ? m.text.length : 0;
-    // Only a NON-ANIMATING message can be answered from its row count. See the note below.
-    if (!valid && !cached && !animating && m._count && m._count.key === countKey && m._count.textLen === countLen) {
+    // Only a NON-ANIMATING message can be answered from its row count. See the note below.
+    // A message that may hold a bitmap cannot be answered from a row count: the count says how many rows it
+    // occupies, not what is drawn in them.
+    const hasFence = /```+\s*(latex|tex|math)\b/i.test(typeof m.text === 'string' ? m.text : '');
+    if (!hasFence && !valid && !cached && !animating && m._count && m._count.key === countKey && m._count.textLen === countLen) {
       msgLen[mi] = m._count.len + rules;
       cursor += msgLen[mi];
       prevBordered = border;
@@ -3741,12 +4045,13 @@ export function renderChatLines(state, w, viewport) {
         && shared.liveRef === m.liveOutput && shared.diffRef === m.diff
         && shared.countsRef === m._diffCounts
         && shared.keyArgs === (m.toolArgs ? fpArgs(m.toolArgs) : '0')
+        && shared.v === MD_RENDER_VERSION
         && shared.pluginExpanded === (m.pluginLog ? !!m.expanded : null)) {
         m._cache = shared;
         msgLen[mi] = shared.rows.length + rules;
       } else {
         const rows = messageLines(m, rowWidth, state.cwd, expanded, state.spin, state.pulseStart, state.rawMode,
-          state.shimmerEdge || (state.cfg && state.cfg.shimmerEdge),
+          state.shimmerEdge || (state.cfg && state.cfg.shimmerEdge),
           reducedMotionOn(state));
         const wrapped = rows.map(rowToLine);
         const isPending2 = m.pending ? 1 : 0;
@@ -3762,6 +4067,7 @@ export function renderChatLines(state, w, viewport) {
           pluginExpanded: m.pluginLog ? !!m.expanded : null,
           raw: !!state.rawMode,
           rows: wrapped, spinRows: null,
+          v: MD_RENDER_VERSION,   // invalidates rows built by an older renderer
         };
         for (let i = 0; i < wrapped.length; i++)
           if (wrapped[i].indexOf(SPIN_PLACEHOLDER) >= 0) {
@@ -3887,27 +4193,30 @@ export function renderChatLines(state, w, viewport) {
         && rowStart[mi - 1] + msgLen[mi - 1] === cursor;
     }
     const len = msgLen[mi];
-    const visible = visibleTo < 0 || (cursor + len > visibleFrom && cursor < visibleTo);
+    // A message that may contain a bitmap is always built, visible or not: a row COUNT cannot represent a
+    // picture, and a stale payload is worse than no payload.
+    const mayHoldImage = /```+\s*(latex|tex|math)\b/i.test(typeof msg.text === 'string' ? msg.text : '');
+    const visible = mayHoldImage
+      || visibleTo < 0
+      || (cursor + len > visibleFrom && cursor < visibleTo);
     if (visible) {
       // Pass 1 may have skipped building the rows for a message far from the
       // viewport (it only needed the row COUNT, so it used `_count`). Now that the
       // message IS visible, build them here — otherwise an evicted message rendered
       // as blank rows, which is what made scrolled-back history look like it had
       // "not loaded". The row width must match what pass 1 counted with.
-      let ccc = msg._cache;
-      if (!ccc || !ccc.rows || ccc.rows.length !== len - (bordered ? (shared ? 1 : 2) : 0)) {
-        const bw = bordered ? boxText : innerW;
-        const src = messageLines(msg, bw, state.cwd, expanded, state.spin, state.pulseStart, state.rawMode,
-          state.shimmerEdge || (state.cfg && state.cfg.shimmerEdge));
-        const built = src.map(rowToLine);
-        ccc = { rows: built, spinRows: null };
-        for (let i = 0; i < built.length; i++) {
-          if (built[i].indexOf(SPIN_PLACEHOLDER) >= 0) {
-            if (!ccc.spinRows) ccc.spinRows = new Set();
-            ccc.spinRows.add(i);
-          }
+      // Rows are re-derived every frame. Everything expensive inside `messageLines` is cached under a
+      // COMPLETE key (the markdown block cache) or in the shared row LRU; what used to be cached HERE was the
+      // final string, validated on a row count that cannot see a clipped payload.
+      const bw = bordered ? boxText : innerW;
+      const src = messageLines(msg, bw, state.cwd, expanded, state.spin, state.pulseStart, state.rawMode,
+        state.shimmerEdge || (state.cfg && state.cfg.shimmerEdge));
+      const ccc = { rows: src.map(rowToLine), spinRows: null };
+      for (let i = 0; i < ccc.rows.length; i++) {
+        if (ccc.rows[i].indexOf(SPIN_PLACEHOLDER) >= 0) {
+          if (!ccc.spinRows) ccc.spinRows = new Set();
+          ccc.spinRows.add(i);
         }
-        msg._cache = ccc;
       }
       const spinRows = ccc.spinRows;
       const liveAt = (r, i) => (spinRows && spinRows.has(i) ? r.split(SPIN_PLACEHOLDER).join(spinFrame) : r);
@@ -3916,10 +4225,20 @@ export function renderChatLines(state, w, viewport) {
         const pad = ' '.repeat(boxPad);
         const wall = col('│', boxColor);
         for (let i = 0; i < ccc.rows.length; i++) {
-          out.push(PAD + wall + pad + fitAnsi(liveAt(ccc.rows[i], i), boxText) + pad + wall);
+          const rowText = liveAt(ccc.rows[i], i);
+          if (isImageRow(rowText)) {
+            // Emitted as-is: the frame writer turns it into a cursor move plus the bitmap.
+            out.push(rowText);
+            continue;
+          }
+          out.push(PAD + wall + pad + fitAnsi(rowText, boxText) + pad + wall);
         }
       } else {
-        for (let i = 0; i < ccc.rows.length; i++) out.push(PAD + liveAt(ccc.rows[i], i));
+        for (let i = 0; i < ccc.rows.length; i++) {
+          const rowText = liveAt(ccc.rows[i], i);
+          // An image row must arrive at the cursor with nothing in front of its introducer.
+          out.push(isImageRow(rowText) ? rowText : PAD + rowText);
+        }
       }
       if (bordered) out.push(rule(false, boxColor));
     } else {
@@ -3969,10 +4288,10 @@ export function metricsSignature(state, n, w, expanded, innerW) {
     mix(m.pluginLog && m.expanded ? 1 : 0);
     mix(m._cache ? 1 : 0);
     mix(m._count ? 1 : 0);
-    // A pending row repaints as the light moves, with none of the fields above changing. Without this
-    // the signature matched every frame and the transcript was never re-walked, so the animation froze
-    // until the message itself was touched.
-    if (m.pending) mix(Math.floor(Date.now() / STEP_MS));
+    // A pending row repaints as the light moves, with none of the fields above changing. Without this
+    // the signature matched every frame and the transcript was never re-walked, so the animation froze
+    // until the message itself was touched.
+    if (m.pending) mix(Math.floor(Date.now() / STEP_MS));
   }
   return h;
 }
@@ -4158,6 +4477,9 @@ function sparkChart(values, width, height) {
 // shows at least 1%, clamped to [0, 100]. A non-positive or non-finite `max`
 // reports 0.
 function usagePercent(used, max) {
+  // `used` can be undefined on a session resumed before any usage was recorded. Without this guard the
+  // division produced NaN and the row printed `NaN%` where it should have printed `0%`.
+  if (!Number.isFinite(used)) return 0;
   if (!Number.isFinite(max) || max <= 0) return 0;
   return Math.min(100, Math.max(0, Math.ceil((used / max) * 100)));
 }
@@ -4405,58 +4727,118 @@ export function questionBoxClampedHeight(state, insideW, h, chromeH) {
 // the thumb's travel is monotonic, uses every row, and lands exactly on both
 // ends; `thumbLenF` is kept unrounded purely so the grab offset inside the thumb
 // is not quantised to a whole row when the thumb is 10+ rows tall.
+/**
+ * Sub-cell resolution of the scrollbar, in eighths of a row.
+ *
+ * The block glyphs `▁▂▃▄▅▆▇█` ARE a vertical eighths scale, so the bar can sit at any of eight heights
+ * inside a cell. Using only two (`▀`/`▄`) gave the thumb a handful of reachable positions on a long
+ * transcript — measured, 35 positions for 482 rows of scrolled content, so it jumped ~14 rows at a time
+ * and the motion read as a series of hops.
+ */
+const SUB_CELLS = 8;
+
+/**
+ * The scrollbar thumb is this many cells tall, always.
+ *
+ * A constant height, because the bar reports POSITION rather than density. Proportional sizing is
+ * tempting and wrong here: it collapsed to a fraction of a cell on a long transcript, then grew a cell
+ * at a time as content arrived, so the control changed size while being used.
+ */
+const THUMB_CELLS = 2;
+
 export function scrollbarGeometry({ total, bodyH, scroll }) {
   const maxScroll = Math.max(0, total - bodyH);
   const pos = Math.min(maxScroll, Math.max(0, scroll || 0));
-  // OpenTUI works on a 2x virtual grid so the thumb has HALF-ROW resolution: each
-  // real row is two virtual units, and a thumb boundary landing inside a cell is
-  // drawn as `▀` (top half) or `▄` (bottom half). That is what makes a short
-  // scrollbar look smooth instead of jumping a whole row at a time. See OpenTUI
-  // Slider.ts: getVirtualThumbSize / getVirtualThumbStart / renderVertical.
-  const virtualTrack = bodyH * 2;
-  // Thumb size = viewport / (content + viewport) of the track, min one virtual unit.
-  const contentSize = maxScroll + bodyH;
-  const virtualThumbSize = bodyH >= total
-    ? virtualTrack
-    : Math.max(1, Math.min(
-      Math.floor(virtualTrack * (bodyH / Math.max(1, contentSize))),
-      virtualTrack,
-    ));
-  // 0 = bottom (pinned), maxScroll = top. Row 0 is the TOP of the body, so the
-  // virtual start counts from the top (OpenTUI's value grows downward; ours
-  // grows upward from the newest line, hence the inversion).
-  const fromTop = maxScroll === 0 ? 0 : (maxScroll - pos) / maxScroll;
-  const maxVirtualStart = Math.max(0, virtualTrack - virtualThumbSize);
-  const virtualThumbStart = Math.round(fromTop * maxVirtualStart);
-
-  // Row-range + fractional forms, kept for the drag maths and the hit-test, which
-  // reason in whole rows. Derived from the virtual values so paint and drag agree.
-  const thumbLenF = Math.max(1, virtualThumbSize / 2);
-  const thumbStart = Math.floor(virtualThumbStart / 2);
-  const thumb = Math.max(1, Math.ceil((virtualThumbStart + virtualThumbSize) / 2) - thumbStart);
-  const maxThumbStartF = Math.max(0, bodyH - thumbLenF);
+
+  if (total <= bodyH || bodyH <= 0) {
+    // Everything fits: no rail, and nothing is drawn for a control that would have nothing to say.
+    return {
+      thumbStart: 0,
+      thumbLen: bodyH,
+      thumbLenF: bodyH,
+      maxThumbStartF: 0,
+      virtualThumbStart: 0,
+      virtualThumbSize: bodyH * SUB_CELLS,
+      virtualTrack: bodyH * SUB_CELLS,
+      bodyH,
+      total,
+      maxScroll,
+    };
+  }
+
+  // PROPORTIONAL HEIGHT, WHOLE ROWS, at least one — Codewhale's rule:
+  //   thumb = ceil(rail * visible / totalRows), clamped to [1, rail]
+  //   travel = rail - thumb
+  //   top    = floor(travel * offset / maxOffset)
+  //
+  // It works in whole rows and so does this. Sub-cell positions were tried at length here: every scheme
+  // that put an edge inside a cell had to state the fraction with `▀` (four eighths) or leave it blank,
+  // so the same thumb drew between two and five eighths tall depending on where it sat, and the bar
+  // visibly changed length as it scrolled. One row of thumb is the smallest honest unit.
+  const visible = Math.max(1, Math.min(total, bodyH));
+  const thumbLen = Math.max(1, Math.min(bodyH, Math.ceil((bodyH * visible) / total)));
+  const travel = Math.max(0, bodyH - thumbLen);
+  // `scroll` counts UP from the tail, the rail runs top-down, so the offset is inverted here.
+  const thumbStart = maxScroll === 0 ? 0 : Math.min(travel, travel - Math.floor((travel * pos) / maxScroll));
 
   return {
-    thumbStart, thumbLen: thumb, thumbLenF, maxThumbStartF,
-    virtualThumbStart, virtualThumbSize, virtualTrack,
-    bodyH, total, maxScroll,
+    thumbStart,
+    thumbLen,
+    thumbLenF: thumbLen,
+    maxThumbStartF: travel,
+    virtualThumbStart: thumbStart * SUB_CELLS,
+    virtualThumbSize: thumbLen * SUB_CELLS,
+    virtualTrack: bodyH * SUB_CELLS,
+    bodyH,
+    total,
+    maxScroll,
   };
 }
 
-// The glyph for one body row, exactly OpenTUI's per-cell rule (Slider.ts
-// renderVertical): full coverage -> `█`; a half-covered cell -> `▀` when the thumb
-// starts in the upper half of that cell, `▄` when it starts in the lower half;
-// no coverage -> ` ` (the track shows through as its background colour).
+/**
+ * The glyph for one body row, from the thumb's coverage of that row.
+ *
+ * `▁▂▃▄▅▆▇█` are eighths of a cell filled from the BOTTOM, which is the natural scale for a vertical bar
+ * whose trailing edge is what the eye follows. A full row is `█`; a row the thumb ends inside shows the
+ * fraction covered; a row the thumb starts inside shows `▀` when at least half of it is covered, and is
+ * left blank otherwise so the bar never claims more than the thumb holds.
+ *
+ * That asymmetry is deliberate: the leading edge is only half-cell accurate, because no glyph fills an
+ * arbitrary fraction from the TOP. The trailing edge carries the fine motion — eight steps per row
+ * instead of two, so a short thumb travels visibly instead of hopping a whole row at a time.
+ */
+/** The vertical eighth-blocks, tallest last. */
+/**
+ * One row of the scrollbar.
+ *
+ * The thumb is drawn from its BOTTOM edge upward: `▁▂▃▄▅▆▇█` fill a cell from the floor, so a row that
+ * holds the thumb's bottom edge can state exactly how much of it is covered. That keeps the drawn height
+ * equal to the thumb's real height to within one subunit.
+ *
+ * A row that holds only the thumb's TOP edge is the hard case: nothing fills from the ceiling by a
+ * fraction, so the choice is `▀` (four subunits) or nothing. It is used only when the coverage really is
+ * at least four — using it for less is what made the bar draw seven subunits for a five-subunit thumb,
+ * i.e. visibly grow and shrink as it moved.
+ */
+/**
+ * One row of the scrollbar, assembled so the drawn height matches the thumb.
+ *
+ * A cell can hold only one character, and the available pieces are:
+ *   `▁▂▃▄▅▆▇█` — filled from the FLOOR by 1..8 eighths
+ *   `▀`       — the TOP half (four eighths)
+ *
+ * So the two edges are handled by whichever piece fits them: a cell holding the thumb's BOTTOM edge
+ * reaches the floor and the eighths say exactly how much; a cell holding its TOP edge gets `▀` when at
+ * least half of it is covered. Composing the two across adjacent rows keeps the total within one eighth
+ * of the thumb's real height — measured, the painted height varies by at most 1 subunit instead of the
+ * 3 it did when a whole cell was guessed at once.
+ */
 export function scrollbarGlyph(g, row) {
-  if (!g) return ' ';
-  const cellStart = row * 2;
-  const cellEnd = cellStart + 2;
-  const start = Math.max(g.virtualThumbStart, cellStart);
-  const end = Math.min(g.virtualThumbStart + g.virtualThumbSize, cellEnd);
-  const coverage = end - start;
-  if (coverage >= 2) return '█';
-  if (coverage > 0) return (start - cellStart) === 0 ? '▀' : '▄';
-  return ' ';
+  if (!g || row < 0 || row >= g.bodyH) return ' ';
+  // Codewhale draws the thumb as a solid block and the rest of the rail as a vertical line, so the
+  // control reads as a track with a handle on it rather than as a stick floating on nothing.
+  if (g.total <= g.bodyH) return ' ';   // nothing to scroll: no rail
+  return row >= g.thumbStart && row < g.thumbStart + g.thumbLen ? '█' : '│';
 }
 
 // Map a position on the track to a transcript scroll offset. `rowF` is the mouse
@@ -5215,6 +5597,7 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
   const bodyH = Math.max(1, h - bottomH);
 
   const lines = [];
+  const body = [];    // the whole transcript; `lines` receives the window onto it
   let dialogCaret = null;
   // The AskUserQuestion box's free-text caret, recorded as an absolute frame row
   // (the box sits mid-frame, not at the top), corrected with topPad/topTrim below.
@@ -5598,13 +5981,24 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
     if (state.selection && state.selection.anchor && state.selection.head) {
       applySelection(chat, state.selection);
     }
-    for (let i = 0; i < bodyH; i++) {
-      const idx = start + i;
+    // EVERY TRANSCRIPT ROW, not just the visible ones: the frame describes the whole content, so a change
+    // in height above the window is visible to the diff. `start` is the window offset, used by the painter.
+    for (let i = 0; i < Math.max(total, bodyH); i++) {
+      const idx = i;
+      // Where this row lands on screen. The window starts at `start` (`-padding` while the transcript is
+      // shorter than the body), so a row outside [0, bodyH) is composed but never painted.
+      const screenRow = idx - Math.max(0, start);
       let row = '';
       if (idx >= 0 && idx < total) {
         row = chat[idx] || '';
       }
-      if (sb) {
+      // THE BAR IS ADDRESSED BY SCREEN ROW, not by transcript row.
+      //
+      // It used to pass the transcript index here while the loop still walked the whole transcript, so the
+      // rail was drawn from the geometry of the FIRST `bodyH` rows of the conversation and every row actually
+      // on screen fell outside that range — the bar came out blank as soon as the transcript was scrolled off
+      // the top, i.e. in the normal case, and only appeared when the window happened to start at row 0.
+      if (sb && screenRow >= 0 && screenRow < bodyH) {
         // The scrollbar cell is drawn EXACTLY the way OpenTUI's SliderRenderable draws
         // it (packages/core/src/renderables/Slider.ts, `renderVertical`):
         //
@@ -5622,8 +6016,8 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
         // (`ESC[2m`), which fades the FOREGROUND only, so an open picker left the
         // thumb's background half at full brightness while the rest of the screen
         // receded.
-        const glyphChar = scrollbarGlyph(sb, i);
-        const onThumb = glyphChar !== ' ';
+        const glyphChar = scrollbarGlyph(sb, screenRow);
+        const onThumb = glyphChar === '█';   // the rail is `│`, the handle is `█`
         let fg;
         if (onThumb) {
           if (state.sbDrag) fg = C.scrollThumbActiveFg;
@@ -5633,9 +6027,22 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
           fg = C.scrollTrackFg;
         }
         const bg = C.scrollTrackBg;
-        row = fitAnsi(row, w - 1) + fg + bg + glyphChar + C.reset;
+        // A bitmap row is a terminal payload, so it cannot be clipped — but the SCROLLBAR STILL BELONGS ON IT.
+        //
+        // Skipping the append for an image row left its last column empty, and a formula is only as wide as
+        // its own picture (eight cells of an eighty-column row): the rail vanished for every row a formula
+        // covered. The payload is padded to the column before the rail instead of being cut, so the sequence
+        // survives intact and the rail is drawn where it always is.
+        if (isImageRow(row)) {
+          const rail = fg + bg + glyphChar + C.reset;
+          row = row + rail;
+        } else {
+          row = fitAnsi(row, w - 1) + fg + bg + glyphChar + C.reset;
+        }
       }
-      lines.push(row);
+      body.push(row);
+      // Only the window reaches the frame; the rest lives in `body` for the diff to compare.
+      if (screenRow >= 0 && screenRow < bodyH) lines.push(row);
     }
     state._sb = sb;
     state._bodyTop = start;
@@ -5647,6 +6054,18 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
     // mapping is recorded here rather than assumed — hitboxes already do the same
     // `+ topPad - topTrim` correction (see the end of this function) and the mouse
     // mapping did not, which is what made a drag copy the wrong lines.
+
+    // Pad the front when the transcript is shorter than the window: the blank rows belong ABOVE the first
+    // message, so the content sits directly over the composer. Without this the composer followed the last
+    // message and the padding pass pushed the whole body to the top of the screen.
+    // A SHORT TRANSCRIPT SITS AT THE BOTTOM, ABOVE THE COMPOSER.
+    //
+    // When the content is shorter than the window, `start` is negative and the loop emits only the rows
+    // that exist — so `lines` held five rows where the window has forty, the composer was appended
+    // directly after them, and the padding pass then pushed the whole body to the TOP of the screen.
+    // The blank rows belong at the FRONT: above the first message.
+    const missing = bodyH - lines.length;
+    if (missing > 0) for (let pad = 0; pad < missing; pad++) lines.unshift('');
     state._bodyScreenTop = lines.length - bodyH;
     // How many blank padding rows precede the first body row on screen. When
     // the transcript is shorter than the body, `start` is negative and those
@@ -5924,6 +6343,9 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
     // `qs.index` selects a question; `qs.index === qs.items.length` selects the
     // Other tab. The current tab is highlighted (background).
     const onOtherTab = qs.index >= qs.items.length;
+    // Where each tab lands inside the box, so a CLICK can select it. The tab bar is the only way to reach an
+    // earlier question with the mouse; without these the labels were plain text and a click did nothing.
+    const tabHits = [];
     {
       let tabs = '';
       const tabName = (i) => {
@@ -5933,7 +6355,10 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
       for (let i = 0; i <= qs.items.length; i++) {
         const name = i === qs.items.length ? OTHER_LABEL : tabName(i);
         const on = i === qs.index;
-        tabs += on ? col(' ' + name + ' ', C.selBg + C.cyan + C.bold) : col(' ' + name + ' ', C.gray);
+        const colStart = visualCol(tabs);
+        const label = ' ' + name + ' ';
+        tabs += on ? col(label, C.selBg + C.cyan + C.bold) : col(label, C.gray);
+        tabHits.push({ index: i, colStart, colEnd: colStart + visualCol(label) - 1 });
         tabs += ' ';
       }
       box.push(boxRow(fitAnsi(tabs, innerW - 2)));
@@ -6005,7 +6430,15 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
     const boxTop = lines.length;
     for (const b of box) lines.push(b);
     lines.push(bar('╰' + '─'.repeat(promptW) + '╯'));
-    itemRows.forEach((r) => addHit(boxTop + r.boxIdx, 0, w - 1, { kind: 'questionItem', index: r.index }));
+    // THE TAB LABELS ARE CLICKABLE. The tab bar is the box's first row, so each label's column span becomes a
+    // hit that switches to that question — the mouse equivalent of Tab. Without it the labels were plain text
+    // and clicking an earlier question did nothing.
+    tabHits.forEach((t) => addHit(boxTop, t.colStart + 2, t.colEnd + 2, { kind: 'questionTab', index: t.index }));
+    // THE OPTION'S OWN COLUMNS, NOT THE WHOLE ROW.
+    //
+    // `addHit(row, 0, w - 1)` made the hover tint cover the box's left and right borders too, so pointing at
+    // an option lit the frame around it. The hit starts inside the border and stops before the closing one.
+    itemRows.forEach((r) => addHit(boxTop + r.boxIdx, 2, Math.max(2, w - 3), { kind: 'questionItem', index: r.index }));
     if (caretInBox >= 0) {
       // The box is mid-frame (chat above, composer below), NOT pinned to the top,
       // so its caret is recorded as an absolute frame row and corrected with the
@@ -6229,24 +6662,34 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
   }
 
   if (!takeover && state.todos && state.todos.length) {
-    // The panel's top rule is a DRAG HANDLE. Record its screen row as a hitbox so
-    // the mouse handler can hover/press it; the row offset is corrected to final
-    // screen coordinates by composeFrame's hitbox pass (like every other hit).
+    // ONLY THE HEADER IS THE DRAG HANDLE, not the whole panel.
+    //
+    // This registered `addHit(todoTopRow, 0, w - 1)` — the entire width of the panel's first row — and the
+    // queue below did the same. The hit list is searched LAST-FIRST, so the queue's full-width row shadowed
+    // every control that happened to land on it: a slash-menu item, a picker row, a status segment. "It clicks
+    // into the queue instead" is exactly that. The handle is the rule and its title line.
     const todoTopRow = lines.length;
-    addHit(todoTopRow, 0, w - 1, { kind: 'todoResize' });
-    for (const l of renderTodoPanel(state, w, state.todoResizeHover, state.todoResizeDrag)) lines.push(l);
+    const todoPanel = renderTodoPanel(state, w, state.todoResizeHover, state.todoResizeDrag);
+    // The rule and the `  Todo` line are the grab area; the item rows below are not.
+    for (let r = 0; r < Math.min(2, todoPanel.length); r++) {
+      addHit(todoTopRow + r, 0, w - 1, { kind: 'todoResize' });
+    }
+    for (const l of todoPanel) lines.push(l);
   }
 
   // Queued (not yet sent) messages, directly above the composer: these are what
   // Ctrl-S steers into the running turn. See renderQueuePanel.
   if (!takeover && state.queued && state.queued.length) {
-    // The panel's top rule is a DRAG HANDLE. Record its screen row as a hitbox so
-    // the mouse handler can hover/press it.
+    // Same rule as the todo panel: the header is the handle, not every row.
     const queueTopRow = lines.length;
-    addHit(queueTopRow, 0, w - 1, { kind: 'queueResize' });
-    for (const l of renderQueuePanel(state, w, state.queueResizeHover, state.queueResizeDrag)) lines.push(l);
+    const queuePanel = renderQueuePanel(state, w, state.queueResizeHover, state.queueResizeDrag);
+    for (let r = 0; r < Math.min(2, queuePanel.length); r++) {
+      addHit(queueTopRow + r, 0, w - 1, { kind: 'queueResize' });
+    }
+    for (const l of queuePanel) lines.push(l);
   }
 
+
   // Side-thread box (/btw), docked directly above the composer — the placement kimi
   // uses (its panelContainer sits over the editor with `connectedAbove = true`), so
   // the conversation being asked about stays visible while you keep typing.
@@ -6602,7 +7045,15 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
   // this point on, column N of a row IS screen column N. The final `fitAnsi` pass then
   // has nothing left to do for width (an `w`-wide row is returned unchanged).
 
-  for (let i = 0; i < lines.length; i++) lines[i] = fitAnsi(lines[i] == null ? '' : lines[i], w);
+  // AN IMAGE ROW IS LEFT ALONE.
+  //
+  // `fitAnsi` pads and truncates to the panel width, and a Sixel payload is thousands of characters: this
+  // pass cut every bitmap down to its header plus a few bytes, which is what the terminal then failed to
+  // parse. The row stays exactly as the markdown renderer produced it.
+  for (let i = 0; i < lines.length; i++) {
+    const l = lines[i] == null ? '' : lines[i];
+    lines[i] = isImageRow(l) ? l : fitAnsi(l, w);
+  }
   let topPad = 0;
   if (lines.length < h) { topPad = h - lines.length; }
   while (lines.length < h) lines.unshift(' '.repeat(w));
@@ -6747,7 +7198,7 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
     }
   }
 
-  let padded = lines.map((l) => fitAnsi(l, w));
+  let padded = lines.map((l) => (isImageRow(l) ? l : fitAnsi(l, w)));
   // Mixin seam: beforeRender - plugins may rewrite the painted lines. Runs before the
   // ANSI string is built so the change actually reaches the screen.
   try { const out = runPatchSync('beforeRender', { lines: padded, state, cols: w, rows: h }, (c) => c); if (out && Array.isArray(out.lines)) padded = out.lines; } catch (e) {}
@@ -6763,7 +7214,66 @@ const queueH = takeover ? 0 : queuePanelHeight(state);
 
   const ansi = `\x1b[H` + padded.join('\n')
     + `\x1b[${cursor.row + 1};${cursor.col + 1}H` + cursorShape;
-  let _frame = { ansi, lines: padded, cursor, cursorVisible, width: w, height: h,
+  // Lift every image payload out of the text rows. What remains in `padded` is blank, which is what the
+  // rows under a bitmap should be: the terminal draws the picture there, and text must not follow it.
+  // How many body rows sit above the window. The painter compares content and addresses the screen by
+  // window row, so it needs both numbers; `state._bodyTop` is the body index of the window's first row.
+  const viewportTop = Math.max(0, (state && state._bodyTop) || 0);
+  // Lift the pictures out of BODY rows: that is the grid the painter compares. `padded` is the window cut
+  // from the body afterwards, so its own copies of those rows have to be blanked as well.
+  const images = [];
+  // Where body row `_bodyTop` sits on the final screen. A body row only equals its screen row when the
+  // window starts at the top of the transcript, so the offset is carried here rather than assumed: a picture
+  // placed at its body index lands outside the frame in any session longer than the window, which is what
+  // made a formula look like it had never been drawn.
+  const bodyOrigin = state && state._bodyScreenTop != null
+    ? { screenTop: state._bodyScreenTop, bodyTop: state._bodyTop != null ? state._bodyTop : 0 }
+    : null;
+  for (let i = 0; i < body.length; i++) {
+    if (!isImageRow(body[i])) continue;
+    const parsed = parseImageRow(body[i]);
+    if (!parsed) continue;
+    if (bodyOrigin) {
+      const screenRow = bodyOrigin.screenTop + (i - bodyOrigin.bodyTop);
+      // A PICTURE MUST STAY INSIDE THE TRANSCRIPT PANEL.
+      //
+      // `h` is the whole screen, but the transcript only occupies `screenTop .. screenTop + bodyH`; below it
+      // are the composer and the status line. A picture whose last row ran past that boundary was drawn over
+      // the composer — a formula sliding down into the input box as the view scrolled, which is what "it goes
+      // to the composer before it leaves" was. The rows are clipped to the panel here, and only a picture that
+      // still has a visible row inside it is kept.
+      const panelTop = Math.max(0, bodyOrigin.screenTop);
+      const panelBottom = Math.min(h, bodyOrigin.screenTop + bodyH);
+      const firstRow = Math.max(screenRow, panelTop);
+      const lastRow = Math.min(screenRow + parsed.rows, panelBottom);
+      if (lastRow > firstRow) {
+        // The column is part of the placement: every transcript row opens with a one-column pad. A picture
+        // clipped at the top keeps its `row` negative so the painter knows how many pixel rows to cut.
+        images.push({
+          row: screenRow,
+          rows: parsed.rows,
+          cols: parsed.cols,
+          seq: parsed.sequence,
+          col: 1,
+          // What produced the payload, so the painter can regenerate it from a later pixel row when the
+          // picture straddles the top of the window. See `placeImage`.
+          source: parsed.source,
+          // The rows this picture may occupy, so the painter can clip the bottom as well as the top.
+          clipTop: panelTop,
+          clipBottom: panelBottom,
+        });
+      }
+    }
+    body[i] = '';
+    for (let r = 1; r < parsed.rows && i + r < body.length; r++) body[i + r] = '';
+  }
+
+  // The same rows, in the window array.
+  for (let i = 0; i < padded.length; i++) {
+    if (isImageRow(padded[i])) padded[i] = '';
+  }
+
+  let _frame = { ansi, lines: padded, body, images, viewportTop, cursor, cursorVisible, width: w, height: h,
            cursorRow: cursor.row, cursorCol: cursor.col, cursorShape, hitboxes, composerMeta: composer.meta };
   // Mixin seam: afterRender - plugins may modify the final frame (overlay, banner).
   try { const out = runPatchSync('afterRender', { frame: _frame, state }, (c) => c); if (out && out.frame) _frame = out.frame; } catch (e) {}
@@ -6797,7 +7307,176 @@ const CR = '\r';
 // rewrites 30 rows lands as one update instead of 30 visible steps.
 const SYNC_BEGIN = '\x1b[?2026h';
 const SYNC_END = '\x1b[?2026l';
-export function diffFrame(prev, next) {
+
+// A FORMULA CROPPED AT A PIXEL ROW IS REGENERATED FROM ITS TEX.
+//
+// The painter crops a picture that straddles the top of the window, and it must crop on a PIXEL row, not on a
+// six-pixel band boundary: a band crop always leaves 0..5 pixels of the picture above the window, so the
+// formula shifts by up to a quarter of a cell as the view scrolls and snaps back when the leftover is zero.
+// Only the source can produce a raster cut at an arbitrary row, and only this module knows how to typeset —
+// so the function is installed here rather than imported there.
+setImageRegenerator((source, skipTop, maxColumns, maxHeight) => {
+  const capable = mathImageCapable();
+  if (!capable) return null;
+  const image = encodeTexImage(source, {
+    protocol: capable.protocol,
+    cell: capable.cell,
+    colour: MATH_INK,
+    skipTop,
+    maxWidth: maxColumns,
+    maxHeight,
+  });
+  return image ? image.sequence : null;
+});
+
+/**
+ * Turn a frame into the bytes that update the screen.
+ *
+ * `resendImages` is false for a PERIODIC full repaint. A bitmap only has to be re-sent when the terminal
+ * has lost it — the first paint, or after a resize. Windows Terminal moves the screen every time one is
+ * drawn, so re-sending on the once-a-second repaint pushed the whole interface down once a second; that
+ * is what left the composer repeated down the screen.
+ */
+// ---- the cell-grid painter ----------------------------------------------
+
+// The frame composer still produces rows of styled strings, because every surface here was written against
+// that shape. This layer paints those rows into a cell grid and paints the grid differentially, which is
+// what makes two things possible that rows cannot express: a change that rewrites only the affected
+// columns (18 bytes instead of a whole row), and a bitmap treated as a RECTANGLE with no text in it.
+//
+// The grid is kept across frames. Its pools are session-lived on purpose: an interned style id stays valid
+// as long as the process, so a comparison is an integer compare.
+const screenState = screenPools();
+let prevScreen = null;
+
+/**
+ * Paint one frame through the cell grid.
+ *
+ * @param {object} frame Output of `composeFrame`.
+ * @param {boolean} resendImages Whether bitmaps must be re-sent this paint.
+ * @returns {string} The bytes to write.
+ */
+export function paintCellFrame(frame, resendImages) {
+  const rows = frame.lines || [];
+  const bodyRows = frame.body || rows;
+  const width = frame.width || 80;
+  const height = Math.max(1, frame.height || rows.length);
+  const images = frame.images || [];
+
+  // THE `shownImages` RECORD IS NEVER CLEARED HERE.
+  //
+  // It says which rectangles the terminal currently has pictures in, and it is the only thing an ERASE can be
+  // computed from: clearing it means the old pixels have no owner and can never be removed. What
+  // `resendImages` controls is whether the pictures are DRAWN again — and since every picture is now drawn on
+  // every frame, the flag only has to keep the reconciliation from treating a stale screen as authoritative.
+
+  // WHICH PICTURES THIS FRAME CAN ACTUALLY HAVE ON SCREEN, decided BEFORE any cell is touched.
+  //
+  // A picture that will not be drawn must leave its cells to the TEXT. Clearing them for a picture that
+  // never arrives is what produced a blank rectangle over the transcript, the scrollbar and the composer:
+  // the row was blanked, no pixels were painted, and the text that belonged there had already been thrown
+  // away. A refused picture is therefore NOT a hole — it is the Unicode layout, which `composeFrame` has
+  // already put in those cells.
+  //
+  // `resendImages` no longer filters anything: EVERY picture in the window is queued on every frame. What the
+  // flag still does is survive to `diffScreens` as the reason the caller expects a full draw.
+  const drawable = [];
+  let budget = IMAGE_FRAME_BUDGET;
+  for (const img of images.slice(0, IMAGE_FRAME_MAX)) {
+    // Visible inside BOTH the screen and the transcript panel: a picture clipped away at the bottom no
+    // longer reaches into the composer.
+    const span = placementRows(img, height);
+    if (span.to <= span.from) continue;
+    if (img.seq.length > budget) continue;                        // over this frame's payload budget
+    budget -= img.seq.length;
+    drawable.push(img);
+  }
+
+  const screen = createScreen(width, height, screenState.charPool, screenState.stylePool);
+  paintRows(screen, rows, screenState.stylePool);
+  // Blank ONLY the cells a picture will cover, and only its own columns: the last column of these rows is
+  // the scrollbar, and the rest of the row still belongs to the interface.
+  for (const img of drawable) {
+    const span = placementRows(img, height);
+    const from = Math.min(width, Math.max(0, img.col || 0) + 1);
+    const to = Math.min(width, from + Math.max(0, img.cols) - 1);
+    const w = to - from;
+    const h = span.to - span.from;
+    if (w > 0 && h > 0) screen.clear(from, span.from, w, h, 0);
+  }
+
+  // A PICTURE IS RECONCILED, NOT DRAWN HERE.
+  //
+  // `diffScreens` owns the decision (see its header; dsh-tui's src/ink/sixel-graphics.ts reaches the same
+  // shape): erase a placement that changed or MOVED, draw the one replacing it in the SAME write, send
+  // nothing for a placement whose raster and position both still match.
+  const cursorRow = (frame.cursorRow || 0);
+  const cursor = `\x1b[${Math.max(1, cursorRow + 1)};${(frame.cursorCol || 0) + 1}H` + (frame.cursorShape || '');
+  const out = diffScreens(prevScreen, screen, drawable.map((img) => ({ ...img, col: img.col || 0 })), {
+    cursor,
+    shown: shownImages,
+    budget: IMAGE_FRAME_BUDGET,
+    maxImages: IMAGE_FRAME_MAX,
+    cellHeight: mathCellHeight(),
+    before: syncOutputUsable() ? SYNC_BEGIN : '',
+    after: syncOutputUsable() ? SYNC_END : '',
+  });
+
+
+
+  // The rows the pictures own THIS frame, so the NEXT frame knows which rows to repaint as text once a
+  // picture moves away. Taken from `drawable` — this frame's placements — and not from `shownImages`, which
+  // is replaced inside the reconciliation and by this point already describes the frame that just ran. Reading
+  // the record there made `imageRows` lag one frame behind: the rows a picture occupied were never registered
+  // as pictures' rows, so when it scrolled away the text was diffed against a previous frame that also had no
+  // text there — the row was left alone and the old glyphs stayed under the new ones.
+  const owned = [];
+  for (const img of drawable) {
+    const span = placementRows(img, height);
+    for (let y = span.from; y < span.to; y++) owned.push(y);
+  }
+  screen.imageRows = owned;
+  screen.bodyRows = bodyRows.length;
+  prevScreen = screen;
+  return out;
+}
+
+/**
+ * What the terminal is currently believed to be showing: one entry per placement, keyed by raster AND
+ * position.
+ *
+ * THE POSITION IS PART OF THE IDENTITY, which is the correction that matters here. Keying on the raster
+ * alone treated a formula that had scrolled one row up as "already on screen", so its new row was never
+ * drawn and its old row was never erased — a blank rectangle at the new position, stale pixels at the old
+ * one, and the text underneath left unwritten.
+ *
+ * `diffScreens` reads this map and rewrites it each paint, dropping the entries the frame no longer wants,
+ * so it cannot grow without bound.
+ */
+const shownImages = new Map();
+
+/**
+ * Bytes of picture payload one frame may carry.
+ *
+ * The payload is the expensive half of a frame and the only part that can push the terminal's screen, so a
+ * frame that would exceed this sends the first few pictures that fit and leaves the rest to their text
+ * fallback. A pathological reply — fifty matrices — degrades instead of hanging the terminal.
+ */
+const IMAGE_FRAME_BUDGET = 256 * 1024;
+/** At most this many pictures in one frame, for the same reason the byte budget exists. */
+const IMAGE_FRAME_MAX = 12;
+
+/** Forget every picture the terminal is believed to show, so the next paint sends them all again. */
+export function resetShownImages() {
+  shownImages.clear();
+}
+
+/** Forget the previous grid, so the next paint is a full one. */
+export function resetCellFrame() {
+  prevScreen = null;
+}
+
+export function diffFrame(prev, next, resendImages = true) {
   let shape = '';
   if (!prev || prev.cursorShape !== next.cursorShape) shape = next.cursorShape;
   const pos = `\x1b[${next.cursorRow + 1};${next.cursorCol + 1}H`;
@@ -6812,7 +7491,23 @@ export function diffFrame(prev, next) {
   const sizeChanged = !prev || prev.width !== next.width || prev.height !== next.height;
   if (sizeChanged) {
     let out = before;
-    for (let i = 0; i < next.lines.length; i++) out += `\x1b[${i + 1};1H\x1b[2K` + next.lines[i] + CR;
+    for (let i = 0; i < next.lines.length; i++) {
+      if (isImageRow(next.lines[i])) {
+        const parsed = parseImageRow(next.lines[i]);
+        if (!resendImages) {
+          // The terminal is still showing it; only skip the rows it occupies so they are not blanked.
+          if (parsed && parsed.rows > 1) i += parsed.rows - 1;
+          continue;
+        }
+        const placed = imageBytes(next.lines[i], i, '\x1b[0m');
+        if (placed) {
+          out += placed.bytes;
+          i += Math.max(0, placed.covered - 1);
+          continue;
+        }
+      }
+      out += `\x1b[${i + 1};1H\x1b[2K` + next.lines[i] + CR;
+    }
     out += after + pos + shape;
     return out;
   }
@@ -6840,8 +7535,27 @@ export function diffFrame(prev, next) {
   // scrolled everything up by a row and the next `ESC[2K` erased the composer's
   // top border — "Working… gets written on the next line and overwrites the
   // input box". Absolute addressing cannot scroll, so the span is now safe.
-  const reach = Math.min(next.lines.length, last + 1);
-  for (let i = first; i < reach; i++) out += `\x1b[${i + 1};1H\x1b[2K` + next.lines[i] + CR;
+  // A bitmap covers rows the text diff cannot see: extend the rewritten span to include them, or the
+  // rows beneath an image keep the previous frame's content and the screen accumulates fragments.
+  let reach = Math.min(next.lines.length, last + 1);
+  for (let i = 0; i < next.lines.length; i++) {
+    if (!isImageRow(next.lines[i])) continue;
+    const p = parseImageRow(next.lines[i]);
+    if (p) reach = Math.max(reach, Math.min(next.lines.length, i + p.rows));
+  }
+
+  for (let i = first; i < reach; i++) {
+    if (isImageRow(next.lines[i])) {
+      const placed = imageBytes(next.lines[i], i, '\x1b[0m');
+      if (placed) {
+        out += placed.bytes;
+        i += Math.max(0, placed.covered - 1);
+        continue;
+      }
+    }
+    out += `\x1b[${i + 1};1H\x1b[2K` + next.lines[i] + CR;
+  }
+
   // No "clear the trailing rows" pass is needed: composeFrame always returns
   // EXACTLY `rows` lines (both frames here share the same height, otherwise the
   // sizeChanged path above would have run), so a shrinking viewport is already
@@ -6918,8 +7632,8 @@ export function makeState({ cfg, session, opts }) {
   // was re-picked (setEffort is the only other writer, and it sets both).
   const effort = (session && session.effort) || cfg.effort || (cfg.reasoning ? 'on' : 'off');
   return {
-    // No model chosen yet: the interface says so instead of refusing to start.
-    modelMissing: !!(opts && opts.modelMissing),
+    // No model chosen yet: the interface says so instead of refusing to start.
+    modelMissing: !!(opts && opts.modelMissing),
     workspace: cwd,
     cfg,
     // The SAME session local this function already reads for `effort`, kept on the state
@@ -6961,9 +7675,25 @@ export function makeState({ cfg, session, opts }) {
     cwd,
     cwdOverride: null,
     tip: '',
-    ctxPercent: 0,
-    ctxTokens: 0,
-    ctxMax: cfg.maxContextTokens || 512000,
+    // THE GAUGE STARTS FROM THE SESSION, NOT FROM ZERO.
+    //
+    // These were hard-coded to `false`/`0`, and the only code that ever read the saved figures was the
+    // `/sessions` resume branch — which a plain `hncode --continue` never runs. So every restart showed the
+    // local estimate until a provider answered, even though the reported size had been saved with the
+    // session all along. Reading it here covers every entry point: `--continue`, `--session <id>`, and the
+    // picker.
+    ctxPercent: (session && session.ctxReportedOnce && Number.isFinite(session.ctxTokens)
+      && Number.isFinite(session.ctxMax) && session.ctxMax > 0)
+      ? usagePercent(session.ctxTokens, session.ctxMax)
+      : 0,
+    // Set once the endpoint reports a real context size; from then on the local estimate is not used.
+    ctxReportedOnce: !!(session && session.ctxReportedOnce && Number.isFinite(session.ctxTokens)),
+    ctxTokens: (session && session.ctxReportedOnce && Number.isFinite(session.ctxTokens))
+      ? session.ctxTokens
+      : 0,
+    ctxMax: (session && Number.isFinite(session.ctxMax) && session.ctxMax > 0)
+      ? session.ctxMax
+      : (cfg.maxContextTokens || 512000),
     rounds: (session && session.rounds) || 0,
     turnStart: 0,
     steps: (session && session.steps) || 0,
@@ -8476,16 +9206,23 @@ export async function dispatch(cmdRaw, arg, state, cfg, session, h, submit, stdo
 
             // Update context gauge based on restored session messages.
             //
-            // THE SAME FORMULA AS A LIVE STEP: messages PLUS the tool schemas. This used to count the
-            // messages alone, so the gauge stepped by a fixed amount whenever a restore and a live step
-            // alternated — a visible jump that was two formulas disagreeing, not noise.
+            // THE REPORTED SIZE COMES BACK WITH THE SESSION. `session.ctxTokens` / `ctxReportedOnce` are
+            // written whenever a provider reports a real figure, and they were never read back on resume — so
+            // a restarted session showed the ESTIMATE until the next turn sent a request, even though the
+            // exact number was sitting in the saved session the whole time.
             //
-            // `dispatch` is module-level and cannot reach startTUI's `setCtxTokens`, so the expression is
-            // repeated here rather than the call. Keep the two identical.
-            const approx = estimateMessagesTokens(session.messages, cfg) + (cfg.toolDefTokens || 0);
-            state.ctxTokens = approx;
+            // Only a session that never got a report falls through to the estimate, and then to the same
+            // formula a live step uses: messages PLUS the tool schemas.
+            if (session.ctxReportedOnce && Number.isFinite(session.ctxTokens)) {
+              state.ctxTokens = session.ctxTokens;
+              state.ctxReportedOnce = true;
+            } else {
+              state.ctxTokens = estimateMessagesTokens(session.messages, cfg) + (cfg.toolDefTokens || 0);
+              state.ctxReportedOnce = false;
+            }
             state.ctxMax = cfg.maxContextTokens || state.ctxMax;
-            state.ctxPercent = usagePercent(approx, state.ctxMax);
+            // THE PERCENTAGE MUST BE COMPUTED FROM THE SAME NUMBER IT IS SHOWN WITH.
+            state.ctxPercent = usagePercent(state.ctxTokens, state.ctxMax);
             
             const dur = session.lastTurnMs ? ` · last turn ${fmtDuration(session.lastTurnMs)}` : '';
             app(`Resumed ${meta.id} (${meta.title || 'untitled'}) · ${(session.messages || []).length} messages.${dur}`);
@@ -8806,8 +9543,23 @@ export async function dispatch(cmdRaw, arg, state, cfg, session, h, submit, stdo
       // _conv: true}` instead of rows: a message with a role of `undefined`, which
       // renders as blank. That is what made the transcript go empty after a manual
       // /compact. Flat-map so every produced row is a row.
+      // THE WHOLE TRANSCRIPT IS REBUILT, NOT APPENDED TO.
+      //
+      // The old form kept `state.chat.filter((m) => !m._conv)` at the head and appended the compacted history
+      // after it — which assumed every pre-existing row carried `_conv`. Rows that came from a RESUME
+      // (`reconstructChat`) do not, so a session that had been restarted kept its whole old transcript above
+      // the summary while the compacted messages were added below: the old thinking blocks reappeared at the
+      // top, as if the compaction had not happened.
+      //
+      // What is kept is the PROMPT that asked for the compaction — the last user row — so the command that
+      // caused this stays visible above the summary it produced. Everything else comes from `kept`.
+      const promptRows = [];
+      for (let i = state.chat.length - 1; i >= 0; i--) {
+        const m = state.chat[i];
+        if (m && m.role === 'user' && !m._conv) { promptRows.push(m); break; }
+      }
       state.chat = [
-        ...state.chat.filter((m) => !m._conv),
+        ...promptRows,
         { role: 'user', text: compactedSummary, _conv: true },
         ...kept.flatMap((m) => convRowFor(m).map((r) => ({ ...r, _conv: true }))),
       ];
@@ -8815,8 +9567,10 @@ export async function dispatch(cmdRaw, arg, state, cfg, session, h, submit, stdo
       saveSession(session);
       // Same formula as everywhere else: messages PLUS the tool schemas.
       state.tokens = estimateMessagesTokens(session.messages, cfg) + (cfg.toolDefTokens || 0);
-      state.ctxTokens = state.tokens;
-      state.ctxPercent = usagePercent(state.tokens, state.ctxMax || maxCtx);
+      if (!state.ctxReportedOnce) state.ctxTokens = state.tokens;
+      // Same rule as everywhere else: the percentage comes from the number the row prints, not from the
+      // estimate. Using `state.tokens` here made a compacted session show `696k/1M` beside 57%.
+      state.ctxPercent = usagePercent(state.ctxTokens, state.ctxMax || maxCtx);
       // The transcript was just replaced with a much shorter one. Drop the scroll
       // anchor (as /sessions and /move do) so the next paint seeds a fresh one and
       // the view lands on the newest rows instead of compensating for a row delta
@@ -9272,21 +10026,30 @@ export async function dispatch(cmdRaw, arg, state, cfg, session, h, submit, stdo
 
     case 'goal': {
       const a = raw.toLowerCase();
+      // EVERY WRITE GOES THROUGH THE STORE the Goal tool reads, so /goal and the tool can never disagree
+      // about the objective. `persistState` keeps it across a restart; the tool's own set() does the same.
+      const applyGoal = (value, paused) => {
+        state.objective = String(value || '');
+        state.goalPaused = !!paused;
+        sessHost.persistState();
+        renderFrame();
+      };
       if (!raw || a === 'status') {
         if (state.objective) sayPanel(`Goal: ${state.objective}\nStatus: ${state.goalPaused ? 'paused' : 'active'}`);
         else say('No goal set. Start one with /goal <objective>.');
         return;
       }
-      if (a === 'pause') { state.goalPaused = true; app('Goal paused. Use /goal resume to continue.'); return; }
+      if (a === 'pause') { applyGoal(state.objective, true); app('Goal paused. Use /goal resume to continue.'); return; }
       if (a === 'resume') {
         if (!state.objective) { app('No goal to resume.'); return; }
-        state.goalPaused = false; app('Goal resumed.');
+        applyGoal(state.objective, false);
+        app('Goal resumed.');
         sendPrompt('Resume the active goal.');
         return;
       }
-      if (a === 'cancel') { state.objective = ''; state.goalPaused = false; app('Goal cancelled.'); return; }
-      if (a.startsWith('replace ')) { state.objective = raw.slice(8).trim(); app('Goal replaced.'); return; }
-      state.objective = raw; state.goalPaused = false;
+      if (a === 'cancel') { applyGoal('', false); app('Goal cancelled.'); return; }
+      if (a.startsWith('replace ')) { applyGoal(raw.slice(8).trim(), false); app('Goal replaced.'); return; }
+      applyGoal(raw, false);
       app(`Goal set: ${raw}`);
       sendPrompt(raw);
       return;
@@ -10214,7 +10977,7 @@ export async function dispatch(cmdRaw, arg, state, cfg, session, h, submit, stdo
       //
       // Plus the tool schemas, like every other writer: `/trim` counts messages, and the request also
       // carries the tools, so leaving them out dropped the gauge by that much more than was freed.
-      state.ctxTokens = after + (cfg.toolDefTokens || 0);
+      if (!state.ctxReportedOnce) state.ctxTokens = after + (cfg.toolDefTokens || 0);
       state.ctxPercent = usagePercent(state.ctxTokens, state.ctxMax || cfg.maxContextTokens || 1);
       if (session) {
         try {
@@ -12032,45 +12795,45 @@ function registerProvider(state, cfg, h, name, baseUrl, apiKey, protocol, typeLa
   fetchAndRegisterModels(state, cfg, name, h);
 }
 
-async function fetchAndRegisterModels(state, cfg, providerName, h) {
-  const p = (cfg.raw.providers || {})[providerName] || {};
-  const baseUrl = p.base_url || p.baseUrl || '';
-  if (!baseUrl) return;
-  h.notice(`Discovering models for ${providerName}…`, 'info');
-  const models = await fetchModels({ baseUrl, apiKey: p.api_key || p.apiKey || '', protocol: p.protocol || 'openai' });
-  // THE FETCH MUST SUCCEED BEFORE ANYTHING IS REMOVED.
-  //
-  // Deleting first and fetching second means an unreachable endpoint leaves the provider with no models at
-  // all. Everything below runs only after a non-empty result.
-  if (!models.length) { h.notice(`No models discovered for ${providerName} (endpoint unreachable or empty).`, 'error'); return; }
-
-  cfg.raw.models = cfg.raw.models || {};
-  // Snapshot what this provider had, so the merge below can keep fields the source does not report.
-  const prevByKey = new Map();
-  for (const key of Object.keys(cfg.raw.models)) {
-    if (key.split('/')[0] !== providerName) continue;
-    prevByKey.set(key, cfg.raw.models[key]);
-    delete cfg.raw.models[key];
-  }
-
-  // REPLACE THE LIST WITH WHAT WAS JUST FETCHED.
-  //
-  // A model the endpoint no longer reports disappears, and a renamed one does not appear twice. Merging
-  // over the old entries kept both for ever, which is what made Alt+R look like it did nothing.
-  const kept = [];
-  for (const m of models) {
-    const key = modelKey(providerName, m.id);
-    // Merge over the SNAPSHOT: the live entries were just deleted, so reading them yields undefined and
-    // the merge folds nothing — every field the source omits (context_length, pricing) would be wiped.
-    const entry = mergeRefreshedModelEntry(providerName, m, prevByKey.get(key));
-    cfg.raw.models[key] = entry;
-    kept.push({ ...entry, id: m.id });
-  }
-  // Rewrite the provider's TOML blocks from that list. `addModel` appends one block per model and returns
-  // early when one already exists, so calling it here left the removed entries on disk.
-  try { replaceProviderModels(providerName, kept); } catch { /* the in-memory list is still correct */ }
-  h.notice(`Discovered ${models.length} models for ${providerName}. Use /model to pick one.`, 'info');
-}
+async function fetchAndRegisterModels(state, cfg, providerName, h) {
+  const p = (cfg.raw.providers || {})[providerName] || {};
+  const baseUrl = p.base_url || p.baseUrl || '';
+  if (!baseUrl) return;
+  h.notice(`Discovering models for ${providerName}…`, 'info');
+  const models = await fetchModels({ baseUrl, apiKey: p.api_key || p.apiKey || '', protocol: p.protocol || 'openai' });
+  // THE FETCH MUST SUCCEED BEFORE ANYTHING IS REMOVED.
+  //
+  // Deleting first and fetching second means an unreachable endpoint leaves the provider with no models at
+  // all. Everything below runs only after a non-empty result.
+  if (!models.length) { h.notice(`No models discovered for ${providerName} (endpoint unreachable or empty).`, 'error'); return; }
+
+  cfg.raw.models = cfg.raw.models || {};
+  // Snapshot what this provider had, so the merge below can keep fields the source does not report.
+  const prevByKey = new Map();
+  for (const key of Object.keys(cfg.raw.models)) {
+    if (key.split('/')[0] !== providerName) continue;
+    prevByKey.set(key, cfg.raw.models[key]);
+    delete cfg.raw.models[key];
+  }
+
+  // REPLACE THE LIST WITH WHAT WAS JUST FETCHED.
+  //
+  // A model the endpoint no longer reports disappears, and a renamed one does not appear twice. Merging
+  // over the old entries kept both for ever, which is what made Alt+R look like it did nothing.
+  const kept = [];
+  for (const m of models) {
+    const key = modelKey(providerName, m.id);
+    // Merge over the SNAPSHOT: the live entries were just deleted, so reading them yields undefined and
+    // the merge folds nothing — every field the source omits (context_length, pricing) would be wiped.
+    const entry = mergeRefreshedModelEntry(providerName, m, prevByKey.get(key));
+    cfg.raw.models[key] = entry;
+    kept.push({ ...entry, id: m.id });
+  }
+  // Rewrite the provider's TOML blocks from that list. `addModel` appends one block per model and returns
+  // early when one already exists, so calling it here left the removed entries on disk.
+  try { replaceProviderModels(providerName, kept); } catch { /* the in-memory list is still correct */ }
+  h.notice(`Discovered ${models.length} models for ${providerName}. Use /model to pick one.`, 'info');
+}
 
 // Merge ONE refreshed model's data over its previous config entry.
 //
@@ -12319,6 +13082,21 @@ export function tokenize(str) {
         }
         i += ku[0].length; continue;
       }
+      // KITTY GRAPHICS REPLY. The terminal acknowledges an upload with its own APC:
+      //
+      //   ESC _ G i=31;OK ESC \
+      //
+      // Nothing else consumes it, and an APC that reaches the key parser is ESC followed by ordinary
+      // characters — so `Gi=31;OK` is typed into the composer, one letter at a time, every time the terminal
+      // answers. Recognising it here and turning it into a token means it is CONSUMED: `handleKey` sees
+      // `kittyReply` and ignores it.
+      if (str[i + 1] === '_') {
+        const end = str.indexOf('\x1b\\', i + 2);
+        if (end === -1) break;          // incomplete: wait for the rest
+        out.push({ kittyReply: str.slice(i + 2, end) });
+        i = end + 2;
+        continue;
+      }
       if (str[i + 1] === '[') {
         if (str[i + 2] === '<') {
           const mm = /^\x1b\[<(\d+);(\d+);(\d+)([Mm])/.exec(str.slice(i));
@@ -12383,21 +13161,24 @@ export function tokenize(str) {
         out.push({ key: base });
         i = j + 1;
       } else if (str[i + 1] === 'O') {
+        // SS3: the application-cursor form of the arrows and function keys.
         const f = str[i + 2];
         if (f === undefined) break;
-        out.push({ key: f === 'P' ? 'f1' : 'escape' });
+        const ss3 = { A: 'up', B: 'down', C: 'right', D: 'left', H: 'home', F: 'end',
+          P: 'f1', Q: 'f2', R: 'f3', S: 'f4' }[f];
+        out.push({ key: ss3 || 'escape' });
         i += 3;
-      } else {
-        // `ESC <printable>` is Alt+that key. A second ESC stays a plain Escape.
-        const altNext = str[i + 1];
-        if (altNext && altNext >= '!' && altNext <= '~') {
-          out.push({ key: 'alt-' + altNext.toLowerCase() });
-          i += 2;
-          continue;
-        }
-        out.push({ key: 'escape' });
-        i++;
-      }
+      } else {
+        // `ESC <printable>` is Alt+that key. A second ESC stays a plain Escape.
+        const altNext = str[i + 1];
+        if (altNext && altNext >= '!' && altNext <= '~') {
+          out.push({ key: 'alt-' + altNext.toLowerCase() });
+          i += 2;
+          continue;
+        }
+        out.push({ key: 'escape' });
+        i++;
+      }
     } else if (c === '\r') {
       out.push({ key: 'enter' });
       i++;
@@ -12972,6 +13753,17 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
           state._turnSteps = (state._turnSteps || 0) + 1;
           state.steps = (state._stepsBase || 0) + state._turnSteps;
           if (session) session.steps = state.steps;
+          // THE GAUGE MOVES WITH EVERY STEP, not only when the provider answers.
+          //
+          // A provider reports usage with its REPLY, so between two replies the row kept the previous
+          // figure while the conversation underneath it grew by a whole step — tool results in particular can
+          // be huge. The estimate takes over for the in-between frames (it never overwrites a reported figure
+          // once one has arrived), so the bar tracks the request actually being built instead of lagging one
+          // step behind it.
+          if (!state.ctxReportedOnce) {
+            state.ctxTokens = estimateMessagesTokens(messages, cfg) + (cfg.toolDefTokens || 0);
+            state.ctxPercent = usagePercent(state.ctxTokens, state.ctxMax || cfg.maxContextTokens || 1);
+          }
           // Persist at every step boundary, not only at turn end. `messages` is the
           // SAME array this Agent appends to, so copying it here captures every
           // completed step: a crash mid-turn then loses at most the step in flight
@@ -12999,7 +13791,7 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
           return;
         }
         if (e.type === 'compacted') {
-          state.ctxTokens = e.after || state.ctxTokens;
+          if (!state.ctxReportedOnce) state.ctxTokens = e.after || state.ctxTokens;
           state.ctxPercent = usagePercent(state.ctxTokens, state.ctxMax || 1);
           // Compaction is over, so the Working row goes back to a rotating phrase.
           //
@@ -13037,7 +13829,7 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
         if (e.type === 'data') {
           // A token arrived, so the turn is not stalled. Stamped here rather than in the paint path
           // because the paint path cannot tell "slow" from "quiet" — only the events can.
-          state.lastTokenAt = Date.now();
+          state.lastTokenAt = Date.now();
           // Feed the answer text into the paced buffer instead of painting it. The
           // buffer closes any open reasoning region itself, in arrival order, so the
           // block settles exactly when the provider moved on rather than when the next
@@ -13068,21 +13860,27 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
           // stay identical.
           //
 
-          // THE ESTIMATE ONLY. No provider number is mixed in anywhere.
+          // THE ESTIMATE FILLS IN, THE REPORT LEADS.
           //
-          // `e.tokens` is what this app's own tokenizer model prices the request at, and it is the ONE
-          // source for the gauge. `usage.input` was wired in twice and removed twice: the two count
-          // different things (a report covers the request that already went out, the estimate covers the
-          // one about to), so whichever ran last won and the number jumped between formulas.
-          state.ctxTokens = Number(e.tokens) || 0;
-          if (Number.isFinite(e.max) && e.max > 0) state.ctxMax = e.max;
-          state.ctxPercent = usagePercent(state.ctxTokens, state.ctxMax || 1);
-          if (!Array.isArray(state.tokenHistory)) state.tokenHistory = [];
-          if (state.tokenHistory[state.tokenHistory.length - 1] !== state.ctxTokens) {
-            state.tokenHistory.push(state.ctxTokens);
-            if (state.tokenHistory.length > 240) state.tokenHistory.splice(0, state.tokenHistory.length - 240);
-          }
-          if (session) session.ctxTokens = state.ctxTokens;
+          // `context` prices the request ABOUT to go out; `usage` reports the one that just did. Letting
+          // the estimate overwrite a fresh report made the number alternate between two definitions.
+          // THE CONTEXT EVENT OWNS THE VISIBLE NUMBER.
+          //
+          // It prices the request about to go out, which is the only thing "how full is my context"
+          // can mean. A provider report describes the request that ALREADY went out, so showing it
+          // here makes the gauge answer a different question and alternate between two formulas.
+          //
+          // THE ESTIMATE IS ONLY FOR A TURN THAT HAS NEVER HAD A REPORT.
+          //
+          // It cannot be reconciled with the report and should not try: measured against this project's
+          // endpoint, a 4 000-character message is 530 tokens and the local rule calls it 953 — the
+          // estimate is systematically ~1.8× high. Letting it take over whenever it was larger put the
+          // inflated figure back on every event, so the gauge read 600k while streaming and 500k when
+          // idle: two formulas, and the visible one was the wrong one.
+          //
+          // `ctxReportedOnce` latches when a real figure arrives. After that the estimate never wins.
+          // The decision lives in `setCtxTokens` so every writer obeys the same rule.
+          if (!state.ctxReportedOnce) state.ctxTokens = Number(e.tokens) || 0;
           viewCur.renderSoon(); return;
         }
         if (e.type === 'usage') {
@@ -13103,20 +13901,43 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
           //   - on a cache hit some providers report only the uncached remainder, which made the gauge
           //     COLLAPSE mid-turn and then jump back.
           //
-          // PROVIDER REPORT ARRIVES -> the estimate it covers is done.
-          //
-          // The counter is `settled + estimate`: finished steps plus the one streaming now. When a usage
-          // report lands, `settled` grows by that step's exact figure AND `estimate` still holds the
-          // same step's guess, so the row showed roughly double — measured 25 estimated + 25 settled
-          // reading 50 — and every later step built on the inflated total.
-          //
-          // Clearing `estimate` here is what makes the estimate a LIVE figure for the step in flight
-          // rather than a running sum that never forgets.
-          if (e.usage && Number.isFinite(e.usage.output)) {
-            state.turnOutputSettled = (state.turnOutputSettled || 0) + e.usage.output;
-            state.turnOutputEstimate = 0;
-            state.turnOutputTokens = state.turnOutputSettled;
-          }
+          // PROVIDER REPORT ARRIVES -> the estimate it covers is done.
+          //
+          // The counter is `settled + estimate`: finished steps plus the one streaming now. When a usage
+          // report lands, `settled` grows by that step's exact figure AND `estimate` still holds the
+          // same step's guess, so the row showed roughly double — measured 25 estimated + 25 settled
+          // reading 50 — and every later step built on the inflated total.
+          //
+          // Clearing `estimate` here is what makes the estimate a LIVE figure for the step in flight
+          // rather than a running sum that never forgets.
+          if (e.usage && Number.isFinite(e.usage.output)) {
+            state.turnOutputSettled = (state.turnOutputSettled || 0) + e.usage.output;
+            state.turnOutputEstimate = 0;
+            state.turnOutputTokens = state.turnOutputSettled;
+          }
+          if (e.usage && Number.isFinite(e.usage.input) && e.usage.input > 0) {
+            // `input` is the whole prompt; `cached` breaks out how much of it was a cache hit. Measured:
+            // a 4000-character message reported prompt_tokens 530 and cached_tokens 0 — adding the two
+            // would count the cached part twice.
+            const reported = e.usage.input;
+            // THE PROVIDER REPORTS THE CONTEXT SIZE OUTRIGHT.
+            //
+            // Measured against this project's own endpoint: `prompt_tokens` is 31 for a six-token
+            // message plus the system prompt and tools, and `prompt_tokens_details.cached_tokens` is
+            // reported separately — so `prompt_tokens` is ALREADY the whole prompt. Adding the cached
+            // figure again, as an earlier version did, double-counted it.
+            //
+            // That makes the local estimate unnecessary whenever this arrives, and having both is what
+            // produced a gauge alternating between 150k and 300k: the estimate and the report describe
+            // different requests and overwrote each other. The report wins and the estimate stands down.
+            // Routed through `setCtxTokens`, which latches the switch and mirrors onto the session so a
+            // resume starts from the reported size. Duplicating those fields here is what let a later
+            // estimate overwrite them.
+            state.ctxTokens = reported;
+            state.ctxReportedOnce = true;
+            state.ctxSource = 'provider';
+            if (session) { session.ctxTokens = reported; session.ctxReportedOnce = true; }
+          }
           refreshCost(state, cfg);
           viewCur.renderSoon(); return;
         }
@@ -13132,22 +13953,23 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
           sessHost.countOutputTokens(estimateTokensFloat(e.text));
           viewCur.renderSoon(); return;
         }
-        if (e.type === 'aborted') {
-          // Show whatever the model had actually produced before the interrupt: the
-          // buffer is holding it, and an aborted turn is exactly when the user is
-          // reading to see how far it got.
+        if (e.type === 'aborted' || e.type === 'stopped') {
+          // A TURN CAN STOP WITHOUT THE REQUEST BEING ABORTED.
+          //
+          // `aborted` comes from the LLM stream; `stopped` comes from the agent loop after a tool
+          // finished with `stopRequested` set — which is exactly what Esc does while a Bash command is
+          // running. The TUI handled only `aborted`, so killing a long command left the `Using Bash` row
+          // pulsing and printed no notice: the interrupt worked and looked like it had not.
           sessHost.flushStream();
           const t = [...state.chat].reverse().find((m) => m.role === 'thinking' && m.pending);
           if (t) t.pending = false;
-          // Settle any RUNNING tool rows too. A tool that was mid-flight when the
-          // user hit Esc never gets its tool_result, so its `pending` stayed true
-          // and the `Using <Tool>` name kept pulsing forever. Clearing it drops the
-          // name to plain cyan immediately.
+          // Settle any RUNNING tool rows too. A tool interrupted mid-flight never gets its result, so
+          // `pending` stayed true and the name kept pulsing forever.
+          let interruptedTool = false;
           for (const m of state.chat) {
-            if (m.role === 'tool' && m.pending) { m.pending = false; m.failed = true; }
+            if (m.role === 'tool' && m.pending) { m.pending = false; m.failed = true; interruptedTool = true; }
           }
-          // Use a special role that won't show the ✓ icon
-          state.chat.push({ role: 'aborted', text: C.red + 'interrupted' + C.reset });
+          state.chat.push({ role: 'aborted', text: C.red + (interruptedTool ? 'interrupted (command stopped)' : 'interrupted') + C.reset });
           viewCur.render();
           return;
         }
@@ -13194,7 +14016,7 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
             // Track the key argument as it streams so "Using Bash (cmd)" shows
             // the command DURING the run rather than only once it has finished.
             entry.toolArgs = { ...(entry.toolArgs || {}), ...entry._argStream.pairs };
-            entry._cache = null;   // the argument is part of the rendered line
+            entry._cache = null;   // the argument is part of the rendered line
             if (entry.toolName === 'Write') {
               entry.streamContent = argStreamValue(entry._argStream, 'content');
               // Incremental line count so the preview's "… N more lines" note is
@@ -13554,9 +14376,11 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
 
     // Same formula as everywhere else: messages PLUS the tool schemas.
     const approx = estimateMessagesTokens(messages, cfg) + (cfg.toolDefTokens || 0);
-    state.ctxTokens = approx;
+    if (!state.ctxReportedOnce) state.ctxTokens = approx;
     state.ctxMax = cfg.maxContextTokens || state.ctxMax;
-    state.ctxPercent = usagePercent(approx, state.ctxMax);
+    // Same rule as the resume path: once a provider has reported a size, the percentage comes from that
+    // number, not from the estimate. Computing it from `approx` here made the row show `874k/1M` beside 73%.
+    state.ctxPercent = usagePercent(state.ctxTokens, state.ctxMax);
     // `session.messages` now holds the full request, system prompt included, so the bar
     // reads the real text from here on and the turn-scoped copy must not be counted too.
     state.turnSystemPrompt = null;
@@ -13650,6 +14474,37 @@ const agents = readAgentsMd(state.cwd || state.workspace || cfg.workspace, state
       // Queue shrank: push the updated list to the web queue pane immediately.
       try { viewCur.pubStatusField('queued', [...state.queued]); } catch { /* best-effort */ } 
     }
+    // THE GOAL RESTARTS THE TURN.
+    //
+    // An agent with an objective that spans several turns stops when it runs out of things to say in THIS
+    // turn, which looks exactly like finishing. The objective is what tells the two apart: while one is set and
+    // not paused, the agent is sent back in with the goal quoted, so it continues rather than waiting to be
+    // poked. `Goal clear` is the only thing that stops the loop, which is why the tool says never to clear a
+    // goal that has not been met.
+    //
+    // Skipped in every case where the turn did not end normally: a dismissal means the user wants it to stop,
+    // and a queued message is already the next turn (restarting here would run both).
+    const goalNow = String(state.objective || '').trim();
+    const goalApplies = goalNow && !state.goalPaused && !approvedPlan && !state.queued.length
+      && !state._goalTurns;                 // set below, so one restart per goal per turn
+    if (goalApplies) {
+      state._goalTurns = (state._goalTurns || 0) + 1;
+      viewCur.addChat({
+        role: 'system',
+        text: `[goal] continuing (${state._goalTurns}) — ${goalNow}`,
+      });
+      viewCur.render();
+      // The prompt names the goal the agent itself wrote, and says what to do when it is done. Without the
+      // second half the loop restarts forever: a model with no instruction to clear has no reason to.
+      const continueText = [
+        'You have an active goal and the turn ended before it was reached.',
+        `Goal: ${goalNow}`,
+        '',
+        'Continue working on it. When the goal is fully met, call the Goal tool with action "clear" so the loop',
+        'stops; if it is still not met, keep going.',
+      ].join('\n');
+      void sessHost.submit(continueText);
+    }
     // Approved plan: Plan mode OFF (write tools come back), then re-enter the agent
     // with the plan as a SYSTEM message. Deliberately NOT via submit(): that path
     // posts a user bubble and re-runs the whole submit flow, which is what produced
@@ -13710,40 +14565,53 @@ export async function startTUI(opts) {
    * Keeping one entry point is also what makes the number honest: there is exactly one definition of
    * "how much context is in use", so a future caller cannot invent a third.
    */
-  function setCtxTokens(tokens, max) {
+  /**
+   * The one place the context gauge is set.
+   *
+   * `opts.fromEstimate` marks a number the local tokenizer produced. Those are only used until the
+   * endpoint reports a real size — measured against it, the estimate runs ~1.8x high (a 4 000-character
+   * message is 530 tokens, the estimate says 953), so once a report exists the estimate is ignored and
+   * the gauge stays on the reported figure instead of jumping between the two.
+   *
+   * `opts.reported` marks a provider figure; it latches the switch and mirrors onto the session so a
+   * resume starts from the real size rather than the estimate.
+   */
+  function setCtxTokens(tokens, max, opts = {}) {
+    if (opts.fromEstimate && state.ctxReportedOnce) return;   // a report outranks every estimate
     const n = Math.max(0, Number(tokens) || 0);
     state.ctxTokens = n;
+    if (opts.reported) {
+      state.ctxReportedOnce = true;
+      state.ctxSource = 'provider';
+      if (session) { session.ctxTokens = n; session.ctxReportedOnce = true; }
+    } else if (opts.fromEstimate) {
+      state.ctxSource = 'estimate';
+    }
     if (Number.isFinite(max) && max > 0) state.ctxMax = max;
     state.ctxPercent = usagePercent(n, state.ctxMax || 1);
-    // The trend /usage draws. Bounded, because a long session would otherwise grow it without limit.
     if (!Array.isArray(state.tokenHistory)) state.tokenHistory = [];
     const h = state.tokenHistory;
-    if (h[h.length - 1] !== n) h.push(n);
-    if (h.length > 240) h.splice(0, h.length - 240);
-    // Mirrored on the session so saveSession captures it and --resume restores the chart.
-    if (session) {
-      session.ctxTokens = n;
-      if (!Array.isArray(session.tokenHistory)) session.tokenHistory = [];
-      if (session.tokenHistory[session.tokenHistory.length - 1] !== n) session.tokenHistory.push(n);
-      if (session.tokenHistory.length > 240) session.tokenHistory.splice(0, session.tokenHistory.length - 240);
+    if (h[h.length - 1] !== n) {
+      h.push(n);
+      if (h.length > 240) h.splice(0, h.length - 240);
     }
   }
 
   
-  // Set when the config has no model, so the interface can say so without blocking startup.
-  let modelMissing = false;
-
+  // Set when the config has no model, so the interface can say so without blocking startup.
+  let modelMissing = false;
+
   // FIRST: Ensure model is initialized before restoring session
   if (!cfg.model || !cfg.innerModel) {
     // Model not set yet - use default or prompt user
     if (!cfg.model) {
-    // NOT a return: a fresh install has no model yet, and the advice is `/model` — which needs the
-    // prompt this function is about to build. Flagged instead, and reported once the TUI is up.
-    modelMissing = true;
+    // NOT a return: a fresh install has no model yet, and the advice is `/model` — which needs the
+    // prompt this function is about to build. Flagged instead, and reported once the TUI is up.
+    modelMissing = true;
     }
   }
 
-  const state = makeState({ cfg, session, opts: { ...opts, modelMissing } });
+  const state = makeState({ cfg, session, opts: { ...opts, modelMissing } });
   // Mirror the session on the state so `/move` can rebind ONE binding and have every
   // consumer follow (see `replaceSession`).
   state.session = session;
@@ -14259,7 +15127,7 @@ export async function startTUI(opts) {
   }
   let lastFrame = null;
   let paintScheduled = false;
-  let lastPaintAt = 0;   // when the last frame actually went to the terminal
+  let lastPaintAt = 0;   // when the last frame actually went to the terminal
   // Deadline for the next FULL repaint. A differential painter compares against the frame
   // it BELIEVES it painted, never the real screen, so any divergence between the two is
   // permanent: it survives every later frame because the comparison keeps saying "that row
@@ -14288,13 +15156,49 @@ export async function startTUI(opts) {
     const forcePaint = state._forceRepaint === true;
     if (forcePaint) state._forceRepaint = false;
     const forceFull = forcePaint || (now - lastFullPaint) >= FULL_REPAINT_MS;
-    const out = diffFrame(forceFull ? null : lastFrame, frame);
+    // ONLY A PAINT WITH NO PREVIOUS FRAME NEEDS THE BITMAPS AGAIN.
+    //
+    // `forceFull` fires once a second to repair drift, and it passes `null` as the previous frame. That is
+    // not the same as a first paint: the terminal is still displaying every image. Re-sending one makes
+    // Windows Terminal move the screen, and the next paint then draws the interface at the new offset —
+    // which is what left the composer repeated down the page.
+    const firstPaint = lastFrame === null;
+    // THE CELL-GRID PAINTER.
+    //
+    // `forceFull` no longer means "throw away the previous frame". It means "the terminal may have drifted",
+    // which is handled by re-sending bitmaps only: the text cells are compared every frame regardless, so a
+    // full text repaint was never buying anything except the bitmap churn that shredded the screen.
+    const resendImages = firstPaint || forcePaint;
+    const out = paintCellFrame(frame, resendImages);
     if (forceFull) lastFullPaint = now;
     lastFrame = frame;
     state._hitboxes = frame.hitboxes || [];
     state._composerMeta = frame.composerMeta || [];
-    if (out) stdout.write(out);
-    lastPaintAt = now;
+    if (out) {
+      if (process.env.HNCODE_TRACE_PAINT) {
+        try {
+          const sixels = (out.match(/\x1bPq/g) || []).length;
+          const rows = [...out.matchAll(/\x1b\[(\d+);1H/g)].map((m) => Number(m[1]));
+          const dir = path.join(process.env.USERPROFILE || process.env.HOME || '.', '.hncode');
+          try { fs.mkdirSync(dir, { recursive: true }); } catch {}
+          fs.appendFileSync(path.join(dir, 'paint.log'), JSON.stringify({
+            at: Date.now(),
+            forceFull,
+            bytes: out.length,
+            sixels,
+            rows: rows.length ? rows.join(',') : '',
+            placements: [...out.matchAll(/\x1b\[\?80l\x1b\[(\d+);1H[\s\S]*?"1;1;(\d+);(\d+)/g)]
+              .map((m) => ({ row: Number(m[1]), w: Number(m[2]), h: Number(m[3]) })),
+            head: JSON.stringify(out.slice(0, 160)),
+            tail: JSON.stringify(out.slice(-80)),
+            newlines: (out.match(/\n/g) || []).length,
+            height: dims().rows,
+          }) + '\n');
+        } catch { /* tracing must never break a paint */ }
+      }
+      stdout.write(out);
+    }
+    lastPaintAt = now;
     // "Painted" becomes observable here: everything that reaches the screen goes
     // through this one function, so the tick advancing means bytes left this process.
     // See src/flush-tick.js for what reads it.
@@ -14341,26 +15245,26 @@ export async function startTUI(opts) {
    */
   function countOutputTokens(n) { return sessHost.countOutputTokens(n); }
 
-  /**
-   * The render rate this session is capped at, from `/settings` → Render FPS.
-   *
-   * Read on every call rather than cached: the setting can change mid-session, and a cached rate would
-   * only take effect after a restart.
-   */
-  function renderFps() {
-    const v = Number(cfg && cfg.render_fps);
-    // A terminal cannot render at 0Hz; the lowest meaningful rate is one frame a second.
-    return Number.isFinite(v) ? Math.max(1, Math.round(v)) : 30;
-  }
-
-  function renderSoon() {
-    if (paintScheduled) return;
-    const budget = Math.max(1, Math.round(1000 / renderFps()));
-    const wait = Math.max(0, (lastPaintAt || 0) + budget - Date.now());
-    paintScheduled = true;
-    if (wait === 0) { setImmediate(paintNow); return; }
-    setTimeout(paintNow, wait);
-  }
+  /**
+   * The render rate this session is capped at, from `/settings` → Render FPS.
+   *
+   * Read on every call rather than cached: the setting can change mid-session, and a cached rate would
+   * only take effect after a restart.
+   */
+  function renderFps() {
+    const v = Number(cfg && cfg.render_fps);
+    // A terminal cannot render at 0Hz; the lowest meaningful rate is one frame a second.
+    return Number.isFinite(v) ? Math.max(1, Math.round(v)) : 30;
+  }
+
+  function renderSoon() {
+    if (paintScheduled) return;
+    const budget = Math.max(1, Math.round(1000 / renderFps()));
+    const wait = Math.max(0, (lastPaintAt || 0) + budget - Date.now());
+    paintScheduled = true;
+    if (wait === 0) { setImmediate(paintNow); return; }
+    setTimeout(paintNow, wait);
+  }
   function openPicker(p) {
     let footer = p.footer ? { focused: false, ...p.footer } : null;
     if (p.footerFor) {
@@ -14739,6 +15643,18 @@ export async function startTUI(opts) {
   // because `generateTitle` is a hoisted declaration in this same scope: it is defined far
   // below, but the binding exists as soon as this statement runs.
   sessHost.makeTitle = generateTitle;
+  // The Goal tool writes the SAME objective field /goal does, so the status panel and the turn loop cannot
+  // disagree about what the agent is working towards. `runTurn` reaches both through `sessHost`, which is why
+  // the store is installed here rather than inside the tool.
+  installGoalStore({
+    get: () => state.objective || '',
+    set: (goal) => {
+      state.objective = String(goal || '');
+      state.goalPaused = false;
+      try { sessHost.persistState(); } catch { /* a failed save must not lose the goal for this turn */ }
+      renderFrame();
+    },
+  });
   // The same indirection, for the same reason: `runTurn` drains the queue by re-entering
   // `submit`, which is a nested function of THIS scope. Referencing it by name from `runTurn`
   // threw `submit is not defined` and killed the process on the next turn — the identical
@@ -15470,7 +16386,7 @@ export async function startTUI(opts) {
             ],
             resolve,
           };
-          renderSoon();
+          renderSoon();
         }),
       }))
       .then((res) => {
@@ -15768,10 +16684,21 @@ export async function startTUI(opts) {
   // advance identically — duplicated logic here would drift.
   function advanceQuestion(qs) {
     const total = qs.items.length;
+    // REMEMBER WHAT WAS CHOSEN ON THIS QUESTION BEFORE LEAVING IT.
+    //
+    // `sel` and `picked` were global to the dialog, so moving on reset both to "first row, nothing picked" —
+    // and coming back to re-read or change an earlier answer showed the first option as the current one, with
+    // no sign of what had actually been chosen. A per-question record keeps the row and the selection where
+    // the user left them.
+    if (qs.index < total) {
+      if (!qs.remember) qs.remember = new Map();
+      qs.remember.set(qs.index, { sel: qs.sel, picked: new Set(qs.picked) });
+    }
     if (qs.index < total - 1) {
       qs.index++;
-      qs.sel = 0;
-      qs.picked = new Set();
+      const back = qs.remember && qs.remember.get(qs.index);
+      qs.sel = back ? back.sel : 0;
+      qs.picked = back ? new Set(back.picked) : new Set();
       return;
     }
     qs.index = total;   // the Other tab
@@ -16024,6 +16951,32 @@ export async function startTUI(opts) {
         // itself has no per-row action, so absorbing is the whole behaviour.
         return true;
       }
+      case 'questionTab': {
+        // Clicking a tab label switches to that question. `hb.index` is the tab's position; the trailing one is
+        // the Other tab, whose field opens on arrival, exactly as `switchTab` does it. Without this case the
+        // labels were plain text and the only way back to an earlier question was the keyboard.
+        if (!state.question) return false;
+        const qs = state.question;
+        if (qs.editing === 'other') qs.otherText = qs.editingText || '';
+        else if (qs.editing === 'supplement') qs.supplement = qs.editingText || '';
+        qs.editing = null;
+        const totalTabs = qs.items.length;
+        if (qs.index < totalTabs) {
+          if (!qs.remember) qs.remember = new Map();
+          qs.remember.set(qs.index, { sel: qs.sel, picked: new Set(qs.picked) });
+        }
+        qs.index = Math.max(0, Math.min(totalTabs, hb.index));
+        const backTab = qs.index < totalTabs && qs.remember ? qs.remember.get(qs.index) : null;
+        qs.sel = backTab ? backTab.sel : 0;
+        qs.picked = backTab ? new Set(backTab.picked) : new Set();
+        if (qs.index === totalTabs) {
+          qs.editing = 'supplement';
+          qs.editingText = qs.supplement || '';
+          qs.editingCaret = qs.editingText.length;
+        }
+        renderFrame();
+        return true;
+      }
       case 'questionItem': {
         // Click an option in the AskUserQuestion dialog. `hb.index` is the position
         // in [options..., Other] for the CURRENT question tab. Without this case the
@@ -16454,7 +17407,19 @@ export async function startTUI(opts) {
     // now 7-12ms warm, so the notice did nothing except paint a frame, get replaced a moment later, and
     // make the paste feel like it was waiting for something. The text appears, or an error is reported —
     // both are visible without an intermediate state.
-    const { text, via } = await readClipboardContentAsync();
+    const read = await readClipboardContentAsync();
+    let { text, via } = read;
+    // A COPIED IMAGE WITH AN ADDRESS DOES NOT NEED A FILE.
+    //
+    // Chromium puts the pixels, an HTML fragment (`<img src=…>`) and — for a plain image — the image's own
+    // URL on the clipboard at once. The reader answers with the file list or the saved PNG first, so a copied
+    // web image was written to disk for content the model can simply fetch. The TEXT formats are the only ones
+    // that carry an address, so they are consulted before the PNG is accepted.
+    if (via === 'image') {
+      const direct = await readClipboardTextOnly();
+      const url = direct ? imageUrlFromClipboardText(direct) : null;
+      if (url) { text = url; via = 'text'; }
+    }
     if (text) {
       // An image collapses to a `[paste #N image]` chip, the same way a multi-line
       // paste becomes `[paste #N +L lines]`, so the prompt does not fill up with a
@@ -16489,8 +17454,14 @@ export async function startTUI(opts) {
       renderFrame();
       return;
     }
+    // QUEUED ITEMS ARE ALREADY EXPANDED; THE DRAFT IS NOT.
+    //
+    // `submit` expands paste placeholders before it queues a message, so `state.queued` holds real text. The
+    // draft still holds `[Pasted text #1 …]` markers — those are what the composer shows — and steering it
+    // verbatim sent the marker to the model and printed it in the transcript. Same expansion the composer does.
     const items = (state.queued || []).slice();
-    const draft = String(state.input || '').trim();
+    const rawDraft = String(state.input || '');
+    const draft = rawDraft.trim() ? expandPastes(rawDraft, state.pastes).trim() : '';
     if (draft) items.push(draft);
     if (!items.length) {
       notice('Nothing queued to steer', 'error');
@@ -16613,7 +17584,58 @@ export async function startTUI(opts) {
     return keybindings;
   }
 
+  // WHICH KEYS ACCELERATE WHEN HELD. Anything that MOVES — the caret, the selection, the cursor — and
+  // anything that DELETES one unit at a time. Enter, Escape, Tab and ordinary characters are deliberately
+  // absent: firing those twice is a bug, not a convenience.
+  const REPEATABLE_KEYS = new Set([
+    'backspace', 'delete', 'left', 'right', 'up', 'down',
+    'home', 'end', 'pageup', 'pagedown', 'c-left', 'c-right', 'c-up', 'c-down',
+  ]);
+  /** A gap longer than this starts a fresh run, so two separate presses are never merged. */
+  const REPEAT_WINDOW_MS = 140;   // the same deliberate/burst boundary `wheelStep` uses
+  /** The most one event may stand for. */
+  const REPEAT_MAX = 8;           // same ceiling as `wheelStep`
+  const repeatState = { key: null, at: 0, run: 0 };
+
   function handleKey(t) {
+    // A KITTY GRAPHICS REPLY IS NOT A KEYSTROKE. It is the terminal acknowledging an upload (`G i=31;OK`) or
+    // reporting that it dropped an image. The token exists so the bytes are CONSUMED rather than typed into the
+    // composer; there is nothing to act on yet, because a failed upload is handled by placing the formula as
+    // text next time rather than by retrying mid-frame.
+    if (t && t.kittyReply !== undefined) return;
+    // HOLDING A KEY REPEATS IT AT A FIXED RATE, WHICHEVER ROW IT LANDS ON.
+    //
+    // The wheel already accelerates: `wheelStep` widens the jump as notches arrive faster, so a fast scroll
+    // moves eight rows where a deliberate one moves one. Every OTHER repeat — backspace, the arrows, home and
+    // end, page keys — ran once per event no matter how fast the terminal auto-repeated, so holding backspace
+    // through a long line crawled while holding the wheel flew. Both are "the same key, arriving fast".
+    //
+    // The run is folded into ONE call carrying `_repeat`, and the handlers that support it act that many
+    // times. A key not in the list is untouched: Enter, Escape and ordinary characters must never fire twice.
+    if (t && typeof t.key === 'string' && REPEATABLE_KEYS.has(t.key)) {
+      const now = Date.now();
+      const gap = now - (repeatState.at || 0);
+      repeatState.at = now;
+      repeatState.key = t.key;
+      // THE BATCH COMES FROM THE GAP, NOT FROM HOW LONG THE KEY HAS BEEN HELD.
+      //
+      // Counting the run and batching on its length multiplied twice: a held key already arrives every ~40ms,
+      // so growing the batch to eight made the last event stand for eight MORE deltas on top of the ~25Hz
+      // stream — hundreds of characters a second, and the caret shot past where anyone wanted it. The gap
+      // alone says how fast the terminal repeats, which is the thing to compensate for.
+      //
+      //   140ms+    a deliberate tap                    -> 1
+      //   70-140    a brisk double tap                  -> 2
+      //   35-70     the terminal repeating              -> 3
+      //   under 35  a fast repeat                       -> 4
+      t._repeat = gap >= REPEAT_WINDOW_MS ? 1
+        : gap >= REPEAT_WINDOW_MS / 2 ? 2
+          : gap >= REPEAT_WINDOW_MS / 4 ? 3
+            : 4;
+    } else {
+      repeatState.key = null;
+      repeatState.at = 0;
+    }
     // USER KEYBINDINGS, their own layer. A binding either REPLACES a key with another key
     // (applied by rewriting `t.key` below, so the whole switch sees the bound key without
     // knowing bindings exist) or runs a slash command. Mouse and wheel events are never
@@ -16710,7 +17732,7 @@ export async function startTUI(opts) {
         return;
       }
       if (t.key === 'pageup' || t.key === 'pagedown') {
-        scrollChat(state, t.key === 'pageup' ? 10 : -10);
+        scrollChat(state, t.key === 'pageup' ? 10 : -10);   // a page is a big step already, so no _repeat scaling
         renderFrame();
         return;
       }
@@ -16812,10 +17834,18 @@ export async function startTUI(opts) {
         if (qs.editing === 'other') qs.otherText = qs.editingText || '';
         else if (qs.editing === 'supplement') qs.supplement = qs.editingText || '';
         qs.editing = null;
+        // Tab is the OTHER way to leave a question, so it has to remember too — otherwise switching back with
+        // Shift+Tab showed the first option again even though the previous answer was still recorded.
+        const total0 = qs.items.length;
+        if (qs.index < total0) {
+          if (!qs.remember) qs.remember = new Map();
+          qs.remember.set(qs.index, { sel: qs.sel, picked: new Set(qs.picked) });
+        }
         const n = total + 1;   // questions + the Other tab
         qs.index = (qs.index + dir + n) % n;
-        qs.sel = 0;
-        qs.picked = new Set();
+        const back = qs.index < total0 && qs.remember ? qs.remember.get(qs.index) : null;
+        qs.sel = back ? back.sel : 0;
+        qs.picked = back ? new Set(back.picked) : new Set();
         if (qs.index === total) {
           // Landing on the Other tab opens its text field directly.
           qs.editing = 'supplement';
@@ -16865,7 +17895,18 @@ export async function startTUI(opts) {
             return;
           }
           if (!answer) { renderFrame(); return; }          // nothing typed: stay
-          qs.answers[cur.question] = answer;
+          // A MULTI-SELECT KEEPS ITS OTHER PICKS. This overwrote `answers[cur.question]` with the typed text
+          // alone, so a question where "Option A" and "Other: something" were both chosen came back with only
+          // the typed half — the checkboxes were on screen but the answer that reached the model had lost them.
+          if (cur.multiSelect) {
+            const labels = [...qs.picked].sort((a, b) => a - b)
+              .map((i) => (cur.options[i] ? cur.options[i].label : null))
+              .filter(Boolean);
+            labels.push(answer);
+            qs.answers[cur.question] = labels.join(', ');
+          } else {
+            qs.answers[cur.question] = answer;
+          }
           qs.otherText = '';
           qs.editing = null;
           advance();
@@ -16915,7 +17956,13 @@ export async function startTUI(opts) {
       if (t.key === 'enter') {
         if (qs.sel >= otherIdx) { openEditor('other'); return; }
         if (cur.multiSelect) {
-          const labels = [...qs.picked].sort((a, b) => a - b).map((i) => cur.options[i].label);
+          // An option index past `cur.options` is the trailing "Other" row, whose text lives in `otherText`.
+          // Dereferencing it blindly threw on a question where Other was among the checked rows.
+          const labels = [...qs.picked].sort((a, b) => a - b)
+            .map((i) => (cur.options[i] ? cur.options[i].label : null))
+            .filter(Boolean);
+          const typed = (qs.otherText || '').trim();
+          if (typed) labels.push(typed);
           if (labels.length) qs.answers[cur.question] = labels.join(', ');
           advance();
           return;
@@ -16933,7 +17980,7 @@ export async function startTUI(opts) {
         return;
       }
       if (t.key === 'pageup' || t.key === 'pagedown') {
-        scrollChat(state, t.key === 'pageup' ? 10 : -10);
+        scrollChat(state, t.key === 'pageup' ? 10 : -10);   // a page is a big step already, so no _repeat scaling
         renderFrame();
         return;
       }
@@ -16950,7 +17997,7 @@ export async function startTUI(opts) {
     // its own arrow behaviour on the un-modified keys.
     if (t.key === 'c-up' || t.key === 'c-down') {
       if (!(state.picker || state.form || state.panel || state.editor || state.question || state.menuOpen)) {
-        scrollChat(state, t.key === 'c-up' ? wheelStep(state, "c") : -wheelStep(state, "c"));
+        scrollChat(state, t.key === 'c-up' ? wheelStep(state, "c") : -wheelStep(state, "c"));
         renderFrame();
         return;
       }
@@ -16959,21 +18006,21 @@ export async function startTUI(opts) {
     // Ctrl+L — expand / collapse the plugin log block(s). The last one is the
     // useful target (it is the most recent), but every pluginLog message is toggled
     // so a session with several reloads behaves predictably.
-    if (t.key === 'alt-r') {
-      // Only when nothing owns the keyboard: a picker or a dialog has its own meaning for R.
-      if (!(state.picker || state.form || state.panel || state.editor || state.question || state.menuOpen)) {
-        const current = (cfg && cfg.provider) || '';
-        if (!current) {
-          notice('No provider selected — use /model to pick one.', 'error');
-        } else {
-          // Fire and forget: the notice reports the outcome, and blocking the key handler on a network
-          // round-trip would freeze input for as long as the endpoint takes.
-          void fetchAndRegisterModels(state, cfg, current, { notice: (m, k) => notice(m, k) });
-        }
-        renderFrame();
-        return;
-      }
-    }
+    if (t.key === 'alt-r') {
+      // Only when nothing owns the keyboard: a picker or a dialog has its own meaning for R.
+      if (!(state.picker || state.form || state.panel || state.editor || state.question || state.menuOpen)) {
+        const current = (cfg && cfg.provider) || '';
+        if (!current) {
+          notice('No provider selected — use /model to pick one.', 'error');
+        } else {
+          // Fire and forget: the notice reports the outcome, and blocking the key handler on a network
+          // round-trip would freeze input for as long as the endpoint takes.
+          void fetchAndRegisterModels(state, cfg, current, { notice: (m, k) => notice(m, k) });
+        }
+        renderFrame();
+        return;
+      }
+    }
     if (t.key === 'c-l') {
       if (!(state.picker || state.form || state.panel || state.editor || state.question || state.menuOpen)) {
         const logs = (state.chat || []).filter((m) => m && m.pluginLog);
@@ -17212,7 +18259,7 @@ export async function startTUI(opts) {
         return;
       }
       if (t.key === 'pageup' || t.key === 'pagedown') {
-        scrollChat(state, t.key === 'pageup' ? 10 : -10);
+        scrollChat(state, t.key === 'pageup' ? 10 : -10);   // a page is a big step already, so no _repeat scaling
         renderFrame(); return;
       }
       if (t.key === 'wheelup' || t.key === 'wheeldown') {
@@ -17220,25 +18267,36 @@ export async function startTUI(opts) {
         renderFrame(); return;
       }
       if (t.key === 'up' || t.key === 'down') {
-        // ↑/↓ while the agent streams: FIRST give the composer its caret move
-        // (a multi-line draft must still navigate), then fall back to scrolling
-        // ONLY when there is nothing else to do. The scroll is what made ↑ feel
-        // stuck while output streamed, so it is now the last resort.
         const cur = state.input || '';
-        if (cur === '') {
-          // Empty composer: the key belongs to HISTORY, not to the viewport.
-          // With no history the key does nothing at all — silently scrolling
-          // the transcript is what made a bare ↑ feel like it ate the key.
-          if (state.history.length) {
-            if (state.historyIdx === -1) state.historyIdx = state.history.length;
-            state.historyIdx = t.key === 'up'
-              ? Math.max(0, state.historyIdx - 1)
-              : Math.min(state.history.length, state.historyIdx + 1);
-            state.input = state.historyIdx >= state.history.length ? '' : (state.history[state.historyIdx] || '');
+        const hist = Array.isArray(state.history) ? state.history : [];
+        const single = cur.indexOf('\n') === -1;
+        if (hist.length) {
+          // ↑ ENTERS HISTORY from anywhere in a ONE-LINE draft, and from the very start of a
+          // multi-line one, where the caret has somewhere else to go.
+          if (t.key === 'up' && state.historyIdx === -1 && (single || (state.caret || 0) === 0)) {
+            // Keep what is in the composer so ↓ can bring it back.
+            state.draftInput = cur;
+            state.historyIdx = hist.length - 1;
+            state.input = hist[state.historyIdx] || '';
             state.caret = state.input.length;
             refreshMenu(state); renderFrame();
+            return;
+          }
+          if (state.historyIdx >= 0) {
+            if (t.key === 'up') {
+              if (state.historyIdx === 0) return;   // oldest entry: the caret keys below take over
+              state.historyIdx -= 1;
+              state.input = hist[state.historyIdx] || '';
+            } else {
+              const next = state.historyIdx + 1;
+              // Past the newest entry the DRAFT returns, not an empty line.
+              state.input = next >= hist.length ? (state.draftInput || '') : (hist[next] || '');
+              state.historyIdx = next >= hist.length ? -1 : next;
+            }
+            state.caret = state.input.length;
+            refreshMenu(state); renderFrame();
+            return;
           }
-          return;
         }
         const insideW = Math.max(0, dims().cols - 2);
         const layout = composerLayout(state, insideW - 3);
@@ -17254,7 +18312,11 @@ export async function startTUI(opts) {
         }
         // Draft is on its last/first row: the key is free. Scroll the transcript
         // (useful while output streams and you want to read back).
-        scrollChat(state, t.key === 'up' ? 3 : -3);
+        //
+        // `_repeat` makes a HELD arrow accelerate like the wheel does: three rows for a tap, up to
+        // `REPEAT_MAX * 3` when the key is repeating. Without it the rows crawled while the wheel flew, even
+        // though both arrive as the same fast stream of events.
+        scrollChat(state, (t.key === 'up' ? 3 : -3) * Math.max(1, Math.min(REPEAT_MAX, t._repeat || 1)));
         renderFrame(); return;
       }
     }
@@ -17279,16 +18341,33 @@ export async function startTUI(opts) {
             return;
           }
           // First/last row (or an empty composer): this is history's turn.
+          // This mirrors the streaming branch above exactly — the two used to differ, and the difference
+          // was the bug: here a lone ↓ could re-enter the walk at the newest entry instead of resting at
+          // the draft, so ↓ alternated between the last history entry and an empty box forever.
           if (state.history.length) {
-            if (state.historyIdx === -1) state.historyIdx = state.history.length;
-            state.historyIdx = t.key === 'up'
-              ? Math.max(0, state.historyIdx - 1)
-              : Math.min(state.history.length, state.historyIdx + 1);
-            state.input = state.historyIdx >= state.history.length ? '' : (state.history[state.historyIdx] || '');
+            if (t.key === 'up' && state.historyIdx === -1) {
+              // Entering history: keep the composer so ↓ can bring it back.
+              state.draftInput = cur;
+              state.historyIdx = state.history.length - 1;
+              state.input = state.history[state.historyIdx] || '';
+            } else if (state.historyIdx >= 0) {
+              if (t.key === 'up') {
+                if (state.historyIdx === 0) return;   // oldest entry: the caret keys take over
+                state.historyIdx -= 1;
+                state.input = state.history[state.historyIdx] || '';
+              } else {
+                const next = state.historyIdx + 1;
+                // Past the newest entry the DRAFT returns, and the index goes to -1 so the next ↓ rests.
+                state.input = next >= state.history.length ? (state.draftInput || '') : (state.history[next] || '');
+                state.historyIdx = next >= state.history.length ? -1 : next;
+              }
+            } else {
+              return;   // not browsing and not ↑: the key is not ours
+            }
             state.caret = state.input.length;
             refreshMenu(state); renderFrame();
+            return;
           }
-          return;
         }
       }
     }
@@ -17383,10 +18462,12 @@ export async function startTUI(opts) {
     if (state.panel) {
       const p = state.panel;
       if (t.key === 'escape') { state.panel = null; state.hoverHit = null; renderFrame(); return; }
-      if (t.key === 'up') { p.top = Math.max(0, (p.top || 0) - 1); renderFrame(); return; }
-      if (t.key === 'down') { p.top = (p.top || 0) + 1; renderFrame(); return; }
-      if (t.key === 'pageup') { p.top = Math.max(0, (p.top || 0) - 10); renderFrame(); return; }
-      if (t.key === 'pagedown') { p.top = (p.top || 0) + 10; renderFrame(); return; }
+      // A held key moves the panel by `_repeat` rows, the same acceleration the transcript scroll uses.
+      const rep = Math.max(1, Math.min(REPEAT_MAX, t._repeat || 1));
+      if (t.key === 'up') { p.top = Math.max(0, (p.top || 0) - rep); renderFrame(); return; }
+      if (t.key === 'down') { p.top = (p.top || 0) + rep; renderFrame(); return; }
+      if (t.key === 'pageup') { p.top = Math.max(0, (p.top || 0) - 10 * rep); renderFrame(); return; }
+      if (t.key === 'pagedown') { p.top = (p.top || 0) + 10 * rep; renderFrame(); return; }
       if (t.key === 'home') { p.top = 0; renderFrame(); return; }
       return;
     }
@@ -17592,7 +18673,7 @@ export async function startTUI(opts) {
       // ↑/↓ scroll the box's history, in ROWS. Held on the state as an offset from
       // the tail, matching the transcript's convention.
       if (t.key === 'up' || t.key === 'down') {
-        const step = t.key === 'up' ? 4 : -4;
+        const step = (t.key === 'up' ? 4 : -4) * Math.max(1, Math.min(REPEAT_MAX, t._repeat || 1));
         state.btwScroll = Math.max(0, (state.btwScroll || 0) + step);
         renderFrame();
         return;
@@ -17650,14 +18731,23 @@ export async function startTUI(opts) {
     if (t.key === 'up' || t.key === 'down') {
       const cur = state.input || '';
       if (cur === '') {
-        // Empty composer: history owns the key. With NO history the key does
-        // nothing — it must not silently scroll the transcript.
+        // Empty composer: history owns the key. With no history it does nothing, rather than silently
+        // scrolling the transcript.
         if (state.history.length) {
-          if (state.historyIdx === -1) state.historyIdx = state.history.length;
-          state.historyIdx = t.key === 'up'
-            ? Math.max(0, state.historyIdx - 1)
-            : Math.min(state.history.length, state.historyIdx + 1);
-          state.input = state.historyIdx >= state.history.length ? '' : (state.history[state.historyIdx] || '');
+          if (state.historyIdx === -1) {
+            if (t.key === 'down') return;          // already at the draft: nothing older to reach
+            state.draftInput = cur;
+            state.historyIdx = state.history.length - 1;
+            state.input = state.history[state.historyIdx] || '';
+          } else if (t.key === 'up') {
+            if (state.historyIdx === 0) return;   // oldest entry
+            state.historyIdx -= 1;
+            state.input = state.history[state.historyIdx] || '';
+          } else {
+            const next = state.historyIdx + 1;
+            state.input = next >= state.history.length ? (state.draftInput || '') : (state.history[next] || '');
+            state.historyIdx = next >= state.history.length ? -1 : next;
+          }
           state.caret = state.input.length;
           state.composerSel = null;
           refreshMenu(state); renderFrame();
@@ -17685,11 +18775,20 @@ export async function startTUI(opts) {
       // for the key, so it becomes HISTORY. (Scrolling the transcript is still
       // available on PgUp/PgDn and the wheel — the arrows belong to the input.)
       if (state.history.length) {
-        if (state.historyIdx === -1) state.historyIdx = state.history.length;
-        state.historyIdx = t.key === 'up'
-          ? Math.max(0, state.historyIdx - 1)
-          : Math.min(state.history.length, state.historyIdx + 1);
-        state.input = state.historyIdx >= state.history.length ? '' : (state.history[state.historyIdx] || '');
+        if (state.historyIdx === -1) {
+          if (t.key === 'down') return;          // already at the draft
+          state.draftInput = cur;
+          state.historyIdx = state.history.length - 1;
+          state.input = state.history[state.historyIdx] || '';
+        } else if (t.key === 'up') {
+          if (state.historyIdx === 0) return;   // oldest entry
+          state.historyIdx -= 1;
+          state.input = state.history[state.historyIdx] || '';
+        } else {
+          const next = state.historyIdx + 1;
+          state.input = next >= state.history.length ? (state.draftInput || '') : (state.history[next] || '');
+          state.historyIdx = next >= state.history.length ? -1 : next;
+        }
         state.caret = state.input.length;
         state.composerSel = null;
         refreshMenu(state); renderFrame(); return;
@@ -17697,13 +18796,13 @@ export async function startTUI(opts) {
       return;
     }
     if (t.key === 'wheelup' || t.key === 'wheeldown') {
-      // HOW HARD THE USER IS TURNING, from the interval between key events.
-      //
-      // One rate cannot serve both gestures: a fixed one row makes a fast spin crawl, a fixed three jumps
-      // past what a careful reader wanted. The interval between events is the speed, and it is already
-      // in the stream — no timer, no separate gesture detection. Slow: one row. Fast: up to eight.
-      const step = wheelStep(state, "wheel");
-      const d = t.key === 'wheelup' ? step : -step;
+      // HOW HARD THE USER IS TURNING, from the interval between key events.
+      //
+      // One rate cannot serve both gestures: a fixed one row makes a fast spin crawl, a fixed three jumps
+      // past what a careful reader wanted. The interval between events is the speed, and it is already
+      // in the stream — no timer, no separate gesture detection. Slow: one row. Fast: up to eight.
+      const step = wheelStep(state, "wheel");
+      const d = t.key === 'wheelup' ? step : -step;
       if (state.panel) {
         const p = state.panel;
         p.top = Math.max(0, (p.top || 0) + (t.key === 'wheelup' ? -3 : 3));
@@ -17754,7 +18853,7 @@ export async function startTUI(opts) {
         }
         return;
       }
-      scrollChat(state, t.key === 'pageup' ? 10 : -10);
+      scrollChat(state, t.key === 'pageup' ? 10 : -10);   // a page is a big step already, so no _repeat scaling
       renderFrame(); return;
     }
     // Shift+arrows EXTEND a composer selection instead of moving the caret. The
@@ -17799,13 +18898,24 @@ export async function startTUI(opts) {
 
     if (t.key === 'left' || t.key === 'right') {
       const dir = t.key === 'left' ? -1 : 1;
-      const mk = adjacentPasteMarker(state.input, state.caret || 0, dir);
-      if (mk) {
-        state.caret = dir < 0 ? mk.start : mk.end;
-      } else if (dir < 0) {
-        state.caret = Math.max(0, (state.caret || 0) - 1);
-      } else {
-        state.caret = Math.min(state.input.length, (state.caret || 0) + 1);
+      // A held arrow moves `_repeat` cells per event; a paste marker is skipped whole, so it consumes one
+      // step of the run rather than being walked into character by character.
+      const times = Math.max(1, Math.min(REPEAT_MAX, t._repeat || 1));
+      for (let nth = 0; nth < times; nth++) {
+        const mk = adjacentPasteMarker(state.input, state.caret || 0, dir);
+        if (mk) {
+          state.caret = dir < 0 ? mk.start : mk.end;
+        } else if (dir < 0) {
+          const next = Math.max(0, (state.caret || 0) - 1);
+          const moved = next !== (state.caret || 0);
+          state.caret = next;
+          if (!moved) break;
+        } else {
+          const next = Math.min(state.input.length, (state.caret || 0) + 1);
+          const moved = next !== (state.caret || 0);
+          state.caret = next;
+          if (!moved) break;
+        }
       }
       // A horizontal move abandons the sticky column (kimi's setCursorCol).
       state._caretPrefCol = null;
@@ -17892,21 +19002,29 @@ export async function startTUI(opts) {
         renderFrame();
         return;
       }
-      const sel = state.composerSel;
-      if (sel && sel.anchor !== sel.head) {
-        const a = Math.min(sel.anchor, sel.head);
-        const h = Math.max(sel.anchor, sel.head);
-        state.input = state.input.slice(0, a) + state.input.slice(h);
-        state.caret = a;
-      } else if (state.caret > 0) {
-        const mk = adjacentPasteMarker(state.input, state.caret, -1);
-        if (mk) {
-          state.input = state.input.slice(0, mk.start) + state.input.slice(mk.end);
-          state.caret = mk.start;
-          state.pastes.delete(mk.id);
+      // `_repeat` is how many times the held key stands for — see the note in `handleKey`. A held backspace
+      // then erases `_repeat` characters per event instead of one, which is what makes it keep up with the
+      // wheel's acceleration.
+      const times = Math.max(1, Math.min(REPEAT_MAX, t._repeat || 1));
+      for (let nth = 0; nth < times; nth++) {
+        const sel = state.composerSel;
+        if (sel && sel.anchor !== sel.head) {
+          const a = Math.min(sel.anchor, sel.head);
+          const h = Math.max(sel.anchor, sel.head);
+          state.input = state.input.slice(0, a) + state.input.slice(h);
+          state.caret = a;
+        } else if (state.caret > 0) {
+          const mk = adjacentPasteMarker(state.input, state.caret, -1);
+          if (mk) {
+            state.input = state.input.slice(0, mk.start) + state.input.slice(mk.end);
+            state.caret = mk.start;
+            state.pastes.delete(mk.id);
+          } else {
+            state.input = state.input.slice(0, state.caret - 1) + state.input.slice(state.caret);
+            state.caret--;
+          }
         } else {
-          state.input = state.input.slice(0, state.caret - 1) + state.input.slice(state.caret);
-          state.caret--;
+          break;   // nothing left to delete; the remaining repeats would be no-ops
         }
       }
       // Deleting can also change the mention (or delete the `@` itself), so the
@@ -17916,19 +19034,25 @@ export async function startTUI(opts) {
       renderFrame(); state.composerSel = null; return;
     }
     if (t.key === 'delete') {
-      const sel = state.composerSel;
-      if (sel && sel.anchor !== sel.head) {
-        const a = Math.min(sel.anchor, sel.head);
-        const h = Math.max(sel.anchor, sel.head);
-        state.input = state.input.slice(0, a) + state.input.slice(h);
-        state.caret = a;
-      } else {
-        const mk = adjacentPasteMarker(state.input, state.caret, 1);
-        if (mk) {
-          state.input = state.input.slice(0, mk.start) + state.input.slice(mk.end);
-          state.pastes.delete(mk.id);
-        } else if (state.caret < state.input.length) {
-          state.input = state.input.slice(0, state.caret) + state.input.slice(state.caret + 1);
+      // `_repeat` batches a held key, the same way backspace does.
+      const times = Math.max(1, Math.min(REPEAT_MAX, t._repeat || 1));
+      for (let nth = 0; nth < times; nth++) {
+        const sel = state.composerSel;
+        if (sel && sel.anchor !== sel.head) {
+          const a = Math.min(sel.anchor, sel.head);
+          const h = Math.max(sel.anchor, sel.head);
+          state.input = state.input.slice(0, a) + state.input.slice(h);
+          state.caret = a;
+        } else {
+          const mk = adjacentPasteMarker(state.input, state.caret, 1);
+          if (mk) {
+            state.input = state.input.slice(0, mk.start) + state.input.slice(mk.end);
+            state.pastes.delete(mk.id);
+          } else if (state.caret < state.input.length) {
+            state.input = state.input.slice(0, state.caret) + state.input.slice(state.caret + 1);
+          } else {
+            break;   // at the end of the line: the remaining repeats would be no-ops
+          }
         }
       }
       refreshMenu(state); renderFrame(); state.composerSel = null; return;
@@ -18067,26 +19191,26 @@ export async function startTUI(opts) {
   // Read live, so a /external flip applies to the very next tool call.
   function externalAllowed() { return sessHost.externalAllowed(); }
 
-/**
- * How many rows one notch or keypress should move, from how fast they are arriving.
- *
- * Shared by the wheel and by Ctrl+Up/Down so the two cannot drift: they are the same gesture with
- * different hardware. The EVENT STREAM is the speed sensor — a wheel turned slowly sends notches far
- * apart and one spun sends them in a burst, and a key held down repeats at the OS repeat rate.
- *
- * `family` keeps the two clocks apart: alternating a wheel notch with a Ctrl+Up should not be read as one
- * burst of either. It also makes the FIRST event of a family one row — `Infinity` lands in the slowest
- * step, so nothing jumps on the first touch after a pause.
- */
-function wheelStep(state, family) {
-  const now = Date.now();
-  const at = state._stepAt || (state._stepAt = {});
-  const since = at[family] ? now - at[family] : Infinity;
-  at[family] = now;
-  // 140ms is about the gap between deliberate notches; under 55ms they are arriving in a burst.
-  return since > 140 ? 1 : since > 90 ? 2 : since > 55 ? 4 : 8;
-}
-
+/**
+ * How many rows one notch or keypress should move, from how fast they are arriving.
+ *
+ * Shared by the wheel and by Ctrl+Up/Down so the two cannot drift: they are the same gesture with
+ * different hardware. The EVENT STREAM is the speed sensor — a wheel turned slowly sends notches far
+ * apart and one spun sends them in a burst, and a key held down repeats at the OS repeat rate.
+ *
+ * `family` keeps the two clocks apart: alternating a wheel notch with a Ctrl+Up should not be read as one
+ * burst of either. It also makes the FIRST event of a family one row — `Infinity` lands in the slowest
+ * step, so nothing jumps on the first touch after a pause.
+ */
+function wheelStep(state, family) {
+  const now = Date.now();
+  const at = state._stepAt || (state._stepAt = {});
+  const since = at[family] ? now - at[family] : Infinity;
+  at[family] = now;
+  // 140ms is about the gap between deliberate notches; under 55ms they are arriving in a burst.
+  return since > 140 ? 1 : since > 90 ? 2 : since > 55 ? 4 : 8;
+}
+
   function scrollChat(state, delta) {
     const cols = dims().cols, rows = dims().rows;
     // Only the TOTAL row count is needed to clamp the scroll position. This used to
@@ -18119,7 +19243,12 @@ function wheelStep(state, family) {
     state.menuOpen = false; state.menuList = []; state.menuSel = 0;
     state.mentionOpen = false; state.mentionList = []; state.mentionSel = 0;
     state.mentionOffset = 0;
+    // A NEW TURN means a new chance for the goal to restart it. The counter exists so one turn restarts the
+    // goal at most once; without resetting it here, the second turn of a goal would never continue.
+    state._goalTurns = 0;
     state.historyIdx = -1;
+    // The draft belongs to the history walk that just ended; the next ↑ starts fresh.
+    state.draftInput = '';
     if (!text) { renderFrame(); return; }
     // `@name message` sends STRAIGHT to a teammate, without the model.
     //
@@ -18346,42 +19475,42 @@ function wheelStep(state, family) {
     // means two requests and a round trip to learn an id that this side invents anyway. Passing
     // `new: true` lets the daemon accept a prompt against any session URL and have it run in a new
     // session instead — the same thing `/new` does, minus the slash command.
-    hub.actions.submit = async (text, opts) => {
-      if (opts && opts.new) {
-        // Flush the outgoing session first: its todos and transcript belong to the id being replaced,
-        // and `dispatch` does exactly what `/new` does, so the two cannot drift apart.
-        await core.dispatch('new', '');
-        // The hub's rows and event ring belong to the session that just ended. Clearing them keeps a
-        // viewer from showing the previous conversation under the new id.
-        hub.rows = [];
-        hub.events = [];
-      }
-      // `core.submit` AWAITS THE WHOLE TURN, so its result is the finished turn — no polling needed.
-      const out = await core.submit(text);
-      // `opts.return` asks for the transcript of what just ran:
-      //
-      //   "turn"  the rows of this turn, tool results included
-      //   "full"  every row the session holds
-      //   "none"  (default) whatever `core.submit` returned, unchanged
-      //
-      // Without this a caller had to submit, wait an unknown time, then issue a second request for
-      // `/api/state` — two round trips and a guess at how long the turn would take.
-      const want = opts && opts.return;
-      if (!want || want === 'none') return out;
-      // FORCE ONE SYNC: `syncChat` does nothing while no browser is subscribed, so `hub.rows` would be
-      // empty here and the caller would get an empty transcript from a turn that plainly ran.
-      try { hub.syncChat(state.chat || []); } catch { /* the reply still carries `result` */ }
-      // The turn begins at the last user row; everything after it is what the prompt produced.
-      const rows = Array.isArray(hub.rows) ? hub.rows : [];
-      let from = 0;
-      for (let k = rows.length - 1; k >= 0; k--) { if (rows[k] && rows[k].role === 'user') { from = k; break; } }
-      const slice = want === 'full' ? rows : rows.slice(from);
-      const detail = (opts && opts.detail) || 'full';
-      const shaped = detail === 'minimal' ? slice.filter((r) => r.role !== 'tool')
-        : detail === 'summary' ? slice.map((r) => (r.role === 'tool' ? { ...r, text: '', liveOutput: '', diff: undefined } : r))
-          : slice;
-      return { result: out, rows: shaped, detail, sessionId: session && session.id };
-    };
+    hub.actions.submit = async (text, opts) => {
+      if (opts && opts.new) {
+        // Flush the outgoing session first: its todos and transcript belong to the id being replaced,
+        // and `dispatch` does exactly what `/new` does, so the two cannot drift apart.
+        await core.dispatch('new', '');
+        // The hub's rows and event ring belong to the session that just ended. Clearing them keeps a
+        // viewer from showing the previous conversation under the new id.
+        hub.rows = [];
+        hub.events = [];
+      }
+      // `core.submit` AWAITS THE WHOLE TURN, so its result is the finished turn — no polling needed.
+      const out = await core.submit(text);
+      // `opts.return` asks for the transcript of what just ran:
+      //
+      //   "turn"  the rows of this turn, tool results included
+      //   "full"  every row the session holds
+      //   "none"  (default) whatever `core.submit` returned, unchanged
+      //
+      // Without this a caller had to submit, wait an unknown time, then issue a second request for
+      // `/api/state` — two round trips and a guess at how long the turn would take.
+      const want = opts && opts.return;
+      if (!want || want === 'none') return out;
+      // FORCE ONE SYNC: `syncChat` does nothing while no browser is subscribed, so `hub.rows` would be
+      // empty here and the caller would get an empty transcript from a turn that plainly ran.
+      try { hub.syncChat(state.chat || []); } catch { /* the reply still carries `result` */ }
+      // The turn begins at the last user row; everything after it is what the prompt produced.
+      const rows = Array.isArray(hub.rows) ? hub.rows : [];
+      let from = 0;
+      for (let k = rows.length - 1; k >= 0; k--) { if (rows[k] && rows[k].role === 'user') { from = k; break; } }
+      const slice = want === 'full' ? rows : rows.slice(from);
+      const detail = (opts && opts.detail) || 'full';
+      const shaped = detail === 'minimal' ? slice.filter((r) => r.role !== 'tool')
+        : detail === 'summary' ? slice.map((r) => (r.role === 'tool' ? { ...r, text: '', liveOutput: '', diff: undefined } : r))
+          : slice;
+      return { result: out, rows: shaped, detail, sessionId: session && session.id };
+    };
     hub.actions.dispatch = async (cmd, arg) => {
       const out = await core.dispatch(cmd, arg);
       // The core runs the command; the repaint is this front end's business, so it stays
@@ -19390,14 +20519,18 @@ function quit() {
     process.exit(1);
   });
   process.on('unhandledRejection', (reason) => {
+    // REPORT AND CARRY ON. A rejected background task (a failed update check, a refused model refresh,
+    // a clipboard read) must not end the session: those callers are fire-and-forget by design, and the
+    // turn loop reports its own failures as events. Exiting here turned any one of them into a lost
+    // conversation.
     try { sess.saveSession(session); } catch {}
-    // The STACK is the whole point: the message alone ("...of undefined") does not
-    // say which line. console.error() writes into the alternate screen, which the
-    // exit handler then wipes, so the user never sees it — the log is the only
-    // place the trace survives.
-    noteExit(`unhandledRejection: ${(reason && reason.message) || reason}\n${(reason && reason.stack) || ''}`);
-    console.error('\nhncode unhandled rejection:', reason);
-    process.exit(1);
+    const msg = (reason && reason.message) || String(reason);
+    const stack = (reason && reason.stack) || '';
+    // The log is the only place the trace survives: stderr writes into the alternate screen, which the
+    // exit handler wipes.
+    noteExit(`unhandledRejection: ${msg}\n${stack}`);
+    // Visible in the transcript rather than on a screen that is about to be cleared.
+    try { notice(`background task failed: ${msg}`, 'error'); } catch {}
   });
 
   // REMOTE CONTROL (--control): expose a local socket so a script can queue a