@qwen-code/qwen-code 0.23.1-preview.1 → 0.23.1

package/chunks/{start-opentui-ui-BFYCJQRZ.js → start-opentui-ui-WLV43247.js}

@@ -5,7 +5,7 @@ import {
   DualOutputBridge,
   EDITOR_DISPLAY_NAMES,
   RemoteInputWatcher,
-  STATUS_LINE_PRESET_ITEMS,
+  addShellCommandToLlmHistory,
   computeWindowTitle,
   editorSettingsManager,
   fmtTokens,
@@ -15,26 +15,29 @@ import {
   getToolInvalidReasons,
   isToolValid,
   normalizeModelIds,
+  useFollowupSuggestionsCLI,
   useLogger,
   useProviderSetupFlow,
   writeTerminalTitle
-} from "./chunk-GVVCLL2P.js";
-import "./chunk-RVNS7NWN.js";
-import "./chunk-LK7S2D6V.js";
+} from "./chunk-LNCNUMJ5.js";
+import "./chunk-CALNF3Z3.js";
+import "./chunk-3VWPPK5Q.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-G34YLYCS.js";
+} from "./chunk-L7V52QEZ.js";
 import {
+  STATUS_LINE_PRESET_ITEMS,
   SessionStatsProvider,
   TOOL_DISPLAY_BY_NAME,
   TOOL_SUCCESS_RATE_HIGH,
   TOOL_SUCCESS_RATE_MEDIUM,
   flattenModelsBySource,
+  formatTokenCount,
   getArenaStatusLabel,
   getStatusColor,
   keyMatchers,
   useSessionStats
-} from "./chunk-IQN2CCIE.js";
+} from "./chunk-RNYENHN5.js";
 import {
   ICON,
   applyCollapsePolicyAndSummary,
@@ -43,7 +46,7 @@ import {
   isFindingsListDisplay,
   shouldDisplayGoalStateCause,
   waitForGoalRuntime
-} from "./chunk-JBTZUFR4.js";
+} from "./chunk-E7XSUYCZ.js";
 import {
   stopAndGetCapturedInput
 } from "./chunk-EWNKP4V4.js";
@@ -54,7 +57,7 @@ import {
   MAX_SUGGESTIONS_TO_SHOW,
   handleAtCommand,
   sanitizeDisplayText
-} from "./chunk-HJ34U5J4.js";
+} from "./chunk-ENZDGHGJ.js";
 import {
   BuiltinCommandLoader,
   BundledSkillLoader,
@@ -86,18 +89,18 @@ import {
   refreshExtensionContentRuntime,
   resetBackgroundStateForSessionSwitch,
   serializeUserPromptExpansionPrompt
-} from "./chunk-WR3SH3EY.js";
+} from "./chunk-ZNO5BUAD.js";
 import {
   EXTENSION_RELOAD_FAILED_REASON,
   ExtensionRefreshState
-} from "./chunk-ZAZ3NFL6.js";
+} from "./chunk-DXQ6Z7AH.js";
 import {
   formatSupportedModes,
   getCommandDisplayName,
   getCommandSourceBadge,
   getCommandSourceGroup,
   getCommandSubcommandNames
-} from "./chunk-XHGGYCTA.js";
+} from "./chunk-O2JBJQCF.js";
 import {
   calculateCost,
   computeSessionStats,
@@ -105,7 +108,7 @@ import {
   getSystemInfoFields,
   levelLabel,
   redactProxy
-} from "./chunk-2RYWGYB3.js";
+} from "./chunk-MFYH2VXV.js";
 import {
   formatDuration
 } from "./chunk-3SH53ANB.js";
@@ -115,8 +118,8 @@ import {
   cleanupOldClipboardImages,
   clipboardHasImage,
   saveClipboardImage
-} from "./chunk-HY3DXYZK.js";
-import "./chunk-JOPC3FND.js";
+} from "./chunk-UYDQYDW2.js";
+import "./chunk-HUX2DOTF.js";
 import "./chunk-4WGODMVR.js";
 import "./chunk-4LIPOIXS.js";
 import {
@@ -133,25 +136,25 @@ import {
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
-import "./chunk-SFMCYMVF.js";
+import "./chunk-D6AQNMUA.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-54TF2ZIQ.js";
-import "./chunk-4VZCORNT.js";
-import "./chunk-N7EYO2E7.js";
+} from "./chunk-6JXHO7LG.js";
+import "./chunk-RXT4QBDX.js";
+import "./chunk-XQ4RDO5B.js";
 import {
   setUpdateHandler
-} from "./chunk-JLWFGYXU.js";
+} from "./chunk-T2IHCZLS.js";
 import "./chunk-EKTCKZV5.js";
-import "./chunk-43JNQAHO.js";
+import "./chunk-YCEKI7QX.js";
 import "./chunk-YAF2MQZ6.js";
 import "./chunk-24FVUD5P.js";
-import "./chunk-IKLFS6SC.js";
+import "./chunk-3YQMUBTS.js";
 import "./chunk-6H67XLET.js";
-import "./chunk-KK2GZGBK.js";
+import "./chunk-TWWS7XUW.js";
 import "./chunk-M3JGHRMQ.js";
 import "./chunk-VFFQAOPR.js";
-import "./chunk-ZTAVGFKA.js";
+import "./chunk-ERXNTINK.js";
 import {
   cpLen,
   escapeAnsiCtrlCodes,
@@ -174,48 +177,51 @@ import {
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-XOVVCGZX.js";
+} from "./chunk-NB3NDQQK.js";
 import "./chunk-Y53DG2HA.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-P6LATTDG.js";
-import "./chunk-YCDL2SAS.js";
+} from "./chunk-5IL2BZHW.js";
+import "./chunk-6QILGINT.js";
 import "./chunk-7U5G6JXI.js";
 import "./chunk-WCCLLK7X.js";
-import "./chunk-O2GG7H4C.js";
+import {
+  getReasoningEffortsForConfig
+} from "./chunk-JGDRB4FP.js";
+import "./chunk-ARYNBBBM.js";
 import "./chunk-HWVUSYSN.js";
-import "./chunk-537SQ2AI.js";
-import "./chunk-IXSGOSEG.js";
-import "./chunk-AHBLRVD5.js";
+import "./chunk-5WC2ECUK.js";
+import "./chunk-DZ6D4B3K.js";
+import "./chunk-EEKU6COG.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-TMWB67LS.js";
-import "./chunk-4IQKBLTQ.js";
-import "./chunk-WXC6OAWD.js";
+import "./chunk-UXDVUFKU.js";
+import "./chunk-UHUT4IDM.js";
+import "./chunk-3BTHHXXE.js";
 import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-4F2QRVW6.js";
-import "./chunk-P4RUUG64.js";
+} from "./chunk-FW4E4QPG.js";
+import "./chunk-45ROPFQY.js";
 import "./chunk-2AUM35J5.js";
 import "./chunk-N6VQ37ZZ.js";
-import "./chunk-WEXA2DNG.js";
+import "./chunk-PSPAM24S.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-STUJ7IMZ.js";
-import "./chunk-4JAGXZR3.js";
+import "./chunk-GM44O6F7.js";
 import "./chunk-GYTKQYDB.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-RKFGE7JH.js";
 import "./chunk-UDG5EZJI.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-3VUENPWF.js";
-import "./chunk-VDXYYVCD.js";
+import "./chunk-XVTCSVBK.js";
 import "./chunk-IW6RQPQB.js";
 import "./chunk-5HBA2Z7V.js";
 import "./chunk-X35VIWWJ.js";
 import {
   loadMcpApprovals
-} from "./chunk-DNPHKA72.js";
+} from "./chunk-TGC4264Q.js";
 import {
   getDefaultValue,
   getDialogSettingKeys,
@@ -231,26 +237,26 @@ import {
   saveModifiedSettings,
   setPendingSettingValueAny,
   validateSettingValue
-} from "./chunk-AQ5NAGWI.js";
+} from "./chunk-66JBCTJF.js";
 import {
   TOGGLE_TYPES
-} from "./chunk-ER273QE6.js";
+} from "./chunk-2ZFO5JD7.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-BW4333PP.js";
 import "./chunk-IDS7MSUP.js";
 import {
   t
-} from "./chunk-MUZCSTOO.js";
+} from "./chunk-CRZBDVP2.js";
 import "./chunk-5EJZE3FP.js";
-import "./chunk-H3UDNQLO.js";
-import "./chunk-NUQFUXOG.js";
+import "./chunk-5CVY5Q2P.js";
+import "./chunk-QTNCGZHQ.js";
 import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
 import {
   getCliVersion
-} from "./chunk-XUSOYE2I.js";
+} from "./chunk-27LTEY6D.js";
 import "./chunk-W3N5XAZ6.js";
-import "./chunk-XY3USGFE.js";
+import "./chunk-3VDLQUR2.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import {
@@ -265,26 +271,27 @@ import {
   findExistingProviderModels,
   findProviderByCredentials,
   findProviderById,
+  generatePromptSuggestion,
   getDefaultModelIds,
   resolveMetadataKey
-} from "./chunk-UEZOXZNI.js";
+} from "./chunk-ZU2T5JIS.js";
 import "./chunk-GELRJXE2.js";
 import "./chunk-32CM56LO.js";
-import "./chunk-JPEAQJNS.js";
+import "./chunk-WJDXKQIO.js";
 import "./chunk-XFSFZCM5.js";
-import "./chunk-WTW36TJ3.js";
+import "./chunk-2EKVPSIJ.js";
 import "./chunk-LJZSMWOH.js";
-import "./chunk-VUSSAGKI.js";
-import "./chunk-O45WBTNS.js";
+import "./chunk-YZTGGCEE.js";
+import "./chunk-6SADVYQQ.js";
 import "./chunk-DJXSOEFB.js";
-import "./chunk-2WGJG2KW.js";
-import "./chunk-QMFOYPGV.js";
-import "./chunk-LDS57224.js";
+import "./chunk-25CBAK3H.js";
+import "./chunk-J3VZF2AL.js";
+import "./chunk-OWCFKIFQ.js";
 import "./chunk-ZPJWUGCS.js";
-import "./chunk-HFTB354P.js";
+import "./chunk-5Z4FCEPY.js";
 import "./chunk-BUQN5LTI.js";
-import "./chunk-VU7O7CGQ.js";
-import "./chunk-QSC5YOEC.js";
+import "./chunk-XDNFODER.js";
+import "./chunk-YAC7H4K3.js";
 import "./chunk-VNOVK4I7.js";
 import {
   CoreToolScheduler,
@@ -294,6 +301,7 @@ import {
   OAUTH_AUTH_URL_EVENT,
   OAUTH_DISPLAY_MESSAGE_EVENT,
   SessionService,
+  ShellExecutionService,
   allowEditorTypeInSandbox,
   checkForExtensionUpdate,
   checkHasEditorType,
@@ -306,6 +314,7 @@ import {
   isGatedMcpScope,
   isImageGenerationCapable,
   isSettledStatus,
+  isSignalTermination,
   isSuccessStatus,
   matchesAnyServerPattern,
   mcpServerRequiresOAuth,
@@ -313,18 +322,18 @@ import {
   parseRule,
   parseVisionModelSetting,
   refreshMemoryInstruction
-} from "./chunk-I72PHOKL.js";
+} from "./chunk-PDUMGZ2P.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-3K65MUKD.js";
+import "./chunk-65I7S4Z3.js";
 import "./chunk-6HUXPLB5.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
 import "./chunk-YHDGABDC.js";
-import "./chunk-RDKXZ2LS.js";
+import "./chunk-LYT2OU7D.js";
 import "./chunk-B54PFQS5.js";
 import {
   writeRuntimeStatus
-} from "./chunk-43NOB5NM.js";
+} from "./chunk-HIXUUCGY.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
@@ -335,14 +344,14 @@ import "./chunk-QHWCP53L.js";
 import "./chunk-F53KKZUD.js";
 import {
   resolveBundleDir
-} from "./chunk-PZV2FASB.js";
+} from "./chunk-TRWQQBVH.js";
 import "./chunk-QJNDUTOL.js";
-import "./chunk-OECNP26L.js";
+import "./chunk-N6S3NUYJ.js";
 import "./chunk-O6GEWCJA.js";
 import {
   formatMemoryUsage
 } from "./chunk-CHEIIBT3.js";
-import "./chunk-UKKYOIVT.js";
+import "./chunk-QAZ2MGYT.js";
 import {
   registerSession
 } from "./chunk-B44JBZBB.js";
@@ -350,34 +359,34 @@ import "./chunk-BF3RUIVP.js";
 import {
   APPROVAL_MODES
 } from "./chunk-JX6XHPTX.js";
-import "./chunk-R355CUNQ.js";
-import "./chunk-4VUVBN3Y.js";
+import "./chunk-CLKE4IY3.js";
 import "./chunk-ZSTCM3MX.js";
-import "./chunk-NXWYCSPL.js";
+import "./chunk-SOA4HKRJ.js";
 import "./chunk-MLXTMF7H.js";
-import "./chunk-GXZHYPHZ.js";
+import "./chunk-3LPJ776W.js";
 import "./chunk-3CZ2BQV6.js";
 import "./chunk-PQEISIKS.js";
-import "./chunk-3K456UJF.js";
-import "./chunk-VEFRT7NX.js";
+import "./chunk-VF6D6EGV.js";
+import "./chunk-H3Q3RSKZ.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-UKADFFL2.js";
-import "./chunk-EJNYBDYC.js";
+import "./chunk-OFVAS4AR.js";
+import "./chunk-HNLMYDQE.js";
 import "./chunk-QHMLYMMS.js";
 import "./chunk-CFKIH3D3.js";
 import {
   REASONING_EFFORT_TIERS,
   applyReasoningEffort
-} from "./chunk-2LD5U7Q3.js";
+} from "./chunk-6YEOCHSE.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-W4LL5RZO.js";
-import "./chunk-3UMWOKJC.js";
+import "./chunk-4ALNJDHL.js";
+import "./chunk-NOO4QFXM.js";
 import "./chunk-KFFCDLKV.js";
 import "./chunk-7OCIQNKX.js";
 import {
   AuthEvent,
   ModelSlashCommandEvent,
+  PromptSuggestionEvent,
   collectText,
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
@@ -387,6 +396,7 @@ import {
   isImageCapable,
   logAuth,
   logModelSlashCommand,
+  logPromptSuggestion,
   logSlashCommand,
   makeSlashCommandEvent,
   normalizeParts,
@@ -396,7 +406,7 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-P5LDR7FI.js";
+} from "./chunk-6QV7Z74P.js";
 import "./chunk-5ETULJLP.js";
 import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
@@ -410,25 +420,26 @@ import "./chunk-HD7O6WLV.js";
 import "./chunk-WZAD4ZNJ.js";
 import "./chunk-FPGTNKCP.js";
 import "./chunk-TIGXX4PA.js";
-import "./chunk-5MTARK4Y.js";
+import "./chunk-N7YQEKGX.js";
 import "./chunk-XFFRI3WM.js";
 import "./chunk-4HOEU2OR.js";
 import "./chunk-HHJLM3WQ.js";
 import {
+  isBinary,
   redactUrlCredentials
 } from "./chunk-7VEYUF3N.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-GMNLYQOS.js";
-import "./chunk-D6PIMKY3.js";
-import "./chunk-NGX4NUNP.js";
-import "./chunk-FKJM6JKY.js";
+import "./chunk-E6TI726I.js";
+import "./chunk-4VY3ITHR.js";
+import "./chunk-O2FEO2CB.js";
+import "./chunk-G6UUOCUT.js";
 import {
   isPathWithinRoot
 } from "./chunk-IZ2U57NY.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-RPBMP6BN.js";
+} from "./chunk-MWIO7MF6.js";
 import {
   Storage,
   createDebugLogger,
@@ -436,12 +447,12 @@ import {
   getErrorMessage,
   isDebugLogFileEnabled
 } from "./chunk-ZAFYHRVY.js";
-import "./chunk-TDP7UULF.js";
+import "./chunk-OPMKGOLD.js";
 import "./chunk-HRPFBHW7.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-BKNY7PDI.js";
+} from "./chunk-USN6VNTO.js";
 import {
   profileCheckpoint
 } from "./chunk-QILD6R27.js";
@@ -453,7 +464,10 @@ import {
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
+import "./chunk-EFT7OMDN.js";
 import "./chunk-MATEIJZF.js";
+import "./chunk-J5TTWBZK.js";
+import "./chunk-RVIGZBIT.js";
 import "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims
@@ -490,7 +504,7 @@ var require_jsx_dev_runtime = __commonJS({
 
 // packages/cli/src/ui/opentui/start-opentui-ui.tsx
 init_esbuild_shims();
-var import_react52 = __toESM(require_react(), 1);
+var import_react55 = __toESM(require_react(), 1);
 import { stat as stat2 } from "node:fs/promises";
 import { basename as basename3 } from "node:path";
 
@@ -539,9 +553,9 @@ function requiredOpenTuiAssetKeys(platform = process.platform, arch = process.ar
   ];
 }
 __name(requiredOpenTuiAssetKeys, "requiredOpenTuiAssetKeys");
-function isFile(path6) {
+function isFile(path7) {
   try {
-    return statSync(path6).isFile();
+    return statSync(path7).isFile();
   } catch {
     return false;
   }
@@ -926,11 +940,11 @@ function toBunPointer(pointer) {
 __name(toBunPointer, "toBunPointer");
 function createBunBackend(bun2) {
   return {
-    dlopen(path6, symbols) {
-      if (path6 === null) {
+    dlopen(path7, symbols) {
+      if (path7 === null) {
         throw new Error(BUN_DLOPEN_NULL);
       }
-      const library = bun2.dlopen(path6, normalizeBunDefinitions(symbols));
+      const library = bun2.dlopen(path7, normalizeBunDefinitions(symbols));
       const callbacks = /* @__PURE__ */ new Set();
       let closed = false;
       return {
@@ -967,8 +981,8 @@ function createBunBackend(bun2) {
 __name(createBunBackend, "createBunBackend");
 function createNodeBackend(nodeFfi) {
   return {
-    dlopen(path6, symbols) {
-      const { lib: lib2, functions } = nodeFfi.dlopen(toNodeLibraryPath(path6), normalizeNodeDefinitions(symbols));
+    dlopen(path7, symbols) {
+      const { lib: lib2, functions } = nodeFfi.dlopen(toNodeLibraryPath(path7), normalizeNodeDefinitions(symbols));
       const callbacks = /* @__PURE__ */ new Set();
       let closed = false;
       let libraryClosed = false;
@@ -1019,8 +1033,8 @@ function createNodeBackend(nodeFfi) {
   };
 }
 __name(createNodeBackend, "createNodeBackend");
-function toNodeLibraryPath(path6) {
-  return path6 instanceof URL ? fileURLToPath(path6) : path6;
+function toNodeLibraryPath(path7) {
+  return path7 instanceof URL ? fileURLToPath(path7) : path7;
 }
 __name(toNodeLibraryPath, "toNodeLibraryPath");
 function normalizeNodeDefinitions(definitions) {
@@ -8340,8 +8354,8 @@ function resolveParserAsset(relativePath) {
   return resolveDefaultParserAsset(relativePath, new URL(`./${relativePath}`, import.meta.url));
 }
 __name(resolveParserAsset, "resolveParserAsset");
-function isBunfsPath(path6) {
-  return path6.includes("$bunfs") || /^B:[\\/]~BUN/i.test(path6);
+function isBunfsPath(path7) {
+  return path7.includes("$bunfs") || /^B:[\\/]~BUN/i.test(path7);
 }
 __name(isBunfsPath, "isBunfsPath");
 function getBunfsRootPath() {
@@ -8626,7 +8640,7 @@ registerEnvVar({
   default: ""
 });
 var DEFAULT_PARSER_OVERRIDES = [];
-var isUrl = /* @__PURE__ */ __name((path6) => path6.startsWith("http://") || path6.startsWith("https://"), "isUrl");
+var isUrl = /* @__PURE__ */ __name((path7) => path7.startsWith("http://") || path7.startsWith("https://"), "isUrl");
 var TreeSitterClient = class extends EventEmitter2 {
   static {
     __name(this, "TreeSitterClient");
@@ -8857,17 +8871,17 @@ var TreeSitterClient = class extends EventEmitter2 {
       worker.postMessage({ type: "ADD_FILETYPE_PARSER", filetypeParser: this.resolveFiletypeParser(parser) });
     }
   }
-  resolvePath(path6) {
-    if (isUrl(path6)) {
-      return path6;
+  resolvePath(path7) {
+    if (isUrl(path7)) {
+      return path7;
     }
-    if (isBunfsPath(path6)) {
-      return normalizeBunfsPath(parse(path6).base);
+    if (isBunfsPath(path7)) {
+      return normalizeBunfsPath(parse(path7).base);
     }
-    if (!isAbsolute3(path6)) {
-      return resolve2(path6);
+    if (!isAbsolute3(path7)) {
+      return resolve2(path7);
     }
-    return path6;
+    return path7;
   }
   addFiletypeParser(filetypeParser) {
     this.sendWorkerMessage({ type: "ADD_FILETYPE_PARSER", filetypeParser: this.resolveFiletypeParser(filetypeParser) });
@@ -8878,8 +8892,8 @@ var TreeSitterClient = class extends EventEmitter2 {
       aliases: filetypeParser.aliases ? [...new Set(filetypeParser.aliases.filter((alias) => alias !== filetypeParser.filetype))] : void 0,
       wasm: this.resolvePath(filetypeParser.wasm),
       queries: {
-        highlights: filetypeParser.queries.highlights.map((path6) => this.resolvePath(path6)),
-        injections: filetypeParser.queries.injections?.map((path6) => this.resolvePath(path6))
+        highlights: filetypeParser.queries.highlights.map((path7) => this.resolvePath(path7)),
+        injections: filetypeParser.queries.injections?.map((path7) => this.resolvePath(path7))
       }
     };
   }
@@ -31202,11 +31216,11 @@ async function readResponseBytes(response, signal) {
   return data.byteLength === total ? data : data.slice(0, total);
 }
 __name(readResponseBytes, "readResponseBytes");
-async function readFileBytes(path6, signal) {
+async function readFileBytes(path7, signal) {
   signal?.throwIfAborted();
-  if ((await stat(path6)).size > MAX_ENCODED_BYTES)
+  if ((await stat(path7)).size > MAX_ENCODED_BYTES)
     throw imageError(6);
-  const file = await open(path6, "r");
+  const file = await open(path7, "r");
   const chunks = [];
   let total = 0;
   try {
@@ -31298,10 +31312,10 @@ var NativeImage = class _NativeImage {
     }
     const url = source instanceof URL ? source : (/^(?:https?|file|blob|data):/i.test(source) || /^[a-z][a-z0-9+.-]*:\/\//i.test(source)) && !/^[a-z]:[\\/]/i.test(source) ? new URL(source) : null;
     if (!url || url.protocol === "file:") {
-      const path6 = url ?? source;
+      const path7 = url ?? source;
       let data;
       try {
-        data = await readFileBytes(path6, options.signal);
+        data = await readFileBytes(path7, options.signal);
       } catch (error) {
         if (options.signal?.aborted)
           throw options.signal.reason;
@@ -40990,9 +41004,27 @@ var PluginErrorBoundary = class extends import_react14.default.Component {
 };
 extend({ "time-to-first-draw": TimeToFirstDrawRenderable });
 
+// packages/cli/src/ui/opentui/use-update-notice-flush.ts
+init_esbuild_shims();
+var import_react17 = __toESM(require_react(), 1);
+function useUpdateNoticeFlush(addItem, setUpdateInfo, isIdleRef, streaming) {
+  const updateHandlerRef = (0, import_react17.useRef)(
+    null
+  );
+  (0, import_react17.useEffect)(() => {
+    const handler = setUpdateHandler(addItem, setUpdateInfo, isIdleRef);
+    updateHandlerRef.current = handler;
+    return handler.cleanup;
+  }, [addItem, setUpdateInfo, isIdleRef]);
+  (0, import_react17.useEffect)(() => {
+    if (!streaming) updateHandlerRef.current?.flush();
+  }, [streaming]);
+}
+__name(useUpdateNoticeFlush, "useUpdateNoticeFlush");
+
 // packages/cli/src/ui/opentui/opentui-app-shell.tsx
 init_esbuild_shims();
-var import_react49 = __toESM(require_react(), 1);
+var import_react50 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/opentui-host.ts
 init_esbuild_shims();
@@ -42232,6 +42264,22 @@ function projectItemToStreamEvent(item, ctx) {
         type: "warning",
         text: formatUserPromptSubmitBlocked(item.reason, item.originalPrompt)
       };
+    case "away_recap":
+      return { type: "away-recap", text: item.text };
+    case "user_shell":
+      return { type: "user-shell", text: item.text };
+    case "advisor":
+      return { type: "advisor", text: item.text, model: item.model };
+    case "arena_agent_complete":
+      return { type: "arena-agent", agent: item.agent };
+    case "arena_session_complete":
+      return {
+        type: "arena-session",
+        sessionStatus: item.sessionStatus,
+        task: item.task,
+        totalDurationMs: item.totalDurationMs,
+        agents: item.agents
+      };
     case "about":
     case "tools_list":
     case "model_stats":
@@ -42258,11 +42306,10 @@ function projectItemToStreamEvent(item, ctx) {
     //  - `help`: `/help` resolves to a dialog and the overlay renders from
     //    help-content.ts; no command returns a HELP message, so nothing writes
     //    this item in either renderer.
-    //  - the rest: ink renders these through dedicated components and this
-    //    renderer has no row shape for them yet. `/advisor`, `/arena` and
-    //    `/recap` are registered here and do write four of these kinds, so
-    //    their output stays invisible — a registered gap (U-34), not an
-    //    accident of the switch.
+    //  - the rest: ink renders these through dedicated components and no
+    //    OpenTUI writer produces them (tool_use_summary is written by ink's
+    //    use-llm-stream only; diff_stats comes from the file-history rewind
+    //    flow, which has no OpenTUI seam; notification has no writer yet).
     case "tool_group":
     case "retry_countdown":
     case "vision_notice":
@@ -42272,11 +42319,6 @@ function projectItemToStreamEvent(item, ctx) {
     case "gemini_thought_content":
     case "help":
     case "notification":
-    case "user_shell":
-    case "advisor":
-    case "arena_agent_complete":
-    case "arena_session_complete":
-    case "away_recap":
     case "tool_use_summary":
     case "diff_stats":
       return null;
@@ -42313,8 +42355,10 @@ function transcribeSession(jsonl, opts = {}) {
     }
     const parts = o.message?.parts ?? [];
     if (o.type === "user") {
-      if (o.subtype) continue;
-      const text = parts.filter((p2) => p2.text && !p2.thought).map((p2) => p2.text).join("\n");
+      if (o.subtype && o.subtype !== "mid_turn_user_message") continue;
+      const partsText = parts.filter((p2) => p2.text && !p2.thought).map((p2) => p2.text).join("\n");
+      const hasAttachmentReferences = Array.isArray(o.systemPayload?.attachmentReferences) && o.systemPayload.attachmentReferences.length > 0;
+      const text = o.systemPayload?.displayText || (hasAttachmentReferences ? "[User message with attachments]" : partsText);
       if (text) {
         events.push({ type: "user", text });
         prompts.push(text);
@@ -42883,6 +42927,620 @@ var OpenTuiAppHost = class {
   }
 };
 
+// packages/cli/src/ui/opentui/shell-mode.ts
+init_esbuild_shims();
+import crypto from "node:crypto";
+import fs2 from "node:fs";
+import os2 from "node:os";
+import path4 from "node:path";
+var OUTPUT_UPDATE_INTERVAL_MS = 1e3;
+async function executeUserShell(config, rawQuery, emit, signal, terminalSize) {
+  const callId = `shell-${crypto.randomUUID()}`;
+  emit({ type: "user-shell", text: rawQuery });
+  emit({
+    type: "tool-start",
+    id: callId,
+    tool: "run_shell_command",
+    title: "run_shell_command"
+  });
+  emit({ type: "tool-description", id: callId, description: rawQuery });
+  const targetDir = config.getTargetDir();
+  let commandToExecute = rawQuery;
+  let pwdFilePath;
+  if (os2.platform() !== "win32") {
+    let command = rawQuery.trim();
+    const pwdFileName = `shell_pwd_${crypto.randomBytes(6).toString("hex")}.tmp`;
+    pwdFilePath = path4.join(os2.tmpdir(), pwdFileName);
+    const trailingBackslashes = /\\+$/.exec(command)?.[0].length ?? 0;
+    if (trailingBackslashes % 2 === 1) {
+      command += "\n";
+    }
+    if (!command.endsWith(";") && !command.endsWith("&")) {
+      command += ";";
+    }
+    commandToExecute = `{ ${command}
+}; __code=$?; pwd > "${pwdFilePath}"; exit $__code`;
+  }
+  const usePty = config.getShouldUseNodePtyShell();
+  const client = config.getGeminiClient();
+  const chatAtStart = client.isInitialized() ? client.getChat() : void 0;
+  let cumulative = "";
+  let emittedText = "";
+  let isBinaryStream = false;
+  let lastUpdate = Date.now();
+  const onOutputEvent = /* @__PURE__ */ __name((event) => {
+    switch (event.type) {
+      case "data":
+        if (!isBinaryStream && !usePty && typeof event.chunk === "string") {
+          cumulative += event.chunk;
+        }
+        break;
+      case "binary_detected":
+      case "binary_progress":
+        isBinaryStream = true;
+        break;
+      default: {
+        throw new Error("An unhandled ShellOutputEvent was found.");
+      }
+    }
+    if (!usePty && !isBinaryStream && Date.now() - lastUpdate > OUTPUT_UPDATE_INTERVAL_MS && cumulative.length > emittedText.length) {
+      const delta = cumulative.slice(emittedText.length);
+      emittedText += delta;
+      emit({ type: "tool-output", id: callId, delta });
+      lastUpdate = Date.now();
+    }
+  }, "onOutputEvent");
+  const cleanup = /* @__PURE__ */ __name(() => {
+    if (pwdFilePath && fs2.existsSync(pwdFilePath)) {
+      fs2.unlinkSync(pwdFilePath);
+    }
+  }, "cleanup");
+  return ShellExecutionService.execute(
+    commandToExecute,
+    targetDir,
+    onOutputEvent,
+    signal,
+    usePty,
+    {
+      ...config.getShellExecutionConfig(),
+      terminalWidth: terminalSize.width,
+      terminalHeight: terminalSize.height
+    }
+  ).then(
+    ({ result }) => result.then((res) => {
+      let success = true;
+      let summary = "ok";
+      let prefixText = "";
+      if (res.error) {
+        success = false;
+        summary = "error";
+        prefixText = `${res.error.message}
+`;
+      } else if (res.aborted) {
+        success = false;
+        summary = "cancelled";
+        prefixText = "Command was cancelled.\n";
+      } else if (isSignalTermination(res.signal)) {
+        success = false;
+        summary = "error";
+        prefixText = `Command terminated by signal: ${res.signal}.
+`;
+      } else if (res.exitCode !== 0) {
+        success = false;
+        summary = "error";
+        prefixText = `Command exited with code ${res.exitCode}.
+`;
+      }
+      if (pwdFilePath && fs2.existsSync(pwdFilePath)) {
+        const finalPwd = fs2.readFileSync(pwdFilePath, "utf8").trim();
+        if (finalPwd && finalPwd !== targetDir) {
+          prefixText = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.
+
+${prefixText}`;
+        }
+      }
+      const mainContent = isBinary(res.rawOutput) ? "[Command produced binary output, which is not shown.]" : res.output.trim() || "(Command produced no output)";
+      const emittedTrimmed = emittedText.trimEnd();
+      const tail = emittedTrimmed && mainContent.startsWith(emittedTrimmed) ? mainContent.slice(emittedTrimmed.length) : mainContent;
+      const finalOutput = tail ? `${prefixText}${tail}` : prefixText ? `
+${prefixText}` : "";
+      emit({ type: "tool-result", id: callId, display: finalOutput });
+      emit({
+        type: "tool-end",
+        id: callId,
+        success,
+        summary
+      });
+      if (client.isInitialized() && client.getChat() === chatAtStart) {
+        addShellCommandToLlmHistory(
+          config.getGeminiClient(),
+          rawQuery,
+          `${prefixText}${mainContent}`
+        );
+      }
+    })
+  ).catch((err) => {
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    emit({
+      type: "error",
+      text: `An unexpected error occurred: ${errorMessage}`
+    });
+    emit({
+      type: "tool-end",
+      id: callId,
+      success: false,
+      summary: "error"
+    });
+  }).finally(cleanup);
+}
+__name(executeUserShell, "executeUserShell");
+
+// packages/cli/src/ui/opentui/messages.tsx
+init_esbuild_shims();
+
+// packages/cli/src/ui/opentui/theme.ts
+init_esbuild_shims();
+var DARK = {
+  text: "#CDD6F4",
+  dim: "#6C7086",
+  accent: "#CBA6F7",
+  green: "#A6E3A1",
+  red: "#F38BA8",
+  yellow: "#F9E2AF",
+  purple: "#89B4FA",
+  hover: "#313244",
+  // No bg on dark: the default invert selection (bg=text fg, fg=black) is
+  // readable on dark terminals, and leaving bg unset keeps transparency.
+  selectionBg: "#264F78",
+  selectionFg: "#FFFFFF"
+};
+var C2 = { ...DARK };
+function buildSyntax(mode) {
+  const styles = mode === "light" ? {
+    // `default` colors unstyled markdown chunks (table cells, plain
+    // inline text); without it TextTable falls back to #FFFFFF.
+    default: { fg: "#1f2328" },
+    keyword: { fg: "#cf222e", bold: true },
+    string: { fg: "#0a3069" },
+    comment: { fg: "#59636e", italic: true },
+    function: { fg: "#8250df" },
+    type: { fg: "#953800" },
+    number: { fg: "#0550ae" },
+    operator: { fg: "#0550ae" },
+    variable: { fg: "#1f2328" },
+    heading: { fg: "#0550ae", bold: true },
+    emphasis: { italic: true },
+    strong: { bold: true },
+    link: { fg: "#0969da" },
+    code: { fg: "#0a3069" }
+  } : {
+    default: { fg: "#e6edf3" },
+    keyword: { fg: "#bb9af7", bold: true },
+    string: { fg: "#9ece6a" },
+    comment: { fg: "#565f89", italic: true },
+    function: { fg: "#7aa2f7" },
+    type: { fg: "#e0af68" },
+    number: { fg: "#ff9e64" },
+    operator: { fg: "#89ddff" },
+    variable: { fg: "#e6edf3" },
+    heading: { fg: "#7aa2f7", bold: true },
+    emphasis: { italic: true },
+    strong: { bold: true },
+    link: { fg: "#7aa2f7" },
+    code: { fg: "#9ece6a" }
+  };
+  return SyntaxStyle.fromStyles({
+    ...styles,
+    ...markdownMarkupTokens(mode)
+  });
+}
+__name(buildSyntax, "buildSyntax");
+function markdownMarkupTokens(mode) {
+  const heading = mode === "light" ? "#0550ae" : "#7aa2f7";
+  const inlineCode = mode === "light" ? "#0a3069" : "#9ece6a";
+  const link2 = mode === "light" ? "#0969da" : "#7aa2f7";
+  const headingStyle = { fg: heading, bold: true };
+  return {
+    "markup.heading": headingStyle,
+    "markup.heading.1": headingStyle,
+    "markup.heading.2": headingStyle,
+    "markup.heading.3": headingStyle,
+    "markup.heading.4": headingStyle,
+    "markup.heading.5": headingStyle,
+    "markup.heading.6": headingStyle,
+    "markup.raw": { fg: inlineCode },
+    "markup.italic": { italic: true },
+    "markup.strong": { bold: true },
+    "markup.link": { fg: link2 },
+    "markup.link.label": { fg: link2 },
+    "markup.link.url": { fg: link2, underline: true }
+  };
+}
+__name(markdownMarkupTokens, "markdownMarkupTokens");
+var SYNTAX = buildSyntax("dark");
+
+// packages/cli/node_modules/@opentui/react/jsx-runtime.js
+init_esbuild_shims();
+var import_jsx_runtime = __toESM(require_jsx_runtime(), 1);
+
+// packages/cli/src/ui/opentui/messages.tsx
+var TOOL_STATUS = {
+  SUCCESS: "\u2713",
+  PENDING: "o",
+  EXECUTING: "\u22B7",
+  CONFIRMING: "?",
+  CANCELED: "-",
+  ERROR: "x"
+};
+var MESSAGE_ICON = {
+  DIAMOND: "\u25C6",
+  THEREFORE: "\u2234",
+  BECAUSE: "\u2235",
+  CIRCLE_FILLED: "\u25CF"
+};
+var STATUS_INDICATOR_WIDTH = 2;
+var selectionProps = /* @__PURE__ */ __name(() => ({
+  selectionBg: C2.selectionBg,
+  selectionFg: C2.selectionFg
+}), "selectionProps");
+var STRIKETHROUGH_ATTR = 128;
+var TODO_STATUS_ICONS = {
+  pending: ICON.CIRCLE_EMPTY,
+  in_progress: ICON.CIRCLE_LEFT_HALF,
+  completed: ICON.CIRCLE_FILLED
+};
+var MAX_RESULT_DISPLAY_CHARACTERS = 1e6;
+function maxHistoryItemRows(terminalHeight) {
+  return Math.max(Math.floor(terminalHeight) * 4, 100);
+}
+__name(maxHistoryItemRows, "maxHistoryItemRows");
+function truncateResultDisplayChars(text) {
+  return text.length > MAX_RESULT_DISPLAY_CHARACTERS ? "..." + text.slice(-MAX_RESULT_DISPLAY_CHARACTERS) : text;
+}
+__name(truncateResultDisplayChars, "truncateResultDisplayChars");
+function tailWindow(lines, maxRows) {
+  const target = Math.max(Math.round(maxRows), 2);
+  if (lines.length <= target) return { visible: lines, hiddenCount: 0 };
+  const visibleContentHeight = target - 1;
+  return {
+    visible: lines.slice(lines.length - visibleContentHeight),
+    hiddenCount: lines.length - visibleContentHeight
+  };
+}
+__name(tailWindow, "tailWindow");
+function hiddenLinesLabel(hiddenCount) {
+  return `... first ${hiddenCount} line${hiddenCount === 1 ? "" : "s"} hidden ...`;
+}
+__name(hiddenLinesLabel, "hiddenLinesLabel");
+function physicalRowCount(row, cols) {
+  return Math.max(1, Math.ceil(getCachedStringWidth(row) / cols));
+}
+__name(physicalRowCount, "physicalRowCount");
+function sliceRowToWidth(row, maxCols, side) {
+  const points = toCodePoints(row);
+  const ordered = side === "head" ? points : [...points].reverse();
+  let used = 0;
+  let taken = 0;
+  for (const cp of ordered) {
+    const cpWidth = getCachedStringWidth(cp);
+    if (used + cpWidth > maxCols) break;
+    used += cpWidth;
+    taken += 1;
+  }
+  const kept = ordered.slice(0, taken);
+  return (side === "tail" ? kept.reverse() : kept).join("");
+}
+__name(sliceRowToWidth, "sliceRowToWidth");
+function headWindowPhysical(rows, width, maxRows) {
+  const cols = Math.max(width - 2, 10);
+  const height = /* @__PURE__ */ __name((row) => physicalRowCount(row, cols), "height");
+  const total = rows.reduce((sum, row) => sum + height(row), 0);
+  if (total <= maxRows) return { visible: [...rows], hiddenRows: 0 };
+  const budget = Math.max(maxRows - 1, 1);
+  const visible = [];
+  let used = 0;
+  for (const row of rows) {
+    const h3 = height(row);
+    if (used + h3 <= budget) {
+      visible.push(row);
+      used += h3;
+      continue;
+    }
+    const remaining = budget - used;
+    if (remaining > 0) {
+      visible.push(sliceRowToWidth(row, remaining * cols, "head"));
+      used = budget;
+    }
+    break;
+  }
+  return { visible, hiddenRows: Math.max(total - used, 1) };
+}
+__name(headWindowPhysical, "headWindowPhysical");
+function hiddenTailLinesLabel(hiddenCount) {
+  return `... last ${hiddenCount} line${hiddenCount === 1 ? "" : "s"} hidden ...`;
+}
+__name(hiddenTailLinesLabel, "hiddenTailLinesLabel");
+function tailWindowPhysical(rows, width, maxRows) {
+  const cols = Math.max(width - 2, 10);
+  const height = /* @__PURE__ */ __name((row) => physicalRowCount(row, cols), "height");
+  const total = rows.reduce((sum, row) => sum + height(row), 0);
+  if (total <= maxRows) return { visible: [...rows], hiddenRows: 0 };
+  const budget = Math.max(maxRows, 1);
+  const visible = [];
+  let used = 0;
+  for (let i = rows.length - 1; i >= 0; i -= 1) {
+    const row = rows[i];
+    const h3 = height(row);
+    if (used + h3 <= budget) {
+      visible.unshift(row);
+      used += h3;
+      continue;
+    }
+    const remaining = budget - used;
+    if (remaining > 0) {
+      visible.unshift(sliceRowToWidth(row, remaining * cols, "tail"));
+      used = budget;
+    }
+    break;
+  }
+  return { visible, hiddenRows: Math.max(total - used, 1) };
+}
+__name(tailWindowPhysical, "tailWindowPhysical");
+var TOOL_CARD_DESCRIPTION_ROWS = 5;
+var PENDING_CARD_VIEWPORT_RESERVE_ROWS = 46;
+var DIALOG_EXPANDED_RESERVE_ROWS = 14;
+var CARD_DESC_WRAP_RATIO = 0.7;
+function pendingCardMaxRows(terminalHeight, descriptionWidth, width) {
+  const h3 = Math.floor(terminalHeight);
+  const payloadRows = Math.ceil(
+    descriptionWidth / Math.max(width - STATUS_INDICATOR_WIDTH, 10)
+  );
+  return Math.max(
+    TOOL_CARD_DESCRIPTION_ROWS,
+    Math.min(
+      maxHistoryItemRows(terminalHeight),
+      h3 - PENDING_CARD_VIEWPORT_RESERVE_ROWS,
+      Math.floor(
+        (h3 - DIALOG_EXPANDED_RESERVE_ROWS - payloadRows) * CARD_DESC_WRAP_RATIO
+      )
+    )
+  );
+}
+__name(pendingCardMaxRows, "pendingCardMaxRows");
+function capToolCardDescription(description, name, width, maxRows) {
+  const cols = Math.max(width - STATUS_INDICATOR_WIDTH, 10);
+  const nameCols = getCachedStringWidth(name) + 1;
+  const rows = Math.ceil((nameCols + getCachedStringWidth(description)) / cols);
+  if (rows <= maxRows) return { description, hiddenRows: 0 };
+  const descRows = Math.max(maxRows - 1, 1);
+  const visibleCols = Math.max(descRows * cols - nameCols, 0);
+  return {
+    description: sliceRowToWidth(description, visibleCols, "head"),
+    hiddenRows: Math.max(rows - descRows, 1)
+  };
+}
+__name(capToolCardDescription, "capToolCardDescription");
+function toolCardName(rawName) {
+  return TOOL_DISPLAY_BY_NAME[rawName] ?? rawName;
+}
+__name(toolCardName, "toolCardName");
+var GENERIC_TOOL_SUMMARIES = /* @__PURE__ */ new Set([
+  "ok",
+  "error",
+  "cancelled",
+  "canceled",
+  "interrupted",
+  "skipped"
+]);
+function toolCardSummarySuffix(done, summary) {
+  if (!done || !summary || GENERIC_TOOL_SUMMARIES.has(summary)) return "";
+  return ` \xB7 ${summary}`;
+}
+__name(toolCardSummarySuffix, "toolCardSummarySuffix");
+function toolCardText(v3) {
+  return sanitizeMultilineForDisplay(v3.replace(/\s*\n\s*/g, " ").trim());
+}
+__name(toolCardText, "toolCardText");
+function toolCardDescription(rawName, args) {
+  let parsed = {};
+  try {
+    parsed = JSON.parse(args ?? "{}");
+  } catch {
+    return "";
+  }
+  const str = /* @__PURE__ */ __name((v3) => typeof v3 === "string" && v3.length > 0 ? v3 : void 0, "str");
+  const oneLine = toolCardText;
+  switch (rawName) {
+    case "run_shell_command": {
+      const cmd = str(parsed["command"] ?? parsed["cmd"]);
+      if (!cmd) return "";
+      const desc = str(parsed["description"]);
+      return desc ? `${oneLine(cmd)} (${oneLine(desc)})` : oneLine(cmd);
+    }
+    case "read_file":
+    case "write_file":
+    case "edit":
+    case "notebook_edit": {
+      const p2 = str(
+        parsed["file_path"] ?? parsed["path"] ?? parsed["filePath"]
+      );
+      return p2 ? oneLine(p2) : "";
+    }
+    case "list_directory":
+    case "glob": {
+      const p2 = str(parsed["path"] ?? parsed["dir"] ?? parsed["pattern"]);
+      return p2 ? oneLine(p2) : "";
+    }
+    case "grep_search": {
+      const pat = str(parsed["pattern"]);
+      return pat ? oneLine(pat) : "";
+    }
+    default:
+      return "";
+  }
+}
+__name(toolCardDescription, "toolCardDescription");
+function userMessageMeta() {
+  return { glyph: ">", color: C2.purple };
+}
+__name(userMessageMeta, "userMessageMeta");
+function assistantMessageMeta() {
+  return { glyph: MESSAGE_ICON.DIAMOND, color: C2.purple };
+}
+__name(assistantMessageMeta, "assistantMessageMeta");
+function thinkingMeta(done, expanded, clickable) {
+  const expandHint = clickable ? "(click or ctrl+o to expand)" : "(ctrl+o to expand)";
+  if (!done) {
+    return {
+      icon: MESSAGE_ICON.BECAUSE,
+      label: "Thinking\u2026",
+      hint: "",
+      color: C2.dim,
+      collapsed: false
+    };
+  }
+  if (!expanded) {
+    return {
+      icon: MESSAGE_ICON.THEREFORE,
+      label: "Thought",
+      hint: expandHint,
+      color: C2.dim,
+      collapsed: true
+    };
+  }
+  return {
+    icon: MESSAGE_ICON.THEREFORE,
+    label: "Thought",
+    hint: "(ctrl+o to collapse)",
+    color: C2.dim,
+    collapsed: false
+  };
+}
+__name(thinkingMeta, "thinkingMeta");
+function toolStatusMeta(item) {
+  if (item.confirm === "pending" && !item.done) {
+    return {
+      glyph: TOOL_STATUS.CONFIRMING,
+      color: C2.yellow,
+      strikethrough: false
+    };
+  }
+  if (!item.done) {
+    return {
+      glyph: TOOL_STATUS.EXECUTING,
+      color: C2.text,
+      strikethrough: false
+    };
+  }
+  if (item.success) {
+    return { glyph: TOOL_STATUS.SUCCESS, color: C2.green, strikethrough: false };
+  }
+  const canceled = item.summary === "interrupted" || item.summary === "canceled" || item.summary === "cancelled";
+  if (canceled) {
+    return { glyph: TOOL_STATUS.CANCELED, color: C2.text, strikethrough: true };
+  }
+  return { glyph: TOOL_STATUS.ERROR, color: C2.red, strikethrough: false };
+}
+__name(toolStatusMeta, "toolStatusMeta");
+function TodoRows({ todos }) {
+  if (todos.length === 0) {
+    return null;
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "column", children: todos.map((todo) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TodoItemRow, { todo }, todo.id)) });
+}
+__name(TodoRows, "TodoRows");
+function TodoItemRow({ todo }) {
+  const statusIcon = TODO_STATUS_ICONS[todo.status];
+  const isCompleted = todo.status === "completed";
+  const isInProgress = todo.status === "in_progress";
+  const itemColor = isCompleted ? C2.text : isInProgress ? C2.green : C2.text;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", minHeight: 1, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { width: 3, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: itemColor, ...selectionProps(), children: statusIcon }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      "text",
+      {
+        fg: itemColor,
+        attributes: isCompleted ? STRIKETHROUGH_ATTR : 0,
+        ...selectionProps(),
+        children: todo.content
+      }
+    ) })
+  ] });
+}
+__name(TodoItemRow, "TodoItemRow");
+var ANSI_DEFAULT_HEIGHT = 24;
+function truncateTokenLine(line, maxWidth) {
+  if (maxWidth <= 0) return [];
+  let width = 0;
+  const kept = [];
+  for (const token of line) {
+    const tokenWidth = getCachedStringWidth(token.text);
+    if (width + tokenWidth <= maxWidth) {
+      if (tokenWidth > 0 || kept.length === 0) kept.push(token);
+      width += tokenWidth;
+      continue;
+    }
+    let partial = "";
+    for (const cp of toCodePoints(token.text)) {
+      const cpWidth = getCachedStringWidth(cp);
+      if (width + cpWidth > maxWidth) break;
+      partial += cp;
+      width += cpWidth;
+    }
+    if (partial) kept.push({ ...token, text: partial });
+    break;
+  }
+  return kept;
+}
+__name(truncateTokenLine, "truncateTokenLine");
+function ansiTokenProps(token) {
+  const fg2 = token.inverse ? token.bg : token.fg;
+  const bg2 = token.inverse ? token.fg : token.bg;
+  return {
+    fg: fg2 || void 0,
+    bg: bg2 || void 0,
+    attributes: (token.bold ? 1 : 0) | (token.dim ? 2 : 0) | (token.italic ? 4 : 0) | (token.underline ? 8 : 0)
+  };
+}
+__name(ansiTokenProps, "ansiTokenProps");
+function AnsiRows({
+  grid,
+  maxWidth,
+  totalLines,
+  totalBytes
+}) {
+  const windowed = tailWindow(grid, ANSI_DEFAULT_HEIGHT);
+  const stats = [];
+  if (totalLines && totalLines > ANSI_DEFAULT_HEIGHT) {
+    stats.push(`+${totalLines - ANSI_DEFAULT_HEIGHT} lines`);
+  }
+  if (totalBytes && totalBytes > 0) {
+    stats.push(formatMemoryUsage(totalBytes));
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
+    windowed.hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, ...selectionProps(), children: hiddenLinesLabel(windowed.hiddenCount) }),
+    windowed.visible.map((line, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "row", children: truncateTokenLine(line, maxWidth).map((token, j3) => {
+      const style = ansiTokenProps(token);
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        "text",
+        {
+          fg: style.fg ?? C2.text,
+          bg: style.bg,
+          attributes: style.attributes,
+          ...selectionProps(),
+          children: token.text
+        },
+        `${j3}`
+      );
+    }) }, `${i}`)),
+    stats.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "row", children: stats.map((part, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+      i > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { children: " " }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, ...selectionProps(), children: part })
+    ] }, `${i}`)) })
+  ] });
+}
+__name(AnsiRows, "AnsiRows");
+
 // packages/cli/src/ui/opentui/slash-gateway.ts
 init_esbuild_shims();
 var QUIT_TOKENS = /* @__PURE__ */ new Set([
@@ -42939,6 +43597,19 @@ var OpenTuiSlashGateway = class {
     await this.ready;
     return this.dispatcher?.mustDeferDuringStreaming(text) ?? false;
   }
+  /**
+   * Whether the dispatcher claims this input instead of the shell lane — the
+   * single admission rule the shell must reuse when tagging a mid-turn
+   * shell-mode submission, so routing cannot diverge between the two gates.
+   */
+  async takesAsSlashCommand(text) {
+    await this.ready;
+    if (!this.dispatcher) {
+      const trimmed = text.trim();
+      return trimmed.startsWith("?") || trimmed.startsWith("/") && !hasSlashCommandPathSeparator(trimmed);
+    }
+    return this.dispatcher.takesAsSlashCommand(text.trim());
+  }
   /** True while a dispatched command is still running. */
   isBusy() {
     return this.busy;
@@ -43339,9 +44010,9 @@ function shouldHideSlashCommandInvocation(command, canonicalPath, args) {
     }
     return true;
   }
-  const path6 = canonicalPath.join(" ");
-  if (BARE_SLASH_COMMANDS_HIDE_INVOCATION.has(path6)) {
-    if (path6 === "model") {
+  const path7 = canonicalPath.join(" ");
+  if (BARE_SLASH_COMMANDS_HIDE_INVOCATION.has(path7)) {
+    if (path7 === "model") {
       return isPickerOnlyModelInvocation(args);
     }
     return args.trim() === "";
@@ -44035,96 +44706,90 @@ async function exitSession(config, code) {
 }
 __name(exitSession, "exitSession");
 
-// packages/cli/src/ui/opentui/opentui-error-boundary.tsx
-init_esbuild_shims();
-var import_react17 = __toESM(require_react(), 1);
-
-// packages/cli/src/ui/opentui/theme.ts
+// packages/cli/src/ui/opentui/early-input.ts
 init_esbuild_shims();
-var DARK = {
-  text: "#CDD6F4",
-  dim: "#6C7086",
-  accent: "#CBA6F7",
-  green: "#A6E3A1",
-  red: "#F38BA8",
-  yellow: "#F9E2AF",
-  purple: "#89B4FA",
-  hover: "#313244",
-  // No bg on dark: the default invert selection (bg=text fg, fg=black) is
-  // readable on dark terminals, and leaving bg unset keeps transparency.
-  selectionBg: "#264F78",
-  selectionFg: "#FFFFFF"
-};
-var C2 = { ...DARK };
-function buildSyntax(mode) {
-  const styles = mode === "light" ? {
-    // `default` colors unstyled markdown chunks (table cells, plain
-    // inline text); without it TextTable falls back to #FFFFFF.
-    default: { fg: "#1f2328" },
-    keyword: { fg: "#cf222e", bold: true },
-    string: { fg: "#0a3069" },
-    comment: { fg: "#59636e", italic: true },
-    function: { fg: "#8250df" },
-    type: { fg: "#953800" },
-    number: { fg: "#0550ae" },
-    operator: { fg: "#0550ae" },
-    variable: { fg: "#1f2328" },
-    heading: { fg: "#0550ae", bold: true },
-    emphasis: { italic: true },
-    strong: { bold: true },
-    link: { fg: "#0969da" },
-    code: { fg: "#0a3069" }
-  } : {
-    default: { fg: "#e6edf3" },
-    keyword: { fg: "#bb9af7", bold: true },
-    string: { fg: "#9ece6a" },
-    comment: { fg: "#565f89", italic: true },
-    function: { fg: "#7aa2f7" },
-    type: { fg: "#e0af68" },
-    number: { fg: "#ff9e64" },
-    operator: { fg: "#89ddff" },
-    variable: { fg: "#e6edf3" },
-    heading: { fg: "#7aa2f7", bold: true },
-    emphasis: { italic: true },
-    strong: { bold: true },
-    link: { fg: "#7aa2f7" },
-    code: { fg: "#9ece6a" }
+function decodeCapturedInput(buffer) {
+  if (buffer.length === 0) return "";
+  const text = buffer.toString("utf8");
+  return text.replace(/\u001B\[[0-9:;<=>?]*[ -/]*[@-~]/g, "").replace(/\u001BO[A-Za-z]/g, "").replace(/\u001B\[[0-9:;<=>?]*[ -/]*$/, "").replace(/\u001BO$/, "").replace(/[\u0000-\u0008\u000B-\u001F\u007F]/g, "");
+}
+__name(decodeCapturedInput, "decodeCapturedInput");
+function drainCapturedInputAsText() {
+  return decodeCapturedInput(stopAndGetCapturedInput());
+}
+__name(drainCapturedInputAsText, "drainCapturedInputAsText");
+function injectCapturedInput(getText, text, opts = {}) {
+  if (text.length === 0) return () => {
+  };
+  const intervalMs = opts.intervalMs ?? 25;
+  const maxAttempts = opts.maxAttempts ?? 40;
+  const setTimeoutFn = opts.setTimeoutFn ?? ((fn2, ms) => setTimeout(fn2, ms));
+  const clearTimeoutFn = opts.clearTimeoutFn ?? ((handle) => clearTimeout(handle));
+  let attempts = 0;
+  let timer = null;
+  let disposed = false;
+  const attempt = /* @__PURE__ */ __name(() => {
+    if (disposed) return;
+    const handle = getText();
+    if (handle) {
+      handle.setText(text);
+      opts.onDelivered?.();
+      return;
+    }
+    attempts += 1;
+    if (attempts >= maxAttempts) {
+      opts.onExhausted?.();
+      return;
+    }
+    timer = setTimeoutFn(attempt, intervalMs);
+  }, "attempt");
+  timer = setTimeoutFn(attempt, intervalMs);
+  return () => {
+    disposed = true;
+    if (timer !== null) clearTimeoutFn(timer);
   };
-  return SyntaxStyle.fromStyles({
-    ...styles,
-    ...markdownMarkupTokens(mode)
-  });
 }
-__name(buildSyntax, "buildSyntax");
-function markdownMarkupTokens(mode) {
-  const heading = mode === "light" ? "#0550ae" : "#7aa2f7";
-  const inlineCode = mode === "light" ? "#0a3069" : "#9ece6a";
-  const link2 = mode === "light" ? "#0969da" : "#7aa2f7";
-  const headingStyle = { fg: heading, bold: true };
-  return {
-    "markup.heading": headingStyle,
-    "markup.heading.1": headingStyle,
-    "markup.heading.2": headingStyle,
-    "markup.heading.3": headingStyle,
-    "markup.heading.4": headingStyle,
-    "markup.heading.5": headingStyle,
-    "markup.heading.6": headingStyle,
-    "markup.raw": { fg: inlineCode },
-    "markup.italic": { italic: true },
-    "markup.strong": { bold: true },
-    "markup.link": { fg: link2 },
-    "markup.link.label": { fg: link2 },
-    "markup.link.url": { fg: link2, underline: true }
+__name(injectCapturedInput, "injectCapturedInput");
+function armCapturedInputInjection(getText, text, opts = {}) {
+  if (text.length === 0) return () => {
+  };
+  const retryDelayMs = opts.retryDelayMs ?? 250;
+  const setTimeoutFn = opts.setTimeoutFn ?? ((fn2, ms) => setTimeout(fn2, ms));
+  const clearTimeoutFn = opts.clearTimeoutFn ?? ((handle) => clearTimeout(handle));
+  let pending = text;
+  let disposed = false;
+  let pollerDisposer = null;
+  let retryTimer = null;
+  const arm = /* @__PURE__ */ __name(() => {
+    if (disposed) return;
+    const pendingText = pending;
+    if (pendingText === null) return;
+    pollerDisposer = injectCapturedInput(getText, pendingText, {
+      intervalMs: opts.intervalMs,
+      maxAttempts: opts.maxAttempts,
+      setTimeoutFn: opts.setTimeoutFn,
+      clearTimeoutFn: opts.clearTimeoutFn,
+      onDelivered: /* @__PURE__ */ __name(() => {
+        pending = null;
+      }, "onDelivered"),
+      onExhausted: /* @__PURE__ */ __name(() => {
+        if (disposed) return;
+        retryTimer = setTimeoutFn(arm, retryDelayMs);
+      }, "onExhausted")
+    });
+  }, "arm");
+  arm();
+  return () => {
+    disposed = true;
+    pollerDisposer?.();
+    if (retryTimer !== null) clearTimeoutFn(retryTimer);
   };
 }
-__name(markdownMarkupTokens, "markdownMarkupTokens");
-var SYNTAX = buildSyntax("dark");
-
-// packages/cli/node_modules/@opentui/react/jsx-runtime.js
-init_esbuild_shims();
-var import_jsx_runtime = __toESM(require_jsx_runtime(), 1);
+__name(armCapturedInputInjection, "armCapturedInputInjection");
 
 // packages/cli/src/ui/opentui/opentui-error-boundary.tsx
+init_esbuild_shims();
+var import_react18 = __toESM(require_react(), 1);
 function normalizeError(error) {
   if (error instanceof Error) {
     return error;
@@ -44139,7 +44804,7 @@ function consumeLastRenderError() {
   return err;
 }
 __name(consumeLastRenderError, "consumeLastRenderError");
-var OpenTuiErrorBoundary = class extends import_react17.Component {
+var OpenTuiErrorBoundary = class extends import_react18.Component {
   static {
     __name(this, "OpenTuiErrorBoundary");
   }
@@ -44174,7 +44839,7 @@ var OpenTuiErrorBoundary = class extends import_react17.Component {
 
 // packages/cli/src/ui/opentui/opentui-dialog-mount.tsx
 init_esbuild_shims();
-var import_react43 = __toESM(require_react(), 1);
+var import_react44 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/key-map.ts
 init_esbuild_shims();
@@ -44547,11 +45212,11 @@ import { EventEmitter as EventEmitter7 } from "node:events";
 
 // packages/cli/src/ui/opentui/dialogs-model.tsx
 init_esbuild_shims();
-var import_react20 = __toESM(require_react(), 1);
+var import_react21 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/dialogs-shared.tsx
 init_esbuild_shims();
-var import_react18 = __toESM(require_react(), 1);
+var import_react19 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/dialogs-core.ts
 init_esbuild_shims();
@@ -44699,20 +45364,20 @@ function useDialogSelect(options) {
     onSelect,
     onHighlight
   } = options;
-  const [activeIndex, setActiveIndexState] = (0, import_react18.useState)(
+  const [activeIndex, setActiveIndexState] = (0, import_react19.useState)(
     () => computeInitialActiveIndex(initialIndex, items)
   );
-  const [scrollOffset, setScrollOffset] = (0, import_react18.useState)(
+  const [scrollOffset, setScrollOffset] = (0, import_react19.useState)(
     () => getSelectionScrollOffset(
       computeInitialActiveIndex(initialIndex, items),
       items.length,
       maxItemsToShow
     )
   );
-  const numberBuffer = (0, import_react18.useRef)("");
-  const numberTimer = (0, import_react18.useRef)(null);
-  const itemsRef = (0, import_react18.useRef)(items);
-  const [appliedResyncKey, setAppliedResyncKey] = (0, import_react18.useState)(resyncKey);
+  const numberBuffer = (0, import_react19.useRef)("");
+  const numberTimer = (0, import_react19.useRef)(null);
+  const itemsRef = (0, import_react19.useRef)(items);
+  const [appliedResyncKey, setAppliedResyncKey] = (0, import_react19.useState)(resyncKey);
   if (appliedResyncKey !== resyncKey) {
     setAppliedResyncKey(resyncKey);
     if (numberTimer.current) {
@@ -44727,7 +45392,7 @@ function useDialogSelect(options) {
       getSelectionScrollOffset(next, items.length, maxItemsToShow)
     );
   }
-  const latestRef = (0, import_react18.useRef)({ items, activeIndex, onSelect });
+  const latestRef = (0, import_react19.useRef)({ items, activeIndex, onSelect });
   latestRef.current = { items, activeIndex, onSelect };
   if (itemsRef.current !== items) {
     const prevItems = itemsRef.current;
@@ -44742,13 +45407,13 @@ function useDialogSelect(options) {
       );
     }
   }
-  (0, import_react18.useEffect)(
+  (0, import_react19.useEffect)(
     () => () => {
       if (numberTimer.current) clearTimeout(numberTimer.current);
     },
     []
   );
-  (0, import_react18.useEffect)(() => {
+  (0, import_react19.useEffect)(() => {
     const next = followScrollOffset(
       activeIndex,
       scrollOffset,
@@ -45022,7 +45687,7 @@ function OpenTuiModelDialog(props) {
     availableTerminalHeight
   } = props;
   const isAuxMode = mode !== "primary";
-  const [highlightedKey, setHighlightedKey] = (0, import_react20.useState)(null);
+  const [highlightedKey, setHighlightedKey] = (0, import_react21.useState)(null);
   const initialIndex = initialKey ? Math.max(
     0,
     entries.findIndex((entry) => entry.key === initialKey)
@@ -45984,7 +46649,7 @@ __name(applyExtensionUpdate, "applyExtensionUpdate");
 
 // packages/cli/src/ui/opentui/dialogs-theme.tsx
 init_esbuild_shims();
-var import_react22 = __toESM(require_react(), 1);
+var import_react23 = __toESM(require_react(), 1);
 var THEME_DIALOG_MAX_ITEMS_TO_SHOW = 12;
 var THEME_PREVIEW_CODE = `# function
 def fibonacci(n):
@@ -45994,7 +46659,7 @@ def fibonacci(n):
     return a`;
 var THEME_PREVIEW_DIFF = `--- a/util.py
 +++ b/util.py
-@@ -1,2 +1,2 @@
+@@ -1,1 +1,1 @@
 - print("Hello, " + name)
 + print(f"Hello, {name}!")
 `;
@@ -46053,11 +46718,11 @@ function computeThemePreviewLayout(availableTerminalHeight, themeItemCount) {
 __name(computeThemePreviewLayout, "computeThemePreviewLayout");
 function OpenTuiThemeDialog(props) {
   const { onSelect, onHighlight, settings, availableTerminalHeight } = props;
-  const [selectedScope, setSelectedScope] = (0, import_react22.useState)(
+  const [selectedScope, setSelectedScope] = (0, import_react23.useState)(
     "User" /* User */
   );
-  const [highlightedThemeName, setHighlightedThemeName] = (0, import_react22.useState)(settings.merged.ui?.theme || AUTO_THEME_NAME);
-  const [mode, setMode] = (0, import_react22.useState)("theme");
+  const [highlightedThemeName, setHighlightedThemeName] = (0, import_react23.useState)(settings.merged.ui?.theme || AUTO_THEME_NAME);
+  const [mode, setMode] = (0, import_react23.useState)("theme");
   const customThemes = selectedScope === "User" /* User */ ? settings.user.settings.ui?.customThemes || {} : settings.merged.ui?.customThemes || {};
   const builtInThemes = themeManager.getAvailableThemes().filter((theme) => theme.type !== "custom");
   const themeItems = buildThemeItems(builtInThemes, Object.keys(customThemes));
@@ -46134,9 +46799,8 @@ function OpenTuiThemeDialog(props) {
             onWheel: (direction) => themeList.setActiveIndex(
               themeList.activeIndex + (direction === "down" ? 1 : -1)
             ),
-            renderLabel: (item, { titleColor }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: titleColor, children: [
-              item.themeNameDisplay,
-              " ",
+            renderLabel: (item, { titleColor }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: titleColor, children: `${item.themeNameDisplay} ` }),
               /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: item.themeTypeDisplay })
             ] })
           }
@@ -46213,14 +46877,14 @@ __name(OpenTuiThemeDialog, "OpenTuiThemeDialog");
 
 // packages/cli/src/ui/opentui/dialogs-settings.tsx
 init_esbuild_shims();
-var import_react25 = __toESM(require_react(), 1);
+var import_react26 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/dialogs-stats-skills.tsx
 init_esbuild_shims();
-var import_react23 = __toESM(require_react(), 1);
+var import_react24 = __toESM(require_react(), 1);
 function useEscToClose(onClose, enabled) {
   const renderer = useRenderer();
-  (0, import_react23.useLayoutEffect)(() => {
+  (0, import_react24.useLayoutEffect)(() => {
     if (!enabled) return;
     const onRawInput = /* @__PURE__ */ __name((sequence) => {
       if (sequence !== "\x1B") return false;
@@ -46256,9 +46920,9 @@ var TABS = [
 ];
 function OpenTuiStatsDialog(props) {
   const { config, onClose, isFocused = true } = props;
-  const [tab, setTab] = (0, import_react23.useState)("session");
-  const [, forceUpdate] = (0, import_react23.useState)(0);
-  (0, import_react23.useEffect)(() => {
+  const [tab, setTab] = (0, import_react24.useState)("session");
+  const [, forceUpdate] = (0, import_react24.useState)(0);
+  (0, import_react24.useEffect)(() => {
     const handler = /* @__PURE__ */ __name(() => forceUpdate((n) => n + 1), "handler");
     uiTelemetryService.on("update", handler);
     return () => {
@@ -46414,10 +47078,10 @@ function OpenTuiStatsDialog(props) {
 __name(OpenTuiStatsDialog, "OpenTuiStatsDialog");
 function OpenTuiSkillsDialog(props) {
   const { config, onClose } = props;
-  const [rows, setRows] = (0, import_react23.useState)([]);
-  const [loading, setLoading] = (0, import_react23.useState)(true);
+  const [rows, setRows] = (0, import_react24.useState)([]);
+  const [loading, setLoading] = (0, import_react24.useState)(true);
   useEscToClose(onClose, true);
-  (0, import_react23.useEffect)(() => {
+  (0, import_react24.useEffect)(() => {
     let alive = true;
     const mgr = config?.getSkillManager?.();
     if (!mgr) {
@@ -46584,37 +47248,37 @@ function editMoveCursor(state, movement) {
 __name(editMoveCursor, "editMoveCursor");
 function OpenTuiSettingsDialog(props) {
   const { settings, onSelect, onRestartRequest, onSettingApplied, config } = props;
-  const [mode, setMode] = (0, import_react25.useState)("settings");
-  const [selectedScope, setSelectedScope] = (0, import_react25.useState)(
+  const [mode, setMode] = (0, import_react26.useState)("settings");
+  const [selectedScope, setSelectedScope] = (0, import_react26.useState)(
     "User" /* User */
   );
-  const [activeSettingIndex, setActiveSettingIndex] = (0, import_react25.useState)(0);
-  const [scrollOffset, setScrollOffset] = (0, import_react25.useState)(0);
-  const [activeTab, setActiveTab] = (0, import_react25.useState)("settings");
-  const [focusZone, setFocusZone] = (0, import_react25.useState)(
+  const [activeSettingIndex, setActiveSettingIndex] = (0, import_react26.useState)(0);
+  const [scrollOffset, setScrollOffset] = (0, import_react26.useState)(0);
+  const [activeTab, setActiveTab] = (0, import_react26.useState)("settings");
+  const [focusZone, setFocusZone] = (0, import_react26.useState)(
     "list"
   );
-  const [searchQuery, setSearchQuery] = (0, import_react25.useState)("");
-  const [pendingSettings, setPendingSettings] = (0, import_react25.useState)(
+  const [searchQuery, setSearchQuery] = (0, import_react26.useState)("");
+  const [pendingSettings, setPendingSettings] = (0, import_react26.useState)(
     () => structuredClone(settings.forScope("User" /* User */).settings)
   );
-  const [modifiedSettings, setModifiedSettings] = (0, import_react25.useState)(
+  const [modifiedSettings, setModifiedSettings] = (0, import_react26.useState)(
     /* @__PURE__ */ new Set()
   );
-  const [restartRequiredSettings, setRestartRequiredSettings] = (0, import_react25.useState)(/* @__PURE__ */ new Set());
-  const [editingKey, setEditingKey] = (0, import_react25.useState)(null);
-  const [edit, setEdit] = (0, import_react25.useState)({ buffer: "", cursor: 0 });
-  const [systemInfo, setSystemInfo] = (0, import_react25.useState)(null);
-  const [statusError, setStatusError] = (0, import_react25.useState)(false);
-  const [statusReloadNonce, setStatusReloadNonce] = (0, import_react25.useState)(0);
+  const [restartRequiredSettings, setRestartRequiredSettings] = (0, import_react26.useState)(/* @__PURE__ */ new Set());
+  const [editingKey, setEditingKey] = (0, import_react26.useState)(null);
+  const [edit, setEdit] = (0, import_react26.useState)({ buffer: "", cursor: 0 });
+  const [systemInfo, setSystemInfo] = (0, import_react26.useState)(null);
+  const [statusError, setStatusError] = (0, import_react26.useState)(false);
+  const [statusReloadNonce, setStatusReloadNonce] = (0, import_react26.useState)(0);
   const showRestartPrompt = restartRequiredSettings.size > 0;
-  (0, import_react25.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     setPendingSettings(
       structuredClone(settings.forScope(selectedScope).settings)
     );
     setModifiedSettings(/* @__PURE__ */ new Set());
   }, [selectedScope, settings]);
-  (0, import_react25.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     if (activeTab !== "status") {
       setSystemInfo(null);
       setStatusError(false);
@@ -46632,7 +47296,7 @@ function OpenTuiSettingsDialog(props) {
       cancelled = true;
     };
   }, [activeTab, config, settings, statusReloadNonce]);
-  (0, import_react25.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     setActiveSettingIndex(0);
     setScrollOffset(0);
   }, [searchQuery]);
@@ -46996,8 +47660,8 @@ function OpenTuiSettingsDialog(props) {
         if (isEditing) {
           displayValue = edit.buffer;
         } else if (item.type === "number" || item.type === "string") {
-          const path6 = item.key.split(".");
-          const currentValue = getNestedValue(pendingSettings, path6);
+          const path7 = item.key.split(".");
+          const currentValue = getNestedValue(pendingSettings, path7);
           const defaultValue = getDefaultValue(item.key);
           const effectiveCurrentValue = currentValue !== void 0 && currentValue !== null ? currentValue : defaultValue;
           if (item.key === "general.outputLanguage" && isAutoLanguage(
@@ -47044,12 +47708,9 @@ function OpenTuiSettingsDialog(props) {
             },
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: isActive ? C2.green : C2.dim, children: isActive ? ICON.CIRCLE_FILLED : "" }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: isActive ? C2.green : C2.text, children: [
-                item.label,
-                scopeMessage ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.dim, children: [
-                  " ",
-                  scopeMessage
-                ] }) : null
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: isActive ? C2.green : C2.text, children: item.label }),
+                scopeMessage ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: ` ${scopeMessage}` }) : null
               ] }) }),
               /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { marginLeft: 1, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
                 "text",
@@ -47081,7 +47742,7 @@ __name(OpenTuiSettingsDialog, "OpenTuiSettingsDialog");
 
 // packages/cli/src/ui/opentui/dialogs-extensions.tsx
 init_esbuild_shims();
-var import_react27 = __toESM(require_react(), 1);
+var import_react28 = __toESM(require_react(), 1);
 var EXTENSIONS_TABS = {
   INSTALLED: "installed",
   DISCOVER: "discover",
@@ -47146,40 +47807,40 @@ function OpenTuiExtensionsDialog(props) {
     onDetailAction,
     busy = false
   } = props;
-  const [activeTab, setActiveTab] = (0, import_react27.useState)(
+  const [activeTab, setActiveTab] = (0, import_react28.useState)(
     initialTab ?? EXTENSIONS_TABS.INSTALLED
   );
-  const [discoverFilter, setDiscoverFilter] = (0, import_react27.useState)(
+  const [discoverFilter, setDiscoverFilter] = (0, import_react28.useState)(
     discoverFilterProp ?? null
   );
-  const [view, setView] = (0, import_react27.useState)("list");
-  const [selectedKey, setSelectedKey] = (0, import_react27.useState)(null);
-  const [checkedUpdateState, setCheckedUpdateState] = (0, import_react27.useState)(void 0);
-  const clearDiscoverFilter = (0, import_react27.useCallback)(() => {
+  const [view, setView] = (0, import_react28.useState)("list");
+  const [selectedKey, setSelectedKey] = (0, import_react28.useState)(null);
+  const [checkedUpdateState, setCheckedUpdateState] = (0, import_react28.useState)(void 0);
+  const clearDiscoverFilter = (0, import_react28.useCallback)(() => {
     setDiscoverFilter(null);
     onDiscoverFilterChange?.(null);
   }, [onDiscoverFilterChange]);
-  const cycle = (0, import_react27.useCallback)((direction) => {
+  const cycle = (0, import_react28.useCallback)((direction) => {
     setDiscoverFilter(null);
     setActiveTab(
       (current) => cycleTab(EXTENSIONS_TAB_ORDER, current, direction)
     );
   }, []);
-  const rows = (0, import_react27.useMemo)(
+  const rows = (0, import_react28.useMemo)(
     () => rowsByTab?.[EXTENSIONS_TABS.INSTALLED] ?? [],
     [rowsByTab]
   );
-  const currentRow = (0, import_react27.useMemo)(
+  const currentRow = (0, import_react28.useMemo)(
     () => selectedKey ? rows.find((row) => row.key === selectedKey) ?? null : null,
     [rows, selectedKey]
   );
-  (0, import_react27.useEffect)(() => {
+  (0, import_react28.useEffect)(() => {
     if (view !== "list" && !currentRow) {
       setView("list");
       setSelectedKey(null);
     }
   }, [view, currentRow]);
-  const listItems = (0, import_react27.useMemo)(
+  const listItems = (0, import_react28.useMemo)(
     () => rows.map((row) => ({
       key: row.key,
       value: row.key,
@@ -47197,7 +47858,7 @@ function OpenTuiExtensionsDialog(props) {
       setView("detail");
     }, "onSelect")
   });
-  const detailActions = (0, import_react27.useMemo)(() => {
+  const detailActions = (0, import_react28.useMemo)(() => {
     if (!currentRow) return [];
     const enabled = currentRow.enabled !== false;
     const items = [
@@ -47267,7 +47928,7 @@ function OpenTuiExtensionsDialog(props) {
       );
     }, "onSelect")
   });
-  const scopeItems = (0, import_react27.useMemo)(
+  const scopeItems = (0, import_react28.useMemo)(
     () => [
       {
         key: "user",
@@ -47534,7 +48195,7 @@ __name(OpenTuiExtensionsDialog, "OpenTuiExtensionsDialog");
 
 // packages/cli/src/ui/opentui/dialogs-mcp.tsx
 init_esbuild_shims();
-var import_react29 = __toESM(require_react(), 1);
+var import_react30 = __toESM(require_react(), 1);
 var MCP_MANAGEMENT_STEPS = {
   SERVER_LIST: "server-list",
   SERVER_DETAIL: "server-detail",
@@ -47712,19 +48373,19 @@ function OpenTuiMcpDialog(props) {
     onClose,
     onServerAction
   } = props;
-  const [navigationStack, setNavigationStack] = (0, import_react29.useState)([
+  const [navigationStack, setNavigationStack] = (0, import_react30.useState)([
     MCP_MANAGEMENT_STEPS.SERVER_LIST
   ]);
-  const [selectedServerName, setSelectedServerName] = (0, import_react29.useState)(
+  const [selectedServerName, setSelectedServerName] = (0, import_react30.useState)(
     null
   );
   const selectedServer = selectedServerName ? servers.find((server) => server.name === selectedServerName) ?? null : null;
-  const [selectedTool, setSelectedTool] = (0, import_react29.useState)(null);
-  const [selectedResource, setSelectedResource] = (0, import_react29.useState)(null);
-  const [serverCursor, setServerCursor] = (0, import_react29.useState)(0);
-  const [actionCursor, setActionCursor] = (0, import_react29.useState)(0);
-  const [toolCursor, setToolCursor] = (0, import_react29.useState)(0);
-  const [resourceCursor, setResourceCursor] = (0, import_react29.useState)(0);
+  const [selectedTool, setSelectedTool] = (0, import_react30.useState)(null);
+  const [selectedResource, setSelectedResource] = (0, import_react30.useState)(null);
+  const [serverCursor, setServerCursor] = (0, import_react30.useState)(0);
+  const [actionCursor, setActionCursor] = (0, import_react30.useState)(0);
+  const [toolCursor, setToolCursor] = (0, import_react30.useState)(0);
+  const [resourceCursor, setResourceCursor] = (0, import_react30.useState)(0);
   const currentStep = navigationStack[navigationStack.length - 1] ?? MCP_MANAGEMENT_STEPS.SERVER_LIST;
   const navigateToStep = /* @__PURE__ */ __name((step) => setNavigationStack((prev) => [...prev, step]), "navigateToStep");
   const navigateBack = /* @__PURE__ */ __name(() => setNavigationStack((prev) => prev.length <= 1 ? prev : prev.slice(0, -1)), "navigateBack");
@@ -47921,13 +48582,9 @@ function OpenTuiMcpDialog(props) {
             flexDirection: "column",
             marginBottom: groupIndex === groupedServers.length - 1 ? 0 : 1,
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.text, attributes: 1, children: [
-                `  ${group.displayName}`,
-                group.servers[0]?.configPath ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.dim, children: [
-                  " (",
-                  group.servers[0].configPath,
-                  ")"
-                ] }) : null
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, attributes: 1, children: `  ${group.displayName}` }),
+                group.servers[0]?.configPath ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: ` (${group.servers[0].configPath})` }) : null
               ] }),
               group.servers.map((server, itemIndex) => {
                 const globalIndex = startIndex + itemIndex;
@@ -48136,9 +48793,9 @@ __name(OpenTuiMcpDialog, "OpenTuiMcpDialog");
 
 // packages/cli/src/ui/opentui/dialogs-permissions.tsx
 init_esbuild_shims();
-var import_react31 = __toESM(require_react(), 1);
-import * as fs2 from "node:fs";
-import * as os2 from "node:os";
+var import_react32 = __toESM(require_react(), 1);
+import * as fs3 from "node:fs";
+import * as os3 from "node:os";
 import * as nodePath from "node:path";
 function getPermissionsTabs() {
   return [
@@ -48212,17 +48869,17 @@ __name(getPermissionScopeItems, "getPermissionScopeItems");
 function validateWorkspaceDirectory(input, currentDirectories) {
   const trimmed = input.trim();
   if (!trimmed) return { error: "" };
-  const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os2.homedir()) : trimmed;
+  const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os3.homedir()) : trimmed;
   const absoluteExpanded = nodePath.isAbsolute(expanded) ? expanded : nodePath.resolve(expanded);
-  if (!fs2.existsSync(absoluteExpanded)) {
+  if (!fs3.existsSync(absoluteExpanded)) {
     return { error: t("Directory does not exist.") };
   }
-  if (!fs2.statSync(absoluteExpanded).isDirectory()) {
+  if (!fs3.statSync(absoluteExpanded).isDirectory()) {
     return { error: t("Path is not a directory.") };
   }
   let resolved;
   try {
-    resolved = fs2.realpathSync(absoluteExpanded);
+    resolved = fs3.realpathSync(absoluteExpanded);
   } catch {
     resolved = absoluteExpanded;
   }
@@ -48253,19 +48910,19 @@ function OpenTuiPermissionsDialog(props) {
     onExit
   } = props;
   const tabs = getPermissionsTabs();
-  const [activeTabIndex, setActiveTabIndex] = (0, import_react31.useState)(0);
+  const [activeTabIndex, setActiveTabIndex] = (0, import_react32.useState)(0);
   const activeTab = tabs[activeTabIndex];
-  const [view, setView] = (0, import_react31.useState)("rule-list");
-  const [searchQuery, setSearchQuery] = (0, import_react31.useState)("");
-  const [newRuleInput, setNewRuleInput] = (0, import_react31.useState)("");
-  const [ruleInputError, setRuleInputError] = (0, import_react31.useState)("");
-  const [pendingRuleText, setPendingRuleText] = (0, import_react31.useState)("");
-  const [deleteTarget, setDeleteTarget] = (0, import_react31.useState)(
+  const [view, setView] = (0, import_react32.useState)("rule-list");
+  const [searchQuery, setSearchQuery] = (0, import_react32.useState)("");
+  const [newRuleInput, setNewRuleInput] = (0, import_react32.useState)("");
+  const [ruleInputError, setRuleInputError] = (0, import_react32.useState)("");
+  const [pendingRuleText, setPendingRuleText] = (0, import_react32.useState)("");
+  const [deleteTarget, setDeleteTarget] = (0, import_react32.useState)(
     null
   );
-  const [newDirInput, setNewDirInput] = (0, import_react31.useState)("");
-  const [dirInputError, setDirInputError] = (0, import_react31.useState)("");
-  const [removeDirTarget, setRemoveDirTarget] = (0, import_react31.useState)(null);
+  const [newDirInput, setNewDirInput] = (0, import_react32.useState)("");
+  const [dirInputError, setDirInputError] = (0, import_react32.useState)("");
+  const [removeDirTarget, setRemoveDirTarget] = (0, import_react32.useState)(null);
   const currentTabRules = activeTab.id === "workspace" ? [] : rules.filter((r) => r.type === activeTab.id);
   const filteredRules = currentTabRules.filter(
     (r) => matchesSearchQuery(searchQuery, [r.raw, r.toolName])
@@ -48567,13 +49224,10 @@ function OpenTuiPermissionsDialog(props) {
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, children: t(
           "Permission rules are a tool name, optionally followed by a specifier in parentheses."
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.text, children: [
-          t("e.g.,"),
-          " ",
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, children: `${t("e.g.,")} ` }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { attributes: 1, children: "WebFetch" }),
-          " ",
-          t("or"),
-          " ",
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, children: ` ${t("or")} ` }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { attributes: 1, children: "Bash(ls:*)" })
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { height: 1 }),
@@ -48604,11 +49258,13 @@ function OpenTuiPermissionsDialog(props) {
             focused: true,
             onHover: scopeList.setActiveIndex,
             onSelectIndex: scopeList.selectIndex,
-            renderLabel: (item, { titleColor }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: titleColor, children: [
-              item.label,
-              " ",
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: item.description })
-            ] })
+            renderLabel: (item, { titleColor }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+              "text",
+              {
+                fg: titleColor,
+                children: `${item.label}    ${item.description}`
+              }
+            )
           }
         )
       ] }),
@@ -48685,7 +49341,7 @@ __name(OpenTuiPermissionsDialog, "OpenTuiPermissionsDialog");
 
 // packages/cli/src/ui/opentui/dialogs-auth.tsx
 init_esbuild_shims();
-var import_react35 = __toESM(require_react(), 1);
+var import_react36 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/input-prompt-key.ts
 init_esbuild_shims();
@@ -49382,10 +50038,10 @@ __name(historyDownDecision, "historyDownDecision");
 
 // packages/cli/src/ui/opentui/dialogs-misc.tsx
 init_esbuild_shims();
-var import_react33 = __toESM(require_react(), 1);
+var import_react34 = __toESM(require_react(), 1);
 function useEsc(onClose) {
   const renderer = useRenderer();
-  (0, import_react33.useLayoutEffect)(() => {
+  (0, import_react34.useLayoutEffect)(() => {
     const onRaw = /* @__PURE__ */ __name((seq) => {
       if (seq !== "\x1B") return false;
       onClose();
@@ -49439,20 +50095,20 @@ function nextEnabledIndex(items, current, delta) {
 __name(nextEnabledIndex, "nextEnabledIndex");
 function OpenTuiEditorDialog({ settings, onClose, notify }) {
   useEsc(onClose);
-  const editors = (0, import_react33.useMemo)(
+  const editors = (0, import_react34.useMemo)(
     () => editorSettingsManager.getAvailableEditorDisplays(),
     []
   );
-  const [mode, setMode] = (0, import_react33.useState)("editor");
-  const [scope, setScope] = (0, import_react33.useState)("User" /* User */);
+  const [mode, setMode] = (0, import_react34.useState)("editor");
+  const [scope, setScope] = (0, import_react34.useState)("User" /* User */);
   const scopeIndexOf = /* @__PURE__ */ __name((s) => {
     const pref = settings.forScope(s).settings.general?.preferredEditor;
     const idx = pref ? editors.findIndex((e) => e.type === pref) : 0;
     return idx >= 0 ? idx : 0;
   }, "scopeIndexOf");
-  const [sel, setSel] = (0, import_react33.useState)(() => scopeIndexOf("User" /* User */));
-  const scopeItems = (0, import_react33.useMemo)(() => getScopeItems(), []);
-  const [scopeSel, setScopeSel] = (0, import_react33.useState)(0);
+  const [sel, setSel] = (0, import_react34.useState)(() => scopeIndexOf("User" /* User */));
+  const scopeItems = (0, import_react34.useMemo)(() => getScopeItems(), []);
+  const [scopeSel, setScopeSel] = (0, import_react34.useState)(0);
   const highlightScope = /* @__PURE__ */ __name((idx) => {
     const item = scopeItems[idx];
     if (!item) return;
@@ -49566,12 +50222,12 @@ function OpenTuiTrustDialog({ config, onClose }) {
 __name(OpenTuiTrustDialog, "OpenTuiTrustDialog");
 function OpenTuiDeleteDialog({ config, onClose, notify }) {
   useEsc(onClose);
-  const [rows, setRows] = (0, import_react33.useState)([]);
-  const [loading, setLoading] = (0, import_react33.useState)(true);
-  const [cursor, setCursor] = (0, import_react33.useState)(0);
-  const [busy, setBusy] = (0, import_react33.useState)(false);
+  const [rows, setRows] = (0, import_react34.useState)([]);
+  const [loading, setLoading] = (0, import_react34.useState)(true);
+  const [cursor, setCursor] = (0, import_react34.useState)(0);
+  const [busy, setBusy] = (0, import_react34.useState)(false);
   const currentSessionId = config?.getSessionId?.() ?? "";
-  (0, import_react33.useEffect)(() => {
+  (0, import_react34.useEffect)(() => {
     let alive = true;
     const svc = config?.getSessionService?.();
     if (!svc) {
@@ -49654,10 +50310,10 @@ function OpenTuiResumeDialog({
   onSelect
 }) {
   useEsc(onClose);
-  const [rows, setRows] = (0, import_react33.useState)(matchedSessions ?? []);
-  const [loading, setLoading] = (0, import_react33.useState)(!matchedSessions);
-  const [cursor, setCursor] = (0, import_react33.useState)(0);
-  (0, import_react33.useEffect)(() => {
+  const [rows, setRows] = (0, import_react34.useState)(matchedSessions ?? []);
+  const [loading, setLoading] = (0, import_react34.useState)(!matchedSessions);
+  const [cursor, setCursor] = (0, import_react34.useState)(0);
+  (0, import_react34.useEffect)(() => {
     if (matchedSessions) {
       setRows(matchedSessions);
       setLoading(false);
@@ -49733,8 +50389,8 @@ function OpenTuiRewindDialog({ onClose }) {
 __name(OpenTuiRewindDialog, "OpenTuiRewindDialog");
 function OpenTuiDiffDialog({ onClose }) {
   useEsc(onClose);
-  const [lines, setLines] = (0, import_react33.useState)([]);
-  (0, import_react33.useEffect)(() => {
+  const [lines, setLines] = (0, import_react34.useState)([]);
+  (0, import_react34.useEffect)(() => {
     let alive = true;
     import("node:child_process").then(({ execFile }) => {
       execFile(
@@ -49771,9 +50427,9 @@ function OpenTuiSubagentCreateDialog({ onClose }) {
 __name(OpenTuiSubagentCreateDialog, "OpenTuiSubagentCreateDialog");
 function OpenTuiSubagentListDialog({ config, onClose }) {
   useEsc(onClose);
-  const [rows, setRows] = (0, import_react33.useState)([]);
-  const [loading, setLoading] = (0, import_react33.useState)(true);
-  (0, import_react33.useEffect)(() => {
+  const [rows, setRows] = (0, import_react34.useState)([]);
+  const [loading, setLoading] = (0, import_react34.useState)(true);
+  (0, import_react34.useEffect)(() => {
     let alive = true;
     const mgr = config?.getSubagentManager?.();
     if (!mgr) {
@@ -49948,13 +50604,13 @@ function useLineInputKeys(value, onChange, onSubmit) {
 __name(useLineInputKeys, "useLineInputKeys");
 function ProtocolStep({ flow }) {
   const provider = flow.state.provider;
-  const items = (0, import_react35.useMemo)(() => {
+  const items = (0, import_react36.useMemo)(() => {
     const protocolOpts = provider.protocolOptions ?? [provider.protocol];
     return PROTOCOL_ITEMS.filter(
       (p2) => protocolOpts.includes(p2.value)
     );
   }, [provider]);
-  const [cursor, setCursor] = (0, import_react35.useState)(0);
+  const [cursor, setCursor] = (0, import_react36.useState)(0);
   useKeyboard((key) => {
     const o = toOriginalKey(key);
     if (o.name === "up") {
@@ -49983,7 +50639,7 @@ function BaseUrlSelectStep({
     description: opt.url,
     value: opt.url
   }));
-  const [cursor, setCursor] = (0, import_react35.useState)(flow.state.baseUrlOptionIndex);
+  const [cursor, setCursor] = (0, import_react36.useState)(flow.state.baseUrlOptionIndex);
   useKeyboard((key) => {
     const o = toOriginalKey(key);
     if (o.name === "up" || o.name === "down") {
@@ -50067,24 +50723,24 @@ function ModelsStep({
   provider,
   flow
 }) {
-  const modelOptions = (0, import_react35.useMemo)(
+  const modelOptions = (0, import_react36.useMemo)(
     () => provider.models?.map((m3) => m3.id) ?? [],
     [provider.models]
   );
   const hasSelectableModels = modelOptions.length > 0;
-  const selectedModelIds = (0, import_react35.useMemo)(
+  const selectedModelIds = (0, import_react36.useMemo)(
     () => normalizeModelIds(flow.state.modelIds),
     [flow.state.modelIds]
   );
-  const recommendedIds = (0, import_react35.useMemo)(() => new Set(modelOptions), [modelOptions]);
-  const [focus, setFocus] = (0, import_react35.useState)(MODEL_CUSTOM_INPUT_FOCUS_INDEX);
-  const [customText, setCustomText] = (0, import_react35.useState)(
+  const recommendedIds = (0, import_react36.useMemo)(() => new Set(modelOptions), [modelOptions]);
+  const [focus, setFocus] = (0, import_react36.useState)(MODEL_CUSTOM_INPUT_FOCUS_INDEX);
+  const [customText, setCustomText] = (0, import_react36.useState)(
     () => selectedModelIds.filter((id) => !recommendedIds.has(id)).join(", ")
   );
-  const [checked, setChecked] = (0, import_react35.useState)(
+  const [checked, setChecked] = (0, import_react36.useState)(
     () => new Set(selectedModelIds.filter((id) => recommendedIds.has(id)))
   );
-  const syncModelIds = (0, import_react35.useCallback)(
+  const syncModelIds = (0, import_react36.useCallback)(
     (custom, keys) => {
       flow.changeModelIds(
         uniqueIds([...normalizeModelIds(custom), ...keys]).join(", ")
@@ -50092,14 +50748,14 @@ function ModelsStep({
     },
     [flow]
   );
-  const updateCustom = (0, import_react35.useCallback)(
+  const updateCustom = (0, import_react36.useCallback)(
     (next) => {
       setCustomText(next);
       syncModelIds(next, checked);
     },
     [checked, syncModelIds]
   );
-  const toggleRecommended = (0, import_react35.useCallback)(
+  const toggleRecommended = (0, import_react36.useCallback)(
     (id) => {
       const next = new Set(checked);
       if (next.has(id)) next.delete(id);
@@ -50109,7 +50765,7 @@ function ModelsStep({
     },
     [checked, customText, syncModelIds]
   );
-  const submit = (0, import_react35.useCallback)(() => {
+  const submit = (0, import_react36.useCallback)(() => {
     flow.submitModelIds({
       modelIds: uniqueIds([...normalizeModelIds(customText), ...checked])
     });
@@ -50339,14 +50995,17 @@ function AuthDialogFlow({
   config,
   settings,
   onClose,
-  notify
+  notify,
+  initialError
 }) {
-  const [errorMessage, setErrorMessage] = (0, import_react35.useState)(null);
-  const [viewLevel, setViewLevel] = (0, import_react35.useState)("main");
-  const [_viewStack, setViewStack] = (0, import_react35.useState)([]);
-  const [mainIndex, setMainIndex] = (0, import_react35.useState)(null);
-  const [subMenuIndex, setSubMenuIndex] = (0, import_react35.useState)({});
-  const handleProviderSubmit = (0, import_react35.useCallback)(
+  const [errorMessage, setErrorMessage] = (0, import_react36.useState)(
+    initialError ?? null
+  );
+  const [viewLevel, setViewLevel] = (0, import_react36.useState)("main");
+  const [_viewStack, setViewStack] = (0, import_react36.useState)([]);
+  const [mainIndex, setMainIndex] = (0, import_react36.useState)(null);
+  const [subMenuIndex, setSubMenuIndex] = (0, import_react36.useState)({});
+  const handleProviderSubmit = (0, import_react36.useCallback)(
     async (providerConfig, inputs) => {
       const protocol = inputs.protocol ?? providerConfig.protocol;
       try {
@@ -50378,15 +51037,15 @@ function AuthDialogFlow({
     [settings, config, notify, onClose]
   );
   const setupFlow = useProviderSetupFlow(handleProviderSubmit);
-  const clearErrors = (0, import_react35.useCallback)(() => setErrorMessage(null), []);
-  const pushView = (0, import_react35.useCallback)(
+  const clearErrors = (0, import_react36.useCallback)(() => setErrorMessage(null), []);
+  const pushView = (0, import_react36.useCallback)(
     (view) => {
       setViewStack((prev) => [...prev, viewLevel]);
       setViewLevel(view);
     },
     [viewLevel]
   );
-  const goBack = (0, import_react35.useCallback)(() => {
+  const goBack = (0, import_react36.useCallback)(() => {
     clearErrors();
     if (viewLevel === "provider-setup") {
       if (setupFlow.goBack()) return;
@@ -50398,8 +51057,8 @@ function AuthDialogFlow({
       return next;
     });
   }, [viewLevel, setupFlow, clearErrors]);
-  const alibabaItems = (0, import_react35.useMemo)(() => ALIBABA_PROVIDERS.map(providerToItem), []);
-  const thirdPartyItems = (0, import_react35.useMemo)(
+  const alibabaItems = (0, import_react36.useMemo)(() => ALIBABA_PROVIDERS.map(providerToItem), []);
+  const thirdPartyItems = (0, import_react36.useMemo)(
     () => THIRD_PARTY_PROVIDERS.map(providerToItem),
     []
   );
@@ -50413,7 +51072,7 @@ function AuthDialogFlow({
     const builtinIds = new Set(getDefaultModelIds(providerConfig));
     return saved.models.map((m3) => m3.id).filter((id) => !builtinIds.has(id));
   }, "getExistingModelIds");
-  const handleProviderSelect = (0, import_react35.useCallback)(
+  const handleProviderSelect = (0, import_react36.useCallback)(
     (providerId) => {
       clearErrors();
       const providerConfig = findProviderById(providerId);
@@ -50439,12 +51098,12 @@ function AuthDialogFlow({
     contentGenConfig?.baseUrl,
     contentGenConfig?.apiKeyEnvKey
   );
-  const defaultMainIndex = (0, import_react35.useMemo)(() => {
+  const defaultMainIndex = (0, import_react36.useMemo)(() => {
     if (matchedProvider?.uiGroup === "third-party") return 1;
     if (matchedProvider?.uiGroup === "custom") return 2;
     return 0;
   }, [matchedProvider]);
-  const handleMainSelect = (0, import_react35.useCallback)(
+  const handleMainSelect = (0, import_react36.useCallback)(
     (value) => {
       clearErrors();
       switch (value) {
@@ -50504,13 +51163,17 @@ function AuthDialogFlow({
     }
   });
   const renderer = useRenderer();
-  (0, import_react35.useLayoutEffect)(() => {
+  (0, import_react36.useLayoutEffect)(() => {
     const onRaw = /* @__PURE__ */ __name((seq) => {
       if (seq !== "\x1B") return false;
       if (viewLevel !== "main") {
         goBack();
         return true;
       }
+      if (initialError && errorMessage === initialError) {
+        onClose();
+        return true;
+      }
       if (errorMessage) return true;
       if (config.getAuthType() === void 0) {
         setErrorMessage(
@@ -50525,8 +51188,16 @@ function AuthDialogFlow({
     }, "onRaw");
     renderer.addInputHandler(onRaw);
     return () => renderer.removeInputHandler(onRaw);
-  }, [renderer, viewLevel, goBack, errorMessage, config, onClose]);
-  const viewTitle = (0, import_react35.useMemo)(() => {
+  }, [
+    renderer,
+    viewLevel,
+    goBack,
+    errorMessage,
+    initialError,
+    config,
+    onClose
+  ]);
+  const viewTitle = (0, import_react36.useMemo)(() => {
     if (viewLevel !== "provider-setup") {
       return VIEW_TITLES[viewLevel] ?? VIEW_TITLES["main"];
     }
@@ -50566,7 +51237,7 @@ __name(AuthDialogFlow, "AuthDialogFlow");
 
 // packages/cli/src/ui/opentui/dialogs-arena.tsx
 init_esbuild_shims();
-var import_react37 = __toESM(require_react(), 1);
+var import_react38 = __toESM(require_react(), 1);
 var MODEL_PROVIDERS_DOCUMENTATION_URL = "https://qwenlm.github.io/qwen-code-docs/en/users/configuration/settings/#modelproviders";
 var STATUS_REFRESH_INTERVAL_MS = 2e3;
 var IN_PROCESS_REFRESH_INTERVAL_MS = 1e3;
@@ -50632,7 +51303,7 @@ function ArenaFrame({
 }
 __name(ArenaFrame, "ArenaFrame");
 function ArenaStart({ config, onClose, onFillInput }) {
-  const modelItems = (0, import_react37.useMemo)(() => {
+  const modelItems = (0, import_react38.useMemo)(() => {
     const all = config?.getAllConfiguredModels?.() ?? [];
     return all.filter((m3) => !m3.isRuntimeModel && !m3.imageOnly).map((m3) => {
       const token = `${m3.authType}:${m3.id}`;
@@ -50643,9 +51314,9 @@ function ArenaStart({ config, onClose, onFillInput }) {
       };
     });
   }, [config]);
-  const [cursor, setCursor] = (0, import_react37.useState)(0);
-  const [checked, setChecked] = (0, import_react37.useState)(/* @__PURE__ */ new Set());
-  const [error, setError] = (0, import_react37.useState)(null);
+  const [cursor, setCursor] = (0, import_react38.useState)(0);
+  const [checked, setChecked] = (0, import_react38.useState)(/* @__PURE__ */ new Set());
+  const [error, setError] = (0, import_react38.useState)(null);
   const hasDisabledQwenOauth = modelItems.some((m3) => m3.disabled);
   const selectableCount = modelItems.filter((m3) => !m3.disabled).length;
   const needsMoreModels = selectableCount < 2;
@@ -50719,11 +51390,11 @@ __name(agentElapsedMs, "agentElapsedMs");
 function ArenaStatus({ config, onClose }) {
   const manager = config?.getArenaManager?.() ?? null;
   const { width } = useTerminalDimensions();
-  const [, setTick] = (0, import_react37.useState)(0);
+  const [, setTick] = (0, import_react38.useState)(0);
   const backend3 = manager?.getBackend();
   const isInProcess = backend3?.type === DISPLAY_MODE.IN_PROCESS;
   const inProcessBackend = isInProcess ? backend3 : null;
-  (0, import_react37.useEffect)(() => {
+  (0, import_react38.useEffect)(() => {
     const interval = isInProcess ? IN_PROCESS_REFRESH_INTERVAL_MS : STATUS_REFRESH_INTERVAL_MS;
     const timer = setInterval(() => setTick((t3) => t3 + 1), interval);
     return () => clearInterval(timer);
@@ -50804,7 +51475,7 @@ function ArenaStatus({ config, onClose }) {
 }
 __name(ArenaStatus, "ArenaStatus");
 function ArenaStop({ config, onClose, notify }) {
-  const [processing, setProcessing] = (0, import_react37.useState)(false);
+  const [processing, setProcessing] = (0, import_react38.useState)(false);
   const preserveDefault = config?.getAgentsSettings?.().arena?.preserveArtifacts ?? false;
   const items = [
     {
@@ -50818,7 +51489,7 @@ function ArenaStop({ config, onClose, notify }) {
       desc: "Keep worktrees and session files for later inspection"
     }
   ];
-  const [sel, setSel] = (0, import_react37.useState)(preserveDefault ? 1 : 0);
+  const [sel, setSel] = (0, import_react38.useState)(preserveDefault ? 1 : 0);
   const runStop = /* @__PURE__ */ __name(async (action) => {
     if (processing) return;
     setProcessing(true);
@@ -50950,17 +51621,17 @@ function AgentDetailedDiff({ result }) {
 __name(AgentDetailedDiff, "AgentDetailedDiff");
 function ArenaSelect({ config, onClose, notify }) {
   const manager = config?.getArenaManager?.() ?? null;
-  const agents = (0, import_react37.useMemo)(() => manager?.getAgentStates() ?? [], [manager]);
+  const agents = (0, import_react38.useMemo)(() => manager?.getAgentStates() ?? [], [manager]);
   const result = manager?.getResult();
-  const [sel, setSel] = (0, import_react37.useState)(
+  const [sel, setSel] = (0, import_react38.useState)(
     () => Math.max(
       0,
       agents.findIndex((a) => isSuccessStatus(a.status))
     )
   );
-  const [showPreview, setShowPreview] = (0, import_react37.useState)(false);
-  const [showDetailedDiff, setShowDetailedDiff] = (0, import_react37.useState)(false);
-  const rows = (0, import_react37.useMemo)(
+  const [showPreview, setShowPreview] = (0, import_react38.useState)(false);
+  const [showDetailedDiff, setShowDetailedDiff] = (0, import_react38.useState)(false);
+  const rows = (0, import_react38.useMemo)(
     () => agents.map((agent) => {
       let additions = 0;
       let deletions = 0;
@@ -51129,24 +51800,24 @@ __name(OpenTuiArenaDialog, "OpenTuiArenaDialog");
 
 // packages/cli/src/ui/opentui/dialogs-memory-status.tsx
 init_esbuild_shims();
-var import_react39 = __toESM(require_react(), 1);
-import fs3 from "node:fs";
-import path4 from "node:path";
+var import_react40 = __toESM(require_react(), 1);
+import fs4 from "node:fs";
+import path5 from "node:path";
 function resolvePreferredMemoryFile(dir) {
   const filenames = getAllGeminiMdFilenames();
   for (const filename of filenames) {
-    const filePath = path4.join(dir, filename);
+    const filePath = path5.join(dir, filename);
     try {
-      if (fs3.existsSync(filePath)) return filePath;
+      if (fs4.existsSync(filePath)) return filePath;
     } catch {
     }
   }
-  return path4.join(dir, filenames[0] ?? "QWEN.md");
+  return path5.join(dir, filenames[0] ?? "QWEN.md");
 }
 __name(resolvePreferredMemoryFile, "resolvePreferredMemoryFile");
 function useEsc2(onClose) {
   const renderer = useRenderer();
-  (0, import_react39.useLayoutEffect)(() => {
+  (0, import_react40.useLayoutEffect)(() => {
     const onRaw = /* @__PURE__ */ __name((seq) => {
       if (seq !== "\x1B") return false;
       onClose();
@@ -51200,7 +51871,7 @@ function OpenTuiMemoryDialog(props) {
   const toggle = /* @__PURE__ */ __name((k3) => readMemoryToggle(mem?.[k3], modes), "toggle");
   const cwd = config?.getWorkingDir?.() ?? process.cwd();
   const filenames = getAllGeminiMdFilenames();
-  const userMem = path4.join(
+  const userMem = path5.join(
     Storage.getGlobalQwenDir(),
     filenames[0] ?? "QWEN.md"
   );
@@ -51248,10 +51919,10 @@ __name(OpenTuiStatusLineDialog, "OpenTuiStatusLineDialog");
 
 // packages/cli/src/ui/opentui/dialogs-modes.tsx
 init_esbuild_shims();
-var import_react41 = __toESM(require_react(), 1);
+var import_react42 = __toESM(require_react(), 1);
 function useEsc3(onClose) {
   const renderer = useRenderer();
-  (0, import_react41.useLayoutEffect)(() => {
+  (0, import_react42.useLayoutEffect)(() => {
     const onRaw = /* @__PURE__ */ __name((seq) => {
       if (seq !== "\x1B") return false;
       onClose();
@@ -51323,7 +51994,7 @@ function OpenTuiApprovalModeDialog(props) {
   const { config, settings, onClose, onApprovalModeChanged } = props;
   const modes = APPROVAL_MODES;
   const current = config?.getApprovalMode?.();
-  const [sel, setSel] = (0, import_react41.useState)(
+  const [sel, setSel] = (0, import_react42.useState)(
     Math.max(0, modes.indexOf(current))
   );
   useEsc3(onClose);
@@ -51363,11 +52034,10 @@ var EFFORT_DESC = {
 };
 function OpenTuiEffortDialog(props) {
   const { config, settings, onClose } = props;
-  const tiers = REASONING_EFFORT_TIERS;
+  const tiers = config ? [...getReasoningEffortsForConfig(config)] : REASONING_EFFORT_TIERS;
   const currentEffort = config?.getReasoningEffort?.();
-  const [sel, setSel] = (0, import_react41.useState)(
-    currentEffort ? Math.max(0, tiers.indexOf(currentEffort)) : 0
-  );
+  const configuredIndex = currentEffort ? tiers.indexOf(currentEffort) : -1;
+  const [sel, setSel] = (0, import_react42.useState)(Math.max(0, configuredIndex));
   useEsc3(onClose);
   const pick = /* @__PURE__ */ __name(() => {
     const effort = tiers[sel];
@@ -51386,19 +52056,22 @@ function OpenTuiEffortDialog(props) {
     }
     onClose();
   }, "pick");
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Shell3, { title: "Reasoning Effort", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    RadioList2,
-    {
-      items: tiers.map((t3) => ({
-        key: t3,
-        label: String(t3),
-        desc: EFFORT_DESC[String(t3)]
-      })),
-      selected: sel,
-      onMove: (d3) => setSel((s) => Math.min(tiers.length - 1, Math.max(0, s + d3))),
-      onPick: pick
-    }
-  ) });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Shell3, { title: "Reasoning Effort", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      RadioList2,
+      {
+        items: tiers.map((t3) => ({
+          key: t3,
+          label: String(t3),
+          desc: EFFORT_DESC[String(t3)]
+        })),
+        selected: sel,
+        onMove: (d3) => setSel((s) => Math.min(tiers.length - 1, Math.max(0, s + d3))),
+        onPick: pick
+      }
+    ),
+    currentEffort && configuredIndex === -1 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: `${currentEffort} is not available for this model \u2014 using the model/provider default.` }) : null
+  ] });
 }
 __name(OpenTuiEffortDialog, "OpenTuiEffortDialog");
 var DEFAULT_STYLE_DESC = "The standard prompt, with no extra style";
@@ -51409,12 +52082,12 @@ function containsStyle(styles, name) {
 __name(containsStyle, "containsStyle");
 function OpenTuiOutputStyleDialog(props) {
   const { config, settings, onClose, notify } = props;
-  const [styles, setStyles] = (0, import_react41.useState)();
-  const onCloseRef = (0, import_react41.useRef)(onClose);
+  const [styles, setStyles] = (0, import_react42.useState)();
+  const onCloseRef = (0, import_react42.useRef)(onClose);
   onCloseRef.current = onClose;
-  const notifyRef = (0, import_react41.useRef)(notify);
+  const notifyRef = (0, import_react42.useRef)(notify);
   notifyRef.current = notify;
-  (0, import_react41.useEffect)(() => {
+  (0, import_react42.useEffect)(() => {
     let cancelled = false;
     void loadSessionOutputStyles(config).then(
       (loaded) => {
@@ -51450,8 +52123,8 @@ function OpenTuiOutputStyleDialog(props) {
       style
     }))
   ] : [];
-  const [sel, setSel] = (0, import_react41.useState)(0);
-  (0, import_react41.useEffect)(() => {
+  const [sel, setSel] = (0, import_react42.useState)(0);
+  (0, import_react42.useEffect)(() => {
     if (!styles) return;
     const wanted = current?.toLowerCase();
     const index = items.findIndex((item) => item.key.toLowerCase() === wanted);
@@ -51484,12 +52157,12 @@ function OpenTuiDialogMount(props) {
   const { request, host, config, settings, commands, onClose, notify } = props;
   const isHelp = request.dialog === "help";
   const dimensions = useTerminalDimensions();
-  const [permissions, setPermissions] = (0, import_react43.useState)(
+  const [permissions, setPermissions] = (0, import_react44.useState)(
     () => request.dialog === "permissions" ? buildPermissionsData(config) : null
   );
   const reloadPermissions = /* @__PURE__ */ __name(() => setPermissions(buildPermissionsData(config)), "reloadPermissions");
-  const [mcpServers, setMcpServers] = (0, import_react43.useState)([]);
-  (0, import_react43.useEffect)(() => {
+  const [mcpServers, setMcpServers] = (0, import_react44.useState)([]);
+  (0, import_react44.useEffect)(() => {
     if (request.dialog !== "mcp") return;
     let alive = true;
     const initial = buildMcpServers(config);
@@ -51513,14 +52186,14 @@ function OpenTuiDialogMount(props) {
       }
     );
   }, "runMcpAction");
-  const [extRows, setExtRows] = (0, import_react43.useState)(
+  const [extRows, setExtRows] = (0, import_react44.useState)(
     () => request.dialog === "extensions_manage" ? buildExtensionRows(config) : []
   );
-  const [extBusy, setExtBusy] = (0, import_react43.useState)(false);
-  const [extStatus, setExtStatus] = (0, import_react43.useState)(
+  const [extBusy, setExtBusy] = (0, import_react44.useState)(false);
+  const [extStatus, setExtStatus] = (0, import_react44.useState)(
     null
   );
-  const [extDiscoverFilter, setExtDiscoverFilter] = (0, import_react43.useState)(
+  const [extDiscoverFilter, setExtDiscoverFilter] = (0, import_react44.useState)(
     null
   );
   const reloadExtensions = /* @__PURE__ */ __name(() => setExtRows(buildExtensionRows(config)), "reloadExtensions");
@@ -51573,9 +52246,9 @@ function OpenTuiDialogMount(props) {
       }
     }
   }, "runExtensionAction");
-  const [modelError, setModelError] = (0, import_react43.useState)(null);
-  const [helpTab, setHelpTab] = (0, import_react43.useState)("commands");
-  const [helpScroll, setHelpScroll] = (0, import_react43.useState)(0);
+  const [modelError, setModelError] = (0, import_react44.useState)(null);
+  const [helpTab, setHelpTab] = (0, import_react44.useState)("commands");
+  const [helpScroll, setHelpScroll] = (0, import_react44.useState)(0);
   useKeyboard((key) => {
     if (!isHelp) return;
     const { name } = toOriginalKey(key);
@@ -51639,8 +52312,11 @@ function OpenTuiDialogMount(props) {
               onClose();
               return;
             }
-            if (props.onSelectSetting) props.onSelectSetting(name, scope);
-            else notify(`'${name}' opens a dialog this shell does not mount.`);
+            if (props.onSelectSetting) {
+              props.onSelectSetting(name, scope);
+              return;
+            }
+            notify(`'${name}' opens a dialog this shell does not mount.`);
             onClose();
           }
         }
@@ -51662,6 +52338,7 @@ function OpenTuiDialogMount(props) {
         {
           config,
           settings,
+          initialError: request.initialError,
           onClose,
           notify
         }
@@ -51897,8 +52574,8 @@ __name(OpenTuiDialogMount, "OpenTuiDialogMount");
 
 // packages/cli/src/ui/opentui/input-prompt.tsx
 init_esbuild_shims();
-var import_react45 = __toESM(require_react(), 1);
-import path5 from "node:path";
+var import_react46 = __toESM(require_react(), 1);
+import path6 from "node:path";
 
 // packages/cli/src/ui/opentui/input-history.ts
 init_esbuild_shims();
@@ -52039,12 +52716,17 @@ function OpenTuiInputPrompt(props) {
     onEscapeArmedChange,
     queueLength = 0,
     onPopQueue,
-    recentSlashCommands
+    recentSlashCommands,
+    promptSuggestion,
+    onPromptSuggestionDismiss,
+    onPromptSuggestionAbort,
+    shellModeActive = false,
+    onToggleShellMode
   } = props;
   const { width } = useTerminalDimensions();
   const renderer = useRenderer();
-  const editorRef = (0, import_react45.useRef)(null);
-  (0, import_react45.useEffect)(() => {
+  const editorRef = (0, import_react46.useRef)(null);
+  (0, import_react46.useEffect)(() => {
     if (!props.composerHandle) return;
     props.composerHandle.current = {
       getText: /* @__PURE__ */ __name(() => editorRef.current?.plainText ?? "", "getText"),
@@ -52056,39 +52738,59 @@ function OpenTuiInputPrompt(props) {
       if (props.composerHandle) props.composerHandle.current = null;
     };
   }, [props.composerHandle]);
-  const userMessagesRef = (0, import_react45.useRef)(userMessages);
+  const userMessagesRef = (0, import_react46.useRef)(userMessages);
   userMessagesRef.current = userMessages;
-  const recentSlashCommandsRef = (0, import_react45.useRef)(recentSlashCommands);
+  const recentSlashCommandsRef = (0, import_react46.useRef)(recentSlashCommands);
   recentSlashCommandsRef.current = recentSlashCommands;
-  const historyRef = (0, import_react45.useRef)(null);
+  const historyRef = (0, import_react46.useRef)(null);
   if (!historyRef.current) {
     historyRef.current = new InputHistory(() => userMessagesRef.current);
   }
-  const escapeRef = (0, import_react45.useRef)(null);
+  const escapeRef = (0, import_react46.useRef)(null);
   if (!escapeRef.current) {
     escapeRef.current = new EscapeClearModel();
   }
-  const [textVersion, setTextVersion] = (0, import_react45.useState)(0);
-  const [suggestions, setSuggestions] = (0, import_react45.useState)([]);
-  const [activeIndex, setActiveIndex] = (0, import_react45.useState)(0);
-  const [loadingSuggestions, setLoadingSuggestions] = (0, import_react45.useState)(false);
-  const [escapeArmed, setEscapeArmed] = (0, import_react45.useState)(false);
-  const [attachments, setAttachments] = (0, import_react45.useState)([]);
-  const completionModeRef = (0, import_react45.useRef)("IDLE" /* IDLE */);
-  const historyRestoredTextRef = (0, import_react45.useRef)(null);
-  const dismissedUntilChangeRef = (0, import_react45.useRef)(null);
-  const fileSearchRef = (0, import_react45.useRef)(null);
-  const fileSearchReadyRef = (0, import_react45.useRef)(null);
-  const atSearchSeqRef = (0, import_react45.useRef)(0);
-  const commandsRef = (0, import_react45.useRef)([]);
-  const slashRangeRef = (0, import_react45.useRef)(null);
-  const slashSearchSeqRef = (0, import_react45.useRef)(0);
-  const suggestionNavigatedRef = (0, import_react45.useRef)(false);
-  const pendingPastesRef = (0, import_react45.useRef)(/* @__PURE__ */ new Map());
-  const activePlaceholderIdsRef = (0, import_react45.useRef)(/* @__PURE__ */ new Map());
-  const chrome = promptChrome(approvalMode);
+  const [textVersion, setTextVersion] = (0, import_react46.useState)(0);
+  const [suggestions, setSuggestions] = (0, import_react46.useState)([]);
+  const [activeIndex, setActiveIndex] = (0, import_react46.useState)(0);
+  const [loadingSuggestions, setLoadingSuggestions] = (0, import_react46.useState)(false);
+  const [escapeArmed, setEscapeArmed] = (0, import_react46.useState)(false);
+  const [attachments, setAttachments] = (0, import_react46.useState)([]);
+  const completionModeRef = (0, import_react46.useRef)("IDLE" /* IDLE */);
+  const historyRestoredTextRef = (0, import_react46.useRef)(null);
+  const dismissedUntilChangeRef = (0, import_react46.useRef)(null);
+  const fileSearchRef = (0, import_react46.useRef)(null);
+  const fileSearchReadyRef = (0, import_react46.useRef)(null);
+  const atSearchSeqRef = (0, import_react46.useRef)(0);
+  const commandsRef = (0, import_react46.useRef)([]);
+  const slashRangeRef = (0, import_react46.useRef)(null);
+  const slashSearchSeqRef = (0, import_react46.useRef)(0);
+  const suggestionNavigatedRef = (0, import_react46.useRef)(false);
+  const pendingPastesRef = (0, import_react46.useRef)(/* @__PURE__ */ new Map());
+  const activePlaceholderIdsRef = (0, import_react46.useRef)(/* @__PURE__ */ new Map());
+  const {
+    state: followupState,
+    accept: acceptFollowup,
+    dismiss: dismissFollowup,
+    recordKeystroke: recordFollowupKeystroke,
+    setSuggestion: setFollowupSuggestion
+  } = useFollowupSuggestionsCLI({
+    config,
+    isFocused: focus,
+    onAccept: /* @__PURE__ */ __name((suggestion) => {
+      const el = editorRef.current;
+      if (!el) return;
+      el.insertText(suggestion);
+      setTextVersion((v3) => v3 + 1);
+    }, "onAccept")
+  });
+  (0, import_react46.useEffect)(() => {
+    setFollowupSuggestion(promptSuggestion ?? null);
+  }, [setFollowupSuggestion, promptSuggestion]);
+  const availableSuggestion = followupState.isVisible || promptSuggestion ? followupState.suggestion ?? promptSuggestion ?? null : null;
+  const chrome = shellModeActive ? { prefix: "!", color: C2.accent, statusText: t("Shell mode") } : promptChrome(approvalMode);
   const borderColor = chrome.color ?? C2.accent;
-  (0, import_react45.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     let cancelled = false;
     loadInteractiveCommands(config ?? null).then((commands) => {
       if (!cancelled) commandsRef.current = commands;
@@ -52099,7 +52801,7 @@ function OpenTuiInputPrompt(props) {
     };
   }, [config]);
   const projectRoot = config?.getTargetDir() ?? process.cwd();
-  const ensureFileSearch = (0, import_react45.useCallback)(() => {
+  const ensureFileSearch = (0, import_react46.useCallback)(() => {
     if (fileSearchReadyRef.current) return fileSearchReadyRef.current;
     const searcher = FileSearchFactory.create({
       projectRoot,
@@ -52119,7 +52821,7 @@ function OpenTuiInputPrompt(props) {
     });
     return fileSearchReadyRef.current;
   }, [config, projectRoot]);
-  (0, import_react45.useEffect)(
+  (0, import_react46.useEffect)(
     () => () => {
       void fileSearchRef.current?.dispose?.();
       fileSearchRef.current = null;
@@ -52127,7 +52829,7 @@ function OpenTuiInputPrompt(props) {
     },
     []
   );
-  const currentCompletionTarget = (0, import_react45.useCallback)(() => {
+  const currentCompletionTarget = (0, import_react46.useCallback)(() => {
     const el = editorRef.current;
     if (!el) return null;
     const text = el.plainText;
@@ -52142,7 +52844,7 @@ function OpenTuiInputPrompt(props) {
       commandsRef.current
     );
   }, []);
-  const refreshCompletion = (0, import_react45.useCallback)(() => {
+  const refreshCompletion = (0, import_react46.useCallback)(() => {
     const el = editorRef.current;
     if (!el) return;
     const text = el.plainText;
@@ -52217,7 +52919,7 @@ function OpenTuiInputPrompt(props) {
       }
     });
   }, [ensureFileSearch, config, currentCompletionTarget]);
-  (0, import_react45.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     const el = editorRef.current;
     if (!el || textVersion === 0) return;
     if (historyRestoredTextRef.current !== null && el.plainText !== historyRestoredTextRef.current) {
@@ -52225,10 +52927,10 @@ function OpenTuiInputPrompt(props) {
     }
     refreshCompletion();
   }, [textVersion, refreshCompletion]);
-  (0, import_react45.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     refreshCompletion();
   }, [recentSlashCommands, refreshCompletion]);
-  const applyTextToEditor = (0, import_react45.useCallback)((line, cursorCol) => {
+  const applyTextToEditor = (0, import_react46.useCallback)((line, cursorCol) => {
     const el = editorRef.current;
     if (!el) return;
     const cursor = el.logicalCursor;
@@ -52242,7 +52944,7 @@ function OpenTuiInputPrompt(props) {
     }
     setTextVersion((v3) => v3 + 1);
   }, []);
-  const acceptSuggestion = (0, import_react45.useCallback)(
+  const acceptSuggestion = (0, import_react46.useCallback)(
     (index, viaEnter) => {
       const el = editorRef.current;
       const suggestion = suggestions[index];
@@ -52277,6 +52979,8 @@ function OpenTuiInputPrompt(props) {
         setSuggestions([]);
         setAttachments([]);
         onSubmit(finalText, images.length > 0 ? images : void 0);
+        dismissFollowup();
+        onPromptSuggestionDismiss?.();
         return;
       }
       const apply = /* @__PURE__ */ __name(() => {
@@ -52292,10 +52996,12 @@ function OpenTuiInputPrompt(props) {
       applyTextToEditor,
       onSubmit,
       attachments,
-      currentCompletionTarget
+      currentCompletionTarget,
+      dismissFollowup,
+      onPromptSuggestionDismiss
     ]
   );
-  const handleClipboardImage = (0, import_react45.useCallback)(async () => {
+  const handleClipboardImage = (0, import_react46.useCallback)(async () => {
     try {
       if (!await clipboardHasImage()) return;
       const imagePath = await saveClipboardImage(Storage.getGlobalTempDir());
@@ -52307,13 +53013,13 @@ function OpenTuiInputPrompt(props) {
         {
           id: `${Date.now()}-${prev.length}`,
           path: imagePath,
-          filename: path5.basename(imagePath)
+          filename: path6.basename(imagePath)
         }
       ]);
     } catch {
     }
   }, []);
-  (0, import_react45.useLayoutEffect)(() => {
+  (0, import_react46.useLayoutEffect)(() => {
     const onRawInput = /* @__PURE__ */ __name((sequence) => {
       if (!focus) return false;
       if (isDeleteWordBackwardSequence(sequence)) {
@@ -52364,12 +53070,16 @@ function OpenTuiInputPrompt(props) {
     renderer.addInputHandler(onRawInput);
     return () => renderer.removeInputHandler(onRawInput);
   }, [renderer, focus]);
-  (0, import_react45.useLayoutEffect)(() => {
+  (0, import_react46.useLayoutEffect)(() => {
     const onPaste = /* @__PURE__ */ __name((event) => {
       if (!focus) return;
       const el = editorRef.current;
       if (!el) return;
       const pasted = normalizePastedText(decodePasteBytes(event.bytes));
+      if (el.plainText.length === 0 && availableSuggestion) {
+        dismissFollowup();
+        onPromptSuggestionDismiss?.();
+      }
       if (!isLargePaste(pasted)) return;
       event.preventDefault();
       const charCount = [...pasted].length;
@@ -52385,7 +53095,15 @@ function OpenTuiInputPrompt(props) {
     return () => {
       renderer.keyInput.off("paste", onPaste);
     };
-  }, [renderer, focus]);
+  }, [
+    renderer,
+    focus,
+    // availableSuggestion/dismissFollowup/onPromptSuggestionDismiss are read
+    // in the handler: resubscribe when they change or the closure goes stale.
+    availableSuggestion,
+    dismissFollowup,
+    onPromptSuggestionDismiss
+  ]);
   useKeyboard((key) => {
     if (!focus) return;
     const el = editorRef.current;
@@ -52410,6 +53128,14 @@ function OpenTuiInputPrompt(props) {
         acceptSuggestion(activeIndex, true);
         return;
       }
+      if (el.plainText.length === 0 && availableSuggestion) {
+        key.preventDefault();
+        acceptFollowup("enter", {
+          fallbackText: promptSuggestion ?? void 0
+        });
+        onPromptSuggestionDismiss?.();
+        return;
+      }
       const decision = decideSubmit(
         el.plainText,
         displayOffsetToCodePointIndex(el.plainText, el.cursorOffset)
@@ -52443,6 +53169,8 @@ function OpenTuiInputPrompt(props) {
       setSuggestions([]);
       setLoadingSuggestions(false);
       onSubmit(finalText, images.length > 0 ? images : void 0);
+      dismissFollowup();
+      onPromptSuggestionDismiss?.();
       key.preventDefault();
       return;
     }
@@ -52457,7 +53185,17 @@ function OpenTuiInputPrompt(props) {
       key.preventDefault();
       return;
     }
+    if (key.sequence === "!" && key.eventType !== "release" && el.plainText.length === 0 && suggestions.length === 0 && onToggleShellMode) {
+      onToggleShellMode();
+      key.preventDefault();
+      return;
+    }
     if (isPrintableKeyInput(key)) {
+      if (el.plainText.length === 0 && availableSuggestion) {
+        recordFollowupKeystroke();
+        dismissFollowup();
+        onPromptSuggestionAbort?.();
+      }
       el.insertText(key.sequence);
       setTextVersion((v3) => v3 + 1);
       key.preventDefault();
@@ -52473,6 +53211,11 @@ function OpenTuiInputPrompt(props) {
     }
     if (key.name === "escape") {
       key.preventDefault();
+      if (shellModeActive) {
+        onToggleShellMode?.();
+        if (streaming) onInterrupt?.();
+        return;
+      }
       if (streaming) {
         onInterrupt?.();
         return;
@@ -52509,6 +53252,7 @@ ${current}` : popped);
     }
     const navigationUp = key.name === "up" && !key.shift && !key.ctrl || key.name === "p" && !!key.ctrl;
     const navigationDown = key.name === "down" && !key.shift && !key.ctrl || key.name === "n" && !!key.ctrl;
+    const historyNavActive = !shellModeActive;
     const showing = suggestions.length > 0;
     if (showing && (navigationUp || navigationDown)) {
       key.preventDefault();
@@ -52526,7 +53270,19 @@ ${current}` : popped);
       acceptSuggestion(activeIndex, false);
       return;
     }
-    if (navigationUp && queueLength > 0) {
+    if (!showing && key.name === "tab" && !key.shift && el.plainText.length === 0 && availableSuggestion) {
+      key.preventDefault();
+      acceptFollowup("tab", { fallbackText: promptSuggestion ?? void 0 });
+      onPromptSuggestionDismiss?.();
+      return;
+    }
+    if (key.name === "right" && !key.ctrl && !key.meta && el.plainText.length === 0 && availableSuggestion) {
+      key.preventDefault();
+      acceptFollowup("right", { fallbackText: promptSuggestion ?? void 0 });
+      onPromptSuggestionDismiss?.();
+      return;
+    }
+    if (historyNavActive && navigationUp && queueLength > 0) {
       const topCursor = el.logicalCursor;
       if (topCursor.row === 0 && topCursor.col === 0) {
         const popped = onPopQueue?.();
@@ -52540,7 +53296,7 @@ ${current}` : popped);
         }
       }
     }
-    if (navigationUp) {
+    if (historyNavActive && navigationUp) {
       const cursor = el.logicalCursor;
       const decision = historyUpDecision(
         historyRef.current,
@@ -52564,7 +53320,7 @@ ${current}` : popped);
       setTextVersion((v3) => v3 + 1);
       return;
     }
-    if (navigationDown) {
+    if (historyNavActive && navigationDown) {
       const cursor = el.logicalCursor;
       const lastLine = el.plainText.split("\n").pop() ?? "";
       const decision = historyDownDecision(
@@ -52589,45 +53345,11 @@ ${current}` : popped);
       return;
     }
   });
-  const handleSubmit = (0, import_react45.useCallback)(() => {
-    const el = editorRef.current;
-    if (!el) return;
-    const text = el.plainText;
-    const decision = decideSubmit(
-      text,
-      displayOffsetToCodePointIndex(text, el.cursorOffset)
-    );
-    if (decision.kind === "noop") return;
-    if (decision.kind === "newline-continuation") {
-      el.deleteCharBackward();
-      el.newLine();
-      setTextVersion((v3) => v3 + 1);
-      return;
-    }
-    let finalText = decision.text.trim();
-    if (pendingPastesRef.current.size > 0) {
-      finalText = expandPendingPastePlaceholders(
-        finalText,
-        pendingPastesRef.current
-      );
-      pendingPastesRef.current.clear();
-      activePlaceholderIdsRef.current.clear();
-    }
-    const images = attachments.map((a) => a.path);
-    el.clear();
-    setTextVersion((v3) => v3 + 1);
-    historyRef.current?.reset();
-    historyRestoredTextRef.current = null;
-    setSuggestions([]);
-    setLoadingSuggestions(false);
-    setAttachments([]);
-    onSubmit(finalText, images.length > 0 ? images : void 0);
-  }, [onSubmit, attachments]);
-  (0, import_react45.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     const el = editorRef.current;
     if (el) el.textColor = C2.text;
   }, []);
-  (0, import_react45.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     const el = editorRef.current;
     if (el) {
       el.keyBindings = [
@@ -52680,14 +53402,13 @@ ${current}` : popped);
               flexGrow: 1,
               minHeight: 1,
               maxHeight: 8,
-              placeholder,
+              placeholder: availableSuggestion ?? placeholder,
               placeholderColor: C2.dim,
               textColor: C2.text,
               cursorColor: C2.accent,
               selectionBg: C2.selectionBg,
               selectionFg: C2.selectionFg,
               wrapMode: "char",
-              onSubmit: handleSubmit,
               onContentChange: () => setTextVersion((v3) => v3 + 1),
               onCursorChange: () => setTextVersion((v3) => v3 + 1),
               keyBindings: [
@@ -52745,7 +53466,7 @@ __name(OpenTuiInputPrompt, "OpenTuiInputPrompt");
 
 // packages/cli/src/ui/opentui/dialogs-confirm.tsx
 init_esbuild_shims();
-var import_react47 = __toESM(require_react(), 1);
+var import_react48 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/diff-render.ts
 init_esbuild_shims();
@@ -52841,279 +53562,9 @@ function renderDiffBody(fileDiff) {
 }
 __name(renderDiffBody, "renderDiffBody");
 
-// packages/cli/src/ui/opentui/messages.tsx
-init_esbuild_shims();
-var TOOL_STATUS = {
-  SUCCESS: "\u2713",
-  PENDING: "o",
-  EXECUTING: "\u22B7",
-  CONFIRMING: "?",
-  CANCELED: "-",
-  ERROR: "x"
-};
-var MESSAGE_ICON = {
-  DIAMOND: "\u25C6",
-  THEREFORE: "\u2234",
-  BECAUSE: "\u2235",
-  CIRCLE_FILLED: "\u25CF"
-};
-var STATUS_INDICATOR_WIDTH = 2;
-var selectionProps = /* @__PURE__ */ __name(() => ({
-  selectionBg: C2.selectionBg,
-  selectionFg: C2.selectionFg
-}), "selectionProps");
-var STRIKETHROUGH_ATTR = 128;
-var TODO_STATUS_ICONS = {
-  pending: ICON.CIRCLE_EMPTY,
-  in_progress: ICON.CIRCLE_LEFT_HALF,
-  completed: ICON.CIRCLE_FILLED
-};
-var MAX_RESULT_DISPLAY_CHARACTERS = 1e6;
-function maxHistoryItemRows(terminalHeight) {
-  return Math.max(Math.floor(terminalHeight) * 4, 100);
-}
-__name(maxHistoryItemRows, "maxHistoryItemRows");
-function truncateResultDisplayChars(text) {
-  return text.length > MAX_RESULT_DISPLAY_CHARACTERS ? "..." + text.slice(-MAX_RESULT_DISPLAY_CHARACTERS) : text;
-}
-__name(truncateResultDisplayChars, "truncateResultDisplayChars");
-function tailWindow(lines, maxRows) {
-  const target = Math.max(Math.round(maxRows), 2);
-  if (lines.length <= target) return { visible: lines, hiddenCount: 0 };
-  const visibleContentHeight = target - 1;
-  return {
-    visible: lines.slice(lines.length - visibleContentHeight),
-    hiddenCount: lines.length - visibleContentHeight
-  };
-}
-__name(tailWindow, "tailWindow");
-function hiddenLinesLabel(hiddenCount) {
-  return `... first ${hiddenCount} line${hiddenCount === 1 ? "" : "s"} hidden ...`;
-}
-__name(hiddenLinesLabel, "hiddenLinesLabel");
-function toolCardName(rawName) {
-  return TOOL_DISPLAY_BY_NAME[rawName] ?? rawName;
-}
-__name(toolCardName, "toolCardName");
-var GENERIC_TOOL_SUMMARIES = /* @__PURE__ */ new Set([
-  "ok",
-  "error",
-  "cancelled",
-  "canceled",
-  "interrupted",
-  "skipped"
-]);
-function toolCardSummarySuffix(done, summary) {
-  if (!done || !summary || GENERIC_TOOL_SUMMARIES.has(summary)) return "";
-  return ` \xB7 ${summary}`;
-}
-__name(toolCardSummarySuffix, "toolCardSummarySuffix");
-function toolCardText(v3) {
-  return sanitizeMultilineForDisplay(v3.replace(/\s*\n\s*/g, " ").trim());
-}
-__name(toolCardText, "toolCardText");
-function toolCardDescription(rawName, args) {
-  let parsed = {};
-  try {
-    parsed = JSON.parse(args ?? "{}");
-  } catch {
-    return "";
-  }
-  const str = /* @__PURE__ */ __name((v3) => typeof v3 === "string" && v3.length > 0 ? v3 : void 0, "str");
-  const oneLine = toolCardText;
-  switch (rawName) {
-    case "run_shell_command": {
-      const cmd = str(parsed["command"] ?? parsed["cmd"]);
-      if (!cmd) return "";
-      const desc = str(parsed["description"]);
-      return desc ? `${oneLine(cmd)} (${oneLine(desc)})` : oneLine(cmd);
-    }
-    case "read_file":
-    case "write_file":
-    case "edit":
-    case "notebook_edit": {
-      const p2 = str(
-        parsed["file_path"] ?? parsed["path"] ?? parsed["filePath"]
-      );
-      return p2 ? oneLine(p2) : "";
-    }
-    case "list_directory":
-    case "glob": {
-      const p2 = str(parsed["path"] ?? parsed["dir"] ?? parsed["pattern"]);
-      return p2 ? oneLine(p2) : "";
-    }
-    case "grep_search": {
-      const pat = str(parsed["pattern"]);
-      return pat ? oneLine(pat) : "";
-    }
-    default:
-      return "";
-  }
-}
-__name(toolCardDescription, "toolCardDescription");
-function userMessageMeta() {
-  return { glyph: ">", color: C2.purple };
-}
-__name(userMessageMeta, "userMessageMeta");
-function assistantMessageMeta() {
-  return { glyph: MESSAGE_ICON.DIAMOND, color: C2.purple };
-}
-__name(assistantMessageMeta, "assistantMessageMeta");
-function thinkingMeta(done, expanded, clickable) {
-  const expandHint = clickable ? "(click or ctrl+o to expand)" : "(ctrl+o to expand)";
-  if (!done) {
-    return {
-      icon: MESSAGE_ICON.BECAUSE,
-      label: "Thinking\u2026",
-      hint: "",
-      color: C2.dim,
-      collapsed: false
-    };
-  }
-  if (!expanded) {
-    return {
-      icon: MESSAGE_ICON.THEREFORE,
-      label: "Thought",
-      hint: expandHint,
-      color: C2.dim,
-      collapsed: true
-    };
-  }
-  return {
-    icon: MESSAGE_ICON.THEREFORE,
-    label: "Thought",
-    hint: "(ctrl+o to collapse)",
-    color: C2.dim,
-    collapsed: false
-  };
-}
-__name(thinkingMeta, "thinkingMeta");
-function toolStatusMeta(item) {
-  if (item.confirm === "pending" && !item.done) {
-    return {
-      glyph: TOOL_STATUS.CONFIRMING,
-      color: C2.yellow,
-      strikethrough: false
-    };
-  }
-  if (!item.done) {
-    return {
-      glyph: TOOL_STATUS.EXECUTING,
-      color: C2.text,
-      strikethrough: false
-    };
-  }
-  if (item.success) {
-    return { glyph: TOOL_STATUS.SUCCESS, color: C2.green, strikethrough: false };
-  }
-  const canceled = item.summary === "interrupted" || item.summary === "canceled" || item.summary === "cancelled";
-  if (canceled) {
-    return { glyph: TOOL_STATUS.CANCELED, color: C2.text, strikethrough: true };
-  }
-  return { glyph: TOOL_STATUS.ERROR, color: C2.red, strikethrough: false };
-}
-__name(toolStatusMeta, "toolStatusMeta");
-function TodoRows({ todos }) {
-  if (todos.length === 0) {
-    return null;
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "column", children: todos.map((todo) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TodoItemRow, { todo }, todo.id)) });
-}
-__name(TodoRows, "TodoRows");
-function TodoItemRow({ todo }) {
-  const statusIcon = TODO_STATUS_ICONS[todo.status];
-  const isCompleted = todo.status === "completed";
-  const isInProgress = todo.status === "in_progress";
-  const itemColor = isCompleted ? C2.text : isInProgress ? C2.green : C2.text;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", minHeight: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { width: 3, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: itemColor, ...selectionProps(), children: statusIcon }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      "text",
-      {
-        fg: itemColor,
-        attributes: isCompleted ? STRIKETHROUGH_ATTR : 0,
-        ...selectionProps(),
-        children: todo.content
-      }
-    ) })
-  ] });
-}
-__name(TodoItemRow, "TodoItemRow");
-var ANSI_DEFAULT_HEIGHT = 24;
-function truncateTokenLine(line, maxWidth) {
-  if (maxWidth <= 0) return [];
-  let width = 0;
-  const kept = [];
-  for (const token of line) {
-    const tokenWidth = getCachedStringWidth(token.text);
-    if (width + tokenWidth <= maxWidth) {
-      if (tokenWidth > 0 || kept.length === 0) kept.push(token);
-      width += tokenWidth;
-      continue;
-    }
-    let partial = "";
-    for (const cp of toCodePoints(token.text)) {
-      const cpWidth = getCachedStringWidth(cp);
-      if (width + cpWidth > maxWidth) break;
-      partial += cp;
-      width += cpWidth;
-    }
-    if (partial) kept.push({ ...token, text: partial });
-    break;
-  }
-  return kept;
-}
-__name(truncateTokenLine, "truncateTokenLine");
-function ansiTokenProps(token) {
-  const fg2 = token.inverse ? token.bg : token.fg;
-  const bg2 = token.inverse ? token.fg : token.bg;
-  return {
-    fg: fg2 || void 0,
-    bg: bg2 || void 0,
-    attributes: (token.bold ? 1 : 0) | (token.dim ? 2 : 0) | (token.italic ? 4 : 0) | (token.underline ? 8 : 0)
-  };
-}
-__name(ansiTokenProps, "ansiTokenProps");
-function AnsiRows({
-  grid,
-  maxWidth,
-  totalLines,
-  totalBytes
-}) {
-  const windowed = tailWindow(grid, ANSI_DEFAULT_HEIGHT);
-  const stats = [];
-  if (totalLines && totalLines > ANSI_DEFAULT_HEIGHT) {
-    stats.push(`+${totalLines - ANSI_DEFAULT_HEIGHT} lines`);
-  }
-  if (totalBytes && totalBytes > 0) {
-    stats.push(formatMemoryUsage(totalBytes));
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
-    windowed.hiddenCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, ...selectionProps(), children: hiddenLinesLabel(windowed.hiddenCount) }),
-    windowed.visible.map((line, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "row", children: truncateTokenLine(line, maxWidth).map((token, j3) => {
-      const style = ansiTokenProps(token);
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        "text",
-        {
-          fg: style.fg ?? C2.text,
-          bg: style.bg,
-          attributes: style.attributes,
-          ...selectionProps(),
-          children: token.text
-        },
-        `${j3}`
-      );
-    }) }, `${i}`)),
-    stats.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "row", children: stats.map((part, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
-      i > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { children: " " }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, ...selectionProps(), children: part })
-    ] }, `${i}`)) })
-  ] });
-}
-__name(AnsiRows, "AnsiRows");
-
 // packages/cli/src/ui/opentui/dialogs-confirm.tsx
 var MAX_BODY_ROWS = 20;
+var EXPANDED_BODY_RESERVE_ROWS = 20;
 function buildOutcomeOptions(details) {
   const options = [
     { label: t("Yes, allow once"), value: "proceed_once" /* ProceedOnce */ }
@@ -53136,7 +53587,7 @@ function buildOutcomeOptions(details) {
 }
 __name(buildOutcomeOptions, "buildOutcomeOptions");
 function DiffBody({ fileDiff }) {
-  const lines = (0, import_react47.useMemo)(() => renderDiffBody(fileDiff), [fileDiff]);
+  const lines = (0, import_react48.useMemo)(() => renderDiffBody(fileDiff), [fileDiff]);
   const window = tailWindow(lines, MAX_BODY_ROWS);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
     window.hiddenCount > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -53151,12 +53602,45 @@ function DiffBody({ fileDiff }) {
 }
 __name(DiffBody, "DiffBody");
 function TextBody({ text }) {
-  const rows = (0, import_react47.useMemo)(() => {
-    const clean = sanitizeTerminalText(text);
-    const window = tailWindow(clean.split("\n"), MAX_BODY_ROWS);
-    return window.visible;
-  }, [text]);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "column", children: rows.map((row, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { children: row }, `${i}`)) });
+  const [expanded, setExpanded] = (0, import_react48.useState)(false);
+  const { width, height } = useTerminalDimensions();
+  const rows = (0, import_react48.useMemo)(() => sanitizeTerminalText(text).split("\n"), [text]);
+  const window = (0, import_react48.useMemo)(
+    () => headWindowPhysical(rows, width, MAX_BODY_ROWS),
+    [rows, width]
+  );
+  const expandedWindow = (0, import_react48.useMemo)(
+    () => tailWindowPhysical(
+      rows,
+      width,
+      Math.max(height - EXPANDED_BODY_RESERVE_ROWS, 1)
+    ),
+    [rows, width, height]
+  );
+  const canExpand = window.hiddenRows > 0 && expandedWindow.hiddenRows < window.hiddenRows;
+  useKeyboard((key) => {
+    if (key.ctrl && toOriginalKey(key).name === "s" && canExpand) {
+      setExpanded(true);
+    }
+  });
+  if (expanded) {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
+      expandedWindow.visible.map((row, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { children: row }, `${i}`)),
+      expandedWindow.hiddenRows > 0 ? (
+        // The tail window keeps the LAST rows, so what it drops is the
+        // head — the same label the transcript's tail windows use (R5-1).
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: hiddenLinesLabel(expandedWindow.hiddenRows) })
+      ) : null
+    ] });
+  }
+  if (window.hiddenRows === 0) {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { flexDirection: "column", children: rows.map((row, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { children: row }, `${i}`)) });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
+    window.visible.map((row, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { children: row }, `${i}`)),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: hiddenTailLinesLabel(window.hiddenRows) }),
+    canExpand ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: "Press ctrl-s to show more lines" }) : null
+  ] });
 }
 __name(TextBody, "TextBody");
 function ConfirmationBody({
@@ -53176,6 +53660,15 @@ function ConfirmationBody({
       ] });
     case "mcp":
       return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { children: sanitizeTerminalText(
+          t(
+            'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?',
+            {
+              tool: details.toolName,
+              server: details.serverName
+            }
+          )
+        ) }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.accent, attributes: 1, children: sanitizeTerminalText(details.toolDisplayName) }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: sanitizeTerminalText(
           `${details.serverName} \xB7 ${details.toolName}`
@@ -53198,7 +53691,7 @@ function ConfirmationBody({
 }
 __name(ConfirmationBody, "ConfirmationBody");
 function OutcomeSelect(props) {
-  const items = (0, import_react47.useMemo)(
+  const items = (0, import_react48.useMemo)(
     () => props.options.map((option, index) => ({
       key: `${option.value}-${index}`,
       value: option.value,
@@ -53231,8 +53724,8 @@ __name(OutcomeSelect, "OutcomeSelect");
 function OpenTuiToolConfirmation(props) {
   const { call, onSettled } = props;
   const details = call.confirmationDetails;
-  const settledRef = (0, import_react47.useRef)(false);
-  const settle = (0, import_react47.useCallback)(
+  const settledRef = (0, import_react48.useRef)(false);
+  const settle = (0, import_react48.useCallback)(
     (outcome, payload) => {
       if (settledRef.current) return;
       settledRef.current = true;
@@ -53286,12 +53779,12 @@ function OpenTuiToolConfirmation(props) {
 __name(OpenTuiToolConfirmation, "OpenTuiToolConfirmation");
 function AskUserQuestionFlow(props) {
   const { details, onAnswered } = props;
-  const [index, setIndex] = (0, import_react47.useState)(0);
-  const [answers, setAnswers] = (0, import_react47.useState)({});
-  const [selected, setSelected] = (0, import_react47.useState)(/* @__PURE__ */ new Set());
+  const [index, setIndex] = (0, import_react48.useState)(0);
+  const [answers, setAnswers] = (0, import_react48.useState)({});
+  const [selected, setSelected] = (0, import_react48.useState)(/* @__PURE__ */ new Set());
   const question = details.questions[index];
   const isMulti = question?.multiSelect === true;
-  const commitQuestion = (0, import_react47.useCallback)(
+  const commitQuestion = (0, import_react48.useCallback)(
     (value) => {
       if (value === void 0) return;
       const nextAnswers = { ...answers, [index]: value };
@@ -53309,7 +53802,7 @@ function AskUserQuestionFlow(props) {
     },
     [answers, index, details.questions.length, onAnswered]
   );
-  const items = (0, import_react47.useMemo)(
+  const items = (0, import_react48.useMemo)(
     () => (question?.options ?? []).map((option, i) => ({
       key: `${option.label}-${i}`,
       value: option.label
@@ -53344,7 +53837,7 @@ function AskUserQuestionFlow(props) {
       commitQuestion([...selected].join(", "));
     }
   });
-  (0, import_react47.useEffect)(() => {
+  (0, import_react48.useEffect)(() => {
     if (details.questions.length === 0 || !question?.options?.length) {
       onAnswered(null);
     }
@@ -53387,7 +53880,7 @@ function AskUserQuestionFlow(props) {
 __name(AskUserQuestionFlow, "AskUserQuestionFlow");
 function OpenTuiShellConfirmation(props) {
   const { commands, onResolve } = props;
-  const options = (0, import_react47.useMemo)(
+  const options = (0, import_react48.useMemo)(
     () => [
       {
         label: t("Yes, allow once"),
@@ -53434,7 +53927,7 @@ function OpenTuiShellConfirmation(props) {
 __name(OpenTuiShellConfirmation, "OpenTuiShellConfirmation");
 function OpenTuiActionConfirmation(props) {
   const { prompt, onResolve } = props;
-  const options = (0, import_react47.useMemo)(
+  const options = (0, import_react48.useMemo)(
     () => [
       { key: "yes", value: true },
       { key: "no", value: false }
@@ -53497,17 +53990,83 @@ function OpenTuiApp(props) {
     onPopQueue,
     waitingToolCalls,
     onToolCallSettled,
-    onRenderError
+    onRenderError,
+    promptSuggestion,
+    onPromptSuggestionDismiss,
+    onPromptSuggestionAbort
   } = props;
-  const [dialog, setDialog] = (0, import_react49.useState)(null);
-  const [noticeText, setNoticeText] = (0, import_react49.useState)(null);
-  const [commandList, setCommandList] = (0, import_react49.useState)(
+  const [dialog, setDialog] = (0, import_react50.useState)(
+    props.initialDialog ?? null
+  );
+  const [noticeText, setNoticeText] = (0, import_react50.useState)(null);
+  const [commandList, setCommandList] = (0, import_react50.useState)(
     commands ?? []
   );
-  const notify = (0, import_react49.useCallback)((text) => setNoticeText(text), []);
-  const [modals, setModals] = (0, import_react49.useState)([]);
-  const modalSeq = (0, import_react49.useRef)(0);
-  const confirmations = (0, import_react49.useMemo)(
+  const notify = (0, import_react50.useCallback)((text) => setNoticeText(text), []);
+  const [shellModeActive, setShellModeActive] = (0, import_react50.useState)(false);
+  const shellControllersRef = (0, import_react50.useRef)(/* @__PURE__ */ new Set());
+  const { width: terminalWidth, height: terminalHeight } = useTerminalDimensions();
+  const toggleShellMode = (0, import_react50.useCallback)(
+    () => setShellModeActive((active) => !active),
+    []
+  );
+  const runShellCommand = (0, import_react50.useCallback)(
+    (command) => {
+      const emit = props.onTranscriptEvent;
+      if (!emit) return;
+      const controller = new AbortController();
+      shellControllersRef.current.add(controller);
+      return executeUserShell(
+        config,
+        command,
+        emit,
+        controller.signal,
+        // The `!` row renders behind the 2-col input indicator, and the child
+        // runs over that inner width (ink parity: it also passes the raw
+        // terminal width to its `!` child — no SHELL_WIDTH_FRACTION here,
+        // which only reaches the model-driven tool).
+        {
+          width: Math.max(terminalWidth - STATUS_INDICATOR_WIDTH, 10),
+          height: terminalHeight
+        }
+      ).catch((error) => {
+        emit({
+          type: "error",
+          text: `An unexpected error occurred: ${error instanceof Error ? error.message : String(error)}`
+        });
+      }).finally(() => {
+        shellControllersRef.current.delete(controller);
+        setDeferredRevision((revision) => revision + 1);
+      });
+    },
+    [config, props.onTranscriptEvent, terminalWidth, terminalHeight]
+  );
+  (0, import_react50.useEffect)(
+    () => () => {
+      for (const controller of shellControllersRef.current) {
+        controller.abort();
+      }
+    },
+    []
+  );
+  const handleSelectSetting = (0, import_react50.useCallback)((name) => {
+    if (name === "ui.theme") setDialog({ dialog: "theme" });
+    else if (name === "general.preferredEditor")
+      setDialog({ dialog: "editor" });
+    else if (name === "fastModel") setDialog({ dialog: "model", mode: "fast" });
+    else if (name === "visionModel")
+      setDialog({ dialog: "model", mode: "vision" });
+    else setDialog(null);
+  }, []);
+  const fillComposer = (0, import_react50.useCallback)(
+    (text) => {
+      injectCapturedInput(() => props.composerHandle?.current ?? null, text);
+    },
+    [props.composerHandle]
+  );
+  const [modals, setModals] = (0, import_react50.useState)([]);
+  const modalSeq = (0, import_react50.useRef)(0);
+  const confirmations = (0, import_react50.useMemo)(
     () => ({
       presentShell: /* @__PURE__ */ __name((commandsToRun) => new Promise((resolve4) => {
         modalSeq.current += 1;
@@ -53532,14 +54091,14 @@ function OpenTuiApp(props) {
     []
   );
   const activeModal = modals[0] ?? null;
-  const closeShellModal = (0, import_react49.useCallback)(
+  const closeShellModal = (0, import_react50.useCallback)(
     (modal, resolution) => {
       setModals((prev) => prev.filter((m3) => m3.id !== modal.id));
       modal.resolve(resolution);
     },
     []
   );
-  const closeActionModal = (0, import_react49.useCallback)(
+  const closeActionModal = (0, import_react50.useCallback)(
     (modal, confirmed) => {
       setModals((prev) => prev.filter((m3) => m3.id !== modal.id));
       modal.resolve(confirmed);
@@ -53547,7 +54106,7 @@ function OpenTuiApp(props) {
     []
   );
   const activeToolCall = waitingToolCalls?.[0] ?? null;
-  const transcript = (0, import_react49.useMemo)(
+  const transcript = (0, import_react50.useMemo)(
     () => ({
       reset: /* @__PURE__ */ __name((events) => onTranscriptReset?.(events), "reset"),
       // /clear semantics: a fresh transcript — the live turn's reset with an
@@ -53557,7 +54116,7 @@ function OpenTuiApp(props) {
     }),
     [onTranscriptReset, onTranscriptEvent]
   );
-  const host = (0, import_react49.useMemo)(
+  const host = (0, import_react50.useMemo)(
     () => new OpenTuiAppHost({
       config,
       settings,
@@ -53586,18 +54145,27 @@ function OpenTuiApp(props) {
       getSessionStats
     ]
   );
-  (0, import_react49.useSyncExternalStore)(
-    (0, import_react49.useCallback)((cb) => host.subscribe(cb), [host]),
-    (0, import_react49.useCallback)(() => host.getVersion(), [host])
+  (0, import_react50.useSyncExternalStore)(
+    (0, import_react50.useCallback)((cb) => host.subscribe(cb), [host]),
+    (0, import_react50.useCallback)(() => host.getVersion(), [host])
   );
-  (0, import_react49.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     host.setStreaming(!!streaming);
   }, [host, streaming]);
-  const gateway = (0, import_react49.useMemo)(() => new OpenTuiSlashGateway(), []);
-  const reloadRef = (0, import_react49.useRef)(null);
-  const deferredCommandsRef = (0, import_react49.useRef)([]);
-  const [deferredRevision, setDeferredRevision] = (0, import_react49.useState)(0);
-  (0, import_react49.useEffect)(() => {
+  const gateway = (0, import_react50.useMemo)(() => new OpenTuiSlashGateway(), []);
+  const reloadRef = (0, import_react50.useRef)(null);
+  const deferredCommandsRef = (0, import_react50.useRef)([]);
+  const [deferredRevision, setDeferredRevision] = (0, import_react50.useState)(0);
+  const drainingRef = (0, import_react50.useRef)(false);
+  const streamingRef = (0, import_react50.useRef)(streaming);
+  (0, import_react50.useEffect)(() => {
+    streamingRef.current = streaming;
+  }, [streaming]);
+  const dialogRef = (0, import_react50.useRef)(dialog);
+  (0, import_react50.useEffect)(() => {
+    dialogRef.current = dialog;
+  }, [dialog]);
+  (0, import_react50.useEffect)(() => {
     const dispatcher = new OpenTuiSlashDispatcher(
       host,
       { config, settings, logger, extensionRefreshState },
@@ -53632,7 +54200,7 @@ function OpenTuiApp(props) {
     commands,
     extensionRefreshState
   ]);
-  const applyOutcome = (0, import_react49.useCallback)(
+  const applyOutcome = (0, import_react50.useCallback)(
     (outcome) => {
       switch (outcome.kind) {
         case "handled":
@@ -53656,6 +54224,9 @@ function OpenTuiApp(props) {
         case "quit":
           deferredCommandsRef.current = [];
           onPopQueue?.();
+          for (const controller of shellControllersRef.current) {
+            controller.abort();
+          }
           onInterrupt?.();
           onQuit?.(outcome.messages);
           return;
@@ -53667,18 +54238,31 @@ function OpenTuiApp(props) {
     },
     [onSubmitPrompt, onQuit, onInterrupt, onPopQueue, notify]
   );
-  const onSubmit = (0, import_react49.useCallback)(
+  const onSubmit = (0, import_react50.useCallback)(
     async (text, imagePaths) => {
       setNoticeText(null);
       const submission = normalizeQuitSubmission(text);
-      if (streaming && await gateway.mustDeferDuringStreaming(submission)) {
-        const command = submission.trim();
-        deferredCommandsRef.current.push(command);
-        setDeferredRevision((revision) => revision + 1);
-        notify(
-          `Queued ${command} \u2014 it will run when the current response ends.`
-        );
-        return;
+      if (streaming || shellControllersRef.current.size > 0) {
+        const takesAsSlash = await gateway.takesAsSlashCommand(submission);
+        const shellEntry = shellModeActive && !takesAsSlash;
+        const blockedByRunningShell = !takesAsSlash && shellControllersRef.current.size > 0;
+        if (shellEntry || blockedByRunningShell || await gateway.mustDeferDuringStreaming(submission)) {
+          const command = submission.trim();
+          deferredCommandsRef.current.push({
+            text: command,
+            shell: shellEntry,
+            // The attachments ride the entry: the seam's contract keeps image
+            // paths in the second, structured argument, so a prompt the
+            // running-`!` gate held back must not lose them in the queue
+            // (R5-5 fix-induced).
+            ...blockedByRunningShell && !shellEntry ? { prompt: true, imagePaths } : {}
+          });
+          setDeferredRevision((revision) => revision + 1);
+          notify(
+            `Queued ${command} \u2014 it will run when the current response ends.`
+          );
+          return;
+        }
       }
       const settlement = await gateway.dispatch(submission);
       if (settlement.kind === "rejected") {
@@ -53686,11 +54270,15 @@ function OpenTuiApp(props) {
         return;
       }
       if (settlement.outcome === false) {
+        const query = text.trim();
+        if (shellModeActive && query) {
+          void runShellCommand(query);
+          return;
+        }
         if (!onSubmitPrompt) {
           notify("The live prompt turn is not wired in this shell.");
           return;
         }
-        const query = text.trim();
         onSubmitPrompt(query, imagePaths, {
           submittedPrompt: query || void 0
         });
@@ -53698,31 +54286,71 @@ function OpenTuiApp(props) {
       }
       applyOutcome(settlement.outcome);
     },
-    [gateway, onSubmitPrompt, applyOutcome, notify, streaming]
+    [
+      gateway,
+      onSubmitPrompt,
+      applyOutcome,
+      notify,
+      streaming,
+      shellModeActive,
+      runShellCommand
+    ]
   );
-  (0, import_react49.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     if (isExitInProgress()) return;
-    if (streaming || dialog || deferredCommandsRef.current.length === 0) {
+    if (streaming || dialog || shellControllersRef.current.size > 0 || deferredCommandsRef.current.length === 0) {
       return;
     }
+    if (drainingRef.current) return;
+    drainingRef.current = true;
     const pending = deferredCommandsRef.current;
     deferredCommandsRef.current = [];
     void (async () => {
-      for (const [i, command] of pending.entries()) {
-        if (isExitInProgress()) return;
-        const settlement = await gateway.dispatch(command);
-        if (settlement.kind === "rejected") {
-          notify(settlement.reason);
-          continue;
-        }
-        if (settlement.outcome === false) continue;
-        const outcome = settlement.outcome;
-        applyOutcome(outcome);
-        const holdsUi = outcome.kind === "open_dialog" || outcome.kind === "submit_prompt" && !!onSubmitPrompt;
-        if (holdsUi && i + 1 < pending.length) {
-          deferredCommandsRef.current.unshift(...pending.slice(i + 1));
-          return;
+      let paused = false;
+      try {
+        for (const [i, entry] of pending.entries()) {
+          if (isExitInProgress()) return;
+          if (streamingRef.current || dialogRef.current || shellControllersRef.current.size > 0) {
+            deferredCommandsRef.current.unshift(...pending.slice(i));
+            paused = true;
+            return;
+          }
+          if (entry.shell) {
+            await runShellCommand(entry.text);
+            continue;
+          }
+          if (entry.prompt) {
+            if (!onSubmitPrompt) {
+              notify("The live prompt turn is not wired in this shell.");
+              continue;
+            }
+            onSubmitPrompt(entry.text, entry.imagePaths, {
+              submittedPrompt: entry.text || void 0
+            });
+            if (i + 1 < pending.length) {
+              deferredCommandsRef.current.unshift(...pending.slice(i + 1));
+              paused = true;
+            }
+            return;
+          }
+          const settlement = await gateway.dispatch(entry.text);
+          if (settlement.kind === "rejected") {
+            notify(settlement.reason);
+            continue;
+          }
+          if (settlement.outcome === false) continue;
+          const outcome = settlement.outcome;
+          applyOutcome(outcome);
+          const holdsUi = outcome.kind === "open_dialog" || outcome.kind === "submit_prompt" && !!onSubmitPrompt;
+          if (holdsUi && i + 1 < pending.length) {
+            deferredCommandsRef.current.unshift(...pending.slice(i + 1));
+            paused = true;
+            return;
+          }
         }
+      } finally {
+        drainingRef.current = false;
+        if (!paused) setDeferredRevision((revision) => revision + 1);
       }
     })();
   }, [
@@ -53732,9 +54360,10 @@ function OpenTuiApp(props) {
     gateway,
     notify,
     applyOutcome,
-    onSubmitPrompt
+    onSubmitPrompt,
+    runShellCommand
   ]);
-  const userMessages = (0, import_react49.useMemo)(
+  const userMessages = (0, import_react50.useMemo)(
     () => host.getHistory().filter((item) => item.type === "user").map((item) => item.text ?? ""),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [host, host.getVersion()]
@@ -53779,6 +54408,8 @@ function OpenTuiApp(props) {
             commands: commandList,
             onClose: () => setDialog(null),
             notify,
+            fillInput: fillComposer,
+            onSelectSetting: handleSelectSetting,
             onApprovalModeChanged: void 0,
             availableTerminalHeight: props.availableTerminalHeight
           },
@@ -53797,7 +54428,12 @@ function OpenTuiApp(props) {
             approvalMode,
             queueLength,
             onPopQueue,
-            composerHandle: props.composerHandle
+            composerHandle: props.composerHandle,
+            promptSuggestion,
+            onPromptSuggestionDismiss,
+            onPromptSuggestionAbort,
+            shellModeActive,
+            onToggleShellMode: toggleShellMode
           }
         )
       ] })
@@ -53806,6 +54442,82 @@ function OpenTuiApp(props) {
 }
 __name(OpenTuiApp, "OpenTuiApp");
 
+// packages/cli/src/ui/opentui/followup-generation.ts
+init_esbuild_shims();
+var import_react52 = __toESM(require_react(), 1);
+function useFollowupSuggestionGeneration({
+  config,
+  settings,
+  streaming,
+  items,
+  waitingCalls
+}) {
+  const [promptSuggestion, setPromptSuggestion] = (0, import_react52.useState)(null);
+  const abortRef = (0, import_react52.useRef)(null);
+  const streamingRef = (0, import_react52.useRef)(streaming);
+  const followupEnabled = settings.merged.ui?.enableFollowupSuggestions !== false;
+  const cacheSharingEnabled = settings.merged.ui?.enableCacheSharing !== false;
+  (0, import_react52.useEffect)(() => {
+    const wasStreaming = streamingRef.current;
+    if (!followupEnabled || wasStreaming !== streaming) {
+      abortRef.current?.abort();
+      setPromptSuggestion(null);
+    }
+    if (followupEnabled && config.isInteractive() && !config.getSdkMode() && wasStreaming && !streaming && items[items.length - 1]?.kind !== "error" && waitingCalls.length === 0 && config.getApprovalMode() !== "plan" /* PLAN */) {
+      const ac = new AbortController();
+      abortRef.current = ac;
+      const conversationHistory = config.getLlmClient().getHistoryTail(40, true);
+      generatePromptSuggestion(config, conversationHistory, ac.signal, {
+        enableCacheSharing: cacheSharingEnabled
+      }).then((result) => {
+        if (ac.signal.aborted) return;
+        if (result.suggestion) {
+          setPromptSuggestion(result.suggestion);
+        } else if (result.filterReason) {
+          logPromptSuggestion(
+            config,
+            new PromptSuggestionEvent({
+              outcome: "suppressed",
+              reason: result.filterReason
+            })
+          );
+        }
+      }).catch(() => {
+      });
+    }
+    streamingRef.current = streaming;
+  }, [
+    config,
+    followupEnabled,
+    cacheSharingEnabled,
+    streaming,
+    items,
+    waitingCalls
+  ]);
+  (0, import_react52.useEffect)(
+    () => () => {
+      abortRef.current?.abort();
+    },
+    []
+  );
+  return {
+    promptSuggestion,
+    // Abort-only (ink AppContainer names this "abort", not "dismiss"):
+    // typing over the ghost kills the in-flight publish but leaves the
+    // suggestion set, so type-then-delete restores it.
+    abortPromptSuggestion: /* @__PURE__ */ __name(() => {
+      abortRef.current?.abort();
+    }, "abortPromptSuggestion"),
+    // Accept/submit path: the persisted suggestion is cleared too, or it
+    // would survive as the ghost after the buffer moved on.
+    dismissPromptSuggestion: /* @__PURE__ */ __name(() => {
+      abortRef.current?.abort();
+      setPromptSuggestion(null);
+    }, "dismissPromptSuggestion")
+  };
+}
+__name(useFollowupSuggestionGeneration, "useFollowupSuggestionGeneration");
+
 // packages/cli/src/ui/opentui/opentui-runtime.ts
 init_esbuild_shims();
 var debugLogger3 = createDebugLogger("OPEN_TUI_RUNTIME");
@@ -53934,7 +54646,7 @@ var OpenTuiRuntime = class _OpenTuiRuntime {
 
 // packages/cli/src/ui/opentui/transcript-view.tsx
 init_esbuild_shims();
-var import_react50 = __toESM(require_react(), 1);
+var import_react53 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/opentui/live-session-model.ts
 init_esbuild_shims();
@@ -54089,6 +54801,16 @@ function foldLiveEvent(prev, ev) {
       });
       return items;
     }
+    case "confirm-resolved": {
+      const i = findToolIndex(items, ev.id);
+      if (i >= 0) {
+        const t3 = items[i];
+        if (t3.confirm === "pending") {
+          items[i] = { ...t3, confirm: ev.outcome };
+        }
+      }
+      return items;
+    }
     case "task-start":
       if (last?.kind === "assistant" && last.streaming)
         items[items.length - 1] = { ...last, streaming: false };
@@ -54244,6 +54966,48 @@ function foldLiveEvent(prev, ev) {
       items.push({ kind: "stop-hook", id: nid("shk"), message: ev.message });
       return items;
     }
+    case "away-recap": {
+      if (last?.kind === "assistant" && last.streaming)
+        items[items.length - 1] = { ...last, streaming: false };
+      items.push({ kind: "away-recap", id: nid("recap"), text: ev.text });
+      return items;
+    }
+    case "user-shell": {
+      if (last?.kind === "assistant" && last.streaming)
+        items[items.length - 1] = { ...last, streaming: false };
+      items.push({ kind: "user-shell", id: nid("ushl"), text: ev.text });
+      return items;
+    }
+    case "advisor": {
+      if (last?.kind === "assistant" && last.streaming)
+        items[items.length - 1] = { ...last, streaming: false };
+      items.push({
+        kind: "advisor",
+        id: nid("advisor"),
+        text: ev.text,
+        model: ev.model
+      });
+      return items;
+    }
+    case "arena-agent": {
+      if (last?.kind === "assistant" && last.streaming)
+        items[items.length - 1] = { ...last, streaming: false };
+      items.push({ kind: "arena-agent", id: nid("arena"), agent: ev.agent });
+      return items;
+    }
+    case "arena-session": {
+      if (last?.kind === "assistant" && last.streaming)
+        items[items.length - 1] = { ...last, streaming: false };
+      items.push({
+        kind: "arena-session",
+        id: nid("arena"),
+        sessionStatus: ev.sessionStatus,
+        task: ev.task,
+        totalDurationMs: ev.totalDurationMs,
+        agents: ev.agents
+      });
+      return items;
+    }
     case "segment-end": {
       if (last?.kind === "assistant" && last.streaming)
         items[items.length - 1] = { ...last, streaming: false };
@@ -54329,6 +55093,13 @@ function describeGoalCard(snapshot, cause) {
   const activeTimeMs = goal.activeTimeMs ?? 0;
   if (activeTimeMs > 0)
     stats.push(formatDuration(activeTimeMs, { hideTrailingZeros: true }));
+  const tokensUsed = goal.tokensUsed ?? 0;
+  if (tokensUsed > 0) {
+    const used = formatTokenCount(tokensUsed);
+    stats.push(
+      goal.tokenBudget === void 0 ? `${used} tokens` : `${used}/${formatTokenCount(goal.tokenBudget)} tokens`
+    );
+  }
   const reason = (goal.status ?? "active") !== "active" || activity === "verifying" ? goal.lastReason?.trim() : void 0;
   return {
     state: "card",
@@ -54966,6 +55737,7 @@ function OpenTuiTranscriptView({
     {
       item,
       maxRows,
+      terminalHeight: availableTerminalHeight,
       width: availableWidth
     },
     item.id
@@ -54975,6 +55747,7 @@ __name(OpenTuiTranscriptView, "OpenTuiTranscriptView");
 function TranscriptItem({
   item,
   maxRows,
+  terminalHeight,
   width
 }) {
   switch (item.kind) {
@@ -54985,7 +55758,15 @@ function TranscriptItem({
     case "thinking":
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThinkingRow, { text: item.text, done: item.done });
     case "tool":
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolCard, { item, maxRows, width });
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        ToolCard,
+        {
+          item,
+          maxRows,
+          terminalHeight,
+          width
+        }
+      );
     case "task":
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TaskCard, { item });
     case "image":
@@ -55016,6 +55797,16 @@ function TranscriptItem({
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StopHookRow, { message: item.message });
     case "goal":
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GoalCard, { item });
+    case "away-recap":
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AwayRecapRow, { text: item.text });
+    case "user-shell":
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(UserShellRow, { text: item.text });
+    case "advisor":
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AdvisorRow, { text: item.text, model: item.model });
+    case "arena-agent":
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArenaAgentRow, { agent: item.agent });
+    case "arena-session":
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArenaSessionRow, { item });
     default: {
       const exhaustive = item;
       return exhaustive;
@@ -55053,7 +55844,7 @@ function AssistantRow({
 }
 __name(AssistantRow, "AssistantRow");
 function ThinkingRow({ text, done }) {
-  const [expanded, setExpanded] = (0, import_react50.useState)(false);
+  const [expanded, setExpanded] = (0, import_react53.useState)(false);
   const meta = thinkingMeta(done, expanded, false);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     "box",
@@ -55078,11 +55869,19 @@ __name(ThinkingRow, "ThinkingRow");
 function ToolCard({
   item,
   maxRows,
+  terminalHeight,
   width
 }) {
   const status = toolStatusMeta(item);
   const name = toolCardName(item.tool);
   const description = item.description ?? toolCardDescription(item.tool, item.args);
+  const text = toolCardText(description);
+  const cap = capToolCardDescription(
+    text,
+    name,
+    width,
+    item.confirm === "pending" && !item.done ? pendingCardMaxRows(terminalHeight, getCachedStringWidth(text), width) : TOOL_CARD_DESCRIPTION_ROWS
+  );
   const suffix2 = toolCardSummarySuffix(item.done, item.summary);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
@@ -55095,9 +55894,10 @@ function ToolCard({
         }
       ) }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, attributes: status.strikethrough ? 129 : 1, children: name }),
-      description ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, ...selectionProps(), children: ` ${sanitizeTerminalText(description)}` }) : null,
+      cap.description ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, ...selectionProps(), children: ` ${sanitizeTerminalText(cap.description)}` }) : null,
       suffix2 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: sanitizeTerminalText(suffix2) }) : null
     ] }),
+    cap.hiddenRows > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: hiddenTailLinesLabel(cap.hiddenRows) }),
     item.confirm === "pending" && !item.done ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.yellow, children: " (awaiting approval)" }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolCardBody, { item, maxRows, width })
   ] });
@@ -55195,8 +55995,8 @@ function RetryRows({
   delayMs,
   startedAt
 }) {
-  const [now, setNow] = (0, import_react50.useState)(() => Date.now());
-  (0, import_react50.useEffect)(() => {
+  const [now, setNow] = (0, import_react53.useState)(() => Date.now());
+  (0, import_react53.useEffect)(() => {
     const timer = setInterval(() => setNow(Date.now()), 1e3);
     return () => clearInterval(timer);
   }, []);
@@ -55276,10 +56076,171 @@ function LegacyGoalCard({ legacy }) {
   ] });
 }
 __name(LegacyGoalCard, "LegacyGoalCard");
+function AwayRecapRow({ text }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: `${ICON.REFERENCE} ` }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, attributes: 1, children: "recap: " }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, attributes: 4, ...selectionProps(), children: sanitizeTerminalText(text) })
+  ] });
+}
+__name(AwayRecapRow, "AwayRecapRow");
+function UserShellRow({ text }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.accent, children: "$ " }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, ...selectionProps(), children: sanitizeTerminalText(text) })
+  ] });
+}
+__name(UserShellRow, "UserShellRow");
+function AdvisorRow({ text, model }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "row", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.accent, attributes: 1, children: "/advisor" }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.accent, children: ` \xB7 ${sanitizeTerminalText(model)}` })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("box", { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      "markdown",
+      {
+        content: sanitizeTerminalText(text),
+        syntaxStyle: SYNTAX,
+        streaming: false
+      }
+    ) })
+  ] });
+}
+__name(AdvisorRow, "AdvisorRow");
+function arenaStatusColor(status) {
+  switch (status) {
+    case "idle" /* IDLE */:
+    case "completed" /* COMPLETED */:
+      return C2.green;
+    case "cancelled" /* CANCELLED */:
+      return C2.yellow;
+    case "failed" /* FAILED */:
+      return C2.red;
+    default:
+      return C2.dim;
+  }
+}
+__name(arenaStatusColor, "arenaStatusColor");
+function ArenaAgentRow({ agent }) {
+  const { icon, text } = getArenaStatusLabel(agent.status);
+  const failed = agent.failedToolCalls > 0;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: arenaStatusColor(agent.status), children: `${icon} ${sanitizeTerminalText(agent.label)} \xB7 ${text} \xB7 ${formatDuration(agent.durationMs)}` }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.dim, children: `  Tokens: ${agent.totalTokens.toLocaleString()} (in ${agent.inputTokens.toLocaleString()}, out ${agent.outputTokens.toLocaleString()})` }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.dim, children: [
+      `  Tool Calls: ${agent.toolCalls}`,
+      failed ? " (" : null,
+      failed ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.green, children: `\u2713 ${agent.successfulToolCalls}` }) : null,
+      failed ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.red, children: ` \u2715 ${agent.failedToolCalls}` }) : null,
+      failed ? ")" : null
+    ] }),
+    agent.error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.red, children: `  ${sanitizeTerminalText(agent.error)}` }) : null
+  ] });
+}
+__name(ArenaAgentRow, "ArenaAgentRow");
+function arenaDiffStats(agent) {
+  if (agent.diffSummary) {
+    return {
+      additions: agent.diffSummary.additions,
+      deletions: agent.diffSummary.deletions
+    };
+  }
+  if (!agent.diff) return { additions: 0, deletions: 0 };
+  let additions = 0;
+  let deletions = 0;
+  for (const line of agent.diff.split("\n")) {
+    if (line.startsWith("+") && !line.startsWith("+++")) additions++;
+    else if (line.startsWith("-") && !line.startsWith("---")) deletions++;
+  }
+  return { additions, deletions };
+}
+__name(arenaDiffStats, "arenaDiffStats");
+function arenaAgentFiles(agent) {
+  return agent.modifiedFiles ?? agent.diffSummary?.files.map((f2) => f2.path) ?? [];
+}
+__name(arenaAgentFiles, "arenaAgentFiles");
+var ARENA_MAX_FILE_ITEMS = 4;
+function arenaFileList(files) {
+  if (files.length === 0) return "none";
+  const visible = files.slice(0, ARENA_MAX_FILE_ITEMS);
+  const suffix2 = files.length > ARENA_MAX_FILE_ITEMS ? `, +${files.length - ARENA_MAX_FILE_ITEMS} more` : "";
+  return `${visible.join(", ")}${suffix2}`;
+}
+__name(arenaFileList, "arenaFileList");
+function arenaFileGroups(agents) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const agent of agents) {
+    for (const file of new Set(arenaAgentFiles(agent))) {
+      counts.set(file, (counts.get(file) ?? 0) + 1);
+    }
+  }
+  const common = [...counts.entries()].filter(([, count]) => count > 1).map(([file]) => file).sort();
+  const groups = [{ label: "common", files: common }];
+  for (const agent of agents) {
+    const unique = arenaAgentFiles(agent).filter((file) => counts.get(file) === 1).sort();
+    if (unique.length > 0) {
+      groups.push({ label: `${agent.label}-only`, files: unique });
+    }
+  }
+  return groups;
+}
+__name(arenaFileGroups, "arenaFileGroups");
+function ArenaSessionRow({ item }) {
+  const { sessionStatus, agents } = item;
+  const comparing = sessionStatus === "idle" || sessionStatus === "completed";
+  const title = comparing ? "Arena Comparison Summary" : sessionStatus === "cancelled" ? "Arena Cancelled" : "Arena Failed";
+  const branch = /* @__PURE__ */ __name((index, total) => index === total - 1 ? "\u2514\u2500" : "\u251C\u2500", "branch");
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, attributes: 1, children: title }),
+    comparing ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, attributes: 1, children: "Status Summary:" }),
+      agents.map((agent, index) => {
+        const { text } = getArenaStatusLabel(agent.status);
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.dim, children: [
+          `  ${branch(index, agents.length)} ${sanitizeTerminalText(agent.label)}: `,
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: arenaStatusColor(agent.status), children: text })
+        ] }, agent.label);
+      }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, attributes: 1, children: "Files Modified:" }),
+      arenaFileGroups(agents).map((group, index, groups) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.dim, children: [
+        `  ${branch(index, groups.length)} ${sanitizeTerminalText(group.label)}: `,
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.text, children: sanitizeTerminalText(arenaFileList(group.files)) })
+      ] }, group.label)),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, attributes: 1, children: "Approach Summary:" }),
+      agents.map((agent, index) => {
+        const stats = arenaDiffStats(agent);
+        const files = arenaAgentFiles(agent).length;
+        const summary = agent.approachSummary ?? "No approach summary available.";
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.text, children: [
+          `  ${branch(index, agents.length)} ${sanitizeTerminalText(agent.label)}: ${sanitizeTerminalText(summary)} `,
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.dim, children: `(${files} ${files === 1 ? "file" : "files"}, ` }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.green, children: `+${stats.additions}` }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.dim, children: " " }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.red, children: `-${stats.deletions}` }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.dim, children: " lines, " }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.accent, children: agent.toolCalls }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.dim, children: agent.toolCalls === 1 ? " tool call)" : " tool calls)" })
+        ] }, agent.label);
+      }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("text", { fg: C2.text, attributes: 1, children: "Token Efficiency:" }),
+      agents.map((agent, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.dim, children: [
+        `  ${branch(index, agents.length)} ${sanitizeTerminalText(agent.label)}: `,
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.text, children: `${agent.outputTokens.toLocaleString()} tokens \xB7 runtime ${formatDuration(agent.durationMs)}` })
+      ] }, agent.label))
+    ] }) : null,
+    comparing ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("text", { fg: C2.dim, children: [
+      "Run ",
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { fg: C2.accent, children: "/arena select" }),
+      sessionStatus === "idle" ? " to view detailed diff or pick a winner." : " to pick a winner."
+    ] }) : null
+  ] });
+}
+__name(ArenaSessionRow, "ArenaSessionRow");
 
 // packages/cli/src/ui/opentui/live-turn.ts
 init_esbuild_shims();
-var import_react51 = __toESM(require_react(), 1);
+var import_react54 = __toESM(require_react(), 1);
 import { readFileSync } from "node:fs";
 
 // packages/cli/src/ui/opentui/live-session.ts
@@ -55306,10 +56267,10 @@ function nextLivePromptId(config) {
   return id;
 }
 __name(nextLivePromptId, "nextLivePromptId");
-function formatTokenCount(n) {
+function formatTokenCount2(n) {
   return n >= 1e3 ? `${(n / 1e3).toFixed(1)}k` : String(n);
 }
-__name(formatTokenCount, "formatTokenCount");
+__name(formatTokenCount2, "formatTokenCount");
 function createEventQueue() {
   const buffer = [];
   let wake = null;
@@ -55444,10 +56405,12 @@ async function resolveSteeredPromptParts(config, texts, signal, turnModel) {
   const restore = /* @__PURE__ */ __name(() => ({
     parts: [],
     events: [],
+    recordings: [],
     restore: [...texts]
   }), "restore");
   const events = [];
   const segments = [];
+  const recordings = [];
   for (const message of texts) {
     if (signal.aborted) return restore();
     let resolved = [{ text: message }];
@@ -55498,6 +56461,7 @@ async function resolveSteeredPromptParts(config, texts, signal, turnModel) {
       events.push(imageFormatWarningEvent());
     }
     if (messageParts.length > 0) segments.push(messageParts);
+    recordings.push({ message, parts: messageParts });
     events.push({ type: "user", text: message, sentToModel: false });
   }
   const parts = [];
@@ -55505,16 +56469,29 @@ async function resolveSteeredPromptParts(config, texts, signal, turnModel) {
     if (parts.length > 0) parts.push({ text: "\n\n" });
     parts.push(...segment);
   }
-  return { parts, events, restore: [] };
+  return { parts, events, recordings, restore: [] };
 }
 __name(resolveSteeredPromptParts, "resolveSteeredPromptParts");
+var initializationPromises = /* @__PURE__ */ new WeakMap();
+function ensureConfigInitialized(config) {
+  const pending = initializationPromises.get(config);
+  if (pending) return pending;
+  const started = config.initialize().catch((err) => {
+    if (config.getGeminiClient()?.isInitialized?.() || err instanceof Error && err.message === "Config was already initialized") {
+      return;
+    }
+    throw err;
+  });
+  started.catch(() => {
+  });
+  initializationPromises.set(config, started);
+  return started;
+}
+__name(ensureConfigInitialized, "ensureConfigInitialized");
 var STARTUP_CHAT_WAIT_MS = 15e3;
 var STARTUP_CHAT_POLL_MS = 100;
 async function* livePromptEvents(config, prompt, signal, options) {
-  try {
-    await config.initialize();
-  } catch {
-  }
+  await ensureConfigInitialized(config);
   const client = config.getGeminiClient();
   const chatDeadline = Date.now() + STARTUP_CHAT_WAIT_MS;
   const chatReady = /* @__PURE__ */ __name(() => client.isInitialized() && client.getChat().getGenerationConfig().tools !== void 0, "chatReady");
@@ -55570,6 +56547,23 @@ async function* livePromptEvents(config, prompt, signal, options) {
   if (hasUnsupportedImageFormat(nextPrompt)) {
     yield imageFormatWarningEvent();
   }
+  let stashedSteeredTexts;
+  let stashedRecordings = [];
+  const flushSteeredStash = /* @__PURE__ */ __name(() => {
+    if (!stashedSteeredTexts) return;
+    const recorder = config.getChatRecordingService?.();
+    for (const recording of stashedRecordings) {
+      recorder?.recordMidTurnUserMessage(recording.parts, recording.message);
+    }
+    stashedRecordings = [];
+    stashedSteeredTexts = void 0;
+  }, "flushSteeredStash");
+  const restoreSteeredStash = /* @__PURE__ */ __name(() => {
+    if (!stashedSteeredTexts) return;
+    options?.restoreSteering?.(stashedSteeredTexts);
+    stashedRecordings = [];
+    stashedSteeredTexts = void 0;
+  }, "restoreSteeredStash");
   let first = true;
   const waitingSeen = /* @__PURE__ */ new Set();
   for (; ; ) {
@@ -55589,23 +56583,33 @@ async function* livePromptEvents(config, prompt, signal, options) {
       promptId,
       sendOptions
     );
-    for await (const ev of stream) {
-      if (dbg) {
-        try {
-          appendFileSync2(
-            "/tmp/opentui-events.log",
-            `${ev.type}
+    try {
+      for await (const ev of stream) {
+        flushSteeredStash();
+        if (dbg) {
+          try {
+            appendFileSync2(
+              "/tmp/opentui-events.log",
+              `${ev.type}
 `
+            );
+          } catch {
+          }
+        }
+        if (ev.type === "tool_call_request") {
+          pending.push(
+            ev.value
           );
-        } catch {
         }
+        for (const neutral of map(ev)) yield neutral;
       }
-      if (ev.type === "tool_call_request") {
-        pending.push(
-          ev.value
-        );
-      }
-      for (const neutral of map(ev)) yield neutral;
+    } catch (error) {
+      restoreSteeredStash();
+      throw error;
+    }
+    if (stashedSteeredTexts) {
+      if (abort.aborted) restoreSteeredStash();
+      else flushSteeredStash();
     }
     if (pending.length === 0 || abort.aborted) return;
     const live = createEventQueue();
@@ -55643,7 +56647,7 @@ async function* livePromptEvents(config, prompt, signal, options) {
             id: callId,
             tools: stats?.totalToolCalls ?? agent.toolCalls?.length ?? 0,
             seconds: Math.round((stats?.totalDurationMs ?? 0) / 100) / 10,
-            tokens: formatTokenCount(
+            tokens: formatTokenCount2(
               stats?.totalTokens ?? agent.tokenCount ?? 0
             )
           });
@@ -55678,19 +56682,32 @@ async function* livePromptEvents(config, prompt, signal, options) {
             description: invocation.getDescription()
           });
         }
-        if (!options?.onWaitingCall) return;
         const awaiting = new Set(
           calls.filter((c2) => c2.status === "awaiting_approval").map((c2) => c2.request.callId)
         );
         for (const id of waitingSeen) {
-          if (!awaiting.has(id)) waitingSeen.delete(id);
+          if (!awaiting.has(id)) {
+            waitingSeen.delete(id);
+            const departed = calls.find((c2) => c2.request.callId === id);
+            live.push({
+              type: "confirm-resolved",
+              id,
+              outcome: departed?.status === "cancelled" ? "rejected" : "approved"
+            });
+          }
         }
         for (const c2 of calls) {
           if (c2.status !== "awaiting_approval") continue;
           const callId = c2.request.callId;
           if (waitingSeen.has(callId)) continue;
           waitingSeen.add(callId);
-          options.onWaitingCall({
+          live.push({
+            type: "confirm",
+            id: callId,
+            tool: c2.request.name,
+            title: c2.confirmationDetails.title
+          });
+          options?.onWaitingCall?.({
             callId,
             name: c2.request.name,
             confirmationDetails: c2.confirmationDetails
@@ -55733,6 +56750,12 @@ async function* livePromptEvents(config, prompt, signal, options) {
       };
       if (resp?.responseParts) responseParts.push(...resp.responseParts);
     }
+    if (completed.every((call) => call.status === "cancelled")) {
+      if (responseParts.length > 0) {
+        await client.addHistory({ role: "user", parts: responseParts });
+      }
+      return;
+    }
     if (!abort.aborted) {
       const texts = (options?.drainSteering?.() ?? []).filter((text) => text);
       if (texts.length > 0) {
@@ -55742,9 +56765,20 @@ async function* livePromptEvents(config, prompt, signal, options) {
           abort,
           turnModel
         );
+        if (abort.aborted) {
+          options?.restoreSteering?.(
+            steered.restore.length > 0 ? steered.restore : texts
+          );
+          if (responseParts.length > 0) {
+            await client.addHistory({ role: "user", parts: responseParts });
+          }
+          return;
+        }
         if (steered.restore.length > 0) {
           options?.restoreSteering?.(steered.restore);
         }
+        stashedRecordings = steered.recordings;
+        stashedSteeredTexts = texts;
         for (const ev of steered.events) yield ev;
         responseParts.push(...steered.parts);
       }
@@ -55781,18 +56815,18 @@ var IMAGE_MIME_BY_EXTENSION = {
 function imagePathsToParts(imagePaths) {
   const parts = [];
   const notices = [];
-  for (const path6 of imagePaths) {
-    const ext = path6.split(".").pop()?.toLowerCase() ?? "";
+  for (const path7 of imagePaths) {
+    const ext = path7.split(".").pop()?.toLowerCase() ?? "";
     const mimeType = IMAGE_MIME_BY_EXTENSION[ext];
     if (!mimeType) {
-      notices.push(`Unsupported image type: ${path6}`);
+      notices.push(`Unsupported image type: ${path7}`);
       continue;
     }
     try {
-      const data = readFileSync(path6).toString("base64");
+      const data = readFileSync(path7).toString("base64");
       parts.push({ inlineData: { mimeType, data } });
     } catch {
-      notices.push(`Could not read image: ${path6}`);
+      notices.push(`Could not read image: ${path7}`);
     }
   }
   return { parts, notices };
@@ -55806,43 +56840,43 @@ function foldBatch(events) {
 __name(foldBatch, "foldBatch");
 function useOpenTuiLiveTurn(options) {
   const { config } = options;
-  const [items, setItems] = (0, import_react51.useState)([]);
-  const [streaming, setStreaming] = (0, import_react51.useState)(false);
-  const [waitingCalls, setWaitingCalls] = (0, import_react51.useState)(
+  const [items, setItems] = (0, import_react54.useState)([]);
+  const [streaming, setStreaming] = (0, import_react54.useState)(false);
+  const [waitingCalls, setWaitingCalls] = (0, import_react54.useState)(
     []
   );
-  const queueRef = (0, import_react51.useRef)([]);
-  const [queueLength, setQueueLength] = (0, import_react51.useState)(0);
-  const abortRef = (0, import_react51.useRef)(null);
-  const streamingRef = (0, import_react51.useRef)(false);
-  const turnSeqRef = (0, import_react51.useRef)(0);
-  const waitingCallsRef = (0, import_react51.useRef)([]);
+  const queueRef = (0, import_react54.useRef)([]);
+  const [queueLength, setQueueLength] = (0, import_react54.useState)(0);
+  const abortRef = (0, import_react54.useRef)(null);
+  const streamingRef = (0, import_react54.useRef)(false);
+  const turnSeqRef = (0, import_react54.useRef)(0);
+  const waitingCallsRef = (0, import_react54.useRef)([]);
   waitingCallsRef.current = waitingCalls;
-  const setBusy = (0, import_react51.useCallback)((busy) => {
+  const setBusy = (0, import_react54.useCallback)((busy) => {
     if (streamingRef.current === busy) return;
     streamingRef.current = busy;
     setStreaming(busy);
   }, []);
-  const apply = (0, import_react51.useCallback)((ev) => {
+  const apply = (0, import_react54.useCallback)((ev) => {
     setItems((prev) => foldLiveEvent(prev, ev));
   }, []);
-  const pushQueue = (0, import_react51.useCallback)((text) => {
+  const pushQueue = (0, import_react54.useCallback)((text) => {
     queueRef.current.push(text);
     setQueueLength(queueRef.current.length);
   }, []);
-  const drainQueue = (0, import_react51.useCallback)(() => {
+  const drainQueue = (0, import_react54.useCallback)(() => {
     const drained = queueRef.current;
     queueRef.current = [];
     setQueueLength(0);
     return drained;
   }, []);
-  const restoreQueue = (0, import_react51.useCallback)((texts) => {
+  const restoreQueue = (0, import_react54.useCallback)((texts) => {
     const restored = texts.map((text) => text.trim()).filter(Boolean);
     if (restored.length === 0) return;
     queueRef.current = [...restored, ...queueRef.current];
     setQueueLength(queueRef.current.length);
   }, []);
-  const runTurn = (0, import_react51.useCallback)(
+  const runTurn = (0, import_react54.useCallback)(
     async (prompt, promptId, turnOptions) => {
       const seq = ++turnSeqRef.current;
       const abort = new AbortController();
@@ -55866,7 +56900,7 @@ function useOpenTuiLiveTurn(options) {
           if (seq !== turnSeqRef.current) return;
           apply(ev);
         }
-        if (seq === turnSeqRef.current) {
+        if (seq === turnSeqRef.current && !abort.signal.aborted) {
           void turnOptions?.onComplete?.().catch(() => {
           });
         }
@@ -55899,7 +56933,7 @@ function useOpenTuiLiveTurn(options) {
     },
     [config, apply, drainQueue, restoreQueue, setBusy]
   );
-  const submit = (0, import_react51.useCallback)(
+  const submit = (0, import_react54.useCallback)(
     (content, imagePaths, options2) => {
       const text = typeof content === "string" ? content : collectText(normalizeParts(content));
       if (streamingRef.current) {
@@ -55923,10 +56957,10 @@ function useOpenTuiLiveTurn(options) {
     },
     [config, apply, pushQueue, runTurn]
   );
-  const interrupt = (0, import_react51.useCallback)(() => {
+  const interrupt = (0, import_react54.useCallback)(() => {
     abortRef.current?.abort();
   }, []);
-  const resetTranscript = (0, import_react51.useCallback)(
+  const resetTranscript = (0, import_react54.useCallback)(
     (events) => {
       turnSeqRef.current += 1;
       const abort = abortRef.current;
@@ -55945,14 +56979,14 @@ function useOpenTuiLiveTurn(options) {
     },
     [setBusy]
   );
-  const settleWaitingCall = (0, import_react51.useCallback)((callId) => {
+  const settleWaitingCall = (0, import_react54.useCallback)((callId) => {
     setWaitingCalls((prev) => prev.filter((c2) => c2.callId !== callId));
   }, []);
-  const popQueue = (0, import_react51.useCallback)(() => {
+  const popQueue = (0, import_react54.useCallback)(() => {
     if (queueRef.current.length === 0) return null;
-    return drainQueue().join("\n");
+    return drainQueue().join("\n\n");
   }, [drainQueue]);
-  (0, import_react51.useEffect)(() => () => abortRef.current?.abort(), []);
+  (0, import_react54.useEffect)(() => () => abortRef.current?.abort(), []);
   return {
     items,
     streaming,
@@ -56019,47 +57053,6 @@ function exitGuardHint(key) {
 }
 __name(exitGuardHint, "exitGuardHint");
 
-// packages/cli/src/ui/opentui/early-input.ts
-init_esbuild_shims();
-function decodeCapturedInput(buffer) {
-  if (buffer.length === 0) return "";
-  const text = buffer.toString("utf8");
-  return text.replace(/\u001B\[[0-9:;<=>?]*[ -/]*[@-~]/g, "").replace(/\u001BO[A-Za-z]/g, "").replace(/\u001B\[[0-9:;<=>?]*[ -/]*$/, "").replace(/\u001BO$/, "").replace(/[\u0000-\u0008\u000B-\u001F\u007F]/g, "");
-}
-__name(decodeCapturedInput, "decodeCapturedInput");
-function drainCapturedInputAsText() {
-  return decodeCapturedInput(stopAndGetCapturedInput());
-}
-__name(drainCapturedInputAsText, "drainCapturedInputAsText");
-function injectCapturedInput(getText, text, opts = {}) {
-  if (text.length === 0) return () => {
-  };
-  const intervalMs = opts.intervalMs ?? 25;
-  const maxAttempts = opts.maxAttempts ?? 40;
-  const setTimeoutFn = opts.setTimeoutFn ?? ((fn2, ms) => setTimeout(fn2, ms));
-  const clearTimeoutFn = opts.clearTimeoutFn ?? ((handle) => clearTimeout(handle));
-  let attempts = 0;
-  let timer = null;
-  let disposed = false;
-  const attempt = /* @__PURE__ */ __name(() => {
-    if (disposed) return;
-    const handle = getText();
-    if (handle) {
-      handle.setText(text);
-      return;
-    }
-    attempts += 1;
-    if (attempts >= maxAttempts) return;
-    timer = setTimeoutFn(attempt, intervalMs);
-  }, "attempt");
-  timer = setTimeoutFn(attempt, intervalMs);
-  return () => {
-    disposed = true;
-    if (timer !== null) clearTimeoutFn(timer);
-  };
-}
-__name(injectCapturedInput, "injectCapturedInput");
-
 // packages/cli/src/ui/opentui/start-opentui-ui.tsx
 var debugLogger4 = createDebugLogger("OPEN_TUI_START");
 function OpenTuiEntryApp({
@@ -56068,36 +57061,44 @@ function OpenTuiEntryApp({
   runtime,
   startupWarnings,
   extensionRefreshState,
-  capturedText
+  capturedText,
+  initialDialog
 }) {
   const { width, height } = useTerminalDimensions();
   const { stats, startNewSession } = useSessionStats();
   const logger = useLogger(config.storage, config.getSessionId());
   const live = useOpenTuiLiveTurn({ config });
   const { applyEvent, submit, interrupt, resetTranscript, settleWaitingCall } = live;
-  const statsRef = (0, import_react52.useRef)(stats);
-  (0, import_react52.useEffect)(() => {
+  const { promptSuggestion, abortPromptSuggestion, dismissPromptSuggestion } = useFollowupSuggestionGeneration({
+    config,
+    settings,
+    streaming: live.streaming,
+    items: live.items,
+    waitingCalls: live.waitingCalls
+  });
+  const statsRef = (0, import_react55.useRef)(stats);
+  (0, import_react55.useEffect)(() => {
     statsRef.current = stats;
   }, [stats]);
-  const getSessionStats = (0, import_react52.useCallback)(() => statsRef.current, []);
-  const composerHandle = (0, import_react52.useRef)(null);
-  (0, import_react52.useEffect)(
-    () => injectCapturedInput(() => composerHandle.current, capturedText),
+  const getSessionStats = (0, import_react55.useCallback)(() => statsRef.current, []);
+  const composerHandle = (0, import_react55.useRef)(null);
+  (0, import_react55.useEffect)(
+    () => armCapturedInputInjection(() => composerHandle.current, capturedText),
     [capturedText]
   );
-  (0, import_react52.useEffect)(() => {
+  (0, import_react55.useEffect)(() => {
     const resumeEvents = resumeEventsFromConfig(config);
     if (resumeEvents) resetTranscript(resumeEvents);
     for (const warning of startupWarnings) {
       applyEvent({ type: "warning", text: warning });
     }
   }, []);
-  const [updateNotice, setUpdateNotice] = (0, import_react52.useState)(null);
-  const isIdleRef = (0, import_react52.useRef)(true);
-  (0, import_react52.useEffect)(() => {
+  const [updateNotice, setUpdateNotice] = (0, import_react55.useState)(null);
+  const isIdleRef = (0, import_react55.useRef)(true);
+  (0, import_react55.useEffect)(() => {
     isIdleRef.current = !live.streaming;
   }, [live.streaming]);
-  const addUpdateItem = (0, import_react52.useCallback)(
+  const addUpdateItem = (0, import_react55.useCallback)(
     (item) => {
       if (item.type === "info" /* INFO */) {
         applyEvent({ type: "info", text: item.text });
@@ -56109,29 +57110,22 @@ function OpenTuiEntryApp({
     },
     [applyEvent]
   );
-  const setUpdateInfo = (0, import_react52.useCallback)((info) => {
+  const setUpdateInfo = (0, import_react55.useCallback)((info) => {
     setUpdateNotice(info?.message ?? null);
   }, []);
-  (0, import_react52.useEffect)(() => {
-    const { cleanup } = setUpdateHandler(
-      addUpdateItem,
-      setUpdateInfo,
-      isIdleRef
-    );
-    return cleanup;
-  }, [addUpdateItem, setUpdateInfo]);
-  const [exitHint, setExitHint] = (0, import_react52.useState)(null);
-  const exitGuard = (0, import_react52.useMemo)(
+  useUpdateNoticeFlush(addUpdateItem, setUpdateInfo, isIdleRef, live.streaming);
+  const [exitHint, setExitHint] = (0, import_react55.useState)(null);
+  const exitGuard = (0, import_react55.useMemo)(
     () => createExitGuard({ onWindowExpired: /* @__PURE__ */ __name(() => setExitHint(null), "onWindowExpired") }),
     []
   );
-  (0, import_react52.useEffect)(() => () => exitGuard.dispose(), [exitGuard]);
-  const streamingRef = (0, import_react52.useRef)(live.streaming);
-  (0, import_react52.useEffect)(() => {
+  (0, import_react55.useEffect)(() => () => exitGuard.dispose(), [exitGuard]);
+  const streamingRef = (0, import_react55.useRef)(live.streaming);
+  (0, import_react55.useEffect)(() => {
     streamingRef.current = live.streaming;
   }, [live.streaming]);
-  const waitingCallsRef = (0, import_react52.useRef)(live.waitingCalls);
-  (0, import_react52.useEffect)(() => {
+  const waitingCallsRef = (0, import_react55.useRef)(live.waitingCalls);
+  (0, import_react55.useEffect)(() => {
     waitingCallsRef.current = live.waitingCalls;
   }, [live.waitingCalls]);
   useKeyboard((key) => {
@@ -56154,7 +57148,7 @@ function OpenTuiEntryApp({
       setExitHint(exitGuardHint(guardKey));
     }
   });
-  const renderMain = (0, import_react52.useCallback)(
+  const renderMain = (0, import_react55.useCallback)(
     () => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("box", { flexDirection: "column", flexGrow: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         OpenTuiTranscriptView,
@@ -56168,7 +57162,7 @@ function OpenTuiEntryApp({
     ] }),
     [live.items, width, height, exitHint]
   );
-  const handleRenderError = (0, import_react52.useCallback)(
+  const handleRenderError = (0, import_react55.useCallback)(
     (error) => {
       debugLogger4.error(
         `[FATAL_RENDER_ERROR] ${error.message}
@@ -56180,15 +57174,15 @@ ${error.stack ?? ""}`
     },
     [config]
   );
-  const handleStartNewSession = (0, import_react52.useCallback)(
+  const handleStartNewSession = (0, import_react55.useCallback)(
     (sessionId) => startNewSession(sessionId),
     [startNewSession]
   );
-  const handleSubmitPrompt = (0, import_react52.useCallback)(
+  const handleSubmitPrompt = (0, import_react55.useCallback)(
     (content, imagePaths, options) => submit(content, imagePaths, options),
     [submit]
   );
-  const handleQuit = (0, import_react52.useCallback)(() => {
+  const handleQuit = (0, import_react55.useCallback)(() => {
     void exitSession(config, 0);
   }, [config]);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -56200,6 +57194,7 @@ ${error.stack ?? ""}`
       getSessionStats,
       runtime,
       extensionRefreshState,
+      initialDialog,
       renderMain,
       onSubmitPrompt: handleSubmitPrompt,
       onQuit: handleQuit,
@@ -56216,12 +57211,15 @@ ${error.stack ?? ""}`
       waitingToolCalls: live.waitingCalls,
       onToolCallSettled: live.settleWaitingCall,
       onRenderError: handleRenderError,
-      composerHandle
+      composerHandle,
+      promptSuggestion,
+      onPromptSuggestionDismiss: dismissPromptSuggestion,
+      onPromptSuggestionAbort: abortPromptSuggestion
     }
   );
 }
 __name(OpenTuiEntryApp, "OpenTuiEntryApp");
-async function startOpenTuiUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), _initializationResult, options = {}) {
+async function startOpenTuiUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), initializationResult, options = {}) {
   let renderer;
   try {
     renderer = await createCliRenderer({ exitOnCtrlC: false, useMouse: true });
@@ -56235,6 +57233,7 @@ async function startOpenTuiUI(config, settings, startupWarnings, workspaceRoot =
   const root = createRoot(renderer);
   let runtime = null;
   try {
+    void ensureConfigInitialized(config);
     const version = await getCliVersion();
     if (!settings.merged.ui?.hideWindowTitle && settings.merged.ui?.showStatusInTitle !== false) {
       writeTerminalTitle(
@@ -56246,11 +57245,15 @@ async function startOpenTuiUI(config, settings, startupWarnings, workspaceRoot =
     await runtime.writeRuntimeSidecar();
     runtime.startPressureMonitor();
     const capturedText = drainCapturedInputAsText();
+    const initialDialog = initializationResult.authError || config.getAuthType() === void 0 ? {
+      dialog: "auth",
+      initialError: initializationResult.authError ?? void 0
+    } : null;
     root.render(
       // children must sit in the props object: the provider declares it as a
       // required prop, which createElement's rest-children overloads can't fill.
       // eslint-disable-next-line react/no-children-prop
-      (0, import_react52.createElement)(SessionStatsProvider, {
+      (0, import_react55.createElement)(SessionStatsProvider, {
         sessionId: config.getSessionId(),
         children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           OpenTuiEntryApp,
@@ -56260,7 +57263,8 @@ async function startOpenTuiUI(config, settings, startupWarnings, workspaceRoot =
             runtime,
             startupWarnings,
             extensionRefreshState: options.extensionRefreshState,
-            capturedText
+            capturedText,
+            initialDialog
           }
         )
       })