nolo-cli 0.11.0 → 0.12.0-alpha.1

package/{readlineWorkspace-HGP3I3OC.js → readlineWorkspace-SWQKC7ZS.js}

@@ -3,55 +3,81 @@ import {
   normalizeDialogRecord,
   readDialogSnapshot,
   sortDialogs
-} from "./chunk-SV5MWASH.js";
+} from "./chunk-4EH7AR52.js";
 import {
+  ANSI_ESCAPE_REGEX,
+  CLI_AUTO_TIER_AGENT_KEYS,
   CLI_AUTO_TIER_AGENT_KEY_TABLE,
   CLI_IMAGE_AGENT_KEY,
+  COLLAPSED_PASTE_PLACEHOLDER_RE,
   THEME_PALETTES,
+  allocateCollapsedPaste,
+  applyTerminalOutputToText,
   buildSkillContextBlocks,
   classifyCliAutoRoute,
+  clearCollapsedPasteStore,
+  countPhysicalLines,
+  createCollapsedPasteStore,
   dimCliText,
+  displayWidth,
+  expandRangeToCollapsedPasteChips,
+  findCollapsedPasteSpanAt,
+  fitAnsiLine,
   formatAssistantDisplay,
   formatTokenCount,
   getActiveBrightness,
   getActiveDensity,
   getActiveThemeName,
-  getCliLocale,
-  highlightMarkdown,
-  initCliLocale,
   isBalanceExhaustedError,
   isQuotaExhaustedError,
   normalizeThinkingDisplayMode,
   normalizeToolDisplayMode,
-  parseCliLocale,
+  padOrTruncateToWidth,
+  releaseCollapsedPaste,
+  releaseCollapsedPasteReferences,
   renderTokenStatus,
+  replaceCollapsedPastesWithReferences,
+  resolveAgentContextWindow,
+  resolveCliAutoFallbackTier,
   resolveCliColorEnabled,
   resolveSkillReference,
   resolveTuiBrightness,
   runAgentTurn,
   setActiveBrightness,
   setActiveDensity,
+  setActiveTerminalBaseHex,
   setActiveThemeName,
-  setCliLocale,
+  shouldCollapsePaste,
+  stripAnsi,
   surfaceBackgroundSequence,
-  t,
+  takeDisplayWidth,
   themeColorSequence,
-  themeText
-} from "./chunk-ZEYDOXHF.js";
+  themeText,
+  truncateAnsi,
+  visibleWidth,
+  wrapTextToLines,
+  wrapTranscriptLine
+} from "./chunk-ZPFRLGIZ.js";
+import "./chunk-3QAF2LTL.js";
 import "./chunk-6HYVJV7B.js";
 import {
   listFavoriteAgentIdsAcrossServers,
   listLocalCachedAgents,
   listRemoteAgents,
   listRemoteAgentsAcrossServers
-} from "./chunk-LAX2JSTX.js";
+} from "./chunk-DE5BA4O6.js";
 import "./chunk-ID4G2MAR.js";
 import {
   listUserRecordsFromServers
-} from "./chunk-DWGAEFJL.js";
-import "./chunk-3QAF2LTL.js";
-import "./chunk-X2S7JTIG.js";
-import "./chunk-5MMZUWSG.js";
+} from "./chunk-OPKKB25T.js";
+import {
+  createCliLocalRuntimeAdapter,
+  initCliLocale,
+  parseCliLocale,
+  setCliLocale,
+  t
+} from "./chunk-5ITRDSHY.js";
+import "./chunk-TOILAPLH.js";
 import "./chunk-CMKUBIGW.js";
 import "./chunk-JBTJAPUF.js";
 import {
@@ -60,135 +86,148 @@ import {
 import {
   queryUserRecords,
   readDbRecord
-} from "./chunk-AEZAORLG.js";
-import "./chunk-C2MDQQ4O.js";
+} from "./chunk-QCA3EPYK.js";
+import "./chunk-RNQ5BLR2.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";
 import "./chunk-LTRXGFMS.js";
-import "./chunk-5OIFWVX7.js";
+import "./chunk-UG3WOFU6.js";
 import "./chunk-ATNTHIZI.js";
 import "./chunk-JEXVIMYZ.js";
-import "./chunk-PXQN7IBQ.js";
-import "./chunk-FXXSGWAJ.js";
-import "./chunk-2W2VYVI5.js";
-import "./chunk-D6OQHXVG.js";
+import {
+  prepareTools
+} from "./chunk-YTQLJYLB.js";
+import "./chunk-4GBNEA5B.js";
+import {
+  expandEnabledPacks
+} from "./chunk-RZ735TLX.js";
+import "./chunk-YDCZVUFP.js";
+import "./chunk-OOIN7HSO.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-QNMFBBZK.js";
+import "./chunk-IVAOVLM7.js";
 import "./chunk-3LY4F7SV.js";
 import "./chunk-VP4WJWKW.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-XYZA7S7V.js";
-import "./chunk-E4HNJSHC.js";
+import "./chunk-MEVCDATU.js";
+import "./chunk-G3B356GF.js";
 import "./chunk-VC6OZXO5.js";
 import "./chunk-OWOHNGCN.js";
 import {
-  DEFAULT_CONTEXT_WINDOW,
-  extractReferenceKeysFromMessage,
-  getModelContextWindow,
-  planCompression,
-  serializeMessageContent
-} from "./chunk-5MOUAAMK.js";
+  extractReferenceKeysFromMessage
+} from "./chunk-AM53Q2SD.js";
 import {
   buildBuiltinSummaryContent
-} from "./chunk-4ZDM73SD.js";
+} from "./chunk-V2J635L5.js";
 import "./chunk-MRC4Q34M.js";
 import "./chunk-MTU75CZ2.js";
 import "./chunk-CWMSB67P.js";
-import "./chunk-Q3UKJVU4.js";
-import "./chunk-GBDSZATH.js";
+import "./chunk-GPZM7QH6.js";
+import "./chunk-6LMFFG3K.js";
 import "./chunk-Z4NR32XR.js";
 import "./chunk-M76ECQRD.js";
-import "./chunk-MQI77IRB.js";
-import "./chunk-3NSIQZZ6.js";
-import "./chunk-Y5GCAMGP.js";
-import "./chunk-SOTZ6RDN.js";
-import "./chunk-7D3JY6C2.js";
-import "./chunk-UAD2WT54.js";
-import "./chunk-O26GI2JP.js";
-import "./chunk-AZPCASRE.js";
-import "./chunk-DCOA4QSN.js";
-import "./chunk-HNW7IJSK.js";
-import "./chunk-XENYHRUE.js";
-import "./chunk-IPYUUY4E.js";
-import {
-  runSelfUpdate
-} from "./chunk-CKOJQDKR.js";
-import {
-  saveProfileAgentSelection,
-  saveProfileLocale
-} from "./chunk-ROWQEJRP.js";
-import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-IDZTNRP2.js";
 import {
   buildSkillDiscoveryContextBlock
-} from "./chunk-AFON4QUU.js";
-import "./chunk-C4FTUXVF.js";
-import "./chunk-KKY4B2Q2.js";
+} from "./chunk-3QKO4EHV.js";
 import "./chunk-WZSRQNQG.js";
 import {
+  buildLocalWorkspaceOpenAiTools,
+  buildLocalWorkspaceToolset,
   getProcessRegistry
-} from "./chunk-BX6U3ETE.js";
-import "./chunk-ZPRK73XY.js";
+} from "./chunk-DRMGJFGQ.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-YOCHZD7D.js";
+import "./chunk-ZR4VHQ5D.js";
+import "./chunk-NCGFB7NN.js";
 import {
   readCommandActionGatePayload,
   resolveAgentImageInputSupport
-} from "./chunk-S3GS2PRL.js";
+} from "./chunk-4BTHUYMY.js";
 import "./chunk-OPZYGHUC.js";
-import "./chunk-OUI3ZHYD.js";
-import "./chunk-YTBMA7NO.js";
-import "./chunk-4SOKXIW4.js";
 import {
-  clipCompactText
-} from "./chunk-5MMAK75Q.js";
-import "./chunk-BBYVOSU2.js";
-import "./chunk-5CS33IBL.js";
+  buildCurrentTimeBlock,
+  buildIdentityBlock,
+  buildRuntimeGuidanceBlocks
+} from "./chunk-6OVCRC72.js";
+import "./chunk-TSKWE74T.js";
+import {
+  canonicalizeToolNames
+} from "./chunk-43UD5ZP7.js";
+import {
+  DEFAULT_CONTEXT_WINDOW,
+  clipCompactText,
+  estimateTokenCount,
+  getModelContextWindow,
+  planCompression,
+  serializeMessageContent
+} from "./chunk-S73OEOHH.js";
+import "./chunk-S3UTETIC.js";
+import "./chunk-PDL2AV3E.js";
 import "./chunk-JZPBVBIY.js";
-import "./chunk-KX6YBIHG.js";
-import "./chunk-IWX4UW2E.js";
-import "./chunk-O4BU24WZ.js";
-import "./chunk-I42VC5KR.js";
-import "./chunk-WWC7I6TA.js";
-import "./chunk-JK7VW2FN.js";
+import "./chunk-BYXBJQAS.js";
+import "./chunk-QLUFR47U.js";
+import "./chunk-KKY4B2Q2.js";
+import "./chunk-5MIDPSSK.js";
 import {
   extractCustomId
 } from "./chunk-DFFIZ25G.js";
 import "./chunk-3ASDTTEI.js";
+import "./chunk-4ON5AV72.js";
 import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
+import "./chunk-H33743XH.js";
+import "./chunk-LM6IYQ3F.js";
+import "./chunk-SOTZ6RDN.js";
+import "./chunk-HNW7IJSK.js";
+import "./chunk-XENYHRUE.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
-import "./chunk-2FTTDCD4.js";
+import {
+  runSelfUpdate
+} from "./chunk-7JJCGV7N.js";
+import {
+  saveProfileAgentSelection,
+  saveProfileLocale
+} from "./chunk-ROWQEJRP.js";
+import {
+  readPipeText,
+  spawnProcess
+} from "./chunk-IDZTNRP2.js";
+import "./chunk-IKXL2HZ3.js";
+import "./chunk-524BDL33.js";
+import "./chunk-7MYHLZ3F.js";
+import "./chunk-WTYKCU4W.js";
+import "./chunk-Y5GCAMGP.js";
+import "./chunk-KX6YBIHG.js";
+import "./chunk-3HHTVM6G.js";
+import "./chunk-NITP2JDG.js";
+import "./chunk-WPHL6ALY.js";
+import "./chunk-O4BU24WZ.js";
+import "./chunk-I42VC5KR.js";
+import "./chunk-WWC7I6TA.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
+import "./chunk-XHQWJUW4.js";
+import "./chunk-TSUJOM6N.js";
+import "./chunk-OOSFSFMA.js";
+import "./chunk-GBRG75BQ.js";
+import "./chunk-KUG52IAP.js";
+import "./chunk-3EUW3WEO.js";
+import "./chunk-U6VC4MU4.js";
 import {
   parseUserIdFromAuthToken,
   resolveAuthToken,
   resolveServerCandidates,
   resolveServerUrl
-} from "./chunk-ISNCLGUZ.js";
+} from "./chunk-5NBHQD4D.js";
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
-import "./chunk-H33743XH.js";
-import "./chunk-LM6IYQ3F.js";
-import "./chunk-XFOLQLDN.js";
-import "./chunk-OOM6SJNR.js";
-import "./chunk-OOSFSFMA.js";
-import "./chunk-GBRG75BQ.js";
-import "./chunk-3EUW3WEO.js";
-import "./chunk-U6VC4MU4.js";
-import "./chunk-KUG52IAP.js";
-import "./chunk-4SN6J65J.js";
 import "./chunk-LCBAMY2M.js";
+import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import {
   asOptionalTrimmedString
@@ -198,8 +237,81 @@ import "./chunk-4VNS5WPM.js";
 // packages/cli/tui/readlineWorkspace.ts
 import { createInterface } from "node:readline";
 import { stdin as defaultInput, stdout as defaultOutput } from "node:process";
-import { existsSync as existsSync2, readFileSync } from "node:fs";
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "node:fs";
+import { join as join2 } from "node:path";
+
+// packages/cli/client/estimateCliContext.ts
+import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+var DEFAULT_CLI_PACKS = ["code", "agent-orchestration", "skills"];
+var DEFAULT_CLI_PLATFORM_TOOLS = [
+  "ui_ask_choice",
+  "exa_search",
+  "fetchWebpage"
+];
+var DEFAULT_FLASH_PROMPT = "\u4F60\u662F\u5171\u4EAB\u7A7A\u95F4\u91CC\u7684\u9AD8\u6027\u4EF7\u6BD4\u901A\u7528 AI \u52A9\u624B\u3002\u4F18\u5148\u5FEB\u901F\u3001\u76F4\u63A5\u3001\u7A33\u5B9A\u5730\u5B8C\u6210\u4EFB\u52A1\uFF1B\u9700\u8981\u63A8\u7406\u65F6\u4FDD\u6301\u6B65\u9AA4\u6E05\u6670\u3002";
+function readAgentsMd(cwd) {
+  for (const name of ["AGENTS.md", "agents.md"]) {
+    const path = join(cwd, name);
+    if (!existsSync(path)) continue;
+    try {
+      return readFileSync(path, "utf8");
+    } catch {
+      return "";
+    }
+  }
+  return "";
+}
+function estimateToolSchemas(toolNames) {
+  const toolset = buildLocalWorkspaceToolset({
+    declaredToolNames: toolNames,
+    exposeShellTools: true
+  });
+  const workspaceTools = buildLocalWorkspaceOpenAiTools({
+    toolNames: toolset.toolNames,
+    exposeShellTools: true
+  });
+  const platformNames = DEFAULT_CLI_PLATFORM_TOOLS.filter(
+    (name) => toolNames.includes(name)
+  );
+  const platformTools = platformNames.length > 0 ? prepareTools([...platformNames]) : [];
+  return estimateTokenCount(JSON.stringify([...workspaceTools, ...platformTools]));
+}
+function estimateDefaultCliContextTokens(opts = {}) {
+  const cwd = opts.cwd?.trim() || process.cwd();
+  const model = opts.model?.trim() || "deepseek-v4-flash";
+  const agentName = opts.agentName?.trim() || "DeepSeek V4 Flash";
+  const agentKey = opts.agentKey?.trim() || "agent-pub-deepseek-v4-flash";
+  const prompt = opts.agentPrompt?.trim() || DEFAULT_FLASH_PROMPT;
+  const packTools = canonicalizeToolNames(
+    expandEnabledPacks([...DEFAULT_CLI_PACKS], [])
+  );
+  const toolNames = canonicalizeToolNames([
+    ...packTools,
+    ...DEFAULT_CLI_PLATFORM_TOOLS
+  ]);
+  const guidance = buildRuntimeGuidanceBlocks(toolNames);
+  const systemParts = [
+    prompt,
+    buildIdentityBlock({
+      agentName,
+      agentId: agentKey,
+      model
+    }),
+    guidance.startupProtocol,
+    guidance.contextLayerContract,
+    guidance.emailRegistrationWorkflow,
+    guidance.webResearchToolPolicy,
+    buildCurrentTimeBlock(/* @__PURE__ */ new Date()),
+    readAgentsMd(cwd),
+    buildSkillDiscoveryContextBlock(cwd) ?? ""
+  ];
+  const systemTokens = estimateTokenCount(
+    systemParts.filter((part) => part?.trim()).join("\n\n")
+  );
+  const toolTokens = estimateToolSchemas(toolNames);
+  return Math.max(0, systemTokens + toolTokens);
+}
 
 // packages/cli/client/compactDialog.ts
 import { ulid } from "ulid";
@@ -480,6 +592,12 @@ function renderDialogRow(args, colorEnabled = resolveCliColorEnabled()) {
 function renderDialogOverflow(text, colorEnabled = resolveCliColorEnabled()) {
   return themeText(`  ${text}`, "chrome", colorEnabled);
 }
+function renderOverflowAbove(count, colorEnabled = resolveCliColorEnabled()) {
+  return renderDialogOverflow(t("dialogMoreAbove", String(count)), colorEnabled);
+}
+function renderOverflowBelow(count, colorEnabled = resolveCliColorEnabled()) {
+  return renderDialogOverflow(t("dialogMoreBelow", String(count)), colorEnabled);
+}
 function renderDialogCommand(text, colorEnabled = resolveCliColorEnabled()) {
   return themeText(`  ${text}`, "danger", colorEnabled);
 }
@@ -578,7 +696,7 @@ function renderSelectDialog(args) {
   ];
   const lines = [...titleLines, ""];
   if (window.start > 0) {
-    lines.push(renderDialogOverflow(`\u2191 ${window.start} more`));
+    lines.push(renderOverflowAbove(window.start));
   }
   for (let index = window.start; index < window.end; index += 1) {
     const item = args.items[index];
@@ -591,7 +709,7 @@ function renderSelectDialog(args) {
     );
   }
   if (window.end < total) {
-    lines.push("", renderDialogOverflow(`\u2193 ${total - window.end} more`));
+    lines.push("", renderOverflowBelow(total - window.end));
   }
   return lines.join("\n");
 }
@@ -820,7 +938,7 @@ async function runSelectDialog(args) {
 // packages/cli/tui/confirmDialog.ts
 var FALLBACK_TERMINAL_WIDTH = 80;
 var WIDE_CHAR = /[ᄀ-ᅟ⺀-〾ぁ-㏿㐀-䶿一-鿿ꀀ-꓏가-힣豈-﫿︰-﹯＀-｠￠-￦]/;
-function displayWidth(text) {
+function displayWidth2(text) {
   let width = 0;
   for (const char of text) width += WIDE_CHAR.test(char) ? 2 : 1;
   return width;
@@ -828,9 +946,9 @@ function displayWidth(text) {
 function truncateCommand(command, maxWidth) {
   const indent = 2;
   const budget = Math.max(10, maxWidth - indent);
-  if (displayWidth(command) <= budget) return command;
+  if (displayWidth2(command) <= budget) return command;
   const marker = ` ${t("dialogConfirmCommandTruncated")}`;
-  const keep = Math.max(1, budget - displayWidth(marker));
+  const keep = Math.max(1, budget - displayWidth2(marker));
   let kept = "";
   let width = 0;
   for (const char of command) {
@@ -860,9 +978,15 @@ async function runConfirmDialog(args) {
       value: false
     }
   ];
-  const isDestructiveShell = args.request.action === "destructive_shell_command";
-  const titleText = isDestructiveShell ? t("dialogConfirmTitle") : args.request.title;
-  const bodyText = isDestructiveShell ? t("dialogConfirmBody") : args.request.body;
+  let titleText = args.request.title;
+  let bodyText = args.request.body;
+  if (args.request.action === "destructive_shell_command") {
+    titleText = t("dialogConfirmTitle");
+    bodyText = t("dialogConfirmBody");
+  } else if (args.request.action === "external_file_access") {
+    titleText = t("dialogConfirmExternalFileTitle");
+    bodyText = t("dialogConfirmExternalFileBody");
+  }
   const terminalWidth = typeof output.columns === "number" && output.columns > 0 ? output.columns : FALLBACK_TERMINAL_WIDTH;
   const titleLines = [
     renderDialogTitle(`${titleText}  ${t("dialogConfirmHint")}`)
@@ -1112,19 +1236,23 @@ function renderTabBar(questions, activeIndex, colorEnabled) {
     }
     return colorEnabled ? themeText(` ${label} `, "muted", colorEnabled) : ` ${label} `;
   });
-  const submitLabel = "Submit";
+  const submitLabel = t("askChoiceSubmit");
   return tabs.join("  ") + "  " + (colorEnabled ? themeText(submitLabel, "chrome", colorEnabled) : submitLabel);
 }
-function renderFooter(colorEnabled) {
-  const hints = "\u21B5 pick/submit \xB7 space toggle \xB7 tab switch \xB7 esc cancel";
+function renderFooter(multiSelect, colorEnabled) {
+  const hints = multiSelect ? t("askChoiceFooterMulti") : t("askChoiceFooterSingle");
   return colorEnabled ? themeText(`  ${hints}`, "chrome", colorEnabled) : `  ${hints}`;
 }
+function otherRowPrefix(index) {
+  return ` [${index + 1}] ${t("askChoiceOtherLabel")}: `;
+}
 function renderAskChoiceFrame(state) {
   const colorEnabled = resolveCliColorEnabled();
   const q = state.questions[state.activeIndex];
   const qs = state.questionStates[state.activeIndex];
   const lines = [];
-  lines.push(renderDialogTitle("question"));
+  let otherCursor = null;
+  lines.push(renderDialogTitle(t("askChoiceTitle")));
   lines.push("");
   if (state.questions.length > 1) {
     lines.push(renderTabBar(state.questions, state.activeIndex, colorEnabled));
@@ -1135,11 +1263,11 @@ function renderAskChoiceFrame(state) {
   );
   if (q.multiSelect) {
     lines.push(
-      colorEnabled ? themeText("  Space to toggle, Enter to confirm selection.", "muted", colorEnabled) : "  Space to toggle, Enter to confirm selection."
+      colorEnabled ? themeText(`  ${t("askChoiceHintMulti")}`, "muted", colorEnabled) : `  ${t("askChoiceHintMulti")}`
     );
   } else {
     lines.push(
-      colorEnabled ? themeText("  Type your answer, then press Enter to save.", "muted", colorEnabled) : "  Type your answer, then press Enter to save."
+      colorEnabled ? themeText(`  ${t("askChoiceHintSingle")}`, "muted", colorEnabled) : `  ${t("askChoiceHintSingle")}`
     );
   }
   lines.push("");
@@ -1149,9 +1277,7 @@ function renderAskChoiceFrame(state) {
     total: totalRows
   });
   if (window.start > 0) {
-    lines.push(
-      colorEnabled ? themeText(`  \u2191 ${window.start} more`, "chrome", colorEnabled) : `  \u2191 ${window.start} more`
-    );
+    lines.push(renderOverflowAbove(window.start));
   }
   for (let i = window.start; i < window.end; i++) {
     if (i < q.choices.length) {
@@ -1169,25 +1295,29 @@ function renderAskChoiceFrame(state) {
     } else {
       const focused = qs.cursorIndex === i;
       const marker = focused ? DIALOG_CURSOR : " ";
-      const otherContent = qs.otherFocused ? `${qs.otherText}\u2588` : qs.otherText || "";
-      const row = `${marker} [${i + 1}] Other: ${otherContent}`;
+      const plainPrefix = `${marker}${otherRowPrefix(i)}`;
+      const plainRow = `${plainPrefix}${qs.otherText}`;
       if (focused && colorEnabled) {
         lines.push(
-          `\x1B[1m${themeColorSequence("accent")}${row}\x1B[0m`
+          `\x1B[1m${themeColorSequence("accent")}${plainRow}\x1B[0m`
         );
       } else {
-        lines.push(row);
+        lines.push(plainRow);
+      }
+      if (qs.otherFocused) {
+        otherCursor = {
+          lineIndex: lines.length - 1,
+          col: displayWidth(plainPrefix + qs.otherText)
+        };
       }
     }
   }
   if (window.end < totalRows) {
-    lines.push(
-      colorEnabled ? themeText(`  \u2193 ${totalRows - window.end} more`, "chrome", colorEnabled) : `  \u2193 ${totalRows - window.end} more`
-    );
+    lines.push(renderOverflowBelow(totalRows - window.end));
   }
   lines.push("");
-  lines.push(renderFooter(colorEnabled));
-  return lines.join("\n");
+  lines.push(renderFooter(q.multiSelect, colorEnabled));
+  return { text: lines.join("\n"), otherCursor };
 }
 async function runAskChoiceDialog(args) {
   const { request } = args;
@@ -1200,9 +1330,6 @@ async function runAskChoiceDialog(args) {
   if (normalized.questions.length === 0) {
     return { kind: "cancelled" };
   }
-  const q0 = normalized.questions[0];
-  if (normalized.questions.length === 1 && !q0.multiSelect && !q0.allowOther) {
-  }
   let state = createInitialAskChoiceState(normalized.questions);
   const output = args.output ?? process.stdout;
   const input = args.input ?? process.stdin;
@@ -1216,9 +1343,15 @@ async function runAskChoiceDialog(args) {
     typeof args.bottomRow === "function" ? args.bottomRow() : args.bottomRow ?? 0
   );
   let lastBottomRow = 0;
+  let unanchoredCursorLift = 0;
+  const restoreUnanchoredCursor = () => {
+    if (unanchoredCursorLift <= 0) return;
+    output.write(`\x1B[${unanchoredCursorLift}B`);
+    unanchoredCursorLift = 0;
+  };
   const paint = () => {
     const frame = renderAskChoiceFrame(state);
-    const lines = frame.split("\n");
+    const lines = frame.text.split("\n");
     const lineCount = lines.length;
     const canPosition = outputIsTty(output) && typeof output.write === "function";
     if (bottomAnchored && canPosition) {
@@ -1235,22 +1368,37 @@ async function runAskChoiceDialog(args) {
       }
       lastBottomRow = anchorRow;
       renderedLineCount = lineCount;
+      unanchoredCursorLift = 0;
+      if (frame.otherCursor) {
+        const cursorRow = anchorRow - (lineCount - 1 - frame.otherCursor.lineIndex);
+        if (cursorRow >= 1) {
+          output.write(`\x1B[${cursorRow};${frame.otherCursor.col + 1}H`);
+        }
+      }
       return;
     }
     if (canPosition) {
+      restoreUnanchoredCursor();
       for (let i = 0; i < renderedLineCount; i++) {
         output.write("\x1B[1A\x1B[2K");
       }
-      output.write(`${frame}
+      output.write(`${frame.text}
 `);
       renderedLineCount = lineCount;
+      if (frame.otherCursor) {
+        const linesFromBottom = lineCount - frame.otherCursor.lineIndex;
+        output.write(`\x1B[${linesFromBottom}A`);
+        output.write(`\x1B[${frame.otherCursor.col + 1}G`);
+        unanchoredCursorLift = linesFromBottom;
+      }
       return;
     }
     if (typeof output.write === "function") {
-      output.write(`${frame}
+      output.write(`${frame.text}
 `);
     }
     renderedLineCount = lineCount;
+    unanchoredCursorLift = 0;
   };
   const resizeTarget = output;
   const onOutputResize = () => paint();
@@ -1278,6 +1426,9 @@ async function runAskChoiceDialog(args) {
         continue;
       }
       let action = null;
+      const qs = state.questionStates[state.activeIndex];
+      const q = state.questions[state.activeIndex];
+      const isOtherRow = qs.cursorIndex >= q.choices.length;
       if (isCancel(sequence)) {
         action = { type: "CANCEL" };
       } else if (sequence === CSI_TAB) {
@@ -1289,11 +1440,17 @@ async function runAskChoiceDialog(args) {
       } else if (isArrowDown(sequence)) {
         action = { type: "MOVE_CURSOR", delta: 1 };
       } else if (sequence === CSI_SPACE) {
-        action = { type: "TOGGLE_AT_CURSOR" };
+        if (qs.otherFocused) {
+          action = {
+            type: "SET_OTHER_TEXT",
+            text: qs.otherText + " "
+          };
+        } else if (q.multiSelect) {
+          action = { type: "TOGGLE_AT_CURSOR" };
+        } else if (isOtherRow) {
+          action = { type: "FOCUS_OTHER" };
+        }
       } else if (isSubmit(sequence)) {
-        const qs = state.questionStates[state.activeIndex];
-        const q = state.questions[state.activeIndex];
-        const isOtherRow = qs.cursorIndex >= q.choices.length;
         if (qs.otherFocused) {
           action = { type: "BLUR_OTHER" };
         } else if (isOtherRow && !qs.otherFocused) {
@@ -1304,24 +1461,29 @@ async function runAskChoiceDialog(args) {
           action = { type: "SELECT_AT_CURSOR" };
         }
       } else if (sequence === CSI_BACKSPACE || sequence === CSI_BACKSPACE_ALT) {
-        const qs = state.questionStates[state.activeIndex];
         if (qs.otherFocused && qs.otherText.length > 0) {
+          const chars = Array.from(qs.otherText);
           action = {
             type: "SET_OTHER_TEXT",
-            text: qs.otherText.slice(0, -1)
+            text: chars.slice(0, -1).join("")
           };
         }
-      } else if (sequence.length === 1 && sequence.charCodeAt(0) >= 32) {
-        const qs = state.questionStates[state.activeIndex];
-        if (qs.otherFocused) {
-          action = {
-            type: "SET_OTHER_TEXT",
-            text: qs.otherText + sequence
-          };
+      } else if (sequence.length >= 1 && sequence.charCodeAt(0) >= 32 && !sequence.startsWith("\x1B")) {
+        if (qs.otherFocused || isOtherRow && q.allowOther) {
+          const cleaned = sequence.replace(/[\x00-\x1f\x7f]/g, "");
+          if (cleaned) {
+            if (!qs.otherFocused) {
+              state = askChoiceReducer(state, { type: "FOCUS_OTHER" });
+            }
+            const currentText = state.questionStates[state.activeIndex].otherText;
+            action = {
+              type: "SET_OTHER_TEXT",
+              text: currentText + cleaned
+            };
+          }
         }
       }
       if (action) {
-        const prev = state;
         state = askChoiceReducer(state, action);
         if (state.phase !== "active") break;
         if (action.type === "BLUR_OTHER" && state.activeIndex >= state.questions.length - 1 && canSubmit(state)) {
@@ -1345,6 +1507,7 @@ async function runAskChoiceDialog(args) {
           renderedLineCount
         );
       } else {
+        restoreUnanchoredCursor();
         for (let i = 0; i < renderedLineCount; i++) {
           output.write("\x1B[1A\x1B[2K");
         }
@@ -1358,13 +1521,13 @@ async function runAskChoiceDialog(args) {
   }
   if (result.answers.length === 1) {
     const a = result.answers[0];
+    const q = normalized.questions[0];
+    const labels = a.selectedIds.map((id) => q.choices.find((c) => c.id === id)?.label ?? "").filter(Boolean);
+    if (a.otherText) labels.push(a.otherText);
     return {
       kind: "selected",
       userMessage: a.userMessage,
-      label: a.selectedIds.map((id) => {
-        const q = normalized.questions[0];
-        return q.choices.find((c) => c.id === id)?.label ?? "";
-      }).join(", ") || a.otherText || ""
+      label: labels.join(", ") || a.otherText || ""
     };
   }
   return {
@@ -1422,8 +1585,13 @@ function createActivityIndicator(deps) {
   let lastActivityAt = 0;
   let frameIndex = 0;
   let timer = null;
+  let stopping = false;
   const elapsedSecFrom = (startedAt) => startedAt > 0 ? Math.max(0, Math.floor((now() - startedAt) / 1e3)) : 0;
   const tick = () => {
+    if (stopping) {
+      deps.onRepaint();
+      return;
+    }
     frameIndex += 1;
     if (explicitLabel === null && !fallbackActive && deps.isTurnActive() && lastActivityAt > 0 && now() - lastActivityAt >= fallbackDelayMs) {
       fallbackActive = true;
@@ -1452,9 +1620,21 @@ function createActivityIndicator(deps) {
     ensureTimer();
     deps.onRepaint();
   };
+  const markStopping = () => {
+    stopping = true;
+    deps.onRepaint();
+  };
+  const isStopping = () => stopping;
   const getView = () => {
     if (!deps.isTurnActive()) return null;
     const frame = ACTIVITY_FRAMES[frameIndex % ACTIVITY_FRAMES.length];
+    if (stopping) {
+      return {
+        frame,
+        label: deps.stoppingLabel(),
+        elapsedSec: 0
+      };
+    }
     if (explicitLabel !== null) {
       return {
         frame,
@@ -1481,8 +1661,9 @@ function createActivityIndicator(deps) {
     fallbackActive = false;
     fallbackStartedAt = 0;
     lastActivityAt = 0;
+    stopping = false;
   };
-  return { report, getView, stop };
+  return { report, getView, markStopping, isStopping, stop };
 }
 
 // packages/ai/agent/utils/sortUtils.ts
@@ -1533,12 +1714,12 @@ function sortAgentsFavoriteOwnedPublic(items) {
 // packages/cli/tui/agentCatalog.ts
 var DEFAULT_TUI_AGENT_KEY = "agent-pub-01NOLOAPPBLD000000019KCKT0";
 function formatAgentSourceLabel(entry) {
-  if (entry.kind === "platform" || entry.apiSource === "platform") return "\u5E73\u53F0";
+  if (entry.kind === "platform" || entry.apiSource === "platform") return t("agentSourcePlatform");
   if (entry.apiSource === "cli") {
-    return entry.cliProvider ? `\u8BA2\u9605(${entry.cliProvider})` : "\u8BA2\u9605";
+    return entry.cliProvider ? `${t("agentSourceSubscription")}(${entry.cliProvider})` : t("agentSourceSubscription");
   }
-  if (entry.apiSource === "custom") return "API";
-  return "\u5E73\u53F0";
+  if (entry.apiSource === "custom") return t("agentSourceApi");
+  return t("agentSourcePlatform");
 }
 var PLATFORM_AGENTS = [
   {
@@ -1722,13 +1903,25 @@ function findAgentCatalogEntry(entries, rawTarget) {
   if (!target) return null;
   if (/^\d+$/.test(target)) {
     const entry = entries[Number(target) - 1];
-    return entry ? { name: entry.name, key: entry.key } : null;
+    return entry ? {
+      name: entry.name,
+      key: entry.key,
+      model: entry.model,
+      ...entry.apiSource ? { apiSource: entry.apiSource } : entry.kind === "platform" ? { apiSource: "platform" } : {}
+    } : null;
   }
   const lower = target.toLowerCase();
   const byName = entries.find(
     (entry) => entry.name.toLowerCase() === lower || entry.key.toLowerCase() === lower || entry.key.toLowerCase().endsWith(`-${lower}`)
   );
-  if (byName) return { name: byName.name, key: byName.key };
+  if (byName) {
+    return {
+      name: byName.name,
+      key: byName.key,
+      model: byName.model,
+      ...byName.apiSource ? { apiSource: byName.apiSource } : byName.kind === "platform" ? { apiSource: "platform" } : {}
+    };
+  }
   if (target.startsWith("agent-") || target.startsWith("agent-pub-")) {
     return { name: target, key: target };
   }
@@ -1787,6 +1980,8 @@ async function runAgentPicker(args) {
     kind: "selected",
     name: selected.name,
     key: selected.key,
+    model: selected.model,
+    apiSource: selected.apiSource ?? (selected.kind === "platform" ? "platform" : void 0),
     entries
   };
 }
@@ -1796,7 +1991,11 @@ function resolveAgentSwitchTarget(rawTarget, catalogEntries = []) {
     const aliasEntry = catalogEntries.find((entry) => entry.key === resolvedKey);
     return {
       name: aliasEntry?.name ?? asTrimmedLowercaseString(rawTarget),
-      key: resolvedKey
+      key: resolvedKey,
+      ...aliasEntry?.model ? { model: aliasEntry.model } : {},
+      ...aliasEntry ? {
+        ...aliasEntry.apiSource ? { apiSource: aliasEntry.apiSource } : aliasEntry.kind === "platform" ? { apiSource: "platform" } : {}
+      } : {}
     };
   }
   return findAgentCatalogEntry(catalogEntries, rawTarget);
@@ -1809,10 +2008,10 @@ function formatDialogTimestamp(value, now = Date.now()) {
   const time = typeof value === "number" ? value : Date.parse(value);
   if (!Number.isFinite(time) || time <= 0) return "";
   const deltaSeconds = Math.max(0, Math.floor((now - time) / 1e3));
-  if (deltaSeconds < 60) return "just now";
-  if (deltaSeconds < 3600) return `${Math.floor(deltaSeconds / 60)}m ago`;
-  if (deltaSeconds < 86400) return `${Math.floor(deltaSeconds / 3600)}h ago`;
-  if (deltaSeconds < 30 * 86400) return `${Math.floor(deltaSeconds / 86400)}d ago`;
+  if (deltaSeconds < 60) return t("timeJustNow");
+  if (deltaSeconds < 3600) return t("timeMinutesAgo", String(Math.floor(deltaSeconds / 60)));
+  if (deltaSeconds < 86400) return t("timeHoursAgo", String(Math.floor(deltaSeconds / 3600)));
+  if (deltaSeconds < 30 * 86400) return t("timeDaysAgo", String(Math.floor(deltaSeconds / 86400)));
   const date = new Date(time);
   const pad = (part) => String(part).padStart(2, "0");
   return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
@@ -1829,7 +2028,7 @@ function toDialogPickerItems(dialogs) {
 }
 function renderDialogList(dialogs) {
   if (dialogs.length === 0) return t("noDialogsYet");
-  const lines = ["Recent dialogs:"];
+  const lines = [t("recentDialogs")];
   for (const [index, dialog] of dialogs.entries()) {
     const stamp = formatDialogTimestamp(dialog.updatedAt ?? dialog.createdAt);
     lines.push(
@@ -1837,7 +2036,7 @@ function renderDialogList(dialogs) {
       `     id=${dialog.id}`
     );
   }
-  lines.push("", "Tip: run /history to pick one interactively, or paste an id after /resume.");
+  lines.push("", t("dialogListTip"));
   return lines.join("\n");
 }
 async function fetchRecentDialogs(args) {
@@ -1918,7 +2117,7 @@ async function runDialogPicker(args) {
 }
 
 // packages/cli/tui/pasteImage.ts
-import { existsSync } from "node:fs";
+import { existsSync as existsSync2 } from "node:fs";
 import { readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { isAbsolute, resolve } from "node:path";
@@ -1973,7 +2172,7 @@ function detectImagePaths(line, cwd) {
     if (!token.raw) continue;
     const resolved = resolveImageSource(token.decoded, cwd);
     if (!isImagePath(resolved)) continue;
-    if (!existsSync(resolved)) continue;
+    if (!existsSync2(resolved)) continue;
     out.push({ raw: token.raw, resolvedPath: resolved });
   }
   return out;
@@ -2156,302 +2355,48 @@ async function readImagePaths(paths, options = {}) {
 }
 
 // packages/cli/tui/gitStatus.ts
-import { execSync } from "node:child_process";
-function detectGitStatus(cwd) {
-  try {
-    const branch = execSync("git rev-parse --abbrev-ref HEAD", {
-      cwd,
-      encoding: "utf8",
-      timeout: 2e3,
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-    if (!branch) return void 0;
-    const status = execSync("git status --porcelain", {
-      cwd,
-      encoding: "utf8",
-      timeout: 2e3,
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-    if (!status) {
-      return { branch, modified: 0, untracked: 0 };
-    }
-    let modified = 0;
-    let untracked = 0;
-    for (const line of status.split("\n")) {
-      if (!line) continue;
-      const flag = line[0];
-      if (flag === "?") untracked += 1;
-      else modified += 1;
-    }
-    return { branch, modified, untracked };
-  } catch {
-    return void 0;
-  }
-}
-
-// packages/cli/tui/tuiAnsi.ts
-var ANSI_ESCAPE_REGEX = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g;
-var OSC_HYPERLINK_REGEX = /\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)\x1b\]8;;(?:\x07|\x1b\\)|\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/g;
-function stripAnsi(text) {
-  return text.replace(OSC_HYPERLINK_REGEX, "").replace(ANSI_ESCAPE_REGEX, "");
-}
-var SGR_SEQUENCE_REGEX = /^\x1b\[[0-9;]*m/;
-var TRAILING_SGR_REGEX = /(?:\x1b\[[0-9;]*m)+$/;
-function applyTerminalOutputToText(existing, chunk) {
-  if (!chunk) return existing;
-  let text = existing;
-  let index = 0;
-  while (index < chunk.length) {
-    if (chunk[index] === "\x1B") {
-      const sgr = SGR_SEQUENCE_REGEX.exec(chunk.slice(index));
-      if (sgr) {
-        text += sgr[0];
-        index += sgr[0].length;
-        continue;
-      }
-      const osc = chunk.slice(index).match(/^\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/);
-      if (osc) {
-        index += osc[0].length;
-        continue;
-      }
-      const csi = chunk.slice(index).match(/^\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/);
-      if (csi) {
-        index += csi[0].length;
-        continue;
-      }
-      index += 1;
-      continue;
-    }
-    const ch = chunk[index];
-    if (ch === "\r") {
-      const lastNl = text.lastIndexOf("\n");
-      text = lastNl === -1 ? "" : text.slice(0, lastNl + 1);
-      index += 1;
-      continue;
-    }
-    if (ch === "\n") {
-      text += "\n";
-      index += 1;
-      continue;
-    }
-    if (ch === "\b") {
-      const trailing = TRAILING_SGR_REGEX.exec(text);
-      const sgrTail = trailing ? trailing[0] : "";
-      const head = sgrTail ? text.slice(0, -sgrTail.length) : text;
-      if (head.length > 0 && head[head.length - 1] !== "\n") {
-        text = head.slice(0, -1) + sgrTail;
-      }
-      index += 1;
-      continue;
-    }
-    const code = ch.charCodeAt(0);
-    if (code < 32 && ch !== "	" || code === 127) {
-      index += 1;
-      continue;
-    }
-    text += ch;
-    index += 1;
-  }
-  return text;
-}
-function displayWidth2(str) {
-  let width = 0;
-  for (const char of str) {
-    const code = char.codePointAt(0) ?? 0;
-    if (code < 32 || code === 127) continue;
-    if (code >= 4352 && code <= 4447 || // 0x2768-0x2775 (ornamental brackets, incl. the ❯ prompt at U+276F)
-    // render narrow in terminals; counting them wide drifts the cursor.
-    code >= 9728 && code <= 10175 && !(code >= 10088 && code <= 10101) || // 0x2B00-0x2BFF (Misc Symbols and Arrows, incl. ⬢ U+2B22 used as the
-    // status-line agent icon) render double-wide in common monospace fonts;
-    // counting ⬢ as width 1 drifts the whole status line right of the icon.
-    code >= 11008 && code <= 11263 || code >= 11904 && code <= 12350 || code >= 12352 && code <= 13247 || code >= 13312 && code <= 19903 || code >= 19968 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65072 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 127744 && code <= 129791 || code >= 131072 && code <= 196605 || code >= 196608 && code <= 262141 || // East Asian Ambiguous CJK quotation marks (U+201C/D “ ”, U+2018/9 ‘ ’).
-    // In CJK locale + CJK fonts these render double-wide like 全角 punctuation;
-    // in English fonts they stay width 1. Follow the active locale so Chinese
-    // replies align correctly without breaking English terminal output.
-    getCliLocale() === "zh" && (code === 8220 || code === 8221 || code === 8216 || code === 8217)) {
-      width += 2;
-    } else {
-      width += 1;
-    }
-  }
-  return width;
-}
-function visibleWidth(str) {
-  return displayWidth2(stripAnsi(str));
-}
-function truncateAnsi(text, maxWidth) {
-  if (maxWidth <= 0) return "";
-  if (visibleWidth(text) <= maxWidth) return text;
-  let width = 0;
-  let out = "";
-  let i = 0;
-  let sawAnsi = false;
-  while (i < text.length) {
-    if (text[i] === "\x1B" && text[i + 1] === "[") {
-      sawAnsi = true;
-      let j = i + 2;
-      while (j < text.length) {
-        const code = text.charCodeAt(j);
-        j += 1;
-        if (code >= 64 && code <= 126) break;
-      }
-      out += text.slice(i, j);
-      i = j;
-      continue;
-    }
-    const codePoint = text.codePointAt(i) ?? 0;
-    const char = String.fromCodePoint(codePoint);
-    const charWidth = displayWidth2(char);
-    if (width + charWidth > maxWidth) break;
-    out += char;
-    width += charWidth;
-    i += char.length;
-  }
-  return sawAnsi ? `${out}\x1B[0m` : out;
-}
-function fitAnsiLine(text, width, ellipsis = "\u2026") {
-  if (width <= 0) return "";
-  if (visibleWidth(text) <= width) return text;
-  const ellipsisWidth = displayWidth2(ellipsis);
-  if (width < ellipsisWidth) return truncateAnsi(text, width);
-  if (width === ellipsisWidth) return truncateAnsi(ellipsis, width) || truncateAnsi(text, width);
-  return `${truncateAnsi(text, width - ellipsisWidth)}${ellipsis}`;
-}
-function countPhysicalLines(text, columns) {
-  const lines = text.split("\n");
-  let total = 0;
-  for (const line of lines) {
-    const width = displayWidth2(line);
-    total += Math.max(1, Math.ceil(width / columns));
-  }
-  return Math.max(total, 1);
-}
-function takeDisplayWidth(text, width) {
-  let used = 0;
-  let index = 0;
-  for (const char of text) {
-    const charWidth = displayWidth2(char);
-    if (used + charWidth > width && used > 0) break;
-    used += charWidth;
-    index += char.length;
-  }
-  return { prefix: text.slice(0, index), rest: text.slice(index) };
-}
-function padOrTruncateToWidth(text, width) {
-  const textWidth = visibleWidth(text);
-  if (textWidth > width) {
-    return truncateAnsi(text, width);
-  }
-  return `${text}${" ".repeat(width - textWidth)}`;
-}
-var SGR_RESET_REGEX = /^\x1b\[0?m$/;
-function tokenizeAnsiLine(line) {
-  const tokens = [];
-  let index = 0;
-  while (index < line.length) {
-    if (line[index] === "\x1B") {
-      const osc = line.slice(index).match(/^\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/);
-      if (osc) {
-        tokens.push({ kind: "sgr", value: osc[0], width: 0 });
-        index += osc[0].length;
-        continue;
-      }
-      const sgr = SGR_SEQUENCE_REGEX.exec(line.slice(index));
-      if (sgr) {
-        tokens.push({ kind: "sgr", value: sgr[0], width: 0 });
-        index += sgr[0].length;
-        continue;
-      }
-    }
-    const codePoint = line.codePointAt(index) ?? 0;
-    const value = String.fromCodePoint(codePoint);
-    tokens.push({ kind: "char", value, width: displayWidth2(value) });
-    index += value.length;
-  }
-  return tokens;
-}
-function wrapTranscriptLine(line, columns) {
-  if (line === "") return [""];
-  const tokens = tokenizeAnsiLine(line);
-  const result = [];
-  let activeStyles = [];
-  const applyStyleToken = (value) => {
-    if (SGR_RESET_REGEX.test(value)) {
-      activeStyles = [];
-    } else {
-      activeStyles.push(value);
-    }
-  };
-  let start = 0;
-  while (start < tokens.length) {
-    if (tokens.slice(start).every((token) => token.kind === "sgr")) {
-      if (result.length > 0) break;
-    }
-    const openingStyles = [...activeStyles];
-    let width = 0;
-    let end = start;
-    let lastBreak = -1;
-    while (end < tokens.length) {
-      const token = tokens[end];
-      if (token.kind === "sgr") {
-        end += 1;
-        continue;
-      }
-      if (width + token.width > columns && width > 0) break;
-      width += token.width;
-      end += 1;
-      if (token.value === " " || token.value === "	") {
-        lastBreak = end;
-      }
-    }
-    let segmentEnd = end;
-    if (end < tokens.length && lastBreak > start) {
-      const overflowToken = tokens[end];
-      if (overflowToken.kind === "char" && overflowToken.value !== " " && overflowToken.width === 1) {
-        segmentEnd = lastBreak;
-      }
-    }
-    if (segmentEnd === start) segmentEnd = start + 1;
-    let segment = "";
-    let sawStyle = openingStyles.length > 0;
-    for (let i = start; i < segmentEnd; i += 1) {
-      const token = tokens[i];
-      segment += token.value;
-      if (token.kind === "sgr") {
-        sawStyle = true;
-        applyStyleToken(token.value);
-      }
-    }
-    const prefix = openingStyles.join("");
-    const needsReset = (sawStyle || activeStyles.length > 0) && !segment.endsWith("\x1B[0m");
-    result.push(`${prefix}${segment}${needsReset ? "\x1B[0m" : ""}`);
-    start = segmentEnd;
-    while (start < tokens.length) {
-      const token = tokens[start];
-      if (token.kind === "char" && token.value === " ") {
-        start += 1;
-        continue;
+import { execFile, execSync } from "node:child_process";
+function parseStatusOutput(branch, status) {
+  if (!status) {
+    return { branch, modified: 0, untracked: 0 };
+  }
+  let modified = 0;
+  let untracked = 0;
+  for (const line of status.split("\n")) {
+    if (!line) continue;
+    const flag = line[0];
+    if (flag === "?") untracked += 1;
+    else modified += 1;
+  }
+  return { branch, modified, untracked };
+}
+function execFileUtf8(file, args, cwd) {
+  return new Promise((resolve2, reject) => {
+    execFile(
+      file,
+      args,
+      { cwd, encoding: "utf8", timeout: 2e3 },
+      (err, stdout) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve2(typeof stdout === "string" ? stdout : String(stdout ?? ""));
       }
-      break;
-    }
-  }
-  return result.length > 0 ? result : [""];
+    );
+  });
 }
-function wrapTextToLines(text, columns) {
-  const result = [];
-  for (const logicalLine of text.split("\n")) {
-    if (logicalLine === "") {
-      result.push("");
-      continue;
-    }
-    let remaining = logicalLine;
-    while (remaining.length > 0) {
-      const { prefix, rest } = takeDisplayWidth(remaining, columns);
-      result.push(prefix);
-      remaining = rest;
+function detectGitStatusAsync(cwd) {
+  return (async () => {
+    try {
+      const branch = (await execFileUtf8("git", ["rev-parse", "--abbrev-ref", "HEAD"], cwd)).trim();
+      if (!branch) return void 0;
+      const status = (await execFileUtf8("git", ["status", "--porcelain"], cwd)).trim();
+      return parseStatusOutput(branch, status);
+    } catch {
+      return void 0;
     }
-  }
-  return result;
+  })();
 }
 
 // packages/cli/tui/sessionRender.ts
@@ -2468,12 +2413,12 @@ function formatElapsedSeconds(totalSeconds) {
   const mins = minutes % 60;
   return `${hours}h ${mins}m`;
 }
-function renderComposerTokenChip(tokens, fallbackContextWindow) {
+function renderComposerTokenChip(tokens, fallbackContextWindow, estimatedContextTokens) {
   const cw = tokens?.contextWindow ?? fallbackContextWindow;
   if (!cw) {
     return "context: \u2014";
   }
-  const used = tokens ? tokens.input + tokens.output : 0;
+  const used = tokens ? tokens.input + tokens.output : Math.max(0, estimatedContextTokens ?? 0);
   const pct = Math.min(100, used / cw * 100);
   const pctText = pct > 0 && pct < 10 ? pct.toFixed(1) : Math.round(pct).toString();
   return `context: ${pctText}% (${formatTokenCount(used)}/${formatTokenCount(cw)})`;
@@ -2495,7 +2440,17 @@ function renderStatusLine(state) {
     const untrackedText = untracked > 0 ? ` ${themeText(`?${untracked}`, "muted", colorEnabled)}` : "";
     parts.push(`${branchText}${modifiedText}${untrackedText}`);
   }
-  const tokenSegment = themeText(renderComposerTokenChip(state.turnTokens, state.contextWindow), "muted", colorEnabled);
+  const credits = state.apiSource === "platform" ? state.turnTokens?.credits : void 0;
+  const creditsSuffix = credits !== void 0 && credits > 0 ? ` \xB7 \u26A1 ${credits.toFixed(2)} \u79EF\u5206` : "";
+  const tokenSegment = themeText(
+    renderComposerTokenChip(
+      state.turnTokens,
+      state.contextWindow,
+      state.estimatedContextTokens
+    ) + creditsSuffix,
+    "muted",
+    colorEnabled
+  );
   parts.push(tokenSegment);
   const runningCount = getProcessRegistry().list().filter((p) => p.status === "running").length;
   if (runningCount > 0) {
@@ -2577,7 +2532,7 @@ function renderWelcome(state, frame = 0, maxFrames = 0, columns) {
   const isDark = brightness === "dark";
   let sceneArt = colorEnabled ? buildColoredScene(isDark, frame, maxFrames) : buildPlainScene(isDark, frame, maxFrames);
   if (typeof columns === "number" && columns > 0) {
-    const widestSceneCol = sceneArt.split("\n").reduce((max, line) => Math.max(max, displayWidth2(stripAnsi(line))), 0);
+    const widestSceneCol = sceneArt.split("\n").reduce((max, line) => Math.max(max, displayWidth(stripAnsi(line))), 0);
     if (columns < widestSceneCol) sceneArt = "";
   }
   const versionLine = colorEnabled ? `\x1B[1m${themeColorSequence("accent")}nolo\x1B[0m ${state.cliVersion ?? ""} | server ${state.serverUrl}`.replace("  |", " |") : `nolo ${state.cliVersion ?? ""} | server ${state.serverUrl}`.replace("  |", " |");
@@ -2627,19 +2582,19 @@ function renderContextPanel(state, colorEnabled = resolveCliColorEnabled()) {
   ];
   let maxW = 0;
   for (const l of labels) {
-    const w = displayWidth2(l);
+    const w = displayWidth(l);
     if (w > maxW) maxW = w;
   }
   const targetWidth = maxW >= 9 ? maxW + 1 : 9;
   const padLabel = (raw) => {
-    const w = displayWidth2(raw);
+    const w = displayWidth(raw);
     const padding = " ".repeat(Math.max(0, targetWidth - w));
     return raw + padding;
   };
   const field = (rawLabel, value) => `${themeText(padLabel(rawLabel), "muted", colorEnabled)}${value}`;
   const next = (command, description) => `  ${themeText(command, "accent", colorEnabled)}${themeText(description, "muted", colorEnabled)}`;
   const titleText = t("contextTitle");
-  const heading = colorEnabled ? [renderDialogTitle(titleText, true)] : [titleText, "\u2500".repeat(displayWidth2(titleText))];
+  const heading = colorEnabled ? [renderDialogTitle(titleText, true)] : [titleText, "\u2500".repeat(displayWidth(titleText))];
   return [
     ...heading,
     field(labels[0], `${state.agentName} (${state.agentKey})`),
@@ -2684,14 +2639,21 @@ function renderKnownAgents(colorEnabled = resolveCliColorEnabled()) {
 
 // packages/cli/tui/sessionInput.ts
 var PASTE_TOKEN_PREFIX = "\0PASTE\0";
-function applyTuiInputKey(buffer, sequence, key = {}, cursorPos) {
+function applyTuiInputKey(buffer, sequence, key = {}, cursorPos, options) {
   const seq = sequence ?? "";
   const curPos = Math.max(0, Math.min(buffer.length, cursorPos ?? buffer.length));
+  const pasteStore = options?.pasteStore;
   if (seq.startsWith(PASTE_TOKEN_PREFIX)) {
     const rawPayload = seq.slice(PASTE_TOKEN_PREFIX.length);
     const normalized = rawPayload.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-    const nextBuf2 = buffer.slice(0, curPos) + normalized + buffer.slice(curPos);
-    return { buffer: nextBuf2, cursorPos: curPos + normalized.length };
+    const insertAt2 = snapCursorOutsidePasteChip(buffer, curPos);
+    if (pasteStore && shouldCollapsePaste(normalized)) {
+      const { placeholder } = allocateCollapsedPaste(pasteStore, normalized);
+      const nextBuf3 = buffer.slice(0, insertAt2) + placeholder + buffer.slice(insertAt2);
+      return { buffer: nextBuf3, cursorPos: insertAt2 + placeholder.length };
+    }
+    const nextBuf2 = buffer.slice(0, insertAt2) + normalized + buffer.slice(insertAt2);
+    return { buffer: nextBuf2, cursorPos: insertAt2 + normalized.length };
   }
   if (seq === "" || key.ctrl && key.name === "c") {
     return { buffer, cursorPos: curPos, abort: true };
@@ -2700,16 +2662,25 @@ function applyTuiInputKey(buffer, sequence, key = {}, cursorPos) {
     return { buffer, cursorPos: curPos, copyView: true };
   }
   if (seq === "\x1B[13;2~" || seq === "\x1B[27;2;13~" || seq === "\x1B\r" || key.shift && (key.name === "enter" || key.name === "return") || seq === "\n" || key.ctrl && key.name === "j") {
-    const nextBuf2 = buffer.slice(0, curPos) + "\n" + buffer.slice(curPos);
-    return { buffer: nextBuf2, cursorPos: curPos + 1 };
+    const insertAt2 = snapCursorOutsidePasteChip(buffer, curPos);
+    const nextBuf2 = buffer.slice(0, insertAt2) + "\n" + buffer.slice(insertAt2);
+    return { buffer: nextBuf2, cursorPos: insertAt2 + 1 };
   }
   if (key.name === "enter" || key.name === "return" || seq === "\r") {
     return { buffer: "", cursorPos: 0, submit: buffer };
   }
   if (isLeftArrowSequence(seq, key)) {
+    const span = findCollapsedPasteSpanAt(buffer, curPos, { preferLeft: true });
+    if (span && curPos > span.start && curPos <= span.end) {
+      return { buffer, cursorPos: span.start };
+    }
     return { buffer, cursorPos: Math.max(0, curPos - 1) };
   }
   if (isRightArrowSequence(seq, key)) {
+    const span = findCollapsedPasteSpanAt(buffer, curPos);
+    if (span && curPos >= span.start && curPos < span.end) {
+      return { buffer, cursorPos: span.end };
+    }
     return { buffer, cursorPos: Math.min(buffer.length, curPos + 1) };
   }
   if (isHomeSequence(seq, key)) {
@@ -2720,24 +2691,33 @@ function applyTuiInputKey(buffer, sequence, key = {}, cursorPos) {
   }
   if (isDeleteWordSequence(seq, key)) {
     if (curPos === 0) return { buffer, cursorPos: curPos };
+    const pasteSpan = findCollapsedPasteSpanAt(buffer, curPos, {
+      preferLeft: true
+    });
+    if (pasteSpan && (curPos === pasteSpan.end || curPos > pasteSpan.start && curPos < pasteSpan.end)) {
+      return removePasteSpan(buffer, pasteSpan, pasteStore);
+    }
     const cutIdx = findWordStartLeft(buffer, curPos);
-    const nextBuf2 = buffer.slice(0, cutIdx) + buffer.slice(curPos);
-    return { buffer: nextBuf2, cursorPos: cutIdx };
+    return deleteBufferRange(buffer, cutIdx, curPos, pasteStore);
   }
   if (isKillToLineStartSequence(seq, key)) {
     if (curPos === 0) return { buffer, cursorPos: curPos };
     const lineStart = buffer.lastIndexOf("\n", curPos - 1) + 1;
-    const nextBuf2 = buffer.slice(0, lineStart) + buffer.slice(curPos);
-    return { buffer: nextBuf2, cursorPos: lineStart };
+    return deleteBufferRange(buffer, lineStart, curPos, pasteStore);
   }
   if (isKillToLineEndSequence(seq, key)) {
     const nlIdx = buffer.indexOf("\n", curPos);
     const lineEnd = nlIdx === -1 ? buffer.length : nlIdx;
-    const nextBuf2 = buffer.slice(0, curPos) + buffer.slice(lineEnd);
-    return { buffer: nextBuf2, cursorPos: curPos };
+    return deleteBufferRange(buffer, curPos, lineEnd, pasteStore);
   }
   if (isBackspaceSequence(seq, key)) {
     if (curPos > 0) {
+      const pasteSpan = findCollapsedPasteSpanAt(buffer, curPos, {
+        preferLeft: true
+      });
+      if (pasteSpan && (curPos === pasteSpan.end || curPos > pasteSpan.start && curPos < pasteSpan.end)) {
+        return removePasteSpan(buffer, pasteSpan, pasteStore);
+      }
       const nextBuf2 = buffer.slice(0, curPos - 1) + buffer.slice(curPos);
       return { buffer: nextBuf2, cursorPos: curPos - 1 };
     }
@@ -2745,6 +2725,10 @@ function applyTuiInputKey(buffer, sequence, key = {}, cursorPos) {
   }
   if (isForwardDeleteSequence(seq, key)) {
     if (curPos < buffer.length) {
+      const pasteSpan = findCollapsedPasteSpanAt(buffer, curPos);
+      if (pasteSpan && (curPos === pasteSpan.start || curPos > pasteSpan.start && curPos < pasteSpan.end)) {
+        return removePasteSpan(buffer, pasteSpan, pasteStore);
+      }
       const nextBuf2 = buffer.slice(0, curPos) + buffer.slice(curPos + 1);
       return { buffer: nextBuf2, cursorPos: curPos };
     }
@@ -2761,8 +2745,14 @@ function applyTuiInputKey(buffer, sequence, key = {}, cursorPos) {
   if (!seq || key.ctrl || key.meta || seq.startsWith("\x1B")) {
     return { buffer, cursorPos: curPos };
   }
-  const nextBuf = buffer.slice(0, curPos) + seq + buffer.slice(curPos);
-  return { buffer: nextBuf, cursorPos: curPos + seq.length };
+  const insertAt = snapCursorOutsidePasteChip(buffer, curPos);
+  const nextBuf = buffer.slice(0, insertAt) + seq + buffer.slice(insertAt);
+  return { buffer: nextBuf, cursorPos: insertAt + seq.length };
+}
+function snapCursorOutsidePasteChip(buffer, pos) {
+  const span = findCollapsedPasteSpanAt(buffer, pos);
+  if (span && pos > span.start && pos < span.end) return span.end;
+  return pos;
 }
 function isLeftArrowSequence(seq, key) {
   if (key.name === "left") return true;
@@ -2786,13 +2776,44 @@ function isEndSequence(seq, key) {
   if (seq === "" || seq === "\x1B[F" || seq === "\x1B[4~" || seq === "\x1B[8~" || seq === "\x1BOF") return true;
   return false;
 }
+function removePasteSpan(buffer, span, pasteStore) {
+  if (pasteStore) releaseCollapsedPaste(pasteStore, span.id);
+  const nextBuf = buffer.slice(0, span.start) + buffer.slice(span.end);
+  return { buffer: nextBuf, cursorPos: span.start };
+}
+function deleteBufferRange(buffer, start, end, pasteStore) {
+  if (start >= end) return { buffer, cursorPos: start };
+  const range = expandRangeToCollapsedPasteChips(buffer, start, end);
+  releasePastesInRange(buffer, range.start, range.end, pasteStore);
+  const nextBuf = buffer.slice(0, range.start) + buffer.slice(range.end);
+  return { buffer: nextBuf, cursorPos: range.start };
+}
+function releasePastesInRange(buffer, start, end, pasteStore) {
+  if (!pasteStore || start >= end) return;
+  const slice = buffer.slice(start, end);
+  const re = /\[paste #(\d+) · (\d+) lines\]/g;
+  let match;
+  while ((match = re.exec(slice)) !== null) {
+    releaseCollapsedPaste(pasteStore, Number(match[1]));
+  }
+}
 var CJK_CHAR = /[\u4e00-\u9fff\u3000-\u303f\uff00-\uffef]/;
 function findWordStartLeft(buffer, curPos) {
   let i = curPos;
   while (i > 0 && /\s/.test(buffer[i - 1])) i--;
   if (i === 0) return 0;
+  const spanAtCursor = findCollapsedPasteSpanAt(buffer, i, {
+    preferLeft: true
+  });
+  if (spanAtCursor && (i === spanAtCursor.end || i > spanAtCursor.start && i < spanAtCursor.end)) {
+    return spanAtCursor.start;
+  }
   if (CJK_CHAR.test(buffer[i - 1])) return i - 1;
-  while (i > 0 && !/\s/.test(buffer[i - 1]) && !CJK_CHAR.test(buffer[i - 1])) i--;
+  while (i > 0 && !/\s/.test(buffer[i - 1]) && !CJK_CHAR.test(buffer[i - 1])) {
+    const span = findCollapsedPasteSpanAt(buffer, i, { preferLeft: true });
+    if (span && i === span.end) break;
+    i--;
+  }
   return i;
 }
 function isDeleteWordSequence(seq, key) {
@@ -2903,6 +2924,7 @@ function createInitialTuiState(env = process.env) {
   ) || void 0;
   const dialogEnvValue = asOptionalTrimmedString(env.NOLO_DIALOG);
   const explicitDialogKey = asOptionalTrimmedString(env.NOLO_DIALOG_KEY) ?? (dialogEnvValue?.startsWith("dialog-") ? dialogEnvValue : void 0);
+  const autoRouteDefault = env.NOLO_AUTO_ROUTE !== "0";
   return {
     agentKey,
     agentName,
@@ -2922,22 +2944,47 @@ function createInitialTuiState(env = process.env) {
     attachedImages: [],
     runtimeMode,
     modeLabel: asOptionalTrimmedString(env.NOLO_CLI_STATUS_MODE) ?? runtimeMode,
-    gitStatus: env.NOLO_CLI_GIT_STATUS === "0" ? void 0 : detectGitStatus(cwd),
+    gitStatus: void 0,
     thinkingDisplay: normalizeThinkingDisplayMode(
       env.NOLO_CLI_THINKING ?? env.NOLO_THINKING,
       "hide"
     ),
     toolDisplay: normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "compact"),
-    contextWindow: getModelContextWindow(agentName)
+    contextWindow: resolveAgentContextWindow({
+      agentKey,
+      agentName,
+      autoRouteDefault
+    }),
+    estimatedContextTokens: estimateDefaultCliContextTokens({
+      cwd,
+      agentKey,
+      agentName: autoRouteDefault ? "DeepSeek V4 Flash" : agentName,
+      model: autoRouteDefault ? "deepseek-v4-flash" : void 0
+    }),
+    apiSource: PLATFORM_AGENTS.some((entry) => entry.key === agentKey) ? "platform" : void 0
   };
 }
-function applyAgentSwitch(state, target) {
+function applyAgentSwitch(state, target, opts) {
+  const autoRouteDefault = opts?.autoRouteDefault ?? process.env.NOLO_AUTO_ROUTE !== "0";
+  const contextWindow = resolveAgentContextWindow({
+    agentKey: target.key,
+    agentName: target.name,
+    model: target.model,
+    autoRouteDefault
+  });
   return {
     nextState: {
       ...state,
       agentName: target.name,
       agentKey: target.key,
-      contextWindow: getModelContextWindow(target.name)
+      contextWindow,
+      estimatedContextTokens: estimateDefaultCliContextTokens({
+        cwd: state.cwd,
+        agentKey: target.key,
+        agentName: target.name,
+        model: target.model
+      }),
+      apiSource: target.apiSource
     },
     output: `Switched to ${target.name}. ${state.dialogId ? `Dialog kept: ${state.dialogId}` : "Dialog kept: new"}`
   };
@@ -2999,32 +3046,32 @@ function handleTuiInput(input, state) {
         return {
           nextState: state,
           output: [
-            `Current theme: ${getActiveThemeName()} \xB7 ${brightness}`,
-            `Usage: /theme <name> | /theme light | /theme dark`,
-            `Available themes: ${available}`
+            t("themeCurrent", getActiveThemeName(), brightness),
+            t("themeUsage"),
+            t("themeAvailable", available)
           ].join("\n")
         };
       }
       if (sub === "light" || sub === "dark") {
         setActiveBrightness(sub);
-        return { nextState: state, output: `Switched to ${sub} background colors.` };
+        return { nextState: state, output: t("themeBrightnessSwitched", sub) };
       }
       if (sub === "auto") {
         setActiveBrightness(null);
         return {
           nextState: state,
-          output: `Background colors follow terminal detection (now: ${resolveTuiBrightness()}).`
+          output: t("themeBrightnessAuto", resolveTuiBrightness())
         };
       }
       if (setActiveThemeName(sub)) {
         return {
           nextState: state,
-          output: `Switched to theme: ${sub}`
+          output: t("themeSwitched", sub)
         };
       } else {
         return {
           nextState: state,
-          output: `Unknown theme: ${sub}. Available themes: ${available}`
+          output: t("themeUnknown", sub, available)
         };
       }
     }
@@ -3034,20 +3081,19 @@ function handleTuiInput(input, state) {
       if (!sub) {
         return {
           nextState: state,
-          output: `Current density: ${getActiveDensity()}
-Usage: /density <cozy|spacious>`
+          output: t("densityCurrent", getActiveDensity())
         };
       }
       if (sub === "cozy" || sub === "spacious") {
         setActiveDensity(sub);
         return {
           nextState: state,
-          output: `Switched to layout density: ${sub}`
+          output: t("densitySwitched", sub)
         };
       } else {
         return {
           nextState: state,
-          output: `Unknown density: ${sub}. Use 'cozy' or 'spacious'.`
+          output: t("densityUnknown", sub)
         };
       }
     }
@@ -3058,52 +3104,52 @@ Usage: /density <cozy|spacious>`
       if (argText !== "auto" && argText !== "local" && argText !== "server") {
         return {
           nextState: state,
-          output: "Usage: /runtime <auto|local|server>"
+          output: t("runtimeUsage")
         };
       }
       return {
         nextState: { ...state, runtimeMode: argText },
-        output: `Runtime: ${argText}`
+        output: t("runtimeSet", argText)
       };
     }
     case "/tools": {
       if (!argText) {
         return {
           nextState: state,
-          output: `Tool display: ${state.toolDisplay} (hide | compact | verbose)`
+          output: t("toolsCurrent", state.toolDisplay)
         };
       }
       const normalizedArg = asTrimmedLowercaseString(argText);
       if (!["hide", "compact", "verbose", "on", "off"].includes(normalizedArg)) {
         return {
           nextState: state,
-          output: "Usage: /tools <hide|compact|verbose>"
+          output: t("toolsUsage")
         };
       }
       const nextMode = normalizeToolDisplayMode(normalizedArg, state.toolDisplay);
       return {
         nextState: { ...state, toolDisplay: nextMode },
-        output: `Tool display: ${nextMode}`
+        output: t("toolsSet", nextMode)
       };
     }
     case "/thinking": {
       if (!argText) {
         return {
           nextState: state,
-          output: `Thinking display: ${state.thinkingDisplay} (hide | marker | show)`
+          output: t("thinkingCurrent", state.thinkingDisplay)
         };
       }
       const normalizedArg = asTrimmedLowercaseString(argText);
       if (!["hide", "marker", "show", "on", "off"].includes(normalizedArg)) {
         return {
           nextState: state,
-          output: "Usage: /thinking <hide|marker|show>"
+          output: t("thinkingUsage")
         };
       }
       const nextMode = normalizeThinkingDisplayMode(normalizedArg, state.thinkingDisplay);
       return {
         nextState: { ...state, thinkingDisplay: nextMode },
-        output: `Thinking display: ${nextMode}`
+        output: t("thinkingSet", nextMode)
       };
     }
     case "/tasks":
@@ -3115,14 +3161,14 @@ Usage: /density <cozy|spacious>`
       const stopped = all.filter((p) => p.status !== "running");
       const lines = [];
       if (running.length > 0) {
-        lines.push(`Running processes (${running.length}):`);
+        lines.push(t("tasksRunning", String(running.length)));
         for (const p of running) {
           const elapsed = formatElapsedSeconds(Math.floor((Date.now() - p.startedAt) / 1e3));
           lines.push(`  pid ${p.pid}  ${p.label}    running  ${elapsed}`);
         }
       }
       if (stopped.length > 0) {
-        lines.push(`Stopped/exited (${stopped.length}):`);
+        lines.push(t("tasksStopped", String(stopped.length)));
         for (const p of stopped) {
           const elapsed = formatElapsedSeconds(Math.floor((Date.now() - p.startedAt) / 1e3));
           const exitInfo = p.exitCode !== void 0 ? `  exit ${p.exitCode}` : "";
@@ -3130,38 +3176,38 @@ Usage: /density <cozy|spacious>`
         }
       }
       if (all.length === 0) {
-        lines.push("No processes.");
+        lines.push(t("tasksNone"));
       }
       return { nextState: state, output: lines.join("\n") };
     }
     case "/stop": {
       const registry = getProcessRegistry();
       if (!argText) {
-        return { nextState: state, output: "Usage: /stop <pid|label|all>" };
+        return { nextState: state, output: t("stopUsage") };
       }
       if (argText === "all") {
         const before = registry.list().filter((p) => p.status === "running").length;
         registry.stopAll();
-        return { nextState: state, output: `Stopped ${before} processes` };
+        return { nextState: state, output: t("stopAllDone", String(before)) };
       }
       if (/^\d+$/.test(argText)) {
         const pid = parseInt(argText, 10);
         const proc = registry.get(pid);
         if (!proc || proc.status !== "running") {
-          return { nextState: state, output: `No running process with pid ${pid}` };
+          return { nextState: state, output: t("stopNoPid", String(pid)) };
         }
         registry.kill(pid);
-        return { nextState: state, output: `Stopped pid ${pid} (${proc.label})` };
+        return { nextState: state, output: t("stopPidDone", String(pid), proc.label) };
       }
       const matches = registry.list().filter((p) => p.status === "running" && p.label === argText);
       if (matches.length === 0) {
-        return { nextState: state, output: `No running process labeled '${argText}'` };
+        return { nextState: state, output: t("stopNoLabel", argText) };
       }
       for (const p of matches) {
         registry.kill(p.pid);
       }
       const stoppedNames = matches.map((p) => `pid ${p.pid} (${p.label})`).join(", ");
-      return { nextState: state, output: `Stopped ${stoppedNames}` };
+      return { nextState: state, output: t("stopLabelsDone", stoppedNames) };
     }
     case "/exit":
     case "/quit":
@@ -3185,15 +3231,13 @@ Usage: /density <cozy|spacious>`
       if (argText) {
         return {
           nextState: state,
-          output: `Unknown command: ${trimmed}
-
-${renderTuiHelp()}`
+          output: t("unknownCommand", trimmed) + renderTuiHelp()
         };
       }
       if (!state.dialogId) {
         return {
           nextState: state,
-          output: "Current dialog: new (nothing to compact yet)"
+          output: t("compactNothing")
         };
       }
       return {
@@ -3220,15 +3264,14 @@ ${renderTuiHelp()}`
       if (argText === "current" || argText === "show") {
         return {
           nextState: state,
-          output: `Current agent: ${state.agentName} (${state.agentKey})`
+          output: t("agentCurrent", state.agentName, state.agentKey)
         };
       }
       const resolvedTarget = resolveAgentSwitchTarget(argText, resolveCatalogPlatformAgents());
       if (!resolvedTarget) {
         return {
           nextState: state,
-          output: `I don't know agent "${argText}" yet.
-Use /switch, /switch list, /switch minimax-m3, or a full agent key.`
+          output: t("agentUnknown", argText)
         };
       }
       return applyAgentSwitch(state, resolvedTarget);
@@ -3282,6 +3325,16 @@ Use /switch, /switch list, /switch minimax-m3, or a full agent key.`
         action: { type: "set-mouse", enabled: argText === "on" }
       };
     }
+    case "/altscreen": {
+      if (argText !== "on" && argText !== "off") {
+        return { nextState: state, output: t("altscreenUsage") };
+      }
+      return {
+        nextState: state,
+        output: argText === "on" ? t("altscreenOn") : t("altscreenOff"),
+        action: { type: "set-altscreen", enabled: argText === "on" }
+      };
+    }
     case "/resume": {
       if (!argText) {
         return {
@@ -3311,7 +3364,7 @@ Use /switch, /switch list, /switch minimax-m3, or a full agent key.`
       if (rest[0] === "attach") {
         const docName = rest.slice(1).join(" ").trim();
         if (!docName) {
-          return { nextState: state, output: "Usage: /doc attach <doc>" };
+          return { nextState: state, output: t("docAttachUsage") };
         }
         const attachedDocs = state.attachedDocs.includes(docName) ? state.attachedDocs : [...state.attachedDocs, docName];
         return {
@@ -3321,7 +3374,7 @@ Use /switch, /switch list, /switch minimax-m3, or a full agent key.`
       }
       return {
         nextState: state,
-        output: state.attachedDocs.length > 0 ? `Attached docs: ${state.attachedDocs.join(", ")}` : "No docs attached. Use /doc attach <doc>."
+        output: state.attachedDocs.length > 0 ? t("docList", state.attachedDocs.join(", ")) : t("docNone")
       };
     }
     case "/skill": {
@@ -3329,7 +3382,7 @@ Use /switch, /switch list, /switch minimax-m3, or a full agent key.`
       if (sub === "attach") {
         const skillRef = rest.slice(1).join(" ").trim();
         if (!skillRef) {
-          return { nextState: state, output: "Usage: /skill attach <skill-ref>" };
+          return { nextState: state, output: t("skillAttachUsage") };
         }
         const attachedSkills = state.attachedSkills.includes(skillRef) ? state.attachedSkills : [...state.attachedSkills, skillRef];
         return {
@@ -3340,38 +3393,37 @@ Use /switch, /switch list, /switch minimax-m3, or a full agent key.`
       if (sub === "detach") {
         const skillRef = rest.slice(1).join(" ").trim();
         if (!skillRef) {
-          return { nextState: state, output: "Usage: /skill detach <skill-ref>" };
+          return { nextState: state, output: t("skillDetachUsage") };
         }
         const attachedSkills = state.attachedSkills.filter((s) => s !== skillRef);
         return {
           nextState: { ...state, attachedSkills },
-          output: state.attachedSkills.includes(skillRef) ? `Detached skill: ${skillRef}` : `Skill not attached: ${skillRef}`
+          output: state.attachedSkills.includes(skillRef) ? t("skillDetached", skillRef) : t("skillNotAttached", skillRef)
         };
       }
       if (sub === "clear") {
         if (state.attachedSkills.length === 0) {
-          return { nextState: state, output: "No skills attached." };
+          return { nextState: state, output: t("skillNone") };
         }
         return {
           nextState: { ...state, attachedSkills: [] },
-          output: `Cleared ${state.attachedSkills.length} skill(s).`
+          output: t("skillCleared", String(state.attachedSkills.length))
         };
       }
       return {
         nextState: state,
-        output: state.attachedSkills.length > 0 ? `Attached skills: ${state.attachedSkills.join(", ")}
-Usage: /skill attach <ref> | /skill detach <ref> | /skill clear` : "No skills attached. Use /skill attach <skill-ref> to attach a skill.\nSkill refs can be a dbKey (page-xxx), a skill name (searched in .agents/skills/ then docs/skills/), or a direct path."
+        output: state.attachedSkills.length > 0 ? t("skillList", state.attachedSkills.join(", ")) : t("skillNoneHint")
       };
     }
     case "/customize":
       return {
         nextState: state,
-        output: "Tell nolo what to change, for example: /customize make my default agent more concise."
+        output: t("customizeHint")
       };
     case "/login":
       return {
         nextState: state,
-        output: "MVP login uses profile/env auth. Set AUTH_TOKEN, NOLO_SERVER, or NOLO_PROFILE before starting nolo."
+        output: t("loginHint")
       };
     case "/profile":
       return {
@@ -3387,16 +3439,12 @@ Usage: /skill attach <ref> | /skill detach <ref> | /skill clear` : "No skills at
     case "/version":
       return {
         nextState: state,
-        output: `nolo ${state.cliVersion || "unknown version"}
-Update this install with: nolo update
-If repo-local output differs, publish/install the latest npm package first.`
+        output: t("versionInfo", state.cliVersion || t("versionUnknown"))
       };
     default:
       return {
         nextState: state,
-        output: `Unknown command: ${command}
-
-${renderTuiHelp()}`
+        output: t("unknownCommand", command) + renderTuiHelp()
       };
   }
 }
@@ -3414,19 +3462,23 @@ function brightnessFromRgb(r, g, b) {
   const luma = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
   return luma >= 0.5 ? "light" : "dark";
 }
-function parseOsc11Reply(reply) {
+function parseOsc11Background(reply) {
   const match = reply.match(OSC11_REPLY_RE);
   if (!match) return null;
-  return brightnessFromRgb(
+  const channels = [
     componentToByte(match[1]),
     componentToByte(match[2]),
     componentToByte(match[3])
-  );
+  ];
+  return {
+    brightness: brightnessFromRgb(channels[0], channels[1], channels[2]),
+    hex: channels.map((v) => v.toString(16).padStart(2, "0").toUpperCase()).join("")
+  };
 }
 function isTerminalDevice(stream) {
   return stream instanceof ReadStream;
 }
-async function detectTerminalBrightness(args = {}) {
+async function detectTerminalBackground(args = {}) {
   const stdin = args.stdin ?? process.stdin;
   const stdout = args.stdout ?? process.stdout;
   const timeoutMs = args.timeoutMs ?? 100;
@@ -3453,7 +3505,7 @@ async function detectTerminalBrightness(args = {}) {
     };
     const onData = (chunk) => {
       buffer += chunk.toString("latin1");
-      const parsed = parseOsc11Reply(buffer);
+      const parsed = parseOsc11Background(buffer);
       if (parsed) finish(parsed);
       else if (buffer.length > 256) finish(null);
     };
@@ -3747,6 +3799,7 @@ function createChatQueueTuiBinding(runTurn) {
 
 // packages/cli/tui/tuiHistory.ts
 var MAX_TUI_HISTORY_TURNS = 500;
+var turnLineCache = /* @__PURE__ */ new WeakMap();
 function createTurnHistory() {
   return {
     turns: [],
@@ -3788,45 +3841,81 @@ function applyOutputChunkToCurrentTurn(history, chunk) {
   history.currentContent = next;
   return true;
 }
-function buildHistoryLines(history, contentWidth) {
-  const colorEnabled = resolveCliColorEnabled();
-  const styleTurn = (role, content) => {
-    if (role === "user") {
-      if (!colorEnabled) return `\u276F ${content}`;
-      const accent = themeColorSequence("accent");
-      const reset = "\x1B[39m";
-      return `${accent}\u276F${reset} ${content}`;
-    }
-    const highlighted = highlightMarkdown(content, colorEnabled);
-    const rawLines = highlighted.split("\n");
-    const styledLines = rawLines.map((line, idx) => {
-      if (idx === 0 && !line.startsWith("[nolo]")) {
-        const anchorPrefix = colorEnabled ? `${themeColorSequence("chrome")}\u25C8\x1B[39m ` : "\u25C8 ";
-        return `${anchorPrefix}${line}`;
-      }
-      return line.startsWith("[nolo]") && colorEnabled ? themeText(line, "chrome", true) : line;
-    });
-    return styledLines.join("\n");
-  };
+function styleAssistantTurn(content, colorEnabled) {
+  const highlighted = colorEnabled ? formatAssistantDisplay(content) : stripAnsi(formatAssistantDisplay(content));
+  const rawLines = highlighted.split("\n");
+  const styledLines = rawLines.map((line, idx) => {
+    if (idx === 0 && !line.startsWith("[nolo]")) {
+      const anchorPrefix = colorEnabled ? `${themeColorSequence("chrome")}\u25C8\x1B[39m ` : "\u25C8 ";
+      return `${anchorPrefix}${line}`;
+    }
+    return line.startsWith("[nolo]") && colorEnabled ? themeText(line, "chrome", true) : line;
+  });
+  return styledLines.join("\n");
+}
+function renderTurnBlock(role, content, contentWidth, colorEnabled) {
   const lines = [];
-  const pushTurn = (role, content) => {
-    if (getActiveDensity() === "spacious") {
-      if (lines.length > 0 || role === "user") lines.push("");
+  if (role === "user") {
+    const logicalLines = content.split("\n");
+    const accentSeq = colorEnabled ? themeColorSequence("accent") : "";
+    const chromeSeq = colorEnabled ? themeColorSequence("chrome") : "";
+    for (let i = 0; i < logicalLines.length; i++) {
+      const line = logicalLines[i];
+      let styledLine;
+      if (colorEnabled) {
+        const prefix = i === 0 ? `${accentSeq}\u276F\x1B[39m ` : `${chromeSeq}\u2502\x1B[39m `;
+        styledLine = `${prefix}${line}`;
+      } else {
+        const prefix = i === 0 ? "\u276F " : "  ";
+        styledLine = `${prefix}${line}`;
+      }
+      lines.push(...wrapTranscriptLine(styledLine, contentWidth, "  "));
+    }
+  } else {
+    const styledEntry = styleAssistantTurn(content, colorEnabled);
+    for (const logicalLine of styledEntry.split("\n")) {
+      lines.push(...wrapTranscriptLine(logicalLine, contentWidth));
     }
-    lines.push(styleTurn(role, content));
-  };
-  for (const turn of history.turns) {
-    pushTurn(turn.role, turn.content);
-  }
-  if (history.currentRole !== null && history.currentContent) {
-    pushTurn(history.currentRole, history.currentContent);
   }
+  return lines;
+}
+function buildHistoryLines(history, contentWidth) {
+  const colorEnabled = resolveCliColorEnabled();
+  const density = getActiveDensity();
   const wrapped = [];
-  for (const entry of lines) {
-    for (const logicalLine of entry.split("\n")) {
-      wrapped.push(...wrapTranscriptLine(logicalLine, contentWidth));
+  for (let i = 0; i < history.turns.length; i++) {
+    const turn = history.turns[i];
+    if (density === "spacious" && (i > 0 || turn.role === "user")) {
+      wrapped.push("");
+    }
+    const cached = turnLineCache.get(turn);
+    if (cached && cached.width === contentWidth && cached.color === colorEnabled && cached.density === density) {
+      wrapped.push(...cached.lines);
+    } else {
+      const lines = renderTurnBlock(turn.role, turn.content, contentWidth, colorEnabled);
+      turnLineCache.set(turn, {
+        width: contentWidth,
+        color: colorEnabled,
+        density,
+        lines
+      });
+      wrapped.push(...lines);
     }
   }
+  if (history.currentRole !== null && history.currentContent) {
+    const i = history.turns.length;
+    if (density === "spacious" && (i > 0 || history.currentRole === "user")) {
+      wrapped.push("");
+    }
+    wrapped.push(
+      ...renderTurnBlock(
+        history.currentRole,
+        history.currentContent,
+        contentWidth,
+        colorEnabled
+      )
+    );
+  }
   return wrapped;
 }
 function renderHistory(output, history, inputLines) {
@@ -3924,6 +4013,38 @@ function applyScrollAction(history, action, output, inputLines) {
 }
 
 // packages/cli/tui/tuiRawInput.ts
+function normalizePasteNewlines(text) {
+  return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+}
+var altScreenOn = /* @__PURE__ */ new WeakMap();
+function outputIsTty2(output) {
+  return Boolean(output.isTTY);
+}
+function enterAltScreen(output) {
+  if (!outputIsTty2(output)) return false;
+  if (altScreenOn.get(output)) return false;
+  altScreenOn.set(output, true);
+  output.write("\x1B[?1049h");
+  return true;
+}
+function leaveAltScreen(output) {
+  if (!outputIsTty2(output)) return false;
+  if (!altScreenOn.get(output)) return false;
+  altScreenOn.set(output, false);
+  output.write("\x1B[?1049l");
+  return true;
+}
+function isAltScreenOn(output) {
+  return Boolean(altScreenOn.get(output));
+}
+function styleCollapsedPastePlaceholders(text, colorEnabled) {
+  if (!colorEnabled || !text.includes("[paste #")) return text;
+  COLLAPSED_PASTE_PLACEHOLDER_RE.lastIndex = 0;
+  return text.replace(
+    COLLAPSED_PASTE_PLACEHOLDER_RE,
+    (match) => themeText(match, "accent", true)
+  );
+}
 function createNoopFixedInput() {
   return {
     active: false,
@@ -3946,6 +4067,8 @@ function createNoopFixedInput() {
     getInputLines: () => 1,
     isPaused: () => false,
     setMouseEnabled() {
+    },
+    setAltScreenEnabled() {
     }
   };
 }
@@ -3989,7 +4112,7 @@ function createFixedInput(output, config) {
       sections.push(fitAnsiLine(line.replace(/\r?\n/g, " "), cols));
     }
     const promptRaw = t("promptLabel");
-    const promptWidth = displayWidth2(promptRaw);
+    const promptWidth = displayWidth(promptRaw);
     const prompt = colorEnabled ? `${themeColorSequence("accent")}${promptRaw}\x1B[39m` : promptRaw;
     const contentWidth = Math.max(1, cols - promptWidth);
     const logicalLines = buffer.length === 0 ? [""] : buffer.split("\n");
@@ -4017,13 +4140,15 @@ function createFixedInput(output, config) {
       for (let j = 0; j < rows.length; j += 1) {
         const rowPrefix = j === 0 ? prefix : " ".repeat(promptWidth);
         const rowText = rows[j] ?? "";
-        sections.push(`${rowPrefix}${rowText}`);
+        sections.push(
+          `${rowPrefix}${styleCollapsedPastePlaceholders(rowText, colorEnabled)}`
+        );
         const rowLen = rowText.length;
         if (!cursorFound) {
           if (targetPos <= charOffset + rowLen || j === rows.length - 1 && i === logicalLines.length - 1) {
             const subOffset = Math.max(0, Math.min(rowLen, targetPos - charOffset));
             const subStr = rowText.slice(0, subOffset);
-            cursorCol = promptWidth + displayWidth2(subStr);
+            cursorCol = promptWidth + displayWidth(subStr);
             cursorRow = inputRows;
             cursorFound = true;
           }
@@ -4040,10 +4165,15 @@ function createFixedInput(output, config) {
   };
   const repaintAt = (buffer, cursorPos) => {
     const { text, lines, cursorCol, cursorRow } = renderInputArea(buffer, cursorPos);
+    let linesChanged = false;
     if (lines !== inputLines) {
       inputLines = lines;
+      linesChanged = true;
     }
     setScrollRegion(inputLines);
+    if (linesChanged) {
+      config.onInputLinesChange?.(inputLines);
+    }
     const startRow = getRows() - inputLines + 1;
     write(`\x1B[${startRow};1H`);
     write("\x1B[J");
@@ -4091,8 +4221,7 @@ function createFixedInput(output, config) {
     disable() {
       disableMouse();
       resetScrollRegion();
-      const rows = getRows();
-      write(`\x1B[${rows};1H\x1B[2K\x1B[${Math.max(1, rows - 1)};1H`);
+      leaveAltScreen(output);
     },
     getInputLines: () => inputLines,
     isPaused: () => paused,
@@ -4103,6 +4232,13 @@ function createFixedInput(output, config) {
       } else {
         write("\x1B[?1000l\x1B[?1006l");
       }
+    },
+    setAltScreenEnabled(enabled) {
+      if (enabled) {
+        enterAltScreen(output);
+      } else {
+        leaveAltScreen(output);
+      }
     }
   };
 }
@@ -4152,9 +4288,27 @@ function isIncompleteTail(input, start) {
   }
   return false;
 }
-var PASTE_START = "\x1B[?2004h";
-var PASTE_END = "\x1B[?2004l";
-function splitRawInputWithTail(input) {
+var PASTE_START = "\x1B[200~";
+var PASTE_END = "\x1B[201~";
+function findBracketedPasteEnd(input, contentStart) {
+  return input.indexOf(PASTE_END, contentStart);
+}
+function emitPlainRunAsTokens(run) {
+  if (run.length === 0) return [];
+  if (shouldCollapsePaste(normalizePasteNewlines(run))) {
+    return [`${PASTE_TOKEN_PREFIX}${run}`];
+  }
+  const tokens = [];
+  for (let index = 0; index < run.length; ) {
+    const codePoint = run.codePointAt(index);
+    if (codePoint === void 0) break;
+    const value = String.fromCodePoint(codePoint);
+    tokens.push(value);
+    index += value.length;
+  }
+  return tokens;
+}
+function splitRawInputWithTail(input, options) {
   const tokens = [];
   for (let index = 0; index < input.length; ) {
     if (isIncompleteTail(input, index)) {
@@ -4162,15 +4316,17 @@ function splitRawInputWithTail(input) {
     }
     if (input.startsWith(PASTE_START, index)) {
       const contentStart = index + PASTE_START.length;
-      const endPos = input.indexOf(PASTE_END, contentStart);
+      const endPos = findBracketedPasteEnd(input, contentStart);
       if (endPos !== -1) {
         const payload = input.slice(contentStart, endPos);
         tokens.push(`${PASTE_TOKEN_PREFIX}${payload}`);
         index = endPos + PASTE_END.length;
-      } else {
+      } else if (options?.forceCompleteOpenPaste) {
         const payload = input.slice(contentStart);
         tokens.push(`${PASTE_TOKEN_PREFIX}${payload}`);
         index = input.length;
+      } else {
+        return { tokens, tail: input.slice(index) };
       }
       continue;
     }
@@ -4195,63 +4351,121 @@ function splitRawInputWithTail(input) {
       index += csi.length;
       continue;
     }
-    const codePoint = input.codePointAt(index);
-    if (codePoint === void 0) break;
-    const value = String.fromCodePoint(codePoint);
-    tokens.push(value);
-    index += value.length;
+    const nextEsc = input.indexOf("\x1B", index);
+    const runEnd = nextEsc === -1 ? input.length : nextEsc;
+    const run = input.slice(index, runEnd);
+    if (run.length === 0) {
+      const codePoint = input.codePointAt(index);
+      if (codePoint === void 0) break;
+      const value = String.fromCodePoint(codePoint);
+      tokens.push(value);
+      index += value.length;
+      continue;
+    }
+    tokens.push(...emitPlainRunAsTokens(run));
+    index = runEnd;
   }
   return { tokens, tail: "" };
 }
 function splitRawInput(input) {
-  const { tokens, tail } = splitRawInputWithTail(input);
+  const { tokens, tail } = splitRawInputWithTail(input, {
+    forceCompleteOpenPaste: true
+  });
   if (!tail) return tokens;
-  const tailTokens = [];
-  for (let index = 0; index < tail.length; ) {
-    const codePoint = tail.codePointAt(index);
-    if (codePoint === void 0) break;
-    const value = String.fromCodePoint(codePoint);
-    tailTokens.push(value);
-    index += value.length;
-  }
-  return [...tokens, ...tailTokens];
+  return [...tokens, ...emitPlainRunAsTokens(tail)];
 }
 function createRawInputDecoder(onToken, options) {
   const decoder = new TextDecoder("utf-8", { fatal: false, ignoreBOM: true });
   let pendingBuffer = "";
   let timer = null;
   const timeoutMs = options?.escTimeoutMs ?? 15;
+  const unmarkedPasteDebounceMs = options?.unmarkedPasteDebounceMs ?? 40;
   const clearTimer = () => {
     if (timer !== null) {
       clearTimeout(timer);
       timer = null;
     }
   };
-  const flush = () => {
+  const emitCodePoints = (text) => {
+    for (let index = 0; index < text.length; ) {
+      const codePoint = text.codePointAt(index);
+      if (codePoint === void 0) break;
+      const value = String.fromCodePoint(codePoint);
+      onToken(value);
+      index += value.length;
+    }
+  };
+  const flushPlainPending = () => {
     clearTimer();
-    if (pendingBuffer.length > 0) {
-      const textToFlush = pendingBuffer;
-      pendingBuffer = "";
-      for (const token of splitRawInput(textToFlush)) {
-        onToken(token);
-      }
+    if (pendingBuffer.length === 0) return;
+    const text = pendingBuffer;
+    pendingBuffer = "";
+    for (const token of emitPlainRunAsTokens(text)) {
+      onToken(token);
     }
   };
+  const flushEscPending = (forceCompleteOpenPaste) => {
+    clearTimer();
+    if (pendingBuffer.length === 0) return;
+    const textToFlush = pendingBuffer;
+    pendingBuffer = "";
+    const { tokens, tail } = splitRawInputWithTail(textToFlush, {
+      forceCompleteOpenPaste
+    });
+    for (const token of tokens) {
+      onToken(token);
+    }
+    if (!tail) return;
+    if (forceCompleteOpenPaste) {
+      emitCodePoints(tail);
+      return;
+    }
+    pendingBuffer = tail;
+  };
   const decodeFn = (chunk) => {
     clearTimer();
     const bytes = typeof chunk === "string" ? Buffer.from(chunk, "utf8") : chunk;
     const text = decoder.decode(bytes, { stream: true });
     pendingBuffer += text;
-    const { tokens, tail } = splitRawInputWithTail(pendingBuffer);
-    pendingBuffer = tail;
-    for (const token of tokens) {
-      onToken(token);
+    if (pendingBuffer.startsWith(PASTE_START)) {
+      const endPos = findBracketedPasteEnd(
+        pendingBuffer,
+        PASTE_START.length
+      );
+      if (endPos === -1) return;
+      const { tokens, tail } = splitRawInputWithTail(pendingBuffer);
+      pendingBuffer = tail;
+      for (const token of tokens) onToken(token);
+      if (pendingBuffer.startsWith(PASTE_START)) return;
+    }
+    if (pendingBuffer.includes("\x1B")) {
+      const { tokens, tail } = splitRawInputWithTail(pendingBuffer);
+      pendingBuffer = tail;
+      for (const token of tokens) onToken(token);
+      if (pendingBuffer.startsWith(PASTE_START)) return;
+      if (pendingBuffer.length > 0) {
+        timer = setTimeout(() => flushEscPending(true), timeoutMs);
+      }
+      return;
+    }
+    if (shouldCollapsePaste(normalizePasteNewlines(pendingBuffer))) {
+      timer = setTimeout(flushPlainPending, unmarkedPasteDebounceMs);
+      return;
+    }
+    if (!pendingBuffer.includes("\n") && !pendingBuffer.includes("\r")) {
+      emitCodePoints(pendingBuffer);
+      pendingBuffer = "";
+      return;
     }
-    if (pendingBuffer.length > 0) {
-      timer = setTimeout(flush, timeoutMs);
+    timer = setTimeout(flushPlainPending, unmarkedPasteDebounceMs);
+  };
+  decodeFn.flush = () => {
+    if (pendingBuffer.startsWith(PASTE_START) || pendingBuffer.includes("\x1B")) {
+      flushEscPending(true);
+      return;
     }
+    flushPlainPending();
   };
-  decodeFn.flush = flush;
   decodeFn.destroy = () => {
     clearTimer();
     pendingBuffer = "";
@@ -4261,12 +4475,66 @@ function createRawInputDecoder(onToken, options) {
 
 // packages/cli/tui/readlineWorkspace.ts
 var AGENTS_MD_MAX_BYTES = 8192;
+var altScreenRestoreOutput = null;
+var altScreenHandlersInstalled = false;
+var preExistingSignalListeners = {};
+var SIGNAL_EXIT_CODE = {
+  SIGINT: 130,
+  SIGTERM: 143,
+  SIGHUP: 129
+};
+var restoreAltScreen = () => {
+  try {
+    if (altScreenRestoreOutput) leaveAltScreen(altScreenRestoreOutput);
+  } catch {
+  }
+};
+function installAltScreenRestoreHandlers(output) {
+  altScreenRestoreOutput = output;
+  if (altScreenHandlersInstalled) return;
+  altScreenHandlersInstalled = true;
+  process.on("exit", restoreAltScreen);
+  for (const sig of ["SIGINT", "SIGTERM", "SIGHUP"]) {
+    const existing = process.listeners(sig);
+    preExistingSignalListeners[sig] = [...existing];
+    const handler = () => {
+      restoreAltScreen();
+      const others = process.listeners(sig).filter((fn) => fn !== handler);
+      if (others.length === 0) {
+        process.exit(SIGNAL_EXIT_CODE[sig] ?? 128 + 1);
+        return;
+      }
+    };
+    process.prependListener(sig, handler);
+  }
+  process.on("uncaughtException", (err) => {
+    restoreAltScreen();
+    try {
+      process.stderr.write(
+        `uncaughtException: ${err?.stack ?? String(err)}
+`
+      );
+    } catch {
+    }
+    process.exit(1);
+  });
+  process.on("unhandledRejection", (reason) => {
+    restoreAltScreen();
+    try {
+      const text = reason instanceof Error ? reason.stack ?? String(reason) : String(reason);
+      process.stderr.write(`unhandledRejection: ${text}
+`);
+    } catch {
+    }
+    process.exit(1);
+  });
+}
 function readAgentsMdBlock(cwd) {
   for (const name of ["AGENTS.md", "CLAUDE.md"]) {
-    const filePath = join(cwd, name);
-    if (existsSync2(filePath)) {
+    const filePath = join2(cwd, name);
+    if (existsSync3(filePath)) {
       try {
-        let content = readFileSync(filePath, "utf8").trim();
+        let content = readFileSync2(filePath, "utf8").trim();
         if (!content) continue;
         if (Buffer.byteLength(content, "utf8") > AGENTS_MD_MAX_BYTES) {
           content = Buffer.from(content, "utf8").subarray(0, AGENTS_MD_MAX_BYTES).toString("utf8") + "\n\n<!-- AGENTS.md truncated -->";
@@ -4290,10 +4558,14 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
     effectiveAgentName = cachedRoute.agentName;
   } else if (!continueId && env.NOLO_AUTO_ROUTE !== "0" && state.agentKey === DEFAULT_TUI_AGENT_KEY) {
     const authToken = env.AUTH_TOKEN ?? env.AUTH ?? env.BENCHMARK_AUTH_TOKEN ?? "";
-    const route = await classifyCliAutoRoute(message, {
+    const route = authToken ? await classifyCliAutoRoute(message, {
       serverUrl: state.serverUrl,
       authToken
-    });
+    }) : {
+      agentKey: CLI_AUTO_TIER_AGENT_KEYS[resolveCliAutoFallbackTier(message)],
+      tier: resolveCliAutoFallbackTier(message),
+      classified: false
+    };
     effectiveAgentKey = route.agentKey;
     effectiveAgentName = `auto\u2192${route.tier}`;
     if (effectiveAgentKey !== state.agentKey) {
@@ -4381,6 +4653,18 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
   if (skillDiscoveryBlock) {
     extraContextBlocks.push(skillDiscoveryBlock);
   }
+  const agentsMdMarker = "--- \u9879\u76EE\u6307\u4EE4\uFF08";
+  const contextBlockScopes = [];
+  for (const block of extraContextBlocks) {
+    if (block.startsWith(agentsMdMarker)) {
+      contextBlockScopes.push({ content: block, cacheScope: "session" });
+    }
+  }
+  for (const block of extraContextBlocks) {
+    if (!block.startsWith(agentsMdMarker)) {
+      contextBlockScopes.push({ content: block, cacheScope: "turn" });
+    }
+  }
   const result = await agentRunner({
     agentName: effectiveAgentName,
     agentKey: effectiveAgentKey,
@@ -4401,9 +4685,17 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
     ...options.confirmDestructiveAction ? { confirmDestructiveAction: options.confirmDestructiveAction } : {},
     ...options.requestUserChoice ? { requestUserChoice: options.requestUserChoice } : {},
     ...options.abortSignal ? { abortSignal: options.abortSignal } : {},
+    ...options.pastedTextStore?.items.size ? {
+      pastedTextStore: options.pastedTextStore,
+      localRuntimeAdapterFactory: (factoryEnv, factoryOptions) => createCliLocalRuntimeAdapter({
+        env: factoryEnv,
+        cwd: factoryOptions?.cwd ?? state.cwd,
+        pastedTextStore: options.pastedTextStore
+      })
+    } : {},
     ...options.activityReporter ? { activityReporter: options.activityReporter } : {},
     ...skillAllowedTools !== void 0 ? { allowedToolNames: skillAllowedTools } : {},
-    ...extraContextBlocks.length > 0 ? { extraContextBlocks } : {}
+    ...contextBlockScopes.length > 0 ? { contextBlockScopes } : {}
   });
   if (!continueId && result.dialogId && effectiveAgentKey !== state.agentKey) {
     autoRouteByDialog.set(result.dialogId, {
@@ -4411,19 +4703,32 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
       agentName: effectiveAgentName
     });
   }
-  return result;
+  return {
+    ...result,
+    contextWindow: resolveAgentContextWindow({
+      agentKey: effectiveAgentKey,
+      agentName: effectiveAgentName,
+      autoRouteDefault: env.NOLO_AUTO_ROUTE !== "0"
+    })
+  };
 }
 function waitForActionGate(rl, input, output, gate, spawnRunner) {
   const commandPayload = gate.kind === "handoff" ? readCommandActionGatePayload(gate.payload) : null;
   const displayCommand = commandPayload?.displayCommand ?? commandPayload?.command.join(" ") ?? gate.title;
-  output.write("\n[nolo] Action needed in your terminal\n");
-  output.write(`[nolo] ${gate.title}
+  const isInteractiveHandoff = gate.kind === "handoff" && gate.title === "This command requires an interactive terminal.";
+  const title = isInteractiveHandoff ? t("actionGateInteractiveTitle") : gate.title;
+  const body = isInteractiveHandoff ? t("actionGateInteractiveBody") : gate.body;
+  output.write(`
+[nolo] ${t("actionGateNeeded")}
+`);
+  output.write(`[nolo] ${title}
 `);
-  if (gate.body) output.write(`[nolo] ${gate.body}
+  if (body) output.write(`[nolo] ${body}
 `);
   output.write(`  ${displayCommand}
 `);
-  output.write("[nolo] Press Enter to run it now. Follow any prompts below, or Ctrl+C to cancel.\n");
+  output.write(`[nolo] ${t("actionGateEnterHint")}
+`);
   return new Promise((resolve2) => {
     let settled = false;
     const finish = (result) => {
@@ -4513,17 +4818,28 @@ function isInteractiveInput(input) {
 function waitForRawActionGate(input, output, gate, spawnRunner, hooks) {
   const commandPayload = gate.kind === "handoff" ? readCommandActionGatePayload(gate.payload) : null;
   const displayCommand = commandPayload?.displayCommand ?? commandPayload?.command.join(" ") ?? gate.title;
-  output.write("\n[nolo] Action needed in your terminal\n");
-  output.write(`[nolo] ${gate.title}
+  const isInteractiveHandoff = gate.kind === "handoff" && gate.title === "This command requires an interactive terminal.";
+  const title = isInteractiveHandoff ? t("actionGateInteractiveTitle") : gate.title;
+  const body = isInteractiveHandoff ? t("actionGateInteractiveBody") : gate.body;
+  output.write(`
+[nolo] ${t("actionGateNeeded")}
 `);
-  if (gate.body) output.write(`[nolo] ${gate.body}
+  output.write(`[nolo] ${title}
+`);
+  if (body) output.write(`[nolo] ${body}
 `);
   output.write(`  ${displayCommand}
 `);
-  output.write("[nolo] Press Enter to run it now. Follow any prompts below, or Ctrl+C to cancel.\n");
+  output.write(`[nolo] ${t("actionGateEnterHint")}
+`);
   return new Promise((resolve2) => {
     const rawInput = input;
+    let settled = false;
+    let commandRunning = false;
     const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      hooks?.registerToken?.(null);
       input.off("data", onData);
       resolve2(result);
     };
@@ -4541,13 +4857,9 @@ function waitForRawActionGate(input, output, gate, spawnRunner, hooks) {
         actionGateResult: { gateId: gate.id, status: "failed", output: message }
       }
     });
-    const onData = async (chunk) => {
-      const text = String(chunk);
-      if (text.includes("")) {
-        cancel("interrupted");
-        return;
-      }
-      if (!text.includes("\r") && !text.includes("\n")) return;
+    const runCommand = async () => {
+      if (settled || commandRunning) return;
+      commandRunning = true;
       if (!commandPayload) {
         fail("unsupported gate payload");
         return;
@@ -4585,7 +4897,25 @@ function waitForRawActionGate(input, output, gate, spawnRunner, hooks) {
         }
       });
     };
-    input.on("data", onData);
+    const handleToken = (text) => {
+      if (settled || commandRunning) return;
+      if (text.includes("")) {
+        cancel("interrupted");
+        return;
+      }
+      if (text.includes("\r") || text.includes("\n")) {
+        void runCommand();
+      }
+    };
+    const onData = (chunk) => {
+      const text = String(chunk);
+      handleToken(text);
+    };
+    if (hooks?.registerToken) {
+      hooks.registerToken(handleToken);
+    } else {
+      input.on("data", onData);
+    }
   });
 }
 async function startTuiWorkspace(options) {
@@ -4597,22 +4927,33 @@ async function startTuiWorkspace(options) {
   const spawnRunner = options.spawnRunner ?? spawnProcess;
   const selfUpdater = options.selfUpdater ?? ((target) => runSelfUpdate({ output: target }));
   if (output.isTTY) {
-    output.write("\x1B[2J\x1B[3J\x1B[H");
+    enterAltScreen(output);
+    installAltScreenRestoreHandlers(output);
+    output.write("\x1B[2J\x1B[H");
   }
-  const detected = await detectTerminalBrightness({
+  const detected = await detectTerminalBackground({
     stdin: input,
     stdout: output
   });
-  if (detected) setActiveBrightness(detected);
+  if (detected) {
+    setActiveBrightness(detected.brightness);
+    setActiveTerminalBaseHex(detected.hex);
+  }
   const bannerColumns = output.columns;
   output.write(renderWelcome(state, 0, 0, bannerColumns));
   let fixedInput = createNoopFixedInput();
   let buffer = "";
   let cursorPos = 0;
+  const pasteStore = createCollapsedPasteStore();
   let activeTurnAbort = null;
+  let forcedStop = false;
+  let forcedStopEpoch = 0;
+  let turnEpoch = 0;
+  let activeTurnEpoch = 0;
   const activityIndicator = createActivityIndicator({
     isTurnActive: () => activeTurnAbort !== null,
     fallbackLabel: () => `${state.agentName} -> working`,
+    stoppingLabel: () => t("turnStopping"),
     onRepaint: () => {
       if (fixedInput.active && !fixedInput.isPaused()) {
         output.write("\x1B[?2026h\x1B[?25l");
@@ -4642,8 +4983,10 @@ async function startTuiWorkspace(options) {
     },
     output
   });
+  const RENDER_THROTTLE_MS = 33;
   let renderScheduled = false;
   let renderTimer = null;
+  let sessionEnded = false;
   const flushPendingRender = () => {
     if (renderTimer !== null) {
       clearTimeout(renderTimer);
@@ -4670,11 +5013,26 @@ async function startTuiWorkspace(options) {
       renderScheduled = false;
       renderTimer = null;
       paintSyncedFrame();
-    }, 0);
+    }, RENDER_THROTTLE_MS);
   };
+  const refreshGitStatus = () => {
+    if ((options.env?.NOLO_CLI_GIT_STATUS ?? process.env.NOLO_CLI_GIT_STATUS) === "0") return;
+    void detectGitStatusAsync(state.cwd).then((gitStatus) => {
+      if (sessionEnded) return;
+      state = { ...state, gitStatus };
+      scheduleRender();
+    });
+  };
+  let syncingLayout = false;
   const renderHistoryToOutput = () => {
     if (fixedInput.isPaused()) return;
-    renderHistory(output, history, fixedInput.getInputLines());
+    if (syncingLayout) return;
+    syncingLayout = true;
+    try {
+      renderHistory(output, history, fixedInput.getInputLines());
+    } finally {
+      syncingLayout = false;
+    }
   };
   const readLatestAssistantReply = () => {
     const lastReply = [...history.turns].reverse().find((turn) => turn.role === "assistant")?.content;
@@ -4712,7 +5070,11 @@ ${t("copyViewHint")}
     return true;
   };
   let modalOwnsKeyboard = false;
+  let rawActionGateTokenHandler = null;
   const runOneAgentTurn = async (message, imageUrls, actionGateHandler, confirmDestructiveAction) => {
+    forcedStop = false;
+    turnEpoch += 1;
+    const myEpoch = turnEpoch;
     history.followBottom = true;
     startTurn(history, "user");
     appendToCurrentTurn(history, message);
@@ -4742,6 +5104,7 @@ ${t("copyViewHint")}
     } : void 0;
     try {
       activeTurnAbort = new AbortController();
+      activeTurnEpoch = myEpoch;
       const runResult = await runAgentChat(
         options.scriptDir,
         state,
@@ -4755,10 +5118,27 @@ ${t("copyViewHint")}
           ...confirmDestructiveAction ? { confirmDestructiveAction } : {},
           ...requestUserChoice ? { requestUserChoice } : {},
           abortSignal: activeTurnAbort.signal,
+          pastedTextStore: pasteStore,
           explicitAgentSwitch,
           activityReporter
         }
       );
+      const wasForceStopped = forcedStopEpoch === myEpoch;
+      if (wasForceStopped) {
+        if (runResult.dialogId || runResult.turnTokens) {
+          const nextDialogKey = runResult.dialogId ? runResult.dialogId === state.dialogId && state.dialogKey ? state.dialogKey : state.dialogOwnerId ? `dialog-${state.dialogOwnerId}-${runResult.dialogId}` : void 0 : state.dialogKey;
+          state = {
+            ...state,
+            ...runResult.dialogId ? {
+              dialogId: runResult.dialogId,
+              dialogKey: nextDialogKey,
+              dialogLabel: runResult.dialogId
+            } : {},
+            ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {}
+          };
+        }
+        return { ok: false, aborted: true };
+      }
       const wasAborted = activeTurnAbort.signal.aborted;
       activeTurnAbort = null;
       explicitAgentSwitch = false;
@@ -4769,9 +5149,13 @@ ${t("copyViewHint")}
         if (fixedInput.active) fixedInput.repaint(buffer);
       }
       if (wasAborted) {
-        emitCommandOutput(t("turnStopped"));
+        if (runResult.pendingToolName) {
+          emitCommandOutput(t("turnStoppedToolPending", runResult.pendingToolName));
+        } else {
+          emitCommandOutput(t("turnStopped"));
+        }
       }
-      if (runResult.dialogId || runResult.turnTokens) {
+      if (runResult.dialogId || runResult.turnTokens || runResult.contextWindow) {
         const nextDialogKey = runResult.dialogId ? runResult.dialogId === state.dialogId && state.dialogKey ? state.dialogKey : state.dialogOwnerId ? `dialog-${state.dialogOwnerId}-${runResult.dialogId}` : void 0 : state.dialogKey;
         state = {
           ...state,
@@ -4780,7 +5164,8 @@ ${t("copyViewHint")}
             dialogKey: nextDialogKey,
             dialogLabel: runResult.dialogId
           } : {},
-          ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {}
+          ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {},
+          ...runResult.contextWindow ? { contextWindow: runResult.contextWindow } : {}
         };
       }
       if (!wasAborted && runResult.exitCode !== 0) {
@@ -4847,6 +5232,7 @@ ${t("copyViewHint")}
     }
     if (result.action?.type === "exit") return true;
     if (result.action?.type === "clear") {
+      clearCollapsedPasteStore(pasteStore);
       history.turns.length = 0;
       history.currentRole = null;
       history.currentContent = "";
@@ -4917,7 +5303,19 @@ ${t("copyViewHint")}
             ...state,
             agentName: pickResult.name,
             agentKey: pickResult.key,
-            contextWindow: getModelContextWindow(pickResult.name)
+            contextWindow: resolveAgentContextWindow({
+              agentKey: pickResult.key,
+              agentName: pickResult.name,
+              model: pickResult.model,
+              autoRouteDefault: (options.env ?? process.env).NOLO_AUTO_ROUTE !== "0"
+            }),
+            estimatedContextTokens: estimateDefaultCliContextTokens({
+              cwd: state.cwd,
+              agentKey: pickResult.key,
+              agentName: pickResult.name,
+              model: pickResult.model
+            }),
+            ...pickResult.apiSource ? { apiSource: pickResult.apiSource } : {}
           };
           if (state.dialogId) autoRouteByDialog.delete(state.dialogId);
           explicitAgentSwitch = true;
@@ -4949,6 +5347,16 @@ ${t("copyViewHint")}
     if (result.action?.type === "set-mouse") {
       fixedInput.setMouseEnabled(result.action.enabled);
     }
+    if (result.action?.type === "set-altscreen") {
+      if (result.action.enabled) {
+        enterAltScreen(output);
+        installAltScreenRestoreHandlers(output);
+      } else {
+        leaveAltScreen(output);
+      }
+      renderHistoryToOutput();
+      fixedInput.repaint(buffer);
+    }
     if (result.action?.type === "copy-view") {
       const opened = await openCopyView();
       if (!opened) emitCommandOutput(t("copyNothing"));
@@ -4992,14 +5400,7 @@ ${t("copyViewHint")}
             dialog: pickResult.dialog,
             env: options.env ?? process.env
           });
-          const restored = loadedTurns.slice(-MAX_TUI_HISTORY_TURNS).map(
-            (turn) => turn.role === "assistant" ? {
-              ...turn,
-              content: formatAssistantDisplay(
-                turn.content
-              )
-            } : turn
-          );
+          const restored = loadedTurns.slice(-MAX_TUI_HISTORY_TURNS);
           history.turns.length = 0;
           history.turns.push(...restored);
           history.currentRole = null;
@@ -5013,6 +5414,7 @@ ${t("copyViewHint")}
             dialogLabel: pickResult.dialog.id,
             turnTokens: void 0
           };
+          clearCollapsedPasteStore(pasteStore);
           emitCommandOutput(
             `${t("resumedDialogPrefix")}: ${pickResult.dialog.title} (${pickResult.dialog.id})`
           );
@@ -5136,6 +5538,7 @@ ${err.message}` : ""}`
     output.write("\x1B[?2004h");
     let busy = false;
     let done = false;
+    let resolveDone = null;
     let cursorPos2 = 0;
     fixedInput = createFixedInput(output, {
       getStatusLine: () => {
@@ -5172,6 +5575,9 @@ ${err.message}` : ""}`
           const oneLine = text.replace(/\r?\n/g, " \u23CE ");
           return dimCliText(`  \u2937 ${i + 1}. ${oneLine}`, colorEnabled);
         });
+      },
+      onInputLinesChange: () => {
+        renderHistoryToOutput();
       }
     });
     fixedInput.init();
@@ -5194,6 +5600,9 @@ ${err.message}` : ""}`
     const finish = () => {
       if (done) return;
       done = true;
+      sessionEnded = true;
+      resolveDone?.();
+      clearCollapsedPasteStore(pasteStore);
       resizeTarget.off?.("resize", onResize);
       input.off("data", onData);
       onData.destroy();
@@ -5211,7 +5620,10 @@ ${err.message}` : ""}`
         }
         return;
       }
-      if (modalOwnsKeyboard) return;
+      if (modalOwnsKeyboard) {
+        rawActionGateTokenHandler?.(sequence);
+        return;
+      }
       const busyLock = busy;
       const scrollAction = parseScrollAction(sequence);
       if (scrollAction) {
@@ -5221,19 +5633,33 @@ ${err.message}` : ""}`
         return;
       }
       if (busyLock && sequence === "\x1B" && activeTurnAbort) {
+        if (activityIndicator.isStopping()) {
+          forcedStop = true;
+          forcedStopEpoch = activeTurnEpoch;
+          activityIndicator.stop();
+          activeTurnAbort.abort();
+          activeTurnAbort = null;
+          activeTurnEpoch = 0;
+          busy = false;
+          emitCommandOutput(t("forceStopped"));
+          flushPendingRender();
+          renderHistoryToOutput();
+          if (fixedInput.active) fixedInput.repaint(buffer);
+          return;
+        }
         const stopBinding = chatQueueBinding;
         if (stopBinding && stopBinding.queueLength() > 0) {
           stopBinding.preemptForStop();
         }
+        activityIndicator.markStopping();
         activeTurnAbort.abort();
         return;
       }
-      const result = applyTuiInputKey(buffer, sequence, {}, cursorPos2);
+      const result = applyTuiInputKey(buffer, sequence, {}, cursorPos2, {
+        pasteStore
+      });
       if (result.copyView) {
-        if (busyLock) return;
-        busy = true;
         const opened = await openCopyView();
-        busy = false;
         if (!opened) {
           history.followBottom = true;
           startTurn(history, "assistant");
@@ -5249,14 +5675,19 @@ ${err.message}` : ""}`
         return;
       }
       if (result.submit !== void 0) {
+        const submittedText = replaceCollapsedPastesWithReferences(
+          result.submit,
+          pasteStore
+        );
+        const submittedTrimmed = submittedText.trim();
+        const startsChatTurn = submittedTrimmed.length > 0 && !submittedTrimmed.startsWith("/") && !submittedTrimmed.startsWith("!");
         if (busyLock) {
-          const submittedText2 = result.submit;
-          const trimmedText = submittedText2.trim();
+          const trimmedText = submittedText.trim();
           const busySlashCommand = trimmedText.split(/\s+/)[0]?.toLowerCase();
           const isBusyLocalSlash = busySlashCommand === "/context" || busySlashCommand === "/ctx" || busySlashCommand === "/switch";
           if (isBusyLocalSlash) {
             const beforeAgentKey = state.agentKey;
-            const res = handleTuiInput(submittedText2, state);
+            const res = handleTuiInput(submittedText, state);
             if (res.action) {
               output.write(
                 "Model picker isn't available while a reply is running. Use `/switch <name>` to switch now (takes effect on the next turn), or wait for the reply to finish.\n"
@@ -5274,6 +5705,7 @@ ${hint}` : hint;
 `);
               }
             }
+            releaseCollapsedPasteReferences(submittedText, pasteStore);
             buffer = "";
             cursorPos2 = 0;
             if (fixedInput.active) fixedInput.repaint(buffer, cursorPos2);
@@ -5285,7 +5717,10 @@ ${hint}` : hint;
               try {
                 return await waitForRawActionGate(input, output, gate, spawnRunner, {
                   beforeSubprocess: () => fixedInput.pause(),
-                  afterSubprocess: () => fixedInput.resumeFromSubprocess()
+                  afterSubprocess: () => fixedInput.resumeFromSubprocess(),
+                  registerToken: (handler) => {
+                    rawActionGateTokenHandler = handler;
+                  }
                 });
               } finally {
                 modalOwnsKeyboard = false;
@@ -5308,7 +5743,7 @@ ${hint}` : hint;
             }
           );
           const decision = binding.resolveSubmit({
-            text: submittedText2,
+            text: submittedText,
             isRunning: true
           });
           if (decision.kind === "queue-text") {
@@ -5317,7 +5752,7 @@ ${hint}` : hint;
             cursorPos2 = 0;
             fixedInput.repaint(buffer, cursorPos2);
           } else if (decision.kind === "queue-blocked") {
-          } else if (decision.kind === "noop" && !submittedText2.trim() && binding.queueLength() > 0) {
+          } else if (decision.kind === "noop" && !submittedText.trim() && binding.queueLength() > 0) {
             if (binding.preemptForDrain()) {
               if (activeTurnAbort) {
                 activeTurnAbort.abort();
@@ -5326,13 +5761,16 @@ ${hint}` : hint;
           }
           return;
         }
-        if (!result.submit.trim() && chatQueueBinding && chatQueueBinding.queueLength() > 0) {
+        if (!submittedText.trim() && chatQueueBinding && chatQueueBinding.queueLength() > 0) {
           const actionGateHandler = async (gate) => {
             modalOwnsKeyboard = true;
             try {
               return await waitForRawActionGate(input, output, gate, spawnRunner, {
                 beforeSubprocess: () => fixedInput.pause(),
-                afterSubprocess: () => fixedInput.resumeFromSubprocess()
+                afterSubprocess: () => fixedInput.resumeFromSubprocess(),
+                registerToken: (handler) => {
+                  rawActionGateTokenHandler = handler;
+                }
               });
             } finally {
               modalOwnsKeyboard = false;
@@ -5377,17 +5815,13 @@ ${err.message}` : ""}`
             } finally {
               busy = false;
             }
-            const drainEnv = options.env ?? process.env;
-            if (drainEnv.NOLO_CLI_GIT_STATUS !== "0") {
-              state = { ...state, gitStatus: detectGitStatus(state.cwd) };
-            }
+            refreshGitStatus();
             flushPendingRender();
             fixedInput.exitOutputMode(buffer, cursorPos2);
             return;
           }
         }
-        busy = true;
-        const submittedText = result.submit;
+        busy = startsChatTurn;
         buffer = "";
         cursorPos2 = 0;
         fixedInput.enterOutputMode(submittedText);
@@ -5400,7 +5834,10 @@ ${err.message}` : ""}`
               try {
                 return await waitForRawActionGate(input, output, gate, spawnRunner, {
                   beforeSubprocess: () => fixedInput.pause(),
-                  afterSubprocess: () => fixedInput.resumeFromSubprocess()
+                  afterSubprocess: () => fixedInput.resumeFromSubprocess(),
+                  registerToken: (handler) => {
+                    rawActionGateTokenHandler = handler;
+                  }
                 });
               } finally {
                 modalOwnsKeyboard = false;
@@ -5430,10 +5867,7 @@ ${err.message}` : ""}`
           finish();
           return;
         }
-        const refreshEnv = options.env ?? process.env;
-        if (refreshEnv.NOLO_CLI_GIT_STATUS !== "0") {
-          state = { ...state, gitStatus: detectGitStatus(state.cwd) };
-        }
+        refreshGitStatus();
         flushPendingRender();
         fixedInput.exitOutputMode(buffer, cursorPos2);
         return;
@@ -5448,13 +5882,10 @@ ${err.message}` : ""}`
     try {
       input.on("data", onData);
       fixedInput.repaint(buffer, cursorPos2);
+      refreshGitStatus();
       await new Promise((resolve2) => {
-        const check = setInterval(() => {
-          if (done) {
-            clearInterval(check);
-            resolve2();
-          }
-        }, 10);
+        resolveDone = resolve2;
+        if (done) resolve2();
       });
     } finally {
       finish();
@@ -5509,9 +5940,13 @@ export {
   createNoopFixedInput,
   createRawInputDecoder,
   createTurnHistory,
-  displayWidth2 as displayWidth,
+  displayWidth,
+  enterAltScreen,
   finalizeCurrentTurn,
   fitAnsiLine,
+  installAltScreenRestoreHandlers,
+  isAltScreenOn,
+  leaveAltScreen,
   padOrTruncateToWidth,
   parseScrollAction,
   renderHistory,