reasonix 0.35.0 → 0.36.1

package/dist/cli/{chunk-GPHBJWCV.js → chunk-3OBWN2NH.js}

@@ -34,7 +34,7 @@ import {
   toWholeFileEditBlock,
   walkFilesStream,
   webFetch
-} from "./chunk-N2IC4XDL.js";
+} from "./chunk-QRUQ2BFT.js";
 import {
   McpClient,
   SseTransport,
@@ -42,7 +42,7 @@ import {
   StreamableHttpTransport,
   inspectMcpServer,
   parseMcpSpec
-} from "./chunk-I6YIAK6C.js";
+} from "./chunk-UNMYFZPZ.js";
 import {
   openTranscriptFile,
   recordFromLoopEvent,
@@ -55,7 +55,7 @@ import {
   KeystrokeProvider,
   SingleSelect,
   useKeystroke
-} from "./chunk-KZHMKOJH.js";
+} from "./chunk-T52GAWPP.js";
 import {
   COLOR,
   GLYPH,
@@ -63,7 +63,7 @@ import {
   ThemeProvider,
   useColor,
   useThemeTokens
-} from "./chunk-2EBODRRO.js";
+} from "./chunk-ZJR4QLXB.js";
 import {
   PRESETS,
   PRESET_DESCRIPTIONS,
@@ -71,7 +71,7 @@ import {
 } from "./chunk-MHDNZXJJ.js";
 import {
   runDoctorChecks
-} from "./chunk-IDP65VCC.js";
+} from "./chunk-BJ376EN3.js";
 import {
   countTokens
 } from "./chunk-DAEAAVDF.js";
@@ -84,6 +84,10 @@ import {
 import {
   renderDashboard
 } from "./chunk-4DCHFFEY.js";
+import {
+  MANUAL_UPDATE_COMMANDS,
+  planUpdate
+} from "./chunk-WJ3YX4PZ.js";
 import {
   SLASH_COMMANDS,
   archivePlanState,
@@ -97,23 +101,23 @@ import {
   resolveSlashAlias,
   savePlanState,
   suggestSlashCommands
-} from "./chunk-RJ5GUVS2.js";
-import {
-  eventLogPath,
-  openEventSink
-} from "./chunk-G3XNWSFN.js";
+} from "./chunk-2MCYGFLK.js";
 import {
   fetchSmitheryDetail,
   loadMorePages,
   openRegistry,
   specStringFor
 } from "./chunk-SOZE7V7V.js";
+import {
+  eventLogPath,
+  openEventSink
+} from "./chunk-G3XNWSFN.js";
 import {
   BUILTIN_ALLOWLIST,
   formatCommandResult,
   pauseGate,
   runCommand
-} from "./chunk-SX6L4HZZ.js";
+} from "./chunk-QPNZWUZF.js";
 import {
   PROJECT_MEMORY_FILE,
   SkillStore,
@@ -127,13 +131,7 @@ import {
   loadHooks,
   projectSettingsPath,
   runHooks
-} from "./chunk-JJTOZPM3.js";
-import {
-  VERSION,
-  compareVersions,
-  getLatestVersion,
-  isNpxInstall
-} from "./chunk-2AWTGJ2C.js";
+} from "./chunk-IPCPEZWQ.js";
 import {
   deleteSession,
   detectGitBranch,
@@ -154,7 +152,7 @@ import {
   setLanguage,
   t,
   tObj
-} from "./chunk-SN7YH6FC.js";
+} from "./chunk-MLXUGPJE.js";
 import {
   addProjectShellAllowed,
   clearProjectShellAllowed,
@@ -162,6 +160,7 @@ import {
   editModeHintShown,
   isPlausibleKey,
   loadApiKey,
+  loadBaseUrl,
   loadEditMode,
   loadProjectShellAllowed,
   loadReasoningEffort,
@@ -181,7 +180,7 @@ import {
   webSearchEndpoint,
   webSearchEngine,
   writeConfig
-} from "./chunk-5JXXEPDM.js";
+} from "./chunk-BHLHOS5Y.js";
 import {
   CARD,
   FG,
@@ -205,6 +204,13 @@ import {
   DEEPSEEK_PRICING,
   DEFAULT_CONTEXT_TOKENS
 } from "./chunk-ORM6PK57.js";
+import {
+  VERSION,
+  compareVersions,
+  detectInstallSource,
+  detectNpmInstallPrefix,
+  getLatestVersion
+} from "./chunk-CRPQUBP6.js";
 
 // src/cli/commands/chat.tsx
 import { render } from "ink";
@@ -231,7 +237,7 @@ function buildMcpServerSummary(opts) {
 // src/cli/ui/App.tsx
 import { statSync } from "fs";
 import { resolve as resolve2 } from "path";
-import { Box as Box49, Text as Text52, useStdout as useStdout14 } from "ink";
+import { Box as Box49, Text as Text52, useStdout as useStdout15 } from "ink";
 import React60, { useCallback as useCallback11, useEffect as useEffect12, useMemo as useMemo9, useRef as useRef9, useState as useState20 } from "react";
 
 // src/code/checkpoints.ts
@@ -5322,9 +5328,17 @@ function processMultilineKey(value, cursor, keyIn) {
     return cursor === value.length ? NOOP : { next: null, cursor: value.length, submit: false };
   }
   if (key.ctrl && key.input === "p") {
+    if (value.includes("\n")) {
+      const moved = moveCursorUp(value, cursor);
+      if (moved !== cursor) return { next: null, cursor: moved, submit: false };
+    }
     return { ...NOOP, historyHandoff: "prev" };
   }
   if (key.ctrl && key.input === "n") {
+    if (value.includes("\n")) {
+      const moved = moveCursorDown(value, cursor);
+      if (moved !== cursor) return { next: null, cursor: moved, submit: false };
+    }
     return { ...NOOP, historyHandoff: "next" };
   }
   if (key.leftArrow) {
@@ -5333,15 +5347,8 @@ function processMultilineKey(value, cursor, keyIn) {
   if (key.rightArrow) {
     return { next: null, cursor: Math.min(value.length, cursor + 1), submit: false };
   }
-  if (key.upArrow) {
-    if (value.length === 0) return { ...NOOP, historyHandoff: "prev" };
-    const moved = moveCursorUp(value, cursor);
-    return moved === cursor ? NOOP : { next: null, cursor: moved, submit: false };
-  }
-  if (key.downArrow) {
-    if (value.length === 0) return { ...NOOP, historyHandoff: "next" };
-    const moved = moveCursorDown(value, cursor);
-    return moved === cursor ? NOOP : { next: null, cursor: moved, submit: false };
+  if (key.upArrow || key.downArrow) {
+    return NOOP;
   }
   if (key.ctrl && key.input === "a" || key.home) {
     return { next: null, cursor: startOfLine(value, cursor), submit: false };
@@ -5907,7 +5914,8 @@ function HintRow() {
   const items = [
     { key: "\u23CE", sep: "send" },
     { key: "\u21E7\u23CE", sep: "newline" },
-    { key: "\u2191\u2193", sep: "history" },
+    { key: "\u2191\u2193", sep: "scroll" },
+    { key: "^P/^N", sep: "history" },
     { key: "esc", sep: "abort" },
     { key: "^C", sep: "quit" }
   ];
@@ -6423,8 +6431,12 @@ function ArgRow({ value, isSelected }) {
 }
 
 // src/cli/ui/SlashSuggestions.tsx
-import { Box as Box23, Text as Text23 } from "ink";
+import { Box as Box23, Text as Text23, useStdout as useStdout8 } from "ink";
 import React27 from "react";
+var GROUP_MODE_MAX_ROWS = 24;
+var SEARCH_MODE_MAX_ROWS = 8;
+var COMMAND_NAME_CELLS = 14;
+var ARGS_CELLS = 14;
 var GROUP_LABEL = {
   chat: "CHAT",
   setup: "SETUP",
@@ -6442,26 +6454,82 @@ function SlashSuggestions({
   advancedHidden
 }) {
   const color = useColor();
+  const { stdout } = useStdout8();
+  const cols = stdout?.columns ?? 80;
+  const [rememberedWindowStart, setRememberedWindowStart] = React27.useState(0);
+  const maxRows = groupMode ? GROUP_MODE_MAX_ROWS : SEARCH_MODE_MAX_ROWS;
+  const safeMatches = matches ?? [];
+  const windowStart = computeWindowStart(
+    safeMatches,
+    maxRows,
+    selectedIndex,
+    rememberedWindowStart,
+    groupMode
+  );
+  React27.useEffect(() => {
+    setRememberedWindowStart(windowStart);
+  }, [windowStart]);
   if (matches === null) return null;
   if (matches.length === 0) {
     return /* @__PURE__ */ React27.createElement(Box23, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React27.createElement(Text23, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ React27.createElement(Text23, null, " "), /* @__PURE__ */ React27.createElement(Text23, { color: color.warn }, "no slash command matches that prefix"), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, " \u2014 Backspace to edit, or /help for the full list"));
   }
-  const MAX = groupMode ? 24 : 8;
   const total = matches.length;
-  const windowStart = total <= MAX ? 0 : Math.max(0, Math.min(selectedIndex - Math.floor(MAX / 2), total - MAX));
-  const shown = matches.slice(windowStart, windowStart + MAX);
+  const items = buildVisibleItems(matches, windowStart, maxRows, groupMode);
+  const shownCommands = items.filter((item) => item.kind === "command");
   const hiddenAbove = windowStart;
-  const hiddenBelow = total - windowStart - shown.length;
-  let lastGroup = null;
-  if (windowStart > 0) lastGroup = matches[windowStart - 1]?.group ?? null;
-  return /* @__PURE__ */ React27.createElement(Box23, { flexDirection: "column", paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React27.createElement(Box23, null, /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `${total} command${total === 1 ? "" : "s"}`), hiddenAbove > 0 ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null), shown.map((spec, i) => {
-    const idx = windowStart + i;
-    const showHeader = groupMode && spec.group !== lastGroup;
-    lastGroup = spec.group;
-    return /* @__PURE__ */ React27.createElement(React27.Fragment, { key: spec.cmd }, showHeader ? /* @__PURE__ */ React27.createElement(Box23, { marginTop: idx === 0 ? 0 : 1 }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `  ${GROUP_LABEL[spec.group]}`)) : null, /* @__PURE__ */ React27.createElement(SuggestionRow, { spec, isSelected: idx === selectedIndex }));
+  const hiddenBelow = total - windowStart - shownCommands.length;
+  return /* @__PURE__ */ React27.createElement(Box23, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ React27.createElement(Box23, null, /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `${total} command${total === 1 ? "" : "s"}`), hiddenAbove > 0 ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null), items.map((item) => {
+    if (item.kind === "group") {
+      return /* @__PURE__ */ React27.createElement(GroupHeader, { key: `group:${item.group}:${item.beforeIndex}`, group: item.group });
+    }
+    return /* @__PURE__ */ React27.createElement(
+      SuggestionRow,
+      {
+        key: `cmd:${item.spec.group}:${item.spec.cmd}`,
+        spec: item.spec,
+        isSelected: item.index === selectedIndex,
+        columns: cols
+      }
+    );
   }), hiddenBelow > 0 ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `   \u2193 ${hiddenBelow} below`) : null, groupMode && advancedHidden && advancedHidden > 0 ? /* @__PURE__ */ React27.createElement(Box23, { marginTop: 1 }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `  + ${advancedHidden} advanced  \xB7  type a letter to search`)) : null, /* @__PURE__ */ React27.createElement(Box23, { marginTop: 0 }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, "  \u2191\u2193 navigate \xB7 Tab / \u23CE pick \xB7 esc cancel")));
 }
-function SuggestionRow({ spec, isSelected }) {
+function computeWindowStart(matches, maxRows, selectedIndex, currentWindowStart, groupMode = false) {
+  if (matches.length <= 0) return 0;
+  const maxWindowStart = Math.max(0, matches.length - 1);
+  let start = Math.max(0, Math.min(currentWindowStart, maxWindowStart));
+  const clampedSelectedIndex = Math.max(0, Math.min(selectedIndex, matches.length - 1));
+  if (clampedSelectedIndex < start) start = clampedSelectedIndex;
+  while (start < clampedSelectedIndex) {
+    const visibleCommandIndexes = buildVisibleItems(matches, start, maxRows, groupMode).filter((item) => item.kind === "command").map((item) => item.index);
+    if (visibleCommandIndexes.includes(clampedSelectedIndex)) break;
+    start += 1;
+  }
+  return Math.min(start, maxWindowStart);
+}
+function buildVisibleItems(matches, windowStart, maxRows, groupMode = false) {
+  const out = [];
+  for (let idx = windowStart; idx < matches.length && out.length < maxRows; idx += 1) {
+    const spec = matches[idx];
+    if (groupMode && shouldShowGroupHeader(matches, idx)) {
+      if (out.length >= maxRows) break;
+      out.push({ kind: "group", group: spec.group, beforeIndex: idx });
+    }
+    if (out.length >= maxRows) break;
+    out.push({ kind: "command", spec, index: idx });
+  }
+  return out;
+}
+function shouldShowGroupHeader(matches, idx) {
+  return idx === 0 || matches[idx]?.group !== matches[idx - 1]?.group;
+}
+function GroupHeader({ group }) {
+  return /* @__PURE__ */ React27.createElement(Box23, { flexShrink: 0, height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true, wrap: "truncate" }, `  ${GROUP_LABEL[group]}`));
+}
+function SuggestionRow({
+  spec,
+  isSelected,
+  columns
+}) {
   const color = useColor();
   const name = `/${spec.cmd}`;
   const argsSuffix = spec.argsHint ? spec.argsHint : "";
@@ -6469,7 +6537,19 @@ function SuggestionRow({ spec, isSelected }) {
   const translated = t(key);
   const summary = translated === key ? spec.summary : translated;
   const aliasHint = spec.aliases?.length ? ` \xB7 /${spec.aliases.join(" /")}` : "";
-  return /* @__PURE__ */ React27.createElement(Box23, null, /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.primary : color.info, bold: isSelected }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: isSelected }, name.padEnd(14)), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, argsSuffix.padEnd(14)), /* @__PURE__ */ React27.createElement(Text23, null, "  "), /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.user : color.info, dimColor: !isSelected }, summary), aliasHint ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, aliasHint) : null);
+  const reservedCells = 2 + COMMAND_NAME_CELLS + ARGS_CELLS + 2 + 2;
+  const summaryBudget = Math.max(8, columns - reservedCells);
+  const summaryText = truncateCells(`${summary}${aliasHint}`, summaryBudget);
+  return /* @__PURE__ */ React27.createElement(Box23, { flexDirection: "row", flexWrap: "nowrap", flexShrink: 0, height: 1, minHeight: 1 }, /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.primary : color.info, bold: isSelected, wrap: "truncate" }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: isSelected, wrap: "truncate" }, padOrTrim(name, COMMAND_NAME_CELLS)), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true, wrap: "truncate" }, padOrTrim(argsSuffix, ARGS_CELLS)), /* @__PURE__ */ React27.createElement(Text23, { wrap: "truncate" }, "  "), /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.user : color.info, dimColor: !isSelected, wrap: "truncate" }, summaryText));
+}
+function padOrTrim(value, cells) {
+  const trimmed = truncateCells(value, cells);
+  return trimmed.padEnd(cells);
+}
+function truncateCells(value, maxCells) {
+  if (value.length <= maxCells) return value;
+  if (maxCells <= 1) return value.slice(0, Math.max(0, maxCells));
+  return `${value.slice(0, maxCells - 1)}\u2026`;
 }
 
 // src/cli/ui/WelcomeBanner.tsx
@@ -6814,6 +6894,10 @@ function handleToolStart(ev, ctx) {
   }
 }
 function handleErrorEvent(ev, ctx) {
+  ctx.setOngoingTool(null);
+  ctx.setToolProgress(null);
+  ctx.toolStartedAtRef.current = null;
+  ctx.translator.toolAbort(ev.error ?? ev.content);
   ctx.log.pushError("tool error", ev.error ?? ev.content);
 }
 function handleWarningEvent(ev, ctx) {
@@ -6855,272 +6939,6 @@ function handleToolEvent(ev, ctx) {
   }
 }
 
-// src/cli/ui/hooks/useAgentSession.ts
-import { useMemo as useMemo6 } from "react";
-function useAgentSession({
-  sessionId,
-  model: model2,
-  workspace,
-  branch
-}) {
-  return useMemo6(
-    () => ({
-      id: sessionId ?? "default",
-      branch: branch ?? "main",
-      workspace,
-      model: model2
-    }),
-    [sessionId, branch, workspace, model2]
-  );
-}
-
-// src/cli/ui/hooks/useChatScroll.ts
-import { useCallback as useCallback2, useEffect as useEffect4, useRef as useRef2, useState as useState14 } from "react";
-var SCROLL_PAGE_ROWS = 3;
-var COALESCE_MS = 16;
-function useChatScroll() {
-  const [scrollRows, setScrollRows] = useState14(0);
-  const [pinned, setPinned] = useState14(true);
-  const [maxScroll, setMaxScrollState] = useState14(0);
-  const maxScrollRef = useRef2(0);
-  const pendingDelta = useRef2(0);
-  const flushTimer = useRef2(null);
-  const flush = useCallback2(() => {
-    flushTimer.current = null;
-    const d = pendingDelta.current;
-    pendingDelta.current = 0;
-    if (d === 0) return;
-    if (d < 0) setPinned(false);
-    setScrollRows((o) => {
-      const next = Math.max(0, Math.min(maxScrollRef.current, o + d));
-      if (next >= maxScrollRef.current) setPinned(true);
-      return next;
-    });
-  }, []);
-  const schedule = useCallback2(
-    (delta) => {
-      pendingDelta.current += delta;
-      if (flushTimer.current !== null) return;
-      flushTimer.current = setTimeout(flush, COALESCE_MS);
-    },
-    [flush]
-  );
-  useEffect4(() => {
-    return () => {
-      if (flushTimer.current !== null) {
-        clearTimeout(flushTimer.current);
-        flushTimer.current = null;
-      }
-    };
-  }, []);
-  useEffect4(() => {
-    if (pinned) setScrollRows(maxScroll);
-  }, [pinned, maxScroll]);
-  useEffect4(() => {
-    if (scrollRows > maxScroll) setScrollRows(maxScroll);
-  }, [scrollRows, maxScroll]);
-  const scrollUp = useCallback2(() => schedule(-SCROLL_PAGE_ROWS), [schedule]);
-  const scrollDown = useCallback2(() => schedule(SCROLL_PAGE_ROWS), [schedule]);
-  const jumpToBottom = useCallback2(() => {
-    pendingDelta.current = 0;
-    if (flushTimer.current !== null) {
-      clearTimeout(flushTimer.current);
-      flushTimer.current = null;
-    }
-    setPinned(true);
-  }, []);
-  const setMaxScroll = useCallback2((rows) => {
-    maxScrollRef.current = rows;
-    setMaxScrollState(rows);
-  }, []);
-  return { scrollRows, pinned, scrollUp, scrollDown, jumpToBottom, setMaxScroll };
-}
-
-// src/cli/ui/hooks/useCodeMode.ts
-import { useCallback as useCallback3 } from "react";
-function useCodeMode(opts) {
-  const { codeMode, pendingEdits, currentRootDir, session, syncPendingCount, recordEdit } = opts;
-  const codeApply = useCallback3(
-    (indices) => {
-      if (!codeMode) return "not in code mode";
-      const blocks = pendingEdits.current;
-      if (blocks.length === 0) {
-        return "nothing pending \u2014 the model hasn't proposed edits since the last /apply or /discard.";
-      }
-      const useSubset = indices !== void 0 && indices.length > 0;
-      const { selected, remaining } = useSubset ? partitionEdits(blocks, indices) : { selected: blocks, remaining: [] };
-      if (selected.length === 0) {
-        return "\u25B8 no edits matched those indices \u2014 nothing applied. Use /apply with no args to commit them all.";
-      }
-      const snaps = snapshotBeforeEdits(selected, currentRootDir);
-      const results = applyEditBlocks(selected, currentRootDir);
-      const anyApplied = results.some((r) => r.status === "applied" || r.status === "created");
-      if (anyApplied) recordEdit("review-apply", selected, results, snaps);
-      pendingEdits.current = remaining;
-      if (remaining.length === 0) clearPendingEdits(session ?? null);
-      else savePendingEdits(session ?? null, remaining);
-      syncPendingCount();
-      const tail = remaining.length > 0 ? `
-\u25B8 ${remaining.length} edit block(s) still pending \u2014 /apply or /discard to clear them.` : "";
-      return formatEditResults(results) + tail;
-    },
-    [codeMode, currentRootDir, session, syncPendingCount, recordEdit, pendingEdits]
-  );
-  const codeDiscard = useCallback3(
-    (indices) => {
-      const blocks = pendingEdits.current;
-      if (blocks.length === 0) return "nothing pending to discard.";
-      const useSubset = indices !== void 0 && indices.length > 0;
-      const { selected, remaining } = useSubset ? partitionEdits(blocks, indices) : { selected: blocks, remaining: [] };
-      if (selected.length === 0) {
-        return "\u25B8 no edits matched those indices \u2014 nothing discarded.";
-      }
-      pendingEdits.current = remaining;
-      if (remaining.length === 0) clearPendingEdits(session ?? null);
-      else savePendingEdits(session ?? null, remaining);
-      syncPendingCount();
-      const tail = remaining.length > 0 ? `  (${remaining.length} block(s) still pending)` : ". Nothing was written to disk.";
-      return `\u25B8 discarded ${selected.length} pending edit block(s)${tail}`;
-    },
-    [session, syncPendingCount, pendingEdits]
-  );
-  return { codeApply, codeDiscard };
-}
-
-// src/cli/ui/hooks/useInputRecall.ts
-import { useCallback as useCallback4, useRef as useRef3 } from "react";
-function useInputRecall(setInput) {
-  const promptHistory = useRef3([]);
-  const historyCursor = useRef3(-1);
-  const recallPrev = useCallback4(() => {
-    const hist = promptHistory.current;
-    if (hist.length === 0) return;
-    const nextCursor = Math.min(historyCursor.current + 1, hist.length - 1);
-    historyCursor.current = nextCursor;
-    setInput(hist[hist.length - 1 - nextCursor] ?? "");
-  }, [setInput]);
-  const recallNext = useCallback4(() => {
-    if (historyCursor.current < 0) return;
-    const hist = promptHistory.current;
-    const nextCursor = historyCursor.current - 1;
-    historyCursor.current = nextCursor;
-    setInput(nextCursor < 0 ? "" : hist[hist.length - 1 - nextCursor] ?? "");
-  }, [setInput]);
-  const pushHistory = useCallback4((text) => {
-    promptHistory.current.push(text);
-  }, []);
-  const resetCursor = useCallback4(() => {
-    historyCursor.current = -1;
-  }, []);
-  return { recallPrev, recallNext, pushHistory, resetCursor };
-}
-
-// src/cli/ui/hooks/useLoopMode.ts
-import { useCallback as useCallback5, useEffect as useEffect5, useRef as useRef4, useState as useState15 } from "react";
-function useLoopMode(opts) {
-  const { log, busyRef, handleSubmitRef } = opts;
-  const [activeLoop, setActiveLoop] = useState15(null);
-  const activeLoopRef = useRef4(null);
-  const loopTimerRef = useRef4(null);
-  const loopFiringRef = useRef4(false);
-  useEffect5(() => {
-    activeLoopRef.current = activeLoop;
-  }, [activeLoop]);
-  const stopLoop = useCallback5(() => {
-    if (loopTimerRef.current) {
-      clearTimeout(loopTimerRef.current);
-      loopTimerRef.current = null;
-    }
-    const cur = activeLoopRef.current;
-    if (!cur) return;
-    setActiveLoop(null);
-    log.pushInfo(`\u25B8 loop stopped (after ${cur.iter} iter${cur.iter === 1 ? "" : "s"}).`);
-  }, [log]);
-  const startLoop = useCallback5((intervalMs, prompt) => {
-    if (loopTimerRef.current) {
-      clearTimeout(loopTimerRef.current);
-      loopTimerRef.current = null;
-    }
-    setActiveLoop({
-      prompt,
-      intervalMs,
-      nextFireAt: Date.now() + intervalMs,
-      iter: 0
-    });
-  }, []);
-  const getLoopStatus = useCallback5(() => {
-    const cur = activeLoopRef.current;
-    if (!cur) return null;
-    return {
-      prompt: cur.prompt,
-      intervalMs: cur.intervalMs,
-      iter: cur.iter,
-      nextFireMs: Math.max(0, cur.nextFireAt - Date.now())
-    };
-  }, []);
-  const isLoopActive = useCallback5(() => activeLoopRef.current !== null, []);
-  const isLoopFiring = useCallback5(() => loopFiringRef.current, []);
-  const clearFiringFlag = useCallback5(() => {
-    loopFiringRef.current = false;
-  }, []);
-  useEffect5(() => {
-    if (!activeLoop) return;
-    const delay = Math.max(0, activeLoop.nextFireAt - Date.now());
-    const timer = setTimeout(async () => {
-      loopTimerRef.current = null;
-      if (busyRef.current) {
-        setActiveLoop((cur2) => cur2 ? { ...cur2, nextFireAt: Date.now() + 1e3 } : cur2);
-        return;
-      }
-      const cur = activeLoopRef.current;
-      if (!cur) return;
-      const nextIter = cur.iter + 1;
-      setActiveLoop(
-        (c) => c ? { ...c, iter: nextIter, nextFireAt: Date.now() + cur.intervalMs } : c
-      );
-      log.pushInfo(`\u25B8 /loop iter ${nextIter} \u2192 ${cur.prompt}`);
-      loopFiringRef.current = true;
-      try {
-        await handleSubmitRef.current?.(cur.prompt);
-      } catch {
-        stopLoop();
-      } finally {
-        loopFiringRef.current = false;
-      }
-    }, delay);
-    loopTimerRef.current = timer;
-    return () => clearTimeout(timer);
-  }, [activeLoop, stopLoop, log, busyRef, handleSubmitRef]);
-  return {
-    startLoop,
-    stopLoop,
-    getLoopStatus,
-    isLoopActive,
-    isLoopFiring,
-    clearFiringFlag,
-    activeLoop
-  };
-}
-
-// src/cli/ui/hooks/useQuit.ts
-import { useCallback as useCallback6, useEffect as useEffect6 } from "react";
-function useQuit(transcriptRef) {
-  const quitProcess = useCallback6(() => {
-    transcriptRef.current?.end();
-    process.exit(0);
-  }, [transcriptRef]);
-  useEffect6(() => {
-    process.on("SIGINT", quitProcess);
-    return () => {
-      process.off("SIGINT", quitProcess);
-    };
-  }, [quitProcess]);
-  return quitProcess;
-}
-
-// src/cli/ui/hooks/useScrollback.ts
-import { useMemo as useMemo7 } from "react";
-
 // src/cli/ui/state/provider.tsx
 import React29 from "react";
 
@@ -7450,68 +7268,343 @@ function initialState(session, cards = []) {
       sessionCost: 0,
       cacheHit: 0
     },
-    focusedCardId: null,
-    toasts: [],
-    turnInProgress: false
-  };
+    focusedCardId: null,
+    toasts: [],
+    turnInProgress: false
+  };
+}
+
+// src/cli/ui/state/store.ts
+function createStore(session, initialCards) {
+  let state = initialState(session, initialCards);
+  const stateListeners = /* @__PURE__ */ new Set();
+  const eventListeners = /* @__PURE__ */ new Set();
+  return {
+    getState() {
+      return state;
+    },
+    dispatch(event) {
+      state = reduce(state, event);
+      for (const listener of stateListeners) listener();
+      for (const listener of eventListeners) listener(event);
+    },
+    subscribe(listener) {
+      stateListeners.add(listener);
+      return () => {
+        stateListeners.delete(listener);
+      };
+    },
+    onEvent(listener) {
+      eventListeners.add(listener);
+      return () => {
+        eventListeners.delete(listener);
+      };
+    }
+  };
+}
+
+// src/cli/ui/state/provider.tsx
+var StoreCtx = React29.createContext(null);
+function AgentStoreProvider({
+  session,
+  initialCards,
+  children
+}) {
+  const initialCardsRef = React29.useRef(initialCards);
+  const store = React29.useMemo(() => createStore(session, initialCardsRef.current), [session]);
+  return /* @__PURE__ */ React29.createElement(StoreCtx.Provider, { value: store }, children);
+}
+function useAgentStore() {
+  const store = React29.useContext(StoreCtx);
+  if (!store) throw new Error("useAgentStore must be used inside AgentStoreProvider");
+  return store;
+}
+function useAgentState(selector) {
+  const store = useAgentStore();
+  const subscribe = React29.useCallback((cb) => store.subscribe(cb), [store]);
+  const getSnapshot = React29.useCallback(() => selector(store.getState()), [store, selector]);
+  return React29.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+}
+function useDispatch() {
+  return useAgentStore().dispatch;
+}
+
+// src/cli/ui/hooks/useActivityPhase.ts
+function deriveActivityLabel(cards) {
+  if (cards.some((c) => c.kind === "reasoning" && c.streaming)) return "thinking\u2026";
+  const last = cards[cards.length - 1];
+  if (!last || last.kind === "user") return "waiting for model\u2026";
+  return "processing\u2026";
+}
+function useActivityLabel() {
+  return useAgentState((s) => deriveActivityLabel(s.cards));
+}
+
+// src/cli/ui/hooks/useAgentSession.ts
+import { useMemo as useMemo6 } from "react";
+function useAgentSession({
+  sessionId,
+  model: model2,
+  workspace,
+  branch
+}) {
+  return useMemo6(
+    () => ({
+      id: sessionId ?? "default",
+      branch: branch ?? "main",
+      workspace,
+      model: model2
+    }),
+    [sessionId, branch, workspace, model2]
+  );
+}
+
+// src/cli/ui/hooks/useChatScroll.ts
+import { useCallback as useCallback2, useEffect as useEffect4, useRef as useRef2, useState as useState14 } from "react";
+var SCROLL_PAGE_ROWS = 3;
+var COALESCE_MS = 16;
+function useChatScroll() {
+  const [scrollRows, setScrollRows] = useState14(0);
+  const [pinned, setPinned] = useState14(true);
+  const [maxScroll, setMaxScrollState] = useState14(0);
+  const maxScrollRef = useRef2(0);
+  const pendingDelta = useRef2(0);
+  const flushTimer = useRef2(null);
+  const flush = useCallback2(() => {
+    flushTimer.current = null;
+    const d = pendingDelta.current;
+    pendingDelta.current = 0;
+    if (d === 0) return;
+    if (d < 0) setPinned(false);
+    setScrollRows((o) => {
+      const next = Math.max(0, Math.min(maxScrollRef.current, o + d));
+      if (next >= maxScrollRef.current) setPinned(true);
+      return next;
+    });
+  }, []);
+  const schedule = useCallback2(
+    (delta) => {
+      pendingDelta.current += delta;
+      if (flushTimer.current !== null) return;
+      flushTimer.current = setTimeout(flush, COALESCE_MS);
+    },
+    [flush]
+  );
+  useEffect4(() => {
+    return () => {
+      if (flushTimer.current !== null) {
+        clearTimeout(flushTimer.current);
+        flushTimer.current = null;
+      }
+    };
+  }, []);
+  useEffect4(() => {
+    if (pinned) setScrollRows(maxScroll);
+  }, [pinned, maxScroll]);
+  useEffect4(() => {
+    if (scrollRows > maxScroll) setScrollRows(maxScroll);
+  }, [scrollRows, maxScroll]);
+  const scrollUp = useCallback2(() => schedule(-SCROLL_PAGE_ROWS), [schedule]);
+  const scrollDown = useCallback2(() => schedule(SCROLL_PAGE_ROWS), [schedule]);
+  const jumpToBottom = useCallback2(() => {
+    pendingDelta.current = 0;
+    if (flushTimer.current !== null) {
+      clearTimeout(flushTimer.current);
+      flushTimer.current = null;
+    }
+    setPinned(true);
+  }, []);
+  const setMaxScroll = useCallback2((rows) => {
+    maxScrollRef.current = rows;
+    setMaxScrollState(rows);
+  }, []);
+  return { scrollRows, pinned, scrollUp, scrollDown, jumpToBottom, setMaxScroll };
+}
+
+// src/cli/ui/hooks/useCodeMode.ts
+import { useCallback as useCallback3 } from "react";
+function useCodeMode(opts) {
+  const { codeMode, pendingEdits, currentRootDir, session, syncPendingCount, recordEdit } = opts;
+  const codeApply = useCallback3(
+    (indices) => {
+      if (!codeMode) return "not in code mode";
+      const blocks = pendingEdits.current;
+      if (blocks.length === 0) {
+        return "nothing pending \u2014 the model hasn't proposed edits since the last /apply or /discard.";
+      }
+      const useSubset = indices !== void 0 && indices.length > 0;
+      const { selected, remaining } = useSubset ? partitionEdits(blocks, indices) : { selected: blocks, remaining: [] };
+      if (selected.length === 0) {
+        return "\u25B8 no edits matched those indices \u2014 nothing applied. Use /apply with no args to commit them all.";
+      }
+      const snaps = snapshotBeforeEdits(selected, currentRootDir);
+      const results = applyEditBlocks(selected, currentRootDir);
+      const anyApplied = results.some((r) => r.status === "applied" || r.status === "created");
+      if (anyApplied) recordEdit("review-apply", selected, results, snaps);
+      pendingEdits.current = remaining;
+      if (remaining.length === 0) clearPendingEdits(session ?? null);
+      else savePendingEdits(session ?? null, remaining);
+      syncPendingCount();
+      const tail = remaining.length > 0 ? `
+\u25B8 ${remaining.length} edit block(s) still pending \u2014 /apply or /discard to clear them.` : "";
+      return formatEditResults(results) + tail;
+    },
+    [codeMode, currentRootDir, session, syncPendingCount, recordEdit, pendingEdits]
+  );
+  const codeDiscard = useCallback3(
+    (indices) => {
+      const blocks = pendingEdits.current;
+      if (blocks.length === 0) return "nothing pending to discard.";
+      const useSubset = indices !== void 0 && indices.length > 0;
+      const { selected, remaining } = useSubset ? partitionEdits(blocks, indices) : { selected: blocks, remaining: [] };
+      if (selected.length === 0) {
+        return "\u25B8 no edits matched those indices \u2014 nothing discarded.";
+      }
+      pendingEdits.current = remaining;
+      if (remaining.length === 0) clearPendingEdits(session ?? null);
+      else savePendingEdits(session ?? null, remaining);
+      syncPendingCount();
+      const tail = remaining.length > 0 ? `  (${remaining.length} block(s) still pending)` : ". Nothing was written to disk.";
+      return `\u25B8 discarded ${selected.length} pending edit block(s)${tail}`;
+    },
+    [session, syncPendingCount, pendingEdits]
+  );
+  return { codeApply, codeDiscard };
 }
 
-// src/cli/ui/state/store.ts
-function createStore(session, initialCards) {
-  let state = initialState(session, initialCards);
-  const stateListeners = /* @__PURE__ */ new Set();
-  const eventListeners = /* @__PURE__ */ new Set();
-  return {
-    getState() {
-      return state;
-    },
-    dispatch(event) {
-      state = reduce(state, event);
-      for (const listener of stateListeners) listener();
-      for (const listener of eventListeners) listener(event);
-    },
-    subscribe(listener) {
-      stateListeners.add(listener);
-      return () => {
-        stateListeners.delete(listener);
-      };
-    },
-    onEvent(listener) {
-      eventListeners.add(listener);
-      return () => {
-        eventListeners.delete(listener);
-      };
+// src/cli/ui/hooks/useInputRecall.ts
+import { useCallback as useCallback4, useRef as useRef3 } from "react";
+function useInputRecall(setInput) {
+  const promptHistory = useRef3([]);
+  const historyCursor = useRef3(-1);
+  const recallPrev = useCallback4(() => {
+    const hist = promptHistory.current;
+    if (hist.length === 0) return;
+    const nextCursor = Math.min(historyCursor.current + 1, hist.length - 1);
+    historyCursor.current = nextCursor;
+    setInput(hist[hist.length - 1 - nextCursor] ?? "");
+  }, [setInput]);
+  const recallNext = useCallback4(() => {
+    if (historyCursor.current < 0) return;
+    const hist = promptHistory.current;
+    const nextCursor = historyCursor.current - 1;
+    historyCursor.current = nextCursor;
+    setInput(nextCursor < 0 ? "" : hist[hist.length - 1 - nextCursor] ?? "");
+  }, [setInput]);
+  const pushHistory = useCallback4((text) => {
+    promptHistory.current.push(text);
+  }, []);
+  const resetCursor = useCallback4(() => {
+    historyCursor.current = -1;
+  }, []);
+  return { recallPrev, recallNext, pushHistory, resetCursor };
+}
+
+// src/cli/ui/hooks/useLoopMode.ts
+import { useCallback as useCallback5, useEffect as useEffect5, useRef as useRef4, useState as useState15 } from "react";
+function useLoopMode(opts) {
+  const { log, busyRef, handleSubmitRef } = opts;
+  const [activeLoop, setActiveLoop] = useState15(null);
+  const activeLoopRef = useRef4(null);
+  const loopTimerRef = useRef4(null);
+  const loopFiringRef = useRef4(false);
+  useEffect5(() => {
+    activeLoopRef.current = activeLoop;
+  }, [activeLoop]);
+  const stopLoop = useCallback5(() => {
+    if (loopTimerRef.current) {
+      clearTimeout(loopTimerRef.current);
+      loopTimerRef.current = null;
+    }
+    const cur = activeLoopRef.current;
+    if (!cur) return;
+    setActiveLoop(null);
+    log.pushInfo(`\u25B8 loop stopped (after ${cur.iter} iter${cur.iter === 1 ? "" : "s"}).`);
+  }, [log]);
+  const startLoop = useCallback5((intervalMs, prompt) => {
+    if (loopTimerRef.current) {
+      clearTimeout(loopTimerRef.current);
+      loopTimerRef.current = null;
     }
+    setActiveLoop({
+      prompt,
+      intervalMs,
+      nextFireAt: Date.now() + intervalMs,
+      iter: 0
+    });
+  }, []);
+  const getLoopStatus = useCallback5(() => {
+    const cur = activeLoopRef.current;
+    if (!cur) return null;
+    return {
+      prompt: cur.prompt,
+      intervalMs: cur.intervalMs,
+      iter: cur.iter,
+      nextFireMs: Math.max(0, cur.nextFireAt - Date.now())
+    };
+  }, []);
+  const isLoopActive = useCallback5(() => activeLoopRef.current !== null, []);
+  const isLoopFiring = useCallback5(() => loopFiringRef.current, []);
+  const clearFiringFlag = useCallback5(() => {
+    loopFiringRef.current = false;
+  }, []);
+  useEffect5(() => {
+    if (!activeLoop) return;
+    const delay = Math.max(0, activeLoop.nextFireAt - Date.now());
+    const timer = setTimeout(async () => {
+      loopTimerRef.current = null;
+      if (busyRef.current) {
+        setActiveLoop((cur2) => cur2 ? { ...cur2, nextFireAt: Date.now() + 1e3 } : cur2);
+        return;
+      }
+      const cur = activeLoopRef.current;
+      if (!cur) return;
+      const nextIter = cur.iter + 1;
+      setActiveLoop(
+        (c) => c ? { ...c, iter: nextIter, nextFireAt: Date.now() + cur.intervalMs } : c
+      );
+      log.pushInfo(`\u25B8 /loop iter ${nextIter} \u2192 ${cur.prompt}`);
+      loopFiringRef.current = true;
+      try {
+        await handleSubmitRef.current?.(cur.prompt);
+      } catch {
+        stopLoop();
+      } finally {
+        loopFiringRef.current = false;
+      }
+    }, delay);
+    loopTimerRef.current = timer;
+    return () => clearTimeout(timer);
+  }, [activeLoop, stopLoop, log, busyRef, handleSubmitRef]);
+  return {
+    startLoop,
+    stopLoop,
+    getLoopStatus,
+    isLoopActive,
+    isLoopFiring,
+    clearFiringFlag,
+    activeLoop
   };
 }
 
-// src/cli/ui/state/provider.tsx
-var StoreCtx = React29.createContext(null);
-function AgentStoreProvider({
-  session,
-  initialCards,
-  children
-}) {
-  const initialCardsRef = React29.useRef(initialCards);
-  const store = React29.useMemo(() => createStore(session, initialCardsRef.current), [session]);
-  return /* @__PURE__ */ React29.createElement(StoreCtx.Provider, { value: store }, children);
-}
-function useAgentStore() {
-  const store = React29.useContext(StoreCtx);
-  if (!store) throw new Error("useAgentStore must be used inside AgentStoreProvider");
-  return store;
-}
-function useAgentState(selector) {
-  const store = useAgentStore();
-  const subscribe = React29.useCallback((cb) => store.subscribe(cb), [store]);
-  const getSnapshot = React29.useCallback(() => selector(store.getState()), [store, selector]);
-  return React29.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-}
-function useDispatch() {
-  return useAgentStore().dispatch;
+// src/cli/ui/hooks/useQuit.ts
+import { useCallback as useCallback6, useEffect as useEffect6 } from "react";
+function useQuit(transcriptRef) {
+  const quitProcess = useCallback6(() => {
+    transcriptRef.current?.end();
+    process.exit(0);
+  }, [transcriptRef]);
+  useEffect6(() => {
+    process.on("SIGINT", quitProcess);
+    return () => {
+      process.off("SIGINT", quitProcess);
+    };
+  }, [quitProcess]);
+  return quitProcess;
 }
 
 // src/cli/ui/hooks/useScrollback.ts
+import { useMemo as useMemo7 } from "react";
 var seq = 0;
 function nextId2(prefix) {
   seq += 1;
@@ -7838,10 +7931,16 @@ function CtxCard({ card }) {
     {
       glyph: "\u2318",
       tone: TONE.brand,
-      title: "context",
+      title: t("cardTitles.context"),
       meta: [`${used.toLocaleString()} / ${cap.toLocaleString()} (${usedPct.toFixed(1)}%)`]
     }
-  ), row("system", card.systemTokens, card.systemTokens / cap, TONE.brand), row("tools", card.toolsTokens, card.toolsTokens / cap, TONE.warn), row("log", card.logTokens, card.logTokens / cap, TONE.ok), row("input", card.inputTokens, card.inputTokens / cap, TONE.accent), card.topTools.length > 0 ? /* @__PURE__ */ React32.createElement(React32.Fragment, null, /* @__PURE__ */ React32.createElement(Text26, { color: FG.faint }, `top tools \xB7 ${card.toolsCount} total \xB7 ${card.logMessages} log msgs`), card.topTools.slice(0, 5).map((t2) => /* @__PURE__ */ React32.createElement(Box27, { key: `${t2.turn}-${t2.name}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React32.createElement(Text26, { color: FG.sub }, t2.name), /* @__PURE__ */ React32.createElement(Text26, { color: FG.faint }, `\xB7 turn ${t2.turn} \xB7 ${t2.tokens.toLocaleString()}`)))) : null);
+  ), row(t("cardLabels.system"), card.systemTokens, card.systemTokens / cap, TONE.brand), row(t("cardLabels.tools"), card.toolsTokens, card.toolsTokens / cap, TONE.warn), row(t("cardLabels.log"), card.logTokens, card.logTokens / cap, TONE.ok), row(t("cardLabels.input"), card.inputTokens, card.inputTokens / cap, TONE.accent), card.topTools.length > 0 ? /* @__PURE__ */ React32.createElement(React32.Fragment, null, /* @__PURE__ */ React32.createElement(Text26, { color: FG.faint }, `${t("cardLabels.topTools")} \xB7 ${card.toolsCount} ${t("cardLabels.tools")} \xB7 ${card.logMessages} ${t("cardLabels.logMsgs")}`), card.topTools.slice(0, 5).map((tool) => /* @__PURE__ */ React32.createElement(Box27, { key: `${tool.turn}-${tool.name}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React32.createElement(Text26, { color: FG.sub }, tool.name), /* @__PURE__ */ React32.createElement(
+    Text26,
+    {
+      color: FG.faint
+    },
+    `\xB7 ${t("cardLabels.turn")} ${tool.turn} \xB7 ${tool.tokens.toLocaleString()}`
+  )))) : null);
 }
 
 // src/cli/ui/cards/DiffCard.tsx
@@ -7909,7 +8008,7 @@ import { Box as Box30, Text as Text29 } from "ink";
 import React35 from "react";
 var STACK_TAIL = 5;
 function ErrorCard({ card }) {
-  const retryNote = card.retries !== void 0 && card.retries > 0 ? `${card.retries} retr${card.retries === 1 ? "y" : "ies"}` : null;
+  const retryNote = card.retries !== void 0 && card.retries > 0 ? `${card.retries} ${t("cardLabels.retries")}` : null;
   const stackLines = card.stack ? card.stack.split("\n") : [];
   const stackTrunc = stackLines.length > STACK_TAIL;
   const stackVisible = stackTrunc ? stackLines.slice(-STACK_TAIL) : stackLines;
@@ -7921,10 +8020,13 @@ function ErrorCard({ card }) {
     {
       glyph: "\u2716",
       tone: TONE.err,
-      title: card.title || "error",
+      title: card.title || t("cardTitles.error"),
       meta: retryNote ? [retryNote] : void 0
     }
-  ), messageLines.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:msg:${i}`, color: TONE.err }, line || " ")), hasStack ? /* @__PURE__ */ React35.createElement(Box30, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React35.createElement(Text29, { color: FG.meta }, "stack trace"), stackHidden > 0 ? /* @__PURE__ */ React35.createElement(Text29, { color: FG.faint }, `\u22EE ${stackHidden} earlier stack line${stackHidden === 1 ? "" : "s"} hidden`) : null, stackVisible.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:stk:${stackHidden + i}`, color: FG.meta }, line || " "))) : null);
+  ), messageLines.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:msg:${i}`, color: TONE.err }, line || " ")), hasStack ? /* @__PURE__ */ React35.createElement(Box30, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React35.createElement(Text29, { color: FG.meta }, t("cardLabels.stackTrace")), stackHidden > 0 ? /* @__PURE__ */ React35.createElement(Text29, { color: FG.faint }, t(
+    stackHidden === 1 ? "cardLabels.earlierStackLine" : "cardLabels.earlierStackLines",
+    { count: stackHidden }
+  )) : null, stackVisible.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:stk:${stackHidden + i}`, color: FG.meta }, line || " "))) : null);
 }
 
 // src/cli/ui/cards/LiveCard.tsx
@@ -8090,7 +8192,7 @@ function anchorIndex(steps) {
 }
 
 // src/cli/ui/cards/ReasoningCard.tsx
-import { Box as Box34, Text as Text35, useStdout as useStdout8 } from "ink";
+import { Box as Box34, Text as Text35, useStdout as useStdout9 } from "ink";
 import React41 from "react";
 
 // src/frame/width.ts
@@ -8157,7 +8259,7 @@ function ReasoningCard({
   card,
   expanded
 }) {
-  const { stdout } = useStdout8();
+  const { stdout } = useStdout9();
   const cols = stdout?.columns ?? 80;
   const lineCells = Math.max(20, cols - 4);
   const allLines = card.text.length > 0 ? card.text.split("\n") : [];
@@ -8169,7 +8271,7 @@ function ReasoningHeader({ card }) {
   const streamingActive = card.streaming && !card.aborted;
   const headColor = card.aborted ? TONE.err : streamingActive ? TONE_ACTIVE.accent : TONE.accent;
   const glyph = streamingActive ? "\u25C7" : "\u25C6";
-  const title = streamingActive ? "reasoning\u2026" : card.aborted ? "reasoning (aborted)" : "reasoning";
+  const title = streamingActive ? t("cardTitles.reasoningEllipsis") : card.aborted ? t("cardTitles.reasoningAborted") : t("cardTitles.reasoning");
   const meta = [];
   const m = headerMeta(card);
   if (m) meta.push(m);
@@ -8191,11 +8293,11 @@ function ReasoningHeader({ card }) {
 }
 function headerMeta(card) {
   if (card.streaming) {
-    return card.tokens > 0 ? `${card.tokens.toLocaleString()} tok` : "";
+    return card.tokens > 0 ? `${card.tokens.toLocaleString()} ${t("cardLabels.tok")}` : "";
   }
   const parts = [];
-  if (card.tokens > 0) parts.push(`${card.tokens.toLocaleString()} tok`);
-  if (card.paragraphs > 0) parts.push(`${card.paragraphs} \xB6`);
+  if (card.tokens > 0) parts.push(`${card.tokens.toLocaleString()} ${t("cardLabels.tok")}`);
+  if (card.paragraphs > 0) parts.push(`${card.paragraphs} ${t("cardLabels.pilcrow")}`);
   return parts.join(" \xB7 ");
 }
 function headerDuration(card) {
@@ -8246,18 +8348,24 @@ import React42 from "react";
 function SearchCard({ card }) {
   const fileCount = new Set(card.hits.map((h) => h.file)).size;
   const elapsed = `${(card.elapsedMs / 1e3).toFixed(2)}s`;
-  const stats2 = `${card.hits.length} hit${card.hits.length === 1 ? "" : "s"} \xB7 ${fileCount} file${fileCount === 1 ? "" : "s"}`;
+  const stats2 = t(card.hits.length === 1 ? "cardLabels.hitSingular" : "cardLabels.hitsPlural", {
+    count: card.hits.length,
+    files: fileCount
+  });
   const grouped = groupByFile(card.hits.slice(0, 10));
   return /* @__PURE__ */ React42.createElement(Card, { tone: TONE.info }, /* @__PURE__ */ React42.createElement(
     CardHeader,
     {
       glyph: "\u2299",
       tone: TONE.info,
-      title: "search",
+      title: t("cardTitles.search"),
       subtitle: `"${card.query}"`,
       meta: [stats2, elapsed]
     }
-  ), grouped.map(([file, hits]) => /* @__PURE__ */ React42.createElement(Box35, { key: file, flexDirection: "column" }, /* @__PURE__ */ React42.createElement(Text36, { bold: true, color: FG.strong }, file), hits.map((h, i) => /* @__PURE__ */ React42.createElement(Box35, { key: `${file}:${h.line}:${i}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, `${h.line.toString().padStart(4)} \u2502`), /* @__PURE__ */ React42.createElement(HighlightedLine, { text: h.preview, start: h.matchStart, end: h.matchEnd }))))), card.hits.length > 10 ? /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, `\u22EE +${card.hits.length - 10} more hits`) : null);
+  ), grouped.map(([file, hits]) => /* @__PURE__ */ React42.createElement(Box35, { key: file, flexDirection: "column" }, /* @__PURE__ */ React42.createElement(Text36, { bold: true, color: FG.strong }, file), hits.map((h, i) => /* @__PURE__ */ React42.createElement(Box35, { key: `${file}:${h.line}:${i}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, `${h.line.toString().padStart(4)} \u2502`), /* @__PURE__ */ React42.createElement(HighlightedLine, { text: h.preview, start: h.matchStart, end: h.matchEnd }))))), card.hits.length > 10 ? /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, t(
+    card.hits.length - 10 === 1 ? "cardLabels.moreHitSingular" : "cardLabels.moreHitsPlural",
+    { count: card.hits.length - 10 }
+  )) : null);
 }
 function HighlightedLine({
   text,
@@ -8280,7 +8388,7 @@ function groupByFile(hits) {
 }
 
 // src/cli/ui/cards/StreamingCard.tsx
-import { Box as Box37, Text as Text38, useStdout as useStdout10 } from "ink";
+import { Box as Box37, Text as Text38, useStdout as useStdout11 } from "ink";
 import React44, { useContext as useContext5 } from "react";
 
 // src/cli/ui/layout/LiveExpandContext.ts
@@ -8289,7 +8397,7 @@ var LiveExpandContext = createContext3(false);
 
 // src/cli/ui/markdown.tsx
 import { highlight, supportsLanguage } from "cli-highlight";
-import { Box as Box36, Text as Text37, useStdout as useStdout9 } from "ink";
+import { Box as Box36, Text as Text37, useStdout as useStdout10 } from "ink";
 import React43 from "react";
 import stringWidth from "string-width";
 var BODY_LEFT_CELLS = 7;
@@ -8297,7 +8405,7 @@ var MarkdownWidthCtx = React43.createContext(void 0);
 function useWidth() {
   const ctx = React43.useContext(MarkdownWidthCtx);
   if (ctx !== void 0) return ctx;
-  return (useStdout9()?.stdout?.columns ?? process.stdout.columns ?? 80) - BODY_LEFT_CELLS;
+  return (useStdout10()?.stdout?.columns ?? process.stdout.columns ?? 80) - BODY_LEFT_CELLS;
 }
 marked.setOptions({ gfm: true, breaks: false });
 function Markdown({ text, width }) {
@@ -8618,7 +8726,7 @@ function tokenRate(text, startTs, endTs) {
 }
 var PILL_RATE = { bg: "#11141a", fg: "#8b949e" };
 function StreamingCard({ card }) {
-  const { stdout } = useStdout10();
+  const { stdout } = useStdout11();
   const cols = stdout?.columns ?? 80;
   const expanded = useContext5(LiveExpandContext);
   const reserveCap = expanded ? EXPANDED_MAX_LINES + 2 : STREAMING_PREVIEW_LINES2 + 2;
@@ -8637,7 +8745,7 @@ function StreamingCard({ card }) {
       {
         glyph: "\u2039",
         tone: TONE.ok,
-        title: "reply",
+        title: t("cardTitles.reply"),
         right: /* @__PURE__ */ React44.createElement(React44.Fragment, null, ratePill, modelPill)
       }
     ), /* @__PURE__ */ React44.createElement(Markdown, { text: card.text }));
@@ -8651,7 +8759,7 @@ function StreamingCard({ card }) {
   const aborted = !!card.aborted;
   const headColor = aborted ? TONE.err : TONE_ACTIVE.brand;
   const glyph = aborted ? "\u2039" : "\u25C8";
-  const headLabel = aborted ? "aborted" : "writing\u2026";
+  const headLabel = aborted ? t("cardLabels.aborted") : t("cardLabels.writing");
   const { tokens: liveTokens, tps: liveTps } = tokenRate(card.text, card.ts, Date.now());
   const liveRatePill = !aborted && liveTokens >= MIN_TOKENS_FOR_RATE && liveTps !== null ? /* @__PURE__ */ React44.createElement(Pill, { label: `${liveTps} t/s`, ...PILL_RATE, bold: false }) : null;
   const expandPill = !aborted ? /* @__PURE__ */ React44.createElement(Pill, { label: expanded ? "expanded \u2303o" : "preview \u2303o", ...PILL_RATE, bold: false }) : null;
@@ -8663,13 +8771,9 @@ function StreamingCard({ card }) {
       title: headLabel,
       right: /* @__PURE__ */ React44.createElement(React44.Fragment, null, liveRatePill, expandPill, aborted ? null : /* @__PURE__ */ React44.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand }), modelPill)
     }
-  ), expanded && droppedAbove > 0 ? /* @__PURE__ */ React44.createElement(
-    Text38,
-    {
-      color: FG.faint
-    },
-    `\u22EF ${droppedAbove} earlier line${droppedAbove === 1 ? "" : "s"} above`
-  ) : null, visible.map((line, i) => /* @__PURE__ */ React44.createElement(Box37, { key: `${card.id}:${visualLines.length - visible.length + i}`, flexDirection: "row" }, /* @__PURE__ */ React44.createElement(Text38, { color: aborted ? FG.meta : FG.body }, clipToCells(line, lineCells)))), aborted ? /* @__PURE__ */ React44.createElement(Text38, { color: FG.faint }, "[truncated by esc]") : null);
+  ), expanded && droppedAbove > 0 ? /* @__PURE__ */ React44.createElement(Text38, { color: FG.faint }, t(droppedAbove === 1 ? "cardLabels.earlierLine" : "cardLabels.earlierLines", {
+    count: droppedAbove
+  })) : null, visible.map((line, i) => /* @__PURE__ */ React44.createElement(Box37, { key: `${card.id}:${visualLines.length - visible.length + i}`, flexDirection: "row" }, /* @__PURE__ */ React44.createElement(Text38, { color: aborted ? FG.meta : FG.body }, clipToCells(line, lineCells)))), aborted ? /* @__PURE__ */ React44.createElement(Text38, { color: FG.faint }, t("cardLabels.truncatedByEsc")) : null);
 }
 
 // src/cli/ui/cards/SubAgentCard.tsx
@@ -8683,22 +8787,22 @@ function SubAgentCard({ card }) {
     failed: tone.err
   };
   const headColor = statusColor[card.status];
-  const headGlyph = card.status === "failed" ? "\u2716" : "\u232C";
+  const headGlyph = card.status === "failed" ? "\u2717" : "\u232C";
   const runningChildren = card.children.filter((c) => !isChildDone(c)).length;
   const isRunning = card.status === "running";
   const inLive = useContext6(ActiveCardContext);
-  const headerMeta2 = isRunning ? runningChildren > 0 ? [`${runningChildren} running`] : ["working"] : [{ text: card.status, color: headColor }];
+  const headerMeta2 = isRunning ? runningChildren > 0 ? [`${runningChildren} ${t("cardLabels.runningLabel")}`] : [t("cardLabels.workingLabel")] : [{ text: card.status, color: headColor }];
   return /* @__PURE__ */ React45.createElement(Card, { tone: headColor }, /* @__PURE__ */ React45.createElement(
     CardHeader,
     {
       glyph: headGlyph,
       tone: headColor,
-      title: "subagent",
+      title: t("cardTitles.subagent"),
       titleColor: tone.violet,
       subtitle: card.task,
       meta: headerMeta2
     }
-  ), card.name ? /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `agent \xB7 ${card.name}`) : null, card.tools && card.tools.length > 0 && /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `tools \xB7 ${card.tools.join(", ")}`), card.children.map((child) => /* @__PURE__ */ React45.createElement(Box38, { key: child.id, flexDirection: "row", gap: 1 }, inLive ? null : /* @__PURE__ */ React45.createElement(Text39, { color: tone.violet }, "\u258E"), /* @__PURE__ */ React45.createElement(ChildRow, { card: child }))));
+  ), card.name ? /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `${t("cardLabels.agent")} \xB7 ${card.name}`) : null, card.tools && card.tools.length > 0 && /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `${t("cardLabels.tools")} \xB7 ${card.tools.join(", ")}`), card.children.map((child) => /* @__PURE__ */ React45.createElement(Box38, { key: child.id, flexDirection: "row", gap: 1 }, inLive ? null : /* @__PURE__ */ React45.createElement(Text39, { color: tone.violet }, "\u258E"), /* @__PURE__ */ React45.createElement(ChildRow, { card: child }))));
 }
 function isChildDone(card) {
   switch (card.kind) {
@@ -8734,7 +8838,7 @@ function childVisual(card, doneColor, failedColor, fallbackColor) {
         statusGlyph: done ? doneGlyph(doneColor) : runningGlyph(CARD.reasoning.color),
         kindGlyph: "\u25C6",
         kindColor: CARD.reasoning.color,
-        text: `reasoning \xB7 ${card.paragraphs} \xB6`
+        text: t("cardLabels.reasoningLabel", { count: card.paragraphs })
       };
     }
     case "tool": {
@@ -8751,7 +8855,7 @@ function childVisual(card, doneColor, failedColor, fallbackColor) {
         statusGlyph: card.done ? doneGlyph(doneColor) : runningGlyph(CARD.streaming.color),
         kindGlyph: "\u25C8",
         kindColor: CARD.streaming.color,
-        text: card.done ? "response" : "writing \u2026"
+        text: card.done ? t("cardLabels.response") : t("cardLabels.writing")
       };
     case "diff":
       return {
@@ -8848,7 +8952,7 @@ function TipRowRender({
 }
 
 // src/cli/ui/cards/ToolCard.tsx
-import { Text as Text42, useStdout as useStdout11 } from "ink";
+import { Text as Text42, useStdout as useStdout12 } from "ink";
 import React48 from "react";
 var READ_TAIL = 2;
 var OTHER_TAIL = 5;
@@ -8857,7 +8961,7 @@ function tailLinesFor(name) {
   return /(?:^|_)(read|search|list|tree|get|status|diff|fetch|grep)(_|$)/.test(lower) || lower === "job_output" ? READ_TAIL : OTHER_TAIL;
 }
 function ToolCard({ card }) {
-  const { stdout } = useStdout11();
+  const { stdout } = useStdout12();
   const cols = stdout?.columns ?? 80;
   const lineCells = Math.max(20, cols - 4);
   const argsLabel = formatArgsSummary(card.args);
@@ -8876,7 +8980,7 @@ function ToolCard({ card }) {
     meta.push({ text: `\u21BB ${card.retry.attempt}/${card.retry.max}`, color: TONE.warn });
   }
   if (card.rejected) {
-    meta.push({ text: "rejected", color: TONE.err });
+    meta.push({ text: t("cardLabels.rejected"), color: TONE.err });
   }
   for (const part of metaTrail(card)) meta.push(part);
   return /* @__PURE__ */ React48.createElement(Card, { tone: headColor }, /* @__PURE__ */ React48.createElement(
@@ -8889,7 +8993,9 @@ function ToolCard({ card }) {
       meta: meta.length > 0 ? meta : void 0,
       right: status2 === "running" ? /* @__PURE__ */ React48.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand, bold: true }) : void 0
     }
-  ), showBody && (subagentMarkdown !== null ? /* @__PURE__ */ React48.createElement(Markdown, { text: subagentMarkdown, width: lineCells }) : /* @__PURE__ */ React48.createElement(React48.Fragment, null, hidden > 0 ? /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, `\u22EE ${hidden} earlier line${hidden === 1 ? "" : "s"} (use /tool to read full)`) : null, visible.map((line, i) => /* @__PURE__ */ React48.createElement(
+  ), showBody && (subagentMarkdown !== null ? /* @__PURE__ */ React48.createElement(Markdown, { text: subagentMarkdown, width: lineCells }) : /* @__PURE__ */ React48.createElement(React48.Fragment, null, hidden > 0 ? /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, t(hidden === 1 ? "cardLabels.earlierLine" : "cardLabels.earlierLines", {
+    count: hidden
+  })) : null, visible.map((line, i) => /* @__PURE__ */ React48.createElement(
     Text42,
     {
       key: `${card.id}:${hidden + i}`,
@@ -8949,10 +9055,11 @@ function headerColorFor(s) {
 function metaTrail(card) {
   const parts = [];
   const inputBytes = largestStringInputBytes(card.args);
-  if (inputBytes !== null) parts.push(`${formatBytes(inputBytes)} in`);
-  if (card.elapsedMs > 0) parts.push(`${(card.elapsedMs / 1e3).toFixed(2)}s`);
+  if (inputBytes !== null) parts.push(t("cardLabels.bytesIn", { bytes: formatBytes(inputBytes) }));
+  if (card.elapsedMs > 0)
+    parts.push(t("cardLabels.elapsedSec", { secs: (card.elapsedMs / 1e3).toFixed(2) }));
   if (card.done && !card.rejected && !card.aborted && card.exitCode !== void 0 && card.exitCode !== 0) {
-    parts.push(`exit ${card.exitCode}`);
+    parts.push(t("cardLabels.exit", { code: card.exitCode }));
   }
   return parts;
 }
@@ -9009,13 +9116,16 @@ function UsageCard({ card }) {
   const promptRatio = card.tokens.prompt / cap;
   const reasonRatio = card.tokens.reason / cap;
   const outputRatio = card.tokens.output / cap;
-  const headerMeta2 = [`turn ${card.turn}`, formatCost(card.cost, card.balanceCurrency)];
+  const headerMeta2 = [
+    `${t("cardLabels.turn")} ${card.turn}`,
+    formatCost(card.cost, card.balanceCurrency)
+  ];
   if (card.elapsedMs !== void 0) headerMeta2.push(`${(card.elapsedMs / 1e3).toFixed(1)}s`);
-  return /* @__PURE__ */ React49.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ React49.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: "usage", meta: headerMeta2 }), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "prompt"), bar(promptRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "reason"), bar(reasonRatio, TONE.accent), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "output"), bar(outputRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "cache "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, "session"), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, `\u26C1 ${formatCost(card.sessionCost, card.balanceCurrency, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(React49.Fragment, null, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, "\xB7 balance"), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
+  return /* @__PURE__ */ React49.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ React49.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: t("cardTitles.usage"), meta: headerMeta2 }), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.prompt")), bar(promptRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.reason")), bar(reasonRatio, TONE.accent), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.output")), bar(outputRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.cache"), " "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, t("cardLabels.session")), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, `\u26C1 ${formatCost(card.sessionCost, card.balanceCurrency, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(React49.Fragment, null, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${t("cardLabels.balance")}`), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
 }
 function CompactUsageRow({ card }) {
   const elapsed = card.elapsedMs !== void 0 ? ` \xB7 ${(card.elapsedMs / 1e3).toFixed(1)}s` : "";
-  return /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1, marginTop: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, "\u03A3"), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `turn ${card.turn}`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, `\xB7 ${compactNum(card.tokens.prompt)} prompt \xB7 ${compactNum(card.tokens.output)} out`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, "\xB7 cache"), /* @__PURE__ */ React49.createElement(Text43, { color: TONE.ok }, `${(card.cacheHit * 100).toFixed(0)}%`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${formatCost(card.cost, card.balanceCurrency)}${elapsed}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(Text43, { color: TONE.brand }, `\xB7 ${formatBalance(card.balance, card.balanceCurrency)}`) : null);
+  return /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1, marginTop: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, "\u03A3"), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `${t("cardLabels.turn")} ${card.turn}`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, `\xB7 ${compactNum(card.tokens.prompt)} ${t("cardLabels.prompt")} \xB7 ${compactNum(card.tokens.output)} ${t("cardLabels.output")}`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${t("cardLabels.cache")}`), /* @__PURE__ */ React49.createElement(Text43, { color: TONE.ok }, `${(card.cacheHit * 100).toFixed(0)}%`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${formatCost(card.cost, card.balanceCurrency)}${elapsed}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(Text43, { color: TONE.brand }, `\xB7 ${formatBalance(card.balance, card.balanceCurrency)}`) : null);
 }
 
 // src/cli/ui/cards/UserCard.tsx
@@ -9338,7 +9448,7 @@ function summarizeToolArgs(name, args) {
 }
 
 // src/cli/ui/layout/StatusRow.tsx
-import { Box as Box46, Text as Text49, useStdout as useStdout12 } from "ink";
+import { Box as Box46, Text as Text49, useStdout as useStdout13 } from "ink";
 import React56 from "react";
 
 // src/cli/ui/primitives/Countdown.tsx
@@ -9359,21 +9469,28 @@ var FEEDBACK_HINT_MIN_COLS = 100;
 function StatusRow() {
   const status2 = useAgentState((s) => s.status);
   const session = useAgentState((s) => s.session);
-  const { stdout } = useStdout12();
+  const { stdout } = useStdout13();
   const cols = stdout?.columns ?? 80;
   const ruleWidth = Math.max(RULE_MIN, cols - RULE_PAD);
   const hasTurn = status2.cost > 0;
   const hasSession = status2.sessionCost > 0;
   const hasBalance = typeof status2.balance === "number";
   const showWallet = cols >= WALLET_MIN_COLS && (hasSession || hasBalance);
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "column" }, /* @__PURE__ */ React56.createElement(Box46, null, /* @__PURE__ */ React56.createElement(Text49, null, "  "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint }, "\u2500".repeat(ruleWidth))), /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, null, "  "), status2.recording ? /* @__PURE__ */ React56.createElement(RecordingPill, { rec: status2.recording }) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ React56.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds }) : /* @__PURE__ */ React56.createElement(ModePill2, { mode: status2.mode, network: status2.network, detail: status2.networkDetail }), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, `${session.id} \xB7 ${session.branch}`), hasTurn && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.brand }, "\u25B8 "), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: FG.body }, `${formatCost(status2.cost, status2.balanceCurrency)} turn`)), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.accent }, `cache ${Math.round(status2.cacheHit * 100)}%`), showWallet && /* @__PURE__ */ React56.createElement(
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Box46, { height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, null, "  "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, "\u2500".repeat(ruleWidth))), /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, minHeight: 1, flexWrap: "nowrap", flexShrink: 0 }, /* @__PURE__ */ React56.createElement(Text49, { wrap: "truncate" }, "  "), status2.recording ? /* @__PURE__ */ React56.createElement(RecordingPill, { rec: status2.recording }) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ React56.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds }) : /* @__PURE__ */ React56.createElement(ModePill2, { mode: status2.mode, network: status2.network, detail: status2.networkDetail }), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, `${session.id} \xB7 ${session.branch}`), hasTurn && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.brand, wrap: "truncate" }, "\u25B8 "), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: FG.body, wrap: "truncate" }, `${formatCost(status2.cost, status2.balanceCurrency)} turn`)), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(
+    Text49,
+    {
+      color: TONE.accent,
+      wrap: "truncate"
+    },
+    `cache ${Math.round(status2.cacheHit * 100)}%`
+  ), showWallet && /* @__PURE__ */ React56.createElement(
     WalletPill,
     {
       sessionCostUsd: status2.sessionCost,
       balance: status2.balance,
       currency: status2.balanceCurrency
     }
-  ), cols >= VERSION_MIN_COLS && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint }, `v${VERSION}`), cols >= FEEDBACK_HINT_MIN_COLS && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint }, "  \xB7  "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "\u2691 "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, "/feedback")))));
+  ), cols >= VERSION_MIN_COLS && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, `v${VERSION}`), cols >= FEEDBACK_HINT_MIN_COLS && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, "  \xB7  "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "\u2691 "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, "/feedback")))));
 }
 function WalletPill({
   sessionCostUsd,
@@ -9382,7 +9499,14 @@ function WalletPill({
 }) {
   const showSpent = sessionCostUsd > 0;
   const showBalance = typeof balance === "number";
-  return /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "\u26C1 "), showSpent && /* @__PURE__ */ React56.createElement(Text49, { color: FG.body }, `${formatCost(sessionCostUsd, currency, 2)} spent`), showSpent && showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "  /  "), showBalance && /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: balanceColor(balance, currency) }, formatBalance(balance, currency, { fractionDigits: 2 })), showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint }, " left"));
+  return /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "\u26C1 "), showSpent && /* @__PURE__ */ React56.createElement(
+    Text49,
+    {
+      color: FG.body,
+      wrap: "truncate"
+    },
+    `${formatCost(sessionCostUsd, currency, 2)} spent`
+  ), showSpent && showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "  /  "), showBalance && /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: balanceColor(balance, currency), wrap: "truncate" }, formatBalance(balance, currency, { fractionDigits: 2 })), showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, " left"));
 }
 function ModePill2({
   mode: mode2,
@@ -9391,18 +9515,18 @@ function ModePill2({
 }) {
   if (network === "online") {
     const pill = modeGlyph(mode2);
-    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, ` ${mode2}`));
+    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, ` ${mode2}`));
   }
   const dot = networkDot(network);
   if (network === "slow") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, ` ${mode2} \xB7 slow${tail}`));
+    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, ` ${mode2} \xB7 slow${tail}`));
   }
   if (network === "disconnected") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, ` disconnect${tail}`));
+    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, ` disconnect${tail}`));
   }
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, " reconnecting\u2026"));
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, " reconnecting\u2026"));
 }
 function CountdownRow({
   mode: mode2,
@@ -9410,14 +9534,14 @@ function CountdownRow({
 }) {
   const pill = modeGlyph(mode2);
   const endsAt = Date.now() + secondsLeft * 1e3;
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, ` ${mode2}   \xB7   `), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn }, "approving in "), /* @__PURE__ */ React56.createElement(Countdown, { endsAt }), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn }, "s \xB7 esc to interrupt"));
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, ` ${mode2}   \xB7   `), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn, wrap: "truncate" }, "approving in "), /* @__PURE__ */ React56.createElement(Countdown, { endsAt }), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn, wrap: "truncate" }, "s \xB7 esc to interrupt"));
 }
 function RecordingPill({ rec }) {
   const sizeMb = (rec.sizeBytes / (1024 * 1024)).toFixed(1);
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.err }, "\u25CFREC"), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.err }, ` ${sizeMb} MB \xB7 ${rec.events} evt`));
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.err, wrap: "truncate" }, "\u25CFREC"), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.err, wrap: "truncate" }, ` ${sizeMb} MB \xB7 ${rec.events} evt`));
 }
 function Sep() {
-  return /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "   \xB7   ");
+  return /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "   \xB7   ");
 }
 function modeGlyph(mode2) {
   switch (mode2) {
@@ -9445,7 +9569,7 @@ function networkDot(state) {
 }
 
 // src/cli/ui/layout/ToastRail.tsx
-import { Box as Box47, Text as Text50, useStdout as useStdout13 } from "ink";
+import { Box as Box47, Text as Text50, useStdout as useStdout14 } from "ink";
 import React57, { useEffect as useEffect8 } from "react";
 var TONE_COLOR = {
   ok: TONE.ok,
@@ -9468,7 +9592,7 @@ function ToastRail() {
   const toasts = useAgentState((s) => s.toasts);
   const dispatch = useDispatch();
   useSlowTick();
-  const { stdout } = useStdout13();
+  const { stdout } = useStdout14();
   const cols = stdout?.columns ?? 80;
   const rule = "\u2501".repeat(Math.max(20, cols - 4));
   const now = Date.now();
@@ -9873,24 +9997,28 @@ var update = (_args, _loop, ctx) => {
     return { info: lines.join("\n") };
   }
   lines.push(t("handlers.admin.updateLatest", { version: latest }));
-  const diff = compareVersions(VERSION, latest);
-  if (diff >= 0) {
+  if (compareVersions(VERSION, latest) >= 0) {
     lines.push("", t("handlers.admin.updateUpToDate"));
     return { info: lines.join("\n") };
   }
-  if (isNpxInstall()) {
+  const installSource = detectInstallSource();
+  const npmPrefix = installSource === "npm" ? detectNpmInstallPrefix() : null;
+  const plan2 = planUpdate({ current: VERSION, latest, installSource, npmPrefix });
+  if (plan2.action === "npx-hint") {
     lines.push("", t("handlers.admin.updateNpxHint"), t("handlers.admin.updateNpxForce"));
+    return { info: lines.join("\n") };
+  }
+  lines.push("", t("handlers.admin.updateUpgradeHint"), t("handlers.admin.updateUpgradeCmd1"));
+  if (plan2.action === "run-install" && plan2.command) {
+    lines.push(t("handlers.admin.updateUpgradeCmd2", { command: plan2.command.join(" ") }));
   } else {
-    lines.push(
-      "",
-      t("handlers.admin.updateUpgradeHint"),
-      t("handlers.admin.updateUpgradeCmd1"),
-      t("handlers.admin.updateUpgradeCmd2"),
-      "",
-      t("handlers.admin.updateInSessionDisabled"),
-      t("handlers.admin.updateInSessionDisabled2")
-    );
+    lines.push(...MANUAL_UPDATE_COMMANDS.map((c) => `  ${c}`));
   }
+  lines.push(
+    "",
+    t("handlers.admin.updateInSessionDisabled"),
+    t("handlers.admin.updateInSessionDisabled2")
+  );
   return { info: lines.join("\n") };
 };
 var stats = () => {
@@ -11067,7 +11195,9 @@ function buildFeedbackDiagnostic(input) {
 }
 function formatVersion(installed, latest) {
   if (!latest) return installed;
-  if (latest === installed) return `${installed} (latest)`;
+  const cmp = compareVersions(installed, latest);
+  if (cmp === 0) return `${installed} (latest)`;
+  if (cmp > 0) return installed;
   return `${installed} (latest: ${latest})`;
 }
 function formatModel(model2, effort) {
@@ -11715,6 +11845,31 @@ var handlers17 = {
   se: (args, loop2, ctx) => handlers17["search-engine"](args, loop2, ctx)
 };
 
+// src/cli/ui/slash/nearest.ts
+function nearestCommands(input, all, opts = {}) {
+  if (!input) return [];
+  const max = opts.max ?? 3;
+  const maxDistance = Math.min(opts.maxDistance ?? 3, Math.floor(input.length / 2));
+  if (max <= 0 || maxDistance <= 0) return [];
+  return all.map((name) => ({ name, distance: levenshtein(input, name) })).filter((entry) => entry.distance <= maxDistance).sort((a, b) => a.distance - b.distance || a.name.localeCompare(b.name)).slice(0, max).map((entry) => entry.name);
+}
+function levenshtein(a, b) {
+  if (a === b) return 0;
+  if (!a) return b.length;
+  if (!b) return a.length;
+  let prev = Array.from({ length: b.length + 1 }, (_, i) => i);
+  let next = new Array(b.length + 1).fill(0);
+  for (let i = 0; i < a.length; i += 1) {
+    next[0] = i + 1;
+    for (let j = 0; j < b.length; j += 1) {
+      const cost2 = a[i] === b[j] ? 0 : 1;
+      next[j + 1] = Math.min((next[j] ?? 0) + 1, (prev[j + 1] ?? 0) + 1, (prev[j] ?? 0) + cost2);
+    }
+    [prev, next] = [next, prev];
+  }
+  return prev[b.length] ?? 0;
+}
+
 // src/cli/ui/slash/dispatch.ts
 var HANDLERS = {
   ...handlers,
@@ -11738,6 +11893,11 @@ var HANDLERS = {
 function handleSlash(cmd, args, loop2, ctx = {}) {
   const h = HANDLERS[resolveSlashAlias(cmd)];
   if (h) return h(args, loop2, ctx);
+  const suggestions = nearestCommands(cmd, Object.keys(HANDLERS));
+  if (suggestions.length > 0) {
+    const list2 = suggestions.map((name) => `/${name}`).join(", ");
+    return { unknown: true, info: `unknown command: /${cmd} \u2014 did you mean ${list2}?` };
+  }
   return { unknown: true, info: `unknown command: /${cmd}  (try /help)` };
 }
 
@@ -11774,6 +11934,16 @@ var TurnTranslator = class {
       this.toolCardId = null;
     }
   }
+  toolAbort(output) {
+    if (this.toolCardId) {
+      this.log.endTool(this.toolCardId, {
+        output,
+        elapsedMs: Date.now() - this.toolStartedAt,
+        aborted: true
+      });
+      this.toolCardId = null;
+    }
+  }
   toolRetry(attempt, max) {
     if (this.toolCardId) this.log.retryTool(this.toolCardId, attempt, max);
   }
@@ -12658,9 +12828,9 @@ function useSubagent({
 // src/cli/ui/App.tsx
 var FLUSH_INTERVAL_MS = (() => {
   const raw = process.env.REASONIX_FLUSH_MS;
-  if (!raw) return 33;
+  if (!raw) return 16;
   const parsed = Number(raw);
-  if (!Number.isFinite(parsed) || parsed < 16 || parsed > 1e3) return 33;
+  if (!Number.isFinite(parsed) || parsed < 16 || parsed > 1e3) return 16;
   return Math.round(parsed);
 })();
 var PLAIN_UI = process.env.REASONIX_UI === "plain";
@@ -12702,7 +12872,8 @@ function AppInner({
   progressSink,
   codeMode,
   noDashboard,
-  onSwitchSession
+  onSwitchSession,
+  mouse = true
 }) {
   markPhase("app_inner_start");
   const log = useScrollback();
@@ -12711,6 +12882,7 @@ function AppInner({
     (s) => s.cards.some((c) => c.kind === "user" || c.kind === "streaming")
   );
   const isStreaming = useAgentState((s) => s.cards.some((c) => c.kind === "streaming" && !c.done));
+  const activityLabel = useActivityLabel();
   const chatScroll = useChatScroll();
   const [input, setInput] = useState20("");
   const [busy, setBusy] = useState20(false);
@@ -12734,18 +12906,18 @@ function AppInner({
   }, [busy]);
   const [ongoingTool, setOngoingTool] = useState20(null);
   const [toolProgress, setToolProgress] = useState20(null);
-  const { stdout } = useStdout14();
+  const { stdout } = useStdout15();
   useEffect12(() => {
     if (!stdout || !stdout.isTTY) return;
     stdout.write("\x1B[?2004h");
     stdout.write("\x1B[>4;2m");
-    stdout.write("\x1B[?1006h\x1B[?1000h");
+    if (mouse) stdout.write("\x1B[?1007h");
     return () => {
-      stdout.write("\x1B[?1000l\x1B[?1006l");
+      if (mouse) stdout.write("\x1B[?1007l");
       stdout.write("\x1B[?2004l");
       stdout.write("\x1B[>4m");
     };
-  }, [stdout]);
+  }, [stdout, mouse]);
   const walletCurrencyRef = useRef9(void 0);
   const { activities: subagentActivities, sinkRef: subagentSinkRef } = useSubagent({
     session,
@@ -12894,7 +13066,7 @@ function AppInner({
   const loopRef = useRef9(null);
   const loop2 = useMemo9(() => {
     if (loopRef.current) return loopRef.current;
-    const client = new DeepSeekClient();
+    const client = new DeepSeekClient({ baseUrl: loadBaseUrl() });
     if (tools && !tools.has("run_skill")) {
       registerSkillTools(tools, {
         projectRoot: codeMode?.rootDir,
@@ -13214,11 +13386,12 @@ function AppInner({
   }, [session, loop2, codeMode, syncPendingCount, log]);
   const quitProcess = useQuit(transcriptRef);
   useKeystroke((ev) => {
+    const pickerOwnsArrows = (atState?.entries.length ?? 0) > 0 || (slashMatches?.length ?? 0) > 0 || (slashArgMatches?.length ?? 0) > 0 || pendingShell != null;
     if (ev.pageUp || ev.mouseScrollUp) chatScroll.scrollUp();
     else if (ev.pageDown || ev.mouseScrollDown) chatScroll.scrollDown();
     else if (ev.end) chatScroll.jumpToBottom();
-    else if ((!chatScroll.pinned || busy) && ev.upArrow) chatScroll.scrollUp();
-    else if ((!chatScroll.pinned || busy) && ev.downArrow) chatScroll.scrollDown();
+    else if (!pickerOwnsArrows && ev.upArrow) chatScroll.scrollUp();
+    else if (!pickerOwnsArrows && ev.downArrow) chatScroll.scrollDown();
   }, !modalOpen);
   useKeystroke((ev) => {
     const chKey = ev.input;
@@ -13433,7 +13606,7 @@ function AppInner({
     if (dashboardRef.current) return dashboardRef.current.url;
     if (dashboardStartingRef.current) return dashboardStartingRef.current;
     const startup = (async () => {
-      const { startDashboardServer } = await import("./server-SMLVXIW4.js");
+      const { startDashboardServer } = await import("./server-W4XJK4GX.js");
       const handle = await startDashboardServer({
         mode: "attached",
         configPath: defaultConfigPath(),
@@ -13757,7 +13930,7 @@ function AppInner({
       }
       if (text.startsWith("/") && !text.includes(" ")) {
         const typed = text.slice(1).toLowerCase();
-        const matches = suggestSlashCommands(typed, !!codeMode);
+        const matches = suggestSlashCommands(typed, !!codeMode, slashUsage);
         const exact = matches.find((m) => m.cmd === typed);
         if (!exact && matches.length > 0) {
           const chosen = matches[slashSelected] ?? matches[0];
@@ -14197,7 +14370,13 @@ function AppInner({
               codeModeOn: !!codeMode
             });
           } else if (ev.role === "error") {
-            handleErrorEvent(ev, { log });
+            handleErrorEvent(ev, {
+              log,
+              setOngoingTool,
+              setToolProgress,
+              toolStartedAtRef,
+              translator
+            });
           } else if (ev.role === "warning") {
             handleWarningEvent(ev, { log, setTurnOnPro });
           }
@@ -14251,6 +14430,7 @@ function AppInner({
       planMode,
       session,
       slashSelected,
+      slashUsage,
       atState,
       atSelected,
       pickAtMention,
@@ -14376,7 +14556,7 @@ function AppInner({
       }
       if (!staged) return;
       const trimmed = feedback2.trim();
-      let synthetic;
+      const tail = trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed;
       let marker;
       if (staged.mode === "approve") {
         togglePlanMode(false);
@@ -14394,19 +14574,7 @@ function AppInner({
           });
           persistPlanState();
         }
-        if (trimmed) {
-          synthetic = `The plan above has been approved. Implement it now. You are out of plan mode \u2014 use edit_file / write_file / run_command as needed.
-
-User's additional instructions / answers to your open questions:
-
-${trimmed}
-
-Factor these in before the first edit. Stick to the plan unless you discover a concrete reason to deviate; if you do, tell me and wait for a response.`;
-          marker = `\u25B8 plan approved + instructions \u2014 ${trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed}`;
-        } else {
-          synthetic = "The plan above has been approved. Implement it now. You are out of plan mode \u2014 use edit_file / write_file / run_command as needed. If the plan listed open questions and I didn't answer them, default to the safest interpretation and call them out in your first reply. Don't fabricate preferences \u2014 if a question is truly unanswerable without me, stop and ask.";
-          marker = "\u25B8 plan approved \u2014 implementing";
-        }
+        marker = trimmed ? `\u25B8 plan approved + instructions \u2014 ${tail}` : "\u25B8 plan approved \u2014 implementing";
       } else if (staged.mode === "reject") {
         planStepsRef.current = null;
         completedStepIdsRef.current = /* @__PURE__ */ new Set();
@@ -14415,38 +14583,20 @@ Factor these in before the first edit. Stick to the plan unless you discover a c
         persistPlanState();
         togglePlanMode(false);
         agentStore.dispatch({ type: "plan.drop" });
-        if (trimmed) {
-          synthetic = `The plan was rejected. User's reason / what they actually want:
-
-${trimmed}
-
-Drop the proposed plan entirely. Use this guidance to understand what the user is after \u2014 ask follow-up questions if anything is still unclear, otherwise propose a different plan that addresses it.`;
-          marker = `\u25B8 plan rejected \u2014 ${trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed}`;
-        } else {
-          synthetic = "The plan was cancelled. Drop it entirely. Ask me what I actually want before proposing another plan or making any changes.";
-          marker = "\u25B8 plan cancelled";
-        }
+        marker = trimmed ? `\u25B8 plan rejected \u2014 ${tail}` : "\u25B8 plan cancelled";
       } else {
-        if (trimmed) {
-          synthetic = `The plan needs refinement. User feedback / answers:
-
-${trimmed}
-
-Stay in plan mode \u2014 address the feedback (explore more if needed), then submit an improved submit_plan call. Don't propose a near-identical plan unless you explain why the feedback doesn't apply.`;
-          marker = `\u25B8 refining \u2014 ${trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed}`;
-        } else {
-          synthetic = "The plan needs refinement. The user saw your open questions / risks block and chose not to answer specifics. Pick the safest default for each open question, call those defaults out explicitly in the new plan, and submit the refined submit_plan. Do not re-ask \u2014 the user already saw the questions.";
-          marker = "\u25B8 refining \u2014 using safe defaults";
-        }
+        marker = trimmed ? `\u25B8 refining \u2014 ${tail}` : "\u25B8 refining \u2014 using safe defaults";
       }
+      log.pushInfo(marker);
       const gateId = pendingGateIdRef.current;
       if (gateId !== null) {
+        const fb = trimmed || void 0;
         if (staged.mode === "approve") {
-          pauseGate.resolve(gateId, { type: "approve" });
+          pauseGate.resolve(gateId, { type: "approve", feedback: fb });
         } else if (staged.mode === "reject") {
-          pauseGate.resolve(gateId, { type: "cancel" });
+          pauseGate.resolve(gateId, { type: "cancel", feedback: fb });
         } else {
-          pauseGate.resolve(gateId, { type: "refine" });
+          pauseGate.resolve(gateId, { type: "refine", feedback: fb });
         }
       }
     },
@@ -14740,7 +14890,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       dashboardUrl,
       languageVersion
     }
-  ) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && ongoingTool ? /* @__PURE__ */ React60.createElement(OngoingToolRow, { tool: ongoingTool, progress: toolProgress }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && subagentActivities.length > 0 ? /* @__PURE__ */ React60.createElement(SubagentLiveStack, { activities: subagentActivities, max: 3 }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && !ongoingTool && statusLine ? /* @__PURE__ */ React60.createElement(ThinkingRow, { text: statusLine }) : null, !PLAIN_UI && undoBanner && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && !pendingChoice && !stagedChoiceCustom && !pendingRevision && !stagedCheckpointRevise && !pendingCheckpoint ? /* @__PURE__ */ React60.createElement(UndoBanner, { banner: undoBanner }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && busy && !isStreaming && !ongoingTool && !statusLine ? /* @__PURE__ */ React60.createElement(ThinkingRow, { text: "processing\u2026" }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview ? /* @__PURE__ */ React60.createElement(PlanLiveRow, null) : null, /* @__PURE__ */ React60.createElement(ToastRail, null)), stagedInput ? /* @__PURE__ */ React60.createElement(
+  ) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && ongoingTool ? /* @__PURE__ */ React60.createElement(OngoingToolRow, { tool: ongoingTool, progress: toolProgress }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && subagentActivities.length > 0 ? /* @__PURE__ */ React60.createElement(SubagentLiveStack, { activities: subagentActivities, max: 3 }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && !ongoingTool && statusLine ? /* @__PURE__ */ React60.createElement(ThinkingRow, { text: statusLine }) : null, !PLAIN_UI && undoBanner && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && !pendingChoice && !stagedChoiceCustom && !pendingRevision && !stagedCheckpointRevise && !pendingCheckpoint ? /* @__PURE__ */ React60.createElement(UndoBanner, { banner: undoBanner }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && busy && !isStreaming && !ongoingTool && !statusLine ? /* @__PURE__ */ React60.createElement(ThinkingRow, { text: activityLabel }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview ? /* @__PURE__ */ React60.createElement(PlanLiveRow, null) : null, /* @__PURE__ */ React60.createElement(ToastRail, null)), stagedInput ? /* @__PURE__ */ React60.createElement(
     PlanRefineInput,
     {
       mode: stagedInput.mode,
@@ -14989,7 +15139,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       block: pendingEdits.current[0],
       onChoose: handleWalkChoice
     }
-  ) : !chatScroll.pinned ? /* @__PURE__ */ React60.createElement(Text52, { color: FG.faint }, " \u{1F4D6} reading history \u2014 End / PgDn to return \xB7 \u2193 to advance one line") : /* @__PURE__ */ React60.createElement(React60.Fragment, null, codeMode ? /* @__PURE__ */ React60.createElement(
+  ) : !chatScroll.pinned ? /* @__PURE__ */ React60.createElement(Text52, { color: FG.faint }, " \u{1F4D6} reading history \u2014 End / PgDn to return \xB7 \u2193 to advance one line") : /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, codeMode ? /* @__PURE__ */ React60.createElement(
     ModeStatusBar,
     {
       editMode,
@@ -15009,15 +15159,16 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       onHistoryPrev: recallPrev,
       onHistoryNext: recallNext
     }
-  ), slashMatches !== null ? /* @__PURE__ */ React60.createElement(
+  )), /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, slashMatches !== null ? /* @__PURE__ */ React60.createElement(
     SlashSuggestions,
     {
+      key: `slash-suggestions:${slashGroupMode ? "group" : "search"}`,
       matches: slashMatches,
       selectedIndex: slashSelected,
       groupMode: slashGroupMode,
       advancedHidden: slashAdvancedHidden
     }
-  ) : null, atState !== null ? /* @__PURE__ */ React60.createElement(AtMentionSuggestions, { state: atState, selectedIndex: atSelected }) : null, slashArgContext ? /* @__PURE__ */ React60.createElement(
+  ) : null, atState !== null ? /* @__PURE__ */ React60.createElement(AtMentionSuggestions, { state: atState, selectedIndex: atSelected }) : null), slashArgContext ? /* @__PURE__ */ React60.createElement(
     SlashArgPicker,
     {
       matches: slashArgMatches,
@@ -15089,7 +15240,7 @@ function Setup({ onReady }) {
       return;
     }
     if (!isPlausibleKey(trimmed)) {
-      setError("Doesn't look like a DeepSeek key. They start with 'sk-' and are 30+ chars.");
+      setError("Key looks too short \u2014 paste the full token (16+ chars, no spaces).");
       setValue("");
       return;
     }
@@ -15382,6 +15533,7 @@ function Root({
       progressSink,
       codeMode: appProps.codeMode,
       noDashboard: appProps.noDashboard,
+      mouse: appProps.mouse,
       onSwitchSession: setActiveSession
     }
   ));
@@ -15456,7 +15608,12 @@ async function chatCommand(opts) {
       exitOnCtrlC: true,
       // patchConsole:false — winpty/MINTTY redraw-glitch source.
       patchConsole: false,
-      incrementalRendering: true,
+      // incrementalRendering:false — Ink's diff drifts when stringWidth
+      // misjudges CJK / emoji ZWJ width or when async terminal-event
+      // bytes interleave mid-render, leaving residual rows. Full-frame
+      // redraws cost more stdout bytes per flush but eliminate the
+      // ghost class.
+      incrementalRendering: false,
       // Default true — alt-screen is the only mode without scrollback-
       // reflow ghosting. `--no-alt-screen` opts back into scrollback mode
       // for users who need chat output preserved in shell history on exit.
@@ -15474,4 +15631,4 @@ async function chatCommand(opts) {
 export {
   chatCommand
 };
-//# sourceMappingURL=chunk-GPHBJWCV.js.map
+//# sourceMappingURL=chunk-3OBWN2NH.js.map