@wrongstack/tui 0.77.0 → 0.84.1

package/dist/index.js

@@ -1,13 +1,14 @@
 import { writeErr, InputBuilder, DefaultSessionRewinder, writeOut, formatTodosList, buildGoalPreamble, shouldEnhance, enhanceUserPrompt, recentTextTurns, normalizedEqual, buildChildEnv } from '@wrongstack/core';
 export { buildGoalPreamble } from '@wrongstack/core';
-import { Box, Text, render, useApp, useStdout, measureElement, Static, useInput, useStdin } from 'ink';
-import React6, { useState, useEffect, useReducer, useRef, useMemo, useCallback, useLayoutEffect } from 'react';
+import { Box, Text, render, useApp, useStdout, Static, useInput, useStdin } from 'ink';
+import React6, { useState, useEffect, useReducer, useRef, useMemo, useCallback } from 'react';
 import * as fs2 from 'fs/promises';
 import * as path2 from 'path';
 import { routeImagesForModel } from '@wrongstack/runtime/vision';
 import { getIndexState, onIndexStateChange, getProcessRegistry } from '@wrongstack/tools';
 import { readClipboardImage } from '@wrongstack/runtime/clipboard';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { expectDefined as expectDefined$1 } from '@wrongstack/core/utils';
 import { spawn } from 'child_process';
 
 // src/run-tui.ts
@@ -34,6 +35,12 @@ var theme = Object.freeze({
   diffAddBg: "greenBright",
   diffDelBg: "redBright"
 });
+function expectDefined(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var MODE_ICONS = {
   teach: "\u{1F9D1}\u200D\u{1F3EB}",
   brief: "\u26A1",
@@ -55,7 +62,7 @@ function modeIcon(label) {
 var COMPACT_THRESHOLD = 50;
 var COMFORTABLE_THRESHOLD = 90;
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-var SPINNER_INTERVAL_MS = 130;
+var SPINNER_INTERVAL_MS = 250;
 function StatusBar({
   model,
   version,
@@ -65,7 +72,7 @@ function StatusBar({
   queueCount = 0,
   yolo = false,
   autonomy,
-  elapsedMs,
+  startedAt,
   todos,
   plan,
   fleet,
@@ -98,6 +105,12 @@ function StatusBar({
   const usage = tokenCounter?.total();
   const cost = tokenCounter?.estimateCost();
   const cache2 = tokenCounter?.cacheStats();
+  const [elapsedMs, setElapsedMs] = useState(startedAt ? Date.now() - startedAt : 0);
+  useEffect(() => {
+    if (startedAt == null) return;
+    const t = setInterval(() => setElapsedMs(Date.now() - startedAt), 1e3);
+    return () => clearInterval(t);
+  }, [startedAt]);
   const [spinnerIdx, setSpinnerIdx] = useState(0);
   useEffect(() => {
     if (state === "idle" || state === "aborting") return;
@@ -107,10 +120,11 @@ function StatusBar({
     );
     return () => clearInterval(t);
   }, [state]);
-  const spinner = SPINNER_FRAMES[spinnerIdx];
+  const spinner = expectDefined(SPINNER_FRAMES[spinnerIdx]);
   const { label: stateLabel, color: stateColor } = stateChip(state, fleet?.running ?? 0);
   const statePrefix = state === "idle" || state === "aborting" ? "\u25CF" : spinner;
-  const hasSecondLine = yolo || autonomy && autonomy !== "off" || elapsedMs !== void 0 || git !== null && git !== void 0 || projectName !== void 0 && projectName.length > 0 || goalSummary !== null && goalSummary !== void 0 || !!modeLabel;
+  const thinking = state === "running" || state === "streaming";
+  const hasSecondLine = yolo || autonomy && autonomy !== "off" || startedAt != null || git !== null && git !== void 0 || projectName !== void 0 && projectName.length > 0 || goalSummary !== null && goalSummary !== void 0 || !!modeLabel;
   const fleetHasActivity = fleet && (fleet.running > 0 || fleet.idle > 0 || fleet.pending > 0 || fleet.completed > 0) || subagentCount > 0;
   const hasBrainActivity = !!brain && brain.state !== "idle";
   const hasThirdLine = todos && (todos.pending > 0 || todos.inProgress > 0 || todos.completed > 0) || plan && (plan.open > 0 || plan.inProgress > 0 || plan.done > 0) || fleetHasActivity || hasBrainActivity;
@@ -128,7 +142,7 @@ function StatusBar({
         /* @__PURE__ */ jsx(Box, { flexDirection: "row", gap: 2, children: isCompact ? (
           // Ultra-compact: state · model
           /* @__PURE__ */ jsxs(Fragment, { children: [
-            /* @__PURE__ */ jsxs(Text, { color: stateColor, children: [
+            thinking ? /* @__PURE__ */ jsx(WaveText, { text: `${statePrefix}${stateLabel}`, phase: spinnerIdx }) : /* @__PURE__ */ jsxs(Text, { color: stateColor, children: [
               statePrefix,
               stateLabel
             ] }),
@@ -148,7 +162,7 @@ function StatusBar({
               ] }),
               /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" })
             ] }) : null,
-            /* @__PURE__ */ jsxs(Text, { color: stateColor, children: [
+            thinking ? /* @__PURE__ */ jsx(WaveText, { text: `${statePrefix} ${stateLabel}`, phase: spinnerIdx }) : /* @__PURE__ */ jsxs(Text, { color: stateColor, children: [
               statePrefix,
               " ",
               stateLabel
@@ -205,7 +219,7 @@ function StatusBar({
               /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
               /* @__PURE__ */ jsx(Text, { dimColor: true, children: hint })
             ] }) : null,
-            indexState && indexState.indexing ? /* @__PURE__ */ jsxs(Fragment, { children: [
+            indexState?.indexing ? /* @__PURE__ */ jsxs(Fragment, { children: [
               /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }),
               /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
                 "\u2699 indexing ",
@@ -244,14 +258,14 @@ function StatusBar({
             ] })
           ] }) : null,
           projectName ? /* @__PURE__ */ jsxs(Fragment, { children: [
-            yolo || elapsedMs !== void 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
+            yolo || startedAt != null ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
             /* @__PURE__ */ jsxs(Text, { color: "blue", children: [
               "\u{1F4C1} ",
               projectName
             ] })
           ] }) : null,
           goalSummary ? /* @__PURE__ */ jsxs(Fragment, { children: [
-            yolo || elapsedMs !== void 0 || projectName ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
+            yolo || startedAt != null || projectName ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
             /* @__PURE__ */ jsxs(
               Text,
               {
@@ -271,11 +285,11 @@ function StatusBar({
             )
           ] }) : null,
           modeLabel ? /* @__PURE__ */ jsxs(Fragment, { children: [
-            yolo || autonomy && autonomy !== "off" || eternalStage || elapsedMs !== void 0 || projectName || goalSummary ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
+            yolo || autonomy && autonomy !== "off" || eternalStage || startedAt != null || projectName || goalSummary ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
             /* @__PURE__ */ jsx(Text, { color: "cyan", children: modeIcon(modeLabel) })
           ] }) : null,
           git ? /* @__PURE__ */ jsxs(Fragment, { children: [
-            yolo || elapsedMs !== void 0 || projectName ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
+            yolo || startedAt != null || projectName ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
             /* @__PURE__ */ jsxs(Text, { children: [
               /* @__PURE__ */ jsxs(Text, { color: "magenta", children: [
                 "\u2387 ",
@@ -375,7 +389,7 @@ function StatusBar({
           /* @__PURE__ */ jsxs(Text, { children: [
             /* @__PURE__ */ jsx(Text, { color: a.color, bold: true, children: a.label }),
             /* @__PURE__ */ jsx(Text, { dimColor: true, children: " " }),
-            /* @__PURE__ */ jsx(Text, { color: a.running ? "yellow" : void 0, dimColor: !a.running, children: a.running ? "\u25B6" : "\xB7" }),
+            /* @__PURE__ */ jsx(Text, { dimColor: !a.running, ...a.running ? { color: "yellow" } : {}, children: a.running ? "\u25B6" : "\xB7" }),
             /* @__PURE__ */ jsx(Text, { dimColor: true, children: " " }),
             /* @__PURE__ */ jsx(Text, { dimColor: true, children: fmtElapsed(a.elapsedMs) }),
             /* @__PURE__ */ jsx(Text, { dimColor: true, children: " \xB7 " }),
@@ -504,6 +518,26 @@ function stateChip(state, fleetRunning) {
   if (state === "aborting") return { label: "aborting\u2026", color: "yellow" };
   return { label: "thinking\u2026", color: "green" };
 }
+var WAVE_COLORS = [
+  "#ff5f5f",
+  "#ff8f3f",
+  "#ffd23f",
+  "#bce84a",
+  "#6bcb77",
+  "#3dd9c0",
+  "#3fb6ff",
+  "#5f8bff",
+  "#845ef7",
+  "#b15bff",
+  "#f06595",
+  "#ff5fa2"
+];
+function WaveText({ text, phase }) {
+  return /* @__PURE__ */ jsx(Text, { bold: true, children: Array.from(text).map((ch, i) => (
+    // biome-ignore lint/suspicious/noArrayIndexKey: glyph order is positional and re-rendered each tick
+    /* @__PURE__ */ jsx(Text, { color: WAVE_COLORS[(i + phase) % WAVE_COLORS.length], children: ch }, i)
+  )) });
+}
 var FILLED = "\u2588";
 var EMPTY = "\u2591";
 function renderProgress(ratio, width) {
@@ -565,7 +599,7 @@ function bucketActivity(recentTools, now, bins = 12, binMs = 2e3) {
     let idx = Math.floor((t.at - windowStart) / binMs);
     if (idx < 0) idx = 0;
     if (idx >= bins) idx = bins - 1;
-    out[idx]++;
+    out[idx] = (out[idx] ?? 0) + 1;
   }
   return out;
 }
@@ -694,7 +728,7 @@ function FleetMonitor({
         // biome-ignore lint/suspicious/noArrayIndexKey: timeline is rebuilt per render
         /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: `${fmtElapsed(Math.max(0, nowTick - ev.at))} ago`.padEnd(10) }),
-          /* @__PURE__ */ jsx(Text, { color: ev.color, children: ev.icon }),
+          /* @__PURE__ */ jsx(Text, { ...ev.color ? { color: ev.color } : {}, children: ev.icon }),
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: ev.text })
         ] }, i)
       )) }) : null
@@ -1021,8 +1055,8 @@ function AutonomyPicker({
     options.map((opt, i) => /* @__PURE__ */ jsxs(
       Text,
       {
-        color: i === selected ? opt.color : void 0,
         inverse: i === selected,
+        ...i === selected ? { color: opt.color } : {},
         children: [
           i === selected ? "\u203A " : "  ",
           /* @__PURE__ */ jsx(Text, { bold: true, children: opt.label.padEnd(12) }),
@@ -1147,8 +1181,8 @@ function CheckpointTimeline({
       const isSelected = i === selected;
       const label = `[${cp.promptIndex}] ${cp.promptPreview}`;
       return /* @__PURE__ */ jsxs(Box, { children: [
-        /* @__PURE__ */ jsx(Text, { color: isSelected ? "cyan" : void 0, bold: isSelected, children: isSelected ? "\u25B8 " : "  " }),
-        /* @__PURE__ */ jsx(Text, { color: isSelected ? "cyan" : void 0, bold: isSelected, children: label }),
+        /* @__PURE__ */ jsx(Text, { bold: isSelected, ...isSelected ? { color: "cyan" } : {}, children: isSelected ? "\u25B8 " : "  " }),
+        /* @__PURE__ */ jsx(Text, { bold: isSelected, ...isSelected ? { color: "cyan" } : {}, children: label }),
         /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
           " ",
           new Date(cp.ts).toLocaleTimeString()
@@ -1193,7 +1227,7 @@ function hasDiff(input) {
 }
 function renderDiffLine(line) {
   const prefix = line.startsWith("+") ? "green" : line.startsWith("-") ? "red" : line.startsWith("@@") ? "cyan" : void 0;
-  return /* @__PURE__ */ jsxs(Text, { color: prefix, children: [
+  return /* @__PURE__ */ jsxs(Text, { ...prefix ? { color: prefix } : {}, children: [
     line,
     "\n"
   ] }, line);
@@ -1318,7 +1352,7 @@ function FilePicker({ query, matches, selected }) {
       query || "\u2026",
       " \u2014 \u2191/\u2193 select, Enter attach, Esc cancel"
     ] }),
-    matches.map((m, i) => /* @__PURE__ */ jsxs(Text, { color: i === selected ? "cyan" : void 0, inverse: i === selected, children: [
+    matches.map((m, i) => /* @__PURE__ */ jsxs(Text, { inverse: i === selected, ...i === selected ? { color: "cyan" } : {}, children: [
       i === selected ? "\u203A " : "  ",
       highlight(m)
     ] }, m))
@@ -1392,9 +1426,8 @@ function FleetPanel({
     ] }) : null
   ] });
 }
-function helpSections(opts) {
+function helpSections() {
   const nav = [];
-  if (opts.managed) nav.push({ keys: "PgUp/PgDn", desc: "scroll chat history" });
   nav.push(
     { keys: "\u2191/\u2193", desc: "previous / next input (empty prompt)" },
     { keys: "?", desc: "open this help (empty prompt)" }
@@ -1437,10 +1470,8 @@ function helpSections(opts) {
     }
   ];
 }
-function HelpOverlay({
-  managed
-}) {
-  const sections = helpSections({ managed });
+function HelpOverlay() {
+  const sections = helpSections();
   const keyWidth = Math.max(...sections.flatMap((s2) => s2.entries.map((e) => e.keys.length)), 0);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
     /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
@@ -1903,8 +1934,6 @@ function detectLang(fenceInfo) {
   const tag = fenceInfo.trim().toLowerCase().split(/\s+/)[0] ?? "";
   return LANG_ALIASES[tag] ?? "plain";
 }
-
-// src/markdown-table.ts
 var ROW_RE = /^\s*\|.*\|\s*$/;
 var SEP_RE = /^\s*\|[\s\-:|]+\|\s*$/;
 function detectTable(lines, start) {
@@ -1988,14 +2017,14 @@ function computeWidths(allRows, cols, maxWidth, sepWidths) {
       const stripped = stripInlineMarkers(cell);
       const w = longestWord(stripped);
       const total = strWidth(stripped);
-      natural[c] = Math.max(natural[c], w, total);
+      natural[c] = Math.max(expectDefined$1(natural[c]), w, total);
     }
   }
   if (sepWidths) {
     for (let c = 0; c < cols && c < sepWidths.length; c++) {
       const sepW = sepWidths[c];
       if (sepW != null) {
-        natural[c] = Math.max(natural[c], sepW);
+        natural[c] = Math.max(expectDefined$1(natural[c]), sepW);
       }
     }
   }
@@ -2007,14 +2036,14 @@ function computeWidths(allRows, cols, maxWidth, sepWidths) {
     let maxIdx = -1;
     let maxVal = MIN_COL_WIDTH;
     for (let i = 0; i < cols; i++) {
-      const w = widths[i];
+      const w = expectDefined$1(widths[i]);
       if (w > maxVal) {
         maxVal = w;
         maxIdx = i;
       }
     }
     if (maxIdx < 0) break;
-    widths[maxIdx]--;
+    widths[maxIdx] = (widths[maxIdx] ?? 0) - 1;
     sum--;
   }
   return widths;
@@ -2067,7 +2096,7 @@ function strWidth(s2) {
       if (i < len) i++;
       continue;
     }
-    const code = s2.codePointAt(i);
+    const code = expectDefined$1(s2.codePointAt(i));
     const cpLen = code > 65535 ? 2 : 1;
     if (code === 8205 || // ZWJ — Zero Width Joiner (emoji sequences)
     code === 8203 || // ZWSP — Zero Width Space
@@ -2098,7 +2127,6 @@ function strWidth(s2) {
     code >= 8960 && code <= 9215 || // Miscellaneous Technical
     code >= 11088 && code <= 11093 || // Stars and similar
     code >= 10548 && code <= 10549 || // Arrow forms
-    code >= 8592 && code <= 8703 || // Arrows
     code >= 9632 && code <= 9727 || // Geometric Shapes
     code >= 9664 && code <= 9726 || // More Geometric Shapes (includes ▶)
     code >= 9984 && code <= 10175) {
@@ -2310,10 +2338,10 @@ function InlineLine({ tokens, dim }) {
     Text,
     {
       color: t.code ? theme.accent : "white",
-      bold: t.bold,
-      italic: t.italic,
-      strikethrough: t.strike,
-      dimColor: dim,
+      bold: Boolean(t.bold),
+      italic: Boolean(t.italic),
+      strikethrough: Boolean(t.strike),
+      dimColor: Boolean(dim),
       children: t.text
     },
     j
@@ -2938,7 +2966,22 @@ function formatToolOutput(toolName, output, ok, _outputBytes, outputLines) {
 }
 var MAX_STREAM_DISPLAY_CHARS = 480;
 var MAX_STREAM_LINES = 8;
-var ToolStreamBox = React6.memo(function ToolStreamBox2({
+function streamBoxRows(text, maxLines, contentWidth) {
+  const trunc = (line) => line.length > contentWidth ? `${line.slice(0, contentWidth - 1)}\u2026` : line;
+  const lines = text.split("\n");
+  const totalLines = lines.length;
+  const hidden = Math.max(0, totalLines - maxLines);
+  const rows = [];
+  if (hidden > 0) {
+    rows.push({ text: `  \u2026 ${hidden} more line${hidden === 1 ? "" : "s"} above`, italic: true });
+    for (const line of lines.slice(totalLines - (maxLines - 1))) rows.push({ text: trunc(line) });
+  } else {
+    for (let i = 0; i < maxLines - totalLines; i++) rows.push({ text: "" });
+    for (const line of lines) rows.push({ text: trunc(line) });
+  }
+  return rows;
+}
+React6.memo(function ToolStreamBox2({
   name,
   text,
   startedAt,
@@ -2950,11 +2993,10 @@ var ToolStreamBox = React6.memo(function ToolStreamBox2({
     return () => clearInterval(t);
   }, []);
   const elapsedMs = Date.now() - startedAt;
-  const lines = text.split("\n");
-  const totalLines = lines.length;
+  const totalLines = text.split("\n").length;
   const hidden = Math.max(0, totalLines - MAX_STREAM_LINES);
-  const visible = hidden > 0 ? lines.slice(hidden) : lines;
   const contentWidth = Math.max(20, Math.min(termWidth - 4, 100));
+  const rows = streamBoxRows(text, MAX_STREAM_LINES, contentWidth);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 0, children: [
     /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
       /* @__PURE__ */ jsx(Text, { color: theme.warn, children: "\u25C6 " }),
@@ -2962,13 +3004,10 @@ var ToolStreamBox = React6.memo(function ToolStreamBox2({
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: `  \u23F1 ${fmtDuration(elapsedMs)}` }),
       hidden > 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: `  (${totalLines} lines, showing last ${MAX_STREAM_LINES})` }) : null
     ] }),
-    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [
-      hidden > 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, italic: true, children: `  \u2026 ${hidden} more line${hidden === 1 ? "" : "s"} above` }) : null,
-      visible.map((line, i) => {
-        const trimmed = line.length > contentWidth ? `${line.slice(0, contentWidth - 1)}\u2026` : line;
-        return /* @__PURE__ */ jsx(Text, { dimColor: true, children: trimmed || " " }, i);
-      })
-    ] })
+    /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginLeft: 2, children: rows.map((r, i) => (
+      // biome-ignore lint/suspicious/noArrayIndexKey: fixed-height block, index is the row
+      /* @__PURE__ */ jsx(Text, { dimColor: true, italic: Boolean(r.italic), children: r.text || " " }, i)
+    )) })
   ] });
 });
 function tailForDisplay(text, maxChars) {
@@ -3014,9 +3053,15 @@ function CodeBlock({
           // biome-ignore lint/suspicious/noArrayIndexKey: code lines are positional
           /* @__PURE__ */ jsxs(Text, { children: [
             /* @__PURE__ */ jsx(Text, { dimColor: true, children: `${String(i + 1).padStart(gutterW, " ")} ` }),
-            tokens.length === 0 ? " " : tokens.map((t, j) => (
-              // biome-ignore lint/suspicious/noArrayIndexKey: token order is stable per line
-              /* @__PURE__ */ jsx(Text, { color: t.color, dimColor: t.dim, bold: t.bold, children: t.text }, j)
+            tokens.length === 0 ? " " : tokens.map((t, j) => /* @__PURE__ */ jsx(
+              Text,
+              {
+                dimColor: Boolean(t.dim),
+                bold: Boolean(t.bold),
+                ...t.color ? { color: t.color } : {},
+                children: t.text
+              },
+              j
             ))
           ] }, i)
         )),
@@ -3170,7 +3215,22 @@ function AssistantBody({
     )
   ) });
 }
-function AssistantTail({ text }) {
+var ASSISTANT_TAIL_LINES = 8;
+function assistantTailRows(text, tailLines, contentWidth) {
+  const tail = text.split("\n").slice(-tailLines);
+  const rows = [];
+  for (let i = 0; i < tailLines - tail.length; i++) rows.push("");
+  for (const line of tail) {
+    rows.push(line.length > contentWidth ? `${line.slice(0, contentWidth - 1)}\u2026` : line);
+  }
+  return rows;
+}
+function AssistantTail({
+  text,
+  termWidth
+}) {
+  const contentWidth = Math.max(20, termWidth - 3);
+  const rows = assistantTailRows(text, ASSISTANT_TAIL_LINES, contentWidth);
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -3187,7 +3247,10 @@ function AssistantTail({ text }) {
           /* @__PURE__ */ jsx(Text, { bold: true, color: theme.assistant, children: "ASSISTANT" }),
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: "  (streaming\u2026)" })
         ] }),
-        /* @__PURE__ */ jsx(Text, { color: "white", children: text })
+        /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: rows.map((r, i) => (
+          // biome-ignore lint/suspicious/noArrayIndexKey: fixed-height block, index is the row
+          /* @__PURE__ */ jsx(Text, { color: "white", children: r || " " }, i)
+        )) })
       ]
     }
   );
@@ -3350,8 +3413,8 @@ var Entry = React6.memo(function Entry2({
             /* @__PURE__ */ jsx(
               Text,
               {
-                color: !entry.ok || line.startsWith("!") ? "red" : void 0,
                 dimColor: entry.ok && !line.startsWith("!"),
+                ...!entry.ok || line.startsWith("!") ? { color: "red" } : {},
                 children: line
               }
             )
@@ -3484,19 +3547,9 @@ function History({ entries, streamingText, toolStream }) {
   }, [stdout]);
   const termWidth = termSize.columns;
   const tail = streamingText ? tailForDisplay(streamingText, MAX_STREAM_DISPLAY_CHARS) : "";
-  const toolTail = toolStream?.text ? tailForDisplay(toolStream.text, MAX_STREAM_DISPLAY_CHARS) : "";
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Static, { items: entries, children: (entry) => /* @__PURE__ */ jsx(Box, { marginBottom: entry.kind === "turn-summary" ? 1 : 0, children: /* @__PURE__ */ jsx(Entry, { entry, termWidth }) }, entry.id) }),
-    tail ? /* @__PURE__ */ jsx(AssistantTail, { text: tail }) : null,
-    toolTail ? /* @__PURE__ */ jsx(
-      ToolStreamBox,
-      {
-        name: toolStream.name,
-        text: toolTail,
-        startedAt: toolStream.startedAt,
-        termWidth
-      }
-    ) : null
+    tail ? /* @__PURE__ */ jsx(AssistantTail, { text: tail, termWidth }) : null
   ] });
 }
 
@@ -3602,6 +3655,12 @@ function layoutInputRows(prompt, value, cursor, width) {
   if (row.length > 0 || rows.length === 0) rows.push(row);
   return rows;
 }
+function expectDefined3(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function renderRow2(cells, rowKey, promptColor) {
   const out = [];
   let run = "";
@@ -3655,6 +3714,14 @@ function isBackspaceOrDelete(data) {
   if (data === "\x1B[3~") return "delete";
   return null;
 }
+function parseMouseWheel(data) {
+  const m = data.match(new RegExp(`^${String.fromCharCode(27)}\\[<(\\d+);(\\d+);(\\d+)([Mm])$`, "u"));
+  if (!m) return null;
+  const cb = Number.parseInt(expectDefined3(m[1]), 10);
+  if (cb === 64) return 1;
+  if (cb === 65) return -1;
+  return null;
+}
 var EMPTY_KEY = {
   upArrow: false,
   downArrow: false,
@@ -3708,6 +3775,11 @@ function Input({
         onKey("", { ...EMPTY_KEY, delete: true });
         return;
       }
+      const wheelDelta = parseMouseWheel(s2);
+      if (wheelDelta !== null) {
+        onKey("", { ...EMPTY_KEY, wheelDeltaY: wheelDelta });
+        return;
+      }
       const fn = fnKey(s2);
       if (fn !== null) onKey("", { ...EMPTY_KEY, fn });
     };
@@ -3742,46 +3814,6 @@ function Input({
     hint ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: hint }) : null
   ] });
 }
-function hintsFor(ctx) {
-  if (ctx.confirm) {
-    return [
-      { key: "y", label: "yes" },
-      { key: "n", label: "no" },
-      { key: "a", label: "always" },
-      { key: "d", label: "deny" }
-    ];
-  }
-  if (ctx.picker) {
-    return [
-      { key: "\u2191\u2193", label: "move" },
-      { key: "\u21B5", label: "select" },
-      { key: "Esc", label: "cancel" }
-    ];
-  }
-  if (ctx.monitor) {
-    return [
-      { key: "Esc", label: "close" },
-      { key: "^F", label: "fleet" },
-      { key: "^G", label: "agents" },
-      { key: "^T", label: "worktrees" },
-      { key: "F6", label: "todos" }
-    ];
-  }
-  const base = [{ key: "?", label: "help" }];
-  if (ctx.managed) base.push({ key: "PgUp/PgDn", label: "scroll" }, { key: "F5", label: "Settings" });
-  base.push({ key: "^G", label: "agents" }, { key: "^C", label: "stop" });
-  return base;
-}
-function KeyHintBar({ context }) {
-  const hints = hintsFor(context);
-  return /* @__PURE__ */ jsx(Box, { flexDirection: "row", paddingX: 1, children: hints.map((h, i) => (
-    // biome-ignore lint/suspicious/noArrayIndexKey: hints are positional + stable
-    /* @__PURE__ */ jsxs(Box, { flexDirection: "row", marginRight: 2, children: [
-      /* @__PURE__ */ jsx(Text, { color: theme.accent, children: h.key }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: ` ${h.label}` })
-    ] }, i)
-  )) });
-}
 function fmtElapsed2(ms) {
   if (ms < 1e3) return `${ms}ms`;
   if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}s`;
@@ -3816,7 +3848,7 @@ var LiveActivityStrip = React6.memo(function LiveActivityStrip2({
   const running = Object.values(entries).filter((e) => e.status === "running").sort((a, b) => a.startedAt - b.startedAt).slice(0, maxRows);
   if (running.length === 0) {
     if (Object.keys(entries).length === 0) return null;
-    return /* @__PURE__ */ jsx(Box, { flexDirection: "column", paddingX: 1, children: Array.from({ length: maxRows }, (_, i) => /* @__PURE__ */ jsx(Box, { height: 1, children: /* @__PURE__ */ jsx(Text, { children: " " }) }, `empty-${i}`)) });
+    return /* @__PURE__ */ jsx(Box, { flexDirection: "column", paddingX: 1, children: Array.from({ length: maxRows }, (_, slot) => slot).map((slot) => /* @__PURE__ */ jsx(Box, { height: 1, children: /* @__PURE__ */ jsx(Text, { children: " " }) }, `empty-${slot}`)) });
   }
   const now = Date.now();
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 1, children: [
@@ -3890,7 +3922,7 @@ function ModelPicker({
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [
       /* @__PURE__ */ jsx(Text, { color: "cyan", bold: true, children: "\u2501\u2501 Switch model \u2014 Step 1/2: Pick provider \u2501\u2501" }),
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191/\u2193 navigate \xB7 Enter select \xB7 Esc cancel \xB7 Ctrl+C exit" }),
-      providerOptions.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "(no providers with keys \u2014 add one via `wstack auth`)" }) : providerOptions.map((p, i) => /* @__PURE__ */ jsxs(Text, { color: i === selected ? "cyan" : void 0, inverse: i === selected, children: [
+      providerOptions.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "(no providers with keys \u2014 add one via `wstack auth`)" }) : providerOptions.map((p, i) => /* @__PURE__ */ jsxs(Text, { inverse: i === selected, ...i === selected ? { color: "cyan" } : {}, children: [
         i === selected ? "\u203A " : "  ",
         /* @__PURE__ */ jsx(Text, { bold: true, children: p.id.padEnd(28) }),
         /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
@@ -3933,8 +3965,8 @@ function ModelPicker({
         return /* @__PURE__ */ jsxs(
           Text,
           {
-            color: absoluteIndex === selected ? "cyan" : void 0,
             inverse: absoluteIndex === selected,
+            ...absoluteIndex === selected ? { color: "cyan" } : {},
             children: [
               absoluteIndex === selected ? "\u203A " : "  ",
               id
@@ -4173,102 +4205,6 @@ function QueuePanel({ items }) {
     ] })
   ] });
 }
-var MAX_MOUNTED = 500;
-function scrollbarThumb(rows, offset, total) {
-  const scrollable = total > rows;
-  if (!scrollable) return { top: 0, size: rows, scrollable: false };
-  const windowTop = Math.max(0, total - rows - offset);
-  const size = Math.max(1, Math.round(rows / total * rows));
-  const rawTop = Math.round(windowTop / total * rows);
-  const top = Math.max(0, Math.min(rawTop, rows - size));
-  return { top, size, scrollable: true };
-}
-function Scrollbar({
-  rows,
-  offset,
-  total
-}) {
-  const { top: thumbTop, size: thumbSize, scrollable } = scrollbarThumb(rows, offset, total);
-  const cells = [];
-  for (let i = 0; i < rows; i++) {
-    cells.push(i >= thumbTop && i < thumbTop + thumbSize ? "\u2588" : "\u2502");
-  }
-  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginLeft: 1, flexShrink: 0, children: cells.map((c, i) => /* @__PURE__ */ jsx(
-    Text,
-    {
-      color: scrollable ? theme.accent : void 0,
-      dimColor: !scrollable || c === "\u2502",
-      children: c
-    },
-    i
-  )) });
-}
-function ScrollableHistory({
-  entries,
-  streamingText,
-  toolStream,
-  scrollOffset,
-  viewportRows,
-  totalLines,
-  onMeasure,
-  maxWidth
-}) {
-  const { stdout } = useStdout();
-  const rawWidth = stdout?.columns ?? 80;
-  const termWidth = maxWidth ? Math.min(rawWidth, maxWidth) : rawWidth;
-  const tail = streamingText ? tailForDisplay(streamingText, MAX_STREAM_DISPLAY_CHARS) : "";
-  const toolTail = toolStream?.text ? tailForDisplay(toolStream.text, MAX_STREAM_DISPLAY_CHARS) : "";
-  const hiddenCount = Math.max(0, entries.length - MAX_MOUNTED);
-  const shown = hiddenCount > 0 ? entries.slice(-MAX_MOUNTED) : entries;
-  const contentRef = useRef(null);
-  const lastReported = useRef(-1);
-  useLayoutEffect(() => {
-    const node = contentRef.current;
-    if (!node) return;
-    const { height } = measureElement(node);
-    if (height !== lastReported.current) {
-      lastReported.current = height;
-      onMeasure(height);
-    }
-  }, [onMeasure]);
-  const vp = Math.max(1, viewportRows);
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
-    /* @__PURE__ */ jsx(
-      Box,
-      {
-        flexDirection: "column",
-        flexGrow: 1,
-        height: vp,
-        overflowY: "hidden",
-        justifyContent: "flex-end",
-        children: /* @__PURE__ */ jsxs(
-          Box,
-          {
-            ref: contentRef,
-            flexDirection: "column",
-            marginBottom: Math.max(0, scrollOffset),
-            flexShrink: 0,
-            children: [
-              hiddenCount > 0 ? /* @__PURE__ */ jsx(Box, { flexShrink: 0, children: /* @__PURE__ */ jsx(Text, { dimColor: true, italic: true, children: `  \u2191 ${hiddenCount} earlier ${hiddenCount === 1 ? "entry" : "entries"} (scroll lives in this session; full log on disk)` }) }) : null,
-              shown.map((entry) => /* @__PURE__ */ jsx(Box, { marginBottom: entry.kind === "turn-summary" ? 1 : 0, flexShrink: 0, children: /* @__PURE__ */ jsx(Entry, { entry, termWidth }) }, entry.id)),
-              tail ? /* @__PURE__ */ jsx(AssistantTail, { text: tail }) : null,
-              toolTail ? /* @__PURE__ */ jsx(
-                ToolStreamBox,
-                {
-                  name: toolStream.name,
-                  text: toolTail,
-                  startedAt: toolStream.startedAt,
-                  termWidth
-                }
-              ) : null
-            ]
-          }
-        )
-      }
-    ),
-    /* @__PURE__ */ jsx(Scrollbar, { rows: vp, offset: Math.max(0, scrollOffset), total: totalLines })
-  ] });
-}
 var DELAY_PRESETS_MS = [0, 15e3, 3e4, 45e3, 6e4, 12e4];
 var SETTINGS_MODES = ["off", "suggest", "auto"];
 var LOG_LEVELS = ["error", "warn", "info", "debug", "trace"];
@@ -4425,7 +4361,7 @@ function SettingsPicker({
   ];
   const fieldRowIndex = [];
   for (let i = 0; i < rows.length; i++) {
-    if (!rows[i].section) fieldRowIndex.push(i);
+    if (!rows[i]?.section) fieldRowIndex.push(i);
   }
   const VISIBLE_FIELDS = 8;
   const totalFields = fieldRowIndex.length;
@@ -4436,7 +4372,7 @@ function SettingsPicker({
   const sectionFields = [];
   let curHeader = -1;
   for (let i = 0; i < rows.length; i++) {
-    if (rows[i].section) curHeader = i;
+    if (rows[i]?.section) curHeader = i;
     else if (curHeader >= 0) {
       const fieldIdx = fieldRowIndex.indexOf(i);
       if (fieldIdx === -1) continue;
@@ -4465,18 +4401,18 @@ function SettingsPicker({
             "\u2500\u2500 ",
             row.section,
             " \u2500\u2500"
-          ] }, `section-${i}`);
+          ] }, `section-${row.section ?? i}`);
         }
         return null;
       }
       if (fieldAtRow < windowStart || fieldAtRow >= windowEnd) return null;
       const selected = fieldAtRow === field;
-      return /* @__PURE__ */ jsxs(Text, { color: selected ? "yellow" : void 0, inverse: selected, children: [
+      return /* @__PURE__ */ jsxs(Text, { inverse: selected, ...selected ? { color: "yellow" } : {}, children: [
         selected ? "\u203A " : "  ",
         /* @__PURE__ */ jsx(Text, { bold: true, children: (row.label ?? "").padEnd(26) }),
         /* @__PURE__ */ jsx(Text, { color: "cyan", children: String(row.value ?? "").padEnd(12) }),
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: row.detail ?? "" })
-      ] }, `row-${i}`);
+      ] }, `row-${row.label ?? fieldAtRow}`);
     }),
     hasBelow ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: `  \u2193 ${totalFields - windowEnd} field${totalFields - windowEnd === 1 ? "" : "s"} below` }) : null,
     /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Persisted to ~/.wrongstack/config.json" }),
@@ -4485,31 +4421,98 @@ function SettingsPicker({
 }
 function SlashMenu({ query, matches, selected }) {
   const placeholder = query ? `/${query}` : "/";
+  const { stdout } = useStdout();
+  const termRows = stdout?.rows ?? 24;
+  const rows = [];
+  let lastCategory = "";
+  for (let i = 0; i < matches.length; i++) {
+    const m = matches[i];
+    if (m.category !== lastCategory) {
+      lastCategory = m.category;
+      rows.push({ type: "header", category: m.category });
+    }
+    rows.push({ type: "item", match: m, index: i });
+  }
+  const overhead = 1 + 2 + 2 + 2 + 6;
+  const maxBodyRows = Math.max(4, termRows - overhead);
+  const selectedRowIdx = rows.findIndex((r) => r.type === "item" && r.index === selected);
+  const visible = windowRows(rows, selectedRowIdx < 0 ? 0 : selectedRowIdx, maxBodyRows);
+  const hiddenAbove = visible.start;
+  const hiddenBelow = rows.length - visible.end;
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
     /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
       placeholder || "/",
-      " \u2014 \u2191/\u2193 select, Enter dispatch, Tab autocomplete, Esc close"
+      " \u2014 \u2191/\u2193 select, Enter dispatch, Tab autocomplete, Esc close",
+      matches.length > 0 ? `  (${selected + 1}/${matches.length})` : ""
+    ] }),
+    hiddenAbove > 0 && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+      "  ",
+      "\u2191 ",
+      hiddenAbove,
+      " more"
+    ] }),
+    visible.contextHeader && /* @__PURE__ */ jsxs(Text, { bold: true, color: "yellow", dimColor: true, children: [
+      "  ",
+      visible.contextHeader
+    ] }),
+    visible.rows.map((row) => {
+      if (row.type === "header") {
+        return /* @__PURE__ */ jsxs(Text, { bold: true, color: "yellow", dimColor: true, children: [
+          "  ",
+          row.category
+        ] }, `cat-${row.category}`);
+      }
+      const { match: m, index: i } = row;
+      return /* @__PURE__ */ jsxs(Text, { inverse: i === selected, ...i === selected ? { color: "cyan" } : {}, children: [
+        i === selected ? "\u203A " : "  ",
+        /* @__PURE__ */ jsx(Text, { bold: true, children: m.name }),
+        m.argsHint ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+          " ",
+          m.argsHint
+        ] }) : null,
+        /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+          " \u2014 ",
+          m.description
+        ] })
+      ] }, m.name);
+    }),
+    hiddenBelow > 0 && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+      "  ",
+      "\u2193 ",
+      hiddenBelow,
+      " more"
     ] }),
-    matches.map((m, i) => /* @__PURE__ */ jsxs(Text, { color: i === selected ? "cyan" : void 0, inverse: i === selected, children: [
-      i === selected ? "\u203A " : "  ",
-      /* @__PURE__ */ jsx(Text, { bold: true, children: m.name }),
-      m.argsHint ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-        " ",
-        m.argsHint
-      ] }) : null,
-      /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-        " \u2014 ",
-        m.description
-      ] })
-    ] }, m.name)),
     matches.length === 0 && /* @__PURE__ */ jsx(Text, { dimColor: true, children: "No matching commands" })
   ] });
 }
+function windowRows(rows, focus, max) {
+  if (rows.length <= max) {
+    return { rows, start: 0, end: rows.length, contextHeader: null };
+  }
+  let start = focus - Math.floor(max / 2);
+  if (start < 0) start = 0;
+  let end = start + max;
+  if (end > rows.length) {
+    end = rows.length;
+    start = end - max;
+  }
+  let contextHeader = null;
+  if (start > 0) {
+    const first = rows[start];
+    if (first && first.type === "item") {
+      for (let i = start - 1; i >= 0; i--) {
+        const r = rows[i];
+        if (r && r.type === "header") {
+          contextHeader = r.category;
+          break;
+        }
+      }
+    }
+  }
+  return { rows: rows.slice(start, end), start, end, contextHeader };
+}
 function TodosMonitor({ todos }) {
   const { stdout } = useStdout();
-  useInput((_input, key) => {
-    if (key.escape) ;
-  });
   const done = todos.filter((t) => t.status === "completed").length;
   const inProgress = todos.filter((t) => t.status === "in_progress").length;
   const pending = todos.filter((t) => t.status === "pending").length;
@@ -4949,7 +4952,15 @@ function useBrainEvents(events, dispatch) {
       const decision = p.decision.optionId ?? p.decision.text ?? p.decision.reason ?? p.decision.prompt ?? p.decision.type;
       dispatch({ type: "brainStatus", state: status, source: p.request.source, risk: p.request.risk, summary: decision });
       if (status === "ask_human") {
-        dispatch({ type: "brainPromptSet", prompt: { requestId: p.request.id, source: p.request.source, risk: p.request.risk, question: p.request.question, context: p.request.context, options: p.request.options } });
+        const prompt = {
+          requestId: p.request.id,
+          source: p.request.source,
+          risk: p.request.risk,
+          question: p.request.question
+        };
+        if (p.request.context !== void 0) prompt.context = p.request.context;
+        if (p.request.options !== void 0) prompt.options = p.request.options;
+        dispatch({ type: "brainPromptSet", prompt });
       } else {
         dispatch({ type: "brainPromptClear" });
       }
@@ -4969,6 +4980,12 @@ function useBrainEvents(events, dispatch) {
     };
   }, [events, dispatch]);
 }
+function expectDefined4(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var STREAM_COLORS = ["cyan", "magenta", "yellow", "green", "blue"];
 function labelFor(labelsRef, id, name) {
   const m = labelsRef.current;
@@ -4977,7 +4994,7 @@ function labelFor(labelsRef, id, name) {
   const n = m.size + 1;
   const v = {
     label: name && name !== id ? name : `AGENT#${n}`,
-    color: STREAM_COLORS[(n - 1) % STREAM_COLORS.length]
+    color: expectDefined4(STREAM_COLORS[(n - 1) % STREAM_COLORS.length])
   };
   m.set(id, v);
   return v;
@@ -5324,6 +5341,12 @@ function buildSteeringPreamble(snapshot, newDirection) {
 }
 
 // src/app-reducer.ts
+function expectDefined5(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function reducer(state, action) {
   switch (action.type) {
     case "addEntry": {
@@ -5688,13 +5711,13 @@ function reducer(state, action) {
         const i = SETTINGS_MODES.indexOf(sp.mode);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + SETTINGS_MODES.length) % SETTINGS_MODES.length;
-        return { ...state, settingsPicker: { ...sp, mode: SETTINGS_MODES[next], hint: void 0 } };
+        return { ...state, settingsPicker: { ...sp, mode: expectDefined5(SETTINGS_MODES[next]), hint: void 0 } };
       }
       if (f === 1) {
         const j = DELAY_PRESETS_MS.indexOf(sp.delayMs);
         const base = j < 0 ? 0 : j;
         const next = (base + action.delta + DELAY_PRESETS_MS.length) % DELAY_PRESETS_MS.length;
-        return { ...state, settingsPicker: { ...sp, delayMs: DELAY_PRESETS_MS[next], hint: void 0 } };
+        return { ...state, settingsPicker: { ...sp, delayMs: expectDefined5(DELAY_PRESETS_MS[next]), hint: void 0 } };
       }
       if (f === 2) return { ...state, settingsPicker: { ...sp, titleAnimation: !sp.titleAnimation, hint: void 0 } };
       if (f === 3) return { ...state, settingsPicker: { ...sp, yolo: !sp.yolo, hint: void 0 } };
@@ -5712,26 +5735,26 @@ function reducer(state, action) {
         const i = COMPACTOR_STRATEGIES.indexOf(sp.contextStrategy);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + COMPACTOR_STRATEGIES.length) % COMPACTOR_STRATEGIES.length;
-        return { ...state, settingsPicker: { ...sp, contextStrategy: COMPACTOR_STRATEGIES[next], hint: void 0 } };
+        return { ...state, settingsPicker: { ...sp, contextStrategy: expectDefined5(COMPACTOR_STRATEGIES[next]), hint: void 0 } };
       }
       if (f === 15) {
         const i = LOG_LEVELS.indexOf(sp.logLevel);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + LOG_LEVELS.length) % LOG_LEVELS.length;
-        return { ...state, settingsPicker: { ...sp, logLevel: LOG_LEVELS[next], hint: void 0 } };
+        return { ...state, settingsPicker: { ...sp, logLevel: expectDefined5(LOG_LEVELS[next]), hint: void 0 } };
       }
       if (f === 16) {
         const i = AUDIT_LEVELS.indexOf(sp.auditLevel);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + AUDIT_LEVELS.length) % AUDIT_LEVELS.length;
-        return { ...state, settingsPicker: { ...sp, auditLevel: AUDIT_LEVELS[next], hint: void 0 } };
+        return { ...state, settingsPicker: { ...sp, auditLevel: expectDefined5(AUDIT_LEVELS[next]), hint: void 0 } };
       }
       if (f === 17) return { ...state, settingsPicker: { ...sp, indexOnStart: !sp.indexOnStart, hint: void 0 } };
       {
         const j = MAX_ITERATIONS_PRESETS.indexOf(sp.maxIterations);
         const base = j < 0 ? 0 : j;
         const next = (base + action.delta + MAX_ITERATIONS_PRESETS.length) % MAX_ITERATIONS_PRESETS.length;
-        return { ...state, settingsPicker: { ...sp, maxIterations: MAX_ITERATIONS_PRESETS[next], hint: void 0 } };
+        return { ...state, settingsPicker: { ...sp, maxIterations: expectDefined5(MAX_ITERATIONS_PRESETS[next]), hint: void 0 } };
       }
     }
     case "settingsHint":
@@ -6379,7 +6402,12 @@ function reducer(state, action) {
     }
   }
 }
-var MIN_VIEWPORT = 3;
+function expectDefined6(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var INPUT_PROMPT = "\u203A ";
 function selectedSlashCommandLine(picker) {
   if (!picker.open || picker.matches.length === 0) return null;
@@ -6388,15 +6416,16 @@ function selectedSlashCommandLine(picker) {
 }
 function rehydrateHistory(messages, startId) {
   const entries = [];
+  let nextId = startId;
   for (const msg of messages) {
     if (msg.role === "system") continue;
     const text = typeof msg.content === "string" ? msg.content : msg.content.filter((b) => b.type === "text").map((b) => b.text).join("");
     const trimmed = text.trim();
     if (!trimmed) continue;
     if (msg.role === "user") {
-      entries.push({ id: startId++, kind: "user", text: trimmed });
+      entries.push({ id: nextId++, kind: "user", text: trimmed });
     } else if (msg.role === "assistant") {
-      entries.push({ id: startId++, kind: "assistant", text: trimmed });
+      entries.push({ id: nextId++, kind: "assistant", text: trimmed });
     }
   }
   return entries;
@@ -6450,7 +6479,6 @@ function App({
   initialGoal,
   initialAsk,
   sessionsDir,
-  managed = false,
   modeLabel,
   getModeLabel
 }) {
@@ -6467,18 +6495,6 @@ function App({
     setIndexState(getIndexState());
     return onIndexStateChange((next) => setIndexState(next));
   }, []);
-  const { stdout } = useStdout();
-  const [termRows, setTermRows] = useState(stdout?.rows ?? 24);
-  useEffect(() => {
-    const onResize = () => {
-      setTermRows(process.stdout.rows ?? 24);
-    };
-    process.stdout.on("resize", onResize);
-    return () => {
-      process.stdout.off("resize", onResize);
-    };
-  }, []);
-  const [managedLive, setManagedLive] = useState(managed);
   useEffect(() => {
     setHiddenItems(statuslineHiddenItems);
   }, [statuslineHiddenItems]);
@@ -6628,19 +6644,6 @@ function App({
   stateRef.current = state;
   const draftRef = useRef({ buffer: state.buffer, cursor: state.cursor });
   draftRef.current = { buffer: state.buffer, cursor: state.cursor };
-  const bottomRef = useRef(null);
-  React6.useLayoutEffect(() => {
-    if (!managedLive) return;
-    const node = bottomRef.current;
-    if (!node) return;
-    const { height } = measureElement(node);
-    const s2 = stateRef.current;
-    const affordance = s2.scrollOffset > 0 && s2.pendingNewLines > 0 ? 1 : 0;
-    const vp = Math.max(MIN_VIEWPORT, termRows - height - affordance - 1);
-    if (vp !== s2.viewportRows) {
-      dispatch({ type: "setViewportRows", rows: vp });
-    }
-  }, [managedLive, termRows]);
   const handleKeyRef = useRef(null);
   const handleRewindTo = React6.useCallback(
     async (checkpointIndex) => {
@@ -6663,10 +6666,21 @@ function App({
   const startedAtRef = useRef(Date.now());
   const [nowTick, setNowTick] = React6.useState(Date.now());
   useEffect(() => {
-    const t = setInterval(() => setNowTick(Date.now()), 1e3);
+    const t = setInterval(() => setNowTick(Date.now()), 1e4);
     return () => clearInterval(t);
   }, []);
-  const elapsedMs = nowTick - startedAtRef.current;
+  const todosRef = useRef(JSON.stringify([]));
+  useEffect(() => {
+    const poll = () => {
+      const snap = JSON.stringify(agent.ctx.todos.map((t2) => ({ s: t2.status })));
+      if (snap !== todosRef.current) {
+        todosRef.current = snap;
+        setNowTick(Date.now());
+      }
+    };
+    const t = setInterval(poll, 2e3);
+    return () => clearInterval(t);
+  }, [agent.ctx.todos]);
   const [gitInfo, setGitInfo] = React6.useState(null);
   useEffect(() => {
     let cancelled = false;
@@ -6744,7 +6758,7 @@ function App({
     const n = m.size + 1;
     const v = {
       label: name && name !== id ? name : `AGENT#${n}`,
-      color: STREAM_COLORS2[(n - 1) % STREAM_COLORS2.length]
+      color: STREAM_COLORS2[(n - 1) % STREAM_COLORS2.length] ?? "cyan"
     };
     m.set(id, v);
     return v;
@@ -6826,7 +6840,7 @@ function App({
   }, [eraseLiveRegion]);
   React6.useLayoutEffect(() => {
     if (state.enhanceBusy || state.enhance != null) eraseLiveRegion();
-  }, [nowTick, state.enhanceBusy, state.enhance, eraseLiveRegion]);
+  }, [state.enhanceBusy, state.enhance, eraseLiveRegion]);
   useEffect(() => {
     const detected = detectAtToken(state.buffer, state.cursor);
     if (!detected) {
@@ -6858,16 +6872,22 @@ function App({
     }
     const query = trimmed.slice(1).toLowerCase();
     const allCommands = slashRegistry.listWithOwner();
+    const CATEGORY_ORDER = ["Run", "Session", "Inspect", "Agent", "Config", "App"];
     const matches = allCommands.filter(({ cmd }) => {
       const name = cmd.name.toLowerCase();
       const aliases = cmd.aliases ?? [];
       return name.includes(query) || aliases.some((a) => a.toLowerCase().includes(query));
-    }).slice(0, 12).map(({ cmd, owner }) => ({
+    }).map(({ cmd, owner }) => ({
       name: cmd.name,
       description: cmd.description,
       argsHint: cmd.argsHint,
-      isBuiltin: owner === "core"
-    }));
+      isBuiltin: owner === "core",
+      category: cmd.category ?? "App"
+    })).sort((a, b) => {
+      const catDiff = CATEGORY_ORDER.indexOf(a.category) - CATEGORY_ORDER.indexOf(b.category);
+      if (catDiff !== 0) return catDiff;
+      return a.name.localeCompare(b.name);
+    });
     if (!state.slashPicker.open) {
       dispatch({ type: "slashPickerOpen", query, matches });
     } else if (state.slashPicker.query !== query) {
@@ -6999,44 +7019,6 @@ function App({
       getProcessRegistry().killAll();
     };
   }, []);
-  useEffect(() => {
-    const ALT_OFF = "\x1B[?1049l";
-    const ALT_ON = "\x1B[?1049h";
-    const cmd = {
-      name: "altscreen",
-      description: "Toggle the alt-screen buffer. Default is OFF (native scroll); /altscreen on for full-screen mode.",
-      async run(args) {
-        const arg = args.trim().toLowerCase();
-        if (arg === "off") {
-          try {
-            writeOut(ALT_OFF);
-          } catch {
-            return { message: "Failed to exit alt-screen." };
-          }
-          setManagedLive(false);
-          return {
-            message: "Alt-screen disabled. New entries will land in normal scrollback (mouse wheel / Shift+PgUp work). On-screen history rendered before this command is no longer reachable via terminal scroll. Resize may now leak the live region \u2014 `/altscreen on` to re-enable."
-          };
-        }
-        if (arg === "on") {
-          try {
-            writeOut(ALT_ON);
-          } catch {
-            return { message: "Failed to re-enter alt-screen." };
-          }
-          setManagedLive(true);
-          return {
-            message: "Alt-screen re-enabled. Managed scroll (PgUp/PgDn) is now active; native scroll is off."
-          };
-        }
-        return { message: "Usage: /altscreen on|off" };
-      }
-    };
-    slashRegistry.register(cmd);
-    return () => {
-      slashRegistry.unregister("altscreen");
-    };
-  }, [slashRegistry]);
   useEffect(() => {
     const cmd = {
       name: "steer",
@@ -8138,26 +8120,7 @@ function App({
       if (key.escape || input === "?" || input === "q") dispatch({ type: "toggleHelp" });
       return;
     }
-    state.todosMonitorOpen || state.monitorOpen || state.agentsMonitorOpen || state.worktreeMonitorOpen || !!state.autoPhase?.monitorOpen;
     if (inputGateRef.current) return;
-    if (managedLive) {
-      if (key.pageUp) {
-        dispatch({ type: "scrollPage", dir: "up" });
-        return;
-      }
-      if (key.pageDown) {
-        dispatch({ type: "scrollPage", dir: "down" });
-        return;
-      }
-      if (key.ctrl && key.home) {
-        dispatch({ type: "scrollToTop" });
-        return;
-      }
-      if (key.ctrl && key.end) {
-        dispatch({ type: "scrollToBottom" });
-        return;
-      }
-    }
     if (key.escape) {
       const now = Date.now();
       if (state.buffer.length > 0 && now - lastEscAtRef.current < ESC_DOUBLE_PRESS_MS) {
@@ -8692,19 +8655,11 @@ function App({
       return;
     }
     if (key.home) {
-      if (managedLive && buffer.length === 0) {
-        dispatch({ type: "scrollToTop" });
-      } else {
-        setDraft(buffer, 0);
-      }
+      setDraft(buffer, 0);
       return;
     }
     if (key.end) {
-      if (managedLive && buffer.length === 0) {
-        dispatch({ type: "scrollToBottom" });
-      } else {
-        setDraft(buffer, buffer.length);
-      }
+      setDraft(buffer, buffer.length);
       return;
     }
     if (key.upArrow) {
@@ -9178,21 +9133,9 @@ User message:
     if (state.picker.open) return "";
     return "";
   }, [state.buffer, state.status, state.picker.open]);
-  const affordanceShown = managedLive && state.scrollOffset > 0 && state.pendingNewLines > 0;
   const enhanceActive = state.enhanceBusy || state.enhance != null;
-  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", height: managedLive ? termRows : void 0, children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 0, children: [
-    managedLive ? /* @__PURE__ */ jsx(
-      ScrollableHistory,
-      {
-        entries: state.entries,
-        streamingText: state.streamingText,
-        toolStream: state.toolStream,
-        scrollOffset: state.scrollOffset,
-        viewportRows: state.viewportRows || Math.max(MIN_VIEWPORT, termRows - 8),
-        totalLines: state.totalLines,
-        onMeasure: (total) => dispatch({ type: "setMeasuredLines", totalLines: total })
-      }
-    ) : /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 0, children: [
+    /* @__PURE__ */ jsx(
       History,
       {
         entries: state.entries,
@@ -9200,8 +9143,7 @@ User message:
         toolStream: state.toolStream
       }
     ),
-    affordanceShown ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: `  \u2193 ${state.pendingNewLines} new line${state.pendingNewLines === 1 ? "" : "s"} \u2014 PgDn or click to jump to bottom` }) : null,
-    /* @__PURE__ */ jsxs(Box, { ref: managedLive ? bottomRef : void 0, flexDirection: "column", flexShrink: 0, children: [
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [
       /* @__PURE__ */ jsx(LiveActivityStrip, { entries: state.fleet, nowTick }),
       /* @__PURE__ */ jsx(
         Input,
@@ -9277,16 +9219,22 @@ User message:
           hint: state.settingsPicker.hint
         }
       ) : null,
-      state.rewindOverlay ? /* @__PURE__ */ jsx(
-        CheckpointTimeline,
-        {
-          checkpoints: state.rewindOverlay.checkpoints,
-          selected: state.rewindOverlay.selected,
-          onSelect: (i) => dispatch({ type: "rewindOverlayMove", delta: i - state.rewindOverlay.selected }),
-          onConfirm: (i) => handleRewindTo(state.rewindOverlay.checkpoints[i].promptIndex),
-          onClose: () => dispatch({ type: "rewindOverlayClose" })
-        }
-      ) : null,
+      state.rewindOverlay ? (() => {
+        const overlay = state.rewindOverlay;
+        return /* @__PURE__ */ jsx(
+          CheckpointTimeline,
+          {
+            checkpoints: overlay.checkpoints,
+            selected: overlay.selected,
+            onSelect: (i) => dispatch({ type: "rewindOverlayMove", delta: i - overlay.selected }),
+            onConfirm: (i) => {
+              const checkpoint = overlay.checkpoints[i];
+              if (checkpoint) handleRewindTo(checkpoint.promptIndex);
+            },
+            onClose: () => dispatch({ type: "rewindOverlayClose" })
+          }
+        );
+      })() : null,
       state.brainPrompt ? /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginY: 1, flexShrink: 0, children: /* @__PURE__ */ jsx(
         BrainDecisionPrompt,
         {
@@ -9298,7 +9246,7 @@ User message:
         }
       ) }) : null,
       state.confirmQueue.length > 0 && (() => {
-        const head = state.confirmQueue[0];
+        const head = expectDefined6(state.confirmQueue[0]);
         let resolved = false;
         const onDecision = (decision) => {
           if (resolved) return;
@@ -9346,7 +9294,7 @@ User message:
           queueCount: state.queue.length,
           yolo: yoloLive,
           autonomy: autonomyLive,
-          elapsedMs,
+          startedAt: startedAtRef.current,
           todos,
           plan: planCounts ?? void 0,
           fleet: fleetCounts,
@@ -9363,18 +9311,7 @@ User message:
           modeLabel: liveModeLabel || void 0
         }
       ),
-      managedLive ? /* @__PURE__ */ jsx(
-        KeyHintBar,
-        {
-          context: {
-            confirm: state.confirmQueue.length > 0,
-            picker: state.picker.open || state.slashPicker.open || state.modelPicker.open || state.autonomyPicker.open || state.settingsPicker.open || !!state.rewindOverlay,
-            monitor: state.agentsMonitorOpen || state.monitorOpen || state.worktreeMonitorOpen || state.todosMonitorOpen || !!state.autoPhase?.monitorOpen,
-            managed: managedLive
-          }
-        }
-      ) : null,
-      state.helpOpen ? /* @__PURE__ */ jsx(HelpOverlay, { managed: managedLive }) : null,
+      state.helpOpen ? /* @__PURE__ */ jsx(HelpOverlay, {}) : null,
       state.agentsMonitorOpen ? /* @__PURE__ */ jsx(
         AgentsMonitor,
         {
@@ -9401,7 +9338,7 @@ User message:
           nowTick,
           onClose: () => dispatch({ type: "worktreeMonitorToggle" })
         }
-      ) : state.todosMonitorOpen && !managedLive ? /* @__PURE__ */ jsx(TodosMonitor, { todos: agent.ctx.todos }) : state.monitorOpen ? /* @__PURE__ */ jsx(
+      ) : state.todosMonitorOpen ? /* @__PURE__ */ jsx(TodosMonitor, { todos: agent.ctx.todos }) : state.monitorOpen ? /* @__PURE__ */ jsx(
         FleetMonitor,
         {
           entries: state.fleet,
@@ -9531,9 +9468,6 @@ function startTerminalTitle(opts) {
 // src/run-tui.ts
 var BRACKETED_PASTE_ON = "\x1B[?2004h";
 var BRACKETED_PASTE_OFF = "\x1B[?2004l";
-var ALT_SCREEN_ON = "\x1B[?1049h";
-var ALT_SCREEN_OFF = "\x1B[?1049l";
-var CURSOR_HOME = "\x1B[H";
 async function runTui(opts) {
   const stdout = process.stdout;
   const stdin = process.stdin;
@@ -9543,12 +9477,8 @@ async function runTui(opts) {
     );
     return 2;
   }
-  const useAltScreen = opts.altScreen === true;
-  if (useAltScreen) {
-    stdout.write(ALT_SCREEN_ON);
-    stdout.write(CURSOR_HOME);
-  }
   stdout.write(BRACKETED_PASTE_ON);
+  stdout.write("\x1B[2J\x1B[H");
   const inkStdin = stdin;
   const stopTitle = opts.titleAnimation !== false ? startTerminalTitle({ stdout, events: opts.events, model: opts.model }) : (() => {
   });
@@ -9571,9 +9501,6 @@ async function runTui(opts) {
     }
     try {
       stdout.write(BRACKETED_PASTE_OFF);
-      if (useAltScreen) {
-        stdout.write(ALT_SCREEN_OFF);
-      }
     } catch {
     }
   };
@@ -9600,12 +9527,6 @@ async function runTui(opts) {
     const settle = (code) => {
       cleanup();
       detachListeners();
-      if (useAltScreen && opts.onAfterExit) {
-        try {
-          opts.onAfterExit();
-        } catch {
-        }
-      }
       resolve(code);
     };
     let instance;
@@ -9641,7 +9562,7 @@ async function runTui(opts) {
           onExit,
           director: opts.director ?? null,
           fleetRoster: opts.fleetRoster,
-          onClearHistory: opts.onClearHistory ? (dispatch) => opts.onClearHistory(dispatch) : void 0,
+          onClearHistory: opts.onClearHistory ? (dispatch) => opts.onClearHistory?.(dispatch) : void 0,
           fleetStreamController: opts.fleetStreamController,
           enhanceController: opts.enhanceController,
           enhanceEnabled: opts.enhanceController?.enabled ?? true,
@@ -9657,9 +9578,6 @@ async function runTui(opts) {
           getSettings: opts.getSettings,
           saveSettings: opts.saveSettings,
           predictNext: opts.predictNext,
-          // Managed viewport (in-app scroll + collapsibility) follows
-          // alt-screen: it owns the screen, so there's no native-scrollback leak.
-          managed: useAltScreen,
           chime: opts.chime,
           confirmExit: opts.confirmExit,
           modeLabel: opts.modeLabel,
@@ -9676,16 +9594,14 @@ async function runTui(opts) {
       return;
     }
     let detachResize = null;
-    if (!useAltScreen) {
-      const onResize = () => {
-        try {
-          stdout.write("\x1B[J");
-        } catch {
-        }
-      };
-      stdout.on("resize", onResize);
-      detachResize = () => stdout.off("resize", onResize);
-    }
+    const onResize = () => {
+      try {
+        stdout.write("\x1B[J");
+      } catch {
+      }
+    };
+    stdout.on("resize", onResize);
+    detachResize = () => stdout.off("resize", onResize);
     instance.waitUntilExit().then(() => {
       detachResize?.();
       settle(exitCode);