@metaphi-ai/hum 0.2.26 → 0.2.28

package/dist/cli.mjs

@@ -89037,7 +89037,7 @@ var win, MINE, npmFix, NPM_FIX, humHome, versionsDir, versionDir, pkgDir, coreDi
 var init_install = __esm({
   "src/install.js"() {
     win = process.platform === "win32";
-    MINE = true ? "0.2.26" : "";
+    MINE = true ? "0.2.28" : "";
     npmFix = (version = "") => `npm i -g @metaphi-ai/hum@${version || "latest"} --foreground-scripts`;
     NPM_FIX = npmFix("latest");
     humHome = (env3 = process.env) => env3.HUM_HOME || path.join(os3.homedir(), ".hum");
@@ -89382,10 +89382,10 @@ function clientEnv() {
     platform: process.platform,
     arch: process.arch,
     terminal: process.env.TERM_PROGRAM || (process.env.WT_SESSION ? "Windows Terminal" : process.env.TERM || ""),
-    tui: true ? "0.2.26" : ""
+    tui: true ? "0.2.28" : ""
   };
 }
-function startFailure(failures, { npm = /^(node|bun)(\.exe)?$/i.test(String(process.execPath).split(/[\\/]/).pop()), platform: platform2 = process.platform, version = true ? "0.2.26" : "" } = {}) {
+function startFailure(failures, { npm = /^(node|bun)(\.exe)?$/i.test(String(process.execPath).split(/[\\/]/).pop()), platform: platform2 = process.platform, version = true ? "0.2.28" : "" } = {}) {
   const refused = failures.find((f) => f.error && f.error.code !== "ENOENT");
   const fix = npm ? npmFix(version) : updateCommand({ kind: "native" }, platform2);
   if (!refused) {
@@ -90490,18 +90490,24 @@ init_wrap_ansi2();
 await init_markdown();
 var optionRows = (step, options2, width, picks, cursor) => {
   const digits = String(options2.length).length;
-  return options2.flatMap((o, i) => {
-    const lead = `${i === cursor ? "\u203A " : "  "}${String(i + 1).padStart(digits)}. ${step.multi ? `[${picks.includes(o.label) ? "x" : " "}] ` : ""}`;
+  const lines = [];
+  let at = [0, 0];
+  options2.forEach((o, i) => {
+    const lead = `${i === cursor ? "\u203A " : "  "}${String(i + 1).padStart(digits)}. ${step.multi && !o.own ? `[${picks.includes(o.label) ? "x" : " "}] ` : ""}`;
     const said = String(o.description || "");
     const desc = /[\x60*_]/.test(said) ? renderMarkdown(said, 1e3).trim() : said;
     const body = `${source_default.bold(o.label)}${step.default === o.label ? " (default)" : ""}${desc ? source_default.dim(` \u2014 ${desc}`) : ""}`;
-    return wrapAnsi2(body, Math.max(8, width - lead.length), { hard: true, trim: true }).split("\n").map((line, j) => (j ? " ".repeat(lead.length) : i === cursor ? source_default.hex(ACCENT)(lead) : lead) + line);
+    const from = lines.length;
+    lines.push(...wrapAnsi2(body, Math.max(8, width - lead.length), { hard: true, trim: true }).split("\n").map((line, j) => (j ? " ".repeat(lead.length) : i === cursor ? source_default.hex(ACCENT)(lead) : lead) + line));
+    if (i === cursor) at = [from, lines.length];
   });
+  return { lines, at };
 };
+var OWN_ANSWER = { label: "Something else", description: "type your own answer", own: true };
 var cell = (s) => String(s || "").replaceAll("\\", "\\\\").replaceAll("|", "\\|").replace(/\r?\n/g, " ");
 function consultBody(question, step, width, picks = [], cursor = 0) {
   const parts = [];
-  let choices = [];
+  let choices = { lines: [], at: [0, 0] };
   if (question.kind === "constraints") {
     const rows = (question.questions || []).filter((q) => q.id !== "missed");
     if (width >= 60) {
@@ -90520,24 +90526,37 @@ ${q.question}`).join("\n\n"));
     if (step.header) parts.push(`**${step.header}**`);
     parts.push(step.question);
     const options2 = (step.options || []).map((o) => typeof o === "string" ? { label: o } : o);
-    if (question.kind === "decision" && options2.length && width >= 60 && !options2.some((o) => /\n/.test(o.description || ""))) {
-      parts.push([
-        "| # | Choice | Consequences |",
-        "| --- | --- | --- |",
-        ...options2.map((o, i) => `| ${i + 1} | ${cell(o.label)} | ${cell(o.description)} |`)
-      ].join("\n"));
-    } else if (options2.length) {
-      choices = optionRows(step, options2, width, picks, cursor);
-    }
+    if (options2.length) choices = optionRows(step, [...options2, OWN_ANSWER], width, picks, cursor);
   }
-  const read = (md) => md.length ? wrapAnsi2(
-    renderMarkdown(md.filter(Boolean).join("\n\n"), width),
-    width,
-    { hard: true, trim: false }
-  ).split("\n") : [];
   const evidence = question.evidence?.length ? ["**Evidence**\n\n" + question.evidence.join("\n\n")] : [];
-  if (!choices.length) return read([...parts, ...evidence]);
-  return [...read(parts), "", ...choices, ...evidence.length ? ["", ...read(evidence)] : []];
+  const md = [...parts, ...evidence].filter(Boolean);
+  const text = md.length ? wrapAnsi2(renderMarkdown(md.join("\n\n"), width), width, { hard: true, trim: false }).split("\n") : [];
+  return { text, rows: choices.lines, at: choices.at };
+}
+function consultWindow({ text, rows, at }, height, top) {
+  const rowsHeight = Math.min(rows.length, height - (text.length ? 1 : 0));
+  const textHeight = Math.min(text.length, height - rowsHeight);
+  const textStart = Math.max(0, Math.min(top, text.length - textHeight));
+  const rowsStart = at[1] <= rowsHeight ? 0 : Math.min(at[0], rows.length - rowsHeight);
+  return {
+    textHeight,
+    textStart,
+    shownText: text.slice(textStart, textStart + textHeight),
+    shownRows: rows.slice(rowsStart, rowsStart + rowsHeight)
+  };
+}
+function pickOf(step, said) {
+  const word = String(said ?? "").trim();
+  const labels = (step.options || []).map((o) => typeof o === "string" ? o : o.label);
+  const nth = (t) => /^\d+$/.test(t) && Number(t) >= 1 && Number(t) <= labels.length ? labels[Number(t) - 1] : null;
+  if (!word || !labels.length) return { pick: null, why: word };
+  if (step.multi && word.includes(",")) {
+    const each = word.split(",").map((t) => nth(t.trim()));
+    return each.every(Boolean) ? { pick: each.join(", "), why: "" } : { pick: null, why: word };
+  }
+  const head = step.graded ? word.split(/\s+/)[0] : word;
+  const named = nth(head) || labels.find((l) => l.toLowerCase() === word.toLowerCase()) || null;
+  return named ? { pick: named, why: nth(head) ? word.slice(head.length).trim() : "" } : { pick: null, why: word };
 }
 
 // src/wordmark.js
@@ -90868,10 +90887,11 @@ var after = (ms, fn) => {
 
 // src/app.jsx
 var import_jsx_runtime3 = __toESM(require_jsx_runtime(), 1);
-var MINE2 = true ? "0.2.26" : "";
+var MINE2 = true ? "0.2.28" : "";
 var fmtDur = (s) => s < 60 ? `${Math.max(1, Math.round(s))}s` : `${Math.floor(s / 60)}m ${Math.round(s % 60)}s`;
 var plural = (n, w) => `${n} ${w}${n === 1 ? "" : "s"}`;
 var shortSession = (name) => (name || "").replace(/\.jsonl$/, "");
+var PLAN_GLYPH = { completed: "\u2714", in_progress: "\u25A1", pending: "\u25A1" };
 var HYPOTHESIS_GLYPH = { candidate: "\u25FB", testing: "\u25B8", supported: "\u25FC", refuted: "\u2717", superseded: "\u21B7", blocked: "\u2016" };
 var PICKER_ROWS = 8;
 var sessionRows = (p, here) => {
@@ -90977,6 +90997,7 @@ var readPaste = (n) => {
 var DRAFT_TAIL_LINES = 14;
 var LIVE_MIN_ROWS = 3;
 var DEFAULT_ROWS = 24;
+var ELAPSED_TICK_MS = 1e3;
 var liveTail = (text, width, rows) => {
   const l = wrapAnsi2(text, Math.max(20, width), { hard: true, trim: false }).split("\n");
   return l.length <= rows ? l.join("\n") : "\u2026\n" + l.slice(-(rows - 1)).join("\n");
@@ -91043,7 +91064,6 @@ var REWIND_CHOICES = [
 ];
 var ERR_TAIL_LINES = 5;
 var PEEK_LINES = 12;
-var THOUGHT_TAIL_LINES = 3;
 var FILE_DEPTH = 3;
 var FILE_CAP = 200;
 var FILE_ROWS = 8;
@@ -91093,6 +91113,15 @@ var ToolRow = ({ text, tail: tail2 }) => /* @__PURE__ */ (0, import_jsx_runtime3
     tail2 ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: tail2 }) : null
   ] })
 ] });
+var CONTINUES = /* @__PURE__ */ new Set(["tool_result", "diff", "errtail", "spool", "agent_end", "thought"]);
+var continuesBlock = (item) => !!item.agent || CONTINUES.has(item.kind);
+var blockGap = (item) => continuesBlock(item) ? 0 : 1;
+var rowStands = (call) => !!call && (call.lines != null || !!call.diff);
+var callLabel = (ev) => ev.lines != null ? `${ev.desc || ev.name}  (${ev.lines} lines)` : ev.desc || ev.name;
+var Hang = ({ lead, children }) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { children: [
+  /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Box2, { width: lead.length, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: lead }) }),
+  /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { children })
+] });
 var tickTail = (t0) => {
   const s = Math.floor((Date.now() - t0) / 1e3);
   return s >= 1 ? ` \xB7 ${fmtDur(s)}` : "";
@@ -91132,6 +91161,7 @@ function App2({ core: core2, task, resume, images = [], peek = peekSession, upda
   const [transcriptEpoch, setTranscriptEpoch] = (0, import_react38.useState)(0);
   const [phase, setPhase] = (0, import_react38.useState)("connecting");
   const [status, setStatus] = (0, import_react38.useState)("");
+  const [statusOf, setStatusOf] = (0, import_react38.useState)("");
   const [hello, setHello] = (0, import_react38.useState)(null);
   const [latest, setLatest] = (0, import_react38.useState)(null);
   const [ready, setReady] = (0, import_react38.useState)("");
@@ -91144,7 +91174,7 @@ function App2({ core: core2, task, resume, images = [], peek = peekSession, upda
   const [looking, setLooking] = (0, import_react38.useState)(null);
   const lookRef = (0, import_react38.useRef)(null);
   const [draft, setDraft] = (0, import_react38.useState)("");
-  const [thinking, setThinking] = (0, import_react38.useState)("");
+  const [planSteps, setPlanSteps] = (0, import_react38.useState)([]);
   const [value, setValue] = (0, import_react38.useState)("");
   const [menuIndex, setMenuIndex] = (0, import_react38.useState)(0);
   const [atShut, setAtShut] = (0, import_react38.useState)("");
@@ -91180,9 +91210,12 @@ function App2({ core: core2, task, resume, images = [], peek = peekSession, upda
   const turnT0 = (0, import_react38.useRef)(null);
   const thinkT0 = (0, import_react38.useRef)(null);
   const thinkChars = (0, import_react38.useRef)(0);
+  const thinkText = (0, import_react38.useRef)("");
   const draftRef = (0, import_react38.useRef)("");
   const thoughtRef = (0, import_react38.useRef)(null);
+  const ledRef = (0, import_react38.useRef)(null);
   const toolsRef = (0, import_react38.useRef)({});
+  const proposedRef = (0, import_react38.useRef)(/* @__PURE__ */ new Set());
   const historyRef = (0, import_react38.useRef)(loadHistory());
   const modelRef = (0, import_react38.useRef)("");
   const heldRef = (0, import_react38.useRef)({ reads: [], calls: [] });
@@ -91258,7 +91291,7 @@ ${r.content}`).join("\n\n") };
       return true;
     }
     printHeld(rest);
-    push(rowOf2(keepOut(ev.name, ev.content)));
+    if (rowOf2) push(rowOf2(keepOut(ev.name, ev.content)));
     return false;
   };
   const setAsks = (next) => {
@@ -91283,6 +91316,16 @@ ${r.content}`).join("\n\n") };
     summary: ev.summary || "",
     evidence: ev.evidence || []
   });
+  const ASK_TITLES = { decision: "Decision", review: "Review", constraints: "Constraints" };
+  const answeredItem = (ask, ev) => {
+    const qs = ask ? ask.questions && ask.questions.length ? ask.questions : [{ id: ask.id, question: ask.question, options: ask.options, default: ask.default }] : [];
+    const given = ev.answers || {};
+    const entries = qs.filter((q) => given[q.id]).map((q) => ({ question: q.question, ...pickOf(q, given[q.id]) }));
+    const whole = entries.length ? [] : [{ question: "", pick: null, why: String(given.reply ?? ev.answer ?? "") }];
+    const count = qs.length > 1 && entries.length ? `${entries.length}/${qs.length} ` : "";
+    const via = ev.via ? ` \xB7 from ${ev.via[0].toUpperCase()}${ev.via.slice(1)}` : "";
+    return { kind: "answered", title: `\u2726 ${ASK_TITLES[ask?.kind] || "Clarification"} \xB7 ${count}answered${via}`, entries: [...entries, ...whole] };
+  };
   const addAsk = (ev) => {
     if (asksRef.current.some((q) => q.id === ev.id)) return;
     const shown = asksRef.current.length > 0;
@@ -91300,26 +91343,30 @@ ${r.content}`).join("\n\n") };
   const stepLabels = stepOptions.map((o) => o.label);
   const listAsk = !!(question && question.kind === "constraints" && question.questions && question.questions.length);
   const listRows = listAsk ? question.questions.filter((q) => q.id !== "missed") : [];
-  const typedRow = /^[1-9]$/.test(value.trim()) && Number(value.trim()) <= stepLabels.length ? Number(value.trim()) - 1 : null;
-  const choiceRow = step && !step.multi && !listAsk && question.kind !== "decision" ? typedRow ?? qChoice ?? stepLabels.indexOf(step.default) : -1;
-  const consultLines = (0, import_react38.useMemo)(
-    () => question && step ? consultBody(question, step, Math.max(20, width - 4), qPicks, step.multi ? qCursor : choiceRow) : [],
+  const typedHead = step && step.graded ? value.trim().split(/\s+/)[0] : value.trim();
+  const typedRow = /^[1-9]$/.test(typedHead) && Number(typedHead) <= stepLabels.length ? Number(typedHead) - 1 : null;
+  const choiceRow = step && !step.multi && !listAsk ? typedRow ?? qChoice ?? stepLabels.indexOf(step.default) : -1;
+  const ownRow = stepLabels.length;
+  const ownMarked = !!(step && ownRow && !listAsk && typedRow === null && (step.multi ? qCursor : qChoice) === ownRow);
+  const markedPick = step && step.graded && !step.multi && !listAsk && qChoice !== null && qChoice < ownRow ? qChoice + 1 : 0;
+  const consult = (0, import_react38.useMemo)(
+    () => question && step ? consultBody(question, step, Math.max(20, width - 4), qPicks, step.multi ? qCursor : choiceRow) : { text: [], rows: [], at: [0, 0] },
     [question, step, width, qPicks, qCursor, choiceRow]
   );
-  const choosing = !!(step && stepLabels.length && !listAsk && question.kind !== "decision");
+  const choosing = !!(step && stepLabels.length && !listAsk);
   const askHint = step && !listAsk ? fitStatus([
     choosing && { text: step.multi ? "a number ticks" : step.graded ? "\u2191\u2193 or a number marks" : "\u2191\u2193 or a number chooses on Enter" },
     choosing && step.multi && { text: "space ticks the one marked", drop: 3 },
     choosing && !step.multi && step.graded && { text: "words after it if you like", drop: 3 },
     !step.graded && { text: "type or paste your answer", drop: 2 },
     !step.graded && { text: "Alt+Enter adds a line", drop: 1 },
-    !step.multi && qChoice !== null ? { text: "enter takes the one marked" } : step.default && { text: "enter takes the default" },
+    ownMarked ? null : !step.multi && qChoice !== null ? { text: "enter takes the one marked" } : step.default && { text: "enter takes the default" },
     !step.default && step.optional && (step.multi || qChoice === null) && { text: "enter says nothing" },
     step.multi && stepLabels.length && { text: "enter takes what is ticked" },
     step.secret && { text: "it is not shown and not recorded" }
   ], width - 4) : "";
   const consultHeight = Math.max(4, Math.min(18, Math.floor((stdout?.rows || DEFAULT_ROWS) / 2)));
-  const consultStart = Math.min(consultTop, Math.max(0, consultLines.length - consultHeight));
+  const consultView = consultWindow(consult, consultHeight, consultTop);
   const menu = !question && value.trimStart().startsWith("/") && !value.includes(" ") ? COMMANDS.filter((c) => c.name.startsWith(value.trim())) : [];
   const atTyped = !question && !menu.length && !search ? (value.match(AT_TAIL) || [])[1] || "" : "";
   const atWord = atTyped === atShut ? "" : atTyped;
@@ -91339,15 +91386,23 @@ ${r.content}`).join("\n\n") };
     if (phase !== "busy" && phase !== "connecting") return void 0;
     const started = Date.now();
     setElapsed(0);
-    const t = setInterval(() => setElapsed(Math.floor((Date.now() - started) / 1e3)), 1e3);
-    return () => clearInterval(t);
+    let ticks = 0;
+    let off = () => {
+    };
+    const tick = () => {
+      ticks += 1;
+      setElapsed(Math.max(ticks, Math.floor((Date.now() - started) / ELAPSED_TICK_MS)));
+      off = after2(ELAPSED_TICK_MS, tick);
+    };
+    off = after2(ELAPSED_TICK_MS, tick);
+    return () => off();
   }, [phase]);
   const foldThinking = () => {
     if (thinkChars.current > 0) {
       const secs = thinkT0.current ? (Date.now() - thinkT0.current) / 1e3 : 0;
-      thoughtRef.current = { kind: "thought", text: `thought for ${fmtDur(secs)}` };
+      thoughtRef.current = { kind: "thought", text: `thought for ${fmtDur(secs)}`, whole: thinkText.current };
     }
-    setThinking("");
+    thinkText.current = "";
     thinkChars.current = 0;
     thinkT0.current = null;
   };
@@ -91363,8 +91418,10 @@ ${r.content}`).join("\n\n") };
     setDraft("");
     draftRef.current = "";
     thoughtRef.current = null;
-    setThinking("");
+    ledRef.current = null;
+    thinkText.current = "";
     thinkChars.current = 0;
+    setPlanSteps([]);
     setProposal(null);
     setAsks([]);
     pendingAsk.current = null;
@@ -91412,14 +91469,14 @@ ${r.content}`).join("\n\n") };
       append({ kind: "warn", text: `could not look at ${row.name}: ${e.message}` });
     }
   };
+  const thoughtRow = (text, whole) => ({ kind: "thought", text: whole ? `${text}  (ctrl+o expands \xB7 #${keepOut("thought", whole)})` : text });
   const flushDraft = () => {
     const d = draftRef.current.trim();
     draftRef.current = "";
     if (d) append({ kind: "hum", text: d });
-    if (thoughtRef.current) {
-      append(thoughtRef.current);
-      thoughtRef.current = null;
-    }
+    if (d && ledRef.current) append(thoughtRow(ledRef.current.text, ledRef.current.whole));
+    ledRef.current = null;
+    thoughtRef.current = null;
     setDraft("");
   };
   const handle = (ev) => {
@@ -91436,6 +91493,7 @@ ${r.content}`).join("\n\n") };
         case "busy":
           setPhaseBoth("busy");
           setStatus(ev.phase || "");
+          setStatusOf(ev.of || "");
           return;
         case "plan":
         case "hypotheses":
@@ -91487,6 +91545,7 @@ ${r.content}`).join("\n\n") };
           if (ev.busy) {
             setPhaseBoth("busy");
             setStatus(ev.phase || "");
+            setStatusOf("");
           } else {
             foldThinking();
             flushDraft();
@@ -91516,6 +91575,7 @@ ${r.content}`).join("\n\n") };
           if (ev.busy) {
             setPhaseBoth("busy");
             setStatus(ev.phase || "");
+            setStatusOf("");
             turnT0.current = Date.now();
           } else setPhaseBoth("idle");
         }
@@ -91543,25 +91603,34 @@ ${r.content}`).join("\n\n") };
           break;
         }
         const ordered = [];
+        let thought = null;
         for (const it of ev.items || []) {
-          const prev = ordered[ordered.length - 1];
-          if (it.type === "text" && prev && prev.type === "thought") ordered.splice(ordered.length - 1, 0, it);
-          else ordered.push(it);
+          if (it.type === "thought") {
+            thought = it;
+            continue;
+          }
+          ordered.push(it);
+          if (it.type === "text" && thought) ordered.push(thought);
+          thought = null;
         }
         for (const it of ordered) {
           switch (it.type) {
             case "you":
               append({ kind: "you", text: it.text, images: it.images || [] });
               break;
+            case "question_closed":
+              append(answeredItem(it.ask ? askOf(it.ask) : null, it));
+              break;
+            // the block it left live
             case "text":
               append({ kind: "hum", text: it.text });
               break;
             case "thought":
-              append({ kind: "thought", text: `thought for ${fmtDur(it.secs || 0)}` });
+              append(thoughtRow(`thought for ${fmtDur(it.secs || 0)}`, it.text));
               break;
             case "tool_call": {
               toolsRef.current[it.id] = it;
-              const row = { kind: "tool", text: it.name === "write_file" && it.lines != null ? `${it.desc || it.name}  (${it.lines} lines)` : it.desc || it.name, name: it.name, args: it.args, agent: it.agent };
+              const row = { kind: "tool", text: callLabel(it), name: it.name, args: it.args, agent: it.agent };
               if (it.agent || it.diff) append(row);
               else holdCall(it, row);
               if (it.diff) {
@@ -91574,14 +91643,13 @@ ${r.content}`).join("\n\n") };
               const more = (n) => (it.lines || 0) > 1 ? `  (+${it.lines - 1} lines${n ? ` \xB7 #${n}` : ""})` : "";
               const rowOf2 = (n) => ({ kind: "tool_result", text: `${it.summary || "(no output)"}${more(n)}`, isError: !it.ok, agent: it.agent });
               if (it.agent) append(rowOf2(0));
-              else landResult(it, rowOf2);
+              else landResult(it, it.ok && rowStands(toolsRef.current[it.id]) ? null : rowOf2);
               break;
             }
-            case "plan": {
-              const glyph = { completed: "\u25FC", in_progress: "\u25B8", pending: "\u25FB" };
-              append({ kind: "plan", steps: (it.steps || []).map((st) => ({ ...st, glyph: glyph[st.status] || "\u25FB" })), explanation: it.explanation });
+            case "plan":
+              if (!it.agent) setPlanSteps(it.steps || []);
+              append({ kind: "plan", steps: (it.steps || []).map((st) => ({ ...st, glyph: PLAN_GLYPH[st.status] || PLAN_GLYPH.pending })), explanation: it.explanation });
               break;
-            }
             case "hypotheses":
               append({ kind: "hypotheses", hypotheses: (it.hypotheses || []).map((h) => ({ ...h, glyph: HYPOTHESIS_GLYPH[h.status] || "\u25FB" })), explanation: it.explanation });
               break;
@@ -91662,6 +91730,7 @@ ${r.content}`).join("\n\n") };
       case "busy":
         setPhaseBoth("busy");
         setStatus(ev.phase || "");
+        setStatusOf(ev.of || "");
         break;
       case "idle":
         setPhaseBoth("idle");
@@ -91671,22 +91740,25 @@ ${r.content}`).join("\n\n") };
       case "reasoning_delta":
         if (!thinkT0.current) thinkT0.current = Date.now();
         thinkChars.current += ev.text.length;
-        setThinking((t) => t + ev.text);
+        thinkText.current += ev.text;
         break;
       case "text_delta":
-        if (thinkChars.current > 0) foldThinking();
+        if (thinkChars.current > 0) {
+          foldThinking();
+          ledRef.current = thoughtRef.current;
+        }
         draftRef.current += ev.text;
         setDraft((d) => d + ev.text);
         break;
       case "tool_pending":
         break;
-      // the status line already shows it; the call itself lands as a transcript line
+      // the call itself lands as a transcript line
       case "tool_call": {
         foldThinking();
         flushDraft();
         toolsRef.current[ev.id] = ev;
-        const label = ev.name === "write_file" && ev.lines != null ? `${ev.desc || ev.name}  (${ev.lines} lines)` : ev.desc || ev.name;
-        const row = { kind: "tool", text: label, name: ev.name, args: ev.args };
+        if (proposedRef.current.delete(ev.id)) break;
+        const row = { kind: "tool", text: callLabel(ev), name: ev.name, args: ev.args };
         if (ev.diff) append(row);
         else holdCall(ev, row);
         if (ev.diff) {
@@ -91698,7 +91770,8 @@ ${r.content}`).join("\n\n") };
       case "tool_result": {
         if (ev.ok && (ev.name === "write_file" || ev.name === "edit_file")) wroteRef.current = true;
         const more = (n) => (ev.lines || 0) > 1 ? `  (+${ev.lines - 1} lines \xB7 ctrl+o expands \xB7 #${n})` : "";
-        if (landResult(ev, (n) => ({ kind: "tool_result", text: `${ev.summary || "(no output)"}${more(n)}`, isError: !ev.ok }))) break;
+        const rowOf2 = (n) => ({ kind: "tool_result", text: `${ev.summary || "(no output)"}${more(n)}`, isError: !ev.ok });
+        if (landResult(ev, ev.ok && rowStands(toolsRef.current[ev.id]) ? null : rowOf2)) break;
         if (!ev.ok && ev.diagnostics && ev.diagnostics.length) {
           push({ kind: "errtail", lines: ev.diagnostics.map(diagLine) });
         } else if (!ev.ok && ev.content) {
@@ -91711,8 +91784,8 @@ ${r.content}`).join("\n\n") };
       case "plan": {
         foldThinking();
         flushDraft();
-        const glyph = { completed: "\u25FC", in_progress: "\u25B8", pending: "\u25FB" };
-        append({ kind: "plan", steps: (ev.steps || []).map((st) => ({ ...st, glyph: glyph[st.status] || "\u25FB" })), explanation: ev.explanation });
+        setPlanSteps(ev.steps || []);
+        append({ kind: "plan", steps: (ev.steps || []).map((st) => ({ ...st, glyph: PLAN_GLYPH[st.status] || PLAN_GLYPH.pending })), explanation: ev.explanation });
         break;
       }
       case "hypotheses": {
@@ -91725,34 +91798,41 @@ ${r.content}`).join("\n\n") };
         foldThinking();
         flushDraft();
         (ev.calls || []).forEach((c) => {
-          if (c.diff) append({ kind: "output", name: `${c.desc} \xB7 the whole change`, lines: c.diff.split("\n"), diff: true });
+          if (!c.diff || proposedRef.current.has(c.id)) return;
+          proposedRef.current.add(c.id);
+          append({ kind: "tool", text: callLabel(c), name: c.name, args: c.args });
+          append({ kind: "diff", lines: c.diff.split("\n"), more: 0 });
         });
         setProposal({ content: ev.content || "", calls: ev.calls || [], remember: ev.remember || [], remember_text: ev.remember_text || "", agent: ev.agent || null });
         setStatus("waiting for your decision");
+        setStatusOf("");
         break;
       case "question":
         foldThinking();
         flushDraft();
         addAsk(ev);
         break;
-      case "question_closed":
+      case "question_closed": {
         if (pendingAsk.current?.id === ev.id) {
-          append({ kind: "you", text: pendingAsk.current.display });
           pendingAsk.current = null;
           setSendingAsk(null);
           setValue("");
         }
+        const closing = asksRef.current.find((q) => q.id === ev.id);
+        if (closing) append(answeredItem(closing, ev));
         dropAsk(ev.id);
-        append({ kind: "info", text: `answered: ${ev.answer}` });
         break;
+      }
       case "mcp":
         append({ kind: "mcp", servers: ev.servers || [] });
         break;
       case "memory": {
         const items2 = ev.items || [];
-        append({ kind: "info", text: `memory: ${ev.dir}${items2.some((i) => i.source === "repo") ? ` \xB7 shared: ${ev.repo_dir}` : ""}` });
-        if (!items2.length) append({ kind: "info", text: "nothing remembered yet; the model writes here with remember, and you may edit the files by hand" });
-        for (const it of items2) append({ kind: "info", text: `  ${it.name} (${it.type}${it.source === "repo" ? ", shared" : ""}): ${it.description}` });
+        append({ kind: "info", text: [
+          `memory: ${ev.dir}${items2.some((i) => i.source === "repo") ? ` \xB7 shared: ${ev.repo_dir}` : ""}`,
+          ...items2.length ? [] : ["nothing remembered yet; the model writes here with remember, and you may edit the files by hand"],
+          ...items2.map((it) => `  ${it.name} (${it.type}${it.source === "repo" ? ", shared" : ""}): ${it.description}`)
+        ].join("\n") });
         break;
       }
       case "reflection":
@@ -91816,8 +91896,10 @@ ${r.content}`).join("\n\n") };
       case "rewind": {
         setConfirm(null);
         const did = [ev.files ? "the files" : null, ev.conversation ? "the conversation" : null].filter(Boolean).join(" and ");
-        append({ kind: "info", text: `back to \u201C${(ev.said || "").slice(0, 60)}\u201D \xB7 ${did} restored` });
-        if (ev.stat) append({ kind: "info", text: `  ${String(ev.stat).split("\n").filter((l) => l.trim()).join("\n  ")}` });
+        append({ kind: "info", text: [
+          `back to \u201C${(ev.said || "").slice(0, 60)}\u201D \xB7 ${did} restored`,
+          ...String(ev.stat || "").split("\n").filter((l) => l.trim()).map((l) => `  ${l}`)
+        ].join("\n") });
         break;
       }
       case "goal":
@@ -91960,6 +92042,8 @@ ${r.content}`).join("\n\n") };
       exit();
     }, 2500);
   };
+  const answering = !!(proposal || question || picker || confirm || trust || looking || reflection || search);
+  const escOwned = answering || files.length > 0 || panelIndex >= 0;
   use_input_default((input, key) => {
     hereNow();
     if (key.ctrl && input === "c") {
@@ -92108,28 +92192,34 @@ ${r.content}`).join("\n\n") };
     if (question && step && !picker) {
       if (key.pageDown || key.pageUp) {
         setConsultTop(Math.max(0, Math.min(
-          consultLines.length - consultHeight,
-          consultStart + (key.pageDown ? consultHeight : -consultHeight)
+          consult.text.length - consultView.textHeight,
+          consultView.textStart + (key.pageDown ? consultView.textHeight : -consultView.textHeight)
         )));
         return;
       }
       if (key.escape || sendingAsk) return;
-      if (!listAsk && question.kind !== "decision") {
+      if (!listAsk) {
         const n = stepLabels.length;
+        const rows2 = n ? n + 1 : 0;
         if (step.multi && n && !value.trim()) {
           if (key.upArrow) {
-            setQCursor((c) => (c + n - 1) % n);
+            setQCursor((c) => (c + rows2 - 1) % rows2);
             return;
           }
           if (key.downArrow || key.tab) {
-            setQCursor((c) => (c + 1) % n);
+            setQCursor((c) => (c + 1) % rows2);
             return;
           }
           if (input === " " && !value.trim()) {
-            togglePick(stepLabels[Math.min(qCursor, n - 1)]);
+            if (qCursor < n) togglePick(stepLabels[qCursor]);
             return;
           }
         }
+        if (n && !value.trim() && input === String(rows2)) {
+          if (step.multi) setQCursor(n);
+          else setQChoice(n);
+          return;
+        }
         if (step.multi && !value.trim() && /^[1-9]$/.test(input) && Number(input) <= n) {
           const label = stepLabels[Number(input) - 1];
           setQCursor(Number(input) - 1);
@@ -92138,15 +92228,16 @@ ${r.content}`).join("\n\n") };
         }
         if (!step.multi && n && !value.trim()) {
           if (key.upArrow) {
-            setQChoice(choiceRow < 0 ? n - 1 : (choiceRow + n - 1) % n);
+            setQChoice(choiceRow < 0 ? rows2 - 1 : (choiceRow + rows2 - 1) % rows2);
             return;
           }
           if (key.downArrow) {
-            setQChoice((choiceRow + 1) % n);
+            setQChoice((choiceRow + 1) % rows2);
             return;
           }
         }
         if (key.return && !key.meta && !key.shift && !value.trim()) {
+          if (ownMarked) return;
           if (!step.multi && qChoice !== null) {
             answerStep(String(qChoice + 1));
             return;
@@ -92229,7 +92320,6 @@ ${r.content}`).join("\n\n") };
       else if (key.tab) setValue(menu[Math.min(menuIndex, menu.length - 1)].name + " ");
       return;
     }
-    const answering = !!(proposal || question || picker || confirm || trust || looking || reflection || search);
     if (key.tab && phaseRef.current === "busy" && !answering && value.trim() && !/^[/!]/.test(value.trim())) {
       const raw = value.trim();
       remember(raw);
@@ -92292,9 +92382,9 @@ ${r.content}`).join("\n\n") };
     setValue("");
     setQPicks((ps) => ps.includes(label) ? ps.filter((x) => x !== label) : [...ps, label]);
   };
-  const submitAsk = (payload, display) => {
+  const submitAsk = (payload) => {
     if (!question || pendingAsk.current) return;
-    pendingAsk.current = { id: question.id, display };
+    pendingAsk.current = { id: question.id };
     setSendingAsk(question.id);
     if (core2.send({ cmd: "answer", id: question.id, ...payload }) === false) {
       pendingAsk.current = null;
@@ -92305,22 +92395,20 @@ ${r.content}`).join("\n\n") };
   const holdAll = () => {
     if (!listAsk) return;
     const answers = Object.fromEntries(question.questions.map((q) => [q.id, q.id === "missed" ? "" : "holds"]));
-    submitAsk({ answers }, `held all ${listRows.length} as stated`);
+    submitAsk({ answers });
   };
   const answerWhole = (text) => {
     if (!text.trim() || /^\d+$/.test(text.trim())) {
       append({ kind: "warn", text: "say what the number means, or type /hold to confirm every constraint" });
       return;
     }
-    submitAsk({ text }, text);
+    submitAsk({ text });
   };
   const answerStep = (text) => {
     if (!question || !step) return;
-    const display = step.secret ? "(kept to yourself)" : text || (step.default ? `(the default: ${step.default})` : "(nothing)");
     const answers = { ...qAnswers, [step.id]: text };
     if (qStep + 1 < steps.length) {
       setValue("");
-      append({ kind: "you", text: display });
       setQAnswers(answers);
       setQStep(qStep + 1);
       setConsultTop(0);
@@ -92329,7 +92417,7 @@ ${r.content}`).join("\n\n") };
       setQChoice(null);
       return;
     }
-    submitAsk({ answers }, display);
+    submitAsk({ answers });
   };
   const vote = (polarity, why2 = "") => {
     core2.send({ cmd: polarity > 0 ? "accept" : "reject", ...why2 ? { why: why2 } : {} });
@@ -92549,7 +92637,7 @@ ${r.content}`).join("\n\n") };
     if (question && step && !/^\/(quit|exit|stop)\b/.test(raw)) {
       if (listAsk && text === "/hold") holdAll();
       else if (listAsk) answerWhole(text);
-      else answerStep(text);
+      else answerStep(markedPick && text.trim() && typedRow === null ? `${markedPick} ${text.trim()}` : text);
       return;
     }
     if (reflection) closeReflection(reflection.id, "dismiss");
@@ -92580,13 +92668,18 @@ ${r.content}`).join("\n\n") };
     !ctrlc && question && step && !step.secret && { text: "ctrl+g editor", drop: 2 },
     ctrlc ? { text: "ctrl+c again to quit" } : { text: "/ for commands", drop: 1 }
   ], width);
-  const spinnerLabel = phase === "connecting" ? " starting \u2026" : ` ${status || "working"}${elapsed >= 2 ? ` \xB7 ${fmtDur(elapsed)}` : ""}` + (thinkChars.current > 4e3 ? ` \xB7 ${(thinkChars.current / 1e3).toFixed(0)}k thinking` : "");
+  const stepAt = planSteps.findIndex((st) => st.status === "in_progress");
+  const phaseWord = statusOf === "tool" ? "" : status;
+  const doing = [stepAt >= 0 ? `${stepAt + 1}/${planSteps.length} \xB7 ${planSteps[stepAt].step}` : "", phaseWord].filter(Boolean).join(" \xB7 ") || "working";
+  const beside = [elapsed >= 1 ? fmtDur(elapsed) : "", escOwned ? "" : "esc to interrupt"].filter(Boolean).join(" \xB7 ");
+  const spinnerLabel = phase === "connecting" ? " starting \u2026" : ` ${doing}${beside ? ` (${beside})` : ""}`;
+  const spinnerRows = wrapAnsi2(spinnerLabel, Math.max(1, width - 1), { hard: true, trim: false }).split("\n").length;
   const rows = stdout?.rows || DEFAULT_ROWS;
   const heldRows = [...foldRows(held.reads), ...held.calls.map((c) => c.item)];
-  const chrome = 1 + 2 + heldRows.length + 4 + (value.split("\n").length - 1) + 1 + (menu.length ? menu.length : 0) + files.length + (!menu.length && !files.length && agents.length ? agents.length + 1 : 0) + (looking ? 4 + (looking.question ? (looking.question.options || []).length + 2 : Math.min(PEEK_LINES, looking.lines.length) + 1) : 0) + (question && step ? 9 + Math.min(consultHeight, consultLines.length) : 0) + (proposal ? 4 + proposal.calls.length * (1 + Math.min(DIFF_TAIL_LINES, 8)) : 0) + (reflection ? 8 + reflection.details.split("\n").length : 0) + (confirm ? 4 + Math.min(8, String(confirm.stat || "").split("\n").length) : 0) + (trust ? 4 + trust.starts.length : 0) + (picker ? 14 : 0);
+  const chrome = 1 + 1 + spinnerRows + heldRows.reduce((n, r) => n + 1 + blockGap(r), 0) + 4 + (value.split("\n").length - 1) + 1 + (menu.length ? menu.length : 0) + files.length + (!menu.length && !files.length && agents.length ? agents.length + 1 : 0) + (looking ? 4 + (looking.question ? (looking.question.options || []).length + 2 : Math.min(PEEK_LINES, looking.lines.length) + 1) : 0) + (question && step ? 9 + Math.min(consultHeight, consult.text.length + consult.rows.length) + (consult.rows.length ? 1 : 0) : 0) + (proposal ? 4 + proposal.calls.length : 0) + (reflection ? 8 + reflection.details.split("\n").length : 0) + (confirm ? 4 + Math.min(8, String(confirm.stat || "").split("\n").length) : 0) + (trust ? 4 + trust.starts.length : 0) + (picker ? 14 : 0);
   const liveBudget = Math.max(LIVE_MIN_ROWS, Math.min(DRAFT_TAIL_LINES, rows - 1 - chrome));
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Static, { items, children: (item) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", marginBottom: ["hum", "you", "banner", "turn"].includes(item.kind) ? 1 : 0, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Static, { items, children: (item) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", marginTop: blockGap(item), children: [
       item.kind === "wordmark" && /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Box2, { flexDirection: "column", paddingLeft: 1, children: WORDMARK.map((row, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: ACCENT, bold: true, children: row }, i)) }),
       item.kind === "banner" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", paddingLeft: 1, children: [
         MASCOT.map((row, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { children: [
@@ -92622,6 +92715,15 @@ ${r.content}`).join("\n\n") };
           ] }, i))
         ] })
       ] }),
+      item.kind === "answered" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: ACCENT, bold: true, children: item.title }),
+        item.entries.map((e, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", children: [
+          e.question ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Hang, { lead: "  \u2022 ", children: e.question }) : null,
+          e.pick ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Hang, { lead: "    pick: ", children: e.pick }) : null,
+          e.pick && e.why ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Hang, { lead: "    why: ", children: e.why }) : null,
+          !e.pick ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Hang, { lead: "    answer: ", children: e.why || "(nothing)" }) : null
+        ] }, i))
+      ] }),
       item.kind === "agent" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { color: "magenta", children: [
         "  \u25B8 ",
         item.text
@@ -92634,22 +92736,25 @@ ${r.content}`).join("\n\n") };
         "      \xB7 ",
         item.text
       ] }) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ToolRow, { text: item.text })),
-      item.kind === "plan" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", paddingLeft: 2, children: [
-        item.explanation ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: item.explanation }) : null,
-        item.steps.map((st, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
-          Text2,
-          {
-            dimColor: st.status === "completed",
-            bold: st.status === "in_progress",
-            color: st.status === "in_progress" ? ACCENT : void 0,
-            children: [
-              st.glyph,
-              " ",
-              st.step
-            ]
-          },
-          i
-        ))
+      item.kind === "plan" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ToolRow, { text: "updated the plan" }),
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", paddingLeft: 2, children: [
+          item.explanation ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, italic: true, children: item.explanation }) : null,
+          item.steps.map((st, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
+            Text2,
+            {
+              dimColor: st.status !== "in_progress",
+              bold: st.status === "in_progress",
+              color: st.status === "in_progress" ? ACCENT : void 0,
+              children: [
+                st.glyph,
+                " ",
+                /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { strikethrough: st.status === "completed", children: st.step })
+              ]
+            },
+            i
+          ))
+        ] })
       ] }),
       item.kind === "hypotheses" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", paddingLeft: 2, children: [
         item.explanation ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: item.explanation }) : null,
@@ -92702,7 +92807,7 @@ ${r.content}`).join("\n\n") };
       item.kind === "errtail" && /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Box2, { flexDirection: "column", paddingLeft: 6, children: item.lines.map((l, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: "red", dimColor: true, children: l }, i)) }),
       item.kind === "output" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", paddingLeft: 4, children: [
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: `full output \xB7 ${item.name}` }),
-        item.lines.map((l, i) => item.diff ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: l.startsWith("+") ? "green" : l.startsWith("-") ? "red" : void 0, dimColor: !l.startsWith("+") && !l.startsWith("-"), children: l || " " }, i) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: l || " " }, i))
+        item.lines.map((l, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: l || " " }, i))
       ] }),
       item.kind === "turn" && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: ACCENT, children: "\u273B " }),
@@ -92754,17 +92859,17 @@ ${r.content}`).join("\n\n") };
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: "red", children: item.text })
       ] })
     ] }, item.id) }, transcriptEpoch),
-    heldRows.map((item, i) => item.kind === "tool" ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ToolRow, { text: item.text, tail: i === heldRows.length - 1 && held.calls.length && phase === "busy" ? tickTail(held.calls[held.calls.length - 1].t0) : "" }, i) : /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { dimColor: true, children: [
-      "  \u23BF ",
-      item.text
-    ] }, i)),
+    heldRows.map((item, i) => (
+      // a held row stands where it will print: the same gap above it here as on the transcript
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Box2, { flexDirection: "column", marginTop: blockGap(item), children: item.kind === "tool" ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ToolRow, { text: item.text, tail: i === heldRows.length - 1 && held.calls.length && phase === "busy" ? tickTail(held.calls[held.calls.length - 1].t0) : "" }) : /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { dimColor: true, children: [
+        "  \u23BF ",
+        item.text
+      ] }) }, i)
+    )),
     draft.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { marginTop: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Box2, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: ACCENT, dimColor: true, children: "\u25CF" }) }),
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { children: liveTail(renderMarkdown(draft, width - 2), width - 2, liveBudget) })
     ] }),
-    thinking.length > 0 && // the thought as it streams: its newest lines, dim, so a long think is never a blank screen.
-    // It folds into one line under the reply the moment the reply starts
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Box2, { flexDirection: "column", marginTop: 1, paddingLeft: 2, width, children: thinking.slice(-600).split("\n").filter((l) => l.trim()).slice(-Math.min(THOUGHT_TAIL_LINES, liveBudget)).map((l, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, italic: true, wrap: "truncate-start", children: l }, i)) }),
     (phase === "busy" || phase === "connecting") && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { marginTop: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: ACCENT, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(build_default, { type: "dots" }) }),
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: spinnerLabel })
@@ -92775,11 +92880,11 @@ ${r.content}`).join("\n\n") };
         listAsk ? `\u2726 Constraints Hum discovered  ${listRows.length} \xB7 say what you know about each` : question.kind === "decision" ? "\u2726 Review a decision" : question.kind === "review" ? "\u2726 Hum asks for your review" : "\u2726 Clarification",
         !listAsk && steps.length > 1 ? ` (${qStep + 1} of ${steps.length})` : ""
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { children: consultLines.slice(consultStart, consultStart + consultHeight).join("\n") }),
-      consultLines.length > consultHeight ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: `lines ${consultStart + 1}\u2013${Math.min(consultLines.length, consultStart + consultHeight)} of ${consultLines.length} \xB7 PgUp/PgDn to read` }) : null,
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { children: consultView.shownText.join("\n") }),
+      consult.text.length > consultView.textHeight ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: `lines ${consultView.textStart + 1}\u2013${consultView.textStart + consultView.textHeight} of ${consult.text.length} \xB7 PgUp/PgDn to read` }) : null,
+      consultView.shownRows.length ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { children: ["", ...consultView.shownRows].join("\n") }) : null,
       listAsk ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: "your words are the answer \xB7 add what was missed \xB7 /hold confirms all \xB7 Alt+Enter adds a line \xB7 Esc leaves unanswered" }) : null,
       question.kind === "review" ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: "Share solution insights, test inputs and expected results, constraints, or a hypothesis and how to test it." }) : null,
-      question.kind === "decision" ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: "Type a choice and your reasoning, or another approach \xB7 Alt+Enter adds a line \xB7 Enter sends" }) : null,
       sendingAsk === question.id ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { color: ACCENT, children: "Sending answer\u2026" }) : null,
       !listAsk ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, wrap: "truncate-end", children: "  " + askHint }) : null
     ] }),
@@ -92837,7 +92942,11 @@ ${r.content}`).join("\n\n") };
         /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { children: [
           "  \xB7 ",
           c.desc,
-          c.lines != null ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: `  (${c.lines} lines)` }) : null
+          c.lines != null ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: `  (${c.lines} lines)` }) : null,
+          c.diff ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { children: [
+            "  ",
+            /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(DiffStat, { lines: c.diff.split("\n") })
+          ] }) : null
         ] }),
         (c.name === "bash" || c.name === "powershell") && c.desc !== `$ ${String(c.args?.command || "")}` ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { color: "cyan", children: [
           "    $ ",
@@ -92846,20 +92955,7 @@ ${r.content}`).join("\n\n") };
         c.escape ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text2, { color: "yellow", children: [
           "    outside the sandbox \u2014 ",
           String(c.reason || "").slice(0, Math.max(20, width - 32))
-        ] }) : null,
-        c.diff ? c.diff.split("\n").slice(0, DIFF_TAIL_LINES).map((l, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
-          Text2,
-          {
-            color: l.startsWith("+") ? "green" : l.startsWith("-") ? "red" : void 0,
-            dimColor: !l.startsWith("+") && !l.startsWith("-"),
-            children: [
-              "    ",
-              l || " "
-            ]
-          },
-          i
-        )) : null,
-        c.diff && c.diff.split("\n").length > DIFF_TAIL_LINES ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text2, { dimColor: true, children: `    the whole change (${c.diff.split("\n").length} lines) is above` }) : null
+        ] }) : null
       ] }, c.id))
     ] }),
     looking && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box2, { flexDirection: "column", borderStyle: "round", borderColor: "magenta", paddingX: 1, marginTop: 1, children: [
@@ -93100,12 +93196,13 @@ ${r.content}`).join("\n\n") };
             if (reflection && why !== reflection.id && (input === "1" || input === "2")) return true;
             if (proposal && (input === "a" || input === "p") && (proposal.remember || []).length) return true;
             if (!question || !step) return false;
-            if (listAsk || question.kind === "decision") return false;
+            if (listAsk) return false;
+            if (stepLabels.length && input === String(stepLabels.length + 1)) return true;
             if (step.multi && /^[1-9]$/.test(input) && Number(input) <= stepLabels.length) return true;
             if (stepLabels.length && (key.upArrow || key.downArrow)) return true;
             return !!(step.multi && stepLabels.length && input === " ");
           },
-          placeholder: why && reflection && why === reflection.id ? "what did it get wrong? (enter alone: just the no)" : listAsk ? "your words on the list, by number or as one reply" : question && step ? stepLabels.length ? "a number, or your answer" : "your answer" : proposal ? (proposal.remember || []).length ? "enter approves \xB7 a / p allow this shape \xB7 or type why not" : "enter to approve \xB7 or type why not" : paused ? "paused \xB7 say what to do, or /continue" : phase === "busy" ? "type to steer \xB7 esc to stop \xB7 !cmd runs a command" : session ? "what next?" : "what are we doing?"
+          placeholder: why && reflection && why === reflection.id ? "what did it get wrong? (enter alone: just the no)" : listAsk ? "your words on the list, by number or as one reply" : question && step ? ownMarked ? "type your own answer" : markedPick ? "why? \xB7 enter sends \xB7 enter on an empty line sends the pick alone" : stepLabels.length ? "a number, or your answer" : "your answer" : proposal ? (proposal.remember || []).length ? "enter approves \xB7 a / p allow this shape \xB7 or type why not" : "enter to approve \xB7 or type why not" : paused ? "paused \xB7 say what to do, or /continue" : phase === "busy" ? "type to steer \xB7 esc to stop \xB7 !cmd runs a command" : session ? "what next?" : "what are we doing?"
         }
       )
     ] }),
@@ -93172,7 +93269,7 @@ init_install();
 await init_theme();
 var import_jsx_runtime5 = __toESM(require_jsx_runtime(), 1);
 import { spawnSync as spawnSync6 } from "node:child_process";
-var MINE3 = true ? "0.2.26" : "0.0.0";
+var MINE3 = true ? "0.2.28" : "0.0.0";
 var layout = installLayout();
 function completeInstall() {
   if (layout.kind !== "npm" || !needsInstall(MINE3)) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaphi-ai/hum",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "Hum: a self-improving coding agent for your terminal.",
   "license": "UNLICENSED",
   "type": "module",