reasonix 0.52.0 → 0.53.0

package/dist/cli/{chunk-GNRKXRRE.js → chunk-S3QII236.js}

@@ -2,10 +2,13 @@
 import { createRequire as __cr } from 'node:module'; if (typeof globalThis.require === 'undefined') { globalThis.require = __cr(import.meta.url); }
 import {
   formatTokens
-} from "./chunk-77JIQ7SL.js";
+} from "./chunk-EQFZIHKJ.js";
 import {
   loadOverlay
 } from "./chunk-JMBMLOBP.js";
+import {
+  renderDashboard
+} from "./chunk-APOSDBAU.js";
 import {
   MANUAL_UPDATE_COMMANDS,
   planUpdate
@@ -32,11 +35,11 @@ import {
   restoreCheckpoint,
   savePlanState,
   suggestSlashCommands
-} from "./chunk-B4MOGWHW.js";
+} from "./chunk-4EHRIP5U.js";
 import {
   eventLogPath,
   openEventSink
-} from "./chunk-XNMXVL6C.js";
+} from "./chunk-FB27YXPX.js";
 import {
   fetchSmitheryDetail,
   loadMorePages,
@@ -50,20 +53,20 @@ import {
   formatQQModeLabel,
   formatQQSetupPrompt,
   formatQQSetupWaiting
-} from "./chunk-MVLPXZAA.js";
+} from "./chunk-GOASYYZ4.js";
 import {
   Eventizer,
   autoResolveVerdict,
   registerSkillTools,
   shouldAutoResolveCheckpoint
-} from "./chunk-XBYHNZ5Z.js";
+} from "./chunk-GMQVINZK.js";
 import {
   formatMcpLifecycleEvent,
   formatMcpSlowToast
-} from "./chunk-CFJY64UA.js";
+} from "./chunk-LRO63VNK.js";
 import {
   buildTransportFromSpec
-} from "./chunk-XUZHBQSM.js";
+} from "./chunk-MQJR7YQ2.js";
 import {
   dumpStartupProfile,
   markPhase,
@@ -96,15 +99,15 @@ import {
   toWholeFileEditBlock,
   walkFilesStream,
   webFetch
-} from "./chunk-HNZ4727T.js";
+} from "./chunk-DFHI2MRB.js";
+import {
+  McpClient
+} from "./chunk-4SBXAHR6.js";
 import {
   openTranscriptFile,
   recordFromLoopEvent,
   writeRecord
-} from "./chunk-D6WRFR6V.js";
-import {
-  McpClient
-} from "./chunk-RCC73DWQ.js";
+} from "./chunk-R7JMQMLD.js";
 import {
   BUILTIN_ALLOWLIST,
   derivePrefix,
@@ -114,7 +117,18 @@ import {
   runCommand,
   stripCompactionMarker,
   toApprovalPrompt
-} from "./chunk-5YLEKX2V.js";
+} from "./chunk-4V4TKQMB.js";
+import {
+  aggregateUsage,
+  appendUsage,
+  defaultUsageLogPath,
+  readUsageLog
+} from "./chunk-FK7NXDRP.js";
+import {
+  DEEPSEEK_CONTEXT_TOKENS,
+  DEFAULT_CONTEXT_TOKENS,
+  pricingFor
+} from "./chunk-V4AXMN4X.js";
 import {
   MemoryStore,
   PROJECT_MEMORY_FILE,
@@ -123,12 +137,12 @@ import {
   memoryEnabled,
   readProjectMemory,
   resolveProjectMemoryWritePath
-} from "./chunk-DLTE4GBY.js";
+} from "./chunk-J4MYMBJ7.js";
 import {
   KeystrokeProvider,
   SingleSelect,
   useKeystroke
-} from "./chunk-CGVW5W7N.js";
+} from "./chunk-EPIHGOM3.js";
 import {
   COLOR,
   GLYPH,
@@ -136,29 +150,33 @@ import {
   ThemeProvider,
   useColor,
   useThemeTokens
-} from "./chunk-RHQOGG43.js";
+} from "./chunk-OHSVEXFF.js";
 import {
-  An,
-  Cv,
-  L,
-  W,
-  Wi,
-  Wo,
-  bv,
-  fc,
+  Box_default,
+  Link,
+  Static,
+  Text,
+  renderSync,
   require_react,
   source_default,
   stringWidth,
-  vv,
-  wv
-} from "./chunk-3OXD5CBM.js";
+  useAnimationFrame,
+  useBoxMetrics,
+  useStdout,
+  use_app_default,
+  use_stdin_default
+} from "./chunk-A6GSOADP.js";
 import {
   runDoctorChecks
-} from "./chunk-HI6THNAZ.js";
+} from "./chunk-TGP7JGHN.js";
 import {
   countTokensBounded,
   warmupTokenizer
 } from "./chunk-BOWSNGQC.js";
+import {
+  DeepSeekClient,
+  pickPrimaryBalance
+} from "./chunk-QSKDP3OS.js";
 import {
   HOOK_EVENTS,
   formatHookOutcomeMessage,
@@ -166,7 +184,7 @@ import {
   loadHooks,
   projectSettingsPath,
   runHooks
-} from "./chunk-CPCUMMSR.js";
+} from "./chunk-NVI4XPOQ.js";
 import {
   deleteSession,
   detectGitBranch,
@@ -183,7 +201,7 @@ import {
   sessionPath,
   sessionsDir,
   timestampSuffix
-} from "./chunk-AMSK3ZLB.js";
+} from "./chunk-P5SUHDUQ.js";
 import {
   VERSION,
   compareVersions,
@@ -191,27 +209,9 @@ import {
   detectNpmInstallPrefix,
   getLatestVersion
 } from "./chunk-XXC2BYTV.js";
-import {
-  DeepSeekClient,
-  pickPrimaryBalance
-} from "./chunk-GFJJEW3Z.js";
 import {
   loadDotenv
 } from "./chunk-2UQP6H6T.js";
-import {
-  renderDashboard
-} from "./chunk-Z663GVUB.js";
-import {
-  aggregateUsage,
-  appendUsage,
-  defaultUsageLogPath,
-  readUsageLog
-} from "./chunk-ARBGTNHM.js";
-import {
-  DEEPSEEK_CONTEXT_TOKENS,
-  DEFAULT_CONTEXT_TOKENS,
-  pricingFor
-} from "./chunk-6QBUXA73.js";
 import {
   getLanguage,
   getSupportedLanguages,
@@ -220,7 +220,7 @@ import {
   setLanguage,
   t,
   tObj
-} from "./chunk-CLHMV6OL.js";
+} from "./chunk-U7G72DHQ.js";
 import {
   CARD,
   FG,
@@ -243,6 +243,7 @@ import {
   isThemeName,
   listThemeNames,
   loadApiKey,
+  loadBraveApiKey,
   loadEditMode,
   loadEndpoint,
   loadEngineeringLifecycleMode,
@@ -250,6 +251,7 @@ import {
   loadHistoryScrollMode,
   loadMetasoApiKey,
   loadMouseWheelRows,
+  loadOllamaApiKey,
   loadPerplexityApiKey,
   loadProjectShellAllowed,
   loadQQConfig,
@@ -283,7 +285,7 @@ import {
   webSearchEndpoint,
   webSearchEngine,
   writeConfig
-} from "./chunk-AOYUW3HR.js";
+} from "./chunk-GCNBIWK7.js";
 import {
   __commonJS,
   __require,
@@ -45771,10 +45773,10 @@ function BootSplash() {
   const waveOffset = frame % 4;
   const wave = WAVE_SOURCE.slice(waveOffset, waveOffset + WAVE_WIDTH);
   const dots = ".".repeat(frame % 4 + 1);
-  return /* @__PURE__ */ import_react2.default.createElement(W, { flexDirection: "column", alignItems: "center", marginY: 1 }, /* @__PURE__ */ import_react2.default.createElement(W, { flexDirection: "column", alignItems: "flex-start", marginBottom: 1 }, REASONIX_LOGO.map((line) => /* @__PURE__ */ import_react2.default.createElement(L, { key: line, color: TONE.brand, bold: true }, line))), /* @__PURE__ */ import_react2.default.createElement(W, { flexDirection: "column", alignItems: "flex-start" }, spout.map((line, i) => (
+  return /* @__PURE__ */ import_react2.default.createElement(Box_default, { flexDirection: "column", alignItems: "center", marginY: 1 }, /* @__PURE__ */ import_react2.default.createElement(Box_default, { flexDirection: "column", alignItems: "flex-start", marginBottom: 1 }, REASONIX_LOGO.map((line) => /* @__PURE__ */ import_react2.default.createElement(Text, { key: line, color: TONE.brand, bold: true }, line))), /* @__PURE__ */ import_react2.default.createElement(Box_default, { flexDirection: "column", alignItems: "flex-start" }, spout.map((line, i) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: fixed-length spout column, position is the identity
-    /* @__PURE__ */ import_react2.default.createElement(L, { key: i, color: TONE.accent }, line.length > 0 ? line : " ")
-  )), WHALE_LINES.map((line) => /* @__PURE__ */ import_react2.default.createElement(L, { key: line, color: TONE.brand, bold: true }, line)), /* @__PURE__ */ import_react2.default.createElement(L, { color: FG.faint }, wave)), /* @__PURE__ */ import_react2.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react2.default.createElement(L, { color: FG.meta }, `${t("common.loading")}${dots}`)));
+    /* @__PURE__ */ import_react2.default.createElement(Text, { key: i, color: TONE.accent }, line.length > 0 ? line : " ")
+  )), WHALE_LINES.map((line) => /* @__PURE__ */ import_react2.default.createElement(Text, { key: line, color: TONE.brand, bold: true }, line)), /* @__PURE__ */ import_react2.default.createElement(Text, { color: FG.faint }, wave)), /* @__PURE__ */ import_react2.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react2.default.createElement(Text, { color: FG.meta }, `${t("common.loading")}${dots}`)));
 }
 
 // src/cli/ui/CheckpointPicker.tsx
@@ -45826,7 +45828,7 @@ function CheckpointPicker({
   pickerPorts
 }) {
   const [focus, setFocus] = (0, import_react4.useState)(0);
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const rows = stdout?.rows ?? 40;
   const visibleCount = Math.max(3, rows - PAGE_MARGIN);
   const snapshot = (0, import_react4.useMemo)(
@@ -45887,7 +45889,7 @@ function CheckpointPicker({
   const end = Math.min(checkpoints.length, start + visibleCount);
   const shown = checkpoints.slice(start, end);
   const hiddenBelow = checkpoints.length - end;
-  return /* @__PURE__ */ import_react4.default.createElement(W, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react4.default.createElement(W, null, /* @__PURE__ */ import_react4.default.createElement(L, { bold: true, color: TONE.brand }, t("checkpointPicker.header")), /* @__PURE__ */ import_react4.default.createElement(L, { color: FG.meta }, `  \xB7  ${workspace}`)), /* @__PURE__ */ import_react4.default.createElement(W, { height: 1 }), checkpoints.length === 0 ? /* @__PURE__ */ import_react4.default.createElement(W, null, /* @__PURE__ */ import_react4.default.createElement(L, { color: FG.faint }, t("checkpointPicker.empty"))) : shown.map((c, i) => /* @__PURE__ */ import_react4.default.createElement(CheckpointRow, { key: c.id, info: c, focused: start + i === focus })), hiddenBelow > 0 ? /* @__PURE__ */ import_react4.default.createElement(W, null, /* @__PURE__ */ import_react4.default.createElement(L, { color: FG.faint }, t("checkpointPicker.more", { hidden: hiddenBelow }))) : null, /* @__PURE__ */ import_react4.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react4.default.createElement(L, { color: FG.faint }, checkpoints.length === 0 ? t("checkpointPicker.footerEmpty") : t("checkpointPicker.footer"))));
+  return /* @__PURE__ */ import_react4.default.createElement(Box_default, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react4.default.createElement(Box_default, null, /* @__PURE__ */ import_react4.default.createElement(Text, { bold: true, color: TONE.brand }, t("checkpointPicker.header")), /* @__PURE__ */ import_react4.default.createElement(Text, { color: FG.meta }, `  \xB7  ${workspace}`)), /* @__PURE__ */ import_react4.default.createElement(Box_default, { height: 1 }), checkpoints.length === 0 ? /* @__PURE__ */ import_react4.default.createElement(Box_default, null, /* @__PURE__ */ import_react4.default.createElement(Text, { color: FG.faint }, t("checkpointPicker.empty"))) : shown.map((c, i) => /* @__PURE__ */ import_react4.default.createElement(CheckpointRow, { key: c.id, info: c, focused: start + i === focus })), hiddenBelow > 0 ? /* @__PURE__ */ import_react4.default.createElement(Box_default, null, /* @__PURE__ */ import_react4.default.createElement(Text, { color: FG.faint }, t("checkpointPicker.more", { hidden: hiddenBelow }))) : null, /* @__PURE__ */ import_react4.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react4.default.createElement(Text, { color: FG.faint }, checkpoints.length === 0 ? t("checkpointPicker.footerEmpty") : t("checkpointPicker.footer"))));
 }
 function CheckpointRow({
   info,
@@ -45896,8 +45898,8 @@ function CheckpointRow({
   const tag2 = info.source === "manual" ? "" : ` (${info.source})`;
   const sizeKb = (info.bytes / 1024).toFixed(1);
   const time = fmtAgo(info.createdAt);
-  return /* @__PURE__ */ import_react4.default.createElement(W, null, /* @__PURE__ */ import_react4.default.createElement(L, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react4.default.createElement(L, { color: FG.meta }, info.id.slice(0, 7).padEnd(8)), /* @__PURE__ */ import_react4.default.createElement(L, { bold: focused, color: focused ? FG.strong : FG.sub }, info.name), /* @__PURE__ */ import_react4.default.createElement(L, { color: FG.faint }, tag2), /* @__PURE__ */ import_react4.default.createElement(W, { flexGrow: 1 }), /* @__PURE__ */ import_react4.default.createElement(L, { color: FG.faint }, `${time.padStart(8)}  \xB7  `), /* @__PURE__ */ import_react4.default.createElement(
-    L,
+  return /* @__PURE__ */ import_react4.default.createElement(Box_default, null, /* @__PURE__ */ import_react4.default.createElement(Text, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react4.default.createElement(Text, { color: FG.meta }, info.id.slice(0, 7).padEnd(8)), /* @__PURE__ */ import_react4.default.createElement(Text, { bold: focused, color: focused ? FG.strong : FG.sub }, info.name), /* @__PURE__ */ import_react4.default.createElement(Text, { color: FG.faint }, tag2), /* @__PURE__ */ import_react4.default.createElement(Box_default, { flexGrow: 1 }), /* @__PURE__ */ import_react4.default.createElement(Text, { color: FG.faint }, `${time.padStart(8)}  \xB7  `), /* @__PURE__ */ import_react4.default.createElement(
+    Text,
     {
       color: FG.faint
     },
@@ -45933,8 +45935,8 @@ function ApprovalCard({
   const effectiveFooter = footerHint ?? t("cardLabels.defaultFooter");
   const palette = TONE_PALETTE[tone];
   const headerGlyph = glyph ?? palette.glyph;
-  return /* @__PURE__ */ import_react5.default.createElement(W, { flexDirection: "column", marginY: 1, flexShrink: 0 }, /* @__PURE__ */ import_react5.default.createElement(
-    W,
+  return /* @__PURE__ */ import_react5.default.createElement(Box_default, { flexDirection: "column", marginY: 1, flexShrink: 0 }, /* @__PURE__ */ import_react5.default.createElement(
+    Box_default,
     {
       flexDirection: "column",
       borderStyle: "round",
@@ -45944,9 +45946,9 @@ function ApprovalCard({
       paddingX: 1,
       flexShrink: 0
     },
-    /* @__PURE__ */ import_react5.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react5.default.createElement(L, { bold: true, color: palette.color }, headerGlyph), /* @__PURE__ */ import_react5.default.createElement(L, { bold: true, color: FG.strong }, title2), metaRight !== void 0 && /* @__PURE__ */ import_react5.default.createElement(L, { color: metaRightColor ?? FG.faint }, metaRight)),
-    /* @__PURE__ */ import_react5.default.createElement(W, { flexDirection: "column", marginTop: 1, flexShrink: 0 }, children)
-  ), /* @__PURE__ */ import_react5.default.createElement(W, { paddingX: 2, marginTop: 1, flexShrink: 0 }, /* @__PURE__ */ import_react5.default.createElement(L, { color: FG.faint }, effectiveFooter)));
+    /* @__PURE__ */ import_react5.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react5.default.createElement(Text, { bold: true, color: palette.color }, headerGlyph), /* @__PURE__ */ import_react5.default.createElement(Text, { bold: true, color: FG.strong }, title2), metaRight !== void 0 && /* @__PURE__ */ import_react5.default.createElement(Text, { color: metaRightColor ?? FG.faint }, metaRight)),
+    /* @__PURE__ */ import_react5.default.createElement(Box_default, { flexDirection: "column", marginTop: 1, flexShrink: 0 }, children)
+  ), /* @__PURE__ */ import_react5.default.createElement(Box_default, { paddingX: 2, marginTop: 1, flexShrink: 0 }, /* @__PURE__ */ import_react5.default.createElement(Text, { color: FG.faint }, effectiveFooter)));
 }
 
 // src/cli/ui/ChoiceConfirm.tsx
@@ -46043,14 +46045,14 @@ function AtMentionSuggestions({
   const shown = entries.slice(windowStart, windowStart + ROW_WINDOW);
   const hiddenAbove = windowStart;
   const hiddenBelow = total - windowStart - shown.length;
-  return /* @__PURE__ */ import_react8.default.createElement(W, { flexDirection: "column", paddingX: 1, marginTop: 1 }, /* @__PURE__ */ import_react8.default.createElement(HeaderRow, { state: state2, hiddenAbove }), total === 0 ? /* @__PURE__ */ import_react8.default.createElement(EmptyRow, { state: state2, color }) : null, shown.map((entry, i) => /* @__PURE__ */ import_react8.default.createElement(
+  return /* @__PURE__ */ import_react8.default.createElement(Box_default, { flexDirection: "column", paddingX: 1, marginTop: 1 }, /* @__PURE__ */ import_react8.default.createElement(HeaderRow, { state: state2, hiddenAbove }), total === 0 ? /* @__PURE__ */ import_react8.default.createElement(EmptyRow, { state: state2, color }) : null, shown.map((entry, i) => /* @__PURE__ */ import_react8.default.createElement(
     EntryRow,
     {
       key: `${entry.insertPath}:${entry.isDir ? "d" : "f"}`,
       entry,
       isSelected: windowStart + i === selectedIndex
     }
-  )), hiddenBelow > 0 ? /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, `   \u2193 ${hiddenBelow} below`) : null, /* @__PURE__ */ import_react8.default.createElement(FooterRow, { isBrowse, hasFolder: shown.some((e) => e.isDir) }));
+  )), hiddenBelow > 0 ? /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, `   \u2193 ${hiddenBelow} below`) : null, /* @__PURE__ */ import_react8.default.createElement(FooterRow, { isBrowse, hasFolder: shown.some((e) => e.isDir) }));
 }
 function HeaderRow({
   state: state2,
@@ -46058,35 +46060,35 @@ function HeaderRow({
 }) {
   const color = useColor();
   const total = state2.entries.length;
-  const lead = /* @__PURE__ */ import_react8.default.createElement(L, { color: color.primary, bold: true }, "@ ");
+  const lead = /* @__PURE__ */ import_react8.default.createElement(Text, { color: color.primary, bold: true }, "@ ");
   if (state2.kind === "browse") {
     const where = state2.baseDir === "" ? "/" : `${state2.baseDir}/`;
     const counter = state2.loading ? t("atMentions.loading") : t(total === 1 ? "atMentions.entrySingular" : "atMentions.entryPlural", { count: total });
-    return /* @__PURE__ */ import_react8.default.createElement(W, null, lead, /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, `${where}  ${counter}`), hiddenAbove > 0 ? /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null);
+    return /* @__PURE__ */ import_react8.default.createElement(Box_default, null, lead, /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, `${where}  ${counter}`), hiddenAbove > 0 ? /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, `   \u2191 ${hiddenAbove} above`) : null);
   }
   const status2 = state2.searching ? `${t("atMentions.searching")} ${state2.scanned} ${t("atMentions.scanned")} \xB7 ${total} ${total === 1 ? t("atMentions.match") : t("atMentions.matches")}` : `${total} ${total === 1 ? t("atMentions.match") : t("atMentions.matches")} ${t("atMentions.forFilter", { filter: state2.filter })}`;
-  return /* @__PURE__ */ import_react8.default.createElement(W, null, lead, /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, status2), hiddenAbove > 0 ? /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null);
+  return /* @__PURE__ */ import_react8.default.createElement(Box_default, null, lead, /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, status2), hiddenAbove > 0 ? /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, `   \u2191 ${hiddenAbove} above`) : null);
 }
 function EmptyRow({ state: state2, color }) {
   if (state2.kind === "browse") {
     if (state2.loading) return null;
-    return /* @__PURE__ */ import_react8.default.createElement(W, null, /* @__PURE__ */ import_react8.default.createElement(L, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react8.default.createElement(L, null, " "), /* @__PURE__ */ import_react8.default.createElement(L, { color: color.warn }, t("atMentions.emptyDir")));
+    return /* @__PURE__ */ import_react8.default.createElement(Box_default, null, /* @__PURE__ */ import_react8.default.createElement(Text, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react8.default.createElement(Text, null, " "), /* @__PURE__ */ import_react8.default.createElement(Text, { color: color.warn }, t("atMentions.emptyDir")));
   }
   if (state2.searching) {
-    return /* @__PURE__ */ import_react8.default.createElement(W, null, /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, t("atMentions.scanning")));
+    return /* @__PURE__ */ import_react8.default.createElement(Box_default, null, /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, t("atMentions.scanning")));
   }
-  return /* @__PURE__ */ import_react8.default.createElement(W, null, /* @__PURE__ */ import_react8.default.createElement(L, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react8.default.createElement(L, null, " "), /* @__PURE__ */ import_react8.default.createElement(L, { color: color.warn }, t("atMentions.noMatch", { filter: state2.filter })));
+  return /* @__PURE__ */ import_react8.default.createElement(Box_default, null, /* @__PURE__ */ import_react8.default.createElement(Text, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react8.default.createElement(Text, null, " "), /* @__PURE__ */ import_react8.default.createElement(Text, { color: color.warn }, t("atMentions.noMatch", { filter: state2.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__ */ import_react8.default.createElement(W, { backgroundColor: isSelected ? SURFACE.bgElev : void 0 }, /* @__PURE__ */ import_react8.default.createElement(L, { color: isSelected ? color.primary : color.info, bold: isSelected }, cursor), /* @__PURE__ */ import_react8.default.createElement(L, { color: labelColor, bold: isSelected }, labelText.padEnd(20)), entry.dirSuffix ? /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, `  ${entry.dirSuffix}`) : null);
+  return /* @__PURE__ */ import_react8.default.createElement(Box_default, { backgroundColor: isSelected ? SURFACE.bgElev : void 0 }, /* @__PURE__ */ import_react8.default.createElement(Text, { color: isSelected ? color.primary : color.info, bold: isSelected }, cursor), /* @__PURE__ */ import_react8.default.createElement(Text, { color: labelColor, bold: isSelected }, labelText.padEnd(20)), entry.dirSuffix ? /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, `  ${entry.dirSuffix}`) : null);
 }
 function FooterRow({ isBrowse, hasFolder }) {
   const hintKey = isBrowse && hasFolder ? "atMentions.footerBrowse" : "atMentions.footerInsert";
-  return /* @__PURE__ */ import_react8.default.createElement(W, { marginTop: 0 }, /* @__PURE__ */ import_react8.default.createElement(L, { dimColor: true }, `  ${t(hintKey)}`));
+  return /* @__PURE__ */ import_react8.default.createElement(Box_default, { marginTop: 0 }, /* @__PURE__ */ import_react8.default.createElement(Text, { dim: true }, `  ${t(hintKey)}`));
 }
 
 // src/cli/ui/PromptInput.tsx
@@ -46651,7 +46653,7 @@ function PromptInput({
     if (action.historyHandoff === "next") onHistoryNext?.();
     if (action.openExternalEditor) onOpenExternalEditor?.();
   }, inputActive);
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const promptPrefix = "\u203A ";
   const continuationIndent = "  ";
@@ -46673,7 +46675,7 @@ function PromptInput({
     return parts.length > 0 ? ` ${parts.join(source_default.hex(FG.faint)(" \xB7 "))} ` : void 0;
   })();
   return /* @__PURE__ */ import_react9.default.createElement(
-    W,
+    Box_default,
     {
       flexDirection: "column",
       paddingX: 1,
@@ -46684,14 +46686,14 @@ function PromptInput({
       borderText: borderLabel ? { content: borderLabel, position: "top", align: "end", offset: 2 } : void 0,
       width: "100%"
     },
-    /* @__PURE__ */ import_react9.default.createElement(W, { flexDirection: "column", flexGrow: 1 }, (() => {
+    /* @__PURE__ */ import_react9.default.createElement(Box_default, { flexDirection: "column", flexGrow: 1 }, (() => {
       const rows = [];
       let firstRowEmitted = false;
       for (let renderIdx = 0; renderIdx < renderItems.length; renderIdx++) {
         const item = renderItems[renderIdx];
         if (item.kind === "skip") {
           rows.push(
-            /* @__PURE__ */ import_react9.default.createElement(W, { key: `skip-${renderIdx}` }, /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, continuationIndent), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, `[\u2026 ${item.linesHidden} line${item.linesHidden === 1 ? "" : "s"} hidden \u2014 full content kept, submitted on Enter \u2026]`))
+            /* @__PURE__ */ import_react9.default.createElement(Box_default, { key: `skip-${renderIdx}` }, /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, continuationIndent), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, `[\u2026 ${item.linesHidden} line${item.linesHidden === 1 ? "" : "s"} hidden \u2014 full content kept, submitted on Enter \u2026]`))
           );
           continue;
         }
@@ -46800,7 +46802,7 @@ function PromptInput({
         }
       }
       return rows;
-    })(), showHugeBufferHints && inputActive ? /* @__PURE__ */ import_react9.default.createElement(W, null, /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, `  [${lines.length} lines \xB7 PgUp/PgDn jump \xB7 Ctrl+U clear \xB7 Ctrl+W del word]`)) : null, inputFrozen ? /* @__PURE__ */ import_react9.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, "  esc to stop")) : null, steerBusy ? /* @__PURE__ */ import_react9.default.createElement(W, { marginTop: 1, flexDirection: "row" }, /* @__PURE__ */ import_react9.default.createElement(L, { color: TONE.accent }, "  \u23CE "), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, t("composer.steerHint")), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, "  \xB7  "), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, "esc to stop")) : null)
+    })(), showHugeBufferHints && inputActive ? /* @__PURE__ */ import_react9.default.createElement(Box_default, null, /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, `  [${lines.length} lines \xB7 PgUp/PgDn jump \xB7 Ctrl+U clear \xB7 Ctrl+W del word]`)) : null, inputFrozen ? /* @__PURE__ */ import_react9.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "  esc to stop")) : null, steerBusy ? /* @__PURE__ */ import_react9.default.createElement(Box_default, { marginTop: 1, flexDirection: "row" }, /* @__PURE__ */ import_react9.default.createElement(Text, { color: TONE.accent }, "  \u23CE "), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, t("composer.steerHint")), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "  \xB7  "), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "esc to stop")) : null)
   );
 }
 function splitLineByPastes(line) {
@@ -46838,9 +46840,9 @@ function PasteChipRow({
   const leadColor = isFirst ? accentColor : FG.faint;
   const labelText = formatChipLabel(entry, pasteId, visibleCells - 6);
   if (active2) {
-    return /* @__PURE__ */ import_react9.default.createElement(W, null, /* @__PURE__ */ import_react9.default.createElement(L, { bold: true, color: leadColor }, lead), /* @__PURE__ */ import_react9.default.createElement(L, { bold: true, color: accentColor }, "\u25B8 "), /* @__PURE__ */ import_react9.default.createElement(L, { bold: true, color: "black", backgroundColor: accentColor }, `  ${labelText}  `));
+    return /* @__PURE__ */ import_react9.default.createElement(Box_default, null, /* @__PURE__ */ import_react9.default.createElement(Text, { bold: true, color: leadColor }, lead), /* @__PURE__ */ import_react9.default.createElement(Text, { bold: true, color: accentColor }, "\u25B8 "), /* @__PURE__ */ import_react9.default.createElement(Text, { bold: true, color: "ansi:black", backgroundColor: accentColor }, `  ${labelText}  `));
   }
-  return /* @__PURE__ */ import_react9.default.createElement(W, null, /* @__PURE__ */ import_react9.default.createElement(L, { bold: true, color: leadColor }, lead), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, "  "), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.meta }, "\u250C "), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.body, backgroundColor: SURFACE.bgElev }, `${labelText} `), /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.meta }, " \u2510"));
+  return /* @__PURE__ */ import_react9.default.createElement(Box_default, null, /* @__PURE__ */ import_react9.default.createElement(Text, { bold: true, color: leadColor }, lead), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "  "), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.meta }, "\u250C "), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.body, backgroundColor: SURFACE.bgElev }, `${labelText} `), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.meta }, " \u2510"));
 }
 function formatChipLabel(entry, pasteId, budget2) {
   if (!entry) return `\u{1F4CB} paste #${pasteId + 1} \xB7 (missing)`;
@@ -46886,10 +46888,10 @@ function PromptLine({
 }) {
   const promptActive = !disabled || !!steerBusy;
   if (showPlaceholder) {
-    return /* @__PURE__ */ import_react9.default.createElement(W, null, /* @__PURE__ */ import_react9.default.createElement(L, { bold: true, color: accentColor }, promptPrefix), promptActive ? /* @__PURE__ */ import_react9.default.createElement(L, { color: accentColor }, cursorVisible ? "\u258C" : " ") : null, /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, placeholderText));
+    return /* @__PURE__ */ import_react9.default.createElement(Box_default, null, /* @__PURE__ */ import_react9.default.createElement(Text, { bold: true, color: accentColor }, promptPrefix), promptActive ? /* @__PURE__ */ import_react9.default.createElement(Text, { color: accentColor }, cursorVisible ? "\u258C" : " ") : null, /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, placeholderText));
   }
   const viewport = buildViewport(line, isCursorLine ? cursorCol : null, visibleCells, pastes);
-  return /* @__PURE__ */ import_react9.default.createElement(W, null, isFirst ? /* @__PURE__ */ import_react9.default.createElement(L, { bold: true, color: accentColor }, promptPrefix) : /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, continuationIndent), viewport.hiddenLeft ? /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, "\u2039") : null, /* @__PURE__ */ import_react9.default.createElement(
+  return /* @__PURE__ */ import_react9.default.createElement(Box_default, null, isFirst ? /* @__PURE__ */ import_react9.default.createElement(Text, { bold: true, color: accentColor }, promptPrefix) : /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, continuationIndent), viewport.hiddenLeft ? /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "\u2039") : null, /* @__PURE__ */ import_react9.default.createElement(
     ViewportContent,
     {
       segments: viewport.segments,
@@ -46897,7 +46899,7 @@ function PromptLine({
       accentColor,
       cursorVisible
     }
-  ), viewport.hiddenRight ? /* @__PURE__ */ import_react9.default.createElement(L, { color: FG.faint }, "\u203A") : null);
+  ), viewport.hiddenRight ? /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "\u203A") : null);
 }
 function ViewportContent({
   segments,
@@ -46926,7 +46928,7 @@ function ViewportContent({
     if (seg.kind === "paste") {
       out.push(
         /* @__PURE__ */ import_react9.default.createElement(
-          L,
+          Text,
           {
             key: `p-${i}-cursor`,
             color: FG.body,
@@ -46943,26 +46945,26 @@ function ViewportContent({
     const offsetIntoSeg = cursorCell - cells;
     const split = splitTextByCells(seg.text, offsetIntoSeg);
     if (split.before.length > 0) {
-      out.push(/* @__PURE__ */ import_react9.default.createElement(L, { key: `t-${i}-b` }, split.before));
+      out.push(/* @__PURE__ */ import_react9.default.createElement(Text, { key: `t-${i}-b` }, split.before));
     }
     if (split.atCursor.length > 0) {
       out.push(
-        /* @__PURE__ */ import_react9.default.createElement(L, { key: `t-${i}-c`, inverse: cursorVisible, color: accentColor }, split.atCursor)
+        /* @__PURE__ */ import_react9.default.createElement(Text, { key: `t-${i}-c`, inverse: cursorVisible, color: accentColor }, split.atCursor)
       );
     } else {
       out.push(
-        /* @__PURE__ */ import_react9.default.createElement(L, { key: `t-${i}-c-eol`, color: accentColor }, cursorVisible ? "\u258C" : " ")
+        /* @__PURE__ */ import_react9.default.createElement(Text, { key: `t-${i}-c-eol`, color: accentColor }, cursorVisible ? "\u258C" : " ")
       );
     }
     if (split.after.length > 0) {
-      out.push(/* @__PURE__ */ import_react9.default.createElement(L, { key: `t-${i}-a` }, split.after));
+      out.push(/* @__PURE__ */ import_react9.default.createElement(Text, { key: `t-${i}-a` }, split.after));
     }
     placed = true;
     cells += segCells;
   }
   if (!placed) {
     out.push(
-      /* @__PURE__ */ import_react9.default.createElement(L, { key: "cursor-eol", color: accentColor }, cursorVisible ? "\u258C" : " ")
+      /* @__PURE__ */ import_react9.default.createElement(Text, { key: "cursor-eol", color: accentColor }, cursorVisible ? "\u258C" : " ")
     );
   }
   return /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, out);
@@ -47005,9 +47007,9 @@ function charCellsForText(ch) {
 }
 function renderSegment(seg, key, _inverse) {
   if (seg.kind === "text") {
-    return /* @__PURE__ */ import_react9.default.createElement(L, { key: `s-${key}`, color: FG.body }, seg.text);
+    return /* @__PURE__ */ import_react9.default.createElement(Text, { key: `s-${key}`, color: FG.body }, seg.text);
   }
-  return /* @__PURE__ */ import_react9.default.createElement(L, { key: `s-${key}`, backgroundColor: SURFACE.bgElev, color: FG.body }, seg.label);
+  return /* @__PURE__ */ import_react9.default.createElement(Text, { key: `s-${key}`, backgroundColor: SURFACE.bgElev, color: FG.body }, seg.label);
 }
 var COLLAPSE_THRESHOLD = 20;
 var COLLAPSE_HEAD_LINES = 3;
@@ -47083,7 +47085,7 @@ var SHORTCUT_GROUPS = [
 ];
 function ShortcutsHelpModal() {
   return /* @__PURE__ */ import_react10.default.createElement(
-    W,
+    Box_default,
     {
       flexDirection: "column",
       borderStyle: "round",
@@ -47092,16 +47094,16 @@ function ShortcutsHelpModal() {
       paddingY: 0,
       backgroundColor: SURFACE.bg
     },
-    /* @__PURE__ */ import_react10.default.createElement(W, { justifyContent: "center" }, /* @__PURE__ */ import_react10.default.createElement(L, { bold: true, color: "#649ed2" }, ` ${t("shortcutsHelp.title")} `)),
+    /* @__PURE__ */ import_react10.default.createElement(Box_default, { justifyContent: "center" }, /* @__PURE__ */ import_react10.default.createElement(Text, { bold: true, color: "#649ed2" }, ` ${t("shortcutsHelp.title")} `)),
     SHORTCUT_GROUPS.map((group, groupIdx) => /* @__PURE__ */ import_react10.default.createElement(
-      W,
+      Box_default,
       {
         key: group.titleKey,
         flexDirection: "column",
         marginBottom: groupIdx < SHORTCUT_GROUPS.length - 1 ? 0 : 0
       },
-      /* @__PURE__ */ import_react10.default.createElement(L, { color: TONE.accent }, `  ${t(group.titleKey)}`),
-      group.items.map((item) => /* @__PURE__ */ import_react10.default.createElement(W, { key: item.keys }, /* @__PURE__ */ import_react10.default.createElement(L, { bold: true, color: "#649ed2" }, `    ${item.keys}`), /* @__PURE__ */ import_react10.default.createElement(L, { color: FG.faint }, `  ${t(item.descKey)}`)))
+      /* @__PURE__ */ import_react10.default.createElement(Text, { color: TONE.accent }, `  ${t(group.titleKey)}`),
+      group.items.map((item) => /* @__PURE__ */ import_react10.default.createElement(Box_default, { key: item.keys }, /* @__PURE__ */ import_react10.default.createElement(Text, { bold: true, color: "#649ed2" }, `    ${item.keys}`), /* @__PURE__ */ import_react10.default.createElement(Text, { color: FG.faint }, `  ${t(item.descKey)}`)))
     ))
   );
 }
@@ -47127,13 +47129,13 @@ function SlashArgPicker({
     const translated = t(descKey);
     return translated === descKey ? spec.summary : translated;
   })();
-  const headerRow = /* @__PURE__ */ import_react11.default.createElement(W, null, /* @__PURE__ */ import_react11.default.createElement(L, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ import_react11.default.createElement(L, { color: color.accent, bold: true }, `/${spec.cmd}`), headerArgsHint ? /* @__PURE__ */ import_react11.default.createElement(L, { dimColor: true }, ` ${headerArgsHint}`) : null, /* @__PURE__ */ import_react11.default.createElement(L, { dimColor: true }, `  ${headerSummary}`));
+  const headerRow = /* @__PURE__ */ import_react11.default.createElement(Box_default, null, /* @__PURE__ */ import_react11.default.createElement(Text, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ import_react11.default.createElement(Text, { color: color.accent, bold: true }, `/${spec.cmd}`), headerArgsHint ? /* @__PURE__ */ import_react11.default.createElement(Text, { dim: true }, ` ${headerArgsHint}`) : null, /* @__PURE__ */ import_react11.default.createElement(Text, { dim: true }, `  ${headerSummary}`));
   if (kind === "hint") {
-    return /* @__PURE__ */ import_react11.default.createElement(W, { paddingX: 1, marginTop: 1 }, headerRow);
+    return /* @__PURE__ */ import_react11.default.createElement(Box_default, { paddingX: 1, marginTop: 1 }, headerRow);
   }
   if (matches === null) return null;
   if (matches.length === 0) {
-    return /* @__PURE__ */ import_react11.default.createElement(W, { flexDirection: "column", paddingX: 1, marginTop: 1 }, headerRow, /* @__PURE__ */ import_react11.default.createElement(W, null, /* @__PURE__ */ import_react11.default.createElement(L, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react11.default.createElement(L, { color: color.warn }, t("slashArgPicker.noMatch", { partial })), /* @__PURE__ */ import_react11.default.createElement(L, { dimColor: true }, t("slashArgPicker.keepTyping"))));
+    return /* @__PURE__ */ import_react11.default.createElement(Box_default, { flexDirection: "column", paddingX: 1, marginTop: 1 }, headerRow, /* @__PURE__ */ import_react11.default.createElement(Box_default, null, /* @__PURE__ */ import_react11.default.createElement(Text, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react11.default.createElement(Text, { color: color.warn }, t("slashArgPicker.noMatch", { partial })), /* @__PURE__ */ import_react11.default.createElement(Text, { dim: true }, t("slashArgPicker.keepTyping"))));
   }
   const MAX = 8;
   const total = matches.length;
@@ -47141,11 +47143,11 @@ function SlashArgPicker({
   const shown = matches.slice(windowStart, windowStart + MAX);
   const hiddenAbove = windowStart;
   const hiddenBelow = total - windowStart - shown.length;
-  return /* @__PURE__ */ import_react11.default.createElement(W, { flexDirection: "column", paddingX: 1, marginTop: 1 }, headerRow, hiddenAbove > 0 ? /* @__PURE__ */ import_react11.default.createElement(L, { dimColor: true }, t("slashArgPicker.above", { hidden: hiddenAbove })) : null, shown.map((value, i) => {
+  return /* @__PURE__ */ import_react11.default.createElement(Box_default, { flexDirection: "column", paddingX: 1, marginTop: 1 }, headerRow, hiddenAbove > 0 ? /* @__PURE__ */ import_react11.default.createElement(Text, { dim: true }, t("slashArgPicker.above", { hidden: hiddenAbove })) : null, shown.map((value, i) => {
     const idx = windowStart + i;
     const isDir = pathCandidates?.[idx]?.isDir ?? false;
     return /* @__PURE__ */ import_react11.default.createElement(ArgRow, { key: value, value, isSelected: idx === selectedIndex, isDir });
-  }), hiddenBelow > 0 ? /* @__PURE__ */ import_react11.default.createElement(L, { dimColor: true }, t("slashArgPicker.below", { hidden: hiddenBelow })) : null, /* @__PURE__ */ import_react11.default.createElement(W, { marginTop: 0 }, /* @__PURE__ */ import_react11.default.createElement(L, { dimColor: true }, t("slashArgPicker.footer"))));
+  }), hiddenBelow > 0 ? /* @__PURE__ */ import_react11.default.createElement(Text, { dim: true }, t("slashArgPicker.below", { hidden: hiddenBelow })) : null, /* @__PURE__ */ import_react11.default.createElement(Box_default, { marginTop: 0 }, /* @__PURE__ */ import_react11.default.createElement(Text, { dim: true }, t("slashArgPicker.footer"))));
 }
 function ArgRow({
   value,
@@ -47153,7 +47155,7 @@ function ArgRow({
   isDir
 }) {
   const color = useColor();
-  return /* @__PURE__ */ import_react11.default.createElement(W, { backgroundColor: isSelected ? SURFACE.bgElev : void 0 }, /* @__PURE__ */ import_react11.default.createElement(L, { color: isSelected ? color.primary : color.info, bold: isSelected }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ import_react11.default.createElement(L, { color: isSelected ? color.user : color.info, bold: isSelected, dimColor: !isSelected }, value), isDir ? /* @__PURE__ */ import_react11.default.createElement(L, { dimColor: true }, "/") : null);
+  return /* @__PURE__ */ import_react11.default.createElement(Box_default, { backgroundColor: isSelected ? SURFACE.bgElev : void 0 }, /* @__PURE__ */ import_react11.default.createElement(Text, { color: isSelected ? color.primary : color.info, bold: isSelected }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ import_react11.default.createElement(Text, { color: isSelected ? color.user : color.info, bold: isSelected, dim: !isSelected }, value), isDir ? /* @__PURE__ */ import_react11.default.createElement(Text, { dim: true }, "/") : null);
 }
 
 // src/cli/ui/SlashSuggestions.tsx
@@ -47173,7 +47175,7 @@ function SlashSuggestions({
   advancedHidden
 }) {
   const color = useColor();
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const [rememberedWindowStart, setRememberedWindowStart] = import_react12.default.useState(0);
   const maxRows = groupMode ? GROUP_MODE_MAX_ROWS : SEARCH_MODE_MAX_ROWS;
@@ -47190,17 +47192,17 @@ function SlashSuggestions({
   }, [windowStart]);
   if (matches === null) return null;
   if (matches.length === 0) {
-    return /* @__PURE__ */ import_react12.default.createElement(W, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ import_react12.default.createElement(L, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react12.default.createElement(L, null, " "), /* @__PURE__ */ import_react12.default.createElement(L, { color: color.warn }, t("slashSuggestions.noMatch")), /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true }, t("slashSuggestions.backspaceHint")));
+    return /* @__PURE__ */ import_react12.default.createElement(Box_default, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ import_react12.default.createElement(Text, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ import_react12.default.createElement(Text, null, " "), /* @__PURE__ */ import_react12.default.createElement(Text, { color: color.warn }, t("slashSuggestions.noMatch")), /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true }, t("slashSuggestions.backspaceHint")));
   }
   const total = matches.length;
   const items = buildVisibleItems(matches, windowStart, maxRows, groupMode);
   const shownCommands = items.filter((item) => item.kind === "command");
   const hiddenAbove = windowStart;
   const hiddenBelow = total - windowStart - shownCommands.length;
-  return /* @__PURE__ */ import_react12.default.createElement(W, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ import_react12.default.createElement(W, null, /* @__PURE__ */ import_react12.default.createElement(L, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true }, t(
+  return /* @__PURE__ */ import_react12.default.createElement(Box_default, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ import_react12.default.createElement(Box_default, null, /* @__PURE__ */ import_react12.default.createElement(Text, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true }, t(
     total === 1 ? "slashSuggestions.commandCount" : "slashSuggestions.commandCountPlural",
     { count: total }
-  )), hiddenAbove > 0 ? /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true }, t("slashSuggestions.aboveLabel", { count: hiddenAbove })) : null), items.map((item) => {
+  )), hiddenAbove > 0 ? /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true }, t("slashSuggestions.aboveLabel", { count: hiddenAbove })) : null), items.map((item) => {
     if (item.kind === "group") {
       return /* @__PURE__ */ import_react12.default.createElement(GroupHeader, { key: `group:${item.group}:${item.beforeIndex}`, group: item.group });
     }
@@ -47213,7 +47215,7 @@ function SlashSuggestions({
         columns: cols
       }
     );
-  }), hiddenBelow > 0 ? /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true }, t("slashSuggestions.belowLabel", { count: hiddenBelow })) : null, groupMode && advancedHidden && advancedHidden > 0 ? /* @__PURE__ */ import_react12.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true }, t("slashSuggestions.advancedHint", { count: advancedHidden }))) : null, /* @__PURE__ */ import_react12.default.createElement(W, { marginTop: 0 }, /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true }, t("slashSuggestions.footerHint"))));
+  }), hiddenBelow > 0 ? /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true }, t("slashSuggestions.belowLabel", { count: hiddenBelow })) : null, groupMode && advancedHidden && advancedHidden > 0 ? /* @__PURE__ */ import_react12.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true }, t("slashSuggestions.advancedHint", { count: advancedHidden }))) : null, /* @__PURE__ */ import_react12.default.createElement(Box_default, { marginTop: 0 }, /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true }, t("slashSuggestions.footerHint"))));
 }
 function computeWindowStart(matches, maxRows, selectedIndex, currentWindowStart, groupMode = false) {
   if (matches.length <= 0) return 0;
@@ -47245,7 +47247,7 @@ function shouldShowGroupHeader(matches, idx) {
   return idx === 0 || matches[idx]?.group !== matches[idx - 1]?.group;
 }
 function GroupHeader({ group }) {
-  return /* @__PURE__ */ import_react12.default.createElement(W, { flexShrink: 0, height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true, wrap: "truncate" }, `  ${groupLabel(group)}`));
+  return /* @__PURE__ */ import_react12.default.createElement(Box_default, { flexShrink: 0, height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true, wrap: "truncate" }, `  ${groupLabel(group)}`));
 }
 function SuggestionRow({
   spec,
@@ -47263,7 +47265,7 @@ function SuggestionRow({
   const summaryBudget = Math.max(8, columns - reservedCells);
   const summaryText = truncateCells(`${summary}${aliasHint}`, summaryBudget);
   return /* @__PURE__ */ import_react12.default.createElement(
-    W,
+    Box_default,
     {
       flexDirection: "row",
       flexWrap: "nowrap",
@@ -47272,11 +47274,11 @@ function SuggestionRow({
       minHeight: 1,
       backgroundColor: isSelected ? SURFACE.bgElev : void 0
     },
-    /* @__PURE__ */ import_react12.default.createElement(L, { color: isSelected ? color.primary : color.info, bold: isSelected, wrap: "truncate" }, isSelected ? `${GLYPH.cur} ` : "  "),
-    /* @__PURE__ */ import_react12.default.createElement(L, { color: color.accent, bold: isSelected, wrap: "truncate" }, padOrTrim(name, COMMAND_NAME_CELLS)),
-    /* @__PURE__ */ import_react12.default.createElement(L, { dimColor: true, wrap: "truncate" }, padOrTrim(argsSuffix, ARGS_CELLS)),
-    /* @__PURE__ */ import_react12.default.createElement(L, { wrap: "truncate" }, "  "),
-    /* @__PURE__ */ import_react12.default.createElement(L, { color: isSelected ? color.user : color.info, dimColor: !isSelected, wrap: "truncate" }, summaryText)
+    /* @__PURE__ */ import_react12.default.createElement(Text, { color: isSelected ? color.primary : color.info, bold: isSelected, wrap: "truncate" }, isSelected ? `${GLYPH.cur} ` : "  "),
+    /* @__PURE__ */ import_react12.default.createElement(Text, { color: color.accent, bold: isSelected, wrap: "truncate" }, padOrTrim(name, COMMAND_NAME_CELLS)),
+    /* @__PURE__ */ import_react12.default.createElement(Text, { dim: true, wrap: "truncate" }, padOrTrim(argsSuffix, ARGS_CELLS)),
+    /* @__PURE__ */ import_react12.default.createElement(Text, { wrap: "truncate" }, "  "),
+    /* @__PURE__ */ import_react12.default.createElement(Text, { color: isSelected ? color.user : color.info, dim: !isSelected, wrap: "truncate" }, summaryText)
   );
 }
 function padOrTrim(value, cells) {
@@ -47315,12 +47317,12 @@ function useTickerActive() {
 }
 function useTick() {
   const isActive = useTickerActive();
-  const [, time] = Wi(isActive ? FAST_TICK_MS : null);
+  const [, time] = useAnimationFrame(isActive ? FAST_TICK_MS : null);
   return isActive ? Math.floor(time / FAST_TICK_MS) : 0;
 }
 function useSlowTick() {
   const isActive = useTickerActive();
-  const [, time] = Wi(isActive ? SLOW_TICK_MS : null);
+  const [, time] = useAnimationFrame(isActive ? SLOW_TICK_MS : null);
   return isActive ? Math.floor(time / SLOW_TICK_MS) : 0;
 }
 
@@ -47332,7 +47334,7 @@ function Countdown({
 }) {
   useSlowTick();
   const remainingSec = Math.max(0, Math.ceil((endsAt - Date.now()) / 1e3));
-  return /* @__PURE__ */ import_react14.default.createElement(L, { bold: true, color, backgroundColor }, String(remainingSec));
+  return /* @__PURE__ */ import_react14.default.createElement(Text, { bold: true, color, backgroundColor }, String(remainingSec));
 }
 
 // src/cli/ui/state/provider.tsx
@@ -48010,23 +48012,23 @@ var DEFAULT_STATUS_BAR_CONFIG = {
 };
 var BG = SURFACE.bgElev;
 function Pill({ children }) {
-  return /* @__PURE__ */ import_react16.default.createElement(W, { flexDirection: "row", flexShrink: 0 }, children);
+  return /* @__PURE__ */ import_react16.default.createElement(Box_default, { flexDirection: "row", flexShrink: 0 }, children);
 }
 function Gap() {
-  return /* @__PURE__ */ import_react16.default.createElement(L, null, " ");
+  return /* @__PURE__ */ import_react16.default.createElement(Text, null, " ");
 }
 function StatusRow({
   statusBar = DEFAULT_STATUS_BAR_CONFIG
 }) {
   const status2 = useAgentState((s) => s.status);
   const session = useAgentState((s) => s.session);
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const hasTurn = status2.cost > 0;
   const hasSession = status2.sessionCost > 0;
   const hasBalance = typeof status2.balance === "number";
   const showWallet = cols >= WALLET_MIN_COLS && (hasSession && statusBar.showSessionCost || hasBalance && statusBar.showBalance);
-  return /* @__PURE__ */ import_react16.default.createElement(W, { flexDirection: "row", flexShrink: 0, marginTop: 1 }, /* @__PURE__ */ import_react16.default.createElement(W, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1 }, /* @__PURE__ */ import_react16.default.createElement(L, null, " "), status2.recording ? /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(RecordingPill, { rec: status2.recording })) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds })) : /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(ModePill, { mode: status2.mode, network: status2.network, detail: status2.networkDetail })), /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.sub }, `${session.id} \xB7 ${session.branch}`)), hasTurn && statusBar.showTurnCost && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(L, { bold: true, color: TONE.brand }, "\u25B8 "), /* @__PURE__ */ import_react16.default.createElement(L, { bold: true, color: FG.body }, `${formatCost(status2.cost, status2.costDisplayCurrency ?? status2.balanceCurrency)} ${t("statusBar.turn")}`))), statusBar.showCacheHit && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: TONE.accent }, `${t("statusBar.cache")} ${Math.round(status2.cacheHit * 100)}%`))), statusBar.showCtxUsage && status2.promptTokens !== void 0 && status2.promptTokens > 0 && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(
+  return /* @__PURE__ */ import_react16.default.createElement(Box_default, { flexDirection: "row", flexShrink: 0, marginTop: 1 }, /* @__PURE__ */ import_react16.default.createElement(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1 }, /* @__PURE__ */ import_react16.default.createElement(Text, null, " "), status2.recording ? /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(RecordingPill, { rec: status2.recording })) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds })) : /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(ModePill, { mode: status2.mode, network: status2.network, detail: status2.networkDetail })), /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.sub }, `${session.id} \xB7 ${session.branch}`)), hasTurn && statusBar.showTurnCost && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(Text, { bold: true, color: TONE.brand }, "\u25B8 "), /* @__PURE__ */ import_react16.default.createElement(Text, { bold: true, color: FG.body }, `${formatCost(status2.cost, status2.costDisplayCurrency ?? status2.balanceCurrency)} ${t("statusBar.turn")}`))), statusBar.showCacheHit && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: TONE.accent }, `${t("statusBar.cache")} ${Math.round(status2.cacheHit * 100)}%`))), statusBar.showCtxUsage && status2.promptTokens !== void 0 && status2.promptTokens > 0 && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(
     CtxUsagePill,
     {
       tokens: status2.promptTokens,
@@ -48042,7 +48044,7 @@ function StatusRow({
       showSessionCost: statusBar.showSessionCost,
       showBalance: statusBar.showBalance
     }
-  )))), /* @__PURE__ */ import_react16.default.createElement(W, { flexDirection: "row", flexShrink: 0 }, statusBar.showVersion && cols >= VERSION_MIN_COLS && /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.faint }, `v${VERSION}`)), statusBar.showFeedbackHint && cols >= FEEDBACK_HINT_MIN_COLS && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.meta }, "\u2691 "), /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.sub }, t("statusBar.shortcutsHint"))))));
+  )))), /* @__PURE__ */ import_react16.default.createElement(Box_default, { flexDirection: "row", flexShrink: 0 }, statusBar.showVersion && cols >= VERSION_MIN_COLS && /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.faint }, `v${VERSION}`)), statusBar.showFeedbackHint && cols >= FEEDBACK_HINT_MIN_COLS && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Gap, null), /* @__PURE__ */ import_react16.default.createElement(Pill, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.meta }, "\u2691 "), /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.sub }, t("statusBar.shortcutsHint"))))));
 }
 function CtxUsagePill({
   tokens,
@@ -48055,13 +48057,13 @@ function CtxUsagePill({
   const showTokens = cols >= CTX_TOKENS_MIN_COLS;
   const showBar = cols >= CTX_BAR_MIN_COLS;
   const filled = Math.round(CTX_BAR_CELLS * ratio);
-  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.meta, wrap: "truncate" }, `${t("statusBar.ctx")} `), showBar && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color, wrap: "truncate" }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.faint, wrap: "truncate" }, GLYPH.shade1.repeat(CTX_BAR_CELLS - filled)), /* @__PURE__ */ import_react16.default.createElement(L, { wrap: "truncate" }, " ")), /* @__PURE__ */ import_react16.default.createElement(L, { color, wrap: "truncate" }, `${pct}%`), showTokens && /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.faint }, ` \xB7 ${formatTokens(tokens)}/${formatTokens(cap)}`));
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, `${t("statusBar.ctx")} `), showBar && /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color, wrap: "truncate" }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.faint, wrap: "truncate" }, GLYPH.shade1.repeat(CTX_BAR_CELLS - filled)), /* @__PURE__ */ import_react16.default.createElement(Text, { wrap: "truncate" }, " ")), /* @__PURE__ */ import_react16.default.createElement(Text, { color, wrap: "truncate" }, `${pct}%`), showTokens && /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.faint }, ` \xB7 ${formatTokens(tokens)}/${formatTokens(cap)}`));
 }
 function McpLoadingPill({
   ready,
   total
 }) {
-  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: TONE.brand, wrap: "truncate" }, "\u2301 "), /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.body }, `${t("statusBar.mcpLoading")} ${ready}/${total}`));
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: TONE.brand, wrap: "truncate" }, "\u2301 "), /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.body }, `${t("statusBar.mcpLoading")} ${ready}/${total}`));
 }
 function WalletPill({
   sessionCostUsd,
@@ -48072,7 +48074,7 @@ function WalletPill({
 }) {
   const showSpent = showSessionCost && sessionCostUsd > 0;
   const showBalanceLine = showBalanceCfg && typeof balance === "number";
-  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.meta, wrap: "truncate" }, "\u26C1 "), showSpent && /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.body }, `${formatCost(sessionCostUsd, currency, 2)} ${t("statusBar.spent")}`), showSpent && showBalanceLine && /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.meta, wrap: "truncate" }, "  /  "), showBalanceLine && /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.faint, wrap: "truncate" }, t("statusBar.left")), showBalanceLine && /* @__PURE__ */ import_react16.default.createElement(L, { bold: true, color: balanceColor(balance, currency), wrap: "truncate" }, formatBalance(balance, currency, { fractionDigits: 2 })));
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "\u26C1 "), showSpent && /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.body }, `${formatCost(sessionCostUsd, currency, 2)} ${t("statusBar.spent")}`), showSpent && showBalanceLine && /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "  /  "), showBalanceLine && /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.faint, wrap: "truncate" }, t("statusBar.left")), showBalanceLine && /* @__PURE__ */ import_react16.default.createElement(Text, { bold: true, color: balanceColor(balance, currency), wrap: "truncate" }, formatBalance(balance, currency, { fractionDigits: 2 })));
 }
 function ModePill({
   mode: mode2,
@@ -48082,18 +48084,18 @@ function ModePill({
   const modeLabel = `${t("statusBar.editsLabel")}${mode2}`;
   if (network === "online") {
     const pill = modeGlyph(mode2);
-    return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.sub, wrap: "truncate" }, ` ${modeLabel}`));
+    return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.sub, wrap: "truncate" }, ` ${modeLabel}`));
   }
   const dot = networkDot(network);
   if (network === "slow") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react16.default.createElement(L, { color: dot.color }, ` ${modeLabel} \xB7 ${t("statusBar.slow")}${tail}`));
+    return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react16.default.createElement(Text, { color: dot.color }, ` ${modeLabel} \xB7 ${t("statusBar.slow")}${tail}`));
   }
   if (network === "disconnected") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react16.default.createElement(L, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.disconnect")}${tail}`));
+    return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react16.default.createElement(Text, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.disconnect")}${tail}`));
   }
-  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react16.default.createElement(L, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.reconnecting")}`));
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react16.default.createElement(Text, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.reconnecting")}`));
 }
 function CountdownRow({
   mode: mode2,
@@ -48101,11 +48103,11 @@ function CountdownRow({
 }) {
   const pill = modeGlyph(mode2);
   const endsAt = Date.now() + secondsLeft * 1e3;
-  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react16.default.createElement(L, { color: FG.sub, wrap: "truncate" }, ` ${t("statusBar.editsLabel")}${mode2} \xB7 `), /* @__PURE__ */ import_react16.default.createElement(L, { color: TONE.warn, wrap: "truncate" }, t("statusBar.approvingIn")), /* @__PURE__ */ import_react16.default.createElement(Countdown, { endsAt }), /* @__PURE__ */ import_react16.default.createElement(L, { color: TONE.warn, wrap: "truncate" }, t("statusBar.escToInterrupt")));
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react16.default.createElement(Text, { color: FG.sub, wrap: "truncate" }, ` ${t("statusBar.editsLabel")}${mode2} \xB7 `), /* @__PURE__ */ import_react16.default.createElement(Text, { color: TONE.warn, wrap: "truncate" }, t("statusBar.approvingIn")), /* @__PURE__ */ import_react16.default.createElement(Countdown, { endsAt }), /* @__PURE__ */ import_react16.default.createElement(Text, { color: TONE.warn, wrap: "truncate" }, t("statusBar.escToInterrupt")));
 }
 function RecordingPill({ rec }) {
   const sizeMb = (rec.sizeBytes / (1024 * 1024)).toFixed(1);
-  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(L, { bold: true, color: TONE.err, wrap: "truncate" }, t("statusBar.recordingGlyph")), /* @__PURE__ */ import_react16.default.createElement(L, { color: TONE.err }, ` ${sizeMb}${t("statusBar.mb")} \xB7 ${rec.events}${t("statusBar.evt")}`));
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(Text, { bold: true, color: TONE.err, wrap: "truncate" }, t("statusBar.recordingGlyph")), /* @__PURE__ */ import_react16.default.createElement(Text, { color: TONE.err }, ` ${sizeMb}${t("statusBar.mb")} \xB7 ${rec.events}${t("statusBar.evt")}`));
 }
 function modeGlyph(mode2) {
   switch (mode2) {
@@ -48226,7 +48228,7 @@ var ComposerArea = import_react17.default.memo(
     slashArgSelected
   }) => {
     useRenderTrace("ComposerArea");
-    const inputArea = /* @__PURE__ */ import_react17.default.createElement(W, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ import_react17.default.createElement(W, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, slashMatches !== null ? /* @__PURE__ */ import_react17.default.createElement(
+    const inputArea = /* @__PURE__ */ import_react17.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ import_react17.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, slashMatches !== null ? /* @__PURE__ */ import_react17.default.createElement(
       SlashSuggestions,
       {
         key: `slash-suggestions:${slashGroupMode ? "group" : "search"}`,
@@ -48272,7 +48274,7 @@ function LoopStatusRow({
 }) {
   useSlowTick();
   const nextFireMs = Math.max(0, loop2.nextFireAt - Date.now());
-  return /* @__PURE__ */ import_react17.default.createElement(W, null, /* @__PURE__ */ import_react17.default.createElement(L, { color: "cyan" }, `loop: ${formatLoopStatus(loop2.prompt, nextFireMs, loop2.iter)} \u2014 /loop stop or type to cancel`));
+  return /* @__PURE__ */ import_react17.default.createElement(Box_default, null, /* @__PURE__ */ import_react17.default.createElement(Text, { color: "ansi:cyan" }, `loop: ${formatLoopStatus(loop2.prompt, nextFireMs, loop2.iter)} \u2014 /loop stop or type to cancel`));
 }
 
 // src/cli/ui/EditConfirm.tsx
@@ -48457,7 +48459,7 @@ function DenyContextInput({
       setValue((v) => v + ev.input);
     }
   });
-  return /* @__PURE__ */ import_react18.default.createElement(W, { flexDirection: "column" }, /* @__PURE__ */ import_react18.default.createElement(W, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ import_react18.default.createElement(L, { color: FG.sub }, description)), /* @__PURE__ */ import_react18.default.createElement(W, null, /* @__PURE__ */ import_react18.default.createElement(L, { bold: true, color: TONE.brand }, "\u203A "), /* @__PURE__ */ import_react18.default.createElement(L, { color: FG.body }, value), /* @__PURE__ */ import_react18.default.createElement(L, { backgroundColor: TONE.brand, color: "#000" }, " ")));
+  return /* @__PURE__ */ import_react18.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react18.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.sub }, description)), /* @__PURE__ */ import_react18.default.createElement(Box_default, null, /* @__PURE__ */ import_react18.default.createElement(Text, { bold: true, color: TONE.brand }, "\u203A "), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.body }, value), /* @__PURE__ */ import_react18.default.createElement(Text, { backgroundColor: TONE.brand, color: "#000" }, " ")));
 }
 
 // src/cli/ui/SplitDiff.tsx
@@ -48517,11 +48519,11 @@ function wrapToCells(s, maxCells) {
 
 // src/cli/ui/SplitDiff.tsx
 function SplitDiff({ rows, totalCols }) {
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = totalCols ?? stdout?.columns ?? 80;
   const innerCols = Math.max(40, cols - 6);
   const halfCols = Math.floor((innerCols - 3) / 2);
-  return /* @__PURE__ */ import_react19.default.createElement(W, { flexDirection: "column" }, rows.map((row2, i) => /* @__PURE__ */ import_react19.default.createElement(W, { key: `r-${i}-${row2.left.num ?? "p"}-${row2.right.num ?? "p"}` }, /* @__PURE__ */ import_react19.default.createElement(Cell, { side: row2.left, width: halfCols, which: "left" }), /* @__PURE__ */ import_react19.default.createElement(L, { color: COLOR.info, dimColor: true }, " \u2502 "), /* @__PURE__ */ import_react19.default.createElement(Cell, { side: row2.right, width: halfCols, which: "right" }))));
+  return /* @__PURE__ */ import_react19.default.createElement(Box_default, { flexDirection: "column" }, rows.map((row2, i) => /* @__PURE__ */ import_react19.default.createElement(Box_default, { key: `r-${i}-${row2.left.num ?? "p"}-${row2.right.num ?? "p"}` }, /* @__PURE__ */ import_react19.default.createElement(Cell, { side: row2.left, width: halfCols, which: "left" }), /* @__PURE__ */ import_react19.default.createElement(Text, { color: COLOR.info, dim: true }, " \u2502 "), /* @__PURE__ */ import_react19.default.createElement(Cell, { side: row2.right, width: halfCols, which: "right" }))));
 }
 function Cell({
   side,
@@ -48540,22 +48542,22 @@ function Cell({
   const raw = side.text;
   const padded = padToCells(clipToCells(raw, inner), inner);
   if (side.kind === "del") {
-    return /* @__PURE__ */ import_react19.default.createElement(L, { color: "#fbc8c8", backgroundColor: "#2a1212" }, `${numStr} ${sign} ${padded}`);
+    return /* @__PURE__ */ import_react19.default.createElement(Text, { color: "#fbc8c8", backgroundColor: "#2a1212" }, `${numStr} ${sign} ${padded}`);
   }
   if (side.kind === "add") {
-    return /* @__PURE__ */ import_react19.default.createElement(L, { color: "#bef0c8", backgroundColor: "#0c2718" }, `${numStr} ${sign} ${padded}`);
+    return /* @__PURE__ */ import_react19.default.createElement(Text, { color: "#bef0c8", backgroundColor: "#0c2718" }, `${numStr} ${sign} ${padded}`);
   }
   if (side.kind === "pad") {
-    return /* @__PURE__ */ import_react19.default.createElement(L, { color: COLOR.info, dimColor: true, italic: !!raw }, `${numStr} ${sign} ${padded}`);
+    return /* @__PURE__ */ import_react19.default.createElement(Text, { color: COLOR.info, dim: true, italic: !!raw }, `${numStr} ${sign} ${padded}`);
   }
-  return /* @__PURE__ */ import_react19.default.createElement(L, { dimColor: true }, `${numStr} ${sign} ${padded}`);
+  return /* @__PURE__ */ import_react19.default.createElement(Text, { dim: true }, `${numStr} ${sign} ${padded}`);
 }
 
 // src/cli/ui/EditConfirm.tsx
 var MODAL_OVERHEAD_ROWS = 18;
 var MIN_DIFF_ROWS = 8;
 function EditConfirm({ block: block2, onChoose }) {
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const rows = stdout?.rows ?? 40;
   const allocated = Math.max(MODAL_OVERHEAD_ROWS + MIN_DIFF_ROWS, rows - 4);
   const budget2 = Math.max(MIN_DIFF_ROWS, allocated - MODAL_OVERHEAD_ROWS);
@@ -48662,12 +48664,12 @@ function EditConfirm({ block: block2, onChoose }) {
       metaRight: metaParts.join("  \xB7  "),
       footerHint: t("editConfirm.footer")
     },
-    hiddenAbove > 0 ? /* @__PURE__ */ import_react20.default.createElement(L, { dimColor: true }, t(hiddenAbove === 1 ? "editConfirm.linesAbove" : "editConfirm.linesAbovePlural", {
+    hiddenAbove > 0 ? /* @__PURE__ */ import_react20.default.createElement(Text, { dim: true }, t(hiddenAbove === 1 ? "editConfirm.linesAbove" : "editConfirm.linesAbovePlural", {
       count: hiddenAbove
     })) : null,
     /* @__PURE__ */ import_react20.default.createElement(SplitDiff, { rows: visibleRows }),
-    /* @__PURE__ */ import_react20.default.createElement(W, null, /* @__PURE__ */ import_react20.default.createElement(L, { color: "#fbc8c8", backgroundColor: "#2a1212" }, t("editConfirm.oldLabel")), /* @__PURE__ */ import_react20.default.createElement(L, null, "  "), /* @__PURE__ */ import_react20.default.createElement(L, { color: "#bef0c8", backgroundColor: "#0c2718" }, t("editConfirm.newLabel")), /* @__PURE__ */ import_react20.default.createElement(L, { dimColor: true }, t("editConfirm.sideBySide"))),
-    hiddenBelow > 0 ? /* @__PURE__ */ import_react20.default.createElement(L, { dimColor: true }, t(hiddenBelow === 1 ? "editConfirm.linesBelow" : "editConfirm.linesBelowPlural", {
+    /* @__PURE__ */ import_react20.default.createElement(Box_default, null, /* @__PURE__ */ import_react20.default.createElement(Text, { color: "#fbc8c8", backgroundColor: "#2a1212" }, t("editConfirm.oldLabel")), /* @__PURE__ */ import_react20.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react20.default.createElement(Text, { color: "#bef0c8", backgroundColor: "#0c2718" }, t("editConfirm.newLabel")), /* @__PURE__ */ import_react20.default.createElement(Text, { dim: true }, t("editConfirm.sideBySide"))),
+    hiddenBelow > 0 ? /* @__PURE__ */ import_react20.default.createElement(Text, { dim: true }, t(hiddenBelow === 1 ? "editConfirm.linesBelow" : "editConfirm.linesBelowPlural", {
       count: hiddenBelow
     })) : null
   );
@@ -48682,7 +48684,7 @@ function EditPicker({
   onChoose
 }) {
   const [focus, setFocus] = (0, import_react21.useState)(Math.max(0, entries.length - 1));
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const rows = stdout?.rows ?? 40;
   const visibleCount = Math.max(3, rows - PAGE_MARGIN2);
   const maxFocus = Math.max(0, entries.length - 1);
@@ -48703,14 +48705,14 @@ function EditPicker({
     }
   });
   if (entries.length === 0) {
-    return /* @__PURE__ */ import_react21.default.createElement(W, { flexDirection: "column", paddingY: 1, paddingX: 2 }, /* @__PURE__ */ import_react21.default.createElement(L, { color: TONE.warn }, t("editPicker.empty")), /* @__PURE__ */ import_react21.default.createElement(L, { color: FG.faint }, t("editPicker.dismiss")));
+    return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "column", paddingY: 1, paddingX: 2 }, /* @__PURE__ */ import_react21.default.createElement(Text, { color: TONE.warn }, t("editPicker.empty")), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.faint }, t("editPicker.dismiss")));
   }
   const start = Math.max(
     0,
     Math.min(focus - Math.floor(visibleCount / 2), entries.length - visibleCount)
   );
   const shown = entries.slice(start, start + visibleCount);
-  return /* @__PURE__ */ import_react21.default.createElement(W, { flexDirection: "column", paddingY: 1, paddingX: 2 }, /* @__PURE__ */ import_react21.default.createElement(L, { bold: true, color: TONE.brand }, t("editPicker.title")), /* @__PURE__ */ import_react21.default.createElement(L, { color: FG.faint }, t("editPicker.hint")), /* @__PURE__ */ import_react21.default.createElement(W, { flexDirection: "column", marginTop: 1 }, shown.map((entry, i) => {
+  return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "column", paddingY: 1, paddingX: 2 }, /* @__PURE__ */ import_react21.default.createElement(Text, { bold: true, color: TONE.brand }, t("editPicker.title")), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.faint }, t("editPicker.hint")), /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "column", marginTop: 1 }, shown.map((entry, i) => {
     const globalIdx = start + i;
     const focused = globalIdx === focus;
     return /* @__PURE__ */ import_react21.default.createElement(Row, { key: entry.cardId, entry, focused });
@@ -48722,7 +48724,7 @@ function Row({ entry, focused }) {
   const numLabel = `#${entry.userTurnIndex + 1}`;
   const bg = focused ? SURFACE.bgElev : void 0;
   const fg = focused ? FG.strong : FG.body;
-  return /* @__PURE__ */ import_react21.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react21.default.createElement(L, { color: focused ? TONE.brand : FG.faint, backgroundColor: bg }, marker), /* @__PURE__ */ import_react21.default.createElement(L, { color: FG.meta, backgroundColor: bg }, numLabel), /* @__PURE__ */ import_react21.default.createElement(L, { color: fg, backgroundColor: bg }, preview));
+  return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react21.default.createElement(Text, { color: focused ? TONE.brand : FG.faint, backgroundColor: bg }, marker), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.meta, backgroundColor: bg }, numLabel), /* @__PURE__ */ import_react21.default.createElement(Text, { color: fg, backgroundColor: bg }, preview));
 }
 function oneLinePreview(text2, cells) {
   const firstLine = text2.split(/\n/, 1)[0] ?? "";
@@ -48748,7 +48750,7 @@ var import_react26 = __toESM(require_react(), 1);
 var import_react22 = __toESM(require_react(), 1);
 var ActiveCardContext = import_react22.default.createContext(true);
 function Card({ children }) {
-  return /* @__PURE__ */ import_react22.default.createElement(W, { flexDirection: "column", marginTop: 1, width: "100%" }, children);
+  return /* @__PURE__ */ import_react22.default.createElement(Box_default, { flexDirection: "column", marginTop: 1, width: "100%" }, children);
 }
 
 // src/cli/ui/primitives/CardHeader.tsx
@@ -48763,13 +48765,13 @@ function CardHeader({
 }) {
   const active2 = (0, import_react23.useContext)(ActiveCardContext);
   const visibleMeta = active2 ? meta : meta?.filter((item) => typeof item !== "string");
-  return /* @__PURE__ */ import_react23.default.createElement(W, { flexDirection: "row", gap: 1 }, typeof glyph === "string" ? /* @__PURE__ */ import_react23.default.createElement(L, { color: tone }, glyph) : glyph, /* @__PURE__ */ import_react23.default.createElement(L, { bold: true, color: tone }, title2), subtitle ? /* @__PURE__ */ import_react23.default.createElement(L, { color: FG.body }, subtitle) : null, visibleMeta?.map((item, i) => {
+  return /* @__PURE__ */ import_react23.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, typeof glyph === "string" ? /* @__PURE__ */ import_react23.default.createElement(Text, { color: tone }, glyph) : glyph, /* @__PURE__ */ import_react23.default.createElement(Text, { bold: true, color: tone }, title2), subtitle ? /* @__PURE__ */ import_react23.default.createElement(Text, { color: FG.body }, subtitle) : null, visibleMeta?.map((item, i) => {
     const isStr = typeof item === "string";
     const text2 = isStr ? item : item.text;
     const color = isStr ? FG.faint : item.color;
     return (
       // biome-ignore lint/suspicious/noArrayIndexKey: meta items are positional
-      /* @__PURE__ */ import_react23.default.createElement(import_react23.default.Fragment, { key: `m-${i}` }, /* @__PURE__ */ import_react23.default.createElement(L, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react23.default.createElement(L, { color }, text2))
+      /* @__PURE__ */ import_react23.default.createElement(import_react23.default.Fragment, { key: `m-${i}` }, /* @__PURE__ */ import_react23.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react23.default.createElement(Text, { color }, text2))
     );
   }), active2 ? right : null);
 }
@@ -48777,7 +48779,7 @@ function CardHeader({
 // src/cli/ui/primitives/Pill.tsx
 var import_react24 = __toESM(require_react(), 1);
 function Pill2({ label, bg, fg, bold = true }) {
-  return /* @__PURE__ */ import_react24.default.createElement(L, { backgroundColor: bg, color: fg, bold }, ` ${label} `);
+  return /* @__PURE__ */ import_react24.default.createElement(Text, { backgroundColor: bg, color: fg, bold }, ` ${label} `);
 }
 var PILL_PATH = { bg: "#11141a", fg: "#8b949e" };
 var PILL_MODEL = {
@@ -48805,12 +48807,12 @@ function Pulse({
   color,
   frameMs = DEFAULT_FRAME_MS
 }) {
-  const [ref, time] = Wi(active2 ? frameMs : null);
+  const [ref, time] = useAnimationFrame(active2 ? frameMs : null);
   const settledGlyph = settled ?? frames[frames.length - 1] ?? "";
   if (!active2)
-    return /* @__PURE__ */ import_react25.default.createElement(W, { ref }, /* @__PURE__ */ import_react25.default.createElement(L, { color }, settledGlyph));
+    return /* @__PURE__ */ import_react25.default.createElement(Box_default, { ref }, /* @__PURE__ */ import_react25.default.createElement(Text, { color }, settledGlyph));
   const idx = Math.floor(time / frameMs) % frames.length;
-  return /* @__PURE__ */ import_react25.default.createElement(W, { ref }, /* @__PURE__ */ import_react25.default.createElement(L, { color }, frames[idx] ?? settledGlyph));
+  return /* @__PURE__ */ import_react25.default.createElement(Box_default, { ref }, /* @__PURE__ */ import_react25.default.createElement(Text, { color }, frames[idx] ?? settledGlyph));
 }
 var PULSE_DIAMOND = ["\u25C7", "\u25C8", "\u25C6", "\u25C8"];
 var PULSE_SQUARE = ["\u25A2", "\u25A3", "\u25A4", "\u25A3"];
@@ -48872,7 +48874,7 @@ function ThinkingRow({ text: text2 }) {
   if (secs >= 1) tail.push(formatElapsed(secs));
   if (tokens > 0) tail.push(`\u2193 ${tokens.toLocaleString()} tok`);
   if (tps !== null) tail.push(`${tps} t/s`);
-  return /* @__PURE__ */ import_react26.default.createElement(W, { marginY: 1, paddingX: 1, gap: 1 }, /* @__PURE__ */ import_react26.default.createElement(Pulse, { active: true, frames: PULSE_CIRCLE, settled: "\u25CF", color: TONE.accent }), /* @__PURE__ */ import_react26.default.createElement(L, { italic: true, color: FG.sub }, text2), tail.length > 0 ? /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, `\xB7 ${tail.join(" \xB7 ")}`) : null);
+  return /* @__PURE__ */ import_react26.default.createElement(Box_default, { marginY: 1, paddingX: 1, gap: 1 }, /* @__PURE__ */ import_react26.default.createElement(Pulse, { active: true, frames: PULSE_CIRCLE, settled: "\u25CF", color: TONE.accent }), /* @__PURE__ */ import_react26.default.createElement(Text, { italic: true, color: FG.sub }, text2), tail.length > 0 ? /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, `\xB7 ${tail.join(" \xB7 ")}`) : null);
 }
 function UndoBanner({
   banner
@@ -48880,7 +48882,7 @@ function UndoBanner({
   const paused = banner.pausedRemainingMs !== null;
   const ok = banner.results.filter((r) => r.status === "applied" || r.status === "created").length;
   const total = banner.results.length;
-  return /* @__PURE__ */ import_react26.default.createElement(W, { marginY: 1, paddingX: 1 }, /* @__PURE__ */ import_react26.default.createElement(L, { backgroundColor: TONE.accent, color: "black", bold: true }, ` \u2713 AUTO-APPLIED ${ok}/${total} `), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, "   press "), /* @__PURE__ */ import_react26.default.createElement(L, { backgroundColor: TONE.brand, color: "black", bold: true }, " u "), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, " to undo \xB7 "), /* @__PURE__ */ import_react26.default.createElement(L, { backgroundColor: paused ? TONE.warn : FG.faint, color: "black", bold: true }, " space "), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, paused ? " to resume" : " to pause"), paused ? /* @__PURE__ */ import_react26.default.createElement(L, { color: TONE.warn, bold: true }, "  \xB7 paused") : null);
+  return /* @__PURE__ */ import_react26.default.createElement(Box_default, { marginY: 1, paddingX: 1 }, /* @__PURE__ */ import_react26.default.createElement(Text, { backgroundColor: TONE.accent, color: "ansi:black", bold: true }, ` \u2713 AUTO-APPLIED ${ok}/${total} `), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, "   press "), /* @__PURE__ */ import_react26.default.createElement(Text, { backgroundColor: TONE.brand, color: "ansi:black", bold: true }, " u "), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, " to undo \xB7 "), /* @__PURE__ */ import_react26.default.createElement(Text, { backgroundColor: paused ? TONE.warn : FG.faint, color: "ansi:black", bold: true }, " space "), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, paused ? " to resume" : " to pause"), paused ? /* @__PURE__ */ import_react26.default.createElement(Text, { color: TONE.warn, bold: true }, "  \xB7 paused") : null);
 }
 function subagentPhaseLabel(phase, iter, elapsedMs) {
   if (phase === "summarising") return "summarising findings\u2026";
@@ -48905,7 +48907,7 @@ function SubagentRow({ activity }) {
       meta: [`iter ${activity.iter}`, `${seconds}s`],
       right: modelBadge ? /* @__PURE__ */ import_react26.default.createElement(Pill2, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null
     }
-  ), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, "task  ", /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.sub }, activity.task)), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, "last  ", last ? /* @__PURE__ */ import_react26.default.createElement(import_react26.default.Fragment, null, /* @__PURE__ */ import_react26.default.createElement(L, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.body }, last.label), last.meta ? /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, `   ${last.meta}`) : null) : /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, t("editMode.queuedDots"))), streamLine ? /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, "flow  ", /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.sub }, streamLine)) : null, /* @__PURE__ */ import_react26.default.createElement(L, { color: TONE.brand }, "\u25B6  ", phase));
+  ), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, "task  ", /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.sub }, activity.task)), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, "last  ", last ? /* @__PURE__ */ import_react26.default.createElement(import_react26.default.Fragment, null, /* @__PURE__ */ import_react26.default.createElement(Text, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.body }, last.label), last.meta ? /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, `   ${last.meta}`) : null) : /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, t("editMode.queuedDots"))), streamLine ? /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, "flow  ", /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.sub }, streamLine)) : null, /* @__PURE__ */ import_react26.default.createElement(Text, { color: TONE.brand }, "\u25B6  ", phase));
 }
 function formatBytes(n) {
   if (n < 1024) return `${n} B`;
@@ -48947,7 +48949,7 @@ function SubagentLiveStack({
       title: "subagents",
       subtitle: metaParts.join(" \xB7 ")
     }
-  ), visible.map((a) => /* @__PURE__ */ import_react26.default.createElement(CompactSubagentLine, { key: a.runId, activity: a })), overflow > 0 ? /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, `  +${overflow} more running\u2026`) : null);
+  ), visible.map((a) => /* @__PURE__ */ import_react26.default.createElement(CompactSubagentLine, { key: a.runId, activity: a })), overflow > 0 ? /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, `  +${overflow} more running\u2026`) : null);
 }
 function CompactSubagentLine({ activity }) {
   const summarising = activity.phase === "summarising";
@@ -48956,7 +48958,7 @@ function CompactSubagentLine({ activity }) {
   const title2 = activity.skillName ?? truncate(activity.task, 28);
   const titlePadded = title2.padEnd(28);
   const last = activity.lastInner;
-  return /* @__PURE__ */ import_react26.default.createElement(W, { flexDirection: "row" }, /* @__PURE__ */ import_react26.default.createElement(L, null, "  "), /* @__PURE__ */ import_react26.default.createElement(Pulse, { active: true, frames: PULSE_HEX, settled: summarising ? "\u25B6" : "\u232C", color: glyphColor }), /* @__PURE__ */ import_react26.default.createElement(L, null, " "), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.body }, titlePadded), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, `  iter ${String(activity.iter).padStart(2)} \xB7 ${seconds}s \xB7 `), last ? /* @__PURE__ */ import_react26.default.createElement(import_react26.default.Fragment, null, /* @__PURE__ */ import_react26.default.createElement(L, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.body }, truncate(last.label, 18)), last.meta ? /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, `  ${last.meta}`) : null) : /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, t("editMode.queuedDots")));
+  return /* @__PURE__ */ import_react26.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react26.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react26.default.createElement(Pulse, { active: true, frames: PULSE_HEX, settled: summarising ? "\u25B6" : "\u232C", color: glyphColor }), /* @__PURE__ */ import_react26.default.createElement(Text, null, " "), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.body }, titlePadded), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, `  iter ${String(activity.iter).padStart(2)} \xB7 ${seconds}s \xB7 `), last ? /* @__PURE__ */ import_react26.default.createElement(import_react26.default.Fragment, null, /* @__PURE__ */ import_react26.default.createElement(Text, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.body }, truncate(last.label, 18)), last.meta ? /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, `  ${last.meta}`) : null) : /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, t("editMode.queuedDots")));
 }
 function truncate(text2, max) {
   return text2.length > max ? `${text2.slice(0, max)}\u2026` : text2;
@@ -48984,7 +48986,7 @@ function OngoingToolRow({
   if (secs >= 1) tailParts.push(formatElapsed(secs));
   if (tokens > 0) tailParts.push(`\u2193 ${tokens.toLocaleString()} tok`);
   if (tps !== null) tailParts.push(`${tps} t/s`);
-  return /* @__PURE__ */ import_react26.default.createElement(W, { marginY: 1, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react26.default.createElement(W, { gap: 1 }, /* @__PURE__ */ import_react26.default.createElement(Pulse, { active: true, frames: PULSE_SQUARE, settled: "\u25A3", color: CARD.tool.color }), /* @__PURE__ */ import_react26.default.createElement(L, { color: CARD.tool.color, bold: true }, tool.name), /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, "running", tailParts.length > 0 ? ` \xB7 ${tailParts.join(" \xB7 ")}` : "")), subagentBytesLine ? /* @__PURE__ */ import_react26.default.createElement(W, { paddingLeft: 3 }, /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, subagentBytesLine)) : null, progress ? /* @__PURE__ */ import_react26.default.createElement(W, { paddingLeft: 3 }, /* @__PURE__ */ import_react26.default.createElement(L, { color: TONE.brand }, renderProgressLine(progress))) : null, summary ? /* @__PURE__ */ import_react26.default.createElement(W, { paddingLeft: 3 }, /* @__PURE__ */ import_react26.default.createElement(L, { color: FG.faint }, summary)) : null);
+  return /* @__PURE__ */ import_react26.default.createElement(Box_default, { marginY: 1, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react26.default.createElement(Box_default, { gap: 1 }, /* @__PURE__ */ import_react26.default.createElement(Pulse, { active: true, frames: PULSE_SQUARE, settled: "\u25A3", color: CARD.tool.color }), /* @__PURE__ */ import_react26.default.createElement(Text, { color: CARD.tool.color, bold: true }, tool.name), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, "running", tailParts.length > 0 ? ` \xB7 ${tailParts.join(" \xB7 ")}` : "")), subagentBytesLine ? /* @__PURE__ */ import_react26.default.createElement(Box_default, { paddingLeft: 3 }, /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, subagentBytesLine)) : null, progress ? /* @__PURE__ */ import_react26.default.createElement(Box_default, { paddingLeft: 3 }, /* @__PURE__ */ import_react26.default.createElement(Text, { color: TONE.brand }, renderProgressLine(progress))) : null, summary ? /* @__PURE__ */ import_react26.default.createElement(Box_default, { paddingLeft: 3 }, /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, summary)) : null);
 }
 function renderProgressLine(p) {
   const msg = p.message ? `  ${p.message}` : "";
@@ -49062,7 +49064,7 @@ function ToastRail() {
   const toasts = useAgentState((s) => s.toasts);
   const dispatch = useDispatch();
   useSlowTick();
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const rule = "\u2501".repeat(Math.max(20, cols - 4));
   const now = Date.now();
@@ -49078,12 +49080,12 @@ function ToastRail() {
   }, [toasts, dispatch]);
   const visible = toasts.filter((t2) => now - t2.bornAt < t2.ttlMs);
   if (visible.length === 0) return null;
-  return /* @__PURE__ */ import_react27.default.createElement(W, { flexDirection: "column" }, visible.map((t2) => {
+  return /* @__PURE__ */ import_react27.default.createElement(Box_default, { 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__ */ import_react27.default.createElement(W, { key: t2.id, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react27.default.createElement(L, { color }, rule), /* @__PURE__ */ import_react27.default.createElement(W, { flexDirection: "row" }, /* @__PURE__ */ import_react27.default.createElement(L, { color }, glyph), /* @__PURE__ */ import_react27.default.createElement(L, { bold: true, color: body }, ` ${t2.title}`), t2.detail !== void 0 && /* @__PURE__ */ import_react27.default.createElement(L, { color: FG.sub }, `  \xB7  ${t2.detail}`), /* @__PURE__ */ import_react27.default.createElement(W, { flexGrow: 1 }), /* @__PURE__ */ import_react27.default.createElement(L, { color: FG.faint }, `${remainingSec}s`)));
+    return /* @__PURE__ */ import_react27.default.createElement(Box_default, { key: t2.id, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react27.default.createElement(Text, { color }, rule), /* @__PURE__ */ import_react27.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react27.default.createElement(Text, { color }, glyph), /* @__PURE__ */ import_react27.default.createElement(Text, { bold: true, color: body }, ` ${t2.title}`), t2.detail !== void 0 && /* @__PURE__ */ import_react27.default.createElement(Text, { color: FG.sub }, `  \xB7  ${t2.detail}`), /* @__PURE__ */ import_react27.default.createElement(Box_default, { flexGrow: 1 }), /* @__PURE__ */ import_react27.default.createElement(Text, { color: FG.faint }, `${remainingSec}s`)));
   }));
 }
 
@@ -49125,11 +49127,11 @@ function PlanCard({ card }) {
       title: card.title,
       meta: [progress]
     }
-  ), window2.hiddenBefore > 0 ? /* @__PURE__ */ import_react28.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react28.default.createElement(L, { color: tone.ok }, "\u2713"), /* @__PURE__ */ import_react28.default.createElement(L, { color: fg.faint }, `\u22EF ${window2.hiddenBefore} ${t("cardLabels.done")}`)) : null, window2.steps.map((step) => {
+  ), window2.hiddenBefore > 0 ? /* @__PURE__ */ import_react28.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react28.default.createElement(Text, { color: tone.ok }, "\u2713"), /* @__PURE__ */ import_react28.default.createElement(Text, { color: fg.faint }, `\u22EF ${window2.hiddenBefore} ${t("cardLabels.done")}`)) : null, window2.steps.map((step) => {
     const isActive = step.status === "running";
     const titleColor = isActive ? fg.strong : fg.sub;
-    return /* @__PURE__ */ import_react28.default.createElement(W, { key: step.id, flexDirection: "row", gap: 1 }, isActive ? /* @__PURE__ */ import_react28.default.createElement(Pulse, { active: true, frames: PULSE_DIAMOND, settled: "\u25C6", color: statusColor[step.status] }) : /* @__PURE__ */ import_react28.default.createElement(L, { color: statusColor[step.status] }, STATUS_GLYPH[step.status]), /* @__PURE__ */ import_react28.default.createElement(L, { bold: isActive, color: titleColor }, `${step.indexLabel}. ${step.title}`), isActive ? /* @__PURE__ */ import_react28.default.createElement(L, { color: toneActive.brand }, t("cardLabels.inProgress")) : null);
-  }), window2.hiddenAfter > 0 ? /* @__PURE__ */ import_react28.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react28.default.createElement(L, { color: fg.faint }, "\u25CB"), /* @__PURE__ */ import_react28.default.createElement(L, { color: fg.faint }, `\u22EF ${window2.hiddenAfter} ${t("cardLabels.upcoming")}`)) : null);
+    return /* @__PURE__ */ import_react28.default.createElement(Box_default, { key: step.id, flexDirection: "row", gap: 1 }, isActive ? /* @__PURE__ */ import_react28.default.createElement(Pulse, { active: true, frames: PULSE_DIAMOND, settled: "\u25C6", color: statusColor[step.status] }) : /* @__PURE__ */ import_react28.default.createElement(Text, { color: statusColor[step.status] }, STATUS_GLYPH[step.status]), /* @__PURE__ */ import_react28.default.createElement(Text, { bold: isActive, color: titleColor }, `${step.indexLabel}. ${step.title}`), isActive ? /* @__PURE__ */ import_react28.default.createElement(Text, { color: toneActive.brand }, t("cardLabels.inProgress")) : null);
+  }), window2.hiddenAfter > 0 ? /* @__PURE__ */ import_react28.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react28.default.createElement(Text, { color: fg.faint }, "\u25CB"), /* @__PURE__ */ import_react28.default.createElement(Text, { color: fg.faint }, `\u22EF ${window2.hiddenAfter} ${t("cardLabels.upcoming")}`)) : null);
 }
 function pickWindow(steps) {
   if (steps.length <= VISIBLE_WINDOW) {
@@ -49189,7 +49191,7 @@ var LiveActivityArea = import_react30.default.memo(
     hideUndo
   }) => {
     useRenderTrace("LiveActivityArea");
-    return /* @__PURE__ */ import_react30.default.createElement(W, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, noTakeoverOverlay && ongoingTool ? /* @__PURE__ */ import_react30.default.createElement(
+    return /* @__PURE__ */ import_react30.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, noTakeoverOverlay && ongoingTool ? /* @__PURE__ */ import_react30.default.createElement(
       OngoingToolRow,
       {
         tool: ongoingTool,
@@ -49463,13 +49465,13 @@ function McpBrowser({
       onClose();
     }
   });
-  return /* @__PURE__ */ import_react31.default.createElement(W, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react31.default.createElement(W, null, /* @__PURE__ */ import_react31.default.createElement(L, { bold: true, color: COLOR.brand }, t("mcpBrowser.title")), /* @__PURE__ */ import_react31.default.createElement(
-    L,
+  return /* @__PURE__ */ import_react31.default.createElement(Box_default, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react31.default.createElement(Box_default, null, /* @__PURE__ */ import_react31.default.createElement(Text, { bold: true, color: COLOR.brand }, t("mcpBrowser.title")), /* @__PURE__ */ import_react31.default.createElement(
+    Text,
     {
-      dimColor: true
+      dim: true
     },
     `  \xB7  ${configPath}  \xB7  ${t("mcpBrowser.serverCount", { count: servers.length, s: servers.length === 1 ? "" : "s" })}`
-  )), /* @__PURE__ */ import_react31.default.createElement(W, { marginTop: 1, flexDirection: "column" }, servers.length === 0 ? /* @__PURE__ */ import_react31.default.createElement(L, { dimColor: true }, t("mcpBrowser.empty")) : servers.map((s, i) => /* @__PURE__ */ import_react31.default.createElement(ServerRow, { key: s.label + s.spec, server: s, active: i === index }))), /* @__PURE__ */ import_react31.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react31.default.createElement(L, { dimColor: true }, t("mcpBrowser.footer"))));
+  )), /* @__PURE__ */ import_react31.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, servers.length === 0 ? /* @__PURE__ */ import_react31.default.createElement(Text, { dim: true }, t("mcpBrowser.empty")) : servers.map((s, i) => /* @__PURE__ */ import_react31.default.createElement(ServerRow, { key: s.label + s.spec, server: s, active: i === index }))), /* @__PURE__ */ import_react31.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react31.default.createElement(Text, { dim: true }, t("mcpBrowser.footer"))));
 }
 function ServerRow({ server, active: active2 }) {
   const { label, toolCount, report } = server;
@@ -49478,7 +49480,7 @@ function ServerRow({ server, active: active2 }) {
   const elapsed = report.elapsedMs;
   const health = healthBadge(elapsed);
   const counts = `${toolCount} tools \xB7 ${resourceCount} resources \xB7 ${promptCount} prompts`;
-  return /* @__PURE__ */ import_react31.default.createElement(W, { flexDirection: "column", marginBottom: active2 ? 1 : 0 }, /* @__PURE__ */ import_react31.default.createElement(W, null, /* @__PURE__ */ import_react31.default.createElement(L, { color: active2 ? COLOR.brand : void 0 }, active2 ? "\u25B8  " : "   "), /* @__PURE__ */ import_react31.default.createElement(L, { bold: active2, color: active2 ? "#e6edf3" : void 0 }, label.padEnd(14)), /* @__PURE__ */ import_react31.default.createElement(L, { color: health.color }, `${health.glyph} ${health.label}`), /* @__PURE__ */ import_react31.default.createElement(L, { dimColor: true }, `      ${counts}`)), active2 ? /* @__PURE__ */ import_react31.default.createElement(W, null, /* @__PURE__ */ import_react31.default.createElement(L, { dimColor: true }, `     ${capabilityList(server)}`)) : null);
+  return /* @__PURE__ */ import_react31.default.createElement(Box_default, { flexDirection: "column", marginBottom: active2 ? 1 : 0 }, /* @__PURE__ */ import_react31.default.createElement(Box_default, null, /* @__PURE__ */ import_react31.default.createElement(Text, { color: active2 ? COLOR.brand : void 0 }, active2 ? "\u25B8  " : "   "), /* @__PURE__ */ import_react31.default.createElement(Text, { bold: active2, color: active2 ? "#e6edf3" : void 0 }, label.padEnd(14)), /* @__PURE__ */ import_react31.default.createElement(Text, { color: health.color }, `${health.glyph} ${health.label}`), /* @__PURE__ */ import_react31.default.createElement(Text, { dim: true }, `      ${counts}`)), active2 ? /* @__PURE__ */ import_react31.default.createElement(Box_default, null, /* @__PURE__ */ import_react31.default.createElement(Text, { dim: true }, `     ${capabilityList(server)}`)) : null);
 }
 function capabilityList(s) {
   const caps = ["tools/list", "tools/call"];
@@ -49765,25 +49767,25 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
     Math.min(state2.selected - Math.floor(VISIBLE_ROWS / 2), filtered.length - VISIBLE_ROWS)
   );
   const window2 = filtered.slice(Math.max(0, start), Math.max(0, start) + VISIBLE_ROWS);
-  return /* @__PURE__ */ import_react32.default.createElement(W, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react32.default.createElement(W, null, /* @__PURE__ */ import_react32.default.createElement(L, { bold: true, color: COLOR.brand }, "\u25C8 MCP marketplace"), /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, `  \xB7  ${state2.status}`)), /* @__PURE__ */ import_react32.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react32.default.createElement(L, null, t("mcpMarketplace.filter")), /* @__PURE__ */ import_react32.default.createElement(L, null, state2.query || t("mcpMarketplace.filterPlaceholder")), /* @__PURE__ */ import_react32.default.createElement(
-    L,
+  return /* @__PURE__ */ import_react32.default.createElement(Box_default, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react32.default.createElement(Box_default, null, /* @__PURE__ */ import_react32.default.createElement(Text, { bold: true, color: COLOR.brand }, "\u25C8 MCP marketplace"), /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, `  \xB7  ${state2.status}`)), /* @__PURE__ */ import_react32.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react32.default.createElement(Text, null, t("mcpMarketplace.filter")), /* @__PURE__ */ import_react32.default.createElement(Text, null, state2.query || t("mcpMarketplace.filterPlaceholder")), /* @__PURE__ */ import_react32.default.createElement(
+    Text,
     {
-      dimColor: true
+      dim: true
     },
     `  ${t(filtered.length === 1 ? "mcpMarketplace.matchSingular" : "mcpMarketplace.matchPlural", { n: filtered.length })}`
-  )), /* @__PURE__ */ import_react32.default.createElement(W, { marginTop: 1, flexDirection: "column" }, window2.length === 0 ? /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, state2.loading ? t("mcpMarketplace.loading") : t("mcpMarketplace.noEntries")) : window2.map((e, i) => {
+  )), /* @__PURE__ */ import_react32.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, window2.length === 0 ? /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, state2.loading ? t("mcpMarketplace.loading") : t("mcpMarketplace.noEntries")) : window2.map((e, i) => {
     const idx = (start || 0) + i;
     const active2 = idx === state2.selected;
     const tag2 = e.source === "official" ? "[off]" : e.source === "smithery" ? "[smt]" : "[loc]";
     const installedSpec = isInstalled(state2.installedSpecs, e);
     const installedBadge = installedSpec ? " \u2713" : "";
     const pop = e.popularity !== void 0 ? ` \xB7 ${e.popularity.toLocaleString()}` : "";
-    return /* @__PURE__ */ import_react32.default.createElement(W, { key: e.name }, /* @__PURE__ */ import_react32.default.createElement(L, { color: active2 ? COLOR.brand : void 0 }, active2 ? "\u25B8 " : "  "), /* @__PURE__ */ import_react32.default.createElement(L, { bold: active2 }, e.name.padEnd(38).slice(0, 38)), /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, ` ${tag2}${pop}${installedBadge}`));
-  })), selected ? /* @__PURE__ */ import_react32.default.createElement(W, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ import_react32.default.createElement(L, { bold: true }, overlay?.[selected.name]?.title ?? selected.title, overlay?.[selected.name] ? /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, `  \xB7  ${selected.title}`) : null), /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, overlay?.[selected.name]?.description ?? selected.description?.slice(0, 200) ?? null), selected.install ? /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, t("mcpMarketplace.specLine", {
+    return /* @__PURE__ */ import_react32.default.createElement(Box_default, { key: e.name }, /* @__PURE__ */ import_react32.default.createElement(Text, { color: active2 ? COLOR.brand : void 0 }, active2 ? "\u25B8 " : "  "), /* @__PURE__ */ import_react32.default.createElement(Text, { bold: active2 }, e.name.padEnd(38).slice(0, 38)), /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, ` ${tag2}${pop}${installedBadge}`));
+  })), selected ? /* @__PURE__ */ import_react32.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ import_react32.default.createElement(Text, { bold: true }, overlay?.[selected.name]?.title ?? selected.title, overlay?.[selected.name] ? /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, `  \xB7  ${selected.title}`) : null), /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, overlay?.[selected.name]?.description ?? selected.description?.slice(0, 200) ?? null), selected.install ? /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, t("mcpMarketplace.specLine", {
     runtime: selected.install.runtime,
     id: selected.install.packageId ?? selected.install.url ?? "\u2014",
     transport: selected.install.transport
-  })) : /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, t("mcpMarketplace.smitheryDetail")), selected.install?.requiredEnv?.length ? /* @__PURE__ */ import_react32.default.createElement(L, { color: "yellow" }, t("mcpMarketplace.needsEnv", { env: selected.install.requiredEnv.join(", ") })) : null) : null, /* @__PURE__ */ import_react32.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react32.default.createElement(L, { dimColor: true }, t("mcpMarketplace.footerHint"))));
+  })) : /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, t("mcpMarketplace.smitheryDetail")), selected.install?.requiredEnv?.length ? /* @__PURE__ */ import_react32.default.createElement(Text, { color: "ansi:yellow" }, t("mcpMarketplace.needsEnv", { env: selected.install.requiredEnv.join(", ") })) : null) : null, /* @__PURE__ */ import_react32.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react32.default.createElement(Text, { dim: true }, t("mcpMarketplace.footerHint"))));
 }
 
 // src/cli/ui/McpHub.tsx
@@ -49802,14 +49804,14 @@ function McpHub({
     if (ev.paste) return;
     if (ev.tab) setTab((t2) => t2 === "live" ? "marketplace" : "live");
   });
-  return /* @__PURE__ */ import_react33.default.createElement(W, { flexDirection: "column" }, /* @__PURE__ */ import_react33.default.createElement(W, { paddingX: 1 }, /* @__PURE__ */ import_react33.default.createElement(L, { bold: true, color: COLOR.brand }, "\u25C8 MCP"), /* @__PURE__ */ import_react33.default.createElement(L, null, "  "), /* @__PURE__ */ import_react33.default.createElement(
+  return /* @__PURE__ */ import_react33.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react33.default.createElement(Box_default, { paddingX: 1 }, /* @__PURE__ */ import_react33.default.createElement(Text, { bold: true, color: COLOR.brand }, "\u25C8 MCP"), /* @__PURE__ */ import_react33.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react33.default.createElement(
     TabPill,
     {
       label: t("handlers.mcp.liveTab"),
       count: liveServers.length,
       active: tab === "live"
     }
-  ), /* @__PURE__ */ import_react33.default.createElement(L, null, "  "), /* @__PURE__ */ import_react33.default.createElement(TabPill, { label: t("handlers.mcp.marketplaceTab"), active: tab === "marketplace" }), /* @__PURE__ */ import_react33.default.createElement(L, { dimColor: true }, `   ${t("handlers.mcp.tabHint")}`)), tab === "live" ? /* @__PURE__ */ import_react33.default.createElement(
+  ), /* @__PURE__ */ import_react33.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react33.default.createElement(TabPill, { label: t("handlers.mcp.marketplaceTab"), active: tab === "marketplace" }), /* @__PURE__ */ import_react33.default.createElement(Text, { dim: true }, `   ${t("handlers.mcp.tabHint")}`)), tab === "live" ? /* @__PURE__ */ import_react33.default.createElement(
     McpBrowser,
     {
       servers: liveServers,
@@ -49831,9 +49833,9 @@ function McpHub({
 function TabPill({ label, count, active: active2 }) {
   const text2 = count !== void 0 ? `${label} (${count})` : label;
   if (active2) {
-    return /* @__PURE__ */ import_react33.default.createElement(L, { bold: true, color: COLOR.brand }, "[", text2, "]");
+    return /* @__PURE__ */ import_react33.default.createElement(Text, { bold: true, color: COLOR.brand }, "[", text2, "]");
   }
-  return /* @__PURE__ */ import_react33.default.createElement(L, { dimColor: true }, ` ${text2} `);
+  return /* @__PURE__ */ import_react33.default.createElement(Text, { dim: true }, ` ${text2} `);
 }
 
 // src/cli/ui/ModelPicker.tsx
@@ -49857,7 +49859,7 @@ function ModelPicker({
   const rows = [...effortRows, ...modelRows];
   const initialIndex = effortRows.length + Math.max(0, modelList.indexOf(current));
   const [focus, setFocus] = (0, import_react34.useState)(initialIndex);
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const termRows = stdout?.rows ?? 40;
   const visibleCount = Math.max(6, termRows - PAGE_MARGIN3);
   useKeystroke((ev) => {
@@ -49885,12 +49887,12 @@ function ModelPicker({
   const loading = models === null;
   const empty = models !== null && models.length === 0;
   let lastSection = null;
-  return /* @__PURE__ */ import_react34.default.createElement(W, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react34.default.createElement(W, null, /* @__PURE__ */ import_react34.default.createElement(L, { bold: true, color: TONE.brand }, t("modelPicker.header")), /* @__PURE__ */ import_react34.default.createElement(L, { color: FG.meta }, loading ? t("modelPicker.loading") : empty ? t("modelPicker.catalogEmpty") : t("modelPicker.modelsAvailable", { count: modelList.length }))), /* @__PURE__ */ import_react34.default.createElement(W, { height: 1 }), hiddenAbove > 0 ? /* @__PURE__ */ import_react34.default.createElement(W, null, /* @__PURE__ */ import_react34.default.createElement(L, { color: FG.faint }, `     \u2026 ${hiddenAbove}`)) : null, shown.map((row2, i) => {
+  return /* @__PURE__ */ import_react34.default.createElement(Box_default, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react34.default.createElement(Box_default, null, /* @__PURE__ */ import_react34.default.createElement(Text, { bold: true, color: TONE.brand }, t("modelPicker.header")), /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.meta }, loading ? t("modelPicker.loading") : empty ? t("modelPicker.catalogEmpty") : t("modelPicker.modelsAvailable", { count: modelList.length }))), /* @__PURE__ */ import_react34.default.createElement(Box_default, { height: 1 }), hiddenAbove > 0 ? /* @__PURE__ */ import_react34.default.createElement(Box_default, null, /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.faint }, `     \u2026 ${hiddenAbove}`)) : null, shown.map((row2, i) => {
     const idx = start + i;
     const focused = idx === focus;
     const showHeader = row2.kind !== lastSection;
     lastSection = row2.kind;
-    const header = showHeader ? /* @__PURE__ */ import_react34.default.createElement(W, { key: `hdr-${row2.kind}`, marginTop: idx === 0 ? 0 : 1 }, /* @__PURE__ */ import_react34.default.createElement(L, { color: FG.meta }, row2.kind === "effort" ? t("modelPicker.effortHeader") : t("modelPicker.modelsHeader"))) : null;
+    const header = showHeader ? /* @__PURE__ */ import_react34.default.createElement(Box_default, { key: `hdr-${row2.kind}`, marginTop: idx === 0 ? 0 : 1 }, /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.meta }, row2.kind === "effort" ? t("modelPicker.effortHeader") : t("modelPicker.modelsHeader"))) : null;
     const body = row2.kind === "effort" ? /* @__PURE__ */ import_react34.default.createElement(
       EffortRow,
       {
@@ -49909,14 +49911,14 @@ function ModelPicker({
       }
     );
     return /* @__PURE__ */ import_react34.default.createElement(import_react34.default.Fragment, { key: `row-${idx}` }, header, body);
-  }), hiddenBelow > 0 ? /* @__PURE__ */ import_react34.default.createElement(W, null, /* @__PURE__ */ import_react34.default.createElement(L, { color: FG.faint }, t("cardLabels.more", { count: hiddenBelow }))) : null, /* @__PURE__ */ import_react34.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react34.default.createElement(L, { color: FG.faint }, t("modelPicker.pickerFooter"))));
+  }), hiddenBelow > 0 ? /* @__PURE__ */ import_react34.default.createElement(Box_default, null, /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.faint }, t("cardLabels.more", { count: hiddenBelow }))) : null, /* @__PURE__ */ import_react34.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.faint }, t("modelPicker.pickerFooter"))));
 }
 function EffortRow({
   effort: effort2,
   focused,
   active: active2
 }) {
-  return /* @__PURE__ */ import_react34.default.createElement(W, null, /* @__PURE__ */ import_react34.default.createElement(L, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react34.default.createElement(L, { bold: focused, color: focused ? FG.strong : FG.sub }, effort2.padEnd(8)), /* @__PURE__ */ import_react34.default.createElement(L, { color: FG.meta }, t(`modelPicker.effortDesc.${effort2}`)), active2 ? /* @__PURE__ */ import_react34.default.createElement(L, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
+  return /* @__PURE__ */ import_react34.default.createElement(Box_default, null, /* @__PURE__ */ import_react34.default.createElement(Text, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react34.default.createElement(Text, { bold: focused, color: focused ? FG.strong : FG.sub }, effort2.padEnd(8)), /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.meta }, t(`modelPicker.effortDesc.${effort2}`)), active2 ? /* @__PURE__ */ import_react34.default.createElement(Text, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
 }
 function ModelRow({
   id,
@@ -49924,7 +49926,7 @@ function ModelRow({
   active: active2
 }) {
   const badge = modelBadgeFor(id);
-  return /* @__PURE__ */ import_react34.default.createElement(W, null, /* @__PURE__ */ import_react34.default.createElement(L, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react34.default.createElement(L, { bold: focused, color: focused ? FG.strong : FG.sub }, id.padEnd(24)), /* @__PURE__ */ import_react34.default.createElement(L, null, " "), /* @__PURE__ */ import_react34.default.createElement(Pill2, { label: badge.label, ...PILL_MODEL[badge.kind], bold: false }), active2 ? /* @__PURE__ */ import_react34.default.createElement(L, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
+  return /* @__PURE__ */ import_react34.default.createElement(Box_default, null, /* @__PURE__ */ import_react34.default.createElement(Text, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react34.default.createElement(Text, { bold: focused, color: focused ? FG.strong : FG.sub }, id.padEnd(24)), /* @__PURE__ */ import_react34.default.createElement(Text, null, " "), /* @__PURE__ */ import_react34.default.createElement(Pill2, { label: badge.label, ...PILL_MODEL[badge.kind], bold: false }), active2 ? /* @__PURE__ */ import_react34.default.createElement(Text, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
 }
 var FALLBACK_MODELS = ["deepseek-v4-flash", "deepseek-v4-pro"];
 
@@ -49972,7 +49974,7 @@ function PathConfirm({ prompt, onChoose }) {
       metaRight: t("pathConfirm.awaiting"),
       footerHint: t("pathConfirm.pickFooter")
     },
-    /* @__PURE__ */ import_react35.default.createElement(W, { marginBottom: 1 }, /* @__PURE__ */ import_react35.default.createElement(L, { color: FG.faint }, prompt.preview ?? "")),
+    /* @__PURE__ */ import_react35.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react35.default.createElement(Text, { color: FG.faint }, prompt.preview ?? "")),
     /* @__PURE__ */ import_react35.default.createElement(InfoRows, { path, sandboxRoot: prompt.meta?.sandboxRoot, allowPrefix }),
     /* @__PURE__ */ import_react35.default.createElement(
       SingleSelect,
@@ -50013,7 +50015,7 @@ function InfoRows({
     rows.push({ label: t("pathConfirm.allowPrefixLabel"), value: allowPrefix });
   }
   const labelWidth = Math.max(...rows.map((r) => r.label.length));
-  return /* @__PURE__ */ import_react35.default.createElement(W, { flexDirection: "column", marginBottom: 1 }, rows.map((r) => /* @__PURE__ */ import_react35.default.createElement(W, { key: r.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react35.default.createElement(L, { color: FG.faint }, r.label.padEnd(labelWidth)), /* @__PURE__ */ import_react35.default.createElement(L, { color: FG.body }, r.value))));
+  return /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, rows.map((r) => /* @__PURE__ */ import_react35.default.createElement(Box_default, { key: r.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react35.default.createElement(Text, { color: FG.faint }, r.label.padEnd(labelWidth)), /* @__PURE__ */ import_react35.default.createElement(Text, { color: FG.body }, r.value))));
 }
 
 // src/cli/ui/PlanCheckpointConfirm.tsx
@@ -50035,7 +50037,7 @@ function CharBar({
   const total = Math.max(4, width);
   const clamped = Math.max(0, Math.min(100, Number.isFinite(pct) ? pct : 0));
   const filled = Math.round(total * clamped / 100);
-  return /* @__PURE__ */ import_react36.default.createElement(W, null, /* @__PURE__ */ import_react36.default.createElement(L, { color }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react36.default.createElement(L, { color: emptyColor ?? COLOR.info, dimColor: true }, GLYPH.shade1.repeat(total - filled)), showLabel ? /* @__PURE__ */ import_react36.default.createElement(L, { dimColor: true }, `  ${label ?? `${Math.round(clamped)}%`}`) : null);
+  return /* @__PURE__ */ import_react36.default.createElement(Box_default, null, /* @__PURE__ */ import_react36.default.createElement(Text, { color }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react36.default.createElement(Text, { color: emptyColor ?? COLOR.info, dim: true }, GLYPH.shade1.repeat(total - filled)), showLabel ? /* @__PURE__ */ import_react36.default.createElement(Text, { dim: true }, `  ${label ?? `${Math.round(clamped)}%`}`) : null);
 }
 
 // src/cli/ui/PlanStepList.tsx
@@ -50065,28 +50067,28 @@ function PlanStepListInner({ steps, statuses, focusStepId }) {
   const doneCount = statusList.filter((s) => s === "done").length;
   const pct = Math.round(doneCount / total * 100);
   const showProgress = doneCount > 0;
-  return /* @__PURE__ */ import_react37.default.createElement(W, { flexDirection: "column" }, /* @__PURE__ */ import_react37.default.createElement(W, null, /* @__PURE__ */ import_react37.default.createElement(L, { dimColor: true }, showProgress ? t(
+  return /* @__PURE__ */ import_react37.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react37.default.createElement(Box_default, null, /* @__PURE__ */ import_react37.default.createElement(Text, { dim: true }, showProgress ? t(
     total === 1 ? "planFlow.stepList.counterDoneSingular" : "planFlow.stepList.counterDone",
     { done: doneCount, total, pct }
   ) : t(total === 1 ? "planFlow.stepList.counterSingular" : "planFlow.stepList.counter", {
     total
-  }))), /* @__PURE__ */ import_react37.default.createElement(W, { flexDirection: "column" }, steps.map((step, i) => {
+  }))), /* @__PURE__ */ import_react37.default.createElement(Box_default, { flexDirection: "column" }, steps.map((step, i) => {
     const status2 = statusList[i];
     const isLast = i === total - 1;
     const isCur = focusStepId === step.id;
     const sg = statusGlyph(status2, isCur);
     const risk = riskLabel(step.risk);
     const titleDim = status2 === "done" || status2 === "skipped";
-    return /* @__PURE__ */ import_react37.default.createElement(W, { key: step.id }, /* @__PURE__ */ import_react37.default.createElement(L, { color: COLOR.info, dimColor: true }, isLast ? GLYPH.branchEnd : GLYPH.branch), /* @__PURE__ */ import_react37.default.createElement(L, null, "  "), /* @__PURE__ */ import_react37.default.createElement(L, { color: sg.color, bold: status2 === "running" || isCur }, sg.glyph), /* @__PURE__ */ import_react37.default.createElement(L, null, "  "), /* @__PURE__ */ import_react37.default.createElement(
-      L,
+    return /* @__PURE__ */ import_react37.default.createElement(Box_default, { key: step.id }, /* @__PURE__ */ import_react37.default.createElement(Text, { color: COLOR.info, dim: true }, isLast ? GLYPH.branchEnd : GLYPH.branch), /* @__PURE__ */ import_react37.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react37.default.createElement(Text, { color: sg.color, bold: status2 === "running" || isCur }, sg.glyph), /* @__PURE__ */ import_react37.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react37.default.createElement(
+      Text,
       {
-        dimColor: titleDim,
+        dim: titleDim,
         bold: isCur || status2 === "running",
         strikethrough: status2 === "done" || status2 === "skipped"
       },
       `${step.id} \xB7 ${step.title}`
-    ), risk ? /* @__PURE__ */ import_react37.default.createElement(import_react37.default.Fragment, null, /* @__PURE__ */ import_react37.default.createElement(L, null, "   "), /* @__PURE__ */ import_react37.default.createElement(L, { color: risk.color }, risk.text)) : null);
-  })), showProgress ? /* @__PURE__ */ import_react37.default.createElement(W, null, /* @__PURE__ */ import_react37.default.createElement(L, null, "      "), /* @__PURE__ */ import_react37.default.createElement(CharBar, { pct, width: 24 })) : null);
+    ), risk ? /* @__PURE__ */ import_react37.default.createElement(import_react37.default.Fragment, null, /* @__PURE__ */ import_react37.default.createElement(Text, null, "   "), /* @__PURE__ */ import_react37.default.createElement(Text, { color: risk.color }, risk.text)) : null);
+  })), showProgress ? /* @__PURE__ */ import_react37.default.createElement(Box_default, null, /* @__PURE__ */ import_react37.default.createElement(Text, null, "      "), /* @__PURE__ */ import_react37.default.createElement(CharBar, { pct, width: 24 })) : null);
 }
 var PlanStepList = import_react37.default.memo(PlanStepListInner);
 
@@ -50105,7 +50107,7 @@ function PlanCheckpointConfirmInner({
   const isLast = total > 0 && completed >= total;
   const statuses = buildStatusMap(steps, completedStepIds, stepId, isLast);
   const subtitle = counter ? `${counter}  \xB7  ${label}` : label;
-  return /* @__PURE__ */ import_react38.default.createElement(ApprovalCard, { tone: "ok", glyph: "\u26C1", title: t("planFlow.checkpoint.title"), metaRight: subtitle }, steps && steps.length > 0 ? /* @__PURE__ */ import_react38.default.createElement(W, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react38.default.createElement(PlanStepList, { steps, statuses, focusStepId: stepId })) : null, /* @__PURE__ */ import_react38.default.createElement(
+  return /* @__PURE__ */ import_react38.default.createElement(ApprovalCard, { tone: "ok", glyph: "\u26C1", title: t("planFlow.checkpoint.title"), metaRight: subtitle }, steps && steps.length > 0 ? /* @__PURE__ */ import_react38.default.createElement(Box_default, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react38.default.createElement(PlanStepList, { steps, statuses, focusStepId: stepId })) : null, /* @__PURE__ */ import_react38.default.createElement(
     SingleSelect,
     {
       initialValue: "continue",
@@ -52544,28 +52546,28 @@ function MarkdownView({ text: text2 }) {
 function MarkdownLines({
   lines
 }) {
-  return /* @__PURE__ */ import_react39.default.createElement(W, { flexDirection: "column" }, lines.map((line, i) => /* @__PURE__ */ import_react39.default.createElement(LineRow, { key: `md-${i}-${line.kind}`, line })));
+  return /* @__PURE__ */ import_react39.default.createElement(Box_default, { flexDirection: "column" }, lines.map((line, i) => /* @__PURE__ */ import_react39.default.createElement(LineRow, { key: `md-${i}-${line.kind}`, line })));
 }
 function LineRow({ line }) {
   switch (line.kind) {
     case "blank":
-      return /* @__PURE__ */ import_react39.default.createElement(L, null, " ");
+      return /* @__PURE__ */ import_react39.default.createElement(Text, null, " ");
     case "hr":
-      return /* @__PURE__ */ import_react39.default.createElement(L, { color: FG_FAINT }, "\u2500\u2500\u2500\u2500\u2500\u2500");
+      return /* @__PURE__ */ import_react39.default.createElement(Text, { color: FG_FAINT }, "\u2500\u2500\u2500\u2500\u2500\u2500");
     case "heading":
-      return /* @__PURE__ */ import_react39.default.createElement(W, null, /* @__PURE__ */ import_react39.default.createElement(L, { bold: true, color: FG_STRONG }, `${"#".repeat(line.level)} `), /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans, bold: true, strongColor: true }));
+      return /* @__PURE__ */ import_react39.default.createElement(Box_default, null, /* @__PURE__ */ import_react39.default.createElement(Text, { bold: true, color: FG_STRONG }, `${"#".repeat(line.level)} `), /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans, bold: true, strongColor: true }));
     case "paragraph":
-      return /* @__PURE__ */ import_react39.default.createElement(W, null, /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans }));
+      return /* @__PURE__ */ import_react39.default.createElement(Box_default, null, /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans }));
     case "list": {
       const indent = " ".repeat(line.depth * 2);
       const marker = line.task === "done" ? "\u2713" : line.task === "todo" ? "\u25CB" : line.ordered ? `${line.index}.` : "\xB7";
       const markerColor = line.task === "done" ? TONE_OK : line.task === "todo" ? FG_FAINT : FG_META;
-      return /* @__PURE__ */ import_react39.default.createElement(W, null, /* @__PURE__ */ import_react39.default.createElement(L, { color: markerColor }, `${indent}${marker} `), /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans, dim: line.task === "done", strike: line.task === "done" }));
+      return /* @__PURE__ */ import_react39.default.createElement(Box_default, null, /* @__PURE__ */ import_react39.default.createElement(Text, { color: markerColor }, `${indent}${marker} `), /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans, dim: line.task === "done", strike: line.task === "done" }));
     }
     case "code":
       return /* @__PURE__ */ import_react39.default.createElement(CodeBlock, { lang: line.lang, text: line.text });
     case "blockquote":
-      return /* @__PURE__ */ import_react39.default.createElement(W, null, /* @__PURE__ */ import_react39.default.createElement(L, { color: TONE_BRAND }, "\u258E "), /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans, italic: true }));
+      return /* @__PURE__ */ import_react39.default.createElement(Box_default, null, /* @__PURE__ */ import_react39.default.createElement(Text, { color: TONE_BRAND }, "\u258E "), /* @__PURE__ */ import_react39.default.createElement(Spans, { spans: line.spans, italic: true }));
   }
 }
 function spanKey(span, i) {
@@ -52573,13 +52575,13 @@ function spanKey(span, i) {
 }
 function CodeBlock({ lang, text: text2 }) {
   const lines = text2.split("\n");
-  return /* @__PURE__ */ import_react39.default.createElement(W, { flexDirection: "column" }, lang.length > 0 ? /* @__PURE__ */ import_react39.default.createElement(L, { color: FG_META }, ` ${lang}`) : null, lines.map((ln, i) => (
+  return /* @__PURE__ */ import_react39.default.createElement(Box_default, { flexDirection: "column" }, lang.length > 0 ? /* @__PURE__ */ import_react39.default.createElement(Text, { color: FG_META }, ` ${lang}`) : null, lines.map((ln, i) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: code lines are positional + stable per render
-    /* @__PURE__ */ import_react39.default.createElement(L, { key: `code-${i}`, backgroundColor: SURFACE_ELEV }, ` ${ln} `)
+    /* @__PURE__ */ import_react39.default.createElement(Text, { key: `code-${i}`, backgroundColor: SURFACE_ELEV }, ` ${ln} `)
   )));
 }
 function Spans({ spans, bold, italic, dim, strike, strongColor }) {
-  if (spans.length === 0) return /* @__PURE__ */ import_react39.default.createElement(L, null, " ");
+  if (spans.length === 0) return /* @__PURE__ */ import_react39.default.createElement(Text, null, " ");
   return /* @__PURE__ */ import_react39.default.createElement(import_react39.default.Fragment, null, spans.map((span, i) => /* @__PURE__ */ import_react39.default.createElement(
     SpanText,
     {
@@ -52602,16 +52604,16 @@ function SpanText({
   strongColor
 }) {
   if (span.code) {
-    return /* @__PURE__ */ import_react39.default.createElement(L, { color: FG_STRONG, backgroundColor: SURFACE_ELEV }, ` ${span.text} `);
+    return /* @__PURE__ */ import_react39.default.createElement(Text, { color: FG_STRONG, backgroundColor: SURFACE_ELEV }, ` ${span.text} `);
   }
   const color = span.fileRef ? TONE_BRAND : span.link ? TONE_BRAND : strongColor ? FG_STRONG : FG_BODY;
   const inner = /* @__PURE__ */ import_react39.default.createElement(
-    L,
+    Text,
     {
       color,
       bold: !!(span.bold || ambientBold),
       italic: !!(span.italic || ambientItalic),
-      dimColor: !!ambientDim,
+      dim: !!ambientDim,
       strikethrough: !!(span.strike || ambientStrike),
       underline: !!(span.link || span.fileRef)
     },
@@ -52619,7 +52621,7 @@ function SpanText({
   );
   const target = linkTarget(span);
   if (!target) return inner;
-  return /* @__PURE__ */ import_react39.default.createElement(wv, { transform: (text2) => `\x1B]8;;${target}\x1B\\${text2}\x1B]8;;\x1B\\` }, inner);
+  return /* @__PURE__ */ import_react39.default.createElement(Link, { url: target }, inner);
 }
 function linkTarget(span) {
   if (span.link) return span.link;
@@ -52665,7 +52667,7 @@ var MIN_DETAIL_LINES = 6;
 var EXPANDED_MODAL_OVERHEAD_ROWS = 12;
 var EXPANDED_DETAIL_CHROME_ROWS = 4;
 function PlanConfirmInner({ plan: plan2, steps, summary, onChoose }) {
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const totalRows = stdout?.rows ?? 40;
   const [expanded, setExpanded] = (0, import_react40.useState)(false);
   const [detailOffset, setDetailOffset] = (0, import_react40.useState)(0);
@@ -52734,8 +52736,8 @@ function PlanConfirmInner({ plan: plan2, steps, summary, onChoose }) {
       metaRight: t("planFlow.approveCardMetaRight"),
       metaRightColor: CARD.plan.color
     },
-    openQuestions ? /* @__PURE__ */ import_react40.default.createElement(W, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react40.default.createElement(L, { color: TONE.warn }, bannerBefore ?? "", /* @__PURE__ */ import_react40.default.createElement(L, { bold: true }, refineLabel), bannerAfter ?? ""), /* @__PURE__ */ import_react40.default.createElement(W, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ import_react40.default.createElement(L, { color: TONE.warn, bold: true }, t("planFlow.openQuestionsHeader")), /* @__PURE__ */ import_react40.default.createElement(MarkdownView, { text: openQuestions }))) : null,
-    !expanded || plan2.trim().length === 0 ? /* @__PURE__ */ import_react40.default.createElement(W, { marginBottom: 1, flexDirection: "column" }, effectiveSummary ? /* @__PURE__ */ import_react40.default.createElement(L, { color: FG.body }, effectiveSummary) : /* @__PURE__ */ import_react40.default.createElement(L, { color: FG.faint }, t("planFlow.noPlanSummary")), !expanded && hasSteps ? /* @__PURE__ */ import_react40.default.createElement(W, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ import_react40.default.createElement(PlanStepList, { steps })) : null, /* @__PURE__ */ import_react40.default.createElement(L, { color: FG.faint }, expanded ? t("planFlow.detailExpandedHint") : t("planFlow.detailCollapsedHint"))) : null,
+    openQuestions ? /* @__PURE__ */ import_react40.default.createElement(Box_default, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react40.default.createElement(Text, { color: TONE.warn }, bannerBefore ?? "", /* @__PURE__ */ import_react40.default.createElement(Text, { bold: true }, refineLabel), bannerAfter ?? ""), /* @__PURE__ */ import_react40.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ import_react40.default.createElement(Text, { color: TONE.warn, bold: true }, t("planFlow.openQuestionsHeader")), /* @__PURE__ */ import_react40.default.createElement(MarkdownView, { text: openQuestions }))) : null,
+    !expanded || plan2.trim().length === 0 ? /* @__PURE__ */ import_react40.default.createElement(Box_default, { marginBottom: 1, flexDirection: "column" }, effectiveSummary ? /* @__PURE__ */ import_react40.default.createElement(Text, { color: FG.body }, effectiveSummary) : /* @__PURE__ */ import_react40.default.createElement(Text, { color: FG.faint }, t("planFlow.noPlanSummary")), !expanded && hasSteps ? /* @__PURE__ */ import_react40.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ import_react40.default.createElement(PlanStepList, { steps })) : null, /* @__PURE__ */ import_react40.default.createElement(Text, { color: FG.faint }, expanded ? t("planFlow.detailExpandedHint") : t("planFlow.detailCollapsedHint"))) : null,
     expanded && plan2.trim().length > 0 ? /* @__PURE__ */ import_react40.default.createElement(
       PlanDetailWindow,
       {
@@ -52746,7 +52748,7 @@ function PlanConfirmInner({ plan: plan2, steps, summary, onChoose }) {
         total: planLines.length
       }
     ) : null,
-    showDetailScrollHint ? /* @__PURE__ */ import_react40.default.createElement(W, { marginBottom: 1 }, /* @__PURE__ */ import_react40.default.createElement(L, { color: FG.faint }, t("planFlow.detailScrollHint"))) : null,
+    showDetailScrollHint ? /* @__PURE__ */ import_react40.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react40.default.createElement(Text, { color: FG.faint }, t("planFlow.detailScrollHint"))) : null,
     /* @__PURE__ */ import_react40.default.createElement(
       SingleSelect,
       {
@@ -52788,7 +52790,7 @@ function PlanDetailWindow({
   end,
   total
 }) {
-  return /* @__PURE__ */ import_react40.default.createElement(W, { flexDirection: "column" }, overflow ? /* @__PURE__ */ import_react40.default.createElement(L, { color: FG.faint }, t("planFlow.detailWindow", { start, end, total })) : null, lines.map((line, i) => /* @__PURE__ */ import_react40.default.createElement(L, { key: `plan-detail-${start + i}`, wrap: "truncate" }, line.length > 0 ? line : " ")));
+  return /* @__PURE__ */ import_react40.default.createElement(Box_default, { flexDirection: "column" }, overflow ? /* @__PURE__ */ import_react40.default.createElement(Text, { color: FG.faint }, t("planFlow.detailWindow", { start, end, total })) : null, lines.map((line, i) => /* @__PURE__ */ import_react40.default.createElement(Text, { key: `plan-detail-${start + i}`, wrap: "truncate" }, line.length > 0 ? line : " ")));
 }
 function summarizePlan(plan2, summary, steps) {
   const trimmedSummary = summary?.trim();
@@ -52855,9 +52857,9 @@ function PlanRefineInput({ mode: mode2, questions, onSubmit, onCancel }) {
       title: meta.title,
       footerHint: t("planFlow.refineFooter")
     },
-    showQuestions ? /* @__PURE__ */ import_react41.default.createElement(W, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react41.default.createElement(L, { color: TONE.warn, bold: true }, t("planFlow.refineQuestionsHeading")), /* @__PURE__ */ import_react41.default.createElement(MarkdownView, { text: questions })) : null,
-    /* @__PURE__ */ import_react41.default.createElement(W, { marginBottom: 1 }, /* @__PURE__ */ import_react41.default.createElement(L, { color: FG.sub }, meta.hint, value === "" ? meta.blankHint : "")),
-    /* @__PURE__ */ import_react41.default.createElement(W, null, /* @__PURE__ */ import_react41.default.createElement(L, { color: meta.cursorColor, bold: true }, "\u203A "), /* @__PURE__ */ import_react41.default.createElement(L, null, value), /* @__PURE__ */ import_react41.default.createElement(L, { color: meta.cursorColor, bold: true }, cursorOn ? "\u258D" : " "))
+    showQuestions ? /* @__PURE__ */ import_react41.default.createElement(Box_default, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react41.default.createElement(Text, { color: TONE.warn, bold: true }, t("planFlow.refineQuestionsHeading")), /* @__PURE__ */ import_react41.default.createElement(MarkdownView, { text: questions })) : null,
+    /* @__PURE__ */ import_react41.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react41.default.createElement(Text, { color: FG.sub }, meta.hint, value === "" ? meta.blankHint : "")),
+    /* @__PURE__ */ import_react41.default.createElement(Box_default, null, /* @__PURE__ */ import_react41.default.createElement(Text, { color: meta.cursorColor, bold: true }, "\u203A "), /* @__PURE__ */ import_react41.default.createElement(Text, null, value), /* @__PURE__ */ import_react41.default.createElement(Text, { color: meta.cursorColor, bold: true }, cursorOn ? "\u258D" : " "))
   );
 }
 
@@ -52910,15 +52912,15 @@ function PlanReviseConfirmInner({
         kept: keptCount
       })
     },
-    /* @__PURE__ */ import_react42.default.createElement(W, { marginBottom: 1 }, /* @__PURE__ */ import_react42.default.createElement(L, null, reason)),
-    summary ? /* @__PURE__ */ import_react42.default.createElement(W, { marginBottom: 1 }, /* @__PURE__ */ import_react42.default.createElement(L, { dimColor: true }, t("planReviseConfirm.updatedSummary", { summary }))) : null,
-    /* @__PURE__ */ import_react42.default.createElement(W, { marginBottom: 1, flexDirection: "column" }, rows.map((row2) => {
+    /* @__PURE__ */ import_react42.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react42.default.createElement(Text, null, reason)),
+    summary ? /* @__PURE__ */ import_react42.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react42.default.createElement(Text, { dim: true }, t("planReviseConfirm.updatedSummary", { summary }))) : null,
+    /* @__PURE__ */ import_react42.default.createElement(Box_default, { marginBottom: 1, flexDirection: "column" }, rows.map((row2) => {
       const risk = riskDots(row2.step.risk);
       const prefix = row2.kind === "removed" ? "\u2212" : row2.kind === "added" ? "+" : " ";
       const prefixColor = row2.kind === "removed" ? "#f87171" : row2.kind === "added" ? "#4ade80" : "#94a3b8";
       const dim = row2.kind === "kept";
       const strike = row2.kind === "removed";
-      return /* @__PURE__ */ import_react42.default.createElement(W, { key: `${row2.kind}-${row2.step.id}` }, /* @__PURE__ */ import_react42.default.createElement(L, { color: prefixColor, bold: true }, `${prefix} `), /* @__PURE__ */ import_react42.default.createElement(L, { color: risk.color, bold: true, dimColor: dim }, risk.dots), /* @__PURE__ */ import_react42.default.createElement(L, { dimColor: dim, strikethrough: strike }, ` ${row2.step.id} \xB7 ${row2.step.title}`));
+      return /* @__PURE__ */ import_react42.default.createElement(Box_default, { key: `${row2.kind}-${row2.step.id}` }, /* @__PURE__ */ import_react42.default.createElement(Text, { color: prefixColor, bold: true }, `${prefix} `), /* @__PURE__ */ import_react42.default.createElement(Text, { color: risk.color, bold: true, dim }, risk.dots), /* @__PURE__ */ import_react42.default.createElement(Text, { dim, strikethrough: strike }, ` ${row2.step.id} \xB7 ${row2.step.title}`));
     })),
     /* @__PURE__ */ import_react42.default.createElement(
       SingleSelect,
@@ -53037,8 +53039,8 @@ function ReviseRow({
   const marker = row2.done ? "[\u2713]" : row2.skipped ? "[s]" : focused ? "[ ]" : "[ ]";
   const markerColor = row2.done ? TONE.ok : row2.skipped ? FG.faint : focused ? TONE.brand : FG.faint;
   const titleColor = row2.done ? FG.sub : row2.skipped ? FG.faint : focused ? FG.strong : FG.sub;
-  const focusGlyph = focused ? /* @__PURE__ */ import_react43.default.createElement(L, { color: TONE.brand }, "\u25B8 ") : /* @__PURE__ */ import_react43.default.createElement(L, null, "  ");
-  return /* @__PURE__ */ import_react43.default.createElement(W, null, focusGlyph, /* @__PURE__ */ import_react43.default.createElement(L, { color: markerColor }, marker), /* @__PURE__ */ import_react43.default.createElement(L, { color: titleColor, bold: focused, italic: row2.skipped, strikethrough: row2.skipped }, ` ${index + 1}. ${row2.step.title}`), row2.skipped ? /* @__PURE__ */ import_react43.default.createElement(L, { color: TONE.warn }, "     \u2190 skipped") : null);
+  const focusGlyph = focused ? /* @__PURE__ */ import_react43.default.createElement(Text, { color: TONE.brand }, "\u25B8 ") : /* @__PURE__ */ import_react43.default.createElement(Text, null, "  ");
+  return /* @__PURE__ */ import_react43.default.createElement(Box_default, null, focusGlyph, /* @__PURE__ */ import_react43.default.createElement(Text, { color: markerColor }, marker), /* @__PURE__ */ import_react43.default.createElement(Text, { color: titleColor, bold: focused, italic: row2.skipped, strikethrough: row2.skipped }, ` ${index + 1}. ${row2.step.title}`), row2.skipped ? /* @__PURE__ */ import_react43.default.createElement(Text, { color: TONE.warn }, "     \u2190 skipped") : null);
 }
 
 // src/cli/ui/SessionPicker.tsx
@@ -53074,7 +53076,7 @@ function SessionPicker({
     onFocusChange?.(focus);
   }, [focus, onFocusChange]);
   const [renaming, setRenaming] = (0, import_react44.useState)(null);
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const rows = stdout?.rows ?? 40;
   const visibleCount = Math.max(3, rows - PAGE_MARGIN4);
   const snapshot = (0, import_react44.useMemo)(
@@ -53205,13 +53207,13 @@ function SessionPicker({
   const end = Math.min(activeSessions.length, start + visibleCount);
   const shown = activeSessions.slice(start, end);
   const hiddenBelow = activeSessions.length - end;
-  return /* @__PURE__ */ import_react44.default.createElement(W, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react44.default.createElement(W, null, /* @__PURE__ */ import_react44.default.createElement(L, { bold: true, color: TONE.brand }, t("sessionPicker.header")), /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.meta }, `  \xB7  ${workspace}`), hasSearch ? /* @__PURE__ */ import_react44.default.createElement(
-    L,
+  return /* @__PURE__ */ import_react44.default.createElement(Box_default, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react44.default.createElement(Box_default, null, /* @__PURE__ */ import_react44.default.createElement(Text, { bold: true, color: TONE.brand }, t("sessionPicker.header")), /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.meta }, `  \xB7  ${workspace}`), hasSearch ? /* @__PURE__ */ import_react44.default.createElement(
+    Text,
     {
       color: FG.meta
     },
     `  \xB7  /${query} (${activeSessions.length}/${sessions2.length})`
-  ) : null), /* @__PURE__ */ import_react44.default.createElement(W, { height: 1 }), sessions2.length === 0 ? /* @__PURE__ */ import_react44.default.createElement(W, null, /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, t("sessionPicker.empty")), /* @__PURE__ */ import_react44.default.createElement(L, { bold: true, color: TONE.brand }, "\u23CE"), /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, t("sessionPicker.emptyNew"))) : activeSessions.length === 0 ? /* @__PURE__ */ import_react44.default.createElement(W, null, /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, t("sessionPicker.searchEmpty"))) : shown.map((s, i) => /* @__PURE__ */ import_react44.default.createElement(
+  ) : null), /* @__PURE__ */ import_react44.default.createElement(Box_default, { height: 1 }), sessions2.length === 0 ? /* @__PURE__ */ import_react44.default.createElement(Box_default, null, /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t("sessionPicker.empty")), /* @__PURE__ */ import_react44.default.createElement(Text, { bold: true, color: TONE.brand }, "\u23CE"), /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t("sessionPicker.emptyNew"))) : activeSessions.length === 0 ? /* @__PURE__ */ import_react44.default.createElement(Box_default, null, /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t("sessionPicker.searchEmpty"))) : shown.map((s, i) => /* @__PURE__ */ import_react44.default.createElement(
     SessionRow,
     {
       key: s.name,
@@ -53219,7 +53221,7 @@ function SessionPicker({
       focused: start + i === focus,
       walletCurrency
     }
-  )), hiddenBelow > 0 ? /* @__PURE__ */ import_react44.default.createElement(W, null, /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, t("cardLabels.more", { count: hiddenBelow }))) : null, renaming ? /* @__PURE__ */ import_react44.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, t("sessionPicker.renamePrompt", { from: renaming.from })), /* @__PURE__ */ import_react44.default.createElement(L, { bold: true, color: TONE.brand }, renaming.buf), /* @__PURE__ */ import_react44.default.createElement(L, { backgroundColor: TONE.brand, color: "black" }, " ")) : null, searching ? /* @__PURE__ */ import_react44.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, t("sessionPicker.searchPrompt")), /* @__PURE__ */ import_react44.default.createElement(L, { bold: true, color: TONE.brand }, query), /* @__PURE__ */ import_react44.default.createElement(L, { backgroundColor: TONE.brand, color: "black" }, " ")) : null, /* @__PURE__ */ import_react44.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, renaming ? t("sessionPicker.renameHint") : searching ? t("sessionPicker.searchHint") : sessions2.length === 0 ? t("sessionPicker.emptyHint") : t("sessionPicker.pickerHint"))));
+  )), hiddenBelow > 0 ? /* @__PURE__ */ import_react44.default.createElement(Box_default, null, /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t("cardLabels.more", { count: hiddenBelow }))) : null, renaming ? /* @__PURE__ */ import_react44.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t("sessionPicker.renamePrompt", { from: renaming.from })), /* @__PURE__ */ import_react44.default.createElement(Text, { bold: true, color: TONE.brand }, renaming.buf), /* @__PURE__ */ import_react44.default.createElement(Text, { backgroundColor: TONE.brand, color: "ansi:black" }, " ")) : null, searching ? /* @__PURE__ */ import_react44.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t("sessionPicker.searchPrompt")), /* @__PURE__ */ import_react44.default.createElement(Text, { bold: true, color: TONE.brand }, query), /* @__PURE__ */ import_react44.default.createElement(Text, { backgroundColor: TONE.brand, color: "ansi:black" }, " ")) : null, /* @__PURE__ */ import_react44.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, renaming ? t("sessionPicker.renameHint") : searching ? t("sessionPicker.searchHint") : sessions2.length === 0 ? t("sessionPicker.emptyHint") : t("sessionPicker.pickerHint"))));
 }
 function SessionRow({
   info,
@@ -53233,7 +53235,7 @@ function SessionRow({
   const currency = walletCurrency ?? info.meta.balanceCurrency;
   const costLabel = info.meta.totalCostUsd !== void 0 ? formatCost(info.meta.totalCostUsd, currency, 2) : "";
   const time = relativeTime2(info.mtime);
-  return /* @__PURE__ */ import_react44.default.createElement(W, null, /* @__PURE__ */ import_react44.default.createElement(L, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react44.default.createElement(L, { bold: focused, color: focused ? FG.strong : FG.sub }, info.name.padEnd(12)), /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.meta }, ` \xB7 ${branch.padEnd(8)} \xB7 `), /* @__PURE__ */ import_react44.default.createElement(L, { color: focused ? FG.body : FG.sub }, truncate2(summary, 40)), /* @__PURE__ */ import_react44.default.createElement(W, { flexGrow: 1 }), /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, `${time.padStart(11)}   `), /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, t("sessionPicker.turns", { count: turns })), costLabel ? /* @__PURE__ */ import_react44.default.createElement(L, { color: FG.faint }, ` \xB7 ${costLabel}`) : null);
+  return /* @__PURE__ */ import_react44.default.createElement(Box_default, null, /* @__PURE__ */ import_react44.default.createElement(Text, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react44.default.createElement(Text, { bold: focused, color: focused ? FG.strong : FG.sub }, info.name.padEnd(12)), /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.meta }, ` \xB7 ${branch.padEnd(8)} \xB7 `), /* @__PURE__ */ import_react44.default.createElement(Text, { color: focused ? FG.body : FG.sub }, truncate2(summary, 40)), /* @__PURE__ */ import_react44.default.createElement(Box_default, { flexGrow: 1 }), /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, `${time.padStart(11)}   `), /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t("sessionPicker.turns", { count: turns })), costLabel ? /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, ` \xB7 ${costLabel}`) : null);
 }
 function truncate2(s, max) {
   if (s.length <= max) return s;
@@ -53296,7 +53298,7 @@ function ShellConfirm({ prompt, onChoose }) {
       metaRight: t("shellConfirm.awaiting"),
       footerHint: t("shellConfirm.pickFooter")
     },
-    /* @__PURE__ */ import_react45.default.createElement(W, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react45.default.createElement(W, null, /* @__PURE__ */ import_react45.default.createElement(L, { bold: true, color: FG.strong }, "$ "), /* @__PURE__ */ import_react45.default.createElement(L, { bold: true, color: FG.strong }, prompt.subtitle ?? ""))),
+    /* @__PURE__ */ import_react45.default.createElement(Box_default, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react45.default.createElement(Box_default, null, /* @__PURE__ */ import_react45.default.createElement(Text, { bold: true, color: FG.strong }, "$ "), /* @__PURE__ */ import_react45.default.createElement(Text, { bold: true, color: FG.strong }, prompt.subtitle ?? ""))),
     /* @__PURE__ */ import_react45.default.createElement(InfoRows2, { meta: prompt.meta }),
     /* @__PURE__ */ import_react45.default.createElement(
       SingleSelect,
@@ -53334,7 +53336,7 @@ function InfoRows2({ meta }) {
     value
   }));
   const labelWidth = Math.max(...rows.map((r) => r.label.length));
-  return /* @__PURE__ */ import_react45.default.createElement(W, { flexDirection: "column", marginBottom: 1 }, rows.map((r) => /* @__PURE__ */ import_react45.default.createElement(W, { key: r.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react45.default.createElement(L, { color: FG.faint }, r.label.padEnd(labelWidth)), /* @__PURE__ */ import_react45.default.createElement(L, { color: FG.body }, r.value))));
+  return /* @__PURE__ */ import_react45.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, rows.map((r) => /* @__PURE__ */ import_react45.default.createElement(Box_default, { key: r.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react45.default.createElement(Text, { color: FG.faint }, r.label.padEnd(labelWidth)), /* @__PURE__ */ import_react45.default.createElement(Text, { color: FG.body }, r.value))));
 }
 
 // src/cli/ui/ThemePicker.tsx
@@ -53350,7 +53352,7 @@ function ThemePicker({
     label: value,
     hint: describeTheme(value, currentPreference, activeTheme)
   }));
-  return /* @__PURE__ */ import_react46.default.createElement(W, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react46.default.createElement(L, { bold: true }, t("themePicker.header")), /* @__PURE__ */ import_react46.default.createElement(
+  return /* @__PURE__ */ import_react46.default.createElement(Box_default, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react46.default.createElement(Text, { bold: true }, t("themePicker.header")), /* @__PURE__ */ import_react46.default.createElement(
     SingleSelect,
     {
       items,
@@ -53380,8 +53382,8 @@ function WelcomeBanner({
   const tagline = inCodeMode ? t("ui.taglineCode") : t("ui.taglineChat");
   const taglineSub = t("ui.taglineSub");
   const startTextRaw = t("ui.startSessionHint");
-  return /* @__PURE__ */ import_react47.default.createElement(W, { flexDirection: "column", alignItems: "center", marginY: 1 }, /* @__PURE__ */ import_react47.default.createElement(
-    W,
+  return /* @__PURE__ */ import_react47.default.createElement(Box_default, { flexDirection: "column", alignItems: "center", marginY: 1 }, /* @__PURE__ */ import_react47.default.createElement(
+    Box_default,
     {
       flexDirection: "column",
       alignItems: "center",
@@ -53390,9 +53392,9 @@ function WelcomeBanner({
       paddingX: 4,
       paddingY: 1
     },
-    /* @__PURE__ */ import_react47.default.createElement(W, { flexDirection: "row", gap: 2 }, /* @__PURE__ */ import_react47.default.createElement(L, { color: TONE.brand, bold: true }, "REASONIX"), /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.faint }, "\xD7"), /* @__PURE__ */ import_react47.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react47.default.createElement(L, null, "\u{1F40B}"), /* @__PURE__ */ import_react47.default.createElement(L, { color: TONE.accent, bold: true }, "DeepSeek"))),
-    /* @__PURE__ */ import_react47.default.createElement(W, { marginTop: 1, flexDirection: "column", alignItems: "center" }, /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.body }, tagline), /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.meta }, taglineSub))
-  ), /* @__PURE__ */ import_react47.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.sub }, startTextRaw)), /* @__PURE__ */ import_react47.default.createElement(W, { marginTop: 1, flexDirection: "row", gap: 3 }, HINTS.map((cmd) => /* @__PURE__ */ import_react47.default.createElement(L, { key: cmd, color: FG.meta }, cmd))), inCodeMode && workspaceRoot ? /* @__PURE__ */ import_react47.default.createElement(W, { marginTop: 1, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react47.default.createElement(L, { color: TONE.brand }, t("welcomeBanner.workspace")), /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.body }, workspaceRoot), /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.faint }, t("welcomeBanner.relaunchHint"))) : null, dashboardUrl ? /* @__PURE__ */ import_react47.default.createElement(W, { marginTop: 1, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react47.default.createElement(L, { color: TONE.brand, bold: true }, t("welcomeBanner.dashboard")), /* @__PURE__ */ import_react47.default.createElement(L, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react47.default.createElement(L, { color: TONE.accent }, dashboardUrl)) : null);
+    /* @__PURE__ */ import_react47.default.createElement(Box_default, { flexDirection: "row", gap: 2 }, /* @__PURE__ */ import_react47.default.createElement(Text, { color: TONE.brand, bold: true }, "REASONIX"), /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.faint }, "\xD7"), /* @__PURE__ */ import_react47.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react47.default.createElement(Text, null, "\u{1F40B}"), /* @__PURE__ */ import_react47.default.createElement(Text, { color: TONE.accent, bold: true }, "DeepSeek"))),
+    /* @__PURE__ */ import_react47.default.createElement(Box_default, { marginTop: 1, flexDirection: "column", alignItems: "center" }, /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.body }, tagline), /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.meta }, taglineSub))
+  ), /* @__PURE__ */ import_react47.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.sub }, startTextRaw)), /* @__PURE__ */ import_react47.default.createElement(Box_default, { marginTop: 1, flexDirection: "row", gap: 3 }, HINTS.map((cmd) => /* @__PURE__ */ import_react47.default.createElement(Text, { key: cmd, color: FG.meta }, cmd))), inCodeMode && workspaceRoot ? /* @__PURE__ */ import_react47.default.createElement(Box_default, { marginTop: 1, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react47.default.createElement(Text, { color: TONE.brand }, t("welcomeBanner.workspace")), /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.body }, workspaceRoot), /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.faint }, t("welcomeBanner.relaunchHint"))) : null, dashboardUrl ? /* @__PURE__ */ import_react47.default.createElement(Box_default, { marginTop: 1, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react47.default.createElement(Text, { color: TONE.brand, bold: true }, t("welcomeBanner.dashboard")), /* @__PURE__ */ import_react47.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react47.default.createElement(Text, { color: TONE.accent }, dashboardUrl)) : null);
 }
 
 // src/cli/ui/WorkspacePicker.tsx
@@ -53417,7 +53419,7 @@ function WorkspacePicker({
   (0, import_react48.useEffect)(() => {
     setFocus((f) => Math.max(0, Math.min(f, maxFocus)));
   }, [maxFocus]);
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const rows = stdout?.rows ?? 40;
   const visibleCount = Math.max(3, rows - PAGE_MARGIN5);
   useKeystroke((ev) => {
@@ -53474,13 +53476,13 @@ function WorkspacePicker({
   const end = Math.min(activeWorkspaces.length, start + visibleCount);
   const shown = activeWorkspaces.slice(start, end);
   const hiddenBelow = activeWorkspaces.length - end;
-  return /* @__PURE__ */ import_react48.default.createElement(W, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react48.default.createElement(W, null, /* @__PURE__ */ import_react48.default.createElement(L, { bold: true, color: TONE.brand }, t("workspacePicker.header")), /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.meta }, `  \xB7  ${currentWorkspace}`), hasSearch ? /* @__PURE__ */ import_react48.default.createElement(
-    L,
+  return /* @__PURE__ */ import_react48.default.createElement(Box_default, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react48.default.createElement(Box_default, null, /* @__PURE__ */ import_react48.default.createElement(Text, { bold: true, color: TONE.brand }, t("workspacePicker.header")), /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.meta }, `  \xB7  ${currentWorkspace}`), hasSearch ? /* @__PURE__ */ import_react48.default.createElement(
+    Text,
     {
       color: FG.meta
     },
     `  \xB7  /${query} (${activeWorkspaces.length}/${workspaces.length})`
-  ) : null), /* @__PURE__ */ import_react48.default.createElement(W, { height: 1 }), workspaces.length === 0 ? /* @__PURE__ */ import_react48.default.createElement(W, null, /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.faint }, t("workspacePicker.empty"))) : activeWorkspaces.length === 0 ? /* @__PURE__ */ import_react48.default.createElement(W, null, /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.faint }, t("workspacePicker.searchEmpty"))) : shown.map((w, i) => /* @__PURE__ */ import_react48.default.createElement(WorkspaceRow, { key: w.path, info: w, focused: start + i === focus })), hiddenBelow > 0 ? /* @__PURE__ */ import_react48.default.createElement(W, null, /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.faint }, t("cardLabels.more", { count: hiddenBelow }))) : null, searching ? /* @__PURE__ */ import_react48.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.faint }, t("workspacePicker.searchPrompt")), /* @__PURE__ */ import_react48.default.createElement(L, { bold: true, color: TONE.brand }, query), /* @__PURE__ */ import_react48.default.createElement(L, { backgroundColor: TONE.brand, color: "black" }, " ")) : null, /* @__PURE__ */ import_react48.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.faint }, searching ? t("workspacePicker.searchHint") : t("workspacePicker.pickerHint"))));
+  ) : null), /* @__PURE__ */ import_react48.default.createElement(Box_default, { height: 1 }), workspaces.length === 0 ? /* @__PURE__ */ import_react48.default.createElement(Box_default, null, /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.faint }, t("workspacePicker.empty"))) : activeWorkspaces.length === 0 ? /* @__PURE__ */ import_react48.default.createElement(Box_default, null, /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.faint }, t("workspacePicker.searchEmpty"))) : shown.map((w, i) => /* @__PURE__ */ import_react48.default.createElement(WorkspaceRow, { key: w.path, info: w, focused: start + i === focus })), hiddenBelow > 0 ? /* @__PURE__ */ import_react48.default.createElement(Box_default, null, /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.faint }, t("cardLabels.more", { count: hiddenBelow }))) : null, searching ? /* @__PURE__ */ import_react48.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.faint }, t("workspacePicker.searchPrompt")), /* @__PURE__ */ import_react48.default.createElement(Text, { bold: true, color: TONE.brand }, query), /* @__PURE__ */ import_react48.default.createElement(Text, { backgroundColor: TONE.brand, color: "ansi:black" }, " ")) : null, /* @__PURE__ */ import_react48.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.faint }, searching ? t("workspacePicker.searchHint") : t("workspacePicker.pickerHint"))));
 }
 function WorkspaceRow({
   info,
@@ -53493,7 +53495,7 @@ function WorkspaceRow({
       count: info.sessions
     }
   );
-  return /* @__PURE__ */ import_react48.default.createElement(W, null, /* @__PURE__ */ import_react48.default.createElement(L, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react48.default.createElement(L, { bold: focused, color: focused ? FG.strong : FG.sub }, label.padEnd(16)), /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.meta }, info.current ? ` \xB7 ${t("workspacePicker.current")} \xB7 ` : " \xB7 "), /* @__PURE__ */ import_react48.default.createElement(L, { color: focused ? FG.body : FG.sub }, info.path), /* @__PURE__ */ import_react48.default.createElement(W, { flexGrow: 1 }), /* @__PURE__ */ import_react48.default.createElement(L, { color: FG.faint }, meta));
+  return /* @__PURE__ */ import_react48.default.createElement(Box_default, null, /* @__PURE__ */ import_react48.default.createElement(Text, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react48.default.createElement(Text, { bold: focused, color: focused ? FG.strong : FG.sub }, label.padEnd(16)), /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.meta }, info.current ? ` \xB7 ${t("workspacePicker.current")} \xB7 ` : " \xB7 "), /* @__PURE__ */ import_react48.default.createElement(Text, { color: focused ? FG.body : FG.sub }, info.path), /* @__PURE__ */ import_react48.default.createElement(Box_default, { flexGrow: 1 }), /* @__PURE__ */ import_react48.default.createElement(Text, { color: FG.faint }, meta));
 }
 function oneLine2(s) {
   return s.replace(/\s+/g, " ").trim();
@@ -54637,7 +54639,7 @@ function CompactionCard({ card }) {
       title: "compacted history",
       meta: [`${card.summary.length.toLocaleString()} chars \xB7 ${lines.length} lines`]
     }
-  ), previewLines.map((line, i) => /* @__PURE__ */ import_react61.default.createElement(L, { key: `${card.id}:p:${i}`, color: FG.sub }, line || " ")), hiddenCount > 0 ? /* @__PURE__ */ import_react61.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react61.default.createElement(L, { color: FG.sub, dimColor: true }, "\u2026 ", hiddenCount, " more line", hiddenCount === 1 ? "" : "s", " (full summary in session log)")) : null);
+  ), previewLines.map((line, i) => /* @__PURE__ */ import_react61.default.createElement(Text, { key: `${card.id}:p:${i}`, color: FG.sub }, line || " ")), hiddenCount > 0 ? /* @__PURE__ */ import_react61.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react61.default.createElement(Text, { color: FG.sub, dim: true }, "\u2026 ", hiddenCount, " more line", hiddenCount === 1 ? "" : "s", " (full summary in session log)")) : null);
 }
 
 // src/cli/ui/cards/CtxCard.tsx
@@ -54645,7 +54647,7 @@ var import_react62 = __toESM(require_react(), 1);
 var BAR_CELLS = 32;
 function row(label, tokens, ratio, color) {
   const filled = Math.max(0, Math.min(BAR_CELLS, Math.round(ratio * BAR_CELLS)));
-  return /* @__PURE__ */ import_react62.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react62.default.createElement(L, { color: FG.sub }, label.padEnd(7)), /* @__PURE__ */ import_react62.default.createElement(L, { color }, "\u2588".repeat(filled)), /* @__PURE__ */ import_react62.default.createElement(L, { color: FG.faint }, "\u2591".repeat(BAR_CELLS - filled)), /* @__PURE__ */ import_react62.default.createElement(L, { bold: true, color: FG.body }, tokens.toLocaleString()), /* @__PURE__ */ import_react62.default.createElement(L, { color: FG.faint }, `\xB7 ${(ratio * 100).toFixed(1)}%`));
+  return /* @__PURE__ */ import_react62.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react62.default.createElement(Text, { color: FG.sub }, label.padEnd(7)), /* @__PURE__ */ import_react62.default.createElement(Text, { color }, "\u2588".repeat(filled)), /* @__PURE__ */ import_react62.default.createElement(Text, { color: FG.faint }, "\u2591".repeat(BAR_CELLS - filled)), /* @__PURE__ */ import_react62.default.createElement(Text, { bold: true, color: FG.body }, tokens.toLocaleString()), /* @__PURE__ */ import_react62.default.createElement(Text, { color: FG.faint }, `\xB7 ${(ratio * 100).toFixed(1)}%`));
 }
 function CtxCard({ card }) {
   const cap = Math.max(1, card.ctxMax);
@@ -54659,8 +54661,8 @@ function CtxCard({ card }) {
       title: t("cardTitles.context"),
       meta: [`${used.toLocaleString()} / ${cap.toLocaleString()} (${usedPct.toFixed(1)}%)`]
     }
-  ), row(t("cardLabels.system"), card.systemTokens, card.systemTokens / cap, TONE.brand), row(t("cardLabels.tools"), card.toolsTokens, card.toolsTokens / cap, TONE.warn), row(t("cardLabels.log"), card.logTokens, card.logTokens / cap, TONE.ok), row(t("cardLabels.input"), card.inputTokens, card.inputTokens / cap, TONE.accent), card.topTools.length > 0 ? /* @__PURE__ */ import_react62.default.createElement(import_react62.default.Fragment, null, /* @__PURE__ */ import_react62.default.createElement(L, { color: FG.faint }, `${t("cardLabels.topTools")} \xB7 ${card.toolsCount} ${t("cardLabels.tools")} \xB7 ${card.logMessages} ${t("cardLabels.logMsgs")}`), card.topTools.slice(0, 5).map((tool) => /* @__PURE__ */ import_react62.default.createElement(W, { key: `${tool.turn}-${tool.name}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react62.default.createElement(L, { color: FG.sub }, tool.name), /* @__PURE__ */ import_react62.default.createElement(
-    L,
+  ), row(t("cardLabels.system"), card.systemTokens, card.systemTokens / cap, TONE.brand), row(t("cardLabels.tools"), card.toolsTokens, card.toolsTokens / cap, TONE.warn), row(t("cardLabels.log"), card.logTokens, card.logTokens / cap, TONE.ok), row(t("cardLabels.input"), card.inputTokens, card.inputTokens / cap, TONE.accent), card.topTools.length > 0 ? /* @__PURE__ */ import_react62.default.createElement(import_react62.default.Fragment, null, /* @__PURE__ */ import_react62.default.createElement(Text, { color: FG.faint }, `${t("cardLabels.topTools")} \xB7 ${card.toolsCount} ${t("cardLabels.tools")} \xB7 ${card.logMessages} ${t("cardLabels.logMsgs")}`), card.topTools.slice(0, 5).map((tool) => /* @__PURE__ */ import_react62.default.createElement(Box_default, { key: `${tool.turn}-${tool.name}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react62.default.createElement(Text, { color: FG.sub }, tool.name), /* @__PURE__ */ import_react62.default.createElement(
+    Text,
     {
       color: FG.faint
     },
@@ -54695,7 +54697,7 @@ function DiffCard({ card }) {
         { text: `-${card.stats.del}`, color: TONE.err }
       ]
     }
-  ), card.hunks.map((hunk) => /* @__PURE__ */ import_react63.default.createElement(W, { key: `${card.id}:${hunk.header}`, flexDirection: "column" }, /* @__PURE__ */ import_react63.default.createElement(L, { italic: true, color: FG.faint }, hunk.header), hunk.lines.map((line, li) => /* @__PURE__ */ import_react63.default.createElement(W, { key: `${card.id}:${hunk.header}:${li}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react63.default.createElement(L, { color: LINE_COLOR[line.kind] }, LINE_GLYPH[line.kind]), /* @__PURE__ */ import_react63.default.createElement(L, { color: LINE_COLOR[line.kind], dimColor: line.kind === "ctx" }, line.text))))), showFooter && /* @__PURE__ */ import_react63.default.createElement(W, { flexDirection: "row", gap: 2 }, /* @__PURE__ */ import_react63.default.createElement(L, { bold: true, color: TONE.ok }, t("cardLabels.applyAction")), /* @__PURE__ */ import_react63.default.createElement(L, { color: FG.sub }, t("cardLabels.skipAction")), /* @__PURE__ */ import_react63.default.createElement(L, { bold: true, color: TONE.err }, t("cardLabels.rejectAction"))));
+  ), card.hunks.map((hunk) => /* @__PURE__ */ import_react63.default.createElement(Box_default, { key: `${card.id}:${hunk.header}`, flexDirection: "column" }, /* @__PURE__ */ import_react63.default.createElement(Text, { italic: true, color: FG.faint }, hunk.header), hunk.lines.map((line, li) => /* @__PURE__ */ import_react63.default.createElement(Box_default, { key: `${card.id}:${hunk.header}:${li}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react63.default.createElement(Text, { color: LINE_COLOR[line.kind] }, LINE_GLYPH[line.kind]), /* @__PURE__ */ import_react63.default.createElement(Text, { color: LINE_COLOR[line.kind], dim: line.kind === "ctx" }, line.text))))), showFooter && /* @__PURE__ */ import_react63.default.createElement(Box_default, { flexDirection: "row", gap: 2 }, /* @__PURE__ */ import_react63.default.createElement(Text, { bold: true, color: TONE.ok }, t("cardLabels.applyAction")), /* @__PURE__ */ import_react63.default.createElement(Text, { color: FG.sub }, t("cardLabels.skipAction")), /* @__PURE__ */ import_react63.default.createElement(Text, { bold: true, color: TONE.err }, t("cardLabels.rejectAction"))));
 }
 
 // src/cli/ui/cards/DoctorCard.tsx
@@ -54735,7 +54737,7 @@ function DoctorCard({ card }) {
       title: t("cardTitles.doctor"),
       meta: [summary]
     }
-  ), card.checks.map((c) => /* @__PURE__ */ import_react64.default.createElement(W, { key: c.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react64.default.createElement(L, { color: levelColor[c.level] }, LEVEL_GLYPH[c.level]), /* @__PURE__ */ import_react64.default.createElement(L, { bold: true, color: fg.body }, c.label.padEnd(labelWidth + 1)), /* @__PURE__ */ import_react64.default.createElement(L, { color: fg.sub }, c.detail), /* @__PURE__ */ import_react64.default.createElement(L, { color: levelColor[c.level] }, levelTag(c.level)))));
+  ), card.checks.map((c) => /* @__PURE__ */ import_react64.default.createElement(Box_default, { key: c.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react64.default.createElement(Text, { color: levelColor[c.level] }, LEVEL_GLYPH[c.level]), /* @__PURE__ */ import_react64.default.createElement(Text, { bold: true, color: fg.body }, c.label.padEnd(labelWidth + 1)), /* @__PURE__ */ import_react64.default.createElement(Text, { color: fg.sub }, c.detail), /* @__PURE__ */ import_react64.default.createElement(Text, { color: levelColor[c.level] }, levelTag(c.level)))));
 }
 
 // src/cli/ui/cards/ErrorCard.tsx
@@ -54757,10 +54759,10 @@ function ErrorCard({ card }) {
       title: card.title || t("cardTitles.error"),
       meta: retryNote ? [retryNote] : void 0
     }
-  ), messageLines.map((line, i) => /* @__PURE__ */ import_react65.default.createElement(L, { key: `${card.id}:msg:${i}`, color: TONE.err }, line || " ")), hasStack ? /* @__PURE__ */ import_react65.default.createElement(W, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ import_react65.default.createElement(L, { color: FG.meta }, t("cardLabels.stackTrace")), stackHidden > 0 ? /* @__PURE__ */ import_react65.default.createElement(L, { color: FG.faint }, t(
+  ), messageLines.map((line, i) => /* @__PURE__ */ import_react65.default.createElement(Text, { key: `${card.id}:msg:${i}`, color: TONE.err }, line || " ")), hasStack ? /* @__PURE__ */ import_react65.default.createElement(Box_default, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ import_react65.default.createElement(Text, { color: FG.meta }, t("cardLabels.stackTrace")), stackHidden > 0 ? /* @__PURE__ */ import_react65.default.createElement(Text, { color: FG.faint }, t(
     stackHidden === 1 ? "cardLabels.earlierStackLine" : "cardLabels.earlierStackLines",
     { count: stackHidden }
-  )) : null, stackVisible.map((line, i) => /* @__PURE__ */ import_react65.default.createElement(L, { key: `${card.id}:stk:${stackHidden + i}`, color: FG.meta }, line || " "))) : null);
+  )) : null, stackVisible.map((line, i) => /* @__PURE__ */ import_react65.default.createElement(Text, { key: `${card.id}:stk:${stackHidden + i}`, color: FG.meta }, line || " "))) : null);
 }
 
 // src/cli/ui/cards/LiveCard.tsx
@@ -54791,7 +54793,7 @@ function LiveCard({ card }) {
   const isPulsing = PULSING_VARIANTS.has(card.variant);
   const frames = card.variant === "thinking" ? PULSE_DIAMOND : PULSE_CIRCLE;
   const settled = VARIANT_GLYPH[card.variant];
-  return /* @__PURE__ */ import_react66.default.createElement(W, { paddingLeft: 2, flexDirection: "row", gap: 1 }, isPulsing ? /* @__PURE__ */ import_react66.default.createElement(Pulse, { active: true, frames, settled, color }) : /* @__PURE__ */ import_react66.default.createElement(L, { bold: true, color }, VARIANT_GLYPH[card.variant]), /* @__PURE__ */ import_react66.default.createElement(L, { color: FG.body }, card.text), card.meta !== void 0 ? /* @__PURE__ */ import_react66.default.createElement(L, { color: FG.faint }, `\xB7 ${card.meta}`) : null);
+  return /* @__PURE__ */ import_react66.default.createElement(Box_default, { paddingLeft: 2, flexDirection: "row", gap: 1 }, isPulsing ? /* @__PURE__ */ import_react66.default.createElement(Pulse, { active: true, frames, settled, color }) : /* @__PURE__ */ import_react66.default.createElement(Text, { bold: true, color }, VARIANT_GLYPH[card.variant]), /* @__PURE__ */ import_react66.default.createElement(Text, { color: FG.body }, card.text), card.meta !== void 0 ? /* @__PURE__ */ import_react66.default.createElement(Text, { color: FG.faint }, `\xB7 ${card.meta}`) : null);
 }
 
 // src/cli/ui/cards/MemoryCard.tsx
@@ -54842,7 +54844,7 @@ function MemoryCard({ card }) {
     const all = card.entries.filter((e) => e.category === category);
     const shown = all.slice(0, 5);
     const remaining = all.length - shown.length;
-    return /* @__PURE__ */ import_react67.default.createElement(W, { key: category, flexDirection: "column" }, /* @__PURE__ */ import_react67.default.createElement(L, { color: FG.faint }, `${categoryLabel(category)} (${counts[category]})`), shown.map((entry) => /* @__PURE__ */ import_react67.default.createElement(W, { key: `${category}:${entry.summary}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react67.default.createElement(L, { color: CATEGORY_GLYPH_COLOR[category] }, CATEGORY_GLYPH[category]), /* @__PURE__ */ import_react67.default.createElement(L, { color: FG.sub }, entry.summary))), remaining > 0 ? /* @__PURE__ */ import_react67.default.createElement(L, { color: FG.faint }, t("cardLabels.more", { count: remaining })) : null);
+    return /* @__PURE__ */ import_react67.default.createElement(Box_default, { key: category, flexDirection: "column" }, /* @__PURE__ */ import_react67.default.createElement(Text, { color: FG.faint }, `${categoryLabel(category)} (${counts[category]})`), shown.map((entry) => /* @__PURE__ */ import_react67.default.createElement(Box_default, { key: `${category}:${entry.summary}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react67.default.createElement(Text, { color: CATEGORY_GLYPH_COLOR[category] }, CATEGORY_GLYPH[category]), /* @__PURE__ */ import_react67.default.createElement(Text, { color: FG.sub }, entry.summary))), remaining > 0 ? /* @__PURE__ */ import_react67.default.createElement(Text, { color: FG.faint }, t("cardLabels.more", { count: remaining })) : null);
   }));
 }
 function countByCategory(entries) {
@@ -54862,7 +54864,7 @@ var import_react71 = __toESM(require_react(), 1);
 // src/cli/ui/primitives/CursorBlock.tsx
 var import_react68 = __toESM(require_react(), 1);
 function CursorBlock() {
-  return /* @__PURE__ */ import_react68.default.createElement(L, { inverse: true, color: CARD.streaming.color }, " ");
+  return /* @__PURE__ */ import_react68.default.createElement(Text, { inverse: true, color: CARD.streaming.color }, " ");
 }
 
 // src/cli/ui/state/verbose-context.ts
@@ -54941,7 +54943,7 @@ function ReasoningCard({
   card,
   expanded
 }) {
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const lineCells = Math.max(20, cols - 4);
   const verbose = import_react71.default.useContext(VerboseContext);
@@ -54967,7 +54969,7 @@ function ReasoningHeader({
   const metaTrail2 = metaParts.length > 0 ? ` \xB7 ${metaParts.join(" \xB7 ")}` : "";
   const collapsedHint = !expanded && card.text.length > 0 ? "  (\u2303o to expand)" : "";
   const modelBadge = card.model ? modelBadgeFor(card.model) : null;
-  return /* @__PURE__ */ import_react71.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react71.default.createElement(
+  return /* @__PURE__ */ import_react71.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react71.default.createElement(
     Pulse,
     {
       active: streamingActive,
@@ -54975,7 +54977,7 @@ function ReasoningHeader({
       settled: "\u25C6",
       color: card.aborted ? TONE.err : FG.faint
     }
-  ), /* @__PURE__ */ import_react71.default.createElement(L, { italic: true, dimColor: true, color: card.aborted ? TONE.err : void 0 }, `${baseTitle}${metaTrail2}${collapsedHint}`), modelBadge ? /* @__PURE__ */ import_react71.default.createElement(Pill2, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null);
+  ), /* @__PURE__ */ import_react71.default.createElement(Text, { italic: true, dim: true, color: card.aborted ? TONE.err : void 0 }, `${baseTitle}${metaTrail2}${collapsedHint}`), modelBadge ? /* @__PURE__ */ import_react71.default.createElement(Pill2, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null);
 }
 function headerMeta(card) {
   if (card.streaming) {
@@ -54994,7 +54996,7 @@ function headerDuration(card) {
 function StreamingPreview({ card, visualLines, lineCells }) {
   const visible = visualLines.slice(-STREAMING_PREVIEW_LINES);
   const hasOverflow = visualLines.length > visible.length;
-  return /* @__PURE__ */ import_react71.default.createElement(import_react71.default.Fragment, null, hasOverflow ? /* @__PURE__ */ import_react71.default.createElement(L, { color: FG.faint }, "\u22EE") : null, /* @__PURE__ */ import_react71.default.createElement(
+  return /* @__PURE__ */ import_react71.default.createElement(import_react71.default.Fragment, null, hasOverflow ? /* @__PURE__ */ import_react71.default.createElement(Text, { color: FG.faint }, "\u22EE") : null, /* @__PURE__ */ import_react71.default.createElement(
     BodyLines,
     {
       card,
@@ -55029,7 +55031,7 @@ function SettledPreview({ card, visualLines, lineCells }) {
   ));
 }
 function EmptyHint() {
-  return /* @__PURE__ */ import_react71.default.createElement(L, { italic: true, color: FG.faint }, "no thinking \u2014 direct answer");
+  return /* @__PURE__ */ import_react71.default.createElement(Text, { italic: true, color: FG.faint }, "no thinking \u2014 direct answer");
 }
 function BodyLines({
   card,
@@ -55044,17 +55046,17 @@ function BodyLines({
   return /* @__PURE__ */ import_react71.default.createElement(import_react71.default.Fragment, null, lines.map((line, i) => {
     const isLast = i === lines.length - 1;
     const isFirst = i === 0;
-    return /* @__PURE__ */ import_react71.default.createElement(W, { key: `${card.id}:b:${indexOffset + i}`, flexDirection: "row", gap: 1 }, anchor ? /* @__PURE__ */ import_react71.default.createElement(L, { color: tone }, isFirst ? "\u21B3" : " ") : null, /* @__PURE__ */ import_react71.default.createElement(L, { italic: true, color: FG.meta }, clipToCells(line, innerCells)), isLast && cursorOnLast && /* @__PURE__ */ import_react71.default.createElement(CursorBlock, null));
+    return /* @__PURE__ */ import_react71.default.createElement(Box_default, { key: `${card.id}:b:${indexOffset + i}`, flexDirection: "row", gap: 1 }, anchor ? /* @__PURE__ */ import_react71.default.createElement(Text, { color: tone }, isFirst ? "\u21B3" : " ") : null, /* @__PURE__ */ import_react71.default.createElement(Text, { italic: true, color: FG.meta }, clipToCells(line, innerCells)), isLast && cursorOnLast && /* @__PURE__ */ import_react71.default.createElement(CursorBlock, null));
   }));
 }
 function MidElisionHint({ droppedLines }) {
-  return /* @__PURE__ */ import_react71.default.createElement(L, { color: FG.faint }, `\u22EF ${droppedLines} line${droppedLines === 1 ? "" : "s"} elided`);
+  return /* @__PURE__ */ import_react71.default.createElement(Text, { color: FG.faint }, `\u22EF ${droppedLines} line${droppedLines === 1 ? "" : "s"} elided`);
 }
 function ScrollPastHint({ card }) {
   const parts = [];
   if (card.paragraphs > 0) parts.push(`${card.paragraphs} \xB6`);
   if (card.tokens > 0) parts.push(`~${card.tokens.toLocaleString()} tok`);
-  return /* @__PURE__ */ import_react71.default.createElement(L, { color: FG.faint }, `\u22EF ${parts.join(" + ")} scrolled past \xB7 /reasoning last`);
+  return /* @__PURE__ */ import_react71.default.createElement(Text, { color: FG.faint }, `\u22EF ${parts.join(" + ")} scrolled past \xB7 /reasoning last`);
 }
 
 // src/cli/ui/cards/SearchCard.tsx
@@ -55076,7 +55078,7 @@ function SearchCard({ card }) {
       subtitle: `"${card.query}"`,
       meta: [stats3, elapsed]
     }
-  ), grouped.map(([file, hits]) => /* @__PURE__ */ import_react72.default.createElement(W, { key: file, flexDirection: "column" }, /* @__PURE__ */ import_react72.default.createElement(L, { bold: true, color: FG.strong }, file), hits.map((h, i) => /* @__PURE__ */ import_react72.default.createElement(W, { key: `${file}:${h.line}:${i}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react72.default.createElement(L, { color: FG.faint }, `${h.line.toString().padStart(4)} \u2502`), /* @__PURE__ */ import_react72.default.createElement(HighlightedLine, { text: h.preview, start: h.matchStart, end: h.matchEnd }))))), card.hits.length > 10 ? /* @__PURE__ */ import_react72.default.createElement(L, { color: FG.faint }, t(
+  ), grouped.map(([file, hits]) => /* @__PURE__ */ import_react72.default.createElement(Box_default, { key: file, flexDirection: "column" }, /* @__PURE__ */ import_react72.default.createElement(Text, { bold: true, color: FG.strong }, file), hits.map((h, i) => /* @__PURE__ */ import_react72.default.createElement(Box_default, { key: `${file}:${h.line}:${i}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react72.default.createElement(Text, { color: FG.faint }, `${h.line.toString().padStart(4)} \u2502`), /* @__PURE__ */ import_react72.default.createElement(HighlightedLine, { text: h.preview, start: h.matchStart, end: h.matchEnd }))))), card.hits.length > 10 ? /* @__PURE__ */ import_react72.default.createElement(Text, { color: FG.faint }, t(
     card.hits.length - 10 === 1 ? "cardLabels.moreHitSingular" : "cardLabels.moreHitsPlural",
     { count: card.hits.length - 10 }
   )) : null);
@@ -55087,9 +55089,9 @@ function HighlightedLine({
   end
 }) {
   if (start < 0 || end <= start || end > text2.length) {
-    return /* @__PURE__ */ import_react72.default.createElement(L, { color: FG.sub }, text2);
+    return /* @__PURE__ */ import_react72.default.createElement(Text, { color: FG.sub }, text2);
   }
-  return /* @__PURE__ */ import_react72.default.createElement(import_react72.default.Fragment, null, /* @__PURE__ */ import_react72.default.createElement(L, { color: FG.sub }, text2.slice(0, start)), /* @__PURE__ */ import_react72.default.createElement(L, { bold: true, inverse: true }, text2.slice(start, end)), /* @__PURE__ */ import_react72.default.createElement(L, { color: FG.sub }, text2.slice(end)));
+  return /* @__PURE__ */ import_react72.default.createElement(import_react72.default.Fragment, null, /* @__PURE__ */ import_react72.default.createElement(Text, { color: FG.sub }, text2.slice(0, start)), /* @__PURE__ */ import_react72.default.createElement(Text, { bold: true, inverse: true }, text2.slice(start, end)), /* @__PURE__ */ import_react72.default.createElement(Text, { color: FG.sub }, text2.slice(end)));
 }
 function groupByFile(hits) {
   const map = /* @__PURE__ */ new Map();
@@ -55116,13 +55118,13 @@ var MarkdownWidthCtx = import_react74.default.createContext(void 0);
 function useWidth() {
   const ctx = import_react74.default.useContext(MarkdownWidthCtx);
   if (ctx !== void 0) return ctx;
-  return (bv()?.stdout?.columns ?? process.stdout.columns ?? 80) - BODY_LEFT_CELLS;
+  return (useStdout()?.stdout?.columns ?? process.stdout.columns ?? 80) - BODY_LEFT_CELLS;
 }
 marked.setOptions({ gfm: true, breaks: false });
 function Markdown({ text: text2, width }) {
   const tokens = import_react74.default.useMemo(() => marked.lexer(text2), [text2]);
   const ctxWidth = width !== void 0 ? Math.max(1, width) : void 0;
-  return /* @__PURE__ */ import_react74.default.createElement(MarkdownWidthCtx.Provider, { value: ctxWidth }, /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column", gap: 1 }, tokens.map((token, i) => /* @__PURE__ */ import_react74.default.createElement(BlockToken, { key: `${i}-${token.type}`, token }))));
+  return /* @__PURE__ */ import_react74.default.createElement(MarkdownWidthCtx.Provider, { value: ctxWidth }, /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column", gap: 1 }, tokens.map((token, i) => /* @__PURE__ */ import_react74.default.createElement(BlockToken, { key: `${i}-${token.type}`, token }))));
 }
 function BlockToken({ token }) {
   switch (token.type) {
@@ -55141,21 +55143,21 @@ function BlockToken({ token }) {
     case "table":
       return /* @__PURE__ */ import_react74.default.createElement(Table, { token });
     case "html":
-      return /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.body }, token.text);
+      return /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.body }, token.text);
     case "space":
       return null;
     default:
-      return /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.body }, token.raw ?? "");
+      return /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.body }, token.raw ?? "");
   }
 }
 function Heading({ token }) {
-  return /* @__PURE__ */ import_react74.default.createElement(W, null, /* @__PURE__ */ import_react74.default.createElement(L, { bold: true, color: FG.strong, backgroundColor: SURFACE.bgElev }, ` ${plainText(token.tokens)} `));
+  return /* @__PURE__ */ import_react74.default.createElement(Box_default, null, /* @__PURE__ */ import_react74.default.createElement(Text, { bold: true, color: FG.strong, backgroundColor: SURFACE.bgElev }, ` ${plainText(token.tokens)} `));
 }
 function Paragraph({ token }) {
-  return /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.body }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens ?? [] }));
+  return /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.body }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens ?? [] }));
 }
 function List({ token, depth }) {
-  return /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column" }, token.items.map((item, i) => /* @__PURE__ */ import_react74.default.createElement(
+  return /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column" }, token.items.map((item, i) => /* @__PURE__ */ import_react74.default.createElement(
     ListItem,
     {
       key: `${i}-${item.text.slice(0, 24)}`,
@@ -55176,12 +55178,12 @@ function ListItem({
   const markerColor = item.task ? item.checked ? TONE.ok : FG.faint : FG.meta;
   const dim = item.task && item.checked === true;
   const indent = " ".repeat(depth + 1);
-  return /* @__PURE__ */ import_react74.default.createElement(W, null, /* @__PURE__ */ import_react74.default.createElement(L, { color: markerColor }, `${indent}${marker} `), /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column" }, item.tokens.map((tok, i) => {
+  return /* @__PURE__ */ import_react74.default.createElement(Box_default, null, /* @__PURE__ */ import_react74.default.createElement(Text, { color: markerColor }, `${indent}${marker} `), /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column" }, item.tokens.map((tok, i) => {
     if (tok.type === "text") {
       const inner = tok.tokens;
       return (
         // biome-ignore lint/suspicious/noArrayIndexKey: list-item children are positional and stable per render
-        /* @__PURE__ */ import_react74.default.createElement(L, { key: `t-${i}`, color: dim ? FG.faint : FG.body, strikethrough: dim }, inner ? /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: inner }) : tok.text)
+        /* @__PURE__ */ import_react74.default.createElement(Text, { key: `t-${i}`, color: dim ? FG.faint : FG.body, strikethrough: dim }, inner ? /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: inner }) : tok.text)
       );
     }
     if (tok.type === "list") {
@@ -55196,9 +55198,9 @@ function CodeBlock2({ token }) {
     () => highlightCode(decodeHtmlEntities(token.text), lang).split("\n"),
     [token.text, lang]
   );
-  return /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column" }, lang ? /* @__PURE__ */ import_react74.default.createElement(W, null, /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.meta }, ` ${lang}`)) : null, /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column" }, lines.map((line, i) => (
+  return /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column" }, lang ? /* @__PURE__ */ import_react74.default.createElement(Box_default, null, /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.meta }, ` ${lang}`)) : null, /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column" }, lines.map((line, i) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: code lines are positional and stable per render
-    /* @__PURE__ */ import_react74.default.createElement(L, { key: `code-${i}`, backgroundColor: SURFACE.bgElev }, ` ${line} `)
+    /* @__PURE__ */ import_react74.default.createElement(Text, { key: `code-${i}`, backgroundColor: SURFACE.bgElev }, ` ${line} `)
   ))));
 }
 function highlightCode(source, lang) {
@@ -55211,12 +55213,12 @@ function highlightCode(source, lang) {
   }
 }
 function Blockquote({ token }) {
-  return /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column" }, (token.tokens ?? []).map((child, i) => /* @__PURE__ */ import_react74.default.createElement(W, { key: `${i}-${child.type}`, flexDirection: "row" }, /* @__PURE__ */ import_react74.default.createElement(L, { color: TONE.brand }, " \u258E "), /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column", flexGrow: 1 }, child.type === "paragraph" ? /* @__PURE__ */ import_react74.default.createElement(L, { italic: true, color: FG.sub }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: child.tokens ?? [] })) : /* @__PURE__ */ import_react74.default.createElement(BlockToken, { token: child })))));
+  return /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column" }, (token.tokens ?? []).map((child, i) => /* @__PURE__ */ import_react74.default.createElement(Box_default, { key: `${i}-${child.type}`, flexDirection: "row" }, /* @__PURE__ */ import_react74.default.createElement(Text, { color: TONE.brand }, " \u258E "), /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column", flexGrow: 1 }, child.type === "paragraph" ? /* @__PURE__ */ import_react74.default.createElement(Text, { italic: true, color: FG.sub }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: child.tokens ?? [] })) : /* @__PURE__ */ import_react74.default.createElement(BlockToken, { token: child })))));
 }
 function HorizontalRule() {
   const width = useWidth();
   const rule = "\u2500".repeat(Math.max(width, 1));
-  return /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.faint }, ` ${rule}`);
+  return /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.faint }, ` ${rule}`);
 }
 function tableLayout(headerCells, bodyCells, availableWidth) {
   const colCount = headerCells.length;
@@ -55272,14 +55274,14 @@ function ColumnarTable({
   gap
 }) {
   const ruleRow = widths.map((w) => "\u2500".repeat(w)).join(gap);
-  return /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column" }, /* @__PURE__ */ import_react74.default.createElement(W, null, /* @__PURE__ */ import_react74.default.createElement(L, null, " "), headerCells.map((cell, i) => (
+  return /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react74.default.createElement(Box_default, null, /* @__PURE__ */ import_react74.default.createElement(Text, null, " "), headerCells.map((cell, i) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: header cells positional
-    /* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, { key: `h-${i}` }, /* @__PURE__ */ import_react74.default.createElement(L, { bold: true, color: FG.sub }, padToCells(cell, widths[i])), i < colCount - 1 ? /* @__PURE__ */ import_react74.default.createElement(L, null, gap) : null)
-  ))), /* @__PURE__ */ import_react74.default.createElement(W, null, /* @__PURE__ */ import_react74.default.createElement(L, null, " "), /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.faint }, ruleRow)), bodyCells.map((row2, ri) => (
+    /* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, { key: `h-${i}` }, /* @__PURE__ */ import_react74.default.createElement(Text, { bold: true, color: FG.sub }, padToCells(cell, widths[i])), i < colCount - 1 ? /* @__PURE__ */ import_react74.default.createElement(Text, null, gap) : null)
+  ))), /* @__PURE__ */ import_react74.default.createElement(Box_default, null, /* @__PURE__ */ import_react74.default.createElement(Text, null, " "), /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.faint }, ruleRow)), bodyCells.map((row2, ri) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: body rows positional
-    /* @__PURE__ */ import_react74.default.createElement(W, { key: `tr-${ri}` }, /* @__PURE__ */ import_react74.default.createElement(L, null, " "), row2.map((cell, i) => (
+    /* @__PURE__ */ import_react74.default.createElement(Box_default, { key: `tr-${ri}` }, /* @__PURE__ */ import_react74.default.createElement(Text, null, " "), row2.map((cell, i) => (
       // biome-ignore lint/suspicious/noArrayIndexKey: cells positional
-      /* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, { key: `c-${ri}-${i}` }, /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.body }, padToCells(cell ?? "", widths[i])), i < colCount - 1 ? /* @__PURE__ */ import_react74.default.createElement(L, null, gap) : null)
+      /* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, { key: `c-${ri}-${i}` }, /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.body }, padToCells(cell ?? "", widths[i])), i < colCount - 1 ? /* @__PURE__ */ import_react74.default.createElement(Text, null, gap) : null)
     )))
   )));
 }
@@ -55289,14 +55291,14 @@ function FallbackTable({
   labelPad,
   valueCells
 }) {
-  return /* @__PURE__ */ import_react74.default.createElement(W, { flexDirection: "column" }, bodyCells.map((row2, ri) => (
+  return /* @__PURE__ */ import_react74.default.createElement(Box_default, { flexDirection: "column" }, bodyCells.map((row2, ri) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: body rows positional
-    /* @__PURE__ */ import_react74.default.createElement(W, { key: `fr-${ri}`, flexDirection: "column" }, ri > 0 ? /* @__PURE__ */ import_react74.default.createElement(L, null, " ") : null, headerCells.map((h, ci) => {
+    /* @__PURE__ */ import_react74.default.createElement(Box_default, { key: `fr-${ri}`, flexDirection: "column" }, ri > 0 ? /* @__PURE__ */ import_react74.default.createElement(Text, null, " ") : null, headerCells.map((h, ci) => {
       const label = `${padToCells(h, labelPad - 2)}: `;
       const lines = wrapToCells(row2[ci] ?? "", valueCells);
       return lines.map((line, li) => (
         // biome-ignore lint/suspicious/noArrayIndexKey: fallback table lines are positional
-        /* @__PURE__ */ import_react74.default.createElement(W, { key: `fc-${ri}-${ci}-${li}` }, li === 0 ? /* @__PURE__ */ import_react74.default.createElement(L, { bold: true, color: FG.sub }, label) : /* @__PURE__ */ import_react74.default.createElement(L, null, padToCells("", labelPad)), /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.body }, line))
+        /* @__PURE__ */ import_react74.default.createElement(Box_default, { key: `fc-${ri}-${ci}-${li}` }, li === 0 ? /* @__PURE__ */ import_react74.default.createElement(Text, { bold: true, color: FG.sub }, label) : /* @__PURE__ */ import_react74.default.createElement(Text, null, padToCells("", labelPad)), /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.body }, line))
       ));
     }))
   )));
@@ -55313,10 +55315,10 @@ function looksLikeFileRef(path, hasLine) {
   return ext.length >= 2;
 }
 function osc8(children, target, color) {
-  return /* @__PURE__ */ import_react74.default.createElement(wv, { transform: (text2) => `\x1B]8;;${target}\x1B\\${text2}\x1B]8;;\x1B\\` }, /* @__PURE__ */ import_react74.default.createElement(L, { color, underline: true }, children));
+  return /* @__PURE__ */ import_react74.default.createElement(Link, { url: target }, /* @__PURE__ */ import_react74.default.createElement(Text, { color, underline: true }, children));
 }
 function renderInlineText(raw) {
-  if (!raw) return /* @__PURE__ */ import_react74.default.createElement(L, null, raw);
+  if (!raw) return /* @__PURE__ */ import_react74.default.createElement(Text, null, raw);
   const out = [];
   let cursor = 0;
   const hits = [];
@@ -55327,7 +55329,7 @@ function renderInlineText(raw) {
     hits.push({
       start,
       end,
-      node: /* @__PURE__ */ import_react74.default.createElement(L, { color: TONE.warn, underline: true }, `@${path}`)
+      node: /* @__PURE__ */ import_react74.default.createElement(Text, { color: TONE.warn, underline: true }, `@${path}`)
     });
   }
   for (const m of raw.matchAll(FILE_REF_RE2)) {
@@ -55344,12 +55346,12 @@ function renderInlineText(raw) {
   let key = 0;
   for (const h of hits) {
     if (h.start > cursor) {
-      out.push(/* @__PURE__ */ import_react74.default.createElement(L, { key: `t-${key++}` }, raw.slice(cursor, h.start)));
+      out.push(/* @__PURE__ */ import_react74.default.createElement(Text, { key: `t-${key++}` }, raw.slice(cursor, h.start)));
     }
     out.push(/* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, { key: `r-${key++}` }, h.node));
     cursor = h.end;
   }
-  if (cursor < raw.length) out.push(/* @__PURE__ */ import_react74.default.createElement(L, { key: `t-${key++}` }, raw.slice(cursor)));
+  if (cursor < raw.length) out.push(/* @__PURE__ */ import_react74.default.createElement(Text, { key: `t-${key++}` }, raw.slice(cursor)));
   return /* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, null, out);
 }
 function InlineToken({ token }) {
@@ -55359,29 +55361,29 @@ function InlineToken({ token }) {
       return t2.tokens ? /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: t2.tokens }) : renderInlineText(t2.text);
     }
     case "strong":
-      return /* @__PURE__ */ import_react74.default.createElement(L, { bold: true, color: FG.strong }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens }));
+      return /* @__PURE__ */ import_react74.default.createElement(Text, { bold: true, color: FG.strong }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens }));
     case "em":
-      return /* @__PURE__ */ import_react74.default.createElement(L, { italic: true }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens }));
+      return /* @__PURE__ */ import_react74.default.createElement(Text, { italic: true }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens }));
     case "codespan":
-      return /* @__PURE__ */ import_react74.default.createElement(L, { color: FG.strong, backgroundColor: SURFACE.bgElev }, ` ${decodeHtmlEntities(token.text)} `);
+      return /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.strong, backgroundColor: SURFACE.bgElev }, ` ${decodeHtmlEntities(token.text)} `);
     case "del":
-      return /* @__PURE__ */ import_react74.default.createElement(L, { color: TONE.err, strikethrough: true }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens }));
+      return /* @__PURE__ */ import_react74.default.createElement(Text, { color: TONE.err, strikethrough: true }, /* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: token.tokens }));
     case "link": {
       const l = token;
       return osc8(/* @__PURE__ */ import_react74.default.createElement(Inline, { tokens: l.tokens }), l.href, TONE.brand);
     }
     case "image": {
       const im = token;
-      return /* @__PURE__ */ import_react74.default.createElement(L, { color: TONE.brand }, `[image: ${im.text || im.href}]`);
+      return /* @__PURE__ */ import_react74.default.createElement(Text, { color: TONE.brand }, `[image: ${im.text || im.href}]`);
     }
     case "br":
-      return /* @__PURE__ */ import_react74.default.createElement(L, null, "\n");
+      return /* @__PURE__ */ import_react74.default.createElement(Text, null, "\n");
     case "escape":
-      return /* @__PURE__ */ import_react74.default.createElement(L, null, token.text);
+      return /* @__PURE__ */ import_react74.default.createElement(Text, null, token.text);
     case "html":
-      return /* @__PURE__ */ import_react74.default.createElement(L, null, token.text);
+      return /* @__PURE__ */ import_react74.default.createElement(Text, null, token.text);
     default:
-      return /* @__PURE__ */ import_react74.default.createElement(L, null, token.raw ?? "");
+      return /* @__PURE__ */ import_react74.default.createElement(Text, null, token.raw ?? "");
   }
 }
 function plainText(tokens) {
@@ -55462,7 +55464,7 @@ function useLiveTokenRate(card, enabled2) {
 }
 var PILL_RATE = { bg: "#11141a", fg: "#8b949e" };
 function StreamingCard({ card }) {
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const expanded = (0, import_react75.useContext)(LiveExpandContext);
   const liveRate = useLiveTokenRate(card, !card.done && !card.aborted);
@@ -55500,9 +55502,9 @@ function StreamingCard({ card }) {
       title: headLabel,
       right: /* @__PURE__ */ import_react75.default.createElement(import_react75.default.Fragment, null, liveRatePill, expandPill, modelPill)
     }
-  ), expanded && droppedAbove > 0 ? /* @__PURE__ */ import_react75.default.createElement(L, { color: FG.faint }, t(droppedAbove === 1 ? "cardLabels.earlierLine" : "cardLabels.earlierLines", {
+  ), expanded && droppedAbove > 0 ? /* @__PURE__ */ import_react75.default.createElement(Text, { color: FG.faint }, t(droppedAbove === 1 ? "cardLabels.earlierLine" : "cardLabels.earlierLines", {
     count: droppedAbove
-  })) : null, visible.map((line, i) => /* @__PURE__ */ import_react75.default.createElement(W, { key: `${card.id}:${visualLines.length - visible.length + i}`, flexDirection: "row" }, /* @__PURE__ */ import_react75.default.createElement(L, { color: aborted ? FG.meta : FG.body }, clipToCells(line, lineCells)))), aborted ? /* @__PURE__ */ import_react75.default.createElement(L, { color: FG.faint }, t("cardLabels.truncatedByEsc")) : null);
+  })) : null, visible.map((line, i) => /* @__PURE__ */ import_react75.default.createElement(Box_default, { key: `${card.id}:${visualLines.length - visible.length + i}`, flexDirection: "row" }, /* @__PURE__ */ import_react75.default.createElement(Text, { color: aborted ? FG.meta : FG.body }, clipToCells(line, lineCells)))), aborted ? /* @__PURE__ */ import_react75.default.createElement(Text, { color: FG.faint }, t("cardLabels.truncatedByEsc")) : null);
 }
 
 // src/cli/ui/cards/SubAgentCard.tsx
@@ -55529,7 +55531,7 @@ function SubAgentCard({ card }) {
       subtitle: card.task,
       meta: headerMeta2
     }
-  ), card.name ? /* @__PURE__ */ import_react76.default.createElement(L, { color: fg.faint }, `${t("cardLabels.agent")} \xB7 ${card.name}`) : null, card.tools && card.tools.length > 0 && /* @__PURE__ */ import_react76.default.createElement(L, { color: fg.faint }, `${t("cardLabels.tools")} \xB7 ${card.tools.join(", ")}`), card.children.map((child) => /* @__PURE__ */ import_react76.default.createElement(W, { key: child.id, flexDirection: "row", gap: 1 }, inLive ? null : /* @__PURE__ */ import_react76.default.createElement(L, { color: tone.violet }, "\u23BF"), /* @__PURE__ */ import_react76.default.createElement(ChildRow, { card: child }))));
+  ), card.name ? /* @__PURE__ */ import_react76.default.createElement(Text, { color: fg.faint }, `${t("cardLabels.agent")} \xB7 ${card.name}`) : null, card.tools && card.tools.length > 0 && /* @__PURE__ */ import_react76.default.createElement(Text, { color: fg.faint }, `${t("cardLabels.tools")} \xB7 ${card.tools.join(", ")}`), card.children.map((child) => /* @__PURE__ */ import_react76.default.createElement(Box_default, { key: child.id, flexDirection: "row", gap: 1 }, inLive ? null : /* @__PURE__ */ import_react76.default.createElement(Text, { color: tone.violet }, "\u23BF"), /* @__PURE__ */ import_react76.default.createElement(ChildRow, { card: child }))));
 }
 function isChildDone(card) {
   switch (card.kind) {
@@ -55546,7 +55548,7 @@ function ChildRow({ card }) {
   const { fg, tone } = useThemeTokens();
   const v = childVisual(card, tone.ok, tone.err, fg.faint);
   const isDone = isChildDone(card);
-  return /* @__PURE__ */ import_react76.default.createElement(import_react76.default.Fragment, null, v.statusGlyph, /* @__PURE__ */ import_react76.default.createElement(L, { color: v.kindColor }, v.kindGlyph), /* @__PURE__ */ import_react76.default.createElement(L, { dimColor: isDone, color: fg.body }, v.text));
+  return /* @__PURE__ */ import_react76.default.createElement(import_react76.default.Fragment, null, v.statusGlyph, /* @__PURE__ */ import_react76.default.createElement(Text, { color: v.kindColor }, v.kindGlyph), /* @__PURE__ */ import_react76.default.createElement(Text, { dim: isDone, color: fg.body }, v.text));
 }
 function runningGlyph(color, kind) {
   const frames = kind === "tool" ? PULSE_SQUARE : kind === "streaming" ? PULSE_CIRCLE : PULSE_DIAMOND;
@@ -55554,10 +55556,10 @@ function runningGlyph(color, kind) {
   return /* @__PURE__ */ import_react76.default.createElement(Pulse, { active: true, frames, settled, color });
 }
 function doneGlyph(color) {
-  return /* @__PURE__ */ import_react76.default.createElement(L, { color }, "\u2713");
+  return /* @__PURE__ */ import_react76.default.createElement(Text, { color }, "\u2713");
 }
 function failedGlyph(color) {
-  return /* @__PURE__ */ import_react76.default.createElement(L, { color }, "\u2717");
+  return /* @__PURE__ */ import_react76.default.createElement(Text, { color }, "\u2717");
 }
 function childVisual(card, doneColor, failedColor, fallbackColor) {
   switch (card.kind) {
@@ -55602,7 +55604,7 @@ function childVisual(card, doneColor, failedColor, fallbackColor) {
       };
     default:
       return {
-        statusGlyph: /* @__PURE__ */ import_react76.default.createElement(L, { color: fallbackColor }, "\xB7"),
+        statusGlyph: /* @__PURE__ */ import_react76.default.createElement(Text, { color: fallbackColor }, "\xB7"),
         kindGlyph: "\xB7",
         kindColor: fallbackColor,
         text: card.kind
@@ -55646,7 +55648,7 @@ function TaskCard({ card }) {
       subtitle: `${card.index} / ${card.total}  ${card.title}`,
       meta: [elapsed, card.status]
     }
-  ), card.steps.map((step) => /* @__PURE__ */ import_react77.default.createElement(W, { key: step.id, flexDirection: "row", gap: 1 }, step.status === "running" ? /* @__PURE__ */ import_react77.default.createElement(Pulse, { active: true, frames: PULSE_TRIANGLE, settled: "\u25B6", color: stepColor[step.status] }) : /* @__PURE__ */ import_react77.default.createElement(L, { color: stepColor[step.status] }, STEP_GLYPH[step.status]), /* @__PURE__ */ import_react77.default.createElement(L, { bold: true, color: fg.body }, (step.toolName ?? t("cardLabels.stepLabel")).padEnd(7)), /* @__PURE__ */ import_react77.default.createElement(Pill2, { label: step.title, ...PILL_PATH, bold: false }), step.detail ? /* @__PURE__ */ import_react77.default.createElement(L, { color: fg.faint }, step.detail) : null, step.elapsedMs !== void 0 ? /* @__PURE__ */ import_react77.default.createElement(L, { color: fg.faint }, `${(step.elapsedMs / 1e3).toFixed(2)}s`) : null)));
+  ), card.steps.map((step) => /* @__PURE__ */ import_react77.default.createElement(Box_default, { key: step.id, flexDirection: "row", gap: 1 }, step.status === "running" ? /* @__PURE__ */ import_react77.default.createElement(Pulse, { active: true, frames: PULSE_TRIANGLE, settled: "\u25B6", color: stepColor[step.status] }) : /* @__PURE__ */ import_react77.default.createElement(Text, { color: stepColor[step.status] }, STEP_GLYPH[step.status]), /* @__PURE__ */ import_react77.default.createElement(Text, { bold: true, color: fg.body }, (step.toolName ?? t("cardLabels.stepLabel")).padEnd(7)), /* @__PURE__ */ import_react77.default.createElement(Pill2, { label: step.title, ...PILL_PATH, bold: false }), step.detail ? /* @__PURE__ */ import_react77.default.createElement(Text, { color: fg.faint }, step.detail) : null, step.elapsedMs !== void 0 ? /* @__PURE__ */ import_react77.default.createElement(Text, { color: fg.faint }, `${(step.elapsedMs / 1e3).toFixed(2)}s`) : null)));
 }
 
 // src/cli/ui/cards/TipCard.tsx
@@ -55657,7 +55659,7 @@ function TipCard({ card }) {
     (max, sec) => sec.rows.reduce((m, r) => Math.max(m, stringWidth(r.key)), max),
     0
   );
-  return /* @__PURE__ */ import_react78.default.createElement(W, { flexDirection: "column", paddingLeft: 2, marginY: 1 }, /* @__PURE__ */ import_react78.default.createElement(W, { flexDirection: "row", justifyContent: "space-between" }, /* @__PURE__ */ import_react78.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react78.default.createElement(L, { color: TONE.accent, bold: true }, "\u24D8"), /* @__PURE__ */ import_react78.default.createElement(L, { color: FG.body, bold: true }, card.topic)), card.oneTime ? /* @__PURE__ */ import_react78.default.createElement(L, { color: FG.faint }, t("ui.tipShownOnce")) : null), card.sections.map((section, i) => /* @__PURE__ */ import_react78.default.createElement(W, { key: section.title ?? `section-${i}`, flexDirection: "column", marginTop: 1 }, section.title ? /* @__PURE__ */ import_react78.default.createElement(W, { marginBottom: 0 }, /* @__PURE__ */ import_react78.default.createElement(L, { color: FG.sub }, section.title)) : null, section.rows.map((row2) => /* @__PURE__ */ import_react78.default.createElement(
+  return /* @__PURE__ */ import_react78.default.createElement(Box_default, { flexDirection: "column", paddingLeft: 2, marginY: 1 }, /* @__PURE__ */ import_react78.default.createElement(Box_default, { flexDirection: "row", justifyContent: "space-between" }, /* @__PURE__ */ import_react78.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react78.default.createElement(Text, { color: TONE.accent, bold: true }, "\u24D8"), /* @__PURE__ */ import_react78.default.createElement(Text, { color: FG.body, bold: true }, card.topic)), card.oneTime ? /* @__PURE__ */ import_react78.default.createElement(Text, { color: FG.faint }, t("ui.tipShownOnce")) : null), card.sections.map((section, i) => /* @__PURE__ */ import_react78.default.createElement(Box_default, { key: section.title ?? `section-${i}`, flexDirection: "column", marginTop: 1 }, section.title ? /* @__PURE__ */ import_react78.default.createElement(Box_default, { marginBottom: 0 }, /* @__PURE__ */ import_react78.default.createElement(Text, { color: FG.sub }, section.title)) : null, section.rows.map((row2) => /* @__PURE__ */ import_react78.default.createElement(
     TipRowRender,
     {
       key: row2.key,
@@ -55665,7 +55667,7 @@ function TipCard({ card }) {
       keyWidth,
       indent: section.title ? 2 : 0
     }
-  )))), card.footer ? /* @__PURE__ */ import_react78.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react78.default.createElement(L, { color: FG.faint }, card.footer)) : null);
+  )))), card.footer ? /* @__PURE__ */ import_react78.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react78.default.createElement(Text, { color: FG.faint }, card.footer)) : null);
 }
 function TipRowRender({
   row: row2,
@@ -55674,7 +55676,7 @@ function TipRowRender({
 }) {
   const pad = " ".repeat(Math.max(0, keyWidth - stringWidth(row2.key) + KEY_GUTTER));
   const lead = indent > 0 ? " ".repeat(indent) : "";
-  return /* @__PURE__ */ import_react78.default.createElement(W, { flexDirection: "row" }, lead ? /* @__PURE__ */ import_react78.default.createElement(L, null, lead) : null, /* @__PURE__ */ import_react78.default.createElement(L, { color: TONE.accent }, row2.key), /* @__PURE__ */ import_react78.default.createElement(L, null, pad), /* @__PURE__ */ import_react78.default.createElement(L, { color: FG.body }, row2.text));
+  return /* @__PURE__ */ import_react78.default.createElement(Box_default, { flexDirection: "row" }, lead ? /* @__PURE__ */ import_react78.default.createElement(Text, null, lead) : null, /* @__PURE__ */ import_react78.default.createElement(Text, { color: TONE.accent }, row2.key), /* @__PURE__ */ import_react78.default.createElement(Text, null, pad), /* @__PURE__ */ import_react78.default.createElement(Text, { color: FG.body }, row2.text));
 }
 
 // src/cli/ui/cards/ToolCard.tsx
@@ -55708,7 +55710,7 @@ function tailLinesFor(name) {
   return /(?:^|_)(read|search|list|tree|get|status|diff|fetch|grep)(_|$)/.test(lower) || lower === "job_output" ? READ_TAIL : OTHER_TAIL;
 }
 function ToolCard({ card }) {
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const lineCells = Math.max(20, cols - 4);
   const argsLabel = formatArgsSummary(card.args);
@@ -55750,18 +55752,18 @@ function ToolCard({ card }) {
       meta: meta.length > 0 ? meta : void 0
     }
   ), showBody && (subagentMarkdown !== null ? /* @__PURE__ */ import_react80.default.createElement(Markdown, { text: subagentMarkdown, width: lineCells }) : /* @__PURE__ */ import_react80.default.createElement(import_react80.default.Fragment, null, preview.rows.map(
-    (row2, i) => row2.kind === "hidden" ? /* @__PURE__ */ import_react80.default.createElement(L, { key: `${card.id}:hidden:${i}`, color: FG.faint }, t(
+    (row2, i) => row2.kind === "hidden" ? /* @__PURE__ */ import_react80.default.createElement(Text, { key: `${card.id}:hidden:${i}`, color: FG.faint }, t(
       hiddenRowLabelKey({
         count: row2.count,
         includeShortcut: i === firstHiddenRow
       }),
       { count: row2.count }
     )) : /* @__PURE__ */ import_react80.default.createElement(
-      L,
+      Text,
       {
         key: `${card.id}:line:${row2.index}`,
         color: errColor,
-        dimColor: !card.exitCode || card.exitCode === 0
+        dim: !card.exitCode || card.exitCode === 0
       },
       clipToCells(row2.text, lineCells) || " "
     )
@@ -55876,7 +55878,7 @@ 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__ */ import_react81.default.createElement(import_react81.default.Fragment, null, /* @__PURE__ */ import_react81.default.createElement(L, { color }, "\u2588".repeat(filled)), /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.faint }, "\u2591".repeat(empty)));
+  return /* @__PURE__ */ import_react81.default.createElement(import_react81.default.Fragment, null, /* @__PURE__ */ import_react81.default.createElement(Text, { color }, "\u2588".repeat(filled)), /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.faint }, "\u2591".repeat(empty)));
 }
 function UsageCard({ card }) {
   const costDisplayCurrency = useAgentState((s) => s.status.costDisplayCurrency);
@@ -55891,14 +55893,14 @@ function UsageCard({ card }) {
     formatCost(card.cost, costCur)
   ];
   if (card.elapsedMs !== void 0) headerMeta2.push(`${(card.elapsedMs / 1e3).toFixed(1)}s`);
-  return /* @__PURE__ */ import_react81.default.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ import_react81.default.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: t("cardTitles.usage"), meta: headerMeta2 }), /* @__PURE__ */ import_react81.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.sub }, t("cardLabels.prompt")), bar(promptRatio, TONE.brand), /* @__PURE__ */ import_react81.default.createElement(L, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react81.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.sub }, t("cardLabels.reason")), bar(reasonRatio, TONE.accent), /* @__PURE__ */ import_react81.default.createElement(L, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ import_react81.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.sub }, t("cardLabels.output")), bar(outputRatio, TONE.brand), /* @__PURE__ */ import_react81.default.createElement(L, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ import_react81.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.sub }, t("cardLabels.cache"), " "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ import_react81.default.createElement(L, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react81.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.faint }, t("cardLabels.session")), /* @__PURE__ */ import_react81.default.createElement(L, { bold: true, color: FG.body }, `\u25CF ${formatCost(card.sessionCost, costCur, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ import_react81.default.createElement(import_react81.default.Fragment, null, /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.faint }, `\xB7 ${t("cardLabels.balance")}`), /* @__PURE__ */ import_react81.default.createElement(L, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
+  return /* @__PURE__ */ import_react81.default.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ import_react81.default.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: t("cardTitles.usage"), meta: headerMeta2 }), /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.sub }, t("cardLabels.prompt")), bar(promptRatio, TONE.brand), /* @__PURE__ */ import_react81.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.sub }, t("cardLabels.reason")), bar(reasonRatio, TONE.accent), /* @__PURE__ */ import_react81.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.sub }, t("cardLabels.output")), bar(outputRatio, TONE.brand), /* @__PURE__ */ import_react81.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.sub }, t("cardLabels.cache"), " "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ import_react81.default.createElement(Text, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.faint }, t("cardLabels.session")), /* @__PURE__ */ import_react81.default.createElement(Text, { bold: true, color: FG.body }, `\u25CF ${formatCost(card.sessionCost, costCur, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ import_react81.default.createElement(import_react81.default.Fragment, null, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.faint }, `\xB7 ${t("cardLabels.balance")}`), /* @__PURE__ */ import_react81.default.createElement(Text, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
 }
 function CompactUsageRow({
   card,
   displayCurrency
 }) {
   const elapsed = card.elapsedMs !== void 0 ? ` \xB7 ${(card.elapsedMs / 1e3).toFixed(1)}s` : "";
-  return /* @__PURE__ */ import_react81.default.createElement(W, { flexDirection: "row", gap: 1, marginTop: 1 }, /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.meta }, "\u03A3"), /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.faint }, `${t("cardLabels.turn")} ${card.turn}`), /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.meta }, `\xB7 ${compactNum(card.tokens.prompt)} ${t("cardLabels.prompt")} \xB7 ${compactNum(card.tokens.output)} ${t("cardLabels.output")}`), /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.faint }, `\xB7 ${t("cardLabels.cache")}`), /* @__PURE__ */ import_react81.default.createElement(L, { color: TONE.ok }, `${(card.cacheHit * 100).toFixed(0)}%`), /* @__PURE__ */ import_react81.default.createElement(L, { color: FG.faint }, `\xB7 ${formatCost(card.cost, displayCurrency)}${elapsed}`), card.balance !== void 0 ? /* @__PURE__ */ import_react81.default.createElement(L, { color: TONE.brand }, `\xB7 ${formatBalance(card.balance, card.balanceCurrency)}`) : null);
+  return /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1, marginTop: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.meta }, "\u03A3"), /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.faint }, `${t("cardLabels.turn")} ${card.turn}`), /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.meta }, `\xB7 ${compactNum(card.tokens.prompt)} ${t("cardLabels.prompt")} \xB7 ${compactNum(card.tokens.output)} ${t("cardLabels.output")}`), /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.faint }, `\xB7 ${t("cardLabels.cache")}`), /* @__PURE__ */ import_react81.default.createElement(Text, { color: TONE.ok }, `${(card.cacheHit * 100).toFixed(0)}%`), /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.faint }, `\xB7 ${formatCost(card.cost, displayCurrency)}${elapsed}`), card.balance !== void 0 ? /* @__PURE__ */ import_react81.default.createElement(Text, { color: TONE.brand }, `\xB7 ${formatBalance(card.balance, card.balanceCurrency)}`) : null);
 }
 
 // src/cli/ui/cards/UserCard.tsx
@@ -55919,7 +55921,7 @@ function formatRelativeTime(ts, now = Date.now()) {
 
 // src/cli/ui/cards/UserCard.tsx
 function UserCard({ card }) {
-  return /* @__PURE__ */ import_react82.default.createElement(W, { flexDirection: "column", width: "100%", paddingX: 1, backgroundColor: MESSAGE_BG.user }, /* @__PURE__ */ import_react82.default.createElement(
+  return /* @__PURE__ */ import_react82.default.createElement(Box_default, { flexDirection: "column", width: "100%", paddingX: 1, backgroundColor: MESSAGE_BG.user }, /* @__PURE__ */ import_react82.default.createElement(
     CardHeader,
     {
       glyph: CARD.user.glyph,
@@ -55927,7 +55929,7 @@ function UserCard({ card }) {
       title: t("cardTitles.you"),
       meta: [formatRelativeTime(card.ts)]
     }
-  ), /* @__PURE__ */ import_react82.default.createElement(W, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react82.default.createElement(L, { color: FG.sub }, "\u21B3"), /* @__PURE__ */ import_react82.default.createElement(L, null, card.text)));
+  ), /* @__PURE__ */ import_react82.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react82.default.createElement(Text, { color: FG.sub }, "\u21B3"), /* @__PURE__ */ import_react82.default.createElement(Text, null, card.text)));
 }
 
 // src/cli/ui/cards/WarnCard.tsx
@@ -55942,14 +55944,14 @@ function WarnCard({ card }) {
       title: card.title,
       meta: card.detail ? [card.detail] : void 0
     }
-  ), messageLines.map((line, i) => /* @__PURE__ */ import_react83.default.createElement(L, { key: `${card.id}:${i}`, color: FG.body }, line || " ")));
+  ), messageLines.map((line, i) => /* @__PURE__ */ import_react83.default.createElement(Text, { key: `${card.id}:${i}`, color: FG.body }, line || " ")));
 }
 
 // src/cli/ui/cards/CardRenderer.tsx
 var CardRenderer = import_react84.default.memo(function CardRenderer2({
   card
 }) {
-  return /* @__PURE__ */ import_react84.default.createElement(W, { flexDirection: "column" }, renderCard(card));
+  return /* @__PURE__ */ import_react84.default.createElement(Box_default, { flexDirection: "column" }, renderCard(card));
 });
 function renderCard(card) {
   switch (card.kind) {
@@ -55994,7 +55996,7 @@ function renderCard(card) {
   }
 }
 function FallbackCard({ card }) {
-  return /* @__PURE__ */ import_react84.default.createElement(W, { flexDirection: "row" }, /* @__PURE__ */ import_react84.default.createElement(L, { color: FG.faint }, `  \xB7 ${card.kind} card \xB7 not yet migrated`));
+  return /* @__PURE__ */ import_react84.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react84.default.createElement(Text, { color: FG.faint }, `  \xB7 ${card.kind} card \xB7 not yet migrated`));
 }
 
 // src/cli/ui/state/chat-scroll-provider.tsx
@@ -56190,13 +56192,7 @@ function CardStream({
   const cardHeights = useChatScrollState((s) => s.cardHeights);
   const { setMaxScroll, setCardHeight, pruneCardHeights } = useChatScrollActions();
   const outerRef = (0, import_react86.useRef)(null);
-  const innerRef = (0, import_react86.useRef)(null);
-  const outer = Cv(outerRef);
-  const inner = Cv(innerRef);
-  const maxScroll = Math.max(0, inner.height - outer.height);
-  (0, import_react86.useEffect)(() => {
-    setMaxScroll(maxScroll);
-  }, [maxScroll, setMaxScroll]);
+  const outer = useBoxMetrics(outerRef);
   (0, import_react86.useEffect)(() => {
     pruneCardHeights(new Set(cards.map((c) => c.id)));
   }, [cards, pruneCardHeights]);
@@ -56204,12 +56200,21 @@ function CardStream({
   if (suppressLive && cards.length > 0 && !isFullySettled(cards[cards.length - 1])) {
     visible = cards.slice(0, -1);
   }
+  const totalInnerRows = (0, import_react86.useMemo)(() => {
+    let sum = 0;
+    for (const card of visible) sum += cardHeights.get(card.id) ?? 0;
+    return sum;
+  }, [visible, cardHeights]);
+  const maxScroll = Math.max(0, totalInnerRows - outer.height);
+  (0, import_react86.useEffect)(() => {
+    setMaxScroll(maxScroll);
+  }, [maxScroll, setMaxScroll]);
   const items = (0, import_react86.useMemo)(
     () => computeCardStreamItems(visible, cardHeights, scrollRows, outer.height),
     [visible, cardHeights, scrollRows, outer.height]
   );
-  return /* @__PURE__ */ import_react86.default.createElement(import_react86.default.Fragment, null, /* @__PURE__ */ import_react86.default.createElement(W, { height: 1, flexShrink: 0 }, scrollRows > 0 ? /* @__PURE__ */ import_react86.default.createElement(ScrollIndicator, { scrollRows, maxScroll }) : null), /* @__PURE__ */ import_react86.default.createElement(W, { ref: outerRef, flexDirection: "column", flexGrow: 1, overflow: "hidden" }, /* @__PURE__ */ import_react86.default.createElement(W, { ref: innerRef, flexDirection: "column", marginTop: -scrollRows, flexShrink: 0 }, items.map(
-    (item) => item.kind === "spacer" ? /* @__PURE__ */ import_react86.default.createElement(W, { key: item.key, height: item.rows, flexShrink: 0 }) : /* @__PURE__ */ import_react86.default.createElement(MeasuredCard, { key: item.card.id, card: item.card, report: setCardHeight })
+  return /* @__PURE__ */ import_react86.default.createElement(import_react86.default.Fragment, null, /* @__PURE__ */ import_react86.default.createElement(Box_default, { height: 1, flexShrink: 0 }, scrollRows > 0 ? /* @__PURE__ */ import_react86.default.createElement(ScrollIndicator, { scrollRows, maxScroll }) : null), /* @__PURE__ */ import_react86.default.createElement(Box_default, { ref: outerRef, flexDirection: "column", flexGrow: 1, overflow: "hidden" }, /* @__PURE__ */ import_react86.default.createElement(Box_default, { flexDirection: "column", marginTop: -scrollRows, flexShrink: 0 }, items.map(
+    (item) => item.kind === "spacer" ? /* @__PURE__ */ import_react86.default.createElement(Box_default, { key: item.key, height: item.rows, flexShrink: 0 }) : /* @__PURE__ */ import_react86.default.createElement(MeasuredCard, { key: item.card.id, card: item.card, report: setCardHeight })
   ))));
 }
 function MeasuredCard({
@@ -56217,7 +56222,7 @@ function MeasuredCard({
   report
 }) {
   const ref = (0, import_react86.useRef)(null);
-  const metrics = Cv(ref);
+  const metrics = useBoxMetrics(ref);
   const lastReportedRef = (0, import_react86.useRef)(0);
   const settled = isFullySettled(card);
   (0, import_react86.useEffect)(() => {
@@ -56227,7 +56232,7 @@ function MeasuredCard({
     lastReportedRef.current = rows;
     report(card.id, rows);
   }, [card.id, metrics.height, report, settled]);
-  return /* @__PURE__ */ import_react86.default.createElement(W, { ref, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react86.default.createElement(CardRenderer, { card }));
+  return /* @__PURE__ */ import_react86.default.createElement(Box_default, { ref, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react86.default.createElement(CardRenderer, { card }));
 }
 function ScrollIndicator({
   scrollRows,
@@ -56245,10 +56250,10 @@ function ScrollIndicator({
   const above = scrollRows === 1 ? t("cardStream.scrollAbove", { scroll: scrollRows, max: maxScroll }) : t("cardStream.scrollAbovePlural", { scroll: scrollRows, max: maxScroll });
   const more = remaining > 0 ? t("cardStream.scrollMore", { remaining }) : "";
   const text2 = `${above}${more}${t("cardStream.scrollPgUp")}${t("cardStream.scrollCopy")}`;
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const cols = stdout?.columns ?? 80;
   const pad = Math.max(0, cols - stringWidth(text2));
-  return /* @__PURE__ */ import_react86.default.createElement(L, { color: hot ? TONE.accent : FG.faint, backgroundColor: SURFACE.bgElev }, text2 + " ".repeat(pad));
+  return /* @__PURE__ */ import_react86.default.createElement(Text, { color: hot ? TONE.accent : FG.faint, backgroundColor: SURFACE.bgElev }, text2 + " ".repeat(pad));
 }
 function isFullySettled(card) {
   switch (card.kind) {
@@ -56282,7 +56287,7 @@ function StaticCardStreamInner({
     [visibleCards]
   );
   const visibleDynamic = suppressLive && hasUnsettledDynamic && dynamicItems.length > 0 ? dynamicItems.slice(0, -1) : dynamicItems;
-  return /* @__PURE__ */ import_react87.default.createElement(import_react87.default.Fragment, null, /* @__PURE__ */ import_react87.default.createElement(vv, { items: staticItems }, (card) => /* @__PURE__ */ import_react87.default.createElement(W, { key: card.id, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react87.default.createElement(CardRenderer, { card }))), /* @__PURE__ */ import_react87.default.createElement(W, { flexDirection: "column", flexShrink: 0 }, visibleDynamic.map((card) => /* @__PURE__ */ import_react87.default.createElement(W, { key: card.id, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react87.default.createElement(CardRenderer, { card })))));
+  return /* @__PURE__ */ import_react87.default.createElement(import_react87.default.Fragment, null, /* @__PURE__ */ import_react87.default.createElement(Static, { items: staticItems }, (card) => /* @__PURE__ */ import_react87.default.createElement(Box_default, { key: card.id, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react87.default.createElement(CardRenderer, { card }))), /* @__PURE__ */ import_react87.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0 }, visibleDynamic.map((card) => /* @__PURE__ */ import_react87.default.createElement(Box_default, { key: card.id, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react87.default.createElement(CardRenderer, { card })))));
 }
 function useProgressiveBacklog(cards) {
   const backlogRef = (0, import_react87.useRef)(null);
@@ -58692,7 +58697,7 @@ var handlers17 = {
 var handlers18 = {
   "search-engine": (args, _loop, ctx) => {
     const engine = args[0];
-    if (!engine || engine !== "bing" && engine !== "searxng" && engine !== "metaso" && engine !== "tavily" && engine !== "perplexity" && engine !== "exa") {
+    if (!engine || engine !== "bing" && engine !== "searxng" && engine !== "metaso" && engine !== "tavily" && engine !== "perplexity" && engine !== "exa" && engine !== "brave" && engine !== "ollama") {
       return {
         info: [
           t("handlers.webSearchEngine.currentEngine", { engine: webSearchEngine() }),
@@ -58706,6 +58711,8 @@ var handlers18 = {
           t("handlers.webSearchEngine.usageTavily"),
           t("handlers.webSearchEngine.usagePerplexity"),
           t("handlers.webSearchEngine.usageExa"),
+          t("handlers.webSearchEngine.usageOllama"),
+          t("handlers.webSearchEngine.usageBrave"),
           "",
           t("handlers.webSearchEngine.alias"),
           "",
@@ -58715,9 +58722,9 @@ var handlers18 = {
       };
     }
     const cfg = readConfig();
-    const apiKeyEngines = /* @__PURE__ */ new Set(["tavily", "perplexity", "exa", "metaso"]);
+    const apiKeyEngines = /* @__PURE__ */ new Set(["tavily", "perplexity", "exa", "metaso", "ollama", "brave"]);
     if (apiKeyEngines.has(engine)) {
-      const loadKey = engine === "tavily" ? loadTavilyApiKey : engine === "perplexity" ? loadPerplexityApiKey : engine === "exa" ? loadExaApiKey : loadMetasoApiKey;
+      const loadKey = engine === "tavily" ? loadTavilyApiKey : engine === "perplexity" ? loadPerplexityApiKey : engine === "exa" ? loadExaApiKey : engine === "ollama" ? loadOllamaApiKey : engine === "brave" ? loadBraveApiKey : loadMetasoApiKey;
       if (args[1]) {
         cfg.webSearchEngine = engine;
         cfg[`${engine}ApiKey`] = args[1];
@@ -58741,7 +58748,7 @@ var handlers18 = {
       cfg.webSearchEndpoint = raw.includes("://") ? raw : `http://${raw}`;
     }
     writeConfig(cfg);
-    const note = engine === "searxng" ? t("handlers.webSearchEngine.switchedSearxngNote", { endpoint: webSearchEndpoint() }) : engine === "metaso" ? t("handlers.webSearchEngine.switchedMetasoNote") : engine === "tavily" ? t("handlers.webSearchEngine.switchedTavilyNote") : engine === "perplexity" ? t("handlers.webSearchEngine.switchedPerplexityNote") : engine === "exa" ? t("handlers.webSearchEngine.switchedExaNote") : "";
+    const note = engine === "searxng" ? t("handlers.webSearchEngine.switchedSearxngNote", { endpoint: webSearchEndpoint() }) : engine === "metaso" ? t("handlers.webSearchEngine.switchedMetasoNote") : engine === "tavily" ? t("handlers.webSearchEngine.switchedTavilyNote") : engine === "perplexity" ? t("handlers.webSearchEngine.switchedPerplexityNote") : engine === "exa" ? t("handlers.webSearchEngine.switchedExaNote") : engine === "ollama" ? t("handlers.webSearchEngine.switchedOllamaNote") : engine === "brave" ? t("handlers.webSearchEngine.switchedBraveNote") : "";
     const detail = engine === "searxng" ? t("handlers.webSearchEngine.confirmedDetail", { endpoint: webSearchEndpoint() }) : "";
     return { info: t("handlers.webSearchEngine.confirmed", { engine, detail }) };
   },
@@ -60111,7 +60118,7 @@ function AppInner({
     setStatusLine,
     clear: clearToolProgressDisplay
   } = useToolProgressDisplay(progressSink);
-  const { stdout } = bv();
+  const { stdout } = useStdout();
   const walletCurrencyRef = (0, import_react93.useRef)(void 0);
   const { activities: subagentActivities, sinkRef: subagentSinkRef } = useSubagent({
     session,
@@ -60206,7 +60213,7 @@ function AppInner({
     isHistoryMode
   } = useInputRecall(setInput);
   const chatScroll = useChatScrollActions();
-  const { setRawMode, isRawModeSupported } = An();
+  const { setRawMode, isRawModeSupported } = use_stdin_default();
   const handleOpenExternalEditor = (0, import_react93.useCallback)(async () => {
     if (!isRawModeSupported) {
       log.pushWarning(t("composer.editorFailed"), t("composer.editorNoRawMode"));
@@ -61217,6 +61224,9 @@ ${t("mcpLifecycle.failedSetupHint")}`
             totalInputCostUsd: s.totalInputCostUsd,
             totalOutputCostUsd: s.totalOutputCostUsd,
             cacheHitRatio: s.cacheHitRatio,
+            cacheHitTokens: loop2.stats.cumulativeCacheHitTokens,
+            cacheMissTokens: loop2.stats.cumulativeCacheMissTokens,
+            totalCompletionTokens: loop2.stats.cumulativeCompletionTokens,
             lastPromptTokens: s.lastPromptTokens,
             contextCapTokens: ctxCap2,
             // useSessionInfo's Balance is a flat { currency, total }; the
@@ -61382,8 +61392,8 @@ ${t("mcpLifecycle.failedSetupHint")}`
       return persistentDashboardHandle.url;
     }
     const startup = (async () => {
-      const { startDashboardServer } = await import("./server-UHKO2VVM.js");
-      const { saveDashboardPort } = await import("./config-KV7VV5LG.js");
+      const { startDashboardServer } = await import("./server-MPCXIW2O.js");
+      const { saveDashboardPort } = await import("./config-T4RWI5NG.js");
       const tryStart = (port) => startDashboardServer(buildCtx(), {
         port,
         host: dashboardHost,
@@ -62784,7 +62794,7 @@ ${answer}`, "brand");
   );
   const tickerSuspended = modalOpen || !busy && !isStreaming;
   if (!bootReady) return /* @__PURE__ */ import_react93.default.createElement(BootSplash, null);
-  return /* @__PURE__ */ import_react93.default.createElement(import_react93.default.Fragment, null, /* @__PURE__ */ import_react93.default.createElement(TickerProvider, { disabled: tickerSuspended }, /* @__PURE__ */ import_react93.default.createElement(InflightProvider, { inflight: loop2.inflight }, /* @__PURE__ */ import_react93.default.createElement(W, { flexDirection: "row" }, /* @__PURE__ */ import_react93.default.createElement(W, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ import_react93.default.createElement(W, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ import_react93.default.createElement(LiveExpandContext.Provider, { value: liveExpand }, /* @__PURE__ */ import_react93.default.createElement(VerboseContext.Provider, { value: verboseMode }, historyScrollMode === "app" ? /* @__PURE__ */ import_react93.default.createElement(CardStream, { suppressLive: modalOpen }) : /* @__PURE__ */ import_react93.default.createElement(StaticCardStream, { suppressLive: modalOpen }))), !hasConversation && !busy && !isStreaming && slashMatches === null ? /* @__PURE__ */ import_react93.default.createElement(W, { flexGrow: 1, justifyContent: "center" }, /* @__PURE__ */ import_react93.default.createElement(
+  return /* @__PURE__ */ import_react93.default.createElement(import_react93.default.Fragment, null, /* @__PURE__ */ import_react93.default.createElement(TickerProvider, { disabled: tickerSuspended }, /* @__PURE__ */ import_react93.default.createElement(InflightProvider, { inflight: loop2.inflight }, /* @__PURE__ */ import_react93.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react93.default.createElement(Box_default, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ import_react93.default.createElement(Box_default, { flexDirection: "column", flexGrow: 1 }, /* @__PURE__ */ import_react93.default.createElement(LiveExpandContext.Provider, { value: liveExpand }, /* @__PURE__ */ import_react93.default.createElement(VerboseContext.Provider, { value: verboseMode }, historyScrollMode === "app" ? /* @__PURE__ */ import_react93.default.createElement(CardStream, { suppressLive: modalOpen }) : /* @__PURE__ */ import_react93.default.createElement(StaticCardStream, { suppressLive: modalOpen }))), !hasConversation && !busy && !isStreaming && slashMatches === null ? /* @__PURE__ */ import_react93.default.createElement(Box_default, { flexGrow: 1, justifyContent: "center" }, /* @__PURE__ */ import_react93.default.createElement(
     WelcomeBanner,
     {
       inCodeMode: !!codeMode,
@@ -63210,18 +63220,18 @@ function MaskedInput({
   });
   if (value.length === 0) {
     if (placeholder.length === 0) {
-      return /* @__PURE__ */ import_react94.default.createElement(L, { inverse: true }, " ");
+      return /* @__PURE__ */ import_react94.default.createElement(Text, { inverse: true }, " ");
     }
-    return /* @__PURE__ */ import_react94.default.createElement(import_react94.default.Fragment, null, /* @__PURE__ */ import_react94.default.createElement(L, { inverse: true }, placeholder[0]), /* @__PURE__ */ import_react94.default.createElement(L, { color: FG.faint }, placeholder.slice(1)));
+    return /* @__PURE__ */ import_react94.default.createElement(import_react94.default.Fragment, null, /* @__PURE__ */ import_react94.default.createElement(Text, { inverse: true }, placeholder[0]), /* @__PURE__ */ import_react94.default.createElement(Text, { color: FG.faint }, placeholder.slice(1)));
   }
-  return /* @__PURE__ */ import_react94.default.createElement(import_react94.default.Fragment, null, /* @__PURE__ */ import_react94.default.createElement(L, null, mask.repeat(value.length)), /* @__PURE__ */ import_react94.default.createElement(L, { inverse: true }, " "));
+  return /* @__PURE__ */ import_react94.default.createElement(import_react94.default.Fragment, null, /* @__PURE__ */ import_react94.default.createElement(Text, null, mask.repeat(value.length)), /* @__PURE__ */ import_react94.default.createElement(Text, { inverse: true }, " "));
 }
 
 // src/cli/ui/Setup.tsx
 function Setup({ onReady }) {
   const [value, setValue] = (0, import_react95.useState)("");
   const [error, setError] = (0, import_react95.useState)(null);
-  const { exit: exit2 } = fc();
+  const { exit: exit2 } = use_app_default();
   const handleSubmit = (raw) => {
     const trimmed = raw.trim();
     if (trimmed === "/exit" || trimmed === "/quit") {
@@ -63241,7 +63251,7 @@ function Setup({ onReady }) {
     }
     onReady(trimmed);
   };
-  return /* @__PURE__ */ import_react95.default.createElement(W, { flexDirection: "column", paddingX: 1, marginY: 1 }, /* @__PURE__ */ import_react95.default.createElement(W, null, /* @__PURE__ */ import_react95.default.createElement(L, { bold: true, color: GRADIENT[0] }, GLYPH.brand), /* @__PURE__ */ import_react95.default.createElement(L, null, "  "), /* @__PURE__ */ import_react95.default.createElement(L, { bold: true }, t("wizard.welcomeTitle"))), /* @__PURE__ */ import_react95.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(L, { color: COLOR.info }, t("wizard.apiKeyPrompt"))), /* @__PURE__ */ import_react95.default.createElement(W, null, /* @__PURE__ */ import_react95.default.createElement(L, { dimColor: true }, `  ${t("wizard.apiKeyGetOne")}`)), /* @__PURE__ */ import_react95.default.createElement(W, null, /* @__PURE__ */ import_react95.default.createElement(L, { dimColor: true }, t("wizard.apiKeySavedLocally", { path: defaultConfigPath() }))), /* @__PURE__ */ import_react95.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(L, { bold: true, color: COLOR.brand }, GLYPH.bar), /* @__PURE__ */ import_react95.default.createElement(L, { bold: true, color: COLOR.primary }, " \u203A "), /* @__PURE__ */ import_react95.default.createElement(
+  return /* @__PURE__ */ import_react95.default.createElement(Box_default, { flexDirection: "column", paddingX: 1, marginY: 1 }, /* @__PURE__ */ import_react95.default.createElement(Box_default, null, /* @__PURE__ */ import_react95.default.createElement(Text, { bold: true, color: GRADIENT[0] }, GLYPH.brand), /* @__PURE__ */ import_react95.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react95.default.createElement(Text, { bold: true }, t("wizard.welcomeTitle"))), /* @__PURE__ */ import_react95.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(Text, { color: COLOR.info }, t("wizard.apiKeyPrompt"))), /* @__PURE__ */ import_react95.default.createElement(Box_default, null, /* @__PURE__ */ import_react95.default.createElement(Text, { dim: true }, `  ${t("wizard.apiKeyGetOne")}`)), /* @__PURE__ */ import_react95.default.createElement(Box_default, null, /* @__PURE__ */ import_react95.default.createElement(Text, { dim: true }, t("wizard.apiKeySavedLocally", { path: defaultConfigPath() }))), /* @__PURE__ */ import_react95.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(Text, { bold: true, color: COLOR.brand }, GLYPH.bar), /* @__PURE__ */ import_react95.default.createElement(Text, { bold: true, color: COLOR.primary }, " \u203A "), /* @__PURE__ */ import_react95.default.createElement(
     MaskedInput,
     {
       value,
@@ -63250,7 +63260,7 @@ function Setup({ onReady }) {
       mask: "\u2022",
       placeholder: t("wizard.apiKeyPlaceholder")
     }
-  )), error ? /* @__PURE__ */ import_react95.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(L, { color: COLOR.err, bold: true }, GLYPH.err), /* @__PURE__ */ import_react95.default.createElement(L, { color: COLOR.err }, `  ${error}`)) : value ? /* @__PURE__ */ import_react95.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(L, { dimColor: true }, t("wizard.apiKeyPreview", { redacted: redactKey(value) }))) : null, /* @__PURE__ */ import_react95.default.createElement(W, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(L, { dimColor: true }, t("wizard.exitHint"))));
+  )), error ? /* @__PURE__ */ import_react95.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(Text, { color: COLOR.err, bold: true }, GLYPH.err), /* @__PURE__ */ import_react95.default.createElement(Text, { color: COLOR.err }, `  ${error}`)) : value ? /* @__PURE__ */ import_react95.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(Text, { dim: true }, t("wizard.apiKeyPreview", { redacted: redactKey(value) }))) : null, /* @__PURE__ */ import_react95.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react95.default.createElement(Text, { dim: true }, t("wizard.exitHint"))));
 }
 
 // src/cli/ui/drain-tty.ts
@@ -63553,7 +63563,7 @@ async function chatCommand(opts) {
       process.exit(143);
     });
   }
-  const { waitUntilExit } = Wo(
+  const { waitUntilExit } = renderSync(
     /* @__PURE__ */ import_react96.default.createElement(
       Root,
       {
@@ -63589,4 +63599,4 @@ async function chatCommand(opts) {
 export {
   chatCommand
 };
-//# sourceMappingURL=chunk-GNRKXRRE.js.map
+//# sourceMappingURL=chunk-S3QII236.js.map