@carboncode/cli 0.1.0 → 0.1.1

package/dist/cli/{chunk-J5BYPUB5.js → chunk-2EKLWOE3.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-JMBMLOBP.js";
 import {
   createMcpRuntime
-} from "./chunk-CPKCNHRR.js";
+} from "./chunk-BYBOY5UY.js";
 import {
   Eventizer,
   autoResolveVerdict,
@@ -19,7 +19,7 @@ import {
 import {
   formatMcpLifecycleEvent,
   formatMcpSlowToast
-} from "./chunk-XJ5SRLKK.js";
+} from "./chunk-OYAIE6C7.js";
 import {
   buildTransportFromSpec
 } from "./chunk-VPMBGAND.js";
@@ -41,6 +41,7 @@ import {
   looksLikeAbsoluteSystemPath,
   parseAtQuery,
   parseEditBlocks,
+  parseUnifiedPatch,
   pathIsUnder,
   rankPickerCandidates,
   registerChoiceTool,
@@ -53,19 +54,19 @@ import {
   toWholeFileEditBlock,
   walkFilesStream,
   webFetch
-} from "./chunk-4TVNJWMA.js";
+} from "./chunk-LRXTF6NZ.js";
 import {
   openTranscriptFile,
   recordFromLoopEvent,
   writeRecord
-} from "./chunk-T5TQ4NDT.js";
+} from "./chunk-MDQWQYBS.js";
 import {
   McpClient
 } from "./chunk-GALC45Q2.js";
 import {
   MemoryStore,
   effectivePriority
-} from "./chunk-QJG7OF27.js";
+} from "./chunk-QLPHVU3W.js";
 import {
   wrapper_default
 } from "./chunk-FEZK652I.js";
@@ -73,7 +74,7 @@ import {
   KeystrokeProvider,
   SingleSelect,
   useKeystroke
-} from "./chunk-UI66BH6D.js";
+} from "./chunk-2UXHZAXP.js";
 import {
   COLOR,
   GLYPH,
@@ -81,7 +82,7 @@ import {
   ThemeProvider,
   useColor,
   useThemeTokens
-} from "./chunk-D5NFKRGO.js";
+} from "./chunk-VVQTSZWX.js";
 import {
   Box_default,
   Text,
@@ -101,20 +102,20 @@ import {
 } from "./chunk-2425HK6U.js";
 import {
   runDoctorChecks
-} from "./chunk-BSINVTTL.js";
+} from "./chunk-7R3PKZXB.js";
 import {
   countTokensBounded
 } from "./chunk-6OWJV3YW.js";
 import {
   DeepSeekClient,
   pickPrimaryBalance
-} from "./chunk-BSGCXZQN.js";
+} from "./chunk-PT4UDK7Z.js";
 import {
   loadDotenv
 } from "./chunk-2UQP6H6T.js";
 import {
   renderDashboard
-} from "./chunk-4IBIPQVB.js";
+} from "./chunk-J6UWUIT2.js";
 import {
   MANUAL_UPDATE_COMMANDS,
   planUpdate
@@ -153,10 +154,11 @@ import {
 } from "./chunk-4VR6XF4P.js";
 import {
   BUILTIN_ALLOWLIST,
+  applyMultiEdit,
   formatCommandResult,
   pauseGate,
   runCommand
-} from "./chunk-TH756VLN.js";
+} from "./chunk-NCMC7AMN.js";
 import {
   PROJECT_MEMORY_FILE,
   SkillStore,
@@ -171,7 +173,7 @@ import {
   loadHooks,
   projectSettingsPath,
   runHooks
-} from "./chunk-IX6XI2RG.js";
+} from "./chunk-3PNIUDTA.js";
 import {
   deleteSession,
   detectGitBranch,
@@ -194,12 +196,12 @@ import {
   appendUsage,
   defaultUsageLogPath,
   readUsageLog
-} from "./chunk-QVC75MR3.js";
+} from "./chunk-U7RHC7D6.js";
 import {
   DEEPSEEK_CONTEXT_TOKENS,
   DEFAULT_CONTEXT_TOKENS,
   pricingFor
-} from "./chunk-ILJOIQ5W.js";
+} from "./chunk-NTF4IE7G.js";
 import {
   getLanguage,
   getSupportedLanguages,
@@ -208,7 +210,7 @@ import {
   setLanguage,
   t,
   tObj
-} from "./chunk-IAUOP25G.js";
+} from "./chunk-V6A26HU5.js";
 import {
   CARD,
   FG,
@@ -261,7 +263,7 @@ import {
   webSearchEndpoint,
   webSearchEngine,
   writeConfig
-} from "./chunk-4MQ3VURH.js";
+} from "./chunk-ZADUQPQP.js";
 import {
   VERSION,
   compareVersions,
@@ -44717,9 +44719,9 @@ var QQChannel = class {
     try {
       await bot.start();
       const readyOrError = await Promise.race([
-        new Promise((resolve4) => bot.once("online", () => resolve4("ready"))),
-        new Promise((resolve4) => bot.once("bot_error", () => resolve4("error"))),
-        new Promise((resolve4) => setTimeout(() => resolve4("timeout"), 15e3))
+        new Promise((resolve6) => bot.once("online", () => resolve6("ready"))),
+        new Promise((resolve6) => bot.once("bot_error", () => resolve6("error"))),
+        new Promise((resolve6) => setTimeout(() => resolve6("timeout"), 15e3))
       ]);
       if (readyOrError === "error") {
         throw new Error("QQ bot authentication failed - check your appId and appSecret");
@@ -44760,7 +44762,7 @@ var QQChannel = class {
 
 // src/cli/ui/App.tsx
 import { statSync as statSync2 } from "fs";
-import { relative as relative2, resolve as resolve3 } from "path";
+import { resolve as resolve4 } from "path";
 var import_react90 = __toESM(require_react(), 1);
 
 // src/code/pending-edits.ts
@@ -44896,8 +44898,8 @@ function useQQChannel({
       if (isRawModeSupported) setRawMode(false);
       const rl = createInterface({ input: process.stdin, output: process.stdout });
       try {
-        const answer = await new Promise((resolve4) => {
-          rl.question(prompt, resolve4);
+        const answer = await new Promise((resolve6) => {
+          rl.question(prompt, resolve6);
         });
         return answer.trim() || fallback || "";
       } finally {
@@ -45714,14 +45716,14 @@ async function openInExternalEditor(initial2) {
   }
 }
 function spawnEditor(editor, path) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve6, reject) => {
     const child = spawn(`${editor} "${path}"`, {
       shell: true,
       stdio: "inherit"
     });
     child.on("error", reject);
     child.on("exit", (code) => {
-      if (code === 0 || code === null) resolve4();
+      if (code === 0 || code === null) resolve6();
       else reject(new Error(String(code)));
     });
   });
@@ -45734,55 +45736,8 @@ function normalizeEditorBuffer(s) {
 
 // src/cli/ui/BootSplash.tsx
 var import_react2 = __toESM(require_react(), 1);
-var CARBON_CODE_LOGO = [
-  "CARBON CODE",
-  " \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2557   \u2588\u2588\u2557     \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557",
-  "\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551    \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D",
-  "\u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2554\u2588\u2588\u2557 \u2588\u2588\u2551    \u2588\u2588\u2551     \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2557  ",
-  "\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551\u255A\u2588\u2588\u2557\u2588\u2588\u2551    \u2588\u2588\u2551     \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u255D  ",
-  "\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2551    \u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557",
-  " \u255A\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u255D  \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D     \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D"
-];
-var WHALE_LINES = [
-  "                _____:_____",
-  "          __.-''           ''-.__",
-  "       ,-'   \u2591\u2591\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2591\u2591     '-.",
-  "     ,'   \u2591\u2592\u2592\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2592\u2592\u2591     '\\",
-  "    /   \u2591\u2592\u2593\u2593\u2593\u2593\u25C9\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2592\u2591     '\\___",
-  "   |  \u2591\u2592\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2592\u2591         '\\\\__",
-  "   |  \u2591\u2592\u2593\u2593\u2593\u2593\u2593\u2593 \u203F\u203F\u203F \u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2592\u2591          \\\\__\\",
-  "   |  \u2591\u2592\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2592\u2591          //__/",
-  "    \\   \u2591\u2592\u2592\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2593\u2592\u2592\u2591         //",
-  "     '\\.   \u2591\u2591\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2591\u2591       __,/'",
-  "        '-..___                 ___..-'",
-  "              '''---..........---'''"
-];
-var SPOUT_FRAMES = [
-  ["                  ", "                  ", "                  "],
-  ["                  ", "                  ", "                 ."],
-  ["                  ", "                 .", "                 :"],
-  ["                 .", "                 :", "                 :"],
-  ["              .  '  .", "                 :", "                 :"],
-  ["              '  .  '", "                 '", "                 :"],
-  ["              .     .", "                  '", "                  "]
-];
-var WAVE_SOURCE = "~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^";
-var WAVE_WIDTH = 44;
-var FRAME_MS = 200;
 function BootSplash() {
-  const [frame, setFrame] = (0, import_react2.useState)(0);
-  (0, import_react2.useEffect)(() => {
-    const t2 = setInterval(() => setFrame((f) => f + 1), FRAME_MS);
-    return () => clearInterval(t2);
-  }, []);
-  const spout = SPOUT_FRAMES[frame % SPOUT_FRAMES.length];
-  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(Box_default, { flexDirection: "column", alignItems: "center", marginY: 1 }, /* @__PURE__ */ import_react2.default.createElement(Box_default, { flexDirection: "column", alignItems: "flex-start", marginBottom: 1 }, CARBON_CODE_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(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}`)));
+  return /* @__PURE__ */ import_react2.default.createElement(Box_default, { flexDirection: "row", gap: 1, marginY: 1 }, /* @__PURE__ */ import_react2.default.createElement(Text, { bold: true, color: TONE.brand }, "Carbon Code"), /* @__PURE__ */ import_react2.default.createElement(Text, { color: FG.meta }, t("common.loading")));
 }
 
 // src/cli/ui/CheckpointPicker.tsx
@@ -46086,7 +46041,7 @@ function ChoiceConfirmInner({ question, options: options2, allowCustom, onChoose
 var ChoiceConfirm = import_react7.default.memo(ChoiceConfirmInner);
 
 // src/cli/ui/ComposerArea.tsx
-var import_react23 = __toESM(require_react(), 1);
+var import_react22 = __toESM(require_react(), 1);
 
 // src/cli/ui/AtMentionSuggestions.tsx
 var import_react8 = __toESM(require_react(), 1);
@@ -46710,7 +46665,7 @@ function PromptInput({
   const { line: cursorLine, col: cursorCol } = lineAndColumn(value, cursor);
   const renderItems = collapseLinesForDisplay(lines, cursorLine);
   const showHugeBufferHints = lines.length > 20;
-  return /* @__PURE__ */ import_react9.default.createElement(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: accentColor, paddingX: 1 }, (() => {
+  return /* @__PURE__ */ import_react9.default.createElement(Box_default, { flexDirection: "column", paddingX: 1 }, (() => {
     const rows = [];
     let firstRowEmitted = false;
     for (let renderIdx = 0; renderIdx < renderItems.length; renderIdx++) {
@@ -46823,18 +46778,7 @@ function PromptInput({
       }
     }
     return rows;
-  })(), showHugeBufferHints && !disabled ? /* @__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, !disabled ? /* @__PURE__ */ import_react9.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react9.default.createElement(HintRow, null)) : /* @__PURE__ */ import_react9.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "  esc to stop")));
-}
-function HintRow() {
-  const items = [
-    { key: "\u23CE", tKey: "composer.hintSend" },
-    { key: "\u21E7\u23CE", tKey: "composer.hintNewline" },
-    { key: "^U", tKey: "composer.hintClear" },
-    { key: "^P/^N", tKey: "composer.hintHistory" },
-    { key: "esc", tKey: "composer.hintAbort" },
-    { key: "^C", tKey: "composer.hintQuit" }
-  ];
-  return /* @__PURE__ */ import_react9.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react9.default.createElement(Text, null, "  "), items.map((item, i) => /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, { key: item.key }, i > 0 && /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "  \xB7  "), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.meta }, item.key), /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, ` ${t(item.tKey)}`))));
+  })(), showHugeBufferHints && !disabled ? /* @__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, disabled ? /* @__PURE__ */ import_react9.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react9.default.createElement(Text, { color: FG.faint }, "  esc to stop")) : null);
 }
 function splitLineByPastes(line) {
   const out = [];
@@ -47223,33 +47167,17 @@ function truncateCells(value, maxCells) {
 }
 
 // src/cli/ui/layout/LiveRows.tsx
-var import_react18 = __toESM(require_react(), 1);
-
-// src/cli/ui/char-bar.tsx
-var import_react12 = __toESM(require_react(), 1);
-function CharBar({
-  pct,
-  width = 24,
-  color = COLOR.primary,
-  emptyColor,
-  showLabel = true,
-  label
-}) {
-  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_react12.default.createElement(Box_default, null, /* @__PURE__ */ import_react12.default.createElement(Text, { color }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react12.default.createElement(Text, { color: emptyColor ?? COLOR.info, dimColor: true }, GLYPH.shade1.repeat(total - filled)), showLabel ? /* @__PURE__ */ import_react12.default.createElement(Text, { dimColor: true }, `  ${label ?? `${Math.round(clamped)}%`}`) : null);
-}
+var import_react17 = __toESM(require_react(), 1);
 
 // src/cli/ui/primitives/Card.tsx
-var import_react13 = __toESM(require_react(), 1);
-var ActiveCardContext = import_react13.default.createContext(true);
+var import_react12 = __toESM(require_react(), 1);
+var ActiveCardContext = import_react12.default.createContext(true);
 function Card({ children }) {
-  return /* @__PURE__ */ import_react13.default.createElement(Box_default, { flexDirection: "column", marginTop: 1, width: "100%" }, children);
+  return /* @__PURE__ */ import_react12.default.createElement(Box_default, { flexDirection: "column", marginTop: 1, width: "100%" }, children);
 }
 
 // src/cli/ui/primitives/CardHeader.tsx
-var import_react14 = __toESM(require_react(), 1);
+var import_react13 = __toESM(require_react(), 1);
 function CardHeader({
   glyph,
   tone,
@@ -47258,36 +47186,24 @@ function CardHeader({
   meta,
   right
 }) {
-  const active = (0, import_react14.useContext)(ActiveCardContext);
+  const active = (0, import_react13.useContext)(ActiveCardContext);
   const visibleMeta = active ? meta : meta?.filter((item) => typeof item !== "string");
-  return /* @__PURE__ */ import_react14.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react14.default.createElement(Text, { color: tone }, glyph), /* @__PURE__ */ import_react14.default.createElement(Text, { bold: true, color: tone }, title2), subtitle ? /* @__PURE__ */ import_react14.default.createElement(Text, { color: FG.body }, subtitle) : null, visibleMeta?.map((item, i) => {
+  return /* @__PURE__ */ import_react13.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react13.default.createElement(Text, { color: tone }, glyph), /* @__PURE__ */ import_react13.default.createElement(Text, { bold: true, color: tone }, title2), subtitle ? /* @__PURE__ */ import_react13.default.createElement(Text, { color: FG.body }, subtitle) : null, visibleMeta?.map((item, i) => {
     const isStr = typeof item === "string";
     const text = isStr ? item : item.text;
     const color = isStr ? FG.faint : item.color;
     return (
       // biome-ignore lint/suspicious/noArrayIndexKey: meta items are positional
-      /* @__PURE__ */ import_react14.default.createElement(import_react14.default.Fragment, { key: `m-${i}` }, /* @__PURE__ */ import_react14.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react14.default.createElement(Text, { color }, text))
+      /* @__PURE__ */ import_react13.default.createElement(import_react13.default.Fragment, { key: `m-${i}` }, /* @__PURE__ */ import_react13.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react13.default.createElement(Text, { color }, text))
     );
   }), active ? right : null);
 }
 
 // src/cli/ui/primitives/Pill.tsx
-var import_react15 = __toESM(require_react(), 1);
+var import_react14 = __toESM(require_react(), 1);
 function Pill({ label, bg, fg, bold = true }) {
-  return /* @__PURE__ */ import_react15.default.createElement(Text, { backgroundColor: bg, color: fg, bold }, ` ${label} `);
-}
-var PILL_SECTION = {
-  reason: { bg: "#2a1f3d", fg: "#d2a8ff" },
-  output: { bg: "#0d1d2e", fg: "#79c0ff" },
-  tool: { bg: "#0f2230", fg: "#79c0ff" },
-  shell: { bg: "#0f2230", fg: "#79c0ff" },
-  task: { bg: "#0d1d2e", fg: "#79c0ff" },
-  taskDone: { bg: "#102815", fg: "#7ee787" },
-  taskFailed: { bg: "#2c1416", fg: "#ff8b81" },
-  plan: { bg: "#2a1f3d", fg: "#d2a8ff" },
-  user: { bg: "#1a2433", fg: "#79c0ff" },
-  empty: { bg: "#11141a", fg: "#6e7681" }
-};
+  return /* @__PURE__ */ import_react14.default.createElement(Text, { backgroundColor: bg, color: fg, bold }, ` ${label} `);
+}
 var PILL_PATH = { bg: "#11141a", fg: "#8b949e" };
 var PILL_MODEL = {
   flash: { bg: "#11141a", fg: "#79c0ff" },
@@ -47305,18 +47221,18 @@ function modelBadgeFor(model2) {
 }
 
 // src/cli/ui/primitives/Spinner.tsx
-var import_react17 = __toESM(require_react(), 1);
+var import_react16 = __toESM(require_react(), 1);
 
 // src/cli/ui/ticker.tsx
-var import_react16 = __toESM(require_react(), 1);
+var import_react15 = __toESM(require_react(), 1);
 var FAST_TICK_MS = 120;
 var SLOW_TICK_MS = 1e3;
-var TickerActiveContext = (0, import_react16.createContext)(true);
+var TickerActiveContext = (0, import_react15.createContext)(true);
 function TickerProvider({ children, disabled }) {
-  return /* @__PURE__ */ import_react16.default.createElement(TickerActiveContext.Provider, { value: !disabled }, children);
+  return /* @__PURE__ */ import_react15.default.createElement(TickerActiveContext.Provider, { value: !disabled }, children);
 }
 function useTickerActive() {
-  return (0, import_react16.useContext)(TickerActiveContext);
+  return (0, import_react15.useContext)(TickerActiveContext);
 }
 function useTick() {
   const isActive = useTickerActive();
@@ -47327,7 +47243,7 @@ function useSlowTick() {
   return useAnimation({ interval: SLOW_TICK_MS, isActive }).frame;
 }
 function useElapsedSeconds() {
-  const [start] = (0, import_react16.useState)(() => Date.now());
+  const [start] = (0, import_react15.useState)(() => Date.now());
   useSlowTick();
   return Math.floor((Date.now() - start) / 1e3);
 }
@@ -47341,7 +47257,7 @@ function Spinner({ kind = "circle", color, bold }) {
   const frames = FRAMES[kind];
   const tick = useTick();
   const frame = tick % frames.length;
-  return /* @__PURE__ */ import_react17.default.createElement(Text, { bold, color }, frames[frame]);
+  return /* @__PURE__ */ import_react16.default.createElement(Text, { bold, color }, frames[frame]);
 }
 
 // src/cli/ui/layout/LiveRows.tsx
@@ -47349,51 +47265,49 @@ var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834"
 function ThinkingRow({ text }) {
   const elapsed = useElapsedSeconds();
   const { fg, tone } = useThemeTokens();
-  return /* @__PURE__ */ import_react18.default.createElement(Box_default, { marginY: 1, paddingX: 1, gap: 1 }, /* @__PURE__ */ import_react18.default.createElement(Spinner, { kind: "circle", color: TONE.accent }), /* @__PURE__ */ import_react18.default.createElement(Text, { italic: true, color: FG.sub }, text), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, `${elapsed}s`));
+  return /* @__PURE__ */ import_react17.default.createElement(Box_default, { marginY: 1, paddingX: 1, gap: 1 }, /* @__PURE__ */ import_react17.default.createElement(Spinner, { kind: "circle", color: TONE.accent }), /* @__PURE__ */ import_react17.default.createElement(Text, { italic: true, color: FG.sub }, text), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, `${elapsed}s`));
 }
 function ModeStatusBar({
   editMode,
   pendingCount,
   flash,
   planMode,
-  undoArmed,
   jobs: jobs2
 }) {
   useSlowTick();
   const running = jobs2?.runningCount() ?? 0;
-  const jobsTag = running > 0 ? /* @__PURE__ */ import_react18.default.createElement(Text, { color: TONE.warn, bold: true }, `  \xB7  \u23F5 ${running} job${running === 1 ? "" : "s"}`) : null;
+  const jobsTag = running > 0 ? /* @__PURE__ */ import_react17.default.createElement(Text, { color: TONE.warn, bold: true }, `  \xB7  \u23F5 ${running} job${running === 1 ? "" : "s"}`) : null;
   if (planMode) {
-    return /* @__PURE__ */ import_react18.default.createElement(ModeBarFrame, null, /* @__PURE__ */ import_react18.default.createElement(ModePill, { label: t("editMode.plan"), color: TONE.err, flash }), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, t("editMode.writesGated")), jobsTag);
+    return /* @__PURE__ */ import_react17.default.createElement(ModeBarFrame, null, /* @__PURE__ */ import_react17.default.createElement(ModePill, { label: t("editMode.plan"), color: TONE.err, flash }), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, t("editMode.writesGated")), jobsTag);
   }
   const label = editMode === "yolo" ? t("editMode.yolo") : editMode === "auto" ? t("editMode.auto") : t("editMode.review");
   const pillColor = editMode === "yolo" ? TONE.err : editMode === "auto" ? TONE.accent : TONE.brand;
   const mid = editMode === "yolo" ? t("editMode.editsShellAuto") : editMode === "auto" ? t("editMode.editsLandNow") : pendingCount > 0 ? t("editMode.queuedApplyDiscard", { count: pendingCount }) : t("editMode.editsQueued");
-  return /* @__PURE__ */ import_react18.default.createElement(ModeBarFrame, null, /* @__PURE__ */ import_react18.default.createElement(ModePill, { label, color: pillColor, flash }), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, t("editMode.shiftTabFlip", { mid })), jobsTag);
+  if (pendingCount === 0 && running === 0) return null;
+  return /* @__PURE__ */ import_react17.default.createElement(ModeBarFrame, null, /* @__PURE__ */ import_react17.default.createElement(ModePill, { label, color: pillColor, flash }), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, t("editMode.shiftTabFlip", { mid })), jobsTag);
 }
 function ModeBarFrame({ children }) {
-  return /* @__PURE__ */ import_react18.default.createElement(Box_default, { paddingX: 1 }, children);
+  return /* @__PURE__ */ import_react17.default.createElement(Box_default, { paddingX: 1 }, children);
 }
 function ModePill({
   label,
   color,
   flash
 }) {
-  return /* @__PURE__ */ import_react18.default.createElement(Text, { color, bold: true, inverse: flash }, `[${label}]`);
+  return /* @__PURE__ */ import_react17.default.createElement(Text, { color, bold: true, inverse: flash }, `[${label}]`);
 }
 function UndoBanner({
   banner
 }) {
   useTick();
-  const totalMs = 5e3;
   const paused = banner.pausedRemainingMs !== null;
   const remainingMs = paused ? banner.pausedRemainingMs ?? 0 : Math.max(0, banner.expiresAt - Date.now());
   const remainingSec = Math.ceil(remainingMs / 1e3);
   const ok = banner.results.filter((r) => r.status === "applied" || r.status === "created").length;
   const total = banner.results.length;
   const urgent = !paused && remainingSec <= 1;
-  const pct = remainingMs / totalMs * 100;
   const tone = paused ? TONE.warn : urgent ? TONE.err : TONE.accent;
-  return /* @__PURE__ */ import_react18.default.createElement(Box_default, { marginY: 1, paddingX: 1 }, /* @__PURE__ */ import_react18.default.createElement(Text, { backgroundColor: TONE.accent, color: "black", bold: true }, ` \u2713 AUTO-APPLIED ${ok}/${total} `), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, "   press "), /* @__PURE__ */ import_react18.default.createElement(Text, { backgroundColor: TONE.brand, color: "black", bold: true }, " u "), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, paused ? " to undo \xB7 " : " to undo \xB7 "), /* @__PURE__ */ import_react18.default.createElement(Text, { backgroundColor: paused ? TONE.warn : FG.faint, color: "black", bold: true }, " space "), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, paused ? " to resume  " : " to pause  "), /* @__PURE__ */ import_react18.default.createElement(CharBar, { pct, width: 20, color: tone, showLabel: false }), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, "  "), /* @__PURE__ */ import_react18.default.createElement(Text, { color: tone, bold: urgent || paused }, paused ? `${remainingSec}s \xB7 paused` : `${remainingSec}s`));
+  return /* @__PURE__ */ import_react17.default.createElement(Box_default, { paddingX: 1 }, /* @__PURE__ */ import_react17.default.createElement(Text, { color: TONE.accent, bold: true }, `\u2713 ${t("editMode.undoApplied", { ok, total })}`), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, ` \xB7 ${t(paused ? "editMode.undoPausedHint" : "editMode.undoHint")}`), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, " \xB7 "), /* @__PURE__ */ import_react17.default.createElement(Text, { color: tone, bold: urgent || paused }, paused ? `${remainingSec}s \xB7 paused` : `${remainingSec}s`));
 }
 function subagentPhaseLabel(phase, iter, elapsedMs) {
   if (phase === "summarising") return "summarising findings\u2026";
@@ -47408,7 +47322,7 @@ function SubagentRow({ activity }) {
   const last = activity.lastInner;
   const subtitle = activity.skillName ?? truncate(activity.task, 48);
   const modelBadge = activity.model ? modelBadgeFor(activity.model) : null;
-  return /* @__PURE__ */ import_react18.default.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ import_react18.default.createElement(
+  return /* @__PURE__ */ import_react17.default.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ import_react17.default.createElement(
     CardHeader,
     {
       glyph: "\u25CF",
@@ -47416,9 +47330,9 @@ function SubagentRow({ activity }) {
       title: "subagent",
       subtitle,
       meta: [`iter ${activity.iter}`, `${seconds}s`],
-      right: /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, modelBadge ? /* @__PURE__ */ import_react18.default.createElement(Pill, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null, /* @__PURE__ */ import_react18.default.createElement(Spinner, { kind: "braille", color: CARD.subagent.color }))
+      right: /* @__PURE__ */ import_react17.default.createElement(import_react17.default.Fragment, null, modelBadge ? /* @__PURE__ */ import_react17.default.createElement(Pill, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null, /* @__PURE__ */ import_react17.default.createElement(Spinner, { kind: "braille", color: CARD.subagent.color }))
     }
-  ), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, "task  ", /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.sub }, activity.task)), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, "last  ", last ? /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(Text, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.body }, last.label), last.meta ? /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, `   ${last.meta}`) : null) : /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, t("editMode.queuedDots"))), /* @__PURE__ */ import_react18.default.createElement(Text, { color: TONE.brand }, "\u25B6  ", phase));
+  ), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, "task  ", /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.sub }, activity.task)), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, "last  ", last ? /* @__PURE__ */ import_react17.default.createElement(import_react17.default.Fragment, null, /* @__PURE__ */ import_react17.default.createElement(Text, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.body }, last.label), last.meta ? /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, `   ${last.meta}`) : null) : /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, t("editMode.queuedDots"))), /* @__PURE__ */ import_react17.default.createElement(Text, { color: TONE.brand }, "\u25B6  ", phase));
 }
 function SubagentLiveStack({
   activities,
@@ -47426,22 +47340,22 @@ function SubagentLiveStack({
 }) {
   const tick = useTick();
   if (activities.length === 0) return null;
-  if (activities.length === 1) return /* @__PURE__ */ import_react18.default.createElement(SubagentRow, { activity: activities[0] });
+  if (activities.length === 1) return /* @__PURE__ */ import_react17.default.createElement(SubagentRow, { activity: activities[0] });
   const visible = activities.slice(0, max);
   const overflow = activities.length - visible.length;
   const summarising = activities.filter((a) => a.phase === "summarising").length;
   const metaParts = [`${activities.length} running`];
   if (summarising > 0) metaParts.push(`${summarising} summarising`);
-  return /* @__PURE__ */ import_react18.default.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ import_react18.default.createElement(
+  return /* @__PURE__ */ import_react17.default.createElement(Card, { tone: CARD.subagent.color }, /* @__PURE__ */ import_react17.default.createElement(
     CardHeader,
     {
       glyph: "\u25CF",
       tone: CARD.subagent.color,
       title: "subagents",
       subtitle: metaParts.join(" \xB7 "),
-      right: /* @__PURE__ */ import_react18.default.createElement(Spinner, { kind: "braille", color: CARD.subagent.color })
+      right: /* @__PURE__ */ import_react17.default.createElement(Spinner, { kind: "braille", color: CARD.subagent.color })
     }
-  ), visible.map((a, i) => /* @__PURE__ */ import_react18.default.createElement(CompactSubagentLine, { key: a.runId, activity: a, tick, index: i })), overflow > 0 ? /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, `  +${overflow} more running\u2026`) : null);
+  ), visible.map((a, i) => /* @__PURE__ */ import_react17.default.createElement(CompactSubagentLine, { key: a.runId, activity: a, tick, index: i })), overflow > 0 ? /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, `  +${overflow} more running\u2026`) : null);
 }
 function CompactSubagentLine({
   activity,
@@ -47456,7 +47370,7 @@ function CompactSubagentLine({
   const title2 = activity.skillName ?? truncate(activity.task, 28);
   const titlePadded = title2.padEnd(28);
   const last = activity.lastInner;
-  return /* @__PURE__ */ import_react18.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react18.default.createElement(Text, { color: glyphColor, bold: true }, `  ${glyph} `), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.body }, titlePadded), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, `  iter ${String(activity.iter).padStart(2)} \xB7 ${seconds}s \xB7 `), last ? /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(Text, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.body }, truncate(last.label, 18)), last.meta ? /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, `  ${last.meta}`) : null) : /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, t("editMode.queuedDots")));
+  return /* @__PURE__ */ import_react17.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react17.default.createElement(Text, { color: glyphColor, bold: true }, `  ${glyph} `), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.body }, titlePadded), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, `  iter ${String(activity.iter).padStart(2)} \xB7 ${seconds}s \xB7 `), last ? /* @__PURE__ */ import_react17.default.createElement(import_react17.default.Fragment, null, /* @__PURE__ */ import_react17.default.createElement(Text, { color: last.color }, `${last.glyph} `), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.body }, truncate(last.label, 18)), last.meta ? /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, `  ${last.meta}`) : null) : /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, t("editMode.queuedDots")));
 }
 function truncate(text, max) {
   return text.length > max ? `${text.slice(0, max)}\u2026` : text;
@@ -47468,7 +47382,7 @@ function OngoingToolRow({
   const tick = useTick();
   const elapsed = useElapsedSeconds();
   const summary = summarizeToolArgs(tool.name, tool.args);
-  return /* @__PURE__ */ import_react18.default.createElement(Box_default, { marginY: 1, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react18.default.createElement(Box_default, null, /* @__PURE__ */ import_react18.default.createElement(Text, { color: CARD.tool.color, bold: true }, SPINNER_FRAMES[tick % SPINNER_FRAMES.length]), /* @__PURE__ */ import_react18.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react18.default.createElement(Text, { color: CARD.tool.color, bold: true }, `\u25A3 ${tool.name}`), /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, `  running \xB7 ${elapsed}s`)), progress ? /* @__PURE__ */ import_react18.default.createElement(Box_default, { paddingLeft: 3 }, /* @__PURE__ */ import_react18.default.createElement(Text, { color: TONE.brand }, renderProgressLine(progress))) : null, summary ? /* @__PURE__ */ import_react18.default.createElement(Box_default, { paddingLeft: 3 }, /* @__PURE__ */ import_react18.default.createElement(Text, { color: FG.faint }, summary)) : null);
+  return /* @__PURE__ */ import_react17.default.createElement(Box_default, { marginY: 1, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react17.default.createElement(Box_default, null, /* @__PURE__ */ import_react17.default.createElement(Text, { color: CARD.tool.color, bold: true }, SPINNER_FRAMES[tick % SPINNER_FRAMES.length]), /* @__PURE__ */ import_react17.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react17.default.createElement(Text, { color: CARD.tool.color, bold: true }, `\u25A3 ${tool.name}`), /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, `  running \xB7 ${elapsed}s`)), progress ? /* @__PURE__ */ import_react17.default.createElement(Box_default, { paddingLeft: 3 }, /* @__PURE__ */ import_react17.default.createElement(Text, { color: TONE.brand }, renderProgressLine(progress))) : null, summary ? /* @__PURE__ */ import_react17.default.createElement(Box_default, { paddingLeft: 3 }, /* @__PURE__ */ import_react17.default.createElement(Text, { color: FG.faint }, summary)) : null);
 }
 function renderProgressLine(p) {
   const msg = p.message ? `  ${p.message}` : "";
@@ -47524,18 +47438,85 @@ function summarizeToolArgs(name, args) {
 }
 
 // src/cli/ui/layout/StatusRow.tsx
-var import_react21 = __toESM(require_react(), 1);
+var import_react20 = __toESM(require_react(), 1);
 
 // src/cli/ui/primitives/Countdown.tsx
-var import_react19 = __toESM(require_react(), 1);
+var import_react18 = __toESM(require_react(), 1);
 function Countdown({ endsAt, color = TONE.brand }) {
   useSlowTick();
   const remainingSec = Math.max(0, Math.ceil((endsAt - Date.now()) / 1e3));
-  return /* @__PURE__ */ import_react19.default.createElement(Text, { bold: true, color }, String(remainingSec));
+  return /* @__PURE__ */ import_react18.default.createElement(Text, { bold: true, color }, String(remainingSec));
 }
 
 // src/cli/ui/state/provider.tsx
-var import_react20 = __toESM(require_react(), 1);
+var import_react19 = __toESM(require_react(), 1);
+
+// src/cli/ui/interrupt-cleanup.ts
+function cleanupInterruptedCards(cards, endedAt = Date.now()) {
+  let changed = false;
+  const next = [];
+  for (const card of cards) {
+    if (card.kind === "live" && card.variant === "thinking") {
+      changed = true;
+      continue;
+    }
+    const cleaned = cleanupInterruptedCard(card, endedAt);
+    if (cleaned !== card) changed = true;
+    next.push(cleaned);
+  }
+  return changed ? next : cards;
+}
+function cleanupInterruptedCard(card, endedAt) {
+  if (card.kind === "reasoning" && card.streaming) {
+    return {
+      ...card,
+      streaming: false,
+      aborted: true,
+      endedAt,
+      paragraphs: card.paragraphs || countParagraphs(card.text),
+      tokens: card.tokens || Math.round(card.text.length / 4)
+    };
+  }
+  if (card.kind === "streaming" && !card.done) {
+    return { ...card, done: true, aborted: true, endedAt };
+  }
+  if (card.kind === "tool" && !card.done) {
+    return { ...card, done: true, aborted: true };
+  }
+  if (card.kind === "task" && card.status === "running") {
+    return cleanupTaskCard(card);
+  }
+  if (card.kind === "subagent" && card.status === "running") {
+    return cleanupSubagentCard(card, endedAt);
+  }
+  return card;
+}
+function cleanupTaskCard(card) {
+  let stepChanged = false;
+  const steps = card.steps.map((step) => {
+    if (step.status !== "running") return step;
+    stepChanged = true;
+    return { ...step, status: "failed" };
+  });
+  return {
+    ...card,
+    status: "failed",
+    steps: stepChanged ? steps : card.steps
+  };
+}
+function cleanupSubagentCard(card, endedAt) {
+  const children = cleanupInterruptedCards(card.children, endedAt);
+  return {
+    ...card,
+    status: "failed",
+    children: children === card.children ? card.children : [...children]
+  };
+}
+function countParagraphs(text) {
+  const trimmed = text.trim();
+  if (!trimmed) return 0;
+  return trimmed.split(/\n\s*\n/).length;
+}
 
 // src/cli/ui/state/reducer.ts
 function reduce(state, event) {
@@ -47580,11 +47561,12 @@ function reduce(state, event) {
     case "tool.end": {
       const finalOutput = event.output ?? "";
       const rejected = isPlanModeRejection(finalOutput);
+      const exitCode = event.exitCode ?? inferToolExitCode(finalOutput);
       return mutateCard(state, event.id, "tool", (c) => ({
         ...c,
         done: true,
         output: event.output ?? c.output,
-        exitCode: event.exitCode,
+        exitCode,
         elapsedMs: event.elapsedMs,
         ...event.aborted ? { aborted: true } : {},
         ...rejected ? { rejected: true } : {}
@@ -47601,6 +47583,23 @@ function reduce(state, event) {
         turnInProgress: false,
         composer: { ...state.composer, abortedHint: true }
       };
+    case "turn.interrupt.cleanup":
+      return appendCard(
+        {
+          ...state,
+          cards: cleanupInterruptedCards(state.cards, event.ts),
+          turnInProgress: false,
+          composer: { ...state.composer, abortedHint: true }
+        },
+        {
+          kind: "live",
+          id: event.id,
+          ts: event.ts,
+          variant: "aborted",
+          tone: "warn",
+          text: event.text
+        }
+      );
     case "turn.end": {
       const sessionCost = state.status.sessionCost + event.usage.cost;
       const sessionInputTokens = state.status.sessionInputTokens + event.usage.prompt;
@@ -47904,6 +47903,22 @@ function isPlanModeRejection(output) {
     return false;
   }
 }
+function inferToolExitCode(output) {
+  if (!output) return void 0;
+  try {
+    const parsed = JSON.parse(output.trim());
+    if (!parsed || typeof parsed !== "object") return void 0;
+    const error = parsed.error;
+    if (typeof error !== "string") return void 0;
+    return isControlSignalError(error) ? void 0 : 1;
+  } catch {
+    return void 0;
+  }
+}
+function isControlSignalError(error) {
+  const tag2 = error.split(":", 1)[0]?.trim();
+  return tag2 === "PlanProposedError" || tag2 === "PlanRevisionProposedError" || tag2 === "ChoiceRequestedError" || tag2 === "NeedsConfirmationError";
+}
 
 // src/cli/ui/state/state.ts
 function initialState(session, cards = []) {
@@ -47964,26 +47979,26 @@ function createStore(session, initialCards) {
 }
 
 // src/cli/ui/state/provider.tsx
-var StoreCtx = import_react20.default.createContext(null);
+var StoreCtx = import_react19.default.createContext(null);
 function AgentStoreProvider({
   session,
   initialCards,
   children
 }) {
-  const initialCardsRef = import_react20.default.useRef(initialCards);
-  const store = import_react20.default.useMemo(() => createStore(session, initialCardsRef.current), [session]);
-  return /* @__PURE__ */ import_react20.default.createElement(StoreCtx.Provider, { value: store }, children);
+  const initialCardsRef = import_react19.default.useRef(initialCards);
+  const store = import_react19.default.useMemo(() => createStore(session, initialCardsRef.current), [session]);
+  return /* @__PURE__ */ import_react19.default.createElement(StoreCtx.Provider, { value: store }, children);
 }
 function useAgentStore() {
-  const store = import_react20.default.useContext(StoreCtx);
+  const store = import_react19.default.useContext(StoreCtx);
   if (!store) throw new Error("useAgentStore must be used inside AgentStoreProvider");
   return store;
 }
 function useAgentState(selector) {
   const store = useAgentStore();
-  const subscribe = import_react20.default.useCallback((cb) => store.subscribe(cb), [store]);
-  const getSnapshot = import_react20.default.useCallback(() => selector(store.getState()), [store, selector]);
-  return import_react20.default.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const subscribe = import_react19.default.useCallback((cb) => store.subscribe(cb), [store]);
+  const getSnapshot = import_react19.default.useCallback(() => selector(store.getState()), [store, selector]);
+  return import_react19.default.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 }
 function useDispatch() {
   return useAgentStore().dispatch;
@@ -47998,6 +48013,9 @@ var CTX_TOKENS_MIN_COLS = 90;
 var CTX_BAR_MIN_COLS = 110;
 var CTX_BAR_CELLS = 8;
 var DEFAULT_STATUS_BAR_CONFIG = {
+  showMode: true,
+  showPreset: true,
+  showSessionInfo: true,
   showBalance: true,
   showSessionCost: true,
   showTurnCost: true,
@@ -48017,29 +48035,82 @@ function StatusRow({
   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_react21.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "row", flexWrap: "wrap", flexShrink: 0 }, /* @__PURE__ */ import_react21.default.createElement(Text, null, "  "), status2.recording ? /* @__PURE__ */ import_react21.default.createElement(RecordingPill, { rec: status2.recording }) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ import_react21.default.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds }) : /* @__PURE__ */ import_react21.default.createElement(ModePill2, { mode: status2.mode, network: status2.network, detail: status2.networkDetail }), cols >= PRESET_MIN_COLS && status2.preset !== void 0 && /* @__PURE__ */ import_react21.default.createElement(PresetPill, { preset: status2.preset, model: session.model }), /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.sub }, `${session.id} \xB7 ${session.branch}`), hasTurn && statusBar.showTurnCost && /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { bold: true, color: TONE.brand }, "\u25B8 "), /* @__PURE__ */ import_react21.default.createElement(Text, { bold: true, color: FG.body }, `${formatCost(status2.cost, status2.balanceCurrency)} ${t("statusBar.turn")}`)), statusBar.showCacheHit && /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.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_react21.default.createElement(
-    CtxUsagePill,
-    {
-      tokens: status2.promptTokens,
-      cap: status2.promptCap ?? DEEPSEEK_CONTEXT_TOKENS[session.model] ?? DEFAULT_CONTEXT_TOKENS,
-      cols
-    }
-  ), status2.mcpLoading && status2.mcpLoading.ready < status2.mcpLoading.total && /* @__PURE__ */ import_react21.default.createElement(McpLoadingPill, { ready: status2.mcpLoading.ready, total: status2.mcpLoading.total }), showWallet && /* @__PURE__ */ import_react21.default.createElement(
-    WalletPill,
-    {
-      sessionCostUsd: status2.sessionCost,
-      balance: status2.balance,
-      currency: status2.balanceCurrency,
-      showSessionCost: statusBar.showSessionCost,
-      showBalance: statusBar.showBalance
-    }
-  ), statusBar.showVersion && cols >= VERSION_MIN_COLS && /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.faint }, `v${VERSION}`)), statusBar.showFeedbackHint && cols >= FEEDBACK_HINT_MIN_COLS && /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.meta }, "\u2691 "), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.sub }, "/feedback"))));
+  const segments = [];
+  if (statusBar.showMode) {
+    segments.push({
+      key: "mode",
+      node: status2.recording ? /* @__PURE__ */ import_react20.default.createElement(RecordingPill, { rec: status2.recording }) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ import_react20.default.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds }) : /* @__PURE__ */ import_react20.default.createElement(ModePill2, { mode: status2.mode, network: status2.network, detail: status2.networkDetail })
+    });
+  }
+  if (statusBar.showPreset && cols >= PRESET_MIN_COLS && status2.preset !== void 0) {
+    segments.push({
+      key: "preset",
+      node: /* @__PURE__ */ import_react20.default.createElement(PresetPill, { preset: status2.preset, model: session.model })
+    });
+  }
+  if (statusBar.showSessionInfo) {
+    segments.push({
+      key: "session",
+      node: /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.sub }, `${session.id} \xB7 ${session.branch}`)
+    });
+  }
+  if (hasTurn && statusBar.showTurnCost) {
+    segments.push({
+      key: "turn",
+      node: /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, null, /* @__PURE__ */ import_react20.default.createElement(Text, { bold: true, color: TONE.brand }, "\u25B8 "), /* @__PURE__ */ import_react20.default.createElement(Text, { bold: true, color: FG.body }, `${formatCost(status2.cost, status2.balanceCurrency)} ${t("statusBar.turn")}`))
+    });
+  }
+  if (statusBar.showCacheHit) {
+    segments.push({
+      key: "cache",
+      node: /* @__PURE__ */ import_react20.default.createElement(Text, { color: TONE.accent }, `${t("statusBar.cache")} ${Math.round(status2.cacheHit * 100)}%`)
+    });
+  }
+  if (statusBar.showCtxUsage && status2.promptTokens !== void 0 && status2.promptTokens > 0) {
+    segments.push({
+      key: "ctx",
+      node: /* @__PURE__ */ import_react20.default.createElement(
+        CtxUsagePill,
+        {
+          tokens: status2.promptTokens,
+          cap: status2.promptCap ?? DEEPSEEK_CONTEXT_TOKENS[session.model] ?? DEFAULT_CONTEXT_TOKENS,
+          cols
+        }
+      )
+    });
+  }
+  if (status2.mcpLoading && status2.mcpLoading.ready < status2.mcpLoading.total) {
+    segments.push({
+      key: "mcp",
+      node: /* @__PURE__ */ import_react20.default.createElement(McpLoadingPill, { ready: status2.mcpLoading.ready, total: status2.mcpLoading.total })
+    });
+  }
+  if (showWallet) {
+    segments.push({
+      key: "wallet",
+      node: /* @__PURE__ */ import_react20.default.createElement(
+        WalletPill,
+        {
+          sessionCostUsd: status2.sessionCost,
+          balance: status2.balance,
+          currency: status2.balanceCurrency,
+          showSessionCost: statusBar.showSessionCost,
+          showBalance: statusBar.showBalance
+        }
+      )
+    });
+  }
+  if (statusBar.showVersion && cols >= VERSION_MIN_COLS) {
+    segments.push({ key: "version", node: /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.faint }, `v${VERSION}`) });
+  }
+  if (statusBar.showFeedbackHint && cols >= FEEDBACK_HINT_MIN_COLS) {
+    segments.push({
+      key: "feedback",
+      node: /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, null, /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.meta }, "\u2691 "), /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.sub }, "/feedback"))
+    });
+  }
+  if (segments.length === 0) return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0 });
+  return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "row", flexWrap: "wrap", flexShrink: 0 }, /* @__PURE__ */ import_react20.default.createElement(Text, null, "  "), segments.map((segment, index) => /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, { key: segment.key }, index > 0 ? /* @__PURE__ */ import_react20.default.createElement(Sep, null) : null, segment.node))));
 }
 function PresetPill({
   preset: preset2,
@@ -48047,7 +48118,7 @@ function PresetPill({
 }) {
   const label = preset2 ?? shortModelLabel(model2);
   const color = preset2 === "pro" ? TONE.accent : preset2 === "flash" ? TONE.brand : FG.sub;
-  return /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "\u25B4 "), /* @__PURE__ */ import_react21.default.createElement(Text, { color, wrap: "truncate" }, label));
+  return /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, null, /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "\u25B4 "), /* @__PURE__ */ import_react20.default.createElement(Text, { color, wrap: "truncate" }, label));
 }
 function shortModelLabel(model2) {
   if (model2 === "deepseek-v4-flash") return "flash";
@@ -48065,13 +48136,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_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, `${t("statusBar.ctx")} `), showBar && /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Text, { color, wrap: "truncate" }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.faint, wrap: "truncate" }, GLYPH.shade1.repeat(CTX_BAR_CELLS - filled)), /* @__PURE__ */ import_react21.default.createElement(Text, { wrap: "truncate" }, " ")), /* @__PURE__ */ import_react21.default.createElement(Text, { color, wrap: "truncate" }, `${pct}%`), showTokens && /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.faint }, ` \xB7 ${formatTokens(tokens)}/${formatTokens(cap)}`));
+  return /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, null, /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, `${t("statusBar.ctx")} `), showBar && /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, null, /* @__PURE__ */ import_react20.default.createElement(Text, { color, wrap: "truncate" }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.faint, wrap: "truncate" }, GLYPH.shade1.repeat(CTX_BAR_CELLS - filled)), /* @__PURE__ */ import_react20.default.createElement(Text, { wrap: "truncate" }, " ")), /* @__PURE__ */ import_react20.default.createElement(Text, { color, wrap: "truncate" }, `${pct}%`), showTokens && /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.faint }, ` \xB7 ${formatTokens(tokens)}/${formatTokens(cap)}`));
 }
 function McpLoadingPill({
   ready,
   total
 }) {
-  return /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { color: TONE.brand, wrap: "truncate" }, "\u2301 "), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.body }, `${t("statusBar.mcpLoading")} ${ready}/${total}`));
+  return /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, null, /* @__PURE__ */ import_react20.default.createElement(Text, { color: TONE.brand, wrap: "truncate" }, "\u2301 "), /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.body }, `${t("statusBar.mcpLoading")} ${ready}/${total}`));
 }
 function WalletPill({
   sessionCostUsd,
@@ -48082,13 +48153,13 @@ function WalletPill({
 }) {
   const showSpent = showSessionCost && sessionCostUsd > 0;
   const showBalanceLine = showBalanceCfg && typeof balance === "number";
-  return /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(Sep, null), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "\u26C1 "), showSpent && /* @__PURE__ */ import_react21.default.createElement(
+  return /* @__PURE__ */ import_react20.default.createElement(import_react20.default.Fragment, null, /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "\u26C1 "), showSpent && /* @__PURE__ */ import_react20.default.createElement(
     Text,
     {
       color: FG.body
     },
     `${formatCost(sessionCostUsd, currency, 2)} ${t("statusBar.spent")}`
-  ), showSpent && showBalanceLine && /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "  /  "), showBalanceLine && /* @__PURE__ */ import_react21.default.createElement(Text, { bold: true, color: balanceColor(balance, currency), wrap: "truncate" }, formatBalance(balance, currency, { fractionDigits: 2 })), showBalanceLine && /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.faint, wrap: "truncate" }, t("statusBar.left")));
+  ), showSpent && showBalanceLine && /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "  /  "), showBalanceLine && /* @__PURE__ */ import_react20.default.createElement(Text, { bold: true, color: balanceColor(balance, currency), wrap: "truncate" }, formatBalance(balance, currency, { fractionDigits: 2 })), showBalanceLine && /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.faint, wrap: "truncate" }, t("statusBar.left")));
 }
 function ModePill2({
   mode: mode2,
@@ -48098,18 +48169,18 @@ function ModePill2({
   const modeLabel = `${t("statusBar.editsLabel")}${mode2}`;
   if (network === "online") {
     const pill = modeGlyph(mode2);
-    return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react21.default.createElement(Text, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.sub, wrap: "truncate" }, ` ${modeLabel}`));
+    return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react20.default.createElement(Text, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.sub, wrap: "truncate" }, ` ${modeLabel}`));
   }
   const dot = networkDot(network);
   if (network === "slow") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react21.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react21.default.createElement(Text, { color: dot.color }, ` ${modeLabel} \xB7 ${t("statusBar.slow")}${tail}`));
+    return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react20.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react20.default.createElement(Text, { color: dot.color }, ` ${modeLabel} \xB7 ${t("statusBar.slow")}${tail}`));
   }
   if (network === "disconnected") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react21.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react21.default.createElement(Text, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.disconnect")}${tail}`));
+    return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react20.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react20.default.createElement(Text, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.disconnect")}${tail}`));
   }
-  return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react21.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react21.default.createElement(Text, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.reconnecting")}`));
+  return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react20.default.createElement(Text, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ import_react20.default.createElement(Text, { color: dot.color, wrap: "truncate" }, ` ${t("statusBar.reconnecting")}`));
 }
 function CountdownRow({
   mode: mode2,
@@ -48117,11 +48188,11 @@ function CountdownRow({
 }) {
   const pill = modeGlyph(mode2);
   const endsAt = Date.now() + secondsLeft * 1e3;
-  return /* @__PURE__ */ import_react21.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react21.default.createElement(Text, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.sub, wrap: "truncate" }, ` ${t("statusBar.editsLabel")}${mode2}   \xB7   `), /* @__PURE__ */ import_react21.default.createElement(Text, { color: TONE.warn, wrap: "truncate" }, t("statusBar.approvingIn")), /* @__PURE__ */ import_react21.default.createElement(Countdown, { endsAt }), /* @__PURE__ */ import_react21.default.createElement(Text, { color: TONE.warn, wrap: "truncate" }, t("statusBar.escToInterrupt")));
+  return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react20.default.createElement(Text, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.sub, wrap: "truncate" }, ` ${t("statusBar.editsLabel")}${mode2}   \xB7   `), /* @__PURE__ */ import_react20.default.createElement(Text, { color: TONE.warn, wrap: "truncate" }, t("statusBar.approvingIn")), /* @__PURE__ */ import_react20.default.createElement(Countdown, { endsAt }), /* @__PURE__ */ import_react20.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_react21.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react21.default.createElement(Text, { bold: true, color: TONE.err, wrap: "truncate" }, t("statusBar.recordingGlyph")), /* @__PURE__ */ import_react21.default.createElement(
+  return /* @__PURE__ */ import_react20.default.createElement(Box_default, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ import_react20.default.createElement(Text, { bold: true, color: TONE.err, wrap: "truncate" }, t("statusBar.recordingGlyph")), /* @__PURE__ */ import_react20.default.createElement(
     Text,
     {
       color: TONE.err
@@ -48130,7 +48201,7 @@ function RecordingPill({ rec }) {
   ));
 }
 function Sep() {
-  return /* @__PURE__ */ import_react21.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "   \xB7   ");
+  return /* @__PURE__ */ import_react20.default.createElement(Text, { color: FG.meta, wrap: "truncate" }, "   \xB7   ");
 }
 function modeGlyph(mode2) {
   switch (mode2) {
@@ -48217,7 +48288,7 @@ function formatDuration(ms) {
 }
 
 // src/cli/ui/state/chat-scroll-provider.tsx
-var import_react22 = __toESM(require_react(), 1);
+var import_react21 = __toESM(require_react(), 1);
 
 // src/cli/ui/state/chat-scroll-store.ts
 var SCROLL_ARROW_ROWS = 3;
@@ -48346,44 +48417,43 @@ function createChatScrollStore() {
 }
 
 // src/cli/ui/state/chat-scroll-provider.tsx
-var Ctx = import_react22.default.createContext(null);
+var Ctx = import_react21.default.createContext(null);
 function ChatScrollProvider({
   children
 }) {
-  const store = import_react22.default.useMemo(() => createChatScrollStore(), []);
-  return /* @__PURE__ */ import_react22.default.createElement(Ctx.Provider, { value: store }, children);
+  const store = import_react21.default.useMemo(() => createChatScrollStore(), []);
+  return /* @__PURE__ */ import_react21.default.createElement(Ctx.Provider, { value: store }, children);
 }
 function useStore() {
-  const s = import_react22.default.useContext(Ctx);
+  const s = import_react21.default.useContext(Ctx);
   if (!s) throw new Error("useChatScroll* must be used inside ChatScrollProvider");
   return s;
 }
 function useChatScrollState(selector) {
   const store = useStore();
-  const subscribe = import_react22.default.useCallback((cb) => store.subscribe(cb), [store]);
-  const getSnapshot = import_react22.default.useCallback(() => selector(store.getState()), [store, selector]);
-  return import_react22.default.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const subscribe = import_react21.default.useCallback((cb) => store.subscribe(cb), [store]);
+  const getSnapshot = import_react21.default.useCallback(() => selector(store.getState()), [store, selector]);
+  return import_react21.default.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 }
 function useChatScrollActions() {
   return useStore();
 }
 
 // src/cli/ui/ComposerArea.tsx
-var HistoryHint = import_react23.default.memo(({ children }) => {
+var HistoryHint = import_react22.default.memo(({ children }) => {
   const pinned = useChatScrollState((s) => s.pinned);
   if (!pinned) {
-    return /* @__PURE__ */ import_react23.default.createElement(Text, { color: FG.faint }, "scrolled up \u2014 reading history \u2014 End / PgDn to return \u2014 \u2193 to advance one line");
+    return /* @__PURE__ */ import_react22.default.createElement(Text, { color: FG.faint }, "scrolled up \u2014 reading history \u2014 End / PgDn to return \u2014 \u2193 to advance one line");
   }
-  return /* @__PURE__ */ import_react23.default.createElement(import_react23.default.Fragment, null, children);
+  return /* @__PURE__ */ import_react22.default.createElement(import_react22.default.Fragment, null, children);
 });
 HistoryHint.displayName = "HistoryHint";
-var ComposerArea = import_react23.default.memo(
+var ComposerArea = import_react22.default.memo(
   ({
     editMode,
     pendingCount,
     modeFlash,
     planMode,
-    undoArmed,
     jobs: jobs2,
     activeLoop,
     statusBar,
@@ -48405,7 +48475,7 @@ var ComposerArea = import_react23.default.memo(
     slashArgMatches,
     slashArgSelected
   }) => {
-    const inputArea = /* @__PURE__ */ import_react23.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ import_react23.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, slashMatches !== null ? /* @__PURE__ */ import_react23.default.createElement(
+    const inputArea = /* @__PURE__ */ import_react22.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ import_react22.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, slashMatches !== null ? /* @__PURE__ */ import_react22.default.createElement(
       SlashSuggestions,
       {
         key: `slash-suggestions:${slashGroupMode ? "group" : "search"}`,
@@ -48414,7 +48484,7 @@ var ComposerArea = import_react23.default.memo(
         groupMode: slashGroupMode,
         advancedHidden: slashAdvancedHidden
       }
-    ) : null, atState !== null ? /* @__PURE__ */ import_react23.default.createElement(AtMentionSuggestions, { state: atState, selectedIndex: atSelected }) : null, slashArgContext ? /* @__PURE__ */ import_react23.default.createElement(
+    ) : null, atState !== null ? /* @__PURE__ */ import_react22.default.createElement(AtMentionSuggestions, { state: atState, selectedIndex: atSelected }) : null, slashArgContext ? /* @__PURE__ */ import_react22.default.createElement(
       SlashArgPicker,
       {
         matches: slashArgMatches,
@@ -48423,7 +48493,7 @@ var ComposerArea = import_react23.default.memo(
         kind: slashArgContext.kind,
         partial: slashArgContext.partial
       }
-    ) : null), /* @__PURE__ */ import_react23.default.createElement(
+    ) : null), /* @__PURE__ */ import_react22.default.createElement(
       PromptInput,
       {
         value: input,
@@ -48435,35 +48505,34 @@ var ComposerArea = import_react23.default.memo(
         onOpenExternalEditor,
         onCursorChange
       }
-    ), activeLoop ? /* @__PURE__ */ import_react23.default.createElement(LoopStatusRow, { loop: activeLoop }) : null, jobs2 ? /* @__PURE__ */ import_react23.default.createElement(
+    ), activeLoop ? /* @__PURE__ */ import_react22.default.createElement(LoopStatusRow, { loop: activeLoop }) : null, jobs2 ? /* @__PURE__ */ import_react22.default.createElement(
       ModeStatusBar,
       {
         editMode,
         pendingCount,
         flash: modeFlash,
         planMode,
-        undoArmed,
         jobs: jobs2
       }
-    ) : null, /* @__PURE__ */ import_react23.default.createElement(StatusRow, { statusBar }));
-    return /* @__PURE__ */ import_react23.default.createElement(HistoryHint, null, inputArea);
+    ) : null, /* @__PURE__ */ import_react22.default.createElement(StatusRow, { statusBar }));
+    return /* @__PURE__ */ import_react22.default.createElement(HistoryHint, null, inputArea);
   }
 );
 ComposerArea.displayName = "ComposerArea";
 function LoopStatusRow({
   loop: loop2
 }) {
-  const [, setTick] = import_react23.default.useState(0);
-  import_react23.default.useEffect(() => {
+  const [, setTick] = import_react22.default.useState(0);
+  import_react22.default.useEffect(() => {
     const id = setInterval(() => setTick((t2) => t2 + 1), 1e3);
     return () => clearInterval(id);
   }, []);
   const nextFireMs = Math.max(0, loop2.nextFireAt - Date.now());
-  return /* @__PURE__ */ import_react23.default.createElement(Box_default, null, /* @__PURE__ */ import_react23.default.createElement(Text, { color: "cyan" }, `loop: ${formatLoopStatus(loop2.prompt, nextFireMs, loop2.iter)} \u2014 /loop stop or type to cancel`));
+  return /* @__PURE__ */ import_react22.default.createElement(Box_default, null, /* @__PURE__ */ import_react22.default.createElement(Text, { color: "cyan" }, `loop: ${formatLoopStatus(loop2.prompt, nextFireMs, loop2.iter)} \u2014 /loop stop or type to cancel`));
 }
 
 // src/cli/ui/EditConfirm.tsx
-var import_react26 = __toESM(require_react(), 1);
+var import_react25 = __toESM(require_react(), 1);
 
 // src/code/diff-preview.ts
 function formatEditBlockDiff(block2, opts = {}) {
@@ -48615,14 +48684,14 @@ function capLines(lines, maxLines, indent) {
 }
 
 // src/cli/ui/DenyContextInput.tsx
-var import_react24 = __toESM(require_react(), 1);
+var import_react23 = __toESM(require_react(), 1);
 var DEFAULT_DESCRIPTION = t("denyContextInput.description");
 function DenyContextInput({
   description = DEFAULT_DESCRIPTION,
   onSubmit,
   onCancel
 }) {
-  const [value, setValue] = (0, import_react24.useState)("");
+  const [value, setValue] = (0, import_react23.useState)("");
   useKeystroke((ev) => {
     if (ev.paste) {
       setValue((v) => v + ev.input);
@@ -48644,17 +48713,17 @@ function DenyContextInput({
       setValue((v) => v + ev.input);
     }
   });
-  return /* @__PURE__ */ import_react24.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react24.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ import_react24.default.createElement(Text, { color: FG.sub }, description)), /* @__PURE__ */ import_react24.default.createElement(Box_default, null, /* @__PURE__ */ import_react24.default.createElement(Text, { bold: true, color: TONE.brand }, "\u203A "), /* @__PURE__ */ import_react24.default.createElement(Text, { color: FG.body }, value), /* @__PURE__ */ import_react24.default.createElement(Text, { backgroundColor: TONE.brand, color: "#000" }, " ")));
+  return /* @__PURE__ */ import_react23.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react23.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ import_react23.default.createElement(Text, { color: FG.sub }, description)), /* @__PURE__ */ import_react23.default.createElement(Box_default, null, /* @__PURE__ */ import_react23.default.createElement(Text, { bold: true, color: TONE.brand }, "\u203A "), /* @__PURE__ */ import_react23.default.createElement(Text, { color: FG.body }, value), /* @__PURE__ */ import_react23.default.createElement(Text, { backgroundColor: TONE.brand, color: "#000" }, " ")));
 }
 
 // src/cli/ui/SplitDiff.tsx
-var import_react25 = __toESM(require_react(), 1);
+var import_react24 = __toESM(require_react(), 1);
 function SplitDiff({ rows, totalCols }) {
   const { stdout } = use_stdout_default();
   const cols = totalCols ?? stdout?.columns ?? 80;
   const innerCols = Math.max(40, cols - 6);
   const halfCols = Math.floor((innerCols - 3) / 2);
-  return /* @__PURE__ */ import_react25.default.createElement(Box_default, { flexDirection: "column" }, rows.map((row2, i) => /* @__PURE__ */ import_react25.default.createElement(Box_default, { key: `r-${i}-${row2.left.num ?? "p"}-${row2.right.num ?? "p"}` }, /* @__PURE__ */ import_react25.default.createElement(Cell, { side: row2.left, width: halfCols, which: "left" }), /* @__PURE__ */ import_react25.default.createElement(Text, { color: COLOR.info, dimColor: true }, " \u2502 "), /* @__PURE__ */ import_react25.default.createElement(Cell, { side: row2.right, width: halfCols, which: "right" }))));
+  return /* @__PURE__ */ import_react24.default.createElement(Box_default, { flexDirection: "column" }, rows.map((row2, i) => /* @__PURE__ */ import_react24.default.createElement(Box_default, { key: `r-${i}-${row2.left.num ?? "p"}-${row2.right.num ?? "p"}` }, /* @__PURE__ */ import_react24.default.createElement(Cell, { side: row2.left, width: halfCols, which: "left" }), /* @__PURE__ */ import_react24.default.createElement(Text, { color: COLOR.info, dimColor: true }, " \u2502 "), /* @__PURE__ */ import_react24.default.createElement(Cell, { side: row2.right, width: halfCols, which: "right" }))));
 }
 function Cell({
   side,
@@ -48674,35 +48743,57 @@ function Cell({
   const truncated = raw.length > inner ? `${raw.slice(0, inner - 1)}\u2026` : raw;
   const padded = truncated.padEnd(inner);
   if (side.kind === "del") {
-    return /* @__PURE__ */ import_react25.default.createElement(Text, { color: "#fbc8c8", backgroundColor: "#2a1212" }, `${numStr} ${sign} ${padded}`);
+    return /* @__PURE__ */ import_react24.default.createElement(Text, { color: "#fbc8c8", backgroundColor: "#2a1212" }, `${numStr} ${sign} ${padded}`);
   }
   if (side.kind === "add") {
-    return /* @__PURE__ */ import_react25.default.createElement(Text, { color: "#bef0c8", backgroundColor: "#0c2718" }, `${numStr} ${sign} ${padded}`);
+    return /* @__PURE__ */ import_react24.default.createElement(Text, { color: "#bef0c8", backgroundColor: "#0c2718" }, `${numStr} ${sign} ${padded}`);
   }
   if (side.kind === "pad") {
-    return /* @__PURE__ */ import_react25.default.createElement(Text, { color: COLOR.info, dimColor: true, italic: !!raw }, `${numStr} ${sign} ${padded}`);
+    return /* @__PURE__ */ import_react24.default.createElement(Text, { color: COLOR.info, dimColor: true, italic: !!raw }, `${numStr} ${sign} ${padded}`);
   }
-  return /* @__PURE__ */ import_react25.default.createElement(Text, { dimColor: true }, `${numStr} ${sign} ${padded}`);
+  return /* @__PURE__ */ import_react24.default.createElement(Text, { dimColor: true }, `${numStr} ${sign} ${padded}`);
 }
 
 // src/cli/ui/EditConfirm.tsx
 var MODAL_OVERHEAD_ROWS = 18;
 var MIN_DIFF_ROWS = 8;
-function EditConfirm({ block: block2, onChoose }) {
+function EditConfirm({ block: block2, blocks, onChoose }) {
+  const effectiveBlocks = (0, import_react25.useMemo)(() => {
+    if (blocks && blocks.length > 0) return [...blocks];
+    return block2 ? [block2] : [];
+  }, [block2, blocks]);
+  const firstBlock = effectiveBlocks[0];
   const rows = useTotalRows();
   const allocated = useReserveRows("modal", {
     min: MODAL_OVERHEAD_ROWS + MIN_DIFF_ROWS,
     max: Math.max(MODAL_OVERHEAD_ROWS + MIN_DIFF_ROWS, rows - 4)
   });
   const budget2 = Math.max(MIN_DIFF_ROWS, allocated - MODAL_OVERHEAD_ROWS);
-  const allRows = (0, import_react26.useMemo)(
-    () => formatEditBlockSplit(block2, { contextLines: 2, maxLines: 1e5 }),
-    [block2]
-  );
-  const [scroll, setScroll] = (0, import_react26.useState)(0);
+  const allRows = (0, import_react25.useMemo)(() => {
+    const multi = effectiveBlocks.length > 1;
+    return effectiveBlocks.flatMap((b, index) => {
+      const diffRows = formatEditBlockSplit(b, { contextLines: 2, maxLines: 1e5 }).map(
+        (row2) => ({
+          kind: "diff",
+          key: diffRowKey(b, row2),
+          row: row2
+        })
+      );
+      if (!multi) return diffRows;
+      return [
+        {
+          kind: "header",
+          key: `h:${b.path}:${b.search.length}:${b.replace.length}`,
+          text: `${index + 1}. ${b.path}`
+        },
+        ...diffRows
+      ];
+    });
+  }, [effectiveBlocks]);
+  const [scroll, setScroll] = (0, import_react25.useState)(0);
   const maxScroll = Math.max(0, allRows.length - budget2);
   const effectiveScroll = Math.min(scroll, maxScroll);
-  const [phase, setPhase] = (0, import_react26.useState)("review");
+  const [phase, setPhase] = (0, import_react25.useState)("review");
   useKeystroke((ev) => {
     if (ev.paste) return;
     if (phase === "context") return;
@@ -48724,6 +48815,10 @@ function EditConfirm({ block: block2, onChoose }) {
       onChoose("flip-to-auto");
       return;
     }
+    if (key.escape) {
+      onChoose("reject");
+      return;
+    }
     if (key.downArrow || input === "j") {
       setScroll((s) => Math.min(maxScroll, s + 1));
       return;
@@ -48749,9 +48844,16 @@ function EditConfirm({ block: block2, onChoose }) {
       return;
     }
   });
-  const isNew = block2.search === "";
-  const removed = isNew ? 0 : (block2.search.match(/\n/g)?.length ?? 0) + 1;
-  const added = block2.replace === "" ? 0 : (block2.replace.match(/\n/g)?.length ?? 0) + 1;
+  if (!firstBlock) return /* @__PURE__ */ import_react25.default.createElement(import_react25.default.Fragment, null);
+  const isNew = effectiveBlocks.every((b) => b.search === "");
+  const removed = effectiveBlocks.reduce(
+    (sum, b) => sum + (b.search === "" ? 0 : countLines2(b.search)),
+    0
+  );
+  const added = effectiveBlocks.reduce(
+    (sum, b) => sum + (b.replace === "" ? 0 : countLines2(b.replace)),
+    0
+  );
   const tag2 = isNew ? t("editConfirm.newTag") : t("editConfirm.editTag");
   const tone = isNew ? "ok" : "warn";
   const glyph = isNew ? "\u271A" : "\u270E";
@@ -48771,7 +48873,7 @@ function EditConfirm({ block: block2, onChoose }) {
     );
   }
   if (phase === "context") {
-    return /* @__PURE__ */ import_react26.default.createElement(
+    return /* @__PURE__ */ import_react25.default.createElement(
       ApprovalCard,
       {
         tone: "error",
@@ -48780,7 +48882,7 @@ function EditConfirm({ block: block2, onChoose }) {
         metaRight: t("shellConfirm.optional"),
         footerHint: t("editConfirm.denyFooter")
       },
-      /* @__PURE__ */ import_react26.default.createElement(
+      /* @__PURE__ */ import_react25.default.createElement(
         DenyContextInput,
         {
           onSubmit: (context2) => onChoose("reject", context2),
@@ -48789,31 +48891,48 @@ function EditConfirm({ block: block2, onChoose }) {
       )
     );
   }
-  return /* @__PURE__ */ import_react26.default.createElement(
+  return /* @__PURE__ */ import_react25.default.createElement(
     ApprovalCard,
     {
       tone,
       glyph,
-      title: `${tag2}  ${block2.path}`,
+      title: effectiveBlocks.length === 1 ? `${tag2}  ${firstBlock.path}` : `${tag2}  ${new Set(effectiveBlocks.map((b) => b.path)).size} files`,
       metaRight: metaParts.join("  \xB7  "),
       footerHint: t("editConfirm.footer")
     },
-    hiddenAbove > 0 ? /* @__PURE__ */ import_react26.default.createElement(Text, { dimColor: true }, t(hiddenAbove === 1 ? "editConfirm.linesAbove" : "editConfirm.linesAbovePlural", {
+    hiddenAbove > 0 ? /* @__PURE__ */ import_react25.default.createElement(Text, { dimColor: true }, t(hiddenAbove === 1 ? "editConfirm.linesAbove" : "editConfirm.linesAbovePlural", {
       count: hiddenAbove
     })) : null,
-    /* @__PURE__ */ import_react26.default.createElement(SplitDiff, { rows: visibleRows }),
-    /* @__PURE__ */ import_react26.default.createElement(Box_default, null, /* @__PURE__ */ import_react26.default.createElement(Text, { color: "#fbc8c8", backgroundColor: "#2a1212" }, t("editConfirm.oldLabel")), /* @__PURE__ */ import_react26.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react26.default.createElement(Text, { color: "#bef0c8", backgroundColor: "#0c2718" }, t("editConfirm.newLabel")), /* @__PURE__ */ import_react26.default.createElement(Text, { dimColor: true }, t("editConfirm.sideBySide"))),
-    hiddenBelow > 0 ? /* @__PURE__ */ import_react26.default.createElement(Text, { dimColor: true }, t(hiddenBelow === 1 ? "editConfirm.linesBelow" : "editConfirm.linesBelowPlural", {
+    visibleRows.map(
+      (row2) => row2.kind === "header" ? /* @__PURE__ */ import_react25.default.createElement(Text, { key: row2.key, bold: true }, row2.text) : /* @__PURE__ */ import_react25.default.createElement(SplitDiff, { key: row2.key, rows: [row2.row] })
+    ),
+    /* @__PURE__ */ import_react25.default.createElement(Box_default, null, /* @__PURE__ */ import_react25.default.createElement(Text, { color: "#fbc8c8", backgroundColor: "#2a1212" }, t("editConfirm.oldLabel")), /* @__PURE__ */ import_react25.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react25.default.createElement(Text, { color: "#bef0c8", backgroundColor: "#0c2718" }, t("editConfirm.newLabel")), /* @__PURE__ */ import_react25.default.createElement(Text, { dimColor: true }, t("editConfirm.sideBySide"))),
+    hiddenBelow > 0 ? /* @__PURE__ */ import_react25.default.createElement(Text, { dimColor: true }, t(hiddenBelow === 1 ? "editConfirm.linesBelow" : "editConfirm.linesBelowPlural", {
       count: hiddenBelow
     })) : null
   );
 }
+function countLines2(text) {
+  return (text.match(/\n/g)?.length ?? 0) + 1;
+}
+function diffRowKey(block2, row2) {
+  return [
+    "d",
+    block2.path,
+    row2.left.num ?? "x",
+    row2.right.num ?? "x",
+    row2.left.kind,
+    row2.right.kind,
+    row2.left.text,
+    row2.right.text
+  ].join(":");
+}
 
 // src/cli/ui/LiveActivityArea.tsx
-var import_react30 = __toESM(require_react(), 1);
+var import_react29 = __toESM(require_react(), 1);
 
 // src/cli/ui/layout/ToastRail.tsx
-var import_react27 = __toESM(require_react(), 1);
+var import_react26 = __toESM(require_react(), 1);
 var TONE_COLOR = {
   ok: TONE.ok,
   info: TONE.brand,
@@ -48839,7 +48958,7 @@ function ToastRail() {
   const cols = stdout?.columns ?? 80;
   const rule = "\u2501".repeat(Math.max(20, cols - 4));
   const now = Date.now();
-  (0, import_react27.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     const timers = [];
     for (const t2 of toasts) {
       const remaining = Math.max(0, t2.ttlMs - (Date.now() - t2.bornAt));
@@ -48851,20 +48970,20 @@ 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(Box_default, { flexDirection: "column" }, visible.map((t2) => {
+  return /* @__PURE__ */ import_react26.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(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`)));
+    return /* @__PURE__ */ import_react26.default.createElement(Box_default, { key: t2.id, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react26.default.createElement(Text, { color }, rule), /* @__PURE__ */ import_react26.default.createElement(Box_default, { flexDirection: "row" }, /* @__PURE__ */ import_react26.default.createElement(Text, { color }, glyph), /* @__PURE__ */ import_react26.default.createElement(Text, { bold: true, color: body }, ` ${t2.title}`), t2.detail !== void 0 && /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.sub }, `  \xB7  ${t2.detail}`), /* @__PURE__ */ import_react26.default.createElement(Box_default, { flexGrow: 1 }), /* @__PURE__ */ import_react26.default.createElement(Text, { color: FG.faint }, `${remainingSec}s`)));
   }));
 }
 
 // src/cli/ui/layout/plan-live-row.tsx
-var import_react29 = __toESM(require_react(), 1);
+var import_react28 = __toESM(require_react(), 1);
 
 // src/cli/ui/cards/PlanCard.tsx
-var import_react28 = __toESM(require_react(), 1);
+var import_react27 = __toESM(require_react(), 1);
 var STATUS_GLYPH = {
   queued: "\u25CB",
   running: "\u25CF",
@@ -48890,11 +49009,11 @@ function PlanCard({ card }) {
   const hasRunning = card.steps.some((s) => s.status === "running");
   const cardTone = hasRunning ? toneActive.accent : tone.accent;
   const window2 = pickWindow(card.steps);
-  return /* @__PURE__ */ import_react28.default.createElement(Card, { tone: cardTone }, /* @__PURE__ */ import_react28.default.createElement(CardHeader, { glyph: "\u25CF", tone: cardTone, title: card.title, meta: [progress] }), 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) => {
+  return /* @__PURE__ */ import_react27.default.createElement(Card, { tone: cardTone }, /* @__PURE__ */ import_react27.default.createElement(CardHeader, { glyph: "\u25CF", tone: cardTone, title: card.title, meta: [progress] }), window2.hiddenBefore > 0 ? /* @__PURE__ */ import_react27.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react27.default.createElement(Text, { color: tone.ok }, "\u2713"), /* @__PURE__ */ import_react27.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(Box_default, { key: step.id, flexDirection: "row", gap: 1 }, /* @__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);
+    return /* @__PURE__ */ import_react27.default.createElement(Box_default, { key: step.id, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react27.default.createElement(Text, { color: statusColor[step.status] }, STATUS_GLYPH[step.status]), /* @__PURE__ */ import_react27.default.createElement(Text, { bold: isActive, color: titleColor }, `${step.indexLabel}. ${step.title}`), isActive ? /* @__PURE__ */ import_react27.default.createElement(Text, { color: toneActive.brand }, t("cardLabels.inProgress")) : null);
+  }), window2.hiddenAfter > 0 ? /* @__PURE__ */ import_react27.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react27.default.createElement(Text, { color: fg.faint }, "\u25CB"), /* @__PURE__ */ import_react27.default.createElement(Text, { color: fg.faint }, `\u22EF ${window2.hiddenAfter} ${t("cardLabels.upcoming")}`)) : null);
 }
 function pickWindow(steps) {
   if (steps.length <= VISIBLE_WINDOW) {
@@ -48936,11 +49055,11 @@ function PlanLiveRow() {
     return null;
   });
   if (!planCard) return null;
-  return /* @__PURE__ */ import_react29.default.createElement(PlanCard, { card: planCard });
+  return /* @__PURE__ */ import_react28.default.createElement(PlanCard, { card: planCard });
 }
 
 // src/cli/ui/LiveActivityArea.tsx
-var LiveActivityArea = import_react30.default.memo(
+var LiveActivityArea = import_react29.default.memo(
   ({
     noTakeoverOverlay,
     ongoingTool,
@@ -48953,16 +49072,16 @@ var LiveActivityArea = import_react30.default.memo(
     undoBanner,
     hideUndo
   }) => {
-    return /* @__PURE__ */ import_react30.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, noTakeoverOverlay && ongoingTool ? /* @__PURE__ */ import_react30.default.createElement(OngoingToolRow, { tool: ongoingTool, progress: toolProgress }) : null, noTakeoverOverlay && subagentActivities.length > 0 ? /* @__PURE__ */ import_react30.default.createElement(SubagentLiveStack, { activities: subagentActivities, max: 3 }) : null, noTakeoverOverlay && !ongoingTool && statusLine ? /* @__PURE__ */ import_react30.default.createElement(ThinkingRow, { text: statusLine }) : null, undoBanner && !hideUndo ? /* @__PURE__ */ import_react30.default.createElement(UndoBanner, { banner: undoBanner }) : null, noTakeoverOverlay && busy && !isStreaming && !ongoingTool && !statusLine ? /* @__PURE__ */ import_react30.default.createElement(ThinkingRow, { text: activityLabel }) : null, noTakeoverOverlay ? /* @__PURE__ */ import_react30.default.createElement(PlanLiveRow, null) : null, /* @__PURE__ */ import_react30.default.createElement(ToastRail, null));
+    return /* @__PURE__ */ import_react29.default.createElement(Box_default, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, noTakeoverOverlay && ongoingTool ? /* @__PURE__ */ import_react29.default.createElement(OngoingToolRow, { tool: ongoingTool, progress: toolProgress }) : null, noTakeoverOverlay && subagentActivities.length > 0 ? /* @__PURE__ */ import_react29.default.createElement(SubagentLiveStack, { activities: subagentActivities, max: 3 }) : null, noTakeoverOverlay && !ongoingTool && statusLine ? /* @__PURE__ */ import_react29.default.createElement(ThinkingRow, { text: statusLine }) : null, undoBanner && !hideUndo ? /* @__PURE__ */ import_react29.default.createElement(UndoBanner, { banner: undoBanner }) : null, noTakeoverOverlay && busy && !isStreaming && !ongoingTool && !statusLine ? /* @__PURE__ */ import_react29.default.createElement(ThinkingRow, { text: activityLabel }) : null, noTakeoverOverlay ? /* @__PURE__ */ import_react29.default.createElement(PlanLiveRow, null) : null, /* @__PURE__ */ import_react29.default.createElement(ToastRail, null));
   }
 );
 LiveActivityArea.displayName = "LiveActivityArea";
 
 // src/cli/ui/McpHub.tsx
-var import_react33 = __toESM(require_react(), 1);
+var import_react32 = __toESM(require_react(), 1);
 
 // src/cli/ui/McpBrowser.tsx
-var import_react31 = __toESM(require_react(), 1);
+var import_react30 = __toESM(require_react(), 1);
 
 // src/cli/ui/mcp-disable.ts
 function toggleMcpDisabled(action, name) {
@@ -49199,7 +49318,7 @@ function McpBrowser({
   postInfo,
   applyAppend
 }) {
-  const [index, setIndex] = (0, import_react31.useState)(0);
+  const [index, setIndex] = (0, import_react30.useState)(0);
   const max = Math.max(0, servers.length - 1);
   useKeystroke((ev) => {
     if (ev.paste) return;
@@ -49218,13 +49337,13 @@ function McpBrowser({
       onClose();
     }
   });
-  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(
+  return /* @__PURE__ */ import_react30.default.createElement(Box_default, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ import_react30.default.createElement(Box_default, null, /* @__PURE__ */ import_react30.default.createElement(Text, { bold: true, color: COLOR.brand }, t("mcpBrowser.title")), /* @__PURE__ */ import_react30.default.createElement(
     Text,
     {
       dimColor: true
     },
     `  \xB7  ${configPath}  \xB7  ${t("mcpBrowser.serverCount", { count: servers.length, s: servers.length === 1 ? "" : "s" })}`
-  )), /* @__PURE__ */ import_react31.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, servers.length === 0 ? /* @__PURE__ */ import_react31.default.createElement(Text, { 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(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, t("mcpBrowser.footer"))));
+  )), /* @__PURE__ */ import_react30.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, servers.length === 0 ? /* @__PURE__ */ import_react30.default.createElement(Text, { dimColor: true }, t("mcpBrowser.empty")) : servers.map((s, i) => /* @__PURE__ */ import_react30.default.createElement(ServerRow, { key: s.label + s.spec, server: s, active: i === index }))), /* @__PURE__ */ import_react30.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react30.default.createElement(Text, { dimColor: true }, t("mcpBrowser.footer"))));
 }
 function ServerRow({ server, active }) {
   const { label, toolCount, report } = server;
@@ -49233,7 +49352,7 @@ function ServerRow({ server, active }) {
   const elapsed = report.elapsedMs;
   const health = healthBadge(elapsed);
   const counts = `${toolCount} tools \xB7 ${resourceCount} resources \xB7 ${promptCount} prompts`;
-  return /* @__PURE__ */ import_react31.default.createElement(Box_default, { flexDirection: "column", marginBottom: active ? 1 : 0 }, /* @__PURE__ */ import_react31.default.createElement(Box_default, null, /* @__PURE__ */ import_react31.default.createElement(Text, { color: active ? COLOR.brand : void 0 }, active ? "\u25B8  " : "   "), /* @__PURE__ */ import_react31.default.createElement(Text, { bold: active, color: active ? "#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, { dimColor: true }, `      ${counts}`)), active ? /* @__PURE__ */ import_react31.default.createElement(Box_default, null, /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, `     ${capabilityList(server)}`)) : null);
+  return /* @__PURE__ */ import_react30.default.createElement(Box_default, { flexDirection: "column", marginBottom: active ? 1 : 0 }, /* @__PURE__ */ import_react30.default.createElement(Box_default, null, /* @__PURE__ */ import_react30.default.createElement(Text, { color: active ? COLOR.brand : void 0 }, active ? "\u25B8  " : "   "), /* @__PURE__ */ import_react30.default.createElement(Text, { bold: active, color: active ? "#e6edf3" : void 0 }, label.padEnd(14)), /* @__PURE__ */ import_react30.default.createElement(Text, { color: health.color }, `${health.glyph} ${health.label}`), /* @__PURE__ */ import_react30.default.createElement(Text, { dimColor: true }, `      ${counts}`)), active ? /* @__PURE__ */ import_react30.default.createElement(Box_default, null, /* @__PURE__ */ import_react30.default.createElement(Text, { dimColor: true }, `     ${capabilityList(server)}`)) : null);
 }
 function capabilityList(s) {
   const caps = ["tools/list", "tools/call"];
@@ -49243,7 +49362,7 @@ function capabilityList(s) {
 }
 
 // src/cli/ui/McpMarketplace.tsx
-var import_react32 = __toESM(require_react(), 1);
+var import_react31 = __toESM(require_react(), 1);
 var VISIBLE_ROWS = 10;
 function buildMarketplacePickerSnapshot(args) {
   return {
@@ -49288,7 +49407,7 @@ function isInstalled(installedSpecs, entry) {
   }
 }
 function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
-  const [state, setState] = (0, import_react32.useState)({
+  const [state, setState] = (0, import_react31.useState)({
     handle: null,
     loading: true,
     query: "",
@@ -49296,7 +49415,7 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
     status: t("mcpMarketplace.opening"),
     installedSpecs: readInstalledSpecs()
   });
-  (0, import_react32.useEffect)(() => {
+  (0, import_react31.useEffect)(() => {
     let cancelled = false;
     (async () => {
       try {
@@ -49321,12 +49440,12 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
       cancelled = true;
     };
   }, []);
-  const filtered = (0, import_react32.useMemo)(() => {
+  const filtered = (0, import_react31.useMemo)(() => {
     if (!state.handle) return [];
     return rankAndFilter(state.handle.cache.entries, state.query);
   }, [state.handle, state.query]);
   const selected = filtered[state.selected];
-  const fetchMore = (0, import_react32.useCallback)(async () => {
+  const fetchMore = (0, import_react31.useCallback)(async () => {
     if (!state.handle || state.loading) return;
     if (state.handle.cache.pagination.nextCursor === null) {
       setState((s) => ({ ...s, status: t("mcpMarketplace.allLoaded") }));
@@ -49344,7 +49463,7 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
       setState((s) => ({ ...s, loading: false, status: `error: ${err.message}` }));
     }
   }, [state.handle, state.loading]);
-  const doUninstall = (0, import_react32.useCallback)(
+  const doUninstall = (0, import_react31.useCallback)(
     async (entry, installed) => {
       const cfg = readConfig();
       const next = (cfg.mcp ?? []).filter((s) => s !== installed);
@@ -49365,7 +49484,7 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
     },
     [postInfo, reloadMcp]
   );
-  const doInstall = (0, import_react32.useCallback)(
+  const doInstall = (0, import_react31.useCallback)(
     async (entry) => {
       let install = entry.install;
       if (!install && entry.source === "smithery") {
@@ -49426,7 +49545,7 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
     },
     [postInfo, reloadMcp]
   );
-  const installOrToggle = (0, import_react32.useCallback)(
+  const installOrToggle = (0, import_react31.useCallback)(
     async (entry) => {
       const installed = isInstalled(state.installedSpecs, entry);
       if (installed) await doUninstall(entry, installed);
@@ -49434,7 +49553,7 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
     },
     [state.installedSpecs, doInstall, doUninstall]
   );
-  const pickerSnapshot = (0, import_react32.useMemo)(
+  const pickerSnapshot = (0, import_react31.useMemo)(
     () => buildMarketplacePickerSnapshot({
       filtered,
       installedSpecs: state.installedSpecs,
@@ -49514,31 +49633,31 @@ function McpMarketplace({ onClose, postInfo, reloadMcp, pickerPorts }) {
       setState((s) => ({ ...s, query: s.query + ev.input, selected: 0 }));
     }
   });
-  const overlay = (0, import_react32.useMemo)(() => loadOverlay("zh-CN"), []);
+  const overlay = (0, import_react31.useMemo)(() => loadOverlay("zh-CN"), []);
   const start = Math.max(
     0,
     Math.min(state.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(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, { dimColor: true }, `  \xB7  ${state.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, state.query || t("mcpMarketplace.filterPlaceholder")), /* @__PURE__ */ import_react32.default.createElement(
+  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 }, "\u25C8 MCP marketplace"), /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, `  \xB7  ${state.status}`)), /* @__PURE__ */ import_react31.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react31.default.createElement(Text, null, t("mcpMarketplace.filter")), /* @__PURE__ */ import_react31.default.createElement(Text, null, state.query || t("mcpMarketplace.filterPlaceholder")), /* @__PURE__ */ import_react31.default.createElement(
     Text,
     {
       dimColor: true
     },
     `  ${t(filtered.length === 1 ? "mcpMarketplace.matchSingular" : "mcpMarketplace.matchPlural", { n: filtered.length })}`
-  )), /* @__PURE__ */ import_react32.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, window2.length === 0 ? /* @__PURE__ */ import_react32.default.createElement(Text, { dimColor: true }, state.loading ? t("mcpMarketplace.loading") : t("mcpMarketplace.noEntries")) : window2.map((e, i) => {
+  )), /* @__PURE__ */ import_react31.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, window2.length === 0 ? /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, state.loading ? t("mcpMarketplace.loading") : t("mcpMarketplace.noEntries")) : window2.map((e, i) => {
     const idx = (start || 0) + i;
     const active = idx === state.selected;
     const tag2 = e.source === "official" ? "[off]" : e.source === "smithery" ? "[smt]" : "[loc]";
     const installedSpec = isInstalled(state.installedSpecs, e);
     const installedBadge = installedSpec ? " \u2713" : "";
     const pop = e.popularity !== void 0 ? ` \xB7 ${e.popularity.toLocaleString()}` : "";
-    return /* @__PURE__ */ import_react32.default.createElement(Box_default, { key: e.name }, /* @__PURE__ */ import_react32.default.createElement(Text, { color: active ? COLOR.brand : void 0 }, active ? "\u25B8 " : "  "), /* @__PURE__ */ import_react32.default.createElement(Text, { bold: active }, e.name.padEnd(38).slice(0, 38)), /* @__PURE__ */ import_react32.default.createElement(Text, { dimColor: 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, { dimColor: true }, `  \xB7  ${selected.title}`) : null), /* @__PURE__ */ import_react32.default.createElement(Text, { dimColor: true }, overlay?.[selected.name]?.description ?? selected.description?.slice(0, 200) ?? null), selected.install ? /* @__PURE__ */ import_react32.default.createElement(Text, { dimColor: true }, t("mcpMarketplace.specLine", {
+    return /* @__PURE__ */ import_react31.default.createElement(Box_default, { key: e.name }, /* @__PURE__ */ import_react31.default.createElement(Text, { color: active ? COLOR.brand : void 0 }, active ? "\u25B8 " : "  "), /* @__PURE__ */ import_react31.default.createElement(Text, { bold: active }, e.name.padEnd(38).slice(0, 38)), /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, ` ${tag2}${pop}${installedBadge}`));
+  })), selected ? /* @__PURE__ */ import_react31.default.createElement(Box_default, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ import_react31.default.createElement(Text, { bold: true }, overlay?.[selected.name]?.title ?? selected.title, overlay?.[selected.name] ? /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, `  \xB7  ${selected.title}`) : null), /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, overlay?.[selected.name]?.description ?? selected.description?.slice(0, 200) ?? null), selected.install ? /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: 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(Text, { dimColor: true }, t("mcpMarketplace.smitheryDetail")), selected.install?.requiredEnv?.length ? /* @__PURE__ */ import_react32.default.createElement(Text, { color: "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, { dimColor: true }, t("mcpMarketplace.footerHint"))));
+  })) : /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, t("mcpMarketplace.smitheryDetail")), selected.install?.requiredEnv?.length ? /* @__PURE__ */ import_react31.default.createElement(Text, { color: "yellow" }, t("mcpMarketplace.needsEnv", { env: selected.install.requiredEnv.join(", ") })) : null) : null, /* @__PURE__ */ import_react31.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react31.default.createElement(Text, { dimColor: true }, t("mcpMarketplace.footerHint"))));
 }
 
 // src/cli/ui/McpHub.tsx
@@ -49552,19 +49671,19 @@ function McpHub({
   reloadMcp,
   pickerPorts
 }) {
-  const [tab, setTab] = (0, import_react33.useState)(initialTab);
+  const [tab, setTab] = (0, import_react32.useState)(initialTab);
   useKeystroke((ev) => {
     if (ev.paste) return;
     if (ev.tab) setTab((t2) => t2 === "live" ? "marketplace" : "live");
   });
-  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(
+  return /* @__PURE__ */ import_react32.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react32.default.createElement(Box_default, { paddingX: 1 }, /* @__PURE__ */ import_react32.default.createElement(Text, { bold: true, color: COLOR.brand }, "\u25C8 MCP"), /* @__PURE__ */ import_react32.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react32.default.createElement(
     TabPill,
     {
       label: t("handlers.mcp.liveTab"),
       count: liveServers.length,
       active: tab === "live"
     }
-  ), /* @__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, { dimColor: true }, `   ${t("handlers.mcp.tabHint")}`)), tab === "live" ? /* @__PURE__ */ import_react33.default.createElement(
+  ), /* @__PURE__ */ import_react32.default.createElement(Text, null, "  "), /* @__PURE__ */ import_react32.default.createElement(TabPill, { label: t("handlers.mcp.marketplaceTab"), active: tab === "marketplace" }), /* @__PURE__ */ import_react32.default.createElement(Text, { dimColor: true }, `   ${t("handlers.mcp.tabHint")}`)), tab === "live" ? /* @__PURE__ */ import_react32.default.createElement(
     McpBrowser,
     {
       servers: liveServers,
@@ -49573,7 +49692,7 @@ function McpHub({
       postInfo,
       applyAppend
     }
-  ) : /* @__PURE__ */ import_react33.default.createElement(
+  ) : /* @__PURE__ */ import_react32.default.createElement(
     McpMarketplace,
     {
       onClose,
@@ -49586,13 +49705,13 @@ function McpHub({
 function TabPill({ label, count, active }) {
   const text = count !== void 0 ? `${label} (${count})` : label;
   if (active) {
-    return /* @__PURE__ */ import_react33.default.createElement(Text, { bold: true, color: COLOR.brand }, "[", text, "]");
+    return /* @__PURE__ */ import_react32.default.createElement(Text, { bold: true, color: COLOR.brand }, "[", text, "]");
   }
-  return /* @__PURE__ */ import_react33.default.createElement(Text, { dimColor: true }, ` ${text} `);
+  return /* @__PURE__ */ import_react32.default.createElement(Text, { dimColor: true }, ` ${text} `);
 }
 
 // src/cli/ui/ModelPicker.tsx
-var import_react34 = __toESM(require_react(), 1);
+var import_react33 = __toESM(require_react(), 1);
 var PAGE_MARGIN2 = 8;
 var PRESET_NAMES = ["auto", "flash", "pro"];
 function ModelPicker({
@@ -49610,7 +49729,7 @@ function ModelPicker({
   const rows = [...presetRows, ...modelRows];
   const activePreset = detectActivePreset(current, currentEffort, currentAutoEscalate);
   const initialIndex = activePreset ? PRESET_NAMES.indexOf(activePreset) : presetRows.length + Math.max(0, modelList.indexOf(current));
-  const [focus, setFocus] = (0, import_react34.useState)(initialIndex);
+  const [focus, setFocus] = (0, import_react33.useState)(initialIndex);
   const { stdout } = use_stdout_default();
   const termRows = stdout?.rows ?? 40;
   const visibleCount = Math.max(6, termRows - PAGE_MARGIN2);
@@ -49639,13 +49758,13 @@ function ModelPicker({
   const loading = models === null;
   const empty = models !== null && models.length === 0;
   let lastSection = null;
-  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) => {
+  return /* @__PURE__ */ import_react33.default.createElement(Box_default, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ import_react33.default.createElement(Box_default, null, /* @__PURE__ */ import_react33.default.createElement(Text, { bold: true, color: TONE.brand }, t("modelPicker.header")), /* @__PURE__ */ import_react33.default.createElement(Text, { color: FG.meta }, loading ? t("modelPicker.loading") : empty ? t("modelPicker.catalogEmpty") : t("modelPicker.modelsAvailable", { count: modelList.length }))), /* @__PURE__ */ import_react33.default.createElement(Box_default, { height: 1 }), hiddenAbove > 0 ? /* @__PURE__ */ import_react33.default.createElement(Box_default, null, /* @__PURE__ */ import_react33.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(Box_default, { key: `hdr-${row2.kind}`, marginTop: idx === 0 ? 0 : 1 }, /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.meta }, row2.kind === "preset" ? t("modelPicker.presetsHeader") : t("modelPicker.modelsHeader"))) : null;
-    const body = row2.kind === "preset" ? /* @__PURE__ */ import_react34.default.createElement(
+    const header = showHeader ? /* @__PURE__ */ import_react33.default.createElement(Box_default, { key: `hdr-${row2.kind}`, marginTop: idx === 0 ? 0 : 1 }, /* @__PURE__ */ import_react33.default.createElement(Text, { color: FG.meta }, row2.kind === "preset" ? t("modelPicker.presetsHeader") : t("modelPicker.modelsHeader"))) : null;
+    const body = row2.kind === "preset" ? /* @__PURE__ */ import_react33.default.createElement(
       PresetRow,
       {
         key: `p-${row2.name}`,
@@ -49653,7 +49772,7 @@ function ModelPicker({
         focused,
         active: activePreset === row2.name
       }
-    ) : /* @__PURE__ */ import_react34.default.createElement(
+    ) : /* @__PURE__ */ import_react33.default.createElement(
       ModelRow,
       {
         key: `m-${row2.id}`,
@@ -49662,8 +49781,8 @@ function ModelPicker({
         active: !activePreset && row2.id === current
       }
     );
-    return /* @__PURE__ */ import_react34.default.createElement(import_react34.default.Fragment, { key: `row-${idx}` }, header, body);
-  }), 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"))));
+    return /* @__PURE__ */ import_react33.default.createElement(import_react33.default.Fragment, { key: `row-${idx}` }, header, body);
+  }), hiddenBelow > 0 ? /* @__PURE__ */ import_react33.default.createElement(Box_default, null, /* @__PURE__ */ import_react33.default.createElement(Text, { color: FG.faint }, t("cardLabels.more", { count: hiddenBelow }))) : null, /* @__PURE__ */ import_react33.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react33.default.createElement(Text, { color: FG.faint }, t("modelPicker.pickerFooter"))));
 }
 function PresetRow({
   name,
@@ -49671,7 +49790,7 @@ function PresetRow({
   active
 }) {
   const desc = PRESET_DESCRIPTIONS[name];
-  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 }, name.padEnd(8)), /* @__PURE__ */ import_react34.default.createElement(Text, { color: focused ? FG.body : FG.meta }, desc.headline.padEnd(28)), /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.meta }, `  ${desc.cost}`), active ? /* @__PURE__ */ import_react34.default.createElement(Text, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
+  return /* @__PURE__ */ import_react33.default.createElement(Box_default, null, /* @__PURE__ */ import_react33.default.createElement(Text, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react33.default.createElement(Text, { bold: focused, color: focused ? FG.strong : FG.sub }, name.padEnd(8)), /* @__PURE__ */ import_react33.default.createElement(Text, { color: focused ? FG.body : FG.meta }, desc.headline.padEnd(28)), /* @__PURE__ */ import_react33.default.createElement(Text, { color: FG.meta }, `  ${desc.cost}`), active ? /* @__PURE__ */ import_react33.default.createElement(Text, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
 }
 function ModelRow({
   id,
@@ -49679,7 +49798,7 @@ function ModelRow({
   active
 }) {
   const badge = modelBadgeFor(id);
-  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(Pill, { label: badge.label, ...PILL_MODEL[badge.kind], bold: false }), active ? /* @__PURE__ */ import_react34.default.createElement(Text, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
+  return /* @__PURE__ */ import_react33.default.createElement(Box_default, null, /* @__PURE__ */ import_react33.default.createElement(Text, { color: focused ? TONE.brand : FG.faint }, focused ? "  \u25B8 " : "    "), /* @__PURE__ */ import_react33.default.createElement(Text, { bold: focused, color: focused ? FG.strong : FG.sub }, id.padEnd(24)), /* @__PURE__ */ import_react33.default.createElement(Text, null, " "), /* @__PURE__ */ import_react33.default.createElement(Pill, { label: badge.label, ...PILL_MODEL[badge.kind], bold: false }), active ? /* @__PURE__ */ import_react33.default.createElement(Text, { color: TONE.brand }, t("modelPicker.currentLabel")) : null);
 }
 function detectActivePreset(model2, effort, autoEscalate) {
   for (const name of PRESET_NAMES) {
@@ -49699,7 +49818,7 @@ var FALLBACK_MODELS = [
 
 // src/cli/ui/PathConfirm.tsx
 import { homedir as homedir3 } from "os";
-var import_react35 = __toESM(require_react(), 1);
+var import_react34 = __toESM(require_react(), 1);
 function tildeify(p) {
   const home = homedir3();
   if (!home) return p;
@@ -49718,9 +49837,9 @@ function PathConfirm({
   onChoose
 }) {
   useReserveRows("modal", { min: 8, max: 14 });
-  const [phase, setPhase] = (0, import_react35.useState)("pick");
+  const [phase, setPhase] = (0, import_react34.useState)("pick");
   if (phase === "deny") {
-    return /* @__PURE__ */ import_react35.default.createElement(
+    return /* @__PURE__ */ import_react34.default.createElement(
       ApprovalCard,
       {
         tone: "error",
@@ -49729,7 +49848,7 @@ function PathConfirm({
         metaRight: t("pathConfirm.optional"),
         footerHint: t("pathConfirm.denyFooter")
       },
-      /* @__PURE__ */ import_react35.default.createElement(
+      /* @__PURE__ */ import_react34.default.createElement(
         DenyContextInput,
         {
           onSubmit: (context2) => onChoose("deny", context2 || void 0),
@@ -49738,7 +49857,7 @@ function PathConfirm({
       )
     );
   }
-  return /* @__PURE__ */ import_react35.default.createElement(
+  return /* @__PURE__ */ import_react34.default.createElement(
     ApprovalCard,
     {
       tone: "warn",
@@ -49747,10 +49866,10 @@ function PathConfirm({
       metaRight: t("pathConfirm.awaiting"),
       footerHint: t("pathConfirm.pickFooter")
     },
-    /* @__PURE__ */ import_react35.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react35.default.createElement(Text, { color: FG.faint }, t(intent === "write" ? "pathConfirm.subtitleWrite" : "pathConfirm.subtitleRead", {
+    /* @__PURE__ */ import_react34.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.faint }, t(intent === "write" ? "pathConfirm.subtitleWrite" : "pathConfirm.subtitleRead", {
       tool: toolName
     }))),
-    /* @__PURE__ */ import_react35.default.createElement(
+    /* @__PURE__ */ import_react34.default.createElement(
       InfoRows,
       {
         path: tildeify(path),
@@ -49758,7 +49877,7 @@ function PathConfirm({
         allowPrefix: tildeify(allowPrefix)
       }
     ),
-    /* @__PURE__ */ import_react35.default.createElement(
+    /* @__PURE__ */ import_react34.default.createElement(
       SingleSelect,
       {
         initialValue: "run_once",
@@ -49804,7 +49923,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(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))));
+  return /* @__PURE__ */ import_react34.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, rows.map((r) => /* @__PURE__ */ import_react34.default.createElement(Box_default, { key: r.label, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.faint }, r.label.padEnd(labelWidth)), /* @__PURE__ */ import_react34.default.createElement(Text, { color: FG.body }, r.value))));
 }
 
 // src/cli/ui/PlanCheckpointConfirm.tsx
@@ -49812,6 +49931,24 @@ var import_react37 = __toESM(require_react(), 1);
 
 // src/cli/ui/PlanStepList.tsx
 var import_react36 = __toESM(require_react(), 1);
+
+// src/cli/ui/char-bar.tsx
+var import_react35 = __toESM(require_react(), 1);
+function CharBar({
+  pct,
+  width = 24,
+  color = COLOR.primary,
+  emptyColor,
+  showLabel = true,
+  label
+}) {
+  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_react35.default.createElement(Box_default, null, /* @__PURE__ */ import_react35.default.createElement(Text, { color }, GLYPH.block.repeat(filled)), /* @__PURE__ */ import_react35.default.createElement(Text, { color: emptyColor ?? COLOR.info, dimColor: true }, GLYPH.shade1.repeat(total - filled)), showLabel ? /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true }, `  ${label ?? `${Math.round(clamped)}%`}`) : null);
+}
+
+// src/cli/ui/PlanStepList.tsx
 function getStatus(stepId, statuses) {
   if (!statuses) return "pending";
   if (statuses instanceof Map) {
@@ -53036,7 +53173,7 @@ function relativeTime2(date) {
 // src/cli/ui/ShellConfirm.tsx
 import { homedir as homedir4 } from "os";
 var import_react44 = __toESM(require_react(), 1);
-var CHROME_ROWS = 18;
+var CHROME_ROWS = 14;
 var MIN_COMMAND_LINES = 3;
 function clampCommand(command, max) {
   const lines = command.split("\n");
@@ -53066,7 +53203,6 @@ function ShellConfirm({
   const maxCommandLines = Math.max(MIN_COMMAND_LINES, totalRows - CHROME_ROWS);
   const { preview, hidden } = clampCommand(command, maxCommandLines);
   const isBackground = kind === "run_background";
-  const subtitle = isBackground ? t("shellConfirm.bgSubtitle") : t("shellConfirm.subtitle");
   const [phase, setPhase] = (0, import_react44.useState)("pick");
   if (phase === "deny") {
     return /* @__PURE__ */ import_react44.default.createElement(
@@ -53096,7 +53232,6 @@ function ShellConfirm({
       metaRight: t("shellConfirm.awaiting"),
       footerHint: t("shellConfirm.pickFooter")
     },
-    /* @__PURE__ */ import_react44.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, subtitle)),
     /* @__PURE__ */ import_react44.default.createElement(Box_default, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ import_react44.default.createElement(Box_default, null, /* @__PURE__ */ import_react44.default.createElement(Text, { bold: true, color: TONE.err }, "$ "), /* @__PURE__ */ import_react44.default.createElement(Text, { bold: true, color: FG.strong }, preview)), hidden > 0 ? /* @__PURE__ */ import_react44.default.createElement(Text, { color: FG.faint }, t(hidden === 1 ? "shellConfirm.previewMore" : "shellConfirm.previewMorePlural", {
       n: hidden
     })) : null),
@@ -53108,18 +53243,15 @@ function ShellConfirm({
         items: [
           {
             value: "run_once",
-            label: t("shellConfirm.allowOnce"),
-            hint: t("shellConfirm.allowOnceDesc")
+            label: t("shellConfirm.allowOnce")
           },
           {
             value: "always_allow",
-            label: t("shellConfirm.allowAlways"),
-            hint: t("shellConfirm.allowAlwaysDesc", { prefix: allowPrefix })
+            label: t("shellConfirm.allowAlways")
           },
           {
             value: "deny",
-            label: t("shellConfirm.deny"),
-            hint: t("shellConfirm.denyDesc")
+            label: t("shellConfirm.deny")
           }
         ],
         onSubmit: (v) => {
@@ -53214,28 +53346,12 @@ function describeTheme(value, currentPreference, activeTheme) {
 
 // src/cli/ui/WelcomeBanner.tsx
 var import_react46 = __toESM(require_react(), 1);
-var HINTS = ["/help", "/init", "/memory", "/cost"];
 function WelcomeBanner({
   inCodeMode,
-  workspaceRoot,
-  dashboardUrl
+  workspaceRoot
 }) {
   const tagline = inCodeMode ? t("ui.taglineCode") : t("ui.taglineChat");
-  const taglineSub = t("ui.taglineSub");
-  const startTextRaw = t("ui.startSessionHint");
-  return /* @__PURE__ */ import_react46.default.createElement(Box_default, { flexDirection: "column", alignItems: "center", marginY: 1 }, /* @__PURE__ */ import_react46.default.createElement(
-    Box_default,
-    {
-      flexDirection: "column",
-      alignItems: "center",
-      borderStyle: "round",
-      borderColor: TONE.brand,
-      paddingX: 4,
-      paddingY: 1
-    },
-    /* @__PURE__ */ import_react46.default.createElement(Box_default, { flexDirection: "row", gap: 2 }, /* @__PURE__ */ import_react46.default.createElement(Text, { color: TONE.brand, bold: true }, "Carbon Code"), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.faint }, "\xD7"), /* @__PURE__ */ import_react46.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react46.default.createElement(Text, null, "\u{1F40B}"), /* @__PURE__ */ import_react46.default.createElement(Text, { color: TONE.accent, bold: true }, "DeepSeek"))),
-    /* @__PURE__ */ import_react46.default.createElement(Box_default, { marginTop: 1, flexDirection: "column", alignItems: "center" }, /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.body }, tagline), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.meta }, taglineSub))
-  ), /* @__PURE__ */ import_react46.default.createElement(Box_default, { marginTop: 1 }, /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.sub }, startTextRaw)), /* @__PURE__ */ import_react46.default.createElement(Box_default, { marginTop: 1, flexDirection: "row", gap: 3 }, HINTS.map((cmd) => /* @__PURE__ */ import_react46.default.createElement(Text, { key: cmd, color: FG.meta }, cmd))), inCodeMode && workspaceRoot ? /* @__PURE__ */ import_react46.default.createElement(Box_default, { marginTop: 1, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react46.default.createElement(Text, { color: TONE.brand }, t("welcomeBanner.workspace")), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.body }, workspaceRoot), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.faint }, t("welcomeBanner.relaunchHint"))) : null, dashboardUrl ? /* @__PURE__ */ import_react46.default.createElement(Box_default, { marginTop: 1, flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react46.default.createElement(Text, { color: TONE.brand, bold: true }, t("welcomeBanner.dashboard")), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react46.default.createElement(Text, { color: TONE.accent }, dashboardUrl)) : null);
+  return /* @__PURE__ */ import_react46.default.createElement(Box_default, { flexDirection: "column", marginY: 1, paddingX: 1 }, /* @__PURE__ */ import_react46.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react46.default.createElement(Text, { color: TONE.brand, bold: true }, "Carbon Code"), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.meta }, tagline)), inCodeMode && workspaceRoot ? /* @__PURE__ */ import_react46.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.meta }, t("welcomeBanner.workspace")), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.faint }, "\xB7"), /* @__PURE__ */ import_react46.default.createElement(Text, { color: FG.body }, workspaceRoot)) : null);
 }
 
 // src/cli/ui/WorkspacePicker.tsx
@@ -53660,6 +53776,70 @@ function formatUndoRows(results) {
   });
 }
 
+// src/cli/ui/edit-tool-gate.ts
+import { relative, resolve as resolve2 } from "path";
+var EDIT_TOOL_NAMES = /* @__PURE__ */ new Set(["edit_file", "write_file", "multi_edit", "apply_patch"]);
+function buildEditToolBlocks(name, args, rootDir) {
+  if (!EDIT_TOOL_NAMES.has(name)) return null;
+  if (name === "apply_patch") {
+    const patch = typeof args.patch === "string" ? args.patch : "";
+    if (!patch) return null;
+    try {
+      return parseUnifiedPatch(patch).map((block2) => {
+        const relPath2 = normalizeToolPath(block2.path, rootDir);
+        if (!relPath2) throw new Error("path escapes root");
+        return { ...block2, path: relPath2 };
+      });
+    } catch {
+      return null;
+    }
+  }
+  if (name === "multi_edit") {
+    const edits = Array.isArray(args.edits) ? args.edits : null;
+    if (!edits || edits.length === 0) return null;
+    const blocks = [];
+    for (const edit2 of edits) {
+      if (!edit2 || typeof edit2 !== "object") return null;
+      const entry = edit2;
+      const relPath2 = normalizeToolPath(entry.path, rootDir);
+      if (!relPath2) return null;
+      const search = typeof entry.search === "string" ? entry.search : "";
+      const replace = typeof entry.replace === "string" ? entry.replace : "";
+      blocks.push({ path: relPath2, search, replace, offset: 0 });
+    }
+    return blocks;
+  }
+  const relPath = normalizeToolPath(args.path, rootDir);
+  if (!relPath) return null;
+  if (name === "edit_file") {
+    const search = typeof args.search === "string" ? args.search : "";
+    const replace = typeof args.replace === "string" ? args.replace : "";
+    if (!search) return null;
+    return [{ path: relPath, search, replace, offset: 0 }];
+  }
+  const content = typeof args.content === "string" ? args.content : "";
+  return [toWholeFileEditBlock(relPath, content, rootDir)];
+}
+function normalizeToolPath(raw, rootDir) {
+  if (typeof raw !== "string" || raw.length === 0) return null;
+  const absRoot = resolve2(rootDir);
+  if (looksLikeAbsoluteSystemPath(raw)) {
+    const abs2 = resolve2(raw);
+    if (!pathIsUnder(abs2, absRoot)) return null;
+    const rel2 = relative(absRoot, abs2);
+    return rel2 ? rel2.replaceAll("\\", "/") : null;
+  }
+  let stripped = raw;
+  while (stripped.startsWith("/") || stripped.startsWith("\\")) {
+    stripped = stripped.slice(1);
+  }
+  if (!stripped) return null;
+  const abs = resolve2(absRoot, stripped);
+  if (!pathIsUnder(abs, absRoot)) return null;
+  const rel = relative(absRoot, abs);
+  return rel ? rel.replaceAll("\\", "/") : null;
+}
+
 // src/cli/ui/effects/loop-to-dashboard.ts
 function loopEventToDashboard(ev, ctx) {
   const id = `${ctx.assistantId}-${ev.role}-${Date.now()}`;
@@ -53908,7 +54088,7 @@ function handleToolEvent(ev, ctx) {
   ctx.flush();
   ctx.setOngoingTool(null);
   ctx.setToolProgress(null);
-  ctx.translator.toolEnd(ev.content);
+  ctx.translator.toolEnd(ev.content, ev.elapsedMs);
   ctx.toolStartedAtRef.current = null;
   if (ev.toolName === "mark_step_complete") {
     try {
@@ -53937,10 +54117,12 @@ function handleToolEvent(ev, ctx) {
 
 // src/cli/ui/hooks/useActivityPhase.ts
 function deriveActivityLabel(cards) {
-  if (cards.some((c) => c.kind === "reasoning" && c.streaming)) return "thinking\u2026";
+  if (cards.some((c) => c.kind === "reasoning" && c.streaming)) {
+    return t("ui.activityThinking");
+  }
   const last = cards[cards.length - 1];
-  if (!last || last.kind === "user") return "waiting for model\u2026";
-  return "processing\u2026";
+  if (!last || last.kind === "user") return t("ui.activityWaitingForModel");
+  return t("ui.activityProcessing");
 }
 function useActivityLabel() {
   return useAgentState((s) => deriveActivityLabel(s.cards));
@@ -54834,38 +55016,16 @@ function ReasoningHeader({
   const headColor = card.aborted ? TONE.err : streamingActive ? TONE_ACTIVE.accent : isEmpty ? FG.faint : TONE.accent;
   const glyph = streamingActive ? "\u25CB" : "\u25CF";
   const title2 = streamingActive ? t("cardTitles.reasoningEllipsis") : card.aborted ? t("cardTitles.reasoningAborted") : t("cardTitles.reasoning");
-  const pill = isEmpty ? PILL_SECTION.empty : PILL_SECTION.reason;
-  const meta = [];
-  const m = headerMeta(card);
-  if (m) meta.push(m);
-  const duration = headerDuration(card);
-  if (duration) meta.push(duration);
-  const modelBadge = card.model ? modelBadgeFor(card.model) : null;
   return /* @__PURE__ */ import_react70.default.createElement(
     CardHeader,
     {
       glyph,
       tone: headColor,
       title: title2,
-      meta: meta.length > 0 ? meta : void 0,
-      right: /* @__PURE__ */ import_react70.default.createElement(import_react70.default.Fragment, null, streamingActive ? /* @__PURE__ */ import_react70.default.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.accent }) : null, modelBadge ? /* @__PURE__ */ import_react70.default.createElement(Pill, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null)
+      right: streamingActive ? /* @__PURE__ */ import_react70.default.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.accent }) : null
     }
   );
 }
-function headerMeta(card) {
-  if (card.streaming) {
-    return card.tokens > 0 ? `${card.tokens.toLocaleString()} ${t("cardLabels.tok")}` : "";
-  }
-  const parts = [];
-  if (card.tokens > 0) parts.push(`${card.tokens.toLocaleString()} ${t("cardLabels.tok")}`);
-  if (card.paragraphs > 0) parts.push(`${card.paragraphs} ${t("cardLabels.pilcrow")}`);
-  return parts.join(" \xB7 ");
-}
-function headerDuration(card) {
-  if (card.streaming || !card.endedAt) return "";
-  const seconds = Math.max(0, (card.endedAt - card.ts) / 1e3);
-  return `${seconds.toFixed(1)}s`;
-}
 function StreamingPreview({ card, visualLines, lineCells }) {
   const visible = visualLines.slice(-STREAMING_PREVIEW_LINES);
   const hasOverflow = visualLines.length > visible.length;
@@ -55295,50 +55455,6 @@ function plainText(tokens) {
 // src/cli/ui/cards/StreamingCard.tsx
 var STREAMING_PREVIEW_LINES2 = 4;
 var EXPANDED_MAX_LINES = 60;
-var MIN_ELAPSED_MS_FOR_RATE = 500;
-var MIN_TOKENS_FOR_RATE = 4;
-var LIVE_TOKEN_CALIBRATION_CHARS = 1e3;
-var ESTIMATED_CHARS_PER_TOKEN = 4;
-function formatTokenCount(n) {
-  if (n >= 1e4) return `${(n / 1e3).toFixed(1)}k`;
-  if (n >= 1e3) return `${(n / 1e3).toFixed(2)}k`;
-  return String(n);
-}
-function rateFromTokens(tokens, startTs, endTs) {
-  const elapsedMs = endTs - startTs;
-  if (elapsedMs < MIN_ELAPSED_MS_FOR_RATE || tokens < MIN_TOKENS_FOR_RATE) {
-    return { tokens, tps: null };
-  }
-  return { tokens, tps: Math.round(tokens * 1e3 / elapsedMs) };
-}
-function tokenRate(text, startTs, endTs) {
-  return rateFromTokens(countTokensBounded(text), startTs, endTs);
-}
-function estimateLiveTokenCount(text, cardId, calibration, countFn = countTokensBounded) {
-  const chars = text.length;
-  const shouldCalibrate = chars > 0 && (!calibration || calibration.cardId !== cardId || chars < calibration.chars || calibration.chars === 0 && chars > 0 || chars - calibration.chars >= LIVE_TOKEN_CALIBRATION_CHARS);
-  if (shouldCalibrate) {
-    const tokens = countFn(text);
-    return { tokens, calibration: { cardId, chars, tokens }, exact: true };
-  }
-  const base = calibration?.cardId === cardId && chars >= calibration.chars ? calibration : null;
-  const baseChars = base?.chars ?? 0;
-  const baseTokens = base?.tokens ?? 0;
-  const estimatedDelta = Math.ceil(Math.max(0, chars - baseChars) / ESTIMATED_CHARS_PER_TOKEN);
-  return {
-    tokens: baseTokens + estimatedDelta,
-    calibration: base ?? { cardId, chars: 0, tokens: 0 },
-    exact: false
-  };
-}
-function useLiveTokenRate(card, enabled) {
-  const calibrationRef = import_react74.default.useRef(null);
-  if (!enabled) return { tokens: 0, tps: null };
-  const estimate = estimateLiveTokenCount(card.text, card.id, calibrationRef.current);
-  calibrationRef.current = estimate.calibration;
-  return rateFromTokens(estimate.tokens, card.ts, Date.now());
-}
-var PILL_RATE = { bg: "#11141a", fg: "#8b949e" };
 function StreamingCard({ card }) {
   const { stdout } = use_stdout_default();
   const cols = stdout?.columns ?? 80;
@@ -55349,23 +55465,10 @@ function StreamingCard({ card }) {
     max: reserveCap
   });
   useSlowTick();
-  const liveRate = useLiveTokenRate(card, !card.done && !card.aborted);
   const lineCells = Math.max(20, cols - 4);
   const visualLines = useIncrementalWrap(card.text, lineCells);
-  const modelBadge = card.model ? modelBadgeFor(card.model) : null;
-  const modelPill = modelBadge ? /* @__PURE__ */ import_react74.default.createElement(Pill, { label: modelBadge.label, ...PILL_MODEL[modelBadge.kind], bold: false }) : null;
   if (card.done && !card.aborted) {
-    const { tokens, tps } = tokenRate(card.text, card.ts, card.endedAt ?? Date.now());
-    const ratePill = tokens >= MIN_TOKENS_FOR_RATE && tps !== null ? /* @__PURE__ */ import_react74.default.createElement(Pill, { label: `${formatTokenCount(tokens)} tok \xB7 ${tps} t/s`, ...PILL_RATE, bold: false }) : null;
-    return /* @__PURE__ */ import_react74.default.createElement(Card, { tone: TONE.ok }, /* @__PURE__ */ import_react74.default.createElement(
-      CardHeader,
-      {
-        glyph: "\u2039",
-        tone: TONE.ok,
-        title: t("cardTitles.reply"),
-        right: /* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, null, ratePill, modelPill)
-      }
-    ), /* @__PURE__ */ import_react74.default.createElement(Markdown, { text: card.text }));
+    return /* @__PURE__ */ import_react74.default.createElement(Card, { tone: TONE.ok }, /* @__PURE__ */ import_react74.default.createElement(CardHeader, { glyph: "\u2039", tone: TONE.ok, title: t("cardTitles.reply") }), /* @__PURE__ */ import_react74.default.createElement(Markdown, { text: card.text }));
   }
   const cap = expanded ? EXPANDED_MAX_LINES : STREAMING_PREVIEW_LINES2;
   const visible = visualLines.slice(-cap);
@@ -55374,15 +55477,13 @@ function StreamingCard({ card }) {
   const headColor = aborted ? TONE.err : TONE_ACTIVE.brand;
   const glyph = aborted ? "\u2298" : "\u25CF";
   const headLabel = aborted ? t("cardLabels.aborted") : t("cardLabels.writing");
-  const liveRatePill = !aborted && liveRate.tokens >= MIN_TOKENS_FOR_RATE && liveRate.tps !== null ? /* @__PURE__ */ import_react74.default.createElement(Pill, { label: `${liveRate.tps} t/s`, ...PILL_RATE, bold: false }) : null;
-  const expandPill = !aborted ? /* @__PURE__ */ import_react74.default.createElement(Pill, { label: expanded ? "expanded \u2303o" : "preview \u2303o", ...PILL_RATE, bold: false }) : null;
   return /* @__PURE__ */ import_react74.default.createElement(Card, { tone: headColor }, /* @__PURE__ */ import_react74.default.createElement(
     CardHeader,
     {
       glyph,
       tone: headColor,
       title: headLabel,
-      right: /* @__PURE__ */ import_react74.default.createElement(import_react74.default.Fragment, null, liveRatePill, expandPill, aborted ? null : /* @__PURE__ */ import_react74.default.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand }), modelPill)
+      right: aborted ? null : /* @__PURE__ */ import_react74.default.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand })
     }
   ), expanded && droppedAbove > 0 ? /* @__PURE__ */ import_react74.default.createElement(Text, { color: FG.faint }, t(droppedAbove === 1 ? "cardLabels.earlierLine" : "cardLabels.earlierLines", {
     count: droppedAbove
@@ -55403,7 +55504,7 @@ function SubAgentCard({ card }) {
   const runningChildren = card.children.filter((c) => !isChildDone(c)).length;
   const isRunning = card.status === "running";
   const inLive = (0, import_react75.useContext)(ActiveCardContext);
-  const headerMeta2 = isRunning ? runningChildren > 0 ? [`${runningChildren} ${t("cardLabels.runningLabel")}`] : [t("cardLabels.workingLabel")] : [{ text: card.status, color: headColor }];
+  const headerMeta = isRunning ? runningChildren > 0 ? [`${runningChildren} ${t("cardLabels.runningLabel")}`] : [t("cardLabels.workingLabel")] : [{ text: card.status, color: headColor }];
   return /* @__PURE__ */ import_react75.default.createElement(Card, { tone: headColor }, /* @__PURE__ */ import_react75.default.createElement(
     CardHeader,
     {
@@ -55411,7 +55512,7 @@ function SubAgentCard({ card }) {
       tone: headColor,
       title: t("cardTitles.subagent"),
       subtitle: card.task,
-      meta: headerMeta2
+      meta: headerMeta
     }
   ), card.name ? /* @__PURE__ */ import_react75.default.createElement(Text, { color: fg.faint }, `${t("cardLabels.agent")} \xB7 ${card.name}`) : null, card.tools && card.tools.length > 0 && /* @__PURE__ */ import_react75.default.createElement(Text, { color: fg.faint }, `${t("cardLabels.tools")} \xB7 ${card.tools.join(", ")}`), card.children.map((child) => /* @__PURE__ */ import_react75.default.createElement(Box_default, { key: child.id, flexDirection: "row", gap: 1 }, inLive ? null : /* @__PURE__ */ import_react75.default.createElement(Text, { color: tone.violet }, "\u23BF"), /* @__PURE__ */ import_react75.default.createElement(ChildRow, { card: child }))));
 }
@@ -55582,12 +55683,113 @@ function useIsInflight(id) {
 var noop = () => {
 };
 
+// src/cli/ui/tool-summary.ts
+var MAX_SUMMARY_CHARS = 80;
+var TRAILING_ELLIPSIS = "\u2026";
+function clip(s, max) {
+  if (s.length <= max) return s;
+  return s.slice(0, Math.max(1, max - TRAILING_ELLIPSIS.length)) + TRAILING_ELLIPSIS;
+}
+function firstNonEmptyLine(text) {
+  for (const line of text.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (trimmed) return trimmed;
+  }
+  return "";
+}
+function summarizeCommandOutput(content) {
+  const lines = content.split(/\r?\n/);
+  const nonEmpty = lines.map((line) => line.trim()).filter(Boolean);
+  const failures = [];
+  const seen = /* @__PURE__ */ new Set();
+  let headline = "";
+  const addFailure = (text) => {
+    const trimmed = text.trim();
+    if (!trimmed || seen.has(trimmed)) return;
+    seen.add(trimmed);
+    failures.push(trimmed);
+  };
+  for (const rawLine of lines) {
+    const line = rawLine.trim();
+    if (!line) continue;
+    const vitestFail = line.match(/^FAIL\s+(.+)/);
+    if (vitestFail?.[1]) addFailure(vitestFail[1]);
+    const stackLine = line.match(/^[❯>]\s+(.+\.(?:[cm]?[jt]sx?|tsx?):\d+:\d+)$/);
+    if (stackLine?.[1]) addFailure(stackLine[1]);
+    const tapFail = line.match(/^not ok\s+\d+\s+-\s+(.+)/);
+    if (tapFail?.[1]) addFailure(tapFail[1]);
+    const testsLine = line.match(/^Tests?\s+(.+)/);
+    if (testsLine?.[1] && /\bfailed\b/i.test(testsLine[1])) headline = testsLine[1];
+    const tapSummary = line.match(/^#\s*fail\s+(\d+)/i);
+    if (tapSummary?.[1]) headline = `${tapSummary[1]} failed`;
+  }
+  if (!headline) {
+    const testFilesLine = nonEmpty.find(
+      (line) => /^Test Files\s+/.test(line) && /\bfailed\b/i.test(line)
+    );
+    if (testFilesLine) headline = testFilesLine.replace(/^Test Files\s+/, "");
+  }
+  const exitMatch = content.match(/(?:^|\n)\s*(?:\[?exit(?: code)?\s+(-?\d+)\]?)/i);
+  const exitCode = exitMatch?.[1] ? Number(exitMatch[1]) : null;
+  const failed = failures.length > 0 || /\b\d+\s+failed\b/i.test(headline) || exitCode !== null && exitCode !== 0;
+  const passed = !failed && (exitCode === 0 || /\bpassed\b/i.test(content));
+  if (!headline) {
+    if (exitCode !== null) headline = `exit ${exitCode}`;
+    else if (failed) headline = "failed";
+    else if (passed) headline = "passed";
+    else headline = firstNonEmptyLine(content) || "(no output)";
+  }
+  return {
+    status: failed ? "failed" : passed ? "passed" : "unknown",
+    headline: clip(headline, MAX_SUMMARY_CHARS),
+    failures: failures.slice(0, 6),
+    tail: nonEmpty.slice(-5)
+  };
+}
+function summarizeStructured(content) {
+  const trimmed = content.trim();
+  if (!trimmed.startsWith("{")) return null;
+  try {
+    const parsed = JSON.parse(trimmed);
+    if (!parsed || typeof parsed !== "object") return null;
+    const obj = parsed;
+    if (typeof obj.error === "string") {
+      const tag2 = obj.error.split(":", 1)[0]?.trim() ?? "error";
+      const detail = obj.error.slice(tag2.length + 1).trim();
+      const summary = detail ? `${tag2} \u2014 ${detail}` : tag2;
+      const isControlSignal = tag2 === "PlanProposedError" || tag2 === "PlanRevisionProposedError" || tag2 === "ChoiceRequestedError" || tag2 === "NeedsConfirmationError";
+      return { summary: clip(summary, MAX_SUMMARY_CHARS), isError: !isControlSignal };
+    }
+    if (obj.kind === "step_completed" && typeof obj.stepId === "string") {
+      const result = typeof obj.result === "string" ? obj.result : "";
+      return {
+        summary: clip(`\u2713 ${obj.stepId}: ${result}`, MAX_SUMMARY_CHARS),
+        isError: false
+      };
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function formatStructuredErrorOutput(content) {
+  const structured = summarizeStructured(content);
+  if (!structured?.isError) return content;
+  return structured.summary;
+}
+
 // src/cli/ui/cards/ToolCard.tsx
 var READ_TAIL = 2;
 var OTHER_TAIL = 5;
-function tailLinesFor(name) {
+function isReadStyleTool(name) {
   const lower = name.toLowerCase();
-  return /(?:^|_)(read|search|list|tree|get|status|diff|fetch|grep)(_|$)/.test(lower) || lower === "job_output" ? READ_TAIL : OTHER_TAIL;
+  return /(?:^|_)(read|search|list|tree|get|status|diff|fetch|grep)(_|$)/.test(lower) || lower === "job_output";
+}
+function tailLinesFor(name) {
+  return isReadStyleTool(name) ? READ_TAIL : OTHER_TAIL;
+}
+function isShellTool(name) {
+  return name === "run_command" || name === "run_background" || /(?:^|_)(run_command|run_background)$/.test(name);
 }
 function ToolCard({ card }) {
   const { stdout } = use_stdout_default();
@@ -55598,7 +55800,14 @@ function ToolCard({ card }) {
     () => unwrapSubagentMarkdown(card.name, card.output),
     [card.name, card.output]
   );
-  const allLines = card.output.length > 0 ? card.output.split("\n") : [];
+  const displayOutput = import_react79.default.useMemo(() => {
+    const formatted = formatStructuredErrorOutput(card.output);
+    if (!isShellTool(card.name)) return formatted;
+    const summary = summarizeCommandOutput(formatted);
+    if (summary.status !== "failed" || summary.failures.length === 0) return formatted;
+    return [summary.headline, ...summary.failures].join("\n");
+  }, [card.name, card.output]);
+  const allLines = displayOutput.length > 0 ? displayOutput.split("\n") : [];
   const tail = tailLinesFor(card.name);
   const truncated = allLines.length > tail;
   const visible = truncated ? allLines.slice(-tail) : allLines;
@@ -55607,7 +55816,8 @@ function ToolCard({ card }) {
   const status2 = toolStatus(card, isInflight);
   const headColor = headerColorFor(status2);
   const errColor = card.exitCode && card.exitCode !== 0 ? TONE.err : FG.sub;
-  const showBody = !card.rejected && (subagentMarkdown !== null || visible.length > 0);
+  const readStyleSuccess = isReadStyleTool(card.name) && status2 === "ok";
+  const showBody = !card.rejected && !readStyleSuccess && (subagentMarkdown !== null || visible.length > 0);
   const meta = [];
   if (card.retry) {
     meta.push({ text: `\u21BB ${card.retry.attempt}/${card.retry.max}`, color: TONE.warn });
@@ -55748,12 +55958,12 @@ function UsageCard({ card }) {
   const promptRatio = card.tokens.prompt / cap;
   const reasonRatio = card.tokens.reason / cap;
   const outputRatio = card.tokens.output / cap;
-  const headerMeta2 = [
+  const headerMeta = [
     `${t("cardLabels.turn")} ${card.turn}`,
     formatCost(card.cost, card.balanceCurrency)
   ];
-  if (card.elapsedMs !== void 0) headerMeta2.push(`${(card.elapsedMs / 1e3).toFixed(1)}s`);
-  return /* @__PURE__ */ import_react80.default.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ import_react80.default.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: t("cardTitles.usage"), meta: headerMeta2 }), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.prompt")), bar(promptRatio, TONE.brand), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.reason")), bar(reasonRatio, TONE.accent), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.output")), bar(outputRatio, TONE.brand), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.cache"), " "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.faint }, t("cardLabels.session")), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, `\u25CF ${formatCost(card.sessionCost, card.balanceCurrency, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ import_react80.default.createElement(import_react80.default.Fragment, null, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.faint }, `\xB7 ${t("cardLabels.balance")}`), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
+  if (card.elapsedMs !== void 0) headerMeta.push(`${(card.elapsedMs / 1e3).toFixed(1)}s`);
+  return /* @__PURE__ */ import_react80.default.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ import_react80.default.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: t("cardTitles.usage"), meta: headerMeta }), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.prompt")), bar(promptRatio, TONE.brand), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.reason")), bar(reasonRatio, TONE.accent), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.output")), bar(outputRatio, TONE.brand), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.sub }, t("cardLabels.cache"), " "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ import_react80.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.faint }, t("cardLabels.session")), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: FG.body }, `\u25CF ${formatCost(card.sessionCost, card.balanceCurrency, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ import_react80.default.createElement(import_react80.default.Fragment, null, /* @__PURE__ */ import_react80.default.createElement(Text, { color: FG.faint }, `\xB7 ${t("cardLabels.balance")}`), /* @__PURE__ */ import_react80.default.createElement(Text, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
 }
 function CompactUsageRow({ card }) {
   const elapsed = card.elapsedMs !== void 0 ? ` \xB7 ${(card.elapsedMs / 1e3).toFixed(1)}s` : "";
@@ -55762,31 +55972,8 @@ function CompactUsageRow({ card }) {
 
 // src/cli/ui/cards/UserCard.tsx
 var import_react81 = __toESM(require_react(), 1);
-
-// src/cli/ui/cards/time.ts
-function formatRelativeTime(ts, now = Date.now()) {
-  const diffSec = Math.max(0, Math.floor((now - ts) / 1e3));
-  if (diffSec < 5) return "just now";
-  if (diffSec < 60) return `${diffSec}s ago`;
-  const diffMin = Math.floor(diffSec / 60);
-  if (diffMin < 60) return `${diffMin}m ago`;
-  const diffHr = Math.floor(diffMin / 60);
-  if (diffHr < 24) return `${diffHr}h ago`;
-  const diffDay = Math.floor(diffHr / 24);
-  return `${diffDay}d ago`;
-}
-
-// src/cli/ui/cards/UserCard.tsx
 function UserCard({ card }) {
-  return /* @__PURE__ */ import_react81.default.createElement(Card, { tone: CARD.user.color }, /* @__PURE__ */ import_react81.default.createElement(
-    CardHeader,
-    {
-      glyph: CARD.user.glyph,
-      tone: CARD.user.color,
-      title: t("cardTitles.you"),
-      meta: [formatRelativeTime(card.ts)]
-    }
-  ), /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { color: FG.sub }, "\u21B3"), /* @__PURE__ */ import_react81.default.createElement(Text, null, card.text)));
+  return /* @__PURE__ */ import_react81.default.createElement(Card, { tone: CARD.user.color }, /* @__PURE__ */ import_react81.default.createElement(Box_default, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ import_react81.default.createElement(Text, { bold: true, color: CARD.user.color }, "\u203A"), /* @__PURE__ */ import_react81.default.createElement(Text, null, card.text)));
 }
 
 // src/cli/ui/cards/WarnCard.tsx
@@ -55815,7 +56002,7 @@ function renderCard(card) {
     case "user":
       return /* @__PURE__ */ import_react83.default.createElement(UserCard, { card });
     case "reasoning":
-      return /* @__PURE__ */ import_react83.default.createElement(ReasoningCard, { card, expanded: true });
+      return /* @__PURE__ */ import_react83.default.createElement(ReasoningCard, { card, expanded: false });
     case "streaming":
       return /* @__PURE__ */ import_react83.default.createElement(StreamingCard, { card });
     case "tool":
@@ -58361,11 +58548,11 @@ var TurnTranslator = class {
     this.toolStartedAt = Date.now();
     this.toolCardId = this.log.startTool(name, args, callId);
   }
-  toolEnd(output) {
+  toolEnd(output, elapsedMs) {
     if (this.toolCardId) {
       this.log.endTool(this.toolCardId, {
         output,
-        elapsedMs: Date.now() - this.toolStartedAt
+        elapsedMs: elapsedMs ?? Date.now() - this.toolStartedAt
       });
       this.toolCardId = null;
     }
@@ -58576,6 +58763,7 @@ function handleTurnInterrupt(key, {
   turnActiveRef,
   abortedThisTurn,
   resetPendingModals,
+  cleanupInterruptedTurn,
   isLoopActive,
   stopLoop,
   loop: loop2,
@@ -58585,6 +58773,7 @@ function handleTurnInterrupt(key, {
     if (abortedThisTurn.current) return "already-aborted";
     abortedThisTurn.current = true;
     resetPendingModals();
+    cleanupInterruptedTurn?.();
     if (isLoopActive()) stopLoop();
     loop2.abort();
     return "aborted";
@@ -58602,7 +58791,7 @@ function handleTurnInterrupt(key, {
 
 // src/cli/ui/useCompletionPickers.ts
 var import_react86 = __toESM(require_react(), 1);
-import { isAbsolute, parse, relative, resolve as resolve2 } from "path";
+import { isAbsolute, parse, relative as relative2, resolve as resolve3 } from "path";
 var SEARCH_DEBOUNCE_MS = 80;
 var SEARCH_FLUSH_MS = 50;
 var SEARCH_RESULT_CAP = 200;
@@ -58822,8 +59011,8 @@ function usePathCandidates(rootDir, partial, isActive) {
       relPartial = partial.slice(root.length).replace(/\\/g, "/");
       insertIsAbsolute = true;
     } else {
-      const resolved = resolve2(rootDir, partial);
-      const relToRoot = relative(rootDir, resolved);
+      const resolved = resolve3(rootDir, partial);
+      const relToRoot = relative2(rootDir, resolved);
       if (relToRoot.startsWith("..") || isAbsolute(relToRoot)) {
         const root = parse(resolved).root;
         listRoot = root;
@@ -59168,14 +59357,14 @@ function useEditHistory(codeMode) {
       const files = [...new Set(entry.blocks.map((b) => b.path))];
       const status2 = entryStatus(entry);
       const header = `\u25B8 edit #${entry.id} \xB7 ${when} \xB7 ${entry.source} \xB7 ${status2} \xB7 ${files.length} file(s)`;
-      const countLines2 = (s) => s.length === 0 ? 0 : (s.match(/\n/g)?.length ?? 0) + 1;
+      const countLines3 = (s) => s.length === 0 ? 0 : (s.match(/\n/g)?.length ?? 0) + 1;
       const fileLines = files.map((path) => {
         const fileBlocks = entry.blocks.filter((b) => b.path === path);
         let removed = 0;
         let added = 0;
         for (const b of fileBlocks) {
-          removed += countLines2(b.search);
-          added += countLines2(b.replace);
+          removed += countLines3(b.search);
+          added += countLines3(b.replace);
         }
         const state = entry.undoneFiles.has(path) ? "UNDONE" : "applied";
         return `  ${state.padEnd(7)}  -${String(removed).padStart(3)}/+${String(added).padStart(3)}   ${path}  (${fileBlocks.length} block${fileBlocks.length === 1 ? "" : "s"})`;
@@ -59482,13 +59671,16 @@ function App(props) {
   const statusBar = import_react90.default.useMemo(() => {
     const cfg = readConfig().statusBar ?? {};
     return {
-      showBalance: cfg.showBalance !== false,
-      showSessionCost: cfg.showSessionCost !== false,
+      showMode: cfg.showMode === true,
+      showPreset: cfg.showPreset === true,
+      showSessionInfo: cfg.showSessionInfo === true,
+      showBalance: cfg.showBalance === true,
+      showSessionCost: cfg.showSessionCost === true,
       showTurnCost: cfg.showTurnCost !== false,
-      showCacheHit: cfg.showCacheHit !== false,
+      showCacheHit: cfg.showCacheHit === true,
       showCtxUsage: cfg.showCtxUsage !== false,
-      showVersion: cfg.showVersion !== false,
-      showFeedbackHint: cfg.showFeedbackHint !== false
+      showVersion: cfg.showVersion === true,
+      showFeedbackHint: cfg.showFeedbackHint === true
     };
   }, []);
   return /* @__PURE__ */ import_react90.default.createElement(ThemeProvider, { name: themeName }, /* @__PURE__ */ import_react90.default.createElement(AgentStoreProvider, { session, initialCards }, /* @__PURE__ */ import_react90.default.createElement(ChatScrollProvider, null, /* @__PURE__ */ import_react90.default.createElement(
@@ -59835,7 +60027,7 @@ function AppInner({
   const switchWorkspaceRoot = (0, import_react90.useCallback)(
     (newPath) => {
       if (!codeMode?.reregisterTools) return { ok: false, info: t("handlers.edits.cwdCodeOnly") };
-      const resolved = resolve3(newPath);
+      const resolved = resolve4(newPath);
       let stat;
       try {
         stat = statSync2(resolved);
@@ -60086,24 +60278,27 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
   }, [pendingPlan, broadcastDashboardEvent]);
   (0, import_react90.useEffect)(() => {
     if (!pendingEditReview) return;
-    const previewLines = (pendingEditReview.search || pendingEditReview.replace || "").split("\n").slice(0, 12);
+    const firstBlock = pendingEditReview[0];
+    if (!firstBlock) return;
+    const previewLines = (firstBlock.search || firstBlock.replace || "").split("\n").slice(0, 12);
     const preview = previewLines.join("\n");
+    const fileCount = new Set(pendingEditReview.map((block2) => block2.path)).size;
     broadcastDashboardEvent({
       kind: "modal-up",
       modal: {
         kind: "edit-review",
-        path: pendingEditReview.path,
-        search: pendingEditReview.search ?? "",
-        replace: pendingEditReview.replace ?? "",
+        path: fileCount === 1 ? firstBlock.path : `${fileCount} files`,
+        search: firstBlock.search ?? "",
+        replace: firstBlock.replace ?? "",
         preview,
-        total: pendingEdits.current.length,
-        remaining: pendingEdits.current.length
+        total: pendingEditReview.length,
+        remaining: pendingEditReview.length
       }
     });
     return () => {
       broadcastDashboardEvent({ kind: "modal-down", modalKind: "edit-review" });
     };
-  }, [pendingEditReview, broadcastDashboardEvent, pendingEdits]);
+  }, [pendingEditReview, broadcastDashboardEvent]);
   (0, import_react90.useEffect)(() => {
     if (!pendingRevision) return;
     broadcastDashboardEvent({
@@ -60220,12 +60415,8 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
   (0, import_react90.useEffect)(() => {
     if (sessionBannerShown.current) return;
     sessionBannerShown.current = true;
-    if (!session) {
-      log.pushInfo(t("ui.ephemeralSession"));
-    } else if (loop2.resumedMessageCount > 0) {
+    if (session && loop2.resumedMessageCount > 0) {
       log.pushInfo(t("ui.resumedSession", { name: session, count: loop2.resumedMessageCount }));
-    } else {
-      log.pushInfo(t("ui.newSession", { name: session }));
     }
     for (const hint of startupInfoHints ?? []) log.pushInfo(hint);
     if (session && codeMode) {
@@ -60269,6 +60460,15 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
     }
   }, [session, loop2, codeMode, syncPendingCount, log, pendingEdits, startupInfoHints]);
   const quitProcess = useQuit(transcriptRef);
+  const cleanupInterruptedTurn = (0, import_react90.useCallback)(() => {
+    const ts = Date.now();
+    agentStore.dispatch({
+      type: "turn.interrupt.cleanup",
+      id: `interrupt-${ts}`,
+      ts,
+      text: t("app.turnInterrupted")
+    });
+  }, [agentStore]);
   useKeystroke((ev) => {
     if (ev.ctrl && ev.input === "d") quitProcess();
   });
@@ -60291,6 +60491,7 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
         turnActiveRef: submittingRef,
         abortedThisTurn,
         resetPendingModals,
+        cleanupInterruptedTurn,
         isLoopActive,
         stopLoop,
         loop: loop2,
@@ -60303,6 +60504,7 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
         turnActiveRef: submittingRef,
         abortedThisTurn,
         resetPendingModals,
+        cleanupInterruptedTurn,
         isLoopActive,
         stopLoop,
         loop: loop2,
@@ -60397,71 +60599,81 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
   });
   (0, import_react90.useEffect)(() => {
     if (!tools || !codeMode) return;
-    tools.setToolInterceptor(async (name, args) => {
-      if (name !== "edit_file" && name !== "write_file") return null;
-      const rawPath = typeof args.path === "string" ? args.path : "";
-      if (!rawPath) return null;
+    tools.setToolInterceptor(async (name, args, ctx) => {
       const rootForEdit = currentRootDirRef.current;
-      const absRoot = resolve3(rootForEdit);
-      let relPath;
-      if (looksLikeAbsoluteSystemPath(rawPath)) {
-        const abs = resolve3(rawPath);
-        if (!pathIsUnder(abs, absRoot)) return null;
-        const rel = relative2(absRoot, abs);
-        if (!rel) return null;
-        relPath = rel;
-      } else {
-        let stripped = rawPath;
-        while (stripped.startsWith("/") || stripped.startsWith("\\")) {
-          stripped = stripped.slice(1);
-        }
-        if (!stripped) return null;
-        relPath = stripped;
-      }
-      let block2;
-      if (name === "edit_file") {
-        const search = typeof args.search === "string" ? args.search : "";
-        const replace = typeof args.replace === "string" ? args.replace : "";
-        if (!search) return null;
-        block2 = { path: relPath, search, replace, offset: 0 };
-      } else {
-        const content = typeof args.content === "string" ? args.content : "";
-        block2 = toWholeFileEditBlock(relPath, content, rootForEdit);
-      }
-      const applyNow = () => {
-        const snaps = snapshotBeforeEdits([block2], rootForEdit);
-        const results = applyEditBlocks([block2], rootForEdit);
+      const blocks = buildEditToolBlocks(name, args, rootForEdit);
+      if (!blocks) return null;
+      const applyNow = async (opts = {}) => {
+        const snaps = snapshotBeforeEdits(blocks, rootForEdit);
+        if (name === "multi_edit" || name === "apply_patch") {
+          let output;
+          try {
+            output = await applyMultiEdit(
+              rootForEdit,
+              blocks.map((block2) => ({
+                abs: resolve4(rootForEdit, block2.path),
+                search: block2.search,
+                replace: block2.replace
+              }))
+            );
+          } catch (err) {
+            if (name === "apply_patch") {
+              return `apply_patch: no files written \u2014 ${err.message}`;
+            }
+            throw err;
+          }
+          const results2 = blocks.map((block2) => ({
+            path: block2.path,
+            status: block2.search.length === 0 ? "created" : "applied"
+          }));
+          recordEdit(opts.source ?? "auto", blocks, results2, snaps);
+          if (opts.showUndoBanner ?? true) armUndoBanner(results2);
+          if (name !== "apply_patch") return output;
+          const fileCount = new Set(blocks.map((block2) => block2.path)).size;
+          const fileNoun = fileCount === 1 ? "file" : "files";
+          const created = blocks.filter((block2) => block2.search.length === 0).map((block2) => `created ${block2.path}`);
+          return [`apply_patch: applied ${fileCount} ${fileNoun}`, ...created, output].join("\n");
+        }
+        const results = applyEditBlocks(blocks, rootForEdit);
         const good = results.some((r) => r.status === "applied" || r.status === "created");
         if (good) {
-          recordEdit("auto", [block2], results, snaps);
-          armUndoBanner(results);
+          recordEdit(opts.source ?? "auto", blocks, results, snaps);
+          if (opts.showUndoBanner ?? true) armUndoBanner(results);
         }
         return formatEditResults(results);
       };
       if (editModeRef.current === "auto" || editModeRef.current === "yolo") return applyNow();
       if (turnEditPolicyRef.current === "apply-all") return applyNow();
-      const { choice, denyContext } = await new Promise((resolveChoice) => {
+      const waitStartedAt = Date.now();
+      const result = await new Promise((resolveChoice) => {
         editReviewResolveRef.current = resolveChoice;
-        setPendingEditReview(block2);
+        setPendingEditReview(blocks);
       });
+      ctx?.onInteractiveWait?.(Date.now() - waitStartedAt);
       editReviewResolveRef.current = null;
       setPendingEditReview(null);
+      const choice = result.choice;
+      const denyContext = result.denyContext;
       if (choice === "reject") {
         const context2 = denyContext ? ` because: ${denyContext}` : "";
-        log.pushInfo(t("app.rejectedEdit", { path: block2.path, context: context2 }));
-        return `User rejected this edit to ${block2.path}${context2}. Don't retry the same SEARCH/REPLACE; either try a different approach or ask the user what they want instead.`;
+        const path = blocks.length === 1 ? blocks[0]?.path ?? "(unknown)" : `${blocks.length} files`;
+        log.pushInfo(t("app.rejectedEdit", { path, context: context2 }));
+        if (blocks.length > 1) {
+          return `User rejected this ${name} before any edits were applied${context2}. Don't retry the same patch or SEARCH/REPLACE batch; either try a different approach or ask the user what they want instead.`;
+        }
+        return `User rejected this edit to ${path}${context2}. Don't retry the same SEARCH/REPLACE; either try a different approach or ask the user what they want instead.`;
       }
       if (choice === "apply-rest-of-turn") {
         turnEditPolicyRef.current = "apply-all";
         log.pushInfo(t("app.autoApprovingRest"));
-        return applyNow();
+        return applyNow({ source: "review-apply", showUndoBanner: false });
       }
       if (choice === "flip-to-auto") {
         setEditMode("auto");
         log.pushInfo(t("app.flippedAutoSession"));
         return applyNow();
       }
-      return applyNow();
+      return applyNow({ source: "review-apply", showUndoBanner: false });
     });
     return () => {
       tools.setToolInterceptor(null);
@@ -60507,7 +60719,7 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
     if (dashboardRef.current) return dashboardRef.current.url;
     if (dashboardStartingRef.current) return dashboardStartingRef.current;
     const startup = (async () => {
-      const { startDashboardServer } = await import("./server-X75PAZG5.js");
+      const { startDashboardServer } = await import("./server-HE7LFAHH.js");
       const handle = await startDashboardServer(
         {
           mode: "attached",
@@ -60635,15 +60847,17 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
               return { kind: "plan", body: pendingPlanRef.current };
             }
             const er = pendingEditReview;
-            if (er) {
+            if (er?.[0]) {
+              const firstBlock = er[0];
+              const fileCount = new Set(er.map((block2) => block2.path)).size;
               return {
                 kind: "edit-review",
-                path: er.path,
-                search: er.search ?? "",
-                replace: er.replace ?? "",
-                preview: (er.search || er.replace || "").split("\n").slice(0, 12).join("\n"),
-                total: pendingEdits.current.length,
-                remaining: pendingEdits.current.length
+                path: fileCount === 1 ? firstBlock.path : `${fileCount} files`,
+                search: firstBlock.search ?? "",
+                replace: firstBlock.replace ?? "",
+                preview: (firstBlock.search || firstBlock.replace || "").split("\n").slice(0, 12).join("\n"),
+                total: er.length,
+                remaining: er.length
               };
             }
             if (pendingRevision) {
@@ -60695,11 +60909,11 @@ run \`carboncode setup\` to remove this entry, or fix the underlying issue (miss
             handleStagedInputSubmitRef.current(text ?? "", { plan: plan2, mode: choice }).catch(() => void 0);
           },
           resolveEditReview: (choice) => {
-            const resolve4 = editReviewResolveRef.current;
-            if (resolve4) {
+            const resolve6 = editReviewResolveRef.current;
+            if (resolve6) {
               editReviewResolveRef.current = null;
               setPendingEditReview(null);
-              resolve4({ choice, denyContext: void 0 });
+              resolve6({ choice, denyContext: void 0 });
             }
           },
           resolveCheckpointConfirm: (choice, text) => {
@@ -61589,7 +61803,7 @@ ${answer}`, "brand");
     (choice, denyContext) => {
       const pending = pendingShell;
       if (!pending || !codeMode) return;
-      const { id, command: cmd, kind } = pending;
+      const { id, command: cmd } = pending;
       setPendingShell(null);
       if (choice === "deny") {
         const context2 = denyContext ? ` because: ${denyContext}` : "";
@@ -61600,9 +61814,6 @@ ${answer}`, "brand");
         log.pushInfo(t("app.alwaysAllowed", { prefix, dir: currentRootDir }));
         pauseGate.resolve(id, { type: "always_allow", prefix });
       } else {
-        log.pushInfo(
-          kind === "run_background" ? t("app.startingBackground", { cmd }) : t("app.runningCommand", { cmd })
-        );
         pauseGate.resolve(id, { type: "run_once" });
       }
     },
@@ -62420,12 +62631,12 @@ ${answer}`, "brand");
   ) : pendingEditReview ? /* @__PURE__ */ import_react90.default.createElement(
     EditConfirm,
     {
-      block: pendingEditReview,
+      blocks: pendingEditReview,
       onChoose: (choice, denyContext) => {
-        const resolve4 = editReviewResolveRef.current;
-        if (resolve4) {
+        const resolve6 = editReviewResolveRef.current;
+        if (resolve6) {
           editReviewResolveRef.current = null;
-          resolve4({ choice, denyContext });
+          resolve6({ choice, denyContext });
         }
       }
     }
@@ -62443,7 +62654,6 @@ ${answer}`, "brand");
       pendingCount,
       modeFlash,
       planMode,
-      undoArmed: !!undoBanner || hasUndoable(),
       jobs: codeMode ? codeMode.jobs : void 0,
       activeLoop,
       statusBar,
@@ -62565,7 +62775,7 @@ async function drainTtyResponses(timeoutMs = 50) {
     return;
   }
   stdin.resume();
-  await new Promise((resolve4) => {
+  await new Promise((resolve6) => {
     const onData = (_chunk) => {
     };
     stdin.on("data", onData);
@@ -62578,12 +62788,41 @@ async function drainTtyResponses(timeoutMs = 50) {
         } catch {
         }
       }
-      resolve4();
+      resolve6();
     }, timeoutMs);
     timer.unref();
   });
 }
 
+// src/cli/ui/rule-summary.ts
+import { basename as basename5, relative as relative3, resolve as resolve5 } from "path";
+function collectStartupRuleFiles(rootDir) {
+  if (!memoryEnabled()) return [];
+  const mem = readProjectMemory(rootDir);
+  return mem ? [mem.path] : [];
+}
+function formatRuleSummary(rootDir, files) {
+  const labels = unique(files).map((file) => displayRulePath(rootDir, file)).filter((label) => label.length > 0);
+  if (labels.length === 0) return null;
+  return `rules \xB7 ${labels.join(", ")}`;
+}
+function unique(files) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const file of files) {
+    const normalized = resolve5(file);
+    if (seen.has(normalized)) continue;
+    seen.add(normalized);
+    out.push(normalized);
+  }
+  return out;
+}
+function displayRulePath(rootDir, file) {
+  const rel = relative3(resolve5(rootDir), resolve5(file)).replaceAll("\\", "/");
+  if (!rel || rel.startsWith("../") || rel === "..") return basename5(file);
+  return rel;
+}
+
 // src/cli/commands/chat.tsx
 function Root({
   initialKey,
@@ -62713,12 +62952,6 @@ async function chatCommand(opts) {
   const mcpServers = [];
   const cfg = readConfig();
   const startupInfoHints = [];
-  if (cfg.setupCompleted === true && (cfg.mcp?.length ?? 0) === 0 && mcpSpecs.length === 0) {
-    startupInfoHints.push(t("mcpHealth.emptyHint"));
-  }
-  startupInfoHints.push(
-    "/copy  \u2192  vim-style copy mode (j/k navigate, v select, y yank to clipboard)"
-  );
   if (searchEnabled()) {
     if (!tools) tools = new ToolRegistry();
     registerWebTools(tools, {
@@ -62737,6 +62970,13 @@ async function chatCommand(opts) {
     opts.forceResume
   );
   const launchWorkspace = opts.codeMode?.rootDir ?? process.cwd();
+  if (opts.codeMode) {
+    const ruleSummary = formatRuleSummary(
+      launchWorkspace,
+      collectStartupRuleFiles(launchWorkspace)
+    );
+    if (ruleSummary) startupInfoHints.push(`\u25B8 ${ruleSummary}`);
+  }
   const showPicker = !opts.session && !opts.forceResume && listSessionsForWorkspace(launchWorkspace).length > 0;
   markPhase("ink_render_call");
   const qqSubmitRef = { current: null };
@@ -62792,4 +63032,4 @@ async function chatCommand(opts) {
 export {
   chatCommand
 };
-//# sourceMappingURL=chunk-J5BYPUB5.js.map
+//# sourceMappingURL=chunk-2EKLWOE3.js.map