reasonix 0.34.1 → 0.36.0

package/dist/cli/{chunk-EINEIIIW.js → chunk-EN4LAZW5.js}

@@ -34,7 +34,7 @@ import {
   toWholeFileEditBlock,
   walkFilesStream,
   webFetch
-} from "./chunk-LNTORE5K.js";
+} from "./chunk-QRUQ2BFT.js";
 import {
   McpClient,
   SseTransport,
@@ -42,7 +42,7 @@ import {
   StreamableHttpTransport,
   inspectMcpServer,
   parseMcpSpec
-} from "./chunk-I6YIAK6C.js";
+} from "./chunk-UNMYFZPZ.js";
 import {
   openTranscriptFile,
   recordFromLoopEvent,
@@ -50,12 +50,12 @@ import {
 } from "./chunk-XHQIK7B6.js";
 import {
   MemoryStore
-} from "./chunk-6TMHAK5D.js";
+} from "./chunk-ZU45XW3P.js";
 import {
   KeystrokeProvider,
   SingleSelect,
   useKeystroke
-} from "./chunk-KZHMKOJH.js";
+} from "./chunk-T52GAWPP.js";
 import {
   COLOR,
   GLYPH,
@@ -63,7 +63,7 @@ import {
   ThemeProvider,
   useColor,
   useThemeTokens
-} from "./chunk-2EBODRRO.js";
+} from "./chunk-ZJR4QLXB.js";
 import {
   PRESETS,
   PRESET_DESCRIPTIONS,
@@ -71,7 +71,7 @@ import {
 } from "./chunk-MHDNZXJJ.js";
 import {
   runDoctorChecks
-} from "./chunk-F3ILWP2L.js";
+} from "./chunk-BJ376EN3.js";
 import {
   countTokens
 } from "./chunk-DAEAAVDF.js";
@@ -84,6 +84,10 @@ import {
 import {
   renderDashboard
 } from "./chunk-4DCHFFEY.js";
+import {
+  MANUAL_UPDATE_COMMANDS,
+  planUpdate
+} from "./chunk-WJ3YX4PZ.js";
 import {
   SLASH_COMMANDS,
   archivePlanState,
@@ -97,29 +101,29 @@ import {
   resolveSlashAlias,
   savePlanState,
   suggestSlashCommands
-} from "./chunk-SA4UGZPG.js";
-import {
-  eventLogPath,
-  openEventSink
-} from "./chunk-G3XNWSFN.js";
+} from "./chunk-2MCYGFLK.js";
 import {
   fetchSmitheryDetail,
   loadMorePages,
   openRegistry,
   specStringFor
 } from "./chunk-SOZE7V7V.js";
+import {
+  eventLogPath,
+  openEventSink
+} from "./chunk-G3XNWSFN.js";
 import {
   BUILTIN_ALLOWLIST,
   formatCommandResult,
   pauseGate,
   runCommand
-} from "./chunk-SX6L4HZZ.js";
+} from "./chunk-QPNZWUZF.js";
 import {
   PROJECT_MEMORY_FILE,
   SkillStore,
   memoryEnabled,
   readProjectMemory
-} from "./chunk-U3V2ZQ5J.js";
+} from "./chunk-KJQIA4US.js";
 import {
   HOOK_EVENTS,
   formatHookOutcomeMessage,
@@ -127,13 +131,7 @@ import {
   loadHooks,
   projectSettingsPath,
   runHooks
-} from "./chunk-OERAGRJX.js";
-import {
-  VERSION,
-  compareVersions,
-  getLatestVersion,
-  isNpxInstall
-} from "./chunk-2AWTGJ2C.js";
+} from "./chunk-IPCPEZWQ.js";
 import {
   deleteSession,
   detectGitBranch,
@@ -154,7 +152,7 @@ import {
   setLanguage,
   t,
   tObj
-} from "./chunk-Q36KBLSU.js";
+} from "./chunk-MLXUGPJE.js";
 import {
   addProjectShellAllowed,
   clearProjectShellAllowed,
@@ -162,6 +160,7 @@ import {
   editModeHintShown,
   isPlausibleKey,
   loadApiKey,
+  loadBaseUrl,
   loadEditMode,
   loadProjectShellAllowed,
   loadReasoningEffort,
@@ -181,7 +180,7 @@ import {
   webSearchEndpoint,
   webSearchEngine,
   writeConfig
-} from "./chunk-5JXXEPDM.js";
+} from "./chunk-BHLHOS5Y.js";
 import {
   CARD,
   FG,
@@ -205,6 +204,13 @@ import {
   DEEPSEEK_PRICING,
   DEFAULT_CONTEXT_TOKENS
 } from "./chunk-ORM6PK57.js";
+import {
+  VERSION,
+  compareVersions,
+  detectInstallSource,
+  detectNpmInstallPrefix,
+  getLatestVersion
+} from "./chunk-CRPQUBP6.js";
 
 // src/cli/commands/chat.tsx
 import { render } from "ink";
@@ -231,7 +237,7 @@ function buildMcpServerSummary(opts) {
 // src/cli/ui/App.tsx
 import { statSync } from "fs";
 import { resolve as resolve2 } from "path";
-import { Box as Box49, Text as Text52, useStdout as useStdout14 } from "ink";
+import { Box as Box49, Text as Text52, useStdout as useStdout15 } from "ink";
 import React60, { useCallback as useCallback11, useEffect as useEffect12, useMemo as useMemo9, useRef as useRef9, useState as useState20 } from "react";
 
 // src/code/checkpoints.ts
@@ -2376,7 +2382,12 @@ function PlanStepListInner({ steps, statuses, focusStepId }) {
   const doneCount = statusList.filter((s) => s === "done").length;
   const pct = Math.round(doneCount / total * 100);
   const showProgress = doneCount > 0;
-  return /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column" }, /* @__PURE__ */ React15.createElement(Box12, null, /* @__PURE__ */ React15.createElement(Text13, { dimColor: true }, showProgress ? `${doneCount}/${total} done (${pct}%) \xB7 ${total} step${total === 1 ? "" : "s"}` : `${total} step${total === 1 ? "" : "s"}`)), /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column" }, steps.map((step, i) => {
+  return /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column" }, /* @__PURE__ */ React15.createElement(Box12, null, /* @__PURE__ */ React15.createElement(Text13, { dimColor: true }, showProgress ? t(
+    total === 1 ? "planFlow.stepList.counterDoneSingular" : "planFlow.stepList.counterDone",
+    { done: doneCount, total, pct }
+  ) : t(total === 1 ? "planFlow.stepList.counterSingular" : "planFlow.stepList.counter", {
+    total
+  }))), /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column" }, steps.map((step, i) => {
     const status2 = statusList[i];
     const isLast = i === total - 1;
     const isCur = focusStepId === step.id;
@@ -2413,25 +2424,25 @@ function PlanCheckpointConfirmInner({
   const isLast = total > 0 && completed >= total;
   const statuses = buildStatusMap(steps, completedStepIds, stepId, isLast);
   const subtitle = counter ? `${counter}  \xB7  ${label}` : label;
-  return /* @__PURE__ */ React16.createElement(ApprovalCard, { tone: "ok", glyph: "\u26C1", title: "Checkpoint \u2014 step done", metaRight: subtitle }, steps && steps.length > 0 ? /* @__PURE__ */ React16.createElement(Box13, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React16.createElement(PlanStepList, { steps, statuses, focusStepId: stepId })) : null, /* @__PURE__ */ React16.createElement(
+  return /* @__PURE__ */ React16.createElement(ApprovalCard, { tone: "ok", glyph: "\u26C1", title: t("planFlow.checkpoint.title"), metaRight: subtitle }, steps && steps.length > 0 ? /* @__PURE__ */ React16.createElement(Box13, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React16.createElement(PlanStepList, { steps, statuses, focusStepId: stepId })) : null, /* @__PURE__ */ React16.createElement(
     SingleSelect,
     {
       initialValue: isLast ? "stop" : "continue",
       items: [
         {
           value: "continue",
-          label: "Continue \u2014 run the next step",
-          hint: "Model resumes with the next step."
+          label: t("planFlow.checkpoint.continue"),
+          hint: t("planFlow.checkpoint.continueHint")
         },
         {
           value: "revise",
-          label: "Revise \u2014 give feedback before the next step",
-          hint: "Stay paused, type guidance; model adjusts the remaining plan."
+          label: t("planFlow.checkpoint.revise"),
+          hint: t("planFlow.checkpoint.reviseHint")
         },
         {
           value: "stop",
-          label: "Stop \u2014 end the plan here",
-          hint: "Model summarizes what was done and ends."
+          label: t("planFlow.checkpoint.stop"),
+          hint: t("planFlow.checkpoint.stopHint")
         }
       ],
       onSubmit: (v) => onChoose(v),
@@ -4886,53 +4897,89 @@ function SpanText({
   );
 }
 
+// src/cli/ui/plan-open-questions.ts
+var HEADER_RE = /^(#{1,6})\s*(open[-\s]?questions?|risks?|unknowns?|assumptions?|unclear|待确认|开放问题|风险|未知|假设|不确定)(?:[\s:：/、,，].*)?$/im;
+function extractOpenQuestionsSection(plan2) {
+  const lines = plan2.split("\n");
+  let startIdx = -1;
+  let startLevel = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i] ?? "";
+    const m = line.match(HEADER_RE);
+    if (m) {
+      startIdx = i;
+      startLevel = (m[1] ?? "#").length;
+      break;
+    }
+  }
+  if (startIdx === -1) return null;
+  let endIdx = lines.length;
+  for (let j = startIdx + 1; j < lines.length; j++) {
+    const line = lines[j] ?? "";
+    const lh = line.match(/^(#{1,6})\s+\S/);
+    if (lh && (lh[1] ?? "").length <= startLevel) {
+      endIdx = j;
+      break;
+    }
+  }
+  const block2 = lines.slice(startIdx, endIdx).join("\n").replace(/\s+$/g, "");
+  return block2.length > 0 ? block2 : null;
+}
+
 // src/cli/ui/PlanConfirm.tsx
 var PLAN_BODY_PREVIEW_LINES = 24;
 function PlanConfirmInner({ plan: plan2, steps, onChoose }) {
   const stepRows = steps?.length ?? 0;
   const hasSteps = stepRows > 0;
+  const openQuestions = extractOpenQuestionsSection(plan2);
   const planLines = plan2.split("\n");
   const truncatedBody = planLines.length > PLAN_BODY_PREVIEW_LINES;
   const previewBody = truncatedBody ? planLines.slice(0, PLAN_BODY_PREVIEW_LINES).join("\n") : plan2;
   const previewRows = truncatedBody ? PLAN_BODY_PREVIEW_LINES : Math.min(planLines.length, PLAN_BODY_PREVIEW_LINES);
   const reservedFor = hasSteps ? stepRows : previewRows;
-  useReserveRows("modal", { min: 10, max: Math.max(16, reservedFor + 14) });
-  const hasOpenQuestions = /^#{1,6}\s*(open[-\s]?questions?|risks?|unknowns?|assumptions?|unclear)/im.test(plan2) || /^#{1,6}\s*(待确认|开放问题|风险|未知|假设|不确定)/im.test(plan2);
+  const oqRows = openQuestions ? openQuestions.split("\n").length : 0;
+  useReserveRows("modal", { min: 10, max: Math.max(16, reservedFor + oqRows + 14) });
+  const refineLabel = t("planFlow.picker.refine");
+  const bannerTemplate = t("planFlow.openQuestionsBanner");
+  const [bannerBefore, bannerAfter] = bannerTemplate.split("{refine}");
   return /* @__PURE__ */ React18.createElement(
     ApprovalCard,
     {
       tone: "accent",
       glyph: "\u229E",
-      title: "Approve plan",
-      metaRight: "awaiting",
+      title: t("planFlow.approveCardTitle"),
+      metaRight: t("planFlow.approveCardMetaRight"),
       metaRightColor: CARD.plan.color
     },
-    hasOpenQuestions ? /* @__PURE__ */ React18.createElement(Box15, { marginBottom: 1 }, /* @__PURE__ */ React18.createElement(Text15, { color: TONE.warn }, "\u25B2 the plan flags open questions or risks \u2014 pick ", /* @__PURE__ */ React18.createElement(Text15, { bold: true }, "refine"), " to write concrete answers before the model moves on.")) : null,
-    hasSteps ? /* @__PURE__ */ React18.createElement(Box15, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React18.createElement(PlanStepList, { steps })) : plan2.trim().length > 0 ? /* @__PURE__ */ React18.createElement(Box15, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React18.createElement(MarkdownView, { text: previewBody }), truncatedBody ? /* @__PURE__ */ React18.createElement(Text15, { color: FG.faint }, `\u2026 ${planLines.length - PLAN_BODY_PREVIEW_LINES} more line${planLines.length - PLAN_BODY_PREVIEW_LINES === 1 ? "" : "s"} above in scrollback`) : null) : null,
+    openQuestions ? /* @__PURE__ */ React18.createElement(Box15, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React18.createElement(Text15, { color: TONE.warn }, bannerBefore ?? "", /* @__PURE__ */ React18.createElement(Text15, { bold: true }, refineLabel), bannerAfter ?? ""), /* @__PURE__ */ React18.createElement(Box15, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React18.createElement(Text15, { color: TONE.warn, bold: true }, t("planFlow.openQuestionsHeader")), /* @__PURE__ */ React18.createElement(MarkdownView, { text: openQuestions }))) : null,
+    hasSteps ? /* @__PURE__ */ React18.createElement(Box15, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React18.createElement(PlanStepList, { steps })) : plan2.trim().length > 0 ? /* @__PURE__ */ React18.createElement(Box15, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React18.createElement(MarkdownView, { text: previewBody }), truncatedBody ? /* @__PURE__ */ React18.createElement(Text15, { color: FG.faint }, t(
+      planLines.length - PLAN_BODY_PREVIEW_LINES === 1 ? "planFlow.truncatedBodyMore" : "planFlow.truncatedBodyMorePlural",
+      { n: planLines.length - PLAN_BODY_PREVIEW_LINES }
+    )) : null) : null,
     /* @__PURE__ */ React18.createElement(
       SingleSelect,
       {
-        initialValue: hasOpenQuestions ? "refine" : "approve",
+        initialValue: openQuestions ? "refine" : "approve",
         items: [
           {
             value: "approve",
-            label: "accept",
-            hint: "run it now, in order"
+            label: t("planFlow.picker.accept"),
+            hint: t("planFlow.picker.acceptHint")
           },
           {
             value: "refine",
-            label: "refine",
-            hint: "give the agent more guidance, draft a new plan"
+            label: refineLabel,
+            hint: t("planFlow.picker.refineHint")
           },
           {
             value: "revise",
-            label: "revise",
-            hint: "edit the plan inline before running (skip / reorder steps)"
+            label: t("planFlow.picker.revise"),
+            hint: t("planFlow.picker.reviseHint")
           },
           {
             value: "cancel",
-            label: "reject",
-            hint: "discard, agent will retry from scratch"
+            label: t("planFlow.picker.reject"),
+            hint: t("planFlow.picker.rejectHint")
           }
         ],
         onSubmit: (v) => onChoose(v),
@@ -4974,49 +5021,25 @@ function useElapsedSeconds() {
 }
 
 // src/cli/ui/PlanRefineInput.tsx
-var MODES = {
-  approve: {
-    title: "approving \u2014 any last instructions?",
-    glyph: "\u25C7",
-    tone: "user",
-    cursorColor: CARD.user.color,
-    hint: "Answer questions the plan raised, add constraints, or just press Enter to approve as-is.",
-    blankHint: " (Enter with blank = approve without extra instructions.)"
-  },
-  refine: {
-    title: "refining \u2014 what should the model change?",
-    glyph: "\u270E",
-    tone: "warn",
-    cursorColor: CARD.warn.color,
-    hint: "Describe what's wrong or missing, or answer questions the plan raised.",
-    blankHint: " (Enter with blank = ask the model to list concrete questions.)"
-  },
-  reject: {
-    title: "rejecting \u2014 tell the model why (optional)",
-    glyph: "\u2717",
-    tone: "error",
-    cursorColor: CARD.error.color,
-    hint: "Say what the model got wrong about your goal, or what you actually want instead.",
-    blankHint: " (Enter with blank = cancel without explanation; the model will ask what you want.)"
-  },
-  "checkpoint-revise": {
-    title: "revising \u2014 what should change before the next step?",
-    glyph: "\u270E",
-    tone: "warn",
-    cursorColor: CARD.warn.color,
-    hint: "Scope change, skip steps, alternative approach \u2014 the model adjusts the remaining plan.",
-    blankHint: " (Enter with blank = continue with the current plan.)"
-  },
-  "choice-custom": {
-    title: "custom answer \u2014 type whatever fits",
-    glyph: "\u2325",
-    tone: "accent",
-    cursorColor: CARD.plan.color,
-    hint: "Free-form reply. The model reads it verbatim and proceeds \u2014 no need to match the listed options.",
-    blankHint: " (Enter with blank = ask the model what you actually want.)"
-  }
+var MODE_VISUALS = {
+  approve: { glyph: "\u25C7", tone: "user", cursorColor: CARD.user.color },
+  refine: { glyph: "\u270E", tone: "warn", cursorColor: CARD.warn.color },
+  reject: { glyph: "\u2717", tone: "error", cursorColor: CARD.error.color },
+  "checkpoint-revise": { glyph: "\u270E", tone: "warn", cursorColor: CARD.warn.color },
+  "choice-custom": { glyph: "\u2325", tone: "accent", cursorColor: CARD.plan.color }
 };
-function PlanRefineInput({ mode: mode2, onSubmit, onCancel }) {
+function modeMeta(mode2) {
+  const v = MODE_VISUALS[mode2];
+  return {
+    title: t(`planFlow.modes.${mode2}.title`),
+    hint: t(`planFlow.modes.${mode2}.hint`),
+    blankHint: t(`planFlow.modes.${mode2}.blankHint`),
+    glyph: v.glyph,
+    tone: v.tone,
+    cursorColor: v.cursorColor
+  };
+}
+function PlanRefineInput({ mode: mode2, questions, onSubmit, onCancel }) {
   const [value, setValue] = useState9("");
   useKeystroke((ev) => {
     if (ev.paste) {
@@ -5041,15 +5064,17 @@ function PlanRefineInput({ mode: mode2, onSubmit, onCancel }) {
   });
   const tick = useTick();
   const cursorOn = Math.floor(tick / 4) % 2 === 0;
-  const meta = MODES[mode2];
+  const meta = modeMeta(mode2);
+  const showQuestions = mode2 === "refine" && !!questions && questions.trim().length > 0;
   return /* @__PURE__ */ React20.createElement(
     ApprovalCard,
     {
       tone: meta.tone,
       glyph: meta.glyph,
       title: meta.title,
-      footerHint: "\u23CE send  \xB7  esc return to picker"
+      footerHint: t("planFlow.refineFooter")
     },
+    showQuestions ? /* @__PURE__ */ React20.createElement(Box16, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React20.createElement(Text16, { color: TONE.warn, bold: true }, t("planFlow.refineQuestionsHeading")), /* @__PURE__ */ React20.createElement(MarkdownView, { text: questions })) : null,
     /* @__PURE__ */ React20.createElement(Box16, { marginBottom: 1 }, /* @__PURE__ */ React20.createElement(Text16, { color: FG.sub }, meta.hint, value === "" ? meta.blankHint : "")),
     /* @__PURE__ */ React20.createElement(Box16, null, /* @__PURE__ */ React20.createElement(Text16, { color: meta.cursorColor, bold: true }, "\u203A "), /* @__PURE__ */ React20.createElement(Text16, null, value), /* @__PURE__ */ React20.createElement(Text16, { color: meta.cursorColor, bold: true }, cursorOn ? "\u258D" : " "))
   );
@@ -5303,9 +5328,17 @@ function processMultilineKey(value, cursor, keyIn) {
     return cursor === value.length ? NOOP : { next: null, cursor: value.length, submit: false };
   }
   if (key.ctrl && key.input === "p") {
+    if (value.includes("\n")) {
+      const moved = moveCursorUp(value, cursor);
+      if (moved !== cursor) return { next: null, cursor: moved, submit: false };
+    }
     return { ...NOOP, historyHandoff: "prev" };
   }
   if (key.ctrl && key.input === "n") {
+    if (value.includes("\n")) {
+      const moved = moveCursorDown(value, cursor);
+      if (moved !== cursor) return { next: null, cursor: moved, submit: false };
+    }
     return { ...NOOP, historyHandoff: "next" };
   }
   if (key.leftArrow) {
@@ -5314,15 +5347,8 @@ function processMultilineKey(value, cursor, keyIn) {
   if (key.rightArrow) {
     return { next: null, cursor: Math.min(value.length, cursor + 1), submit: false };
   }
-  if (key.upArrow) {
-    if (value.length === 0) return { ...NOOP, historyHandoff: "prev" };
-    const moved = moveCursorUp(value, cursor);
-    return moved === cursor ? NOOP : { next: null, cursor: moved, submit: false };
-  }
-  if (key.downArrow) {
-    if (value.length === 0) return { ...NOOP, historyHandoff: "next" };
-    const moved = moveCursorDown(value, cursor);
-    return moved === cursor ? NOOP : { next: null, cursor: moved, submit: false };
+  if (key.upArrow || key.downArrow) {
+    return NOOP;
   }
   if (key.ctrl && key.input === "a" || key.home) {
     return { next: null, cursor: startOfLine(value, cursor), submit: false };
@@ -5888,7 +5914,8 @@ function HintRow() {
   const items = [
     { key: "\u23CE", sep: "send" },
     { key: "\u21E7\u23CE", sep: "newline" },
-    { key: "\u2191\u2193", sep: "history" },
+    { key: "\u2191\u2193", sep: "scroll" },
+    { key: "^P/^N", sep: "history" },
     { key: "esc", sep: "abort" },
     { key: "^C", sep: "quit" }
   ];
@@ -6404,8 +6431,12 @@ function ArgRow({ value, isSelected }) {
 }
 
 // src/cli/ui/SlashSuggestions.tsx
-import { Box as Box23, Text as Text23 } from "ink";
+import { Box as Box23, Text as Text23, useStdout as useStdout8 } from "ink";
 import React27 from "react";
+var GROUP_MODE_MAX_ROWS = 24;
+var SEARCH_MODE_MAX_ROWS = 8;
+var COMMAND_NAME_CELLS = 14;
+var ARGS_CELLS = 14;
 var GROUP_LABEL = {
   chat: "CHAT",
   setup: "SETUP",
@@ -6423,26 +6454,82 @@ function SlashSuggestions({
   advancedHidden
 }) {
   const color = useColor();
+  const { stdout } = useStdout8();
+  const cols = stdout?.columns ?? 80;
+  const [rememberedWindowStart, setRememberedWindowStart] = React27.useState(0);
+  const maxRows = groupMode ? GROUP_MODE_MAX_ROWS : SEARCH_MODE_MAX_ROWS;
+  const safeMatches = matches ?? [];
+  const windowStart = computeWindowStart(
+    safeMatches,
+    maxRows,
+    selectedIndex,
+    rememberedWindowStart,
+    groupMode
+  );
+  React27.useEffect(() => {
+    setRememberedWindowStart(windowStart);
+  }, [windowStart]);
   if (matches === null) return null;
   if (matches.length === 0) {
     return /* @__PURE__ */ React27.createElement(Box23, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React27.createElement(Text23, { color: color.warn, bold: true }, GLYPH.warn), /* @__PURE__ */ React27.createElement(Text23, null, " "), /* @__PURE__ */ React27.createElement(Text23, { color: color.warn }, "no slash command matches that prefix"), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, " \u2014 Backspace to edit, or /help for the full list"));
   }
-  const MAX = groupMode ? 24 : 8;
   const total = matches.length;
-  const windowStart = total <= MAX ? 0 : Math.max(0, Math.min(selectedIndex - Math.floor(MAX / 2), total - MAX));
-  const shown = matches.slice(windowStart, windowStart + MAX);
+  const items = buildVisibleItems(matches, windowStart, maxRows, groupMode);
+  const shownCommands = items.filter((item) => item.kind === "command");
   const hiddenAbove = windowStart;
-  const hiddenBelow = total - windowStart - shown.length;
-  let lastGroup = null;
-  if (windowStart > 0) lastGroup = matches[windowStart - 1]?.group ?? null;
-  return /* @__PURE__ */ React27.createElement(Box23, { flexDirection: "column", paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React27.createElement(Box23, null, /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `${total} command${total === 1 ? "" : "s"}`), hiddenAbove > 0 ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null), shown.map((spec, i) => {
-    const idx = windowStart + i;
-    const showHeader = groupMode && spec.group !== lastGroup;
-    lastGroup = spec.group;
-    return /* @__PURE__ */ React27.createElement(React27.Fragment, { key: spec.cmd }, showHeader ? /* @__PURE__ */ React27.createElement(Box23, { marginTop: idx === 0 ? 0 : 1 }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `  ${GROUP_LABEL[spec.group]}`)) : null, /* @__PURE__ */ React27.createElement(SuggestionRow, { spec, isSelected: idx === selectedIndex }));
+  const hiddenBelow = total - windowStart - shownCommands.length;
+  return /* @__PURE__ */ React27.createElement(Box23, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ React27.createElement(Box23, null, /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: true }, "/ "), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `${total} command${total === 1 ? "" : "s"}`), hiddenAbove > 0 ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `   \u2191 ${hiddenAbove} above`) : null), items.map((item) => {
+    if (item.kind === "group") {
+      return /* @__PURE__ */ React27.createElement(GroupHeader, { key: `group:${item.group}:${item.beforeIndex}`, group: item.group });
+    }
+    return /* @__PURE__ */ React27.createElement(
+      SuggestionRow,
+      {
+        key: `cmd:${item.spec.group}:${item.spec.cmd}`,
+        spec: item.spec,
+        isSelected: item.index === selectedIndex,
+        columns: cols
+      }
+    );
   }), hiddenBelow > 0 ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `   \u2193 ${hiddenBelow} below`) : null, groupMode && advancedHidden && advancedHidden > 0 ? /* @__PURE__ */ React27.createElement(Box23, { marginTop: 1 }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, `  + ${advancedHidden} advanced  \xB7  type a letter to search`)) : null, /* @__PURE__ */ React27.createElement(Box23, { marginTop: 0 }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, "  \u2191\u2193 navigate \xB7 Tab / \u23CE pick \xB7 esc cancel")));
 }
-function SuggestionRow({ spec, isSelected }) {
+function computeWindowStart(matches, maxRows, selectedIndex, currentWindowStart, groupMode = false) {
+  if (matches.length <= 0) return 0;
+  const maxWindowStart = Math.max(0, matches.length - 1);
+  let start = Math.max(0, Math.min(currentWindowStart, maxWindowStart));
+  const clampedSelectedIndex = Math.max(0, Math.min(selectedIndex, matches.length - 1));
+  if (clampedSelectedIndex < start) start = clampedSelectedIndex;
+  while (start < clampedSelectedIndex) {
+    const visibleCommandIndexes = buildVisibleItems(matches, start, maxRows, groupMode).filter((item) => item.kind === "command").map((item) => item.index);
+    if (visibleCommandIndexes.includes(clampedSelectedIndex)) break;
+    start += 1;
+  }
+  return Math.min(start, maxWindowStart);
+}
+function buildVisibleItems(matches, windowStart, maxRows, groupMode = false) {
+  const out = [];
+  for (let idx = windowStart; idx < matches.length && out.length < maxRows; idx += 1) {
+    const spec = matches[idx];
+    if (groupMode && shouldShowGroupHeader(matches, idx)) {
+      if (out.length >= maxRows) break;
+      out.push({ kind: "group", group: spec.group, beforeIndex: idx });
+    }
+    if (out.length >= maxRows) break;
+    out.push({ kind: "command", spec, index: idx });
+  }
+  return out;
+}
+function shouldShowGroupHeader(matches, idx) {
+  return idx === 0 || matches[idx]?.group !== matches[idx - 1]?.group;
+}
+function GroupHeader({ group }) {
+  return /* @__PURE__ */ React27.createElement(Box23, { flexShrink: 0, height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React27.createElement(Text23, { dimColor: true, wrap: "truncate" }, `  ${GROUP_LABEL[group]}`));
+}
+function SuggestionRow({
+  spec,
+  isSelected,
+  columns
+}) {
   const color = useColor();
   const name = `/${spec.cmd}`;
   const argsSuffix = spec.argsHint ? spec.argsHint : "";
@@ -6450,7 +6537,19 @@ function SuggestionRow({ spec, isSelected }) {
   const translated = t(key);
   const summary = translated === key ? spec.summary : translated;
   const aliasHint = spec.aliases?.length ? ` \xB7 /${spec.aliases.join(" /")}` : "";
-  return /* @__PURE__ */ React27.createElement(Box23, null, /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.primary : color.info, bold: isSelected }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: isSelected }, name.padEnd(14)), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, argsSuffix.padEnd(14)), /* @__PURE__ */ React27.createElement(Text23, null, "  "), /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.user : color.info, dimColor: !isSelected }, summary), aliasHint ? /* @__PURE__ */ React27.createElement(Text23, { dimColor: true }, aliasHint) : null);
+  const reservedCells = 2 + COMMAND_NAME_CELLS + ARGS_CELLS + 2 + 2;
+  const summaryBudget = Math.max(8, columns - reservedCells);
+  const summaryText = truncateCells(`${summary}${aliasHint}`, summaryBudget);
+  return /* @__PURE__ */ React27.createElement(Box23, { flexDirection: "row", flexWrap: "nowrap", flexShrink: 0, height: 1, minHeight: 1 }, /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.primary : color.info, bold: isSelected, wrap: "truncate" }, isSelected ? `${GLYPH.cur} ` : "  "), /* @__PURE__ */ React27.createElement(Text23, { color: color.accent, bold: isSelected, wrap: "truncate" }, padOrTrim(name, COMMAND_NAME_CELLS)), /* @__PURE__ */ React27.createElement(Text23, { dimColor: true, wrap: "truncate" }, padOrTrim(argsSuffix, ARGS_CELLS)), /* @__PURE__ */ React27.createElement(Text23, { wrap: "truncate" }, "  "), /* @__PURE__ */ React27.createElement(Text23, { color: isSelected ? color.user : color.info, dimColor: !isSelected, wrap: "truncate" }, summaryText));
+}
+function padOrTrim(value, cells) {
+  const trimmed = truncateCells(value, cells);
+  return trimmed.padEnd(cells);
+}
+function truncateCells(value, maxCells) {
+  if (value.length <= maxCells) return value;
+  if (maxCells <= 1) return value.slice(0, Math.max(0, maxCells));
+  return `${value.slice(0, maxCells - 1)}\u2026`;
 }
 
 // src/cli/ui/WelcomeBanner.tsx
@@ -7819,10 +7918,16 @@ function CtxCard({ card }) {
     {
       glyph: "\u2318",
       tone: TONE.brand,
-      title: "context",
+      title: t("cardTitles.context"),
       meta: [`${used.toLocaleString()} / ${cap.toLocaleString()} (${usedPct.toFixed(1)}%)`]
     }
-  ), row("system", card.systemTokens, card.systemTokens / cap, TONE.brand), row("tools", card.toolsTokens, card.toolsTokens / cap, TONE.warn), row("log", card.logTokens, card.logTokens / cap, TONE.ok), row("input", card.inputTokens, card.inputTokens / cap, TONE.accent), card.topTools.length > 0 ? /* @__PURE__ */ React32.createElement(React32.Fragment, null, /* @__PURE__ */ React32.createElement(Text26, { color: FG.faint }, `top tools \xB7 ${card.toolsCount} total \xB7 ${card.logMessages} log msgs`), card.topTools.slice(0, 5).map((t2) => /* @__PURE__ */ React32.createElement(Box27, { key: `${t2.turn}-${t2.name}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React32.createElement(Text26, { color: FG.sub }, t2.name), /* @__PURE__ */ React32.createElement(Text26, { color: FG.faint }, `\xB7 turn ${t2.turn} \xB7 ${t2.tokens.toLocaleString()}`)))) : null);
+  ), row(t("cardLabels.system"), card.systemTokens, card.systemTokens / cap, TONE.brand), row(t("cardLabels.tools"), card.toolsTokens, card.toolsTokens / cap, TONE.warn), row(t("cardLabels.log"), card.logTokens, card.logTokens / cap, TONE.ok), row(t("cardLabels.input"), card.inputTokens, card.inputTokens / cap, TONE.accent), card.topTools.length > 0 ? /* @__PURE__ */ React32.createElement(React32.Fragment, null, /* @__PURE__ */ React32.createElement(Text26, { color: FG.faint }, `${t("cardLabels.topTools")} \xB7 ${card.toolsCount} ${t("cardLabels.tools")} \xB7 ${card.logMessages} ${t("cardLabels.logMsgs")}`), card.topTools.slice(0, 5).map((tool) => /* @__PURE__ */ React32.createElement(Box27, { key: `${tool.turn}-${tool.name}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React32.createElement(Text26, { color: FG.sub }, tool.name), /* @__PURE__ */ React32.createElement(
+    Text26,
+    {
+      color: FG.faint
+    },
+    `\xB7 ${t("cardLabels.turn")} ${tool.turn} \xB7 ${tool.tokens.toLocaleString()}`
+  )))) : null);
 }
 
 // src/cli/ui/cards/DiffCard.tsx
@@ -7890,7 +7995,7 @@ import { Box as Box30, Text as Text29 } from "ink";
 import React35 from "react";
 var STACK_TAIL = 5;
 function ErrorCard({ card }) {
-  const retryNote = card.retries !== void 0 && card.retries > 0 ? `${card.retries} retr${card.retries === 1 ? "y" : "ies"}` : null;
+  const retryNote = card.retries !== void 0 && card.retries > 0 ? `${card.retries} ${t("cardLabels.retries")}` : null;
   const stackLines = card.stack ? card.stack.split("\n") : [];
   const stackTrunc = stackLines.length > STACK_TAIL;
   const stackVisible = stackTrunc ? stackLines.slice(-STACK_TAIL) : stackLines;
@@ -7902,10 +8007,13 @@ function ErrorCard({ card }) {
     {
       glyph: "\u2716",
       tone: TONE.err,
-      title: card.title || "error",
+      title: card.title || t("cardTitles.error"),
       meta: retryNote ? [retryNote] : void 0
     }
-  ), messageLines.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:msg:${i}`, color: TONE.err }, line || " ")), hasStack ? /* @__PURE__ */ React35.createElement(Box30, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React35.createElement(Text29, { color: FG.meta }, "stack trace"), stackHidden > 0 ? /* @__PURE__ */ React35.createElement(Text29, { color: FG.faint }, `\u22EE ${stackHidden} earlier stack line${stackHidden === 1 ? "" : "s"} hidden`) : null, stackVisible.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:stk:${stackHidden + i}`, color: FG.meta }, line || " "))) : null);
+  ), messageLines.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:msg:${i}`, color: TONE.err }, line || " ")), hasStack ? /* @__PURE__ */ React35.createElement(Box30, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React35.createElement(Text29, { color: FG.meta }, t("cardLabels.stackTrace")), stackHidden > 0 ? /* @__PURE__ */ React35.createElement(Text29, { color: FG.faint }, t(
+    stackHidden === 1 ? "cardLabels.earlierStackLine" : "cardLabels.earlierStackLines",
+    { count: stackHidden }
+  )) : null, stackVisible.map((line, i) => /* @__PURE__ */ React35.createElement(Text29, { key: `${card.id}:stk:${stackHidden + i}`, color: FG.meta }, line || " "))) : null);
 }
 
 // src/cli/ui/cards/LiveCard.tsx
@@ -8071,7 +8179,7 @@ function anchorIndex(steps) {
 }
 
 // src/cli/ui/cards/ReasoningCard.tsx
-import { Box as Box34, Text as Text35, useStdout as useStdout8 } from "ink";
+import { Box as Box34, Text as Text35, useStdout as useStdout9 } from "ink";
 import React41 from "react";
 
 // src/frame/width.ts
@@ -8138,7 +8246,7 @@ function ReasoningCard({
   card,
   expanded
 }) {
-  const { stdout } = useStdout8();
+  const { stdout } = useStdout9();
   const cols = stdout?.columns ?? 80;
   const lineCells = Math.max(20, cols - 4);
   const allLines = card.text.length > 0 ? card.text.split("\n") : [];
@@ -8150,7 +8258,7 @@ function ReasoningHeader({ card }) {
   const streamingActive = card.streaming && !card.aborted;
   const headColor = card.aborted ? TONE.err : streamingActive ? TONE_ACTIVE.accent : TONE.accent;
   const glyph = streamingActive ? "\u25C7" : "\u25C6";
-  const title = streamingActive ? "reasoning\u2026" : card.aborted ? "reasoning (aborted)" : "reasoning";
+  const title = streamingActive ? t("cardTitles.reasoningEllipsis") : card.aborted ? t("cardTitles.reasoningAborted") : t("cardTitles.reasoning");
   const meta = [];
   const m = headerMeta(card);
   if (m) meta.push(m);
@@ -8172,11 +8280,11 @@ function ReasoningHeader({ card }) {
 }
 function headerMeta(card) {
   if (card.streaming) {
-    return card.tokens > 0 ? `${card.tokens.toLocaleString()} tok` : "";
+    return card.tokens > 0 ? `${card.tokens.toLocaleString()} ${t("cardLabels.tok")}` : "";
   }
   const parts = [];
-  if (card.tokens > 0) parts.push(`${card.tokens.toLocaleString()} tok`);
-  if (card.paragraphs > 0) parts.push(`${card.paragraphs} \xB6`);
+  if (card.tokens > 0) parts.push(`${card.tokens.toLocaleString()} ${t("cardLabels.tok")}`);
+  if (card.paragraphs > 0) parts.push(`${card.paragraphs} ${t("cardLabels.pilcrow")}`);
   return parts.join(" \xB7 ");
 }
 function headerDuration(card) {
@@ -8227,18 +8335,24 @@ import React42 from "react";
 function SearchCard({ card }) {
   const fileCount = new Set(card.hits.map((h) => h.file)).size;
   const elapsed = `${(card.elapsedMs / 1e3).toFixed(2)}s`;
-  const stats2 = `${card.hits.length} hit${card.hits.length === 1 ? "" : "s"} \xB7 ${fileCount} file${fileCount === 1 ? "" : "s"}`;
+  const stats2 = t(card.hits.length === 1 ? "cardLabels.hitSingular" : "cardLabels.hitsPlural", {
+    count: card.hits.length,
+    files: fileCount
+  });
   const grouped = groupByFile(card.hits.slice(0, 10));
   return /* @__PURE__ */ React42.createElement(Card, { tone: TONE.info }, /* @__PURE__ */ React42.createElement(
     CardHeader,
     {
       glyph: "\u2299",
       tone: TONE.info,
-      title: "search",
+      title: t("cardTitles.search"),
       subtitle: `"${card.query}"`,
       meta: [stats2, elapsed]
     }
-  ), grouped.map(([file, hits]) => /* @__PURE__ */ React42.createElement(Box35, { key: file, flexDirection: "column" }, /* @__PURE__ */ React42.createElement(Text36, { bold: true, color: FG.strong }, file), hits.map((h, i) => /* @__PURE__ */ React42.createElement(Box35, { key: `${file}:${h.line}:${i}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, `${h.line.toString().padStart(4)} \u2502`), /* @__PURE__ */ React42.createElement(HighlightedLine, { text: h.preview, start: h.matchStart, end: h.matchEnd }))))), card.hits.length > 10 ? /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, `\u22EE +${card.hits.length - 10} more hits`) : null);
+  ), grouped.map(([file, hits]) => /* @__PURE__ */ React42.createElement(Box35, { key: file, flexDirection: "column" }, /* @__PURE__ */ React42.createElement(Text36, { bold: true, color: FG.strong }, file), hits.map((h, i) => /* @__PURE__ */ React42.createElement(Box35, { key: `${file}:${h.line}:${i}`, flexDirection: "row", gap: 1 }, /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, `${h.line.toString().padStart(4)} \u2502`), /* @__PURE__ */ React42.createElement(HighlightedLine, { text: h.preview, start: h.matchStart, end: h.matchEnd }))))), card.hits.length > 10 ? /* @__PURE__ */ React42.createElement(Text36, { color: FG.faint }, t(
+    card.hits.length - 10 === 1 ? "cardLabels.moreHitSingular" : "cardLabels.moreHitsPlural",
+    { count: card.hits.length - 10 }
+  )) : null);
 }
 function HighlightedLine({
   text,
@@ -8261,7 +8375,7 @@ function groupByFile(hits) {
 }
 
 // src/cli/ui/cards/StreamingCard.tsx
-import { Box as Box37, Text as Text38, useStdout as useStdout10 } from "ink";
+import { Box as Box37, Text as Text38, useStdout as useStdout11 } from "ink";
 import React44, { useContext as useContext5 } from "react";
 
 // src/cli/ui/layout/LiveExpandContext.ts
@@ -8270,7 +8384,7 @@ var LiveExpandContext = createContext3(false);
 
 // src/cli/ui/markdown.tsx
 import { highlight, supportsLanguage } from "cli-highlight";
-import { Box as Box36, Text as Text37, useStdout as useStdout9 } from "ink";
+import { Box as Box36, Text as Text37, useStdout as useStdout10 } from "ink";
 import React43 from "react";
 import stringWidth from "string-width";
 var BODY_LEFT_CELLS = 7;
@@ -8278,7 +8392,7 @@ var MarkdownWidthCtx = React43.createContext(void 0);
 function useWidth() {
   const ctx = React43.useContext(MarkdownWidthCtx);
   if (ctx !== void 0) return ctx;
-  return (useStdout9()?.stdout?.columns ?? process.stdout.columns ?? 80) - BODY_LEFT_CELLS;
+  return (useStdout10()?.stdout?.columns ?? process.stdout.columns ?? 80) - BODY_LEFT_CELLS;
 }
 marked.setOptions({ gfm: true, breaks: false });
 function Markdown({ text, width }) {
@@ -8599,7 +8713,7 @@ function tokenRate(text, startTs, endTs) {
 }
 var PILL_RATE = { bg: "#11141a", fg: "#8b949e" };
 function StreamingCard({ card }) {
-  const { stdout } = useStdout10();
+  const { stdout } = useStdout11();
   const cols = stdout?.columns ?? 80;
   const expanded = useContext5(LiveExpandContext);
   const reserveCap = expanded ? EXPANDED_MAX_LINES + 2 : STREAMING_PREVIEW_LINES2 + 2;
@@ -8618,7 +8732,7 @@ function StreamingCard({ card }) {
       {
         glyph: "\u2039",
         tone: TONE.ok,
-        title: "reply",
+        title: t("cardTitles.reply"),
         right: /* @__PURE__ */ React44.createElement(React44.Fragment, null, ratePill, modelPill)
       }
     ), /* @__PURE__ */ React44.createElement(Markdown, { text: card.text }));
@@ -8632,7 +8746,7 @@ function StreamingCard({ card }) {
   const aborted = !!card.aborted;
   const headColor = aborted ? TONE.err : TONE_ACTIVE.brand;
   const glyph = aborted ? "\u2039" : "\u25C8";
-  const headLabel = aborted ? "aborted" : "writing\u2026";
+  const headLabel = aborted ? t("cardLabels.aborted") : t("cardLabels.writing");
   const { tokens: liveTokens, tps: liveTps } = tokenRate(card.text, card.ts, Date.now());
   const liveRatePill = !aborted && liveTokens >= MIN_TOKENS_FOR_RATE && liveTps !== null ? /* @__PURE__ */ React44.createElement(Pill, { label: `${liveTps} t/s`, ...PILL_RATE, bold: false }) : null;
   const expandPill = !aborted ? /* @__PURE__ */ React44.createElement(Pill, { label: expanded ? "expanded \u2303o" : "preview \u2303o", ...PILL_RATE, bold: false }) : null;
@@ -8644,13 +8758,9 @@ function StreamingCard({ card }) {
       title: headLabel,
       right: /* @__PURE__ */ React44.createElement(React44.Fragment, null, liveRatePill, expandPill, aborted ? null : /* @__PURE__ */ React44.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand }), modelPill)
     }
-  ), expanded && droppedAbove > 0 ? /* @__PURE__ */ React44.createElement(
-    Text38,
-    {
-      color: FG.faint
-    },
-    `\u22EF ${droppedAbove} earlier line${droppedAbove === 1 ? "" : "s"} above`
-  ) : null, visible.map((line, i) => /* @__PURE__ */ React44.createElement(Box37, { key: `${card.id}:${visualLines.length - visible.length + i}`, flexDirection: "row" }, /* @__PURE__ */ React44.createElement(Text38, { color: aborted ? FG.meta : FG.body }, clipToCells(line, lineCells)))), aborted ? /* @__PURE__ */ React44.createElement(Text38, { color: FG.faint }, "[truncated by esc]") : null);
+  ), expanded && droppedAbove > 0 ? /* @__PURE__ */ React44.createElement(Text38, { color: FG.faint }, t(droppedAbove === 1 ? "cardLabels.earlierLine" : "cardLabels.earlierLines", {
+    count: droppedAbove
+  })) : null, visible.map((line, i) => /* @__PURE__ */ React44.createElement(Box37, { key: `${card.id}:${visualLines.length - visible.length + i}`, flexDirection: "row" }, /* @__PURE__ */ React44.createElement(Text38, { color: aborted ? FG.meta : FG.body }, clipToCells(line, lineCells)))), aborted ? /* @__PURE__ */ React44.createElement(Text38, { color: FG.faint }, t("cardLabels.truncatedByEsc")) : null);
 }
 
 // src/cli/ui/cards/SubAgentCard.tsx
@@ -8664,22 +8774,22 @@ function SubAgentCard({ card }) {
     failed: tone.err
   };
   const headColor = statusColor[card.status];
-  const headGlyph = card.status === "failed" ? "\u2716" : "\u232C";
+  const headGlyph = card.status === "failed" ? "\u2717" : "\u232C";
   const runningChildren = card.children.filter((c) => !isChildDone(c)).length;
   const isRunning = card.status === "running";
   const inLive = useContext6(ActiveCardContext);
-  const headerMeta2 = isRunning ? runningChildren > 0 ? [`${runningChildren} running`] : ["working"] : [{ text: card.status, color: headColor }];
+  const headerMeta2 = isRunning ? runningChildren > 0 ? [`${runningChildren} ${t("cardLabels.runningLabel")}`] : [t("cardLabels.workingLabel")] : [{ text: card.status, color: headColor }];
   return /* @__PURE__ */ React45.createElement(Card, { tone: headColor }, /* @__PURE__ */ React45.createElement(
     CardHeader,
     {
       glyph: headGlyph,
       tone: headColor,
-      title: "subagent",
+      title: t("cardTitles.subagent"),
       titleColor: tone.violet,
       subtitle: card.task,
       meta: headerMeta2
     }
-  ), card.name ? /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `agent \xB7 ${card.name}`) : null, card.tools && card.tools.length > 0 && /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `tools \xB7 ${card.tools.join(", ")}`), card.children.map((child) => /* @__PURE__ */ React45.createElement(Box38, { key: child.id, flexDirection: "row", gap: 1 }, inLive ? null : /* @__PURE__ */ React45.createElement(Text39, { color: tone.violet }, "\u258E"), /* @__PURE__ */ React45.createElement(ChildRow, { card: child }))));
+  ), card.name ? /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `${t("cardLabels.agent")} \xB7 ${card.name}`) : null, card.tools && card.tools.length > 0 && /* @__PURE__ */ React45.createElement(Text39, { color: fg.faint }, `${t("cardLabels.tools")} \xB7 ${card.tools.join(", ")}`), card.children.map((child) => /* @__PURE__ */ React45.createElement(Box38, { key: child.id, flexDirection: "row", gap: 1 }, inLive ? null : /* @__PURE__ */ React45.createElement(Text39, { color: tone.violet }, "\u258E"), /* @__PURE__ */ React45.createElement(ChildRow, { card: child }))));
 }
 function isChildDone(card) {
   switch (card.kind) {
@@ -8715,7 +8825,7 @@ function childVisual(card, doneColor, failedColor, fallbackColor) {
         statusGlyph: done ? doneGlyph(doneColor) : runningGlyph(CARD.reasoning.color),
         kindGlyph: "\u25C6",
         kindColor: CARD.reasoning.color,
-        text: `reasoning \xB7 ${card.paragraphs} \xB6`
+        text: t("cardLabels.reasoningLabel", { count: card.paragraphs })
       };
     }
     case "tool": {
@@ -8732,7 +8842,7 @@ function childVisual(card, doneColor, failedColor, fallbackColor) {
         statusGlyph: card.done ? doneGlyph(doneColor) : runningGlyph(CARD.streaming.color),
         kindGlyph: "\u25C8",
         kindColor: CARD.streaming.color,
-        text: card.done ? "response" : "writing \u2026"
+        text: card.done ? t("cardLabels.response") : t("cardLabels.writing")
       };
     case "diff":
       return {
@@ -8829,7 +8939,7 @@ function TipRowRender({
 }
 
 // src/cli/ui/cards/ToolCard.tsx
-import { Text as Text42, useStdout as useStdout11 } from "ink";
+import { Text as Text42, useStdout as useStdout12 } from "ink";
 import React48 from "react";
 var READ_TAIL = 2;
 var OTHER_TAIL = 5;
@@ -8838,10 +8948,11 @@ function tailLinesFor(name) {
   return /(?:^|_)(read|search|list|tree|get|status|diff|fetch|grep)(_|$)/.test(lower) || lower === "job_output" ? READ_TAIL : OTHER_TAIL;
 }
 function ToolCard({ card }) {
-  const { stdout } = useStdout11();
+  const { stdout } = useStdout12();
   const cols = stdout?.columns ?? 80;
   const lineCells = Math.max(20, cols - 4);
   const argsLabel = formatArgsSummary(card.args);
+  const subagentMarkdown = unwrapSubagentMarkdown(card);
   const allLines = card.output.length > 0 ? card.output.split("\n") : [];
   const tail = tailLinesFor(card.name);
   const truncated = allLines.length > tail;
@@ -8850,13 +8961,13 @@ function ToolCard({ card }) {
   const status2 = toolStatus(card);
   const headColor = headerColorFor(status2);
   const errColor = card.exitCode && card.exitCode !== 0 ? TONE.err : FG.sub;
-  const showBody = !card.rejected && visible.length > 0;
+  const showBody = !card.rejected && (subagentMarkdown !== null || visible.length > 0);
   const meta = [];
   if (card.retry) {
     meta.push({ text: `\u21BB ${card.retry.attempt}/${card.retry.max}`, color: TONE.warn });
   }
   if (card.rejected) {
-    meta.push({ text: "rejected", color: TONE.err });
+    meta.push({ text: t("cardLabels.rejected"), color: TONE.err });
   }
   for (const part of metaTrail(card)) meta.push(part);
   return /* @__PURE__ */ React48.createElement(Card, { tone: headColor }, /* @__PURE__ */ React48.createElement(
@@ -8869,7 +8980,9 @@ function ToolCard({ card }) {
       meta: meta.length > 0 ? meta : void 0,
       right: status2 === "running" ? /* @__PURE__ */ React48.createElement(Spinner, { kind: "braille", color: TONE_ACTIVE.brand, bold: true }) : void 0
     }
-  ), showBody && /* @__PURE__ */ React48.createElement(React48.Fragment, null, hidden > 0 ? /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, `\u22EE ${hidden} earlier line${hidden === 1 ? "" : "s"} (use /tool to read full)`) : null, visible.map((line, i) => /* @__PURE__ */ React48.createElement(
+  ), showBody && (subagentMarkdown !== null ? /* @__PURE__ */ React48.createElement(Markdown, { text: subagentMarkdown, width: lineCells }) : /* @__PURE__ */ React48.createElement(React48.Fragment, null, hidden > 0 ? /* @__PURE__ */ React48.createElement(Text42, { color: FG.faint }, t(hidden === 1 ? "cardLabels.earlierLine" : "cardLabels.earlierLines", {
+    count: hidden
+  })) : null, visible.map((line, i) => /* @__PURE__ */ React48.createElement(
     Text42,
     {
       key: `${card.id}:${hidden + i}`,
@@ -8877,7 +8990,21 @@ function ToolCard({ card }) {
       dimColor: !card.exitCode || card.exitCode === 0
     },
     clipToCells(line, lineCells) || " "
-  ))));
+  )))));
+}
+function unwrapSubagentMarkdown(card) {
+  if (card.name !== "spawn_subagent") return null;
+  if (card.output.length === 0) return null;
+  try {
+    const parsed = JSON.parse(card.output);
+    if (!parsed || typeof parsed !== "object") return null;
+    const obj = parsed;
+    if (obj.success !== true) return null;
+    if (typeof obj.output !== "string") return null;
+    return obj.output;
+  } catch {
+    return null;
+  }
 }
 function toolStatus(card) {
   if (card.rejected) return "rejected";
@@ -8915,10 +9042,11 @@ function headerColorFor(s) {
 function metaTrail(card) {
   const parts = [];
   const inputBytes = largestStringInputBytes(card.args);
-  if (inputBytes !== null) parts.push(`${formatBytes(inputBytes)} in`);
-  if (card.elapsedMs > 0) parts.push(`${(card.elapsedMs / 1e3).toFixed(2)}s`);
+  if (inputBytes !== null) parts.push(t("cardLabels.bytesIn", { bytes: formatBytes(inputBytes) }));
+  if (card.elapsedMs > 0)
+    parts.push(t("cardLabels.elapsedSec", { secs: (card.elapsedMs / 1e3).toFixed(2) }));
   if (card.done && !card.rejected && !card.aborted && card.exitCode !== void 0 && card.exitCode !== 0) {
-    parts.push(`exit ${card.exitCode}`);
+    parts.push(t("cardLabels.exit", { code: card.exitCode }));
   }
   return parts;
 }
@@ -8975,13 +9103,16 @@ function UsageCard({ card }) {
   const promptRatio = card.tokens.prompt / cap;
   const reasonRatio = card.tokens.reason / cap;
   const outputRatio = card.tokens.output / cap;
-  const headerMeta2 = [`turn ${card.turn}`, formatCost(card.cost, card.balanceCurrency)];
+  const headerMeta2 = [
+    `${t("cardLabels.turn")} ${card.turn}`,
+    formatCost(card.cost, card.balanceCurrency)
+  ];
   if (card.elapsedMs !== void 0) headerMeta2.push(`${(card.elapsedMs / 1e3).toFixed(1)}s`);
-  return /* @__PURE__ */ React49.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ React49.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: "usage", meta: headerMeta2 }), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "prompt"), bar(promptRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "reason"), bar(reasonRatio, TONE.accent), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "output"), bar(outputRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, "cache "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, "session"), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, `\u26C1 ${formatCost(card.sessionCost, card.balanceCurrency, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(React49.Fragment, null, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, "\xB7 balance"), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
+  return /* @__PURE__ */ React49.createElement(Card, { tone: FG.meta }, /* @__PURE__ */ React49.createElement(CardHeader, { glyph: "\u03A3", tone: FG.meta, title: t("cardTitles.usage"), meta: headerMeta2 }), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.prompt")), bar(promptRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.prompt.toLocaleString()), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `/ 1M \xB7 ${(promptRatio * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.reason")), bar(reasonRatio, TONE.accent), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.reason.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.output")), bar(outputRatio, TONE.brand), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, card.tokens.output.toLocaleString())), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.sub }, t("cardLabels.cache"), " "), bar(card.cacheHit, TONE.ok), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.ok }, `${(card.cacheHit * 100).toFixed(1)}%`)), /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, t("cardLabels.session")), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: FG.body }, `\u26C1 ${formatCost(card.sessionCost, card.balanceCurrency, 3)}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(React49.Fragment, null, /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${t("cardLabels.balance")}`), /* @__PURE__ */ React49.createElement(Text43, { bold: true, color: TONE.brand }, formatBalance(card.balance, card.balanceCurrency))) : null));
 }
 function CompactUsageRow({ card }) {
   const elapsed = card.elapsedMs !== void 0 ? ` \xB7 ${(card.elapsedMs / 1e3).toFixed(1)}s` : "";
-  return /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1, marginTop: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, "\u03A3"), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `turn ${card.turn}`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, `\xB7 ${compactNum(card.tokens.prompt)} prompt \xB7 ${compactNum(card.tokens.output)} out`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, "\xB7 cache"), /* @__PURE__ */ React49.createElement(Text43, { color: TONE.ok }, `${(card.cacheHit * 100).toFixed(0)}%`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${formatCost(card.cost, card.balanceCurrency)}${elapsed}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(Text43, { color: TONE.brand }, `\xB7 ${formatBalance(card.balance, card.balanceCurrency)}`) : null);
+  return /* @__PURE__ */ React49.createElement(Box42, { flexDirection: "row", gap: 1, marginTop: 1 }, /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, "\u03A3"), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `${t("cardLabels.turn")} ${card.turn}`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.meta }, `\xB7 ${compactNum(card.tokens.prompt)} ${t("cardLabels.prompt")} \xB7 ${compactNum(card.tokens.output)} ${t("cardLabels.output")}`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${t("cardLabels.cache")}`), /* @__PURE__ */ React49.createElement(Text43, { color: TONE.ok }, `${(card.cacheHit * 100).toFixed(0)}%`), /* @__PURE__ */ React49.createElement(Text43, { color: FG.faint }, `\xB7 ${formatCost(card.cost, card.balanceCurrency)}${elapsed}`), card.balance !== void 0 ? /* @__PURE__ */ React49.createElement(Text43, { color: TONE.brand }, `\xB7 ${formatBalance(card.balance, card.balanceCurrency)}`) : null);
 }
 
 // src/cli/ui/cards/UserCard.tsx
@@ -9304,7 +9435,7 @@ function summarizeToolArgs(name, args) {
 }
 
 // src/cli/ui/layout/StatusRow.tsx
-import { Box as Box46, Text as Text49, useStdout as useStdout12 } from "ink";
+import { Box as Box46, Text as Text49, useStdout as useStdout13 } from "ink";
 import React56 from "react";
 
 // src/cli/ui/primitives/Countdown.tsx
@@ -9320,24 +9451,33 @@ function Countdown({ endsAt, color = TONE.brand }) {
 var RULE_PAD = 4;
 var RULE_MIN = 20;
 var WALLET_MIN_COLS = 90;
+var VERSION_MIN_COLS = 70;
+var FEEDBACK_HINT_MIN_COLS = 100;
 function StatusRow() {
   const status2 = useAgentState((s) => s.status);
   const session = useAgentState((s) => s.session);
-  const { stdout } = useStdout12();
+  const { stdout } = useStdout13();
   const cols = stdout?.columns ?? 80;
   const ruleWidth = Math.max(RULE_MIN, cols - RULE_PAD);
   const hasTurn = status2.cost > 0;
   const hasSession = status2.sessionCost > 0;
   const hasBalance = typeof status2.balance === "number";
   const showWallet = cols >= WALLET_MIN_COLS && (hasSession || hasBalance);
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "column" }, /* @__PURE__ */ React56.createElement(Box46, null, /* @__PURE__ */ React56.createElement(Text49, null, "  "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint }, "\u2500".repeat(ruleWidth))), /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, null, "  "), status2.recording ? /* @__PURE__ */ React56.createElement(RecordingPill, { rec: status2.recording }) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ React56.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds }) : /* @__PURE__ */ React56.createElement(ModePill2, { mode: status2.mode, network: status2.network, detail: status2.networkDetail }), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, `${session.id} \xB7 ${session.branch}`), hasTurn && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.brand }, "\u25B8 "), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: FG.body }, `${formatCost(status2.cost, status2.balanceCurrency)} turn`)), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.accent }, `cache ${Math.round(status2.cacheHit * 100)}%`), showWallet && /* @__PURE__ */ React56.createElement(
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Box46, { height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, null, "  "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, "\u2500".repeat(ruleWidth))), /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, minHeight: 1, flexWrap: "nowrap", flexShrink: 0 }, /* @__PURE__ */ React56.createElement(Text49, { wrap: "truncate" }, "  "), status2.recording ? /* @__PURE__ */ React56.createElement(RecordingPill, { rec: status2.recording }) : status2.countdownSeconds !== void 0 ? /* @__PURE__ */ React56.createElement(CountdownRow, { mode: status2.mode, secondsLeft: status2.countdownSeconds }) : /* @__PURE__ */ React56.createElement(ModePill2, { mode: status2.mode, network: status2.network, detail: status2.networkDetail }), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, `${session.id} \xB7 ${session.branch}`), hasTurn && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.brand, wrap: "truncate" }, "\u25B8 "), /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: FG.body, wrap: "truncate" }, `${formatCost(status2.cost, status2.balanceCurrency)} turn`)), /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(
+    Text49,
+    {
+      color: TONE.accent,
+      wrap: "truncate"
+    },
+    `cache ${Math.round(status2.cacheHit * 100)}%`
+  ), showWallet && /* @__PURE__ */ React56.createElement(
     WalletPill,
     {
       sessionCostUsd: status2.sessionCost,
       balance: status2.balance,
       currency: status2.balanceCurrency
     }
-  )));
+  ), cols >= VERSION_MIN_COLS && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, `v${VERSION}`), cols >= FEEDBACK_HINT_MIN_COLS && /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, "  \xB7  "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "\u2691 "), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, "/feedback")))));
 }
 function WalletPill({
   sessionCostUsd,
@@ -9346,7 +9486,14 @@ function WalletPill({
 }) {
   const showSpent = sessionCostUsd > 0;
   const showBalance = typeof balance === "number";
-  return /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "\u26C1 "), showSpent && /* @__PURE__ */ React56.createElement(Text49, { color: FG.body }, `${formatCost(sessionCostUsd, currency, 2)} spent`), showSpent && showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "  /  "), showBalance && /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: balanceColor(balance, currency) }, formatBalance(balance, currency, { fractionDigits: 2 })), showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint }, " left"));
+  return /* @__PURE__ */ React56.createElement(React56.Fragment, null, /* @__PURE__ */ React56.createElement(Sep, null), /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "\u26C1 "), showSpent && /* @__PURE__ */ React56.createElement(
+    Text49,
+    {
+      color: FG.body,
+      wrap: "truncate"
+    },
+    `${formatCost(sessionCostUsd, currency, 2)} spent`
+  ), showSpent && showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "  /  "), showBalance && /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: balanceColor(balance, currency), wrap: "truncate" }, formatBalance(balance, currency, { fractionDigits: 2 })), showBalance && /* @__PURE__ */ React56.createElement(Text49, { color: FG.faint, wrap: "truncate" }, " left"));
 }
 function ModePill2({
   mode: mode2,
@@ -9355,18 +9502,18 @@ function ModePill2({
 }) {
   if (network === "online") {
     const pill = modeGlyph(mode2);
-    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, ` ${mode2}`));
+    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, ` ${mode2}`));
   }
   const dot = networkDot(network);
   if (network === "slow") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, ` ${mode2} \xB7 slow${tail}`));
+    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, ` ${mode2} \xB7 slow${tail}`));
   }
   if (network === "disconnected") {
     const tail = detail ? ` \xB7 ${detail}` : "";
-    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, ` disconnect${tail}`));
+    return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, ` disconnect${tail}`));
   }
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color }, " reconnecting\u2026"));
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, dot.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: dot.color, wrap: "truncate" }, " reconnecting\u2026"));
 }
 function CountdownRow({
   mode: mode2,
@@ -9374,14 +9521,14 @@ function CountdownRow({
 }) {
   const pill = modeGlyph(mode2);
   const endsAt = Date.now() + secondsLeft * 1e3;
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub }, ` ${mode2}   \xB7   `), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn }, "approving in "), /* @__PURE__ */ React56.createElement(Countdown, { endsAt }), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn }, "s \xB7 esc to interrupt"));
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { color: pill.color, wrap: "truncate" }, pill.glyph), /* @__PURE__ */ React56.createElement(Text49, { color: FG.sub, wrap: "truncate" }, ` ${mode2}   \xB7   `), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn, wrap: "truncate" }, "approving in "), /* @__PURE__ */ React56.createElement(Countdown, { endsAt }), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.warn, wrap: "truncate" }, "s \xB7 esc to interrupt"));
 }
 function RecordingPill({ rec }) {
   const sizeMb = (rec.sizeBytes / (1024 * 1024)).toFixed(1);
-  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row" }, /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.err }, "\u25CFREC"), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.err }, ` ${sizeMb} MB \xB7 ${rec.events} evt`));
+  return /* @__PURE__ */ React56.createElement(Box46, { flexDirection: "row", height: 1, flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Text49, { bold: true, color: TONE.err, wrap: "truncate" }, "\u25CFREC"), /* @__PURE__ */ React56.createElement(Text49, { color: TONE.err, wrap: "truncate" }, ` ${sizeMb} MB \xB7 ${rec.events} evt`));
 }
 function Sep() {
-  return /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta }, "   \xB7   ");
+  return /* @__PURE__ */ React56.createElement(Text49, { color: FG.meta, wrap: "truncate" }, "   \xB7   ");
 }
 function modeGlyph(mode2) {
   switch (mode2) {
@@ -9409,7 +9556,7 @@ function networkDot(state) {
 }
 
 // src/cli/ui/layout/ToastRail.tsx
-import { Box as Box47, Text as Text50, useStdout as useStdout13 } from "ink";
+import { Box as Box47, Text as Text50, useStdout as useStdout14 } from "ink";
 import React57, { useEffect as useEffect8 } from "react";
 var TONE_COLOR = {
   ok: TONE.ok,
@@ -9432,7 +9579,7 @@ function ToastRail() {
   const toasts = useAgentState((s) => s.toasts);
   const dispatch = useDispatch();
   useSlowTick();
-  const { stdout } = useStdout13();
+  const { stdout } = useStdout14();
   const cols = stdout?.columns ?? 80;
   const rule = "\u2501".repeat(Math.max(20, cols - 4));
   const now = Date.now();
@@ -9837,24 +9984,28 @@ var update = (_args, _loop, ctx) => {
     return { info: lines.join("\n") };
   }
   lines.push(t("handlers.admin.updateLatest", { version: latest }));
-  const diff = compareVersions(VERSION, latest);
-  if (diff >= 0) {
+  if (compareVersions(VERSION, latest) >= 0) {
     lines.push("", t("handlers.admin.updateUpToDate"));
     return { info: lines.join("\n") };
   }
-  if (isNpxInstall()) {
+  const installSource = detectInstallSource();
+  const npmPrefix = installSource === "npm" ? detectNpmInstallPrefix() : null;
+  const plan2 = planUpdate({ current: VERSION, latest, installSource, npmPrefix });
+  if (plan2.action === "npx-hint") {
     lines.push("", t("handlers.admin.updateNpxHint"), t("handlers.admin.updateNpxForce"));
+    return { info: lines.join("\n") };
+  }
+  lines.push("", t("handlers.admin.updateUpgradeHint"), t("handlers.admin.updateUpgradeCmd1"));
+  if (plan2.action === "run-install" && plan2.command) {
+    lines.push(t("handlers.admin.updateUpgradeCmd2", { command: plan2.command.join(" ") }));
   } else {
-    lines.push(
-      "",
-      t("handlers.admin.updateUpgradeHint"),
-      t("handlers.admin.updateUpgradeCmd1"),
-      t("handlers.admin.updateUpgradeCmd2"),
-      "",
-      t("handlers.admin.updateInSessionDisabled"),
-      t("handlers.admin.updateInSessionDisabled2")
-    );
+    lines.push(...MANUAL_UPDATE_COMMANDS.map((c) => `  ${c}`));
   }
+  lines.push(
+    "",
+    t("handlers.admin.updateInSessionDisabled"),
+    t("handlers.admin.updateInSessionDisabled2")
+  );
   return { info: lines.join("\n") };
 };
 var stats = () => {
@@ -10931,6 +11082,32 @@ var handlers10 = {
   budget
 };
 
+// src/cli/ui/slash/handlers/observability.ts
+import { release } from "os";
+
+// src/cli/ui/clipboard.ts
+import { mkdtempSync, writeFileSync as writeFileSync4 } from "fs";
+import { tmpdir } from "os";
+import { join as join6 } from "path";
+var OSC_52_LIMIT = 75e3;
+function writeClipboard(text) {
+  const dir = mkdtempSync(join6(tmpdir(), "reasonix-clip-"));
+  const filePath = join6(dir, "clip.txt");
+  let osc52 = false;
+  if (text.length <= OSC_52_LIMIT) {
+    const b64 = Buffer.from(text, "utf8").toString("base64");
+    process.stdout.write(`\x1B]52;c;${b64}\x1B\\`);
+    osc52 = true;
+  }
+  let writtenPath = null;
+  try {
+    writeFileSync4(filePath, text, "utf8");
+    writtenPath = filePath;
+  } catch {
+  }
+  return { osc52, filePath: writtenPath, size: text.length };
+}
+
 // src/cli/ui/ctx-breakdown.tsx
 import { Box as Box48, Text as Text51 } from "ink";
 import React59 from "react";
@@ -10975,6 +11152,92 @@ function computeCtxBreakdown(loop2) {
   };
 }
 
+// src/cli/ui/feedback.ts
+var FEEDBACK_ISSUE_BASE = "https://github.com/esengine/DeepSeek-Reasonix/issues/new";
+var FEEDBACK_BODY_QUERY_LIMIT = 6e3;
+function buildFeedbackIssueUrl(diagnostic) {
+  const trimmed = diagnostic.length > FEEDBACK_BODY_QUERY_LIMIT ? diagnostic.slice(0, FEEDBACK_BODY_QUERY_LIMIT) : diagnostic;
+  return `${FEEDBACK_ISSUE_BASE}?body=${encodeURIComponent(trimmed)}`;
+}
+function buildFeedbackDiagnostic(input) {
+  const lines = [];
+  lines.push(`**Reasonix**: ${formatVersion(input.version, input.latestVersion)}`);
+  lines.push(`**Platform**: ${input.platform} (${input.osRelease})`);
+  lines.push(`**Terminal**: ${formatTerminal(input)}`);
+  if (typeof input.cols === "number" && typeof input.rows === "number") {
+    lines.push(`**Size**: ${input.cols}\xD7${input.rows}`);
+  }
+  lines.push(`**Node**: ${input.nodeVersion}`);
+  lines.push(`**Locale**: ${input.locale}`);
+  if (input.theme) lines.push(`**Theme**: ${input.theme}`);
+  lines.push(`**Model**: ${formatModel(input.model, input.reasoningEffort)}`);
+  const modeLine = formatMode(input.editMode, input.planMode);
+  if (modeLine) lines.push(`**Mode**: ${modeLine}`);
+  if (typeof input.mcpServerCount === "number") {
+    lines.push(`**MCP**: ${input.mcpServerCount} server(s)`);
+  }
+  if (input.sessionId) lines.push(`**Session**: ${input.sessionId}`);
+  lines.push("", "<!-- describe what you were doing when this happened -->", "");
+  return lines.join("\n");
+}
+function formatVersion(installed, latest) {
+  if (!latest) return installed;
+  const cmp = compareVersions(installed, latest);
+  if (cmp === 0) return `${installed} (latest)`;
+  if (cmp > 0) return installed;
+  return `${installed} (latest: ${latest})`;
+}
+function formatModel(model2, effort) {
+  return effort ? `${model2} \xB7 effort=${effort}` : model2;
+}
+function formatMode(editMode, planMode) {
+  const parts = [];
+  if (editMode) parts.push(`edit=${editMode}`);
+  parts.push(`plan=${planMode ? "on" : "off"}`);
+  return parts.join(" \xB7 ");
+}
+function formatTerminal(input) {
+  const head = input.termProgram ?? "(unknown)";
+  const env = [];
+  if (input.termProgram) env.push(`TERM_PROGRAM=${input.termProgram}`);
+  if (input.term) env.push(`TERM=${input.term}`);
+  if (input.colorTerm) env.push(`COLORTERM=${input.colorTerm}`);
+  if (input.inWindowsTerminal) env.push("WT_SESSION=set");
+  if (input.inTmux) env.push("TMUX=set");
+  if (input.inSsh) env.push("SSH_TTY=set");
+  if (input.wslDistro) env.push(`WSL=${input.wslDistro}`);
+  if (env.length === 0) return head;
+  return `${head} (${env.join(", ")})`;
+}
+
+// src/cli/ui/open-url.ts
+import { spawn } from "child_process";
+import { platform } from "os";
+function openUrl(url) {
+  if (process.env.CI) return { opened: false, reason: "ci" };
+  if (process.env.REASONIX_NO_OPEN) return { opened: false, reason: "disabled" };
+  const os = platform();
+  let cmd;
+  let args;
+  if (os === "win32") {
+    cmd = "cmd";
+    args = ["/c", "start", "", url];
+  } else if (os === "darwin") {
+    cmd = "open";
+    args = [url];
+  } else {
+    cmd = "xdg-open";
+    args = [url];
+  }
+  try {
+    const child = spawn(cmd, args, { detached: true, stdio: "ignore" });
+    child.unref();
+    return { opened: true };
+  } catch {
+    return { opened: false, reason: "spawn-failed" };
+  }
+}
+
 // src/cli/ui/slash/handlers/observability.ts
 var context = (_args, loop2) => {
   const breakdown = computeCtxBreakdown(loop2);
@@ -11004,11 +11267,11 @@ var status = (_args, loop2, ctx) => {
   }) : t("handlers.observability.statusCtxNone");
   const cost2 = summary.totalCostUsd;
   const cacheLine = summary.turns > 3 ? (() => {
-    const cachePct = Math.round(summary.cacheHitRatio * 100);
+    const cachePct = summary.cacheHitRatio * 100;
     return t("handlers.observability.statusCost", {
       cost: cost2.toFixed(4),
       bar: renderTinyBar(cachePct, 12),
-      pct: cachePct,
+      pct: cachePct.toFixed(1),
       turns: summary.turns
     });
   })() : t("handlers.observability.statusCostCold", {
@@ -11147,11 +11410,48 @@ function estimateCost(userText, loop2) {
   ];
   return { info: lines.join("\n") };
 }
+var feedback = (_args, loop2, ctx) => {
+  const themeName = resolveThemePreference(loadTheme(), process.env.REASONIX_THEME);
+  const diagnostic = buildFeedbackDiagnostic({
+    version: VERSION,
+    latestVersion: ctx.latestVersion ?? void 0,
+    platform: process.platform,
+    osRelease: release(),
+    termProgram: process.env.TERM_PROGRAM,
+    term: process.env.TERM,
+    colorTerm: process.env.COLORTERM,
+    inWindowsTerminal: !!process.env.WT_SESSION,
+    inTmux: !!process.env.TMUX,
+    inSsh: !!process.env.SSH_TTY,
+    wslDistro: process.env.WSL_DISTRO_NAME,
+    cols: process.stdout.columns,
+    rows: process.stdout.rows,
+    nodeVersion: process.version,
+    locale: getLanguage(),
+    theme: themeName,
+    model: loop2.model,
+    reasoningEffort: loop2.reasoningEffort,
+    editMode: ctx.editMode,
+    planMode: ctx.planMode,
+    mcpServerCount: ctx.mcpServers?.length ?? ctx.mcpSpecs?.length,
+    sessionId: ctx.sessionId
+  });
+  writeClipboard(diagnostic);
+  const url = buildFeedbackIssueUrl(diagnostic);
+  const opened = openUrl(url);
+  const lines = [
+    opened.opened ? "\u25B8 issue page opened with the diagnostic block pre-filled. Just describe what you were doing and submit." : `\u25B8 couldn't open the browser (${opened.reason ?? "unknown"}). Diagnostic info is on your clipboard; open this URL manually: ${url}`,
+    "",
+    diagnostic
+  ];
+  return { info: lines.join("\n") };
+};
 var handlers11 = {
   context,
   status,
   compact,
-  cost
+  cost,
+  feedback
 };
 
 // src/cli/ui/slash/handlers/permissions.ts
@@ -11532,6 +11832,31 @@ var handlers17 = {
   se: (args, loop2, ctx) => handlers17["search-engine"](args, loop2, ctx)
 };
 
+// src/cli/ui/slash/nearest.ts
+function nearestCommands(input, all, opts = {}) {
+  if (!input) return [];
+  const max = opts.max ?? 3;
+  const maxDistance = Math.min(opts.maxDistance ?? 3, Math.floor(input.length / 2));
+  if (max <= 0 || maxDistance <= 0) return [];
+  return all.map((name) => ({ name, distance: levenshtein(input, name) })).filter((entry) => entry.distance <= maxDistance).sort((a, b) => a.distance - b.distance || a.name.localeCompare(b.name)).slice(0, max).map((entry) => entry.name);
+}
+function levenshtein(a, b) {
+  if (a === b) return 0;
+  if (!a) return b.length;
+  if (!b) return a.length;
+  let prev = Array.from({ length: b.length + 1 }, (_, i) => i);
+  let next = new Array(b.length + 1).fill(0);
+  for (let i = 0; i < a.length; i += 1) {
+    next[0] = i + 1;
+    for (let j = 0; j < b.length; j += 1) {
+      const cost2 = a[i] === b[j] ? 0 : 1;
+      next[j + 1] = Math.min((next[j] ?? 0) + 1, (prev[j + 1] ?? 0) + 1, (prev[j] ?? 0) + cost2);
+    }
+    [prev, next] = [next, prev];
+  }
+  return prev[b.length] ?? 0;
+}
+
 // src/cli/ui/slash/dispatch.ts
 var HANDLERS = {
   ...handlers,
@@ -11555,6 +11880,11 @@ var HANDLERS = {
 function handleSlash(cmd, args, loop2, ctx = {}) {
   const h = HANDLERS[resolveSlashAlias(cmd)];
   if (h) return h(args, loop2, ctx);
+  const suggestions = nearestCommands(cmd, Object.keys(HANDLERS));
+  if (suggestions.length > 0) {
+    const list2 = suggestions.map((name) => `/${name}`).join(", ");
+    return { unknown: true, info: `unknown command: /${cmd} \u2014 did you mean ${list2}?` };
+  }
   return { unknown: true, info: `unknown command: /${cmd}  (try /help)` };
 }
 
@@ -12475,9 +12805,9 @@ function useSubagent({
 // src/cli/ui/App.tsx
 var FLUSH_INTERVAL_MS = (() => {
   const raw = process.env.REASONIX_FLUSH_MS;
-  if (!raw) return 33;
+  if (!raw) return 16;
   const parsed = Number(raw);
-  if (!Number.isFinite(parsed) || parsed < 16 || parsed > 1e3) return 33;
+  if (!Number.isFinite(parsed) || parsed < 16 || parsed > 1e3) return 16;
   return Math.round(parsed);
 })();
 var PLAIN_UI = process.env.REASONIX_UI === "plain";
@@ -12519,7 +12849,8 @@ function AppInner({
   progressSink,
   codeMode,
   noDashboard,
-  onSwitchSession
+  onSwitchSession,
+  mouse = true
 }) {
   markPhase("app_inner_start");
   const log = useScrollback();
@@ -12551,18 +12882,18 @@ function AppInner({
   }, [busy]);
   const [ongoingTool, setOngoingTool] = useState20(null);
   const [toolProgress, setToolProgress] = useState20(null);
-  const { stdout } = useStdout14();
+  const { stdout } = useStdout15();
   useEffect12(() => {
     if (!stdout || !stdout.isTTY) return;
     stdout.write("\x1B[?2004h");
     stdout.write("\x1B[>4;2m");
-    stdout.write("\x1B[?1006h\x1B[?1000h");
+    if (mouse) stdout.write("\x1B[?1007h");
     return () => {
-      stdout.write("\x1B[?1000l\x1B[?1006l");
+      if (mouse) stdout.write("\x1B[?1007l");
       stdout.write("\x1B[?2004l");
       stdout.write("\x1B[>4m");
     };
-  }, [stdout]);
+  }, [stdout, mouse]);
   const walletCurrencyRef = useRef9(void 0);
   const { activities: subagentActivities, sinkRef: subagentSinkRef } = useSubagent({
     session,
@@ -12711,7 +13042,7 @@ function AppInner({
   const loopRef = useRef9(null);
   const loop2 = useMemo9(() => {
     if (loopRef.current) return loopRef.current;
-    const client = new DeepSeekClient();
+    const client = new DeepSeekClient({ baseUrl: loadBaseUrl() });
     if (tools && !tools.has("run_skill")) {
       registerSkillTools(tools, {
         projectRoot: codeMode?.rootDir,
@@ -13031,11 +13362,12 @@ function AppInner({
   }, [session, loop2, codeMode, syncPendingCount, log]);
   const quitProcess = useQuit(transcriptRef);
   useKeystroke((ev) => {
+    const pickerOwnsArrows = (atState?.entries.length ?? 0) > 0 || (slashMatches?.length ?? 0) > 0 || (slashArgMatches?.length ?? 0) > 0 || pendingShell != null;
     if (ev.pageUp || ev.mouseScrollUp) chatScroll.scrollUp();
     else if (ev.pageDown || ev.mouseScrollDown) chatScroll.scrollDown();
     else if (ev.end) chatScroll.jumpToBottom();
-    else if ((!chatScroll.pinned || busy) && ev.upArrow) chatScroll.scrollUp();
-    else if ((!chatScroll.pinned || busy) && ev.downArrow) chatScroll.scrollDown();
+    else if (!pickerOwnsArrows && ev.upArrow) chatScroll.scrollUp();
+    else if (!pickerOwnsArrows && ev.downArrow) chatScroll.scrollDown();
   }, !modalOpen);
   useKeystroke((ev) => {
     const chKey = ev.input;
@@ -13250,7 +13582,7 @@ function AppInner({
     if (dashboardRef.current) return dashboardRef.current.url;
     if (dashboardStartingRef.current) return dashboardStartingRef.current;
     const startup = (async () => {
-      const { startDashboardServer } = await import("./server-MC4A4WAJ.js");
+      const { startDashboardServer } = await import("./server-W4XJK4GX.js");
       const handle = await startDashboardServer({
         mode: "attached",
         configPath: defaultConfigPath(),
@@ -13685,6 +14017,7 @@ function AppInner({
           startDashboard,
           stopDashboard,
           getDashboardUrl,
+          sessionId: session,
           jobs: codeMode?.jobs,
           postInfo: (text2) => log.pushInfo(text2),
           postDoctor: (checks) => log.showDoctor(checks),
@@ -14151,7 +14484,8 @@ function AppInner({
       }
       if (choice === "refine" || choice === "approve") {
         if (pendingPlan) {
-          setStagedInput({ plan: pendingPlan, mode: choice });
+          const questions = extractOpenQuestionsSection(pendingPlan) ?? void 0;
+          setStagedInput({ plan: pendingPlan, mode: choice, questions });
           setPendingPlan(null);
         } else if (choice === "approve") {
           setStagedInput({ plan: "", mode: "approve" });
@@ -14166,7 +14500,8 @@ function AppInner({
         return;
       }
       if (pendingPlan) {
-        setStagedInput({ plan: pendingPlan, mode: "reject" });
+        const questions = extractOpenQuestionsSection(pendingPlan) ?? void 0;
+        setStagedInput({ plan: pendingPlan, mode: "reject", questions });
         setPendingPlan(null);
       }
     },
@@ -14181,7 +14516,7 @@ function AppInner({
     []
   );
   const handleStagedInputSubmit = useCallback11(
-    async (feedback, override) => {
+    async (feedback2, override) => {
       const staged = override ?? stagedInput;
       if (override) {
         setPendingPlan(null);
@@ -14189,8 +14524,8 @@ function AppInner({
         setStagedInput(null);
       }
       if (!staged) return;
-      const trimmed = feedback.trim();
-      let synthetic;
+      const trimmed = feedback2.trim();
+      const tail = trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed;
       let marker;
       if (staged.mode === "approve") {
         togglePlanMode(false);
@@ -14208,19 +14543,7 @@ function AppInner({
           });
           persistPlanState();
         }
-        if (trimmed) {
-          synthetic = `The plan above has been approved. Implement it now. You are out of plan mode \u2014 use edit_file / write_file / run_command as needed.
-
-User's additional instructions / answers to your open questions:
-
-${trimmed}
-
-Factor these in before the first edit. Stick to the plan unless you discover a concrete reason to deviate; if you do, tell me and wait for a response.`;
-          marker = `\u25B8 plan approved + instructions \u2014 ${trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed}`;
-        } else {
-          synthetic = "The plan above has been approved. Implement it now. You are out of plan mode \u2014 use edit_file / write_file / run_command as needed. If the plan listed open questions and I didn't answer them, default to the safest interpretation and call them out in your first reply. Don't fabricate preferences \u2014 if a question is truly unanswerable without me, stop and ask.";
-          marker = "\u25B8 plan approved \u2014 implementing";
-        }
+        marker = trimmed ? `\u25B8 plan approved + instructions \u2014 ${tail}` : "\u25B8 plan approved \u2014 implementing";
       } else if (staged.mode === "reject") {
         planStepsRef.current = null;
         completedStepIdsRef.current = /* @__PURE__ */ new Set();
@@ -14229,38 +14552,20 @@ Factor these in before the first edit. Stick to the plan unless you discover a c
         persistPlanState();
         togglePlanMode(false);
         agentStore.dispatch({ type: "plan.drop" });
-        if (trimmed) {
-          synthetic = `The plan was rejected. User's reason / what they actually want:
-
-${trimmed}
-
-Drop the proposed plan entirely. Use this guidance to understand what the user is after \u2014 ask follow-up questions if anything is still unclear, otherwise propose a different plan that addresses it.`;
-          marker = `\u25B8 plan rejected \u2014 ${trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed}`;
-        } else {
-          synthetic = "The plan was cancelled. Drop it entirely. Ask me what I actually want before proposing another plan or making any changes.";
-          marker = "\u25B8 plan cancelled";
-        }
+        marker = trimmed ? `\u25B8 plan rejected \u2014 ${tail}` : "\u25B8 plan cancelled";
       } else {
-        if (trimmed) {
-          synthetic = `The plan needs refinement. User feedback / answers:
-
-${trimmed}
-
-Stay in plan mode \u2014 address the feedback (explore more if needed), then submit an improved submit_plan call. Don't propose a near-identical plan unless you explain why the feedback doesn't apply.`;
-          marker = `\u25B8 refining \u2014 ${trimmed.length > 50 ? `${trimmed.slice(0, 50)}\u2026` : trimmed}`;
-        } else {
-          synthetic = "The plan needs refinement, but the user didn't give specifics. Ask them one or two concrete questions \u2014 scope, approach, file boundaries, or the risks you flagged \u2014 then wait for their answer before submitting an updated plan.";
-          marker = "\u25B8 refining \u2014 asking the model to clarify";
-        }
+        marker = trimmed ? `\u25B8 refining \u2014 ${tail}` : "\u25B8 refining \u2014 using safe defaults";
       }
+      log.pushInfo(marker);
       const gateId = pendingGateIdRef.current;
       if (gateId !== null) {
+        const fb = trimmed || void 0;
         if (staged.mode === "approve") {
-          pauseGate.resolve(gateId, { type: "approve" });
+          pauseGate.resolve(gateId, { type: "approve", feedback: fb });
         } else if (staged.mode === "reject") {
-          pauseGate.resolve(gateId, { type: "cancel" });
+          pauseGate.resolve(gateId, { type: "cancel", feedback: fb });
         } else {
-          pauseGate.resolve(gateId, { type: "refine" });
+          pauseGate.resolve(gateId, { type: "refine", feedback: fb });
         }
       }
     },
@@ -14453,12 +14758,12 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
     []
   );
   const handleCheckpointReviseSubmit = useCallback11(
-    (feedback, snapOverride) => {
+    (feedback2, snapOverride) => {
       const snap = snapOverride;
       setStagedCheckpointRevise(null);
       if (!snap) return;
       const label = snap.title ? `${snap.stepId} \xB7 ${snap.title}` : snap.stepId;
-      const trimmed = feedback.trim();
+      const trimmed = feedback2.trim();
       const gid = pendingGateIdRef.current;
       if (gid !== null) {
         pauseGate.resolve(
@@ -14558,6 +14863,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
     PlanRefineInput,
     {
       mode: stagedInput.mode,
+      questions: stagedInput.questions,
       onSubmit: handleStagedInputSubmit,
       onCancel: handleStagedInputCancel
     }
@@ -14802,7 +15108,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       block: pendingEdits.current[0],
       onChoose: handleWalkChoice
     }
-  ) : !chatScroll.pinned ? /* @__PURE__ */ React60.createElement(Text52, { color: FG.faint }, " \u{1F4D6} reading history \u2014 End / PgDn to return \xB7 \u2193 to advance one line") : /* @__PURE__ */ React60.createElement(React60.Fragment, null, codeMode ? /* @__PURE__ */ React60.createElement(
+  ) : !chatScroll.pinned ? /* @__PURE__ */ React60.createElement(Text52, { color: FG.faint }, " \u{1F4D6} reading history \u2014 End / PgDn to return \xB7 \u2193 to advance one line") : /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, codeMode ? /* @__PURE__ */ React60.createElement(
     ModeStatusBar,
     {
       editMode,
@@ -14822,15 +15128,16 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       onHistoryPrev: recallPrev,
       onHistoryNext: recallNext
     }
-  ), slashMatches !== null ? /* @__PURE__ */ React60.createElement(
+  )), /* @__PURE__ */ React60.createElement(Box49, { flexDirection: "column", flexShrink: 0, flexWrap: "nowrap" }, slashMatches !== null ? /* @__PURE__ */ React60.createElement(
     SlashSuggestions,
     {
+      key: `slash-suggestions:${slashGroupMode ? "group" : "search"}`,
       matches: slashMatches,
       selectedIndex: slashSelected,
       groupMode: slashGroupMode,
       advancedHidden: slashAdvancedHidden
     }
-  ) : null, atState !== null ? /* @__PURE__ */ React60.createElement(AtMentionSuggestions, { state: atState, selectedIndex: atSelected }) : null, slashArgContext ? /* @__PURE__ */ React60.createElement(
+  ) : null, atState !== null ? /* @__PURE__ */ React60.createElement(AtMentionSuggestions, { state: atState, selectedIndex: atSelected }) : null), slashArgContext ? /* @__PURE__ */ React60.createElement(
     SlashArgPicker,
     {
       matches: slashArgMatches,
@@ -14902,7 +15209,7 @@ function Setup({ onReady }) {
       return;
     }
     if (!isPlausibleKey(trimmed)) {
-      setError("Doesn't look like a DeepSeek key. They start with 'sk-' and are 30+ chars.");
+      setError("Key looks too short \u2014 paste the full token (16+ chars, no spaces).");
       setValue("");
       return;
     }
@@ -15195,6 +15502,7 @@ function Root({
       progressSink,
       codeMode: appProps.codeMode,
       noDashboard: appProps.noDashboard,
+      mouse: appProps.mouse,
       onSwitchSession: setActiveSession
     }
   ));
@@ -15269,7 +15577,12 @@ async function chatCommand(opts) {
       exitOnCtrlC: true,
       // patchConsole:false — winpty/MINTTY redraw-glitch source.
       patchConsole: false,
-      incrementalRendering: true,
+      // incrementalRendering:false — Ink's diff drifts when stringWidth
+      // misjudges CJK / emoji ZWJ width or when async terminal-event
+      // bytes interleave mid-render, leaving residual rows. Full-frame
+      // redraws cost more stdout bytes per flush but eliminate the
+      // ghost class.
+      incrementalRendering: false,
       // Default true — alt-screen is the only mode without scrollback-
       // reflow ghosting. `--no-alt-screen` opts back into scrollback mode
       // for users who need chat output preserved in shell history on exit.
@@ -15287,4 +15600,4 @@ async function chatCommand(opts) {
 export {
   chatCommand
 };
-//# sourceMappingURL=chunk-EINEIIIW.js.map
+//# sourceMappingURL=chunk-EN4LAZW5.js.map