reasonix 0.33.2 → 0.34.0

package/dist/cli/{chunk-OW7IHE6M.js → chunk-5SAMVHA3.js}

@@ -6,16 +6,6 @@ import {
 import {
   preflightStdioSpec
 } from "./chunk-RFX7TYVV.js";
-import {
-  CARD,
-  FG,
-  SURFACE,
-  TONE,
-  TONE_ACTIVE,
-  balanceColor,
-  formatBalance,
-  formatCost
-} from "./chunk-63KAV5DX.js";
 import {
   dumpStartupProfile,
   markPhase
@@ -30,7 +20,8 @@ import {
   expandAtMentions,
   expandAtUrls,
   formatSubagentResult,
-  listFilesWithStatsAsync,
+  listDirectory,
+  parseAtQuery,
   parseEditBlocks,
   rankPickerCandidates,
   registerChoiceTool,
@@ -41,8 +32,9 @@ import {
   snapshotBeforeEdits,
   spawnSubagent,
   toWholeFileEditBlock,
+  walkFilesStream,
   webFetch
-} from "./chunk-G7M3QWEN.js";
+} from "./chunk-LNTORE5K.js";
 import {
   McpClient,
   SseTransport,
@@ -63,12 +55,15 @@ import {
   KeystrokeProvider,
   SingleSelect,
   useKeystroke
-} from "./chunk-SDE5U32Z.js";
+} from "./chunk-KZHMKOJH.js";
 import {
   COLOR,
   GLYPH,
-  GRADIENT
-} from "./chunk-ZPTSJGX5.js";
+  GRADIENT,
+  ThemeProvider,
+  useColor,
+  useThemeTokens
+} from "./chunk-2EBODRRO.js";
 import {
   PRESETS,
   PRESET_DESCRIPTIONS,
@@ -76,7 +71,7 @@ import {
 } from "./chunk-MHDNZXJJ.js";
 import {
   runDoctorChecks
-} from "./chunk-WVJL7ZO2.js";
+} from "./chunk-F3ILWP2L.js";
 import {
   countTokens
 } from "./chunk-DAEAAVDF.js";
@@ -102,7 +97,7 @@ import {
   resolveSlashAlias,
   savePlanState,
   suggestSlashCommands
-} from "./chunk-FXGQ5NHE.js";
+} from "./chunk-SA4UGZPG.js";
 import {
   eventLogPath,
   openEventSink
@@ -118,7 +113,7 @@ import {
   formatCommandResult,
   pauseGate,
   runCommand
-} from "./chunk-W4LDFAZ6.js";
+} from "./chunk-SX6L4HZZ.js";
 import {
   PROJECT_MEMORY_FILE,
   SkillStore,
@@ -132,7 +127,7 @@ import {
   loadHooks,
   projectSettingsPath,
   runHooks
-} from "./chunk-WBDE4IRI.js";
+} from "./chunk-OERAGRJX.js";
 import {
   VERSION,
   compareVersions,
@@ -157,8 +152,9 @@ import {
   notifyLanguageChange,
   onLanguageChange,
   setLanguage,
-  t
-} from "./chunk-QGE6AF76.js";
+  t,
+  tObj
+} from "./chunk-Q36KBLSU.js";
 import {
   addProjectShellAllowed,
   clearProjectShellAllowed,
@@ -169,18 +165,35 @@ import {
   loadEditMode,
   loadProjectShellAllowed,
   loadReasoningEffort,
+  loadTheme,
   markEditModeHintShown,
+  markMouseClipboardHintShown,
+  mouseClipboardHintShown,
   readConfig,
   redactKey,
   removeProjectShellAllowed,
+  resolveThemePreference,
   saveApiKey,
   saveEditMode,
   saveReasoningEffort,
+  saveTheme,
   searchEnabled,
   webSearchEndpoint,
   webSearchEngine,
   writeConfig
-} from "./chunk-DULSP7JH.js";
+} from "./chunk-5JXXEPDM.js";
+import {
+  CARD,
+  FG,
+  SURFACE,
+  TONE,
+  TONE_ACTIVE,
+  balanceColor,
+  formatBalance,
+  formatCost,
+  isThemeName,
+  listThemeNames
+} from "./chunk-WUI3P4RA.js";
 import {
   aggregateUsage,
   appendUsage,
@@ -195,7 +208,7 @@ import {
 
 // src/cli/commands/chat.tsx
 import { render } from "ink";
-import React62, { useState as useState22 } from "react";
+import React63, { useState as useState22 } from "react";
 
 // src/mcp/summary.ts
 function buildMcpServerSummary(opts) {
@@ -218,8 +231,8 @@ function buildMcpServerSummary(opts) {
 // src/cli/ui/App.tsx
 import { statSync } from "fs";
 import { resolve as resolve2 } from "path";
-import { Box as Box48, Text as Text51, useStdout as useStdout14 } from "ink";
-import React59, { useCallback as useCallback11, useEffect as useEffect12, useMemo as useMemo9, useRef as useRef8, useState as useState20 } from "react";
+import { Box as Box49, Text as Text52, useStdout as useStdout14 } from "ink";
+import React60, { useCallback as useCallback11, useEffect as useEffect12, useMemo as useMemo9, useRef as useRef8, useState as useState20 } from "react";
 
 // src/code/checkpoints.ts
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
@@ -851,28 +864,64 @@ ${skill2.body}${argsBlock}`;
 // src/cli/ui/AtMentionSuggestions.tsx
 import { Box, Text } from "ink";
 import React from "react";
+var ROW_WINDOW = 8;
 function AtMentionSuggestions({
-  matches,
-  selectedIndex,
-  query
+  state,
+  selectedIndex
 }) {
-  if (matches === null) return null;
-  if (matches.length === 0) {
-    return /* @__PURE__ */ React.createElement(Box, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { color: COLOR.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ React.createElement(Text, null, " "), /* @__PURE__ */ React.createElement(Text, { color: COLOR.warn }, `no files match "@${query}"`), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, " \u2014 keep typing or Backspace; paths resolve from the code root"));
-  }
-  const MAX = 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 color = useColor();
+  if (!state) return null;
+  const isBrowse = state.kind === "browse";
+  const entries = state.entries;
+  const total = entries.length;
+  const windowStart = total <= ROW_WINDOW ? 0 : Math.max(0, Math.min(selectedIndex - Math.floor(ROW_WINDOW / 2), total - ROW_WINDOW));
+  const shown = entries.slice(windowStart, windowStart + ROW_WINDOW);
   const hiddenAbove = windowStart;
   const hiddenBelow = total - windowStart - shown.length;
-  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: COLOR.primary, bold: true }, "@ "), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, query ? `${total} match${total === 1 ? "" : "es"} for "${query}"` : `${total} file${total === 1 ? "" : "s"}`), hiddenAbove > 0 ? /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null), shown.map((path, i) => /* @__PURE__ */ React.createElement(FileRow, { key: path, path, isSelected: windowStart + i === selectedIndex })), hiddenBelow > 0 ? /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   \u2193 ${hiddenBelow} below`) : null, /* @__PURE__ */ React.createElement(Box, { marginTop: 0 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "  \u2191\u2193 navigate \xB7 Tab / \u23CE insert as @path \xB7 esc cancel")));
+  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React.createElement(HeaderRow, { state, hiddenAbove }), total === 0 ? /* @__PURE__ */ React.createElement(EmptyRow, { state, color }) : null, shown.map((entry, i) => /* @__PURE__ */ React.createElement(
+    EntryRow,
+    {
+      key: `${entry.insertPath}:${entry.isDir ? "d" : "f"}`,
+      entry,
+      isSelected: windowStart + i === selectedIndex
+    }
+  )), hiddenBelow > 0 ? /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   \u2193 ${hiddenBelow} below`) : null, /* @__PURE__ */ React.createElement(FooterRow, { isBrowse, hasFolder: shown.some((e) => e.isDir) }));
 }
-function FileRow({ path, isSelected }) {
-  const slash = path.lastIndexOf("/");
-  const dir = slash >= 0 ? `${path.slice(0, slash)}/` : "";
-  const base = slash >= 0 ? path.slice(slash + 1) : path;
-  return /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: isSelected ? COLOR.primary : COLOR.info, bold: isSelected }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ React.createElement(Text, { color: COLOR.primary, bold: isSelected }, base.padEnd(20)), dir ? /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `  ${dir}`) : null);
+function HeaderRow({
+  state,
+  hiddenAbove
+}) {
+  const color = useColor();
+  const total = state.entries.length;
+  const lead = /* @__PURE__ */ React.createElement(Text, { color: color.primary, bold: true }, "@ ");
+  if (state.kind === "browse") {
+    const where = state.baseDir === "" ? "/" : `${state.baseDir}/`;
+    const counter = state.loading ? "loading\u2026" : `${total} ${total === 1 ? "entry" : "entries"}`;
+    return /* @__PURE__ */ React.createElement(Box, null, lead, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `${where}  ${counter}`), hiddenAbove > 0 ? /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null);
+  }
+  const status2 = state.searching ? `searching\u2026 ${state.scanned} scanned \xB7 ${total} ${total === 1 ? "match" : "matches"}` : `${total} ${total === 1 ? "match" : "matches"} for "${state.filter}"`;
+  return /* @__PURE__ */ React.createElement(Box, null, lead, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, status2), hiddenAbove > 0 ? /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null);
+}
+function EmptyRow({ state, color }) {
+  if (state.kind === "browse") {
+    if (state.loading) return null;
+    return /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ React.createElement(Text, null, " "), /* @__PURE__ */ React.createElement(Text, { color: color.warn }, "empty directory"));
+  }
+  if (state.searching) {
+    return /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "scanning the tree\u2026"));
+  }
+  return /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ React.createElement(Text, null, " "), /* @__PURE__ */ React.createElement(Text, { color: color.warn }, `no files match "${state.filter}"`));
+}
+function EntryRow({ entry, isSelected }) {
+  const color = useColor();
+  const cursor = isSelected ? `${GLYPH.cur} ` : "  ";
+  const labelColor = entry.isDir ? color.accent : color.primary;
+  const labelText = entry.isDir ? `${entry.label}/` : entry.label;
+  return /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: isSelected ? color.primary : color.info, bold: isSelected }, cursor), /* @__PURE__ */ React.createElement(Text, { color: labelColor, bold: isSelected }, labelText.padEnd(20)), entry.dirSuffix ? /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `  ${entry.dirSuffix}`) : null);
+}
+function FooterRow({ isBrowse, hasFolder }) {
+  const hint = isBrowse ? hasFolder ? "\u2191\u2193 navigate \xB7 Tab drill into folder \xB7 \u23CE insert \xB7 esc cancel" : "\u2191\u2193 navigate \xB7 Tab / \u23CE insert as @path \xB7 esc cancel" : "\u2191\u2193 navigate \xB7 Tab / \u23CE insert as @path \xB7 esc cancel";
+  return /* @__PURE__ */ React.createElement(Box, { marginTop: 0 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, `  ${hint}`));
 }
 
 // src/cli/ui/CheckpointPicker.tsx
@@ -6332,13 +6381,14 @@ function SlashArgPicker({
   kind,
   partial
 }) {
-  const headerRow = /* @__PURE__ */ React26.createElement(Box22, null, /* @__PURE__ */ React26.createElement(Text22, { color: COLOR.accent, bold: true }, "/ "), /* @__PURE__ */ React26.createElement(Text22, { color: COLOR.accent, bold: true }, `/${spec.cmd}`), spec.argsHint ? /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, ` ${spec.argsHint}`) : null, /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, `  ${spec.summary}`));
+  const color = useColor();
+  const headerRow = /* @__PURE__ */ React26.createElement(Box22, null, /* @__PURE__ */ React26.createElement(Text22, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ React26.createElement(Text22, { color: color.accent, bold: true }, `/${spec.cmd}`), spec.argsHint ? /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, ` ${spec.argsHint}`) : null, /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, `  ${spec.summary}`));
   if (kind === "hint") {
     return /* @__PURE__ */ React26.createElement(Box22, { paddingX: 1, marginTop: 1 }, headerRow);
   }
   if (matches === null) return null;
   if (matches.length === 0) {
-    return /* @__PURE__ */ React26.createElement(Box22, { flexDirection: "column", paddingX: 1, marginTop: 1 }, headerRow, /* @__PURE__ */ React26.createElement(Box22, null, /* @__PURE__ */ React26.createElement(Text22, { color: COLOR.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ React26.createElement(Text22, { color: COLOR.warn }, ` no match for "${partial}"`), /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, " \u2014 keep typing, or Backspace to edit")));
+    return /* @__PURE__ */ React26.createElement(Box22, { flexDirection: "column", paddingX: 1, marginTop: 1 }, headerRow, /* @__PURE__ */ React26.createElement(Box22, null, /* @__PURE__ */ React26.createElement(Text22, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ React26.createElement(Text22, { color: color.warn }, ` no match for "${partial}"`), /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, " \u2014 keep typing, or Backspace to edit")));
   }
   const MAX = 8;
   const total = matches.length;
@@ -6349,7 +6399,8 @@ function SlashArgPicker({
   return /* @__PURE__ */ React26.createElement(Box22, { flexDirection: "column", paddingX: 1, marginTop: 1 }, headerRow, hiddenAbove > 0 ? /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null, shown.map((value, i) => /* @__PURE__ */ React26.createElement(ArgRow, { key: value, value, isSelected: windowStart + i === selectedIndex })), hiddenBelow > 0 ? /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, `   \u2193 ${hiddenBelow} below`) : null, /* @__PURE__ */ React26.createElement(Box22, { marginTop: 0 }, /* @__PURE__ */ React26.createElement(Text22, { dimColor: true }, "  \u2191\u2193 navigate \xB7 Tab / \u23CE pick \xB7 esc cancel")));
 }
 function ArgRow({ value, isSelected }) {
-  return /* @__PURE__ */ React26.createElement(Box22, null, /* @__PURE__ */ React26.createElement(Text22, { color: isSelected ? COLOR.primary : COLOR.info, bold: isSelected }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ React26.createElement(Text22, { color: isSelected ? COLOR.user : COLOR.info, bold: isSelected, dimColor: !isSelected }, value));
+  const color = useColor();
+  return /* @__PURE__ */ React26.createElement(Box22, null, /* @__PURE__ */ React26.createElement(Text22, { color: isSelected ? color.primary : color.info, bold: isSelected }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ React26.createElement(Text22, { color: isSelected ? color.user : color.info, bold: isSelected, dimColor: !isSelected }, value));
 }
 
 // src/cli/ui/SlashSuggestions.tsx
@@ -6371,9 +6422,10 @@ function SlashSuggestions({
   groupMode,
   advancedHidden
 }) {
+  const color = useColor();
   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"));
+    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;
@@ -6383,7 +6435,7 @@ function SlashSuggestions({
   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) => {
+  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;
@@ -6391,13 +6443,14 @@ function SlashSuggestions({
   }), 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 }) {
+  const color = useColor();
   const name = `/${spec.cmd}`;
   const argsSuffix = spec.argsHint ? spec.argsHint : "";
   const key = `slash.${spec.cmd}.description`;
   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);
+  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);
 }
 
 // src/cli/ui/WelcomeBanner.tsx
@@ -7150,6 +7203,16 @@ function reduce(state, event) {
         text: event.text,
         meta: event.meta
       });
+    case "tip.show":
+      return appendCard(state, {
+        kind: "tip",
+        id: event.id,
+        ts: event.ts,
+        topic: event.topic,
+        sections: event.sections,
+        footer: event.footer,
+        oneTime: event.oneTime
+      });
     case "session.reset":
       return { ...state, cards: [], focusedCardId: null, toasts: [] };
     case "plan.show":
@@ -7455,6 +7518,22 @@ ${stack}` : message
         });
         return id;
       },
+      pushTip({ topic, sections, footer, oneTime = true }) {
+        const id = nextId2("tip");
+        dispatch({
+          type: "tip.show",
+          id,
+          ts: Date.now(),
+          topic,
+          sections: sections.map((s) => ({
+            title: s.title,
+            rows: s.rows.map((r) => ({ key: r.key, text: r.text }))
+          })),
+          footer,
+          oneTime
+        });
+        return id;
+      },
       pushCtxPressureIfHigh(usedTokens, ctxMax) {
         if (ctxMax <= 0) return;
         const pct = usedTokens / ctxMax * 100;
@@ -7619,12 +7698,12 @@ function useTranscriptWriter(transcriptRef, model2, prefixHash) {
 }
 
 // src/cli/ui/layout/CardStream.tsx
-import { Box as Box43, Text as Text45, useBoxMetrics } from "ink";
-import React52, { useEffect as useEffect7, useRef as useRef4 } from "react";
+import { Box as Box44, Text as Text46, useBoxMetrics } from "ink";
+import React53, { useEffect as useEffect7, useRef as useRef4 } from "react";
 
 // src/cli/ui/cards/CardRenderer.tsx
-import { Box as Box42, Text as Text44 } from "ink";
-import React51 from "react";
+import { Box as Box43, Text as Text45 } from "ink";
+import React52 from "react";
 
 // src/cli/ui/cards/CtxCard.tsx
 import { Box as Box27, Text as Text26 } from "ink";
@@ -7748,11 +7827,6 @@ function DiffCard({ card }) {
 // src/cli/ui/cards/DoctorCard.tsx
 import { Box as Box29, Text as Text28 } from "ink";
 import React34 from "react";
-var LEVEL_COLOR = {
-  ok: TONE.ok,
-  warn: TONE.warn,
-  fail: TONE.err
-};
 var LEVEL_GLYPH = {
   ok: "\u2713",
   warn: "\u26A0",
@@ -7764,12 +7838,18 @@ var LEVEL_TAG = {
   fail: "FAIL"
 };
 function DoctorCard({ card }) {
+  const { fg, tone } = useThemeTokens();
+  const levelColor = {
+    ok: tone.ok,
+    warn: tone.warn,
+    fail: tone.err
+  };
   const ok = card.checks.filter((c) => c.level === "ok").length;
   const warn = card.checks.filter((c) => c.level === "warn").length;
   const fail = card.checks.filter((c) => c.level === "fail").length;
   const labelWidth = card.checks.reduce((m, c) => Math.max(m, c.label.length), 0);
   const summary = `${card.checks.length} checks \xB7 ${ok} passed${warn > 0 ? ` \xB7 ${warn} warn` : ""}${fail > 0 ? ` \xB7 ${fail} fail` : ""}`;
-  return /* @__PURE__ */ React34.createElement(Card, { tone: CARD.tool.color }, /* @__PURE__ */ React34.createElement(CardHeader, { glyph: "\u2695", tone: CARD.tool.color, title: "doctor", meta: [summary] }), card.checks.map((c) => /* @__PURE__ */ React34.createElement(Box29, { key: c.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React34.createElement(Text28, { color: LEVEL_COLOR[c.level] }, LEVEL_GLYPH[c.level]), /* @__PURE__ */ React34.createElement(Text28, { bold: true, color: FG.body }, c.label.padEnd(labelWidth + 1)), /* @__PURE__ */ React34.createElement(Text28, { color: FG.sub }, c.detail), /* @__PURE__ */ React34.createElement(Text28, { color: LEVEL_COLOR[c.level] }, LEVEL_TAG[c.level]))));
+  return /* @__PURE__ */ React34.createElement(Card, { tone: CARD.tool.color }, /* @__PURE__ */ React34.createElement(CardHeader, { glyph: "\u2695", tone: CARD.tool.color, title: "doctor", meta: [summary] }), card.checks.map((c) => /* @__PURE__ */ React34.createElement(Box29, { key: c.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React34.createElement(Text28, { color: levelColor[c.level] }, LEVEL_GLYPH[c.level]), /* @__PURE__ */ React34.createElement(Text28, { bold: true, color: fg.body }, c.label.padEnd(labelWidth + 1)), /* @__PURE__ */ React34.createElement(Text28, { color: fg.sub }, c.detail), /* @__PURE__ */ React34.createElement(Text28, { color: levelColor[c.level] }, LEVEL_TAG[c.level]))));
 }
 
 // src/cli/ui/cards/ErrorCard.tsx
@@ -7909,27 +7989,28 @@ var STATUS_GLYPH = {
   blocked: "!",
   skipped: "s"
 };
-var STATUS_COLOR = {
-  queued: FG.faint,
-  running: TONE_ACTIVE.brand,
-  done: TONE.ok,
-  failed: TONE.err,
-  blocked: TONE.warn,
-  skipped: FG.faint
-};
 var VISIBLE_WINDOW = 5;
 function PlanCard({ card }) {
+  const { fg, tone, toneActive } = useThemeTokens();
+  const statusColor = {
+    queued: fg.faint,
+    running: toneActive.brand,
+    done: tone.ok,
+    failed: tone.err,
+    blocked: tone.warn,
+    skipped: fg.faint
+  };
   const doneCount = card.steps.filter((s) => s.status === "done").length;
   const variantTag = card.variant === "resumed" ? "resumed \xB7 " : card.variant === "replay" ? "\u23EA archive \xB7 " : "";
   const progress = `${variantTag}${doneCount}/${card.steps.length} done`;
   const hasRunning = card.steps.some((s) => s.status === "running");
-  const tone = hasRunning ? TONE_ACTIVE.accent : TONE.accent;
+  const cardTone = hasRunning ? toneActive.accent : tone.accent;
   const window = pickWindow(card.steps);
-  return /* @__PURE__ */ React39.createElement(Card, { tone }, /* @__PURE__ */ React39.createElement(CardHeader, { glyph: "\u229E", tone, title: card.title, meta: [progress] }), window.hiddenBefore > 0 ? /* @__PURE__ */ React39.createElement(Box33, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React39.createElement(Text33, { color: TONE.ok }, "\u2713"), /* @__PURE__ */ React39.createElement(Text33, { color: FG.faint }, `\u22EF ${window.hiddenBefore} done`)) : null, window.steps.map((step) => {
+  return /* @__PURE__ */ React39.createElement(Card, { tone: cardTone }, /* @__PURE__ */ React39.createElement(CardHeader, { glyph: "\u229E", tone: cardTone, title: card.title, meta: [progress] }), window.hiddenBefore > 0 ? /* @__PURE__ */ React39.createElement(Box33, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React39.createElement(Text33, { color: tone.ok }, "\u2713"), /* @__PURE__ */ React39.createElement(Text33, { color: fg.faint }, `\u22EF ${window.hiddenBefore} done`)) : null, window.steps.map((step) => {
     const isActive = step.status === "running";
-    const titleColor = isActive ? FG.strong : FG.sub;
-    return /* @__PURE__ */ React39.createElement(Box33, { key: step.id, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React39.createElement(Text33, { color: STATUS_COLOR[step.status] }, STATUS_GLYPH[step.status]), /* @__PURE__ */ React39.createElement(Text33, { bold: isActive, color: titleColor }, `${step.indexLabel}. ${step.title}`), isActive ? /* @__PURE__ */ React39.createElement(Text33, { color: TONE_ACTIVE.brand }, "\u2190 in progress") : null);
-  }), window.hiddenAfter > 0 ? /* @__PURE__ */ React39.createElement(Box33, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React39.createElement(Text33, { color: FG.faint }, "\u25CB"), /* @__PURE__ */ React39.createElement(Text33, { color: FG.faint }, `\u22EF ${window.hiddenAfter} upcoming`)) : null);
+    const titleColor = isActive ? fg.strong : fg.sub;
+    return /* @__PURE__ */ React39.createElement(Box33, { key: step.id, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React39.createElement(Text33, { color: statusColor[step.status] }, STATUS_GLYPH[step.status]), /* @__PURE__ */ React39.createElement(Text33, { bold: isActive, color: titleColor }, `${step.indexLabel}. ${step.title}`), isActive ? /* @__PURE__ */ React39.createElement(Text33, { color: toneActive.brand }, "\u2190 in progress") : null);
+  }), window.hiddenAfter > 0 ? /* @__PURE__ */ React39.createElement(Box33, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React39.createElement(Text33, { color: fg.faint }, "\u25CB"), /* @__PURE__ */ React39.createElement(Text33, { color: fg.faint }, `\u22EF ${window.hiddenAfter} upcoming`)) : null);
 }
 function pickWindow(steps) {
   if (steps.length <= VISIBLE_WINDOW) {
@@ -8542,13 +8623,14 @@ function StreamingCard({ card }) {
 // src/cli/ui/cards/SubAgentCard.tsx
 import { Box as Box38, Text as Text39 } from "ink";
 import React45, { useContext as useContext6 } from "react";
-var STATUS_COLOR2 = {
-  running: TONE_ACTIVE.violet,
-  done: TONE.ok,
-  failed: TONE.err
-};
 function SubAgentCard({ card }) {
-  const headColor = STATUS_COLOR2[card.status];
+  const { fg, tone, toneActive } = useThemeTokens();
+  const statusColor = {
+    running: toneActive.violet,
+    done: tone.ok,
+    failed: tone.err
+  };
+  const headColor = statusColor[card.status];
   const headGlyph = card.status === "failed" ? "\u2716" : "\u232C";
   const runningChildren = card.children.filter((c) => !isChildDone(c)).length;
   const isRunning = card.status === "running";
@@ -8560,11 +8642,11 @@ function SubAgentCard({ card }) {
       glyph: headGlyph,
       tone: headColor,
       title: "subagent",
-      titleColor: TONE.violet,
+      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 }, `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 }))));
 }
 function isChildDone(card) {
   switch (card.kind) {
@@ -8578,9 +8660,10 @@ function isChildDone(card) {
   }
 }
 function ChildRow({ card }) {
-  const v = childVisual(card);
+  const { fg, tone } = useThemeTokens();
+  const v = childVisual(card, tone.ok, tone.err, fg.faint);
   const isDone = isChildDone(card);
-  return /* @__PURE__ */ React45.createElement(React45.Fragment, null, v.statusGlyph, /* @__PURE__ */ React45.createElement(Text39, { color: v.kindColor }, v.kindGlyph), /* @__PURE__ */ React45.createElement(Text39, { dimColor: isDone, color: FG.body }, v.text));
+  return /* @__PURE__ */ React45.createElement(React45.Fragment, null, v.statusGlyph, /* @__PURE__ */ React45.createElement(Text39, { color: v.kindColor }, v.kindGlyph), /* @__PURE__ */ React45.createElement(Text39, { dimColor: isDone, color: fg.body }, v.text));
 }
 function runningGlyph(color) {
   return /* @__PURE__ */ React45.createElement(Spinner, { kind: "circle", color });
@@ -8588,15 +8671,15 @@ function runningGlyph(color) {
 function doneGlyph(color) {
   return /* @__PURE__ */ React45.createElement(Text39, { color }, "\u2713");
 }
-function failedGlyph() {
-  return /* @__PURE__ */ React45.createElement(Text39, { color: TONE.err }, "\u2716");
+function failedGlyph(color) {
+  return /* @__PURE__ */ React45.createElement(Text39, { color }, "\u2716");
 }
-function childVisual(card) {
+function childVisual(card, doneColor, failedColor, fallbackColor) {
   switch (card.kind) {
     case "reasoning": {
       const done = !card.streaming;
       return {
-        statusGlyph: done ? doneGlyph(TONE.ok) : runningGlyph(CARD.reasoning.color),
+        statusGlyph: done ? doneGlyph(doneColor) : runningGlyph(CARD.reasoning.color),
         kindGlyph: "\u25C6",
         kindColor: CARD.reasoning.color,
         text: `reasoning \xB7 ${card.paragraphs} \xB6`
@@ -8605,7 +8688,7 @@ function childVisual(card) {
     case "tool": {
       const elapsed = card.elapsedMs > 0 ? ` \xB7 ${(card.elapsedMs / 1e3).toFixed(2)}s` : "";
       return {
-        statusGlyph: card.done ? doneGlyph(TONE.ok) : runningGlyph(CARD.tool.color),
+        statusGlyph: card.done ? doneGlyph(doneColor) : runningGlyph(CARD.tool.color),
         kindGlyph: "\u25A3",
         kindColor: CARD.tool.color,
         text: `${card.name}${elapsed}`
@@ -8613,30 +8696,30 @@ function childVisual(card) {
     }
     case "streaming":
       return {
-        statusGlyph: card.done ? doneGlyph(TONE.ok) : runningGlyph(CARD.streaming.color),
+        statusGlyph: card.done ? doneGlyph(doneColor) : runningGlyph(CARD.streaming.color),
         kindGlyph: "\u25C8",
         kindColor: CARD.streaming.color,
         text: card.done ? "response" : "writing \u2026"
       };
     case "diff":
       return {
-        statusGlyph: doneGlyph(TONE.ok),
+        statusGlyph: doneGlyph(doneColor),
         kindGlyph: "\xB1",
         kindColor: CARD.diff.color,
         text: card.file
       };
     case "error":
       return {
-        statusGlyph: failedGlyph(),
+        statusGlyph: failedGlyph(failedColor),
         kindGlyph: "\u2716",
         kindColor: CARD.error.color,
         text: card.title
       };
     default:
       return {
-        statusGlyph: /* @__PURE__ */ React45.createElement(Text39, { color: FG.faint }, "\xB7"),
+        statusGlyph: /* @__PURE__ */ React45.createElement(Text39, { color: fallbackColor }, "\xB7"),
         kindGlyph: "\xB7",
-        kindColor: FG.faint,
+        kindColor: fallbackColor,
         text: card.kind
       };
   }
@@ -8651,39 +8734,70 @@ var STEP_GLYPH = {
   done: "\u2713",
   failed: "\u2717"
 };
-var STEP_COLOR = {
-  queued: FG.faint,
-  running: TONE.warn,
-  done: TONE.ok,
-  failed: TONE.err
-};
-var TASK_COLOR = {
-  running: TONE.warn,
-  done: TONE.ok,
-  failed: TONE.err
-};
 var TASK_GLYPH = {
   running: "\u25B6",
   done: "\u2713",
   failed: "\u2717"
 };
 function TaskCard({ card }) {
+  const { fg, tone } = useThemeTokens();
+  const stepColor = {
+    queued: fg.faint,
+    running: tone.warn,
+    done: tone.ok,
+    failed: tone.err
+  };
+  const taskColor = {
+    running: tone.warn,
+    done: tone.ok,
+    failed: tone.err
+  };
   const elapsed = `${(card.elapsedMs / 1e3).toFixed(1)}s`;
-  return /* @__PURE__ */ React46.createElement(Card, { tone: TASK_COLOR[card.status] }, /* @__PURE__ */ React46.createElement(
+  return /* @__PURE__ */ React46.createElement(Card, { tone: taskColor[card.status] }, /* @__PURE__ */ React46.createElement(
     CardHeader,
     {
       glyph: TASK_GLYPH[card.status],
-      tone: TASK_COLOR[card.status],
+      tone: taskColor[card.status],
       title: `step ${card.index}/${card.total}`,
       subtitle: card.title,
       meta: [elapsed, card.status]
     }
-  ), card.steps.map((step) => /* @__PURE__ */ React46.createElement(Box39, { key: step.id, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React46.createElement(Text40, { color: STEP_COLOR[step.status] }, STEP_GLYPH[step.status]), /* @__PURE__ */ React46.createElement(Text40, { bold: true, color: FG.body }, (step.toolName ?? "step").padEnd(7)), /* @__PURE__ */ React46.createElement(Text40, { color: FG.sub }, step.title), step.detail ? /* @__PURE__ */ React46.createElement(Text40, { color: FG.faint }, step.detail) : null, step.elapsedMs !== void 0 ? /* @__PURE__ */ React46.createElement(Text40, { color: FG.faint }, `${(step.elapsedMs / 1e3).toFixed(2)}s`) : null)));
+  ), card.steps.map((step) => /* @__PURE__ */ React46.createElement(Box39, { key: step.id, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React46.createElement(Text40, { color: stepColor[step.status] }, STEP_GLYPH[step.status]), /* @__PURE__ */ React46.createElement(Text40, { bold: true, color: fg.body }, (step.toolName ?? "step").padEnd(7)), /* @__PURE__ */ React46.createElement(Text40, { color: fg.sub }, step.title), step.detail ? /* @__PURE__ */ React46.createElement(Text40, { color: fg.faint }, step.detail) : null, step.elapsedMs !== void 0 ? /* @__PURE__ */ React46.createElement(Text40, { color: fg.faint }, `${(step.elapsedMs / 1e3).toFixed(2)}s`) : null)));
 }
 
-// src/cli/ui/cards/ToolCard.tsx
-import { Text as Text41, useStdout as useStdout11 } from "ink";
+// src/cli/ui/cards/TipCard.tsx
+import { Box as Box40, Text as Text41 } from "ink";
 import React47 from "react";
+import stringWidth2 from "string-width";
+var KEY_GUTTER = 4;
+function TipCard({ card }) {
+  const keyWidth = card.sections.reduce(
+    (max, sec) => sec.rows.reduce((m, r) => Math.max(m, stringWidth2(r.key)), max),
+    0
+  );
+  return /* @__PURE__ */ React47.createElement(Box40, { flexDirection: "column", paddingLeft: 2, marginY: 1 }, /* @__PURE__ */ React47.createElement(Box40, { flexDirection: "row", justifyContent: "space-between" }, /* @__PURE__ */ React47.createElement(Box40, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React47.createElement(Text41, { color: TONE.accent, bold: true }, "\u24D8"), /* @__PURE__ */ React47.createElement(Text41, { color: FG.body, bold: true }, card.topic)), card.oneTime ? /* @__PURE__ */ React47.createElement(Text41, { color: FG.faint }, t("ui.tipShownOnce")) : null), card.sections.map((section, i) => /* @__PURE__ */ React47.createElement(Box40, { key: section.title ?? `section-${i}`, flexDirection: "column", marginTop: 1 }, section.title ? /* @__PURE__ */ React47.createElement(Box40, { marginBottom: 0 }, /* @__PURE__ */ React47.createElement(Text41, { color: FG.sub }, section.title)) : null, section.rows.map((row2) => /* @__PURE__ */ React47.createElement(
+    TipRowRender,
+    {
+      key: row2.key,
+      row: row2,
+      keyWidth,
+      indent: section.title ? 2 : 0
+    }
+  )))), card.footer ? /* @__PURE__ */ React47.createElement(Box40, { marginTop: 1 }, /* @__PURE__ */ React47.createElement(Text41, { color: FG.faint }, card.footer)) : null);
+}
+function TipRowRender({
+  row: row2,
+  keyWidth,
+  indent
+}) {
+  const pad = " ".repeat(Math.max(0, keyWidth - stringWidth2(row2.key) + KEY_GUTTER));
+  const lead = indent > 0 ? " ".repeat(indent) : "";
+  return /* @__PURE__ */ React47.createElement(Box40, { flexDirection: "row" }, lead ? /* @__PURE__ */ React47.createElement(Text41, null, lead) : null, /* @__PURE__ */ React47.createElement(Text41, { color: TONE.accent }, row2.key), /* @__PURE__ */ React47.createElement(Text41, null, pad), /* @__PURE__ */ React47.createElement(Text41, { color: FG.body }, row2.text));
+}
+
+// src/cli/ui/cards/ToolCard.tsx
+import { Text as Text42, useStdout as useStdout11 } from "ink";
+import React48 from "react";
 var READ_TAIL = 2;
 var OTHER_TAIL = 5;
 function tailLinesFor(name) {
@@ -8712,7 +8826,7 @@ function ToolCard({ card }) {
     meta.push({ text: "rejected", color: TONE.err });
   }
   for (const part of metaTrail(card)) meta.push(part);
-  return /* @__PURE__ */ React47.createElement(Card, { tone: headColor }, /* @__PURE__ */ React47.createElement(
+  return /* @__PURE__ */ React48.createElement(Card, { tone: headColor }, /* @__PURE__ */ React48.createElement(
     CardHeader,
     {
       glyph: statusGlyph2(status2),
@@ -8720,10 +8834,10 @@ function ToolCard({ card }) {
       title: card.name,
       subtitle: argsLabel || void 0,
       meta: meta.length > 0 ? meta : void 0,
-      right: status2 === "running" ? /* @__PURE__ */ React47.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand, bold: true }) : void 0
+      right: status2 === "running" ? /* @__PURE__ */ React48.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand, bold: true }) : void 0
     }
-  ), showBody && /* @__PURE__ */ React47.createElement(React47.Fragment, null, hidden > 0 ? /* @__PURE__ */ React47.createElement(Text41, { color: FG.faint }, `\u22EE ${hidden} earlier line${hidden === 1 ? "" : "s"} (use /tool to read full)`) : null, visible.map((line, i) => /* @__PURE__ */ React47.createElement(
-    Text41,
+  ), showBody && /* @__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(
+    Text42,
     {
       key: `${card.id}:${hidden + i}`,
       color: errColor,
@@ -8778,15 +8892,15 @@ function metaTrail(card) {
 function formatArgsSummary(args) {
   if (typeof args === "string") return args.length > 60 ? `${args.slice(0, 60)}\u2026` : args;
   if (args && typeof args === "object") {
-    const keys = Object.keys(args);
-    if (keys.length === 0) return "";
-    const first = keys[0];
+    const keys2 = Object.keys(args);
+    if (keys2.length === 0) return "";
+    const first = keys2[0];
     const value = args[first];
     if (typeof value === "string") {
       const trimmed = value.length > 40 ? `${value.slice(0, 40)}\u2026` : value;
-      return keys.length === 1 ? trimmed : `${trimmed}  +${keys.length - 1}`;
+      return keys2.length === 1 ? trimmed : `${trimmed}  +${keys2.length - 1}`;
     }
-    return keys.join(" ");
+    return keys2.join(" ");
   }
   return "";
 }
@@ -8809,8 +8923,8 @@ function formatBytes(n) {
 }
 
 // src/cli/ui/cards/UsageCard.tsx
-import { Box as Box41, Text as Text42 } from "ink";
-import React48 from "react";
+import { Box as Box42, Text as Text43 } from "ink";
+import React49 from "react";
 var BAR_CELLS2 = 30;
 function compactNum(n) {
   if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
@@ -8820,25 +8934,25 @@ function compactNum(n) {
 function bar(ratio, color) {
   const filled = Math.max(0, Math.min(BAR_CELLS2, Math.round(ratio * BAR_CELLS2)));
   const empty = BAR_CELLS2 - filled;
-  return /* @__PURE__ */ React48.createElement(React48.Fragment, null, /* @__PURE__ */ React48.createElement(Text42, { color }, "\u2588".repeat(filled)), /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, "\u2591".repeat(empty)));
+  return /* @__PURE__ */ React49.createElement(React49.Fragment, null, /* @__PURE__ */ React49.createElement(Text43, { color }, "\u2588".repeat(filled)), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, "\u2591".repeat(empty)));
 }
 function UsageCard({ card }) {
-  if (card.compact) return /* @__PURE__ */ React48.createElement(CompactUsageRow, { card });
+  if (card.compact) return /* @__PURE__ */ React49.createElement(CompactUsageRow, { card });
   const cap = Math.max(1, card.tokens.promptCap);
   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)];
   if (card.elapsedMs !== void 0) headerMeta2.push(`${(card.elapsedMs / 1e3).toFixed(1)}s`);
-  return /* @__PURE__ */ React48.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ React48.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: "usage", meta: headerMeta2 }), /* @__PURE__ */ React48.createElement(Box41, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React48.createElement(Text42, { color: FG.sub }, "prompt"), bar(promptRatio, TONE.brand), /* @__PURE__ */ React48.createElement(Text42, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ React48.createElement(Box41, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React48.createElement(Text42, { color: FG.sub }, "reason"), bar(reasonRatio, TONE.accent), /* @__PURE__ */ React48.createElement(Text42, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ React48.createElement(Box41, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React48.createElement(Text42, { color: FG.sub }, "output"), bar(outputRatio, TONE.brand), /* @__PURE__ */ React48.createElement(Text42, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ React48.createElement(Box41, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React48.createElement(Text42, { color: FG.sub }, "cache "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ React48.createElement(Text42, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ React48.createElement(Box41, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, "session"), /* @__PURE__ */ React48.createElement(Text42, { bold: true, color: FG.body }, `\u26C1 ${formatCost(card.sessionCost, card.balanceCurrency, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ React48.createElement(React48.Fragment, null, /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, "\xB7 balance"), /* @__PURE__ */ React48.createElement(Text42, { 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: "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));
 }
 function CompactUsageRow({ card }) {
   const elapsed = card.elapsedMs !== void 0 ? ` \xB7 ${(card.elapsedMs / 1e3).toFixed(1)}s` : "";
-  return /* @__PURE__ */ React48.createElement(Box41, { flexDirection: "row", gap: 1, marginTop: 1 }, /* @__PURE__ */ React48.createElement(Text42, { color: FG.meta }, "\u03A3"), /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, `turn ${card.turn}`), /* @__PURE__ */ React48.createElement(Text42, { color: FG.meta }, `\xB7 ${compactNum(card.tokens.prompt)} prompt \xB7 ${compactNum(card.tokens.output)} out`), /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, "\xB7 cache"), /* @__PURE__ */ React48.createElement(Text42, { color: TONE.ok }, `${(card.cacheHit * 100).toFixed(0)}%`), /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, `\xB7 ${formatCost(card.cost, card.balanceCurrency)}${elapsed}`), card.balance !== void 0 ? /* @__PURE__ */ React48.createElement(Text42, { 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 }, `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);
 }
 
 // src/cli/ui/cards/UserCard.tsx
-import React49 from "react";
+import React50 from "react";
 
 // src/cli/ui/cards/time.ts
 function formatRelativeTime(ts, now = Date.now()) {
@@ -8855,7 +8969,7 @@ function formatRelativeTime(ts, now = Date.now()) {
 
 // src/cli/ui/cards/UserCard.tsx
 function UserCard({ card }) {
-  return /* @__PURE__ */ React49.createElement(Card, { tone: TONE.accent }, /* @__PURE__ */ React49.createElement(
+  return /* @__PURE__ */ React50.createElement(Card, { tone: TONE.accent }, /* @__PURE__ */ React50.createElement(
     CardHeader,
     {
       glyph: "\u203A",
@@ -8864,15 +8978,15 @@ function UserCard({ card }) {
       titleColor: FG.sub,
       meta: [formatRelativeTime(card.ts)]
     }
-  ), /* @__PURE__ */ React49.createElement(Markdown, { text: card.text }));
+  ), /* @__PURE__ */ React50.createElement(Markdown, { text: card.text }));
 }
 
 // src/cli/ui/cards/WarnCard.tsx
-import { Text as Text43 } from "ink";
-import React50 from "react";
+import { Text as Text44 } from "ink";
+import React51 from "react";
 function WarnCard({ card }) {
   const messageLines = card.message.length > 0 ? card.message.split("\n") : [];
-  return /* @__PURE__ */ React50.createElement(Card, { tone: TONE.warn }, /* @__PURE__ */ React50.createElement(
+  return /* @__PURE__ */ React51.createElement(Card, { tone: TONE.warn }, /* @__PURE__ */ React51.createElement(
     CardHeader,
     {
       glyph: "\u26A0",
@@ -8880,55 +8994,57 @@ function WarnCard({ card }) {
       title: card.title,
       meta: card.detail ? [card.detail] : void 0
     }
-  ), messageLines.map((line, i) => /* @__PURE__ */ React50.createElement(Text43, { key: `${card.id}:${i}`, color: FG.body }, line || " ")));
+  ), messageLines.map((line, i) => /* @__PURE__ */ React51.createElement(Text44, { key: `${card.id}:${i}`, color: FG.body }, line || " ")));
 }
 
 // src/cli/ui/cards/CardRenderer.tsx
-var CardRenderer = React51.memo(function CardRenderer2({
+var CardRenderer = React52.memo(function CardRenderer2({
   card
 }) {
-  return /* @__PURE__ */ React51.createElement(Box42, { flexDirection: "column" }, renderCard(card));
+  return /* @__PURE__ */ React52.createElement(Box43, { flexDirection: "column" }, renderCard(card));
 });
 function renderCard(card) {
   switch (card.kind) {
     case "user":
-      return /* @__PURE__ */ React51.createElement(UserCard, { card });
+      return /* @__PURE__ */ React52.createElement(UserCard, { card });
     case "reasoning":
-      return /* @__PURE__ */ React51.createElement(ReasoningCard, { card, expanded: true });
+      return /* @__PURE__ */ React52.createElement(ReasoningCard, { card, expanded: true });
     case "streaming":
-      return /* @__PURE__ */ React51.createElement(StreamingCard, { card });
+      return /* @__PURE__ */ React52.createElement(StreamingCard, { card });
     case "tool":
-      return /* @__PURE__ */ React51.createElement(ToolCard, { card });
+      return /* @__PURE__ */ React52.createElement(ToolCard, { card });
     case "task":
-      return /* @__PURE__ */ React51.createElement(TaskCard, { card });
+      return /* @__PURE__ */ React52.createElement(TaskCard, { card });
     case "plan":
-      return /* @__PURE__ */ React51.createElement(PlanCard, { card });
+      return /* @__PURE__ */ React52.createElement(PlanCard, { card });
     case "diff":
-      return /* @__PURE__ */ React51.createElement(DiffCard, { card });
+      return /* @__PURE__ */ React52.createElement(DiffCard, { card });
     case "error":
-      return /* @__PURE__ */ React51.createElement(ErrorCard, { card });
+      return /* @__PURE__ */ React52.createElement(ErrorCard, { card });
     case "warn":
-      return /* @__PURE__ */ React51.createElement(WarnCard, { card });
+      return /* @__PURE__ */ React52.createElement(WarnCard, { card });
     case "usage":
-      return /* @__PURE__ */ React51.createElement(UsageCard, { card });
+      return /* @__PURE__ */ React52.createElement(UsageCard, { card });
     case "memory":
-      return /* @__PURE__ */ React51.createElement(MemoryCard, { card });
+      return /* @__PURE__ */ React52.createElement(MemoryCard, { card });
     case "subagent":
-      return /* @__PURE__ */ React51.createElement(SubAgentCard, { card });
+      return /* @__PURE__ */ React52.createElement(SubAgentCard, { card });
     case "search":
-      return /* @__PURE__ */ React51.createElement(SearchCard, { card });
+      return /* @__PURE__ */ React52.createElement(SearchCard, { card });
     case "live":
-      return /* @__PURE__ */ React51.createElement(LiveCard, { card });
+      return /* @__PURE__ */ React52.createElement(LiveCard, { card });
+    case "tip":
+      return /* @__PURE__ */ React52.createElement(TipCard, { card });
     case "ctx":
-      return /* @__PURE__ */ React51.createElement(CtxCard, { card });
+      return /* @__PURE__ */ React52.createElement(CtxCard, { card });
     case "doctor":
-      return /* @__PURE__ */ React51.createElement(DoctorCard, { card });
+      return /* @__PURE__ */ React52.createElement(DoctorCard, { card });
     default:
-      return /* @__PURE__ */ React51.createElement(FallbackCard, { card });
+      return /* @__PURE__ */ React52.createElement(FallbackCard, { card });
   }
 }
 function FallbackCard({ card }) {
-  return /* @__PURE__ */ React51.createElement(Box42, { flexDirection: "row" }, /* @__PURE__ */ React51.createElement(Text44, { color: FG.faint }, `  \xB7 ${card.kind} card \xB7 not yet migrated`));
+  return /* @__PURE__ */ React52.createElement(Box43, { flexDirection: "row" }, /* @__PURE__ */ React52.createElement(Text45, { color: FG.faint }, `  \xB7 ${card.kind} card \xB7 not yet migrated`));
 }
 
 // src/cli/ui/layout/CardStream.tsx
@@ -8950,7 +9066,7 @@ function CardStream({
   if (suppressLive && cards.length > 0 && !isFullySettled(cards[cards.length - 1])) {
     visible = cards.slice(0, -1);
   }
-  return /* @__PURE__ */ React52.createElement(React52.Fragment, null, scrollRows > 0 ? /* @__PURE__ */ React52.createElement(Text45, { color: FG.faint }, " \u2191 earlier \u2014 PgUp / wheel / \u2191") : null, /* @__PURE__ */ React52.createElement(Box43, { ref: outerRef, flexDirection: "column", flexGrow: 1, overflow: "hidden" }, /* @__PURE__ */ React52.createElement(Box43, { ref: innerRef, flexDirection: "column", marginTop: -scrollRows, flexShrink: 0 }, visible.map((card) => /* @__PURE__ */ React52.createElement(CardRenderer, { key: card.id, card })))));
+  return /* @__PURE__ */ React53.createElement(React53.Fragment, null, scrollRows > 0 ? /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, " \u2191 earlier \u2014 PgUp / wheel / \u2191") : null, /* @__PURE__ */ React53.createElement(Box44, { ref: outerRef, flexDirection: "column", flexGrow: 1, overflow: "hidden" }, /* @__PURE__ */ React53.createElement(Box44, { ref: innerRef, flexDirection: "column", marginTop: -scrollRows, flexShrink: 0 }, visible.map((card) => /* @__PURE__ */ React53.createElement(CardRenderer, { key: card.id, card })))));
 }
 function isFullySettled(card) {
   switch (card.kind) {
@@ -8970,12 +9086,13 @@ function isFullySettled(card) {
 }
 
 // src/cli/ui/layout/LiveRows.tsx
-import { Box as Box44, Text as Text46 } from "ink";
-import React53 from "react";
+import { Box as Box45, Text as Text47 } from "ink";
+import React54 from "react";
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 function ThinkingRow({ text }) {
   const elapsed = useElapsedSeconds();
-  return /* @__PURE__ */ React53.createElement(Box44, { marginY: 1, paddingX: 1, gap: 1 }, /* @__PURE__ */ React53.createElement(Spinner, { kind: "circle", color: TONE.accent }), /* @__PURE__ */ React53.createElement(Text46, { italic: true, color: FG.sub }, text), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, `${elapsed}s`));
+  const { fg, tone } = useThemeTokens();
+  return /* @__PURE__ */ React54.createElement(Box45, { marginY: 1, paddingX: 1, gap: 1 }, /* @__PURE__ */ React54.createElement(Spinner, { kind: "circle", color: TONE.accent }), /* @__PURE__ */ React54.createElement(Text47, { italic: true, color: FG.sub }, text), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, `${elapsed}s`));
 }
 function ModeStatusBar({
   editMode,
@@ -8987,24 +9104,24 @@ function ModeStatusBar({
 }) {
   useSlowTick();
   const running = jobs2?.runningCount() ?? 0;
-  const jobsTag = running > 0 ? /* @__PURE__ */ React53.createElement(Text46, { color: TONE.warn, bold: true }, `  \xB7  \u23F5 ${running} job${running === 1 ? "" : "s"}`) : null;
+  const jobsTag = running > 0 ? /* @__PURE__ */ React54.createElement(Text47, { color: TONE.warn, bold: true }, `  \xB7  \u23F5 ${running} job${running === 1 ? "" : "s"}`) : null;
   if (planMode) {
-    return /* @__PURE__ */ React53.createElement(ModeBarFrame, null, /* @__PURE__ */ React53.createElement(ModePill, { label: "PLAN MODE", color: TONE.err, flash }), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, "   writes gated \xB7 /plan off to leave"), jobsTag);
+    return /* @__PURE__ */ React54.createElement(ModeBarFrame, null, /* @__PURE__ */ React54.createElement(ModePill, { label: "PLAN MODE", color: TONE.err, flash }), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, "   writes gated \xB7 /plan off to leave"), jobsTag);
   }
   const label = editMode === "yolo" ? "YOLO" : editMode === "auto" ? "AUTO" : "REVIEW";
   const pillColor = editMode === "yolo" ? TONE.err : editMode === "auto" ? TONE.accent : TONE.brand;
   const mid = editMode === "yolo" ? "edits + shell auto \xB7 /undo to roll back" : editMode === "auto" ? "edits land now \xB7 u to undo" : pendingCount > 0 ? `${pendingCount} queued \xB7 y apply \xB7 n discard` : "edits queued \xB7 y apply \xB7 n discard";
-  return /* @__PURE__ */ React53.createElement(ModeBarFrame, null, /* @__PURE__ */ React53.createElement(ModePill, { label, color: pillColor, flash }), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, `   ${mid} \xB7 Shift+Tab to flip`), jobsTag);
+  return /* @__PURE__ */ React54.createElement(ModeBarFrame, null, /* @__PURE__ */ React54.createElement(ModePill, { label, color: pillColor, flash }), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, `   ${mid} \xB7 Shift+Tab to flip`), jobsTag);
 }
 function ModeBarFrame({ children }) {
-  return /* @__PURE__ */ React53.createElement(Box44, { paddingX: 1 }, children);
+  return /* @__PURE__ */ React54.createElement(Box45, { paddingX: 1 }, children);
 }
 function ModePill({
   label,
   color,
   flash
 }) {
-  return /* @__PURE__ */ React53.createElement(Text46, { color, bold: true, inverse: flash }, `[${label}]`);
+  return /* @__PURE__ */ React54.createElement(Text47, { color, bold: true, inverse: flash }, `[${label}]`);
 }
 function UndoBanner({
   banner
@@ -9019,7 +9136,7 @@ function UndoBanner({
   const urgent = !paused && remainingSec <= 1;
   const pct = remainingMs / totalMs * 100;
   const tone = paused ? TONE.warn : urgent ? TONE.err : TONE.accent;
-  return /* @__PURE__ */ React53.createElement(Box44, { marginY: 1, paddingX: 1 }, /* @__PURE__ */ React53.createElement(Text46, { backgroundColor: TONE.accent, color: "black", bold: true }, ` \u2713 AUTO-APPLIED ${ok}/${total} `), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, "   press "), /* @__PURE__ */ React53.createElement(Text46, { backgroundColor: TONE.brand, color: "black", bold: true }, " u "), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, paused ? " to undo \xB7 " : " to undo \xB7 "), /* @__PURE__ */ React53.createElement(Text46, { backgroundColor: paused ? TONE.warn : FG.faint, color: "black", bold: true }, " space "), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, paused ? " to resume  " : " to pause  "), /* @__PURE__ */ React53.createElement(CharBar, { pct, width: 20, color: tone, showLabel: false }), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, "  "), /* @__PURE__ */ React53.createElement(Text46, { color: tone, bold: urgent || paused }, paused ? `${remainingSec}s \xB7 paused` : `${remainingSec}s`));
+  return /* @__PURE__ */ React54.createElement(Box45, { marginY: 1, paddingX: 1 }, /* @__PURE__ */ React54.createElement(Text47, { backgroundColor: TONE.accent, color: "black", bold: true }, ` \u2713 AUTO-APPLIED ${ok}/${total} `), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, "   press "), /* @__PURE__ */ React54.createElement(Text47, { backgroundColor: TONE.brand, color: "black", bold: true }, " u "), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, paused ? " to undo \xB7 " : " to undo \xB7 "), /* @__PURE__ */ React54.createElement(Text47, { backgroundColor: paused ? TONE.warn : FG.faint, color: "black", bold: true }, " space "), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, paused ? " to resume  " : " to pause  "), /* @__PURE__ */ React54.createElement(CharBar, { pct, width: 20, color: tone, showLabel: false }), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, "  "), /* @__PURE__ */ React54.createElement(Text47, { color: tone, bold: urgent || paused }, paused ? `${remainingSec}s \xB7 paused` : `${remainingSec}s`));
 }
 function subagentPhaseLabel(phase, iter, elapsedMs) {
   if (phase === "summarising") return "summarising findings\u2026";
@@ -9034,7 +9151,7 @@ function SubagentRow({ activity }) {
   const last = activity.lastInner;
   const subtitle = activity.skillName ?? truncate2(activity.task, 48);
   const modelBadge = activity.model ? modelBadgeFor(activity.model) : null;
-  return /* @__PURE__ */ React53.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ React53.createElement(
+  return /* @__PURE__ */ React54.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ React54.createElement(
     CardHeader,
     {
       glyph: "\u232C",
@@ -9044,9 +9161,9 @@ function SubagentRow({ activity }) {
       titleBg: PILL_SECTION.plan.bg,
       subtitle,
       meta: [`iter ${activity.iter}`, `${seconds}s`],
-      right: /* @__PURE__ */ React53.createElement(React53.Fragment, null, modelBadge ? /* @__PURE__ */ React53.createElement(Pill, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null, /* @__PURE__ */ React53.createElement(Spinner, { kind: "braille", color: CARD.subagent.color }))
+      right: /* @__PURE__ */ React54.createElement(React54.Fragment, null, modelBadge ? /* @__PURE__ */ React54.createElement(Pill, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null, /* @__PURE__ */ React54.createElement(Spinner, { kind: "braille", color: CARD.subagent.color }))
     }
-  ), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, "task  ", /* @__PURE__ */ React53.createElement(Text46, { color: FG.sub }, activity.task)), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, "last  ", last ? /* @__PURE__ */ React53.createElement(React53.Fragment, null, /* @__PURE__ */ React53.createElement(Text46, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ React53.createElement(Text46, { color: FG.body }, last.label), last.meta ? /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, `   ${last.meta}`) : null) : /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, "queued\u2026")), /* @__PURE__ */ React53.createElement(Text46, { color: TONE.brand }, "\u25B6  ", phase));
+  ), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, "task  ", /* @__PURE__ */ React54.createElement(Text47, { color: FG.sub }, activity.task)), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, "last  ", last ? /* @__PURE__ */ React54.createElement(React54.Fragment, null, /* @__PURE__ */ React54.createElement(Text47, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ React54.createElement(Text47, { color: FG.body }, last.label), last.meta ? /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, `   ${last.meta}`) : null) : /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, "queued\u2026")), /* @__PURE__ */ React54.createElement(Text47, { color: TONE.brand }, "\u25B6  ", phase));
 }
 function SubagentLiveStack({
   activities,
@@ -9054,13 +9171,13 @@ function SubagentLiveStack({
 }) {
   const tick = useTick();
   if (activities.length === 0) return null;
-  if (activities.length === 1) return /* @__PURE__ */ React53.createElement(SubagentRow, { activity: activities[0] });
+  if (activities.length === 1) return /* @__PURE__ */ React54.createElement(SubagentRow, { activity: activities[0] });
   const visible = activities.slice(0, max);
   const overflow = activities.length - visible.length;
   const summarising = activities.filter((a) => a.phase === "summarising").length;
   const metaParts = [`${activities.length} running`];
   if (summarising > 0) metaParts.push(`${summarising} summarising`);
-  return /* @__PURE__ */ React53.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ React53.createElement(
+  return /* @__PURE__ */ React54.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ React54.createElement(
     CardHeader,
     {
       glyph: "\u232C",
@@ -9069,9 +9186,9 @@ function SubagentLiveStack({
       titleColor: PILL_SECTION.plan.fg,
       titleBg: PILL_SECTION.plan.bg,
       subtitle: metaParts.join(" \xB7 "),
-      right: /* @__PURE__ */ React53.createElement(Spinner, { kind: "braille", color: CARD.subagent.color })
+      right: /* @__PURE__ */ React54.createElement(Spinner, { kind: "braille", color: CARD.subagent.color })
     }
-  ), visible.map((a, i) => /* @__PURE__ */ React53.createElement(CompactSubagentLine, { key: a.runId, activity: a, tick, index: i })), overflow > 0 ? /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, `  +${overflow} more running\u2026`) : null);
+  ), visible.map((a, i) => /* @__PURE__ */ React54.createElement(CompactSubagentLine, { key: a.runId, activity: a, tick, index: i })), overflow > 0 ? /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, `  +${overflow} more running\u2026`) : null);
 }
 function CompactSubagentLine({
   activity,
@@ -9086,7 +9203,7 @@ function CompactSubagentLine({
   const title = activity.skillName ?? truncate2(activity.task, 28);
   const titlePadded = title.padEnd(28);
   const last = activity.lastInner;
-  return /* @__PURE__ */ React53.createElement(Box44, { flexDirection: "row" }, /* @__PURE__ */ React53.createElement(Text46, { color: glyphColor, bold: true }, `  ${glyph} `), /* @__PURE__ */ React53.createElement(Text46, { color: FG.body }, titlePadded), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, `  iter ${String(activity.iter).padStart(2)} \xB7 ${seconds}s \xB7 `), last ? /* @__PURE__ */ React53.createElement(React53.Fragment, null, /* @__PURE__ */ React53.createElement(Text46, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ React53.createElement(Text46, { color: FG.body }, truncate2(last.label, 18)), last.meta ? /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, `  ${last.meta}`) : null) : /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, "queued\u2026"));
+  return /* @__PURE__ */ React54.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React54.createElement(Text47, { color: glyphColor, bold: true }, `  ${glyph} `), /* @__PURE__ */ React54.createElement(Text47, { color: FG.body }, titlePadded), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, `  iter ${String(activity.iter).padStart(2)} \xB7 ${seconds}s \xB7 `), last ? /* @__PURE__ */ React54.createElement(React54.Fragment, null, /* @__PURE__ */ React54.createElement(Text47, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ React54.createElement(Text47, { color: FG.body }, truncate2(last.label, 18)), last.meta ? /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, `  ${last.meta}`) : null) : /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, "queued\u2026"));
 }
 function truncate2(text, max) {
   return text.length > max ? `${text.slice(0, max)}\u2026` : text;
@@ -9098,7 +9215,7 @@ function OngoingToolRow({
   const tick = useTick();
   const elapsed = useElapsedSeconds();
   const summary = summarizeToolArgs(tool.name, tool.args);
-  return /* @__PURE__ */ React53.createElement(Box44, { marginY: 1, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React53.createElement(Box44, null, /* @__PURE__ */ React53.createElement(Text46, { color: CARD.tool.color, bold: true }, SPINNER_FRAMES[tick % SPINNER_FRAMES.length]), /* @__PURE__ */ React53.createElement(Text46, null, "  "), /* @__PURE__ */ React53.createElement(Text46, { color: CARD.tool.color, bold: true }, `\u25A3 ${tool.name}`), /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, `  running \xB7 ${elapsed}s`)), progress ? /* @__PURE__ */ React53.createElement(Box44, { paddingLeft: 3 }, /* @__PURE__ */ React53.createElement(Text46, { color: TONE.brand }, renderProgressLine(progress))) : null, summary ? /* @__PURE__ */ React53.createElement(Box44, { paddingLeft: 3 }, /* @__PURE__ */ React53.createElement(Text46, { color: FG.faint }, summary)) : null);
+  return /* @__PURE__ */ React54.createElement(Box45, { marginY: 1, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React54.createElement(Box45, null, /* @__PURE__ */ React54.createElement(Text47, { color: CARD.tool.color, bold: true }, SPINNER_FRAMES[tick % SPINNER_FRAMES.length]), /* @__PURE__ */ React54.createElement(Text47, null, "  "), /* @__PURE__ */ React54.createElement(Text47, { color: CARD.tool.color, bold: true }, `\u25A3 ${tool.name}`), /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, `  running \xB7 ${elapsed}s`)), progress ? /* @__PURE__ */ React54.createElement(Box45, { paddingLeft: 3 }, /* @__PURE__ */ React54.createElement(Text47, { color: TONE.brand }, renderProgressLine(progress))) : null, summary ? /* @__PURE__ */ React54.createElement(Box45, { paddingLeft: 3 }, /* @__PURE__ */ React54.createElement(Text47, { color: FG.faint }, summary)) : null);
 }
 function renderProgressLine(p) {
   const msg = p.message ? `  ${p.message}` : "";
@@ -9154,16 +9271,16 @@ function summarizeToolArgs(name, args) {
 }
 
 // src/cli/ui/layout/StatusRow.tsx
-import { Box as Box45, Text as Text48, useStdout as useStdout12 } from "ink";
-import React55 from "react";
+import { Box as Box46, Text as Text49, useStdout as useStdout12 } from "ink";
+import React56 from "react";
 
 // src/cli/ui/primitives/Countdown.tsx
-import { Text as Text47 } from "ink";
-import React54 from "react";
+import { Text as Text48 } from "ink";
+import React55 from "react";
 function Countdown({ endsAt, color = TONE.brand }) {
   useSlowTick();
   const remainingSec = Math.max(0, Math.ceil((endsAt - Date.now()) / 1e3));
-  return /* @__PURE__ */ React54.createElement(Text47, { bold: true, color }, String(remainingSec));
+  return /* @__PURE__ */ React55.createElement(Text48, { bold: true, color }, String(remainingSec));
 }
 
 // src/cli/ui/layout/StatusRow.tsx
@@ -9180,7 +9297,7 @@ function StatusRow() {
   const hasSession = status2.sessionCost > 0;
   const hasBalance = typeof status2.balance === "number";
   const showWallet = cols >= WALLET_MIN_COLS && (hasSession || hasBalance);
-  return /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "column" }, /* @__PURE__ */ React55.createElement(Box45, null, /* @__PURE__ */ React55.createElement(Text48, null, "  "), /* @__PURE__ */ React55.createElement(Text48, { color: FG.faint }, "\u2500".repeat(ruleWidth))), /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text48, null, "  "), status2.recording ? /* @__PURE__ */ React55.createElement(RecordingPill, { rec: status2.recording }) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ React55.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds }) : /* @__PURE__ */ React55.createElement(ModePill2, { mode: status2.mode, network: status2.network, detail: status2.networkDetail }), /* @__PURE__ */ React55.createElement(Sep, null), /* @__PURE__ */ React55.createElement(Text48, { color: FG.sub }, `${session.id} \xB7 ${session.branch}`), hasTurn && /* @__PURE__ */ React55.createElement(React55.Fragment, null, /* @__PURE__ */ React55.createElement(Sep, null), /* @__PURE__ */ React55.createElement(Text48, { bold: true, color: TONE.brand }, "\u25B8 "), /* @__PURE__ */ React55.createElement(Text48, { bold: true, color: FG.body }, `${formatCost(status2.cost, status2.balanceCurrency)} turn`)), /* @__PURE__ */ React55.createElement(Sep, null), /* @__PURE__ */ React55.createElement(Text48, { color: TONE.accent }, `cache ${Math.round(status2.cacheHit * 100)}%`), showWallet && /* @__PURE__ */ React55.createElement(
+  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(
     WalletPill,
     {
       sessionCostUsd: status2.sessionCost,
@@ -9196,7 +9313,7 @@ function WalletPill({
 }) {
   const showSpent = sessionCostUsd > 0;
   const showBalance = typeof balance === "number";
-  return /* @__PURE__ */ React55.createElement(React55.Fragment, null, /* @__PURE__ */ React55.createElement(Sep, null), /* @__PURE__ */ React55.createElement(Text48, { color: FG.meta }, "\u26C1 "), showSpent && /* @__PURE__ */ React55.createElement(Text48, { color: FG.body }, `${formatCost(sessionCostUsd, currency, 2)} spent`), showSpent && showBalance && /* @__PURE__ */ React55.createElement(Text48, { color: FG.meta }, "  /  "), showBalance && /* @__PURE__ */ React55.createElement(Text48, { bold: true, color: balanceColor(balance, currency) }, formatBalance(balance, currency, { fractionDigits: 2 })), showBalance && /* @__PURE__ */ React55.createElement(Text48, { color: FG.faint }, " left"));
+  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"));
 }
 function ModePill2({
   mode: mode2,
@@ -9205,18 +9322,18 @@ function ModePill2({
 }) {
   if (network === "online") {
     const pill = modeGlyph(mode2);
-    return /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text48, { color: pill.color }, pill.glyph), /* @__PURE__ */ React55.createElement(Text48, { color: FG.sub }, ` ${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}`));
   }
   const dot = networkDot(network);
   if (network === "slow") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text48, { color: dot.color }, dot.glyph), /* @__PURE__ */ React55.createElement(Text48, { color: dot.color }, ` ${mode2} \xB7 slow${tail}`));
+    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}`));
   }
   if (network === "disconnected") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text48, { color: dot.color }, dot.glyph), /* @__PURE__ */ React55.createElement(Text48, { color: dot.color }, ` 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 }, ` disconnect${tail}`));
   }
-  return /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text48, { color: dot.color }, dot.glyph), /* @__PURE__ */ React55.createElement(Text48, { color: dot.color }, " reconnecting\u2026"));
+  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"));
 }
 function CountdownRow({
   mode: mode2,
@@ -9224,14 +9341,14 @@ function CountdownRow({
 }) {
   const pill = modeGlyph(mode2);
   const endsAt = Date.now() + secondsLeft * 1e3;
-  return /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text48, { color: pill.color }, pill.glyph), /* @__PURE__ */ React55.createElement(Text48, { color: FG.sub }, ` ${mode2}   \xB7   `), /* @__PURE__ */ React55.createElement(Text48, { color: TONE.warn }, "approving in "), /* @__PURE__ */ React55.createElement(Countdown, { endsAt }), /* @__PURE__ */ React55.createElement(Text48, { color: TONE.warn }, "s \xB7 esc to interrupt"));
+  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"));
 }
 function RecordingPill({ rec }) {
   const sizeMb = (rec.sizeBytes / (1024 * 1024)).toFixed(1);
-  return /* @__PURE__ */ React55.createElement(Box45, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text48, { bold: true, color: TONE.err }, "\u25CFREC"), /* @__PURE__ */ React55.createElement(Text48, { color: TONE.err }, ` ${sizeMb} MB \xB7 ${rec.events} evt`));
+  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`));
 }
 function Sep() {
-  return /* @__PURE__ */ React55.createElement(Text48, { color: FG.meta }, "   \xB7   ");
+  return /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "   \xB7   ");
 }
 function modeGlyph(mode2) {
   switch (mode2) {
@@ -9259,8 +9376,8 @@ function networkDot(state) {
 }
 
 // src/cli/ui/layout/ToastRail.tsx
-import { Box as Box46, Text as Text49, useStdout as useStdout13 } from "ink";
-import React56, { useEffect as useEffect8 } from "react";
+import { Box as Box47, Text as Text50, useStdout as useStdout13 } from "ink";
+import React57, { useEffect as useEffect8 } from "react";
 var TONE_COLOR = {
   ok: TONE.ok,
   info: TONE.brand,
@@ -9298,17 +9415,17 @@ function ToastRail() {
   }, [toasts, dispatch]);
   const visible = toasts.filter((t2) => now - t2.bornAt < t2.ttlMs);
   if (visible.length === 0) return null;
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "column" }, visible.map((t2) => {
+  return /* @__PURE__ */ React57.createElement(Box47, { flexDirection: "column" }, visible.map((t2) => {
     const color = TONE_COLOR[t2.tone];
     const glyph = TONE_GLYPH[t2.tone];
     const body = bodyColor(t2, now);
     const remainingSec = Math.max(0, Math.ceil((t2.ttlMs - (now - t2.bornAt)) / 1e3));
-    return /* @__PURE__ */ React56.createElement(Box46, { key: t2.id, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React56.createElement(Text49, { color }, rule), /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color }, glyph), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: body }, ` ${t2.title}`), t2.detail !== void 0 && /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, `  \xB7  ${t2.detail}`), /* @__PURE__ */ React56.createElement(Box46, { flexGrow: 1 }), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint }, `${remainingSec}s`)));
+    return /* @__PURE__ */ React57.createElement(Box47, { key: t2.id, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React57.createElement(Text50, { color }, rule), /* @__PURE__ */ React57.createElement(Box47, { flexDirection: "row" }, /* @__PURE__ */ React57.createElement(Text50, { color }, glyph), /* @__PURE__ */ React57.createElement(Text50, { bold: true, color: body }, ` ${t2.title}`), t2.detail !== void 0 && /* @__PURE__ */ React57.createElement(Text50, { color: FG.sub }, `  \xB7  ${t2.detail}`), /* @__PURE__ */ React57.createElement(Box47, { flexGrow: 1 }), /* @__PURE__ */ React57.createElement(Text50, { color: FG.faint }, `${remainingSec}s`)));
   }));
 }
 
 // src/cli/ui/layout/plan-live-row.tsx
-import React57 from "react";
+import React58 from "react";
 function isActivePlanInFlight(card) {
   if (card.kind !== "plan") return false;
   if (card.variant !== "active") return false;
@@ -9323,7 +9440,7 @@ function PlanLiveRow() {
     return null;
   });
   if (!planCard) return null;
-  return /* @__PURE__ */ React57.createElement(PlanCard, { card: planCard });
+  return /* @__PURE__ */ React58.createElement(PlanCard, { card: planCard });
 }
 
 // src/cli/ui/loop.ts
@@ -9851,12 +9968,19 @@ var loop = (args, _loop, ctx) => {
     })
   };
 };
+var keys = (_args, _loop, ctx) => {
+  if (!ctx.postKeys) return { info: t("handlers.basic.keysNeedsTui") };
+  const ref = tObj("ui.keysReference");
+  ctx.postKeys({ topic: ref.topic, sections: ref.sections, footer: ref.footer });
+  return {};
+};
 var handlers2 = {
   exit,
   new: resetLog,
   help,
   retry,
-  loop
+  loop,
+  keys
 };
 
 // src/cli/ui/slash/handlers/dashboard.ts
@@ -10775,8 +10899,8 @@ var handlers10 = {
 };
 
 // src/cli/ui/ctx-breakdown.tsx
-import { Box as Box47, Text as Text50 } from "ink";
-import React58 from "react";
+import { Box as Box48, Text as Text51 } from "ink";
+import React59 from "react";
 function computeCtxBreakdown(loop2) {
   const systemTokens = countTokens(loop2.prefix.system);
   const toolsTokens = countTokens(JSON.stringify(loop2.prefix.toolSpecs));
@@ -11306,8 +11430,40 @@ var handlers15 = {
   skills: skill
 };
 
-// src/cli/ui/slash/handlers/web-search-engine.ts
+// src/cli/ui/slash/handlers/theme.ts
+var themeChoices = ["auto", ...listThemeNames()];
+function formatThemeStatus() {
+  const configured = loadTheme();
+  const active = resolveThemePreference(configured, process.env.REASONIX_THEME);
+  const source = configured && configured !== "auto" ? "config" : "env/default";
+  return [
+    `theme: ${active} (${source})`,
+    `configured: ${configured ?? "unset"}`,
+    `available: ${themeChoices.join(", ")}`,
+    "usage: /theme <name|auto>"
+  ].join("\n");
+}
+function isThemeChoice(value) {
+  return value === "auto" || isThemeName(value);
+}
+var theme = (args) => {
+  const next = args[0];
+  if (!next) return { info: formatThemeStatus() };
+  if (!isThemeChoice(next)) {
+    return { info: `unknown theme: ${next}
+available: ${themeChoices.join(", ")}` };
+  }
+  saveTheme(next);
+  const active = resolveThemePreference(next, process.env.REASONIX_THEME);
+  return { info: `theme saved: ${next}
+active on next launch: ${active}` };
+};
 var handlers16 = {
+  theme
+};
+
+// src/cli/ui/slash/handlers/web-search-engine.ts
+var handlers17 = {
   "search-engine": (args, _loop, ctx) => {
     const engine = args[0];
     if (!engine || engine !== "mojeek" && engine !== "searxng") {
@@ -11340,7 +11496,7 @@ var handlers16 = {
     const detail = engine === "searxng" ? t("handlers.webSearchEngine.confirmedDetail", { endpoint: webSearchEndpoint() }) : "";
     return { info: t("handlers.webSearchEngine.confirmed", { engine, detail }) };
   },
-  se: (args, loop2, ctx) => handlers16["search-engine"](args, loop2, ctx)
+  se: (args, loop2, ctx) => handlers17["search-engine"](args, loop2, ctx)
 };
 
 // src/cli/ui/slash/dispatch.ts
@@ -11359,8 +11515,9 @@ var HANDLERS = {
   ...handlers12,
   ...handlers13,
   ...handlers14,
+  ...handlers16,
   ...handlers15,
-  ...handlers16
+  ...handlers17
 };
 function handleSlash(cmd, args, loop2, ctx = {}) {
   const h = HANDLERS[resolveSlashAlias(cmd)];
@@ -11497,6 +11654,20 @@ ${card.meta}` : card.text
       case "ctx":
         out.push({ id: card.id, role: "info", text: card.text });
         break;
+      case "tip": {
+        const sectionTexts = card.sections.map((sec) => {
+          const body2 = sec.rows.map((r) => `${r.key}	${r.text}`).join("\n");
+          return sec.title ? `[${sec.title}]
+${body2}` : body2;
+        });
+        const body = sectionTexts.join("\n\n");
+        const text = card.footer ? `${card.topic}
+${body}
+${card.footer}` : `${card.topic}
+${body}`;
+        out.push({ id: card.id, role: "info", text });
+        break;
+      }
       case "plan": {
         const done = card.steps.filter((s) => s.status === "done").length;
         const tag2 = card.variant === "resumed" ? "[resumed]" : card.variant === "replay" ? "[replay]" : "";
@@ -11579,7 +11750,10 @@ function hydrateCardsFromMessages(messages) {
 }
 
 // src/cli/ui/useCompletionPickers.ts
-import { useCallback as useCallback8, useEffect as useEffect9, useMemo as useMemo8, useRef as useRef5, useState as useState16 } from "react";
+import { useCallback as useCallback8, useEffect as useEffect9, useMemo as useMemo8, useReducer as useReducer2, useRef as useRef5, useState as useState16 } from "react";
+var SEARCH_DEBOUNCE_MS = 80;
+var SEARCH_FLUSH_MS = 50;
+var SEARCH_RESULT_CAP = 200;
 function useCompletionPickers({
   input,
   setInput,
@@ -11607,22 +11781,6 @@ function useCompletionPickers({
     });
   }, [slashMatches]);
   const [atSelected, setAtSelected] = useState16(0);
-  const [atFiles, setAtFiles] = useState16([]);
-  useEffect9(() => {
-    if (!codeMode) {
-      setAtFiles([]);
-      return;
-    }
-    let cancelled = false;
-    listFilesWithStatsAsync(rootDir, { maxResults: 500 }).then((files) => {
-      if (!cancelled) setAtFiles(files);
-    }).catch(() => {
-      if (!cancelled) setAtFiles([]);
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [codeMode, rootDir]);
   const recentFilesRef = useRef5([]);
   const recordRecentFile = useCallback8((p) => {
     const list2 = recentFilesRef.current;
@@ -11636,25 +11794,50 @@ function useCompletionPickers({
     if (slashMatches !== null) return null;
     return detectAtPicker(input);
   }, [codeMode, input, slashMatches]);
-  const atMatches = useMemo8(() => {
-    if (!atPicker) return null;
-    return rankPickerCandidates(atFiles, atPicker.query, {
-      limit: 40,
-      recentlyUsed: recentFilesRef.current
-    });
-  }, [atPicker, atFiles]);
+  const parsed = useMemo8(
+    () => atPicker ? parseAtQuery(atPicker.query) : null,
+    [atPicker]
+  );
+  const atMode = parsed ? parsed.trailingSlash || parsed.filter === "" ? "browse" : "search" : null;
+  const browseDir = parsed && atMode === "browse" ? parsed.dir : "";
+  const browse = useBrowseListing(rootDir, atMode === "browse" ? browseDir : null);
+  const search = useStreamingSearch(
+    rootDir,
+    atMode === "search" && parsed ? parsed.filter : null,
+    recentFilesRef
+  );
+  const atState = useMemo8(() => {
+    if (!parsed) return null;
+    if (atMode === "browse") {
+      return {
+        kind: "browse",
+        baseDir: browseDir,
+        entries: browse.entries,
+        loading: browse.loading
+      };
+    }
+    return {
+      kind: "search",
+      filter: parsed.filter,
+      entries: search.entries,
+      scanned: search.scanned,
+      searching: search.searching
+    };
+  }, [parsed, atMode, browseDir, browse, search]);
   useEffect9(() => {
     setAtSelected((prev) => {
-      if (!atMatches || atMatches.length === 0) return 0;
-      if (prev >= atMatches.length) return atMatches.length - 1;
+      const len = atState?.entries.length ?? 0;
+      if (len === 0) return 0;
+      if (prev >= len) return len - 1;
       return prev;
     });
-  }, [atMatches]);
+  }, [atState]);
   const pickAtMention = useCallback8(
-    (chosenPath) => {
+    (entry, action) => {
       if (!atPicker) return;
       const before = input.slice(0, atPicker.atOffset);
-      setInput(`${before}@${chosenPath} `);
+      const tail = action === "drill" && entry.isDir ? `${entry.insertPath}/` : `${entry.insertPath} `;
+      setInput(`${before}@${tail}`);
     },
     [atPicker, input, setInput]
   );
@@ -11725,8 +11908,7 @@ function useCompletionPickers({
     setSlashSelected,
     slashGroupMode,
     slashAdvancedHidden,
-    atPicker,
-    atMatches,
+    atState,
     atSelected,
     setAtSelected,
     pickAtMention,
@@ -11738,6 +11920,113 @@ function useCompletionPickers({
     pickSlashArg
   };
 }
+function useBrowseListing(rootDir, dir) {
+  const [entries, setEntries] = useState16([]);
+  const [loading, setLoading] = useState16(false);
+  useEffect9(() => {
+    if (dir === null) {
+      setEntries([]);
+      setLoading(false);
+      return;
+    }
+    let cancelled = false;
+    setLoading(true);
+    listDirectory(rootDir, dir).then(
+      (raw) => {
+        if (cancelled) return;
+        setEntries(raw.map(toBrowseEntry));
+        setLoading(false);
+      },
+      () => {
+        if (cancelled) return;
+        setEntries([]);
+        setLoading(false);
+      }
+    );
+    return () => {
+      cancelled = true;
+    };
+  }, [rootDir, dir]);
+  return { entries, loading };
+}
+function toBrowseEntry(d) {
+  return { label: d.name, insertPath: d.path, dirSuffix: "", isDir: d.isDir };
+}
+function useStreamingSearch(rootDir, filter, recentFilesRef) {
+  const [, bumpRender] = useReducer2((x) => x + 1, 0);
+  const hitsRef = useRef5([]);
+  const scannedRef = useRef5(0);
+  const searchingRef = useRef5(false);
+  const rankedRef = useRef5([]);
+  useEffect9(() => {
+    if (filter === null) {
+      hitsRef.current = [];
+      scannedRef.current = 0;
+      searchingRef.current = false;
+      rankedRef.current = [];
+      bumpRender();
+      return;
+    }
+    hitsRef.current = [];
+    scannedRef.current = 0;
+    searchingRef.current = true;
+    rankedRef.current = [];
+    bumpRender();
+    const ac = new AbortController();
+    let flushTimer = null;
+    const scheduleFlush = () => {
+      if (flushTimer) return;
+      flushTimer = setTimeout(() => {
+        flushTimer = null;
+        rankedRef.current = rankSearchHits(hitsRef.current, filter, recentFilesRef.current ?? []);
+        bumpRender();
+      }, SEARCH_FLUSH_MS);
+    };
+    const debounce = setTimeout(() => {
+      walkFilesStream(rootDir, {
+        signal: ac.signal,
+        onEntry: (e) => {
+          hitsRef.current.push(e);
+          if (hitsRef.current.length >= SEARCH_RESULT_CAP * 8) return false;
+          scheduleFlush();
+        },
+        onProgress: (n) => {
+          scannedRef.current = n;
+          scheduleFlush();
+        }
+      }).then(() => {
+        searchingRef.current = false;
+        rankedRef.current = rankSearchHits(hitsRef.current, filter, recentFilesRef.current ?? []);
+        bumpRender();
+      });
+    }, SEARCH_DEBOUNCE_MS);
+    return () => {
+      clearTimeout(debounce);
+      if (flushTimer) clearTimeout(flushTimer);
+      ac.abort();
+    };
+  }, [rootDir, filter, recentFilesRef]);
+  return {
+    entries: rankedRef.current,
+    scanned: scannedRef.current,
+    searching: searchingRef.current
+  };
+}
+function rankSearchHits(hits, filter, recent) {
+  const ranked = rankPickerCandidates(hits, filter, {
+    limit: SEARCH_RESULT_CAP,
+    recentlyUsed: recent
+  });
+  return ranked.map((path) => {
+    const slash = path.lastIndexOf("/");
+    return {
+      label: slash >= 0 ? path.slice(slash + 1) : path,
+      insertPath: path,
+      dirSuffix: slash >= 0 ? `${path.slice(0, slash)}/` : "",
+      isDir: false
+    };
+  });
+}
 
 // src/cli/ui/useEditHistory.ts
 import { useCallback as useCallback9, useRef as useRef6, useState as useState17 } from "react";
@@ -12162,13 +12451,13 @@ var PLAIN_UI = process.env.REASONIX_UI === "plain";
 function LoopStatusRow({
   loop: loop2
 }) {
-  const [, setTick] = React59.useState(0);
-  React59.useEffect(() => {
+  const [, setTick] = React60.useState(0);
+  React60.useEffect(() => {
     const id = setInterval(() => setTick((t2) => t2 + 1), 1e3);
     return () => clearInterval(id);
   }, []);
   const nextFireMs = Math.max(0, loop2.nextFireAt - Date.now());
-  return /* @__PURE__ */ React59.createElement(Box48, null, /* @__PURE__ */ React59.createElement(Text51, { color: "cyan" }, `\u25B8 ${formatLoopStatus(loop2.prompt, nextFireMs, loop2.iter)} \xB7 /loop stop or type to cancel`));
+  return /* @__PURE__ */ React60.createElement(Box49, null, /* @__PURE__ */ React60.createElement(Text52, { color: "cyan" }, `\u25B8 ${formatLoopStatus(loop2.prompt, nextFireMs, loop2.iter)} \xB7 /loop stop or type to cancel`));
 }
 function App(props) {
   markPhase("app_render_start");
@@ -12177,11 +12466,12 @@ function App(props) {
     model: props.model,
     workspace: props.codeMode?.rootDir ?? process.cwd()
   });
-  const initialCards = React59.useMemo(
+  const initialCards = React60.useMemo(
     () => props.session ? hydrateCardsFromMessages(loadSessionMessages(props.session)) : [],
     [props.session]
   );
-  return /* @__PURE__ */ React59.createElement(AgentStoreProvider, { session, initialCards }, /* @__PURE__ */ React59.createElement(AppInner, { ...props }));
+  const themeName = resolveThemePreference(loadTheme(), process.env.REASONIX_THEME);
+  return /* @__PURE__ */ React60.createElement(ThemeProvider, { name: themeName }, /* @__PURE__ */ React60.createElement(AgentStoreProvider, { session, initialCards }, /* @__PURE__ */ React60.createElement(AppInner, { ...props })));
 }
 function AppInner({
   model: model2,
@@ -12233,7 +12523,9 @@ function AppInner({
     if (!stdout || !stdout.isTTY) return;
     stdout.write("\x1B[?2004h");
     stdout.write("\x1B[>4;2m");
+    stdout.write("\x1B[?1006h\x1B[?1000h");
     return () => {
+      stdout.write("\x1B[?1000l\x1B[?1006l");
       stdout.write("\x1B[?2004l");
       stdout.write("\x1B[>4m");
     };
@@ -12621,8 +12913,7 @@ function AppInner({
     setSlashSelected,
     slashGroupMode,
     slashAdvancedHidden,
-    atPicker,
-    atMatches,
+    atState,
     atSelected,
     setAtSelected,
     pickAtMention,
@@ -12695,14 +12986,20 @@ function AppInner({
       }
     }
     if (codeMode && !editModeHintShown()) {
-      log.pushInfo(t("ui.tipEditBindings"));
+      const tip = tObj("ui.tipEditBindings");
+      log.pushTip({ topic: tip.topic, sections: tip.sections, footer: tip.footer });
       markEditModeHintShown();
     }
+    if (!mouseClipboardHintShown()) {
+      const tip = tObj("ui.tipMouseClipboard");
+      log.pushTip({ topic: tip.topic, sections: tip.sections, footer: tip.footer });
+      markMouseClipboardHintShown();
+    }
   }, [session, loop2, codeMode, syncPendingCount, log]);
   const quitProcess = useQuit(transcriptRef);
   useKeystroke((ev) => {
-    if (ev.pageUp) chatScroll.scrollUp();
-    else if (ev.pageDown) chatScroll.scrollDown();
+    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();
@@ -12734,7 +13031,7 @@ function AppInner({
       stopLoop();
       return;
     }
-    if (key.escape && !busy && (slashMatches || atMatches || slashArgContext)) {
+    if (key.escape && !busy && (slashMatches || atState || slashArgContext)) {
       setInput("");
       return;
     }
@@ -12772,18 +13069,19 @@ function AppInner({
     }
     if (busy) return;
     if (pendingShell) return;
-    if (atMatches && atMatches.length > 0) {
+    if (atState && atState.entries.length > 0) {
+      const entries = atState.entries;
       if (key.upArrow) {
         setAtSelected((i) => Math.max(0, i - 1));
         return;
       }
       if (key.downArrow) {
-        setAtSelected((i) => Math.min(atMatches.length - 1, i + 1));
+        setAtSelected((i) => Math.min(entries.length - 1, i + 1));
         return;
       }
       if (key.tab) {
-        const sel = atMatches[atSelected] ?? atMatches[0];
-        if (sel) pickAtMention(sel);
+        const sel = entries[atSelected] ?? entries[0];
+        if (sel) pickAtMention(sel, sel.isDir ? "drill" : "commit");
         return;
       }
     }
@@ -12919,7 +13217,7 @@ function AppInner({
     if (dashboardRef.current) return dashboardRef.current.url;
     if (dashboardStartingRef.current) return dashboardStartingRef.current;
     const startup = (async () => {
-      const { startDashboardServer } = await import("./server-SYC3OVOP.js");
+      const { startDashboardServer } = await import("./server-MC4A4WAJ.js");
       const handle = await startDashboardServer({
         mode: "attached",
         configPath: defaultConfigPath(),
@@ -13227,10 +13525,10 @@ function AppInner({
       }
       clearFiringFlag();
       if (busy) return;
-      if (atMatches && atMatches.length > 0 && atPicker) {
-        const sel = atMatches[atSelected] ?? atMatches[0];
+      if (atState && atState.entries.length > 0) {
+        const sel = atState.entries[atSelected] ?? atState.entries[0];
         if (sel) {
-          pickAtMention(sel);
+          pickAtMention(sel, "commit");
           return;
         }
       }
@@ -13358,6 +13656,12 @@ function AppInner({
           postInfo: (text2) => log.pushInfo(text2),
           postDoctor: (checks) => log.showDoctor(checks),
           postUsage: (args) => log.showUsageVerbose(args),
+          postKeys: (args) => log.pushTip({
+            topic: args.topic,
+            sections: args.sections,
+            footer: args.footer,
+            oneTime: false
+          }),
           dispatch: agentStore.dispatch,
           reloadHooks: () => {
             const fresh = loadHooks({ projectRoot: codeMode ? currentRootDir : void 0 });
@@ -13730,8 +14034,7 @@ function AppInner({
       planMode,
       session,
       slashSelected,
-      atMatches,
-      atPicker,
+      atState,
       atSelected,
       pickAtMention,
       recordRecentFile,
@@ -14203,14 +14506,14 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
     []
   );
   const tickerSuspended = PLAIN_UI || modalOpen || !busy && !isStreaming;
-  return /* @__PURE__ */ React59.createElement(React59.Fragment, null, /* @__PURE__ */ React59.createElement(TickerProvider, { disabled: tickerSuspended }, /* @__PURE__ */ React59.createElement(ViewportBudgetProvider, null, /* @__PURE__ */ React59.createElement(Box48, { flexDirection: "row", height: stdout?.rows ?? 24 }, /* @__PURE__ */ React59.createElement(Box48, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ React59.createElement(Box48, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ React59.createElement(LiveExpandContext.Provider, { value: liveExpand }, /* @__PURE__ */ React59.createElement(
+  return /* @__PURE__ */ React60.createElement(React60.Fragment, null, /* @__PURE__ */ React60.createElement(TickerProvider, { disabled: tickerSuspended }, /* @__PURE__ */ React60.createElement(ViewportBudgetProvider, null, /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "row", height: stdout?.rows ?? 24 }, /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ React60.createElement(LiveExpandContext.Provider, { value: liveExpand }, /* @__PURE__ */ React60.createElement(
     CardStream,
     {
       suppressLive: modalOpen,
       scrollRows: chatScroll.scrollRows,
       onMaxScrollChange: chatScroll.setMaxScroll
     }
-  )), !hasConversation && !busy && !isStreaming ? /* @__PURE__ */ React59.createElement(
+  )), !hasConversation && !busy && !isStreaming ? /* @__PURE__ */ React60.createElement(
     WelcomeBanner,
     {
       inCodeMode: !!codeMode,
@@ -14218,28 +14521,28 @@ 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__ */ React59.createElement(OngoingToolRow, { tool: ongoingTool, progress: toolProgress }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && subagentActivities.length > 0 ? /* @__PURE__ */ React59.createElement(SubagentLiveStack, { activities: subagentActivities, max: 3 }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && !ongoingTool && statusLine ? /* @__PURE__ */ React59.createElement(ThinkingRow, { text: statusLine }) : null, !PLAIN_UI && undoBanner && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && !pendingChoice && !stagedChoiceCustom && !pendingRevision && !stagedCheckpointRevise && !pendingCheckpoint ? /* @__PURE__ */ React59.createElement(UndoBanner, { banner: undoBanner }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview && busy && !isStreaming && !ongoingTool && !statusLine ? /* @__PURE__ */ React59.createElement(ThinkingRow, { text: "processing\u2026" }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !pendingReviseEditor && !pendingSessionsPicker && !pendingCheckpointPicker && !pendingMcpHub && !stagedInput && !pendingEditReview ? /* @__PURE__ */ React59.createElement(PlanLiveRow, null) : null, /* @__PURE__ */ React59.createElement(ToastRail, null)), stagedInput ? /* @__PURE__ */ React59.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: "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(
     PlanRefineInput,
     {
       mode: stagedInput.mode,
       onSubmit: handleStagedInputSubmit,
       onCancel: handleStagedInputCancel
     }
-  ) : stagedChoiceCustom ? /* @__PURE__ */ React59.createElement(
+  ) : stagedChoiceCustom ? /* @__PURE__ */ React60.createElement(
     PlanRefineInput,
     {
       mode: "choice-custom",
       onSubmit: handleChoiceCustomSubmit,
       onCancel: handleChoiceCustomCancel
     }
-  ) : stagedCheckpointRevise ? /* @__PURE__ */ React59.createElement(
+  ) : stagedCheckpointRevise ? /* @__PURE__ */ React60.createElement(
     PlanRefineInput,
     {
       mode: "checkpoint-revise",
       onSubmit: (text) => handleCheckpointReviseSubmit(text, stagedCheckpointRevise),
       onCancel: handleCheckpointReviseCancel
     }
-  ) : pendingChoice ? /* @__PURE__ */ React59.createElement(
+  ) : pendingChoice ? /* @__PURE__ */ React60.createElement(
     ChoiceConfirm,
     {
       question: pendingChoice.question,
@@ -14247,7 +14550,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       allowCustom: pendingChoice.allowCustom,
       onChoose: stableHandleChoiceConfirm
     }
-  ) : pendingRevision ? /* @__PURE__ */ React59.createElement(
+  ) : pendingRevision ? /* @__PURE__ */ React60.createElement(
     PlanReviseConfirm,
     {
       reason: pendingRevision.reason,
@@ -14258,7 +14561,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       summary: pendingRevision.summary,
       onChoose: stableHandleReviseConfirm
     }
-  ) : pendingCheckpoint ? /* @__PURE__ */ React59.createElement(
+  ) : pendingCheckpoint ? /* @__PURE__ */ React60.createElement(
     PlanCheckpointConfirm,
     {
       stepId: pendingCheckpoint.stepId,
@@ -14269,7 +14572,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       completedStepIds: completedStepIdsRef.current,
       onChoose: stableHandleCheckpointConfirm
     }
-  ) : pendingCheckpointPicker ? /* @__PURE__ */ React59.createElement(
+  ) : pendingCheckpointPicker ? /* @__PURE__ */ React60.createElement(
     CheckpointPicker,
     {
       checkpoints: checkpointPickerList,
@@ -14314,7 +14617,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
         }
       }
     }
-  ) : pendingSessionsPicker ? /* @__PURE__ */ React59.createElement(
+  ) : pendingSessionsPicker ? /* @__PURE__ */ React60.createElement(
     SessionPicker,
     {
       sessions: sessionsPickerList,
@@ -14359,7 +14662,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
         }
       }
     }
-  ) : pendingModelPicker ? /* @__PURE__ */ React59.createElement(
+  ) : pendingModelPicker ? /* @__PURE__ */ React60.createElement(
     ModelPicker,
     {
       models,
@@ -14391,7 +14694,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
         }
       }
     }
-  ) : pendingMcpHub ? /* @__PURE__ */ React59.createElement(
+  ) : pendingMcpHub ? /* @__PURE__ */ React60.createElement(
     McpHub,
     {
       initialTab: pendingMcpHub.tab,
@@ -14411,7 +14714,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
         return r;
       } : void 0
     }
-  ) : pendingPlan ? /* @__PURE__ */ React59.createElement(
+  ) : pendingPlan ? /* @__PURE__ */ React60.createElement(
     PlanConfirm,
     {
       plan: pendingPlan,
@@ -14420,7 +14723,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       onChoose: stableHandlePlanConfirm,
       projectRoot: currentRootDir
     }
-  ) : pendingReviseEditor ? /* @__PURE__ */ React59.createElement(
+  ) : pendingReviseEditor ? /* @__PURE__ */ React60.createElement(
     PlanReviseEditor,
     {
       steps: planStepsRef.current ?? [],
@@ -14439,7 +14742,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
         setPendingPlan(planText);
       }
     }
-  ) : pendingShell ? /* @__PURE__ */ React59.createElement(
+  ) : pendingShell ? /* @__PURE__ */ React60.createElement(
     ShellConfirm,
     {
       command: pendingShell.command,
@@ -14447,7 +14750,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       kind: pendingShell.kind,
       onChoose: handleShellConfirm
     }
-  ) : pendingEditReview ? /* @__PURE__ */ React59.createElement(
+  ) : pendingEditReview ? /* @__PURE__ */ React60.createElement(
     EditConfirm,
     {
       block: pendingEditReview,
@@ -14459,14 +14762,14 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
         }
       }
     }
-  ) : walkthroughActive && pendingEdits.current.length > 0 ? /* @__PURE__ */ React59.createElement(
+  ) : walkthroughActive && pendingEdits.current.length > 0 ? /* @__PURE__ */ React60.createElement(
     EditConfirm,
     {
       key: `walk-${pendingTick}`,
       block: pendingEdits.current[0],
       onChoose: handleWalkChoice
     }
-  ) : !chatScroll.pinned ? /* @__PURE__ */ React59.createElement(Text51, { color: FG.faint }, " \u{1F4D6} reading history \u2014 End / PgDn to return \xB7 \u2193 to advance one line") : /* @__PURE__ */ React59.createElement(React59.Fragment, null, codeMode ? /* @__PURE__ */ React59.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(React60.Fragment, null, codeMode ? /* @__PURE__ */ React60.createElement(
     ModeStatusBar,
     {
       editMode,
@@ -14476,7 +14779,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       undoArmed: !!undoBanner || hasUndoable(),
       jobs: codeMode.jobs
     }
-  ) : null, activeLoop ? /* @__PURE__ */ React59.createElement(LoopStatusRow, { loop: activeLoop }) : null, /* @__PURE__ */ React59.createElement(StatusRow, null), /* @__PURE__ */ React59.createElement(
+  ) : null, activeLoop ? /* @__PURE__ */ React60.createElement(LoopStatusRow, { loop: activeLoop }) : null, /* @__PURE__ */ React60.createElement(StatusRow, null), /* @__PURE__ */ React60.createElement(
     PromptInput,
     {
       value: input,
@@ -14486,7 +14789,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       onHistoryPrev: recallPrev,
       onHistoryNext: recallNext
     }
-  ), slashMatches !== null ? /* @__PURE__ */ React59.createElement(
+  ), slashMatches !== null ? /* @__PURE__ */ React60.createElement(
     SlashSuggestions,
     {
       matches: slashMatches,
@@ -14494,14 +14797,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       groupMode: slashGroupMode,
       advancedHidden: slashAdvancedHidden
     }
-  ) : null, atMatches !== null ? /* @__PURE__ */ React59.createElement(
-    AtMentionSuggestions,
-    {
-      matches: atMatches,
-      selectedIndex: atSelected,
-      query: atPicker?.query ?? ""
-    }
-  ) : null, slashArgContext ? /* @__PURE__ */ React59.createElement(
+  ) : null, atState !== null ? /* @__PURE__ */ React60.createElement(AtMentionSuggestions, { state: atState, selectedIndex: atSelected }) : null, slashArgContext ? /* @__PURE__ */ React60.createElement(
     SlashArgPicker,
     {
       matches: slashArgMatches,
@@ -14514,12 +14810,12 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
 }
 
 // src/cli/ui/Setup.tsx
-import { Box as Box49, Text as Text53, useApp } from "ink";
-import React61, { useState as useState21 } from "react";
+import { Box as Box50, Text as Text54, useApp } from "ink";
+import React62, { useState as useState21 } from "react";
 
 // src/cli/ui/MaskedInput.tsx
-import { Text as Text52, useInput } from "ink";
-import React60, { useRef as useRef9 } from "react";
+import { Text as Text53, useInput } from "ink";
+import React61, { useRef as useRef9 } from "react";
 function stripPasteMarkers(s) {
   return s.replace(/\u001b?\[20[01]~/g, "").replace(/\u001b/g, "");
 }
@@ -14554,11 +14850,11 @@ function MaskedInput({
   });
   if (value.length === 0) {
     if (placeholder.length === 0) {
-      return /* @__PURE__ */ React60.createElement(Text52, { inverse: true }, " ");
+      return /* @__PURE__ */ React61.createElement(Text53, { inverse: true }, " ");
     }
-    return /* @__PURE__ */ React60.createElement(React60.Fragment, null, /* @__PURE__ */ React60.createElement(Text52, { inverse: true }, placeholder[0]), /* @__PURE__ */ React60.createElement(Text52, { color: FG.faint }, placeholder.slice(1)));
+    return /* @__PURE__ */ React61.createElement(React61.Fragment, null, /* @__PURE__ */ React61.createElement(Text53, { inverse: true }, placeholder[0]), /* @__PURE__ */ React61.createElement(Text53, { color: FG.faint }, placeholder.slice(1)));
   }
-  return /* @__PURE__ */ React60.createElement(React60.Fragment, null, /* @__PURE__ */ React60.createElement(Text52, null, mask.repeat(value.length)), /* @__PURE__ */ React60.createElement(Text52, { inverse: true }, " "));
+  return /* @__PURE__ */ React61.createElement(React61.Fragment, null, /* @__PURE__ */ React61.createElement(Text53, null, mask.repeat(value.length)), /* @__PURE__ */ React61.createElement(Text53, { inverse: true }, " "));
 }
 
 // src/cli/ui/Setup.tsx
@@ -14585,7 +14881,7 @@ function Setup({ onReady }) {
     }
     onReady(trimmed);
   };
-  return /* @__PURE__ */ React61.createElement(Box49, { flexDirection: "column", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React61.createElement(Box49, null, /* @__PURE__ */ React61.createElement(Text53, { bold: true, color: GRADIENT[0] }, GLYPH.brand), /* @__PURE__ */ React61.createElement(Text53, null, "  "), /* @__PURE__ */ React61.createElement(Text53, { bold: true }, "Welcome to "), /* @__PURE__ */ React61.createElement(Text53, { bold: true, color: GRADIENT[2] }, "REASONIX")), /* @__PURE__ */ React61.createElement(Box49, { marginTop: 1 }, /* @__PURE__ */ React61.createElement(Text53, { color: COLOR.info }, "Paste your DeepSeek API key to get started.")), /* @__PURE__ */ React61.createElement(Box49, null, /* @__PURE__ */ React61.createElement(Text53, { dimColor: true }, "  sign up at \xB7 "), /* @__PURE__ */ React61.createElement(Text53, { color: COLOR.primary }, "https://platform.deepseek.com/api_keys")), /* @__PURE__ */ React61.createElement(Box49, null, /* @__PURE__ */ React61.createElement(Text53, { dimColor: true }, "  saved to "), /* @__PURE__ */ React61.createElement(Text53, { dimColor: true }, defaultConfigPath())), /* @__PURE__ */ React61.createElement(Box49, { marginTop: 1 }, /* @__PURE__ */ React61.createElement(Text53, { bold: true, color: COLOR.brand }, GLYPH.bar), /* @__PURE__ */ React61.createElement(Text53, { bold: true, color: COLOR.primary }, " \u203A "), /* @__PURE__ */ React61.createElement(
+  return /* @__PURE__ */ React62.createElement(Box50, { flexDirection: "column", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React62.createElement(Box50, null, /* @__PURE__ */ React62.createElement(Text54, { bold: true, color: GRADIENT[0] }, GLYPH.brand), /* @__PURE__ */ React62.createElement(Text54, null, "  "), /* @__PURE__ */ React62.createElement(Text54, { bold: true }, "Welcome to "), /* @__PURE__ */ React62.createElement(Text54, { bold: true, color: GRADIENT[2] }, "REASONIX")), /* @__PURE__ */ React62.createElement(Box50, { marginTop: 1 }, /* @__PURE__ */ React62.createElement(Text54, { color: COLOR.info }, "Paste your DeepSeek API key to get started.")), /* @__PURE__ */ React62.createElement(Box50, null, /* @__PURE__ */ React62.createElement(Text54, { dimColor: true }, "  sign up at \xB7 "), /* @__PURE__ */ React62.createElement(Text54, { color: COLOR.primary }, "https://platform.deepseek.com/api_keys")), /* @__PURE__ */ React62.createElement(Box50, null, /* @__PURE__ */ React62.createElement(Text54, { dimColor: true }, "  saved to "), /* @__PURE__ */ React62.createElement(Text54, { dimColor: true }, defaultConfigPath())), /* @__PURE__ */ React62.createElement(Box50, { marginTop: 1 }, /* @__PURE__ */ React62.createElement(Text54, { bold: true, color: COLOR.brand }, GLYPH.bar), /* @__PURE__ */ React62.createElement(Text54, { bold: true, color: COLOR.primary }, " \u203A "), /* @__PURE__ */ React62.createElement(
     MaskedInput,
     {
       value,
@@ -14594,7 +14890,7 @@ function Setup({ onReady }) {
       mask: "\u2022",
       placeholder: "sk-..."
     }
-  )), error ? /* @__PURE__ */ React61.createElement(Box49, { marginTop: 1 }, /* @__PURE__ */ React61.createElement(Text53, { color: COLOR.err, bold: true }, GLYPH.err), /* @__PURE__ */ React61.createElement(Text53, { color: COLOR.err }, `  ${error}`)) : value ? /* @__PURE__ */ React61.createElement(Box49, { marginTop: 1 }, /* @__PURE__ */ React61.createElement(Text53, { dimColor: true }, `  preview \xB7 ${redactKey(value)}`)) : null, /* @__PURE__ */ React61.createElement(Box49, { marginTop: 1 }, /* @__PURE__ */ React61.createElement(Text53, { dimColor: true }, "  /exit to abort")));
+  )), error ? /* @__PURE__ */ React62.createElement(Box50, { marginTop: 1 }, /* @__PURE__ */ React62.createElement(Text54, { color: COLOR.err, bold: true }, GLYPH.err), /* @__PURE__ */ React62.createElement(Text54, { color: COLOR.err }, `  ${error}`)) : value ? /* @__PURE__ */ React62.createElement(Box50, { marginTop: 1 }, /* @__PURE__ */ React62.createElement(Text54, { dimColor: true }, `  preview \xB7 ${redactKey(value)}`)) : null, /* @__PURE__ */ React62.createElement(Box50, { marginTop: 1 }, /* @__PURE__ */ React62.createElement(Text54, { dimColor: true }, "  /exit to abort")));
 }
 
 // src/cli/ui/drain-tty.ts
@@ -14805,7 +15101,7 @@ function Root({
   const workspaceRoot = appProps.codeMode?.rootDir ?? process.cwd();
   const [sessions2, setSessions] = useState22(() => listSessionsForWorkspace(workspaceRoot));
   if (!key) {
-    return /* @__PURE__ */ React62.createElement(
+    return /* @__PURE__ */ React63.createElement(
       Setup,
       {
         onReady: (k) => {
@@ -14817,7 +15113,7 @@ function Root({
   }
   process.env.DEEPSEEK_API_KEY = key;
   if (pickerOpen) {
-    return /* @__PURE__ */ React62.createElement(KeystrokeProvider, null, /* @__PURE__ */ React62.createElement(
+    return /* @__PURE__ */ React63.createElement(KeystrokeProvider, null, /* @__PURE__ */ React63.createElement(
       SessionPicker,
       {
         sessions: sessions2,
@@ -14850,7 +15146,7 @@ function Root({
       }
     ));
   }
-  return /* @__PURE__ */ React62.createElement(KeystrokeProvider, null, /* @__PURE__ */ React62.createElement(
+  return /* @__PURE__ */ React63.createElement(KeystrokeProvider, null, /* @__PURE__ */ React63.createElement(
     App,
     {
       key: activeSession ?? "__new__",
@@ -14922,7 +15218,7 @@ async function chatCommand(opts) {
   const showPicker = !opts.session && !opts.forceResume && listSessionsForWorkspace(launchWorkspace).length > 0;
   markPhase("ink_render_call");
   const { waitUntilExit } = render(
-    /* @__PURE__ */ React62.createElement(
+    /* @__PURE__ */ React63.createElement(
       Root,
       {
         initialKey,
@@ -14958,4 +15254,4 @@ async function chatCommand(opts) {
 export {
   chatCommand
 };
-//# sourceMappingURL=chunk-OW7IHE6M.js.map
+//# sourceMappingURL=chunk-5SAMVHA3.js.map