nolo-cli 0.19.0 → 0.24.0-alpha.7

package/{readlineWorkspace-Y2RDOFZG.js → readlineWorkspace-BDH4G477.js}

@@ -3,23 +3,9 @@ import {
   normalizeDialogRecord,
   readDialogSnapshot,
   sortDialogs
-} from "./chunk-V3ED5AWK.js";
-import {
-  listFavoriteAgentIdsAcrossServers,
-  listLocalCachedAgents,
-  listRemoteAgents,
-  listRemoteAgentsAcrossServers
-} from "./chunk-HWW2M4SN.js";
-import "./chunk-ID4G2MAR.js";
-import {
-  listUserRecordsFromServers
-} from "./chunk-HEGV7BH3.js";
-import {
-  buildOverlayPresentation
-} from "./chunk-V5R4NZP2.js";
+} from "./chunk-S77SCVBU.js";
 import {
   ANSI_ESCAPE_REGEX,
-  CLI_AUTO_TIER_AGENT_KEYS,
   CLI_AUTO_TIER_AGENT_KEY_TABLE,
   CLI_IMAGE_AGENT_KEY,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
@@ -45,14 +31,15 @@ import {
   getActiveDensity,
   getActiveThemeName,
   isBalanceExhaustedError,
+  isQuotaExhaustedError,
   normalizeToolDisplayMode,
   padOrTruncateToWidth,
   releaseCollapsedPaste,
   releaseCollapsedPasteReferences,
+  renderSurfaceLine,
   renderTokenStatus,
   replaceCollapsedPastesWithReferences,
   resolveAgentContextWindow,
-  resolveCliAutoFallbackTier,
   resolveCliColorEnabled,
   resolveSkillReference,
   resolveTuiBrightness,
@@ -68,141 +55,143 @@ import {
   themeColorSequence,
   themeText,
   truncateAnsi,
+  userSurfaceBackgroundSequence,
   visibleWidth,
   wrapTextToLines,
   wrapTranscriptLine
-} from "./chunk-BV4VEE3W.js";
+} from "./chunk-ROYOKSX4.js";
 import "./chunk-DZ3XJVET.js";
+import "./chunk-6HYVJV7B.js";
 import {
-  getReadableCliDb
-} from "./chunk-WFHXMLHZ.js";
+  listFavoriteAgentIdsAcrossServers,
+  listLocalCachedAgents,
+  listRemoteAgents,
+  listRemoteAgentsAcrossServers,
+  normalizeListedAgent
+} from "./chunk-QLVWFXZQ.js";
+import "./chunk-ID4G2MAR.js";
 import {
-  deleteDbRecord,
-  queryUserRecords,
-  readDbRecord
-} from "./chunk-DFCFMCY6.js";
+  listUserRecordsFromServers,
+  readLiveDbRecordAfterTombstoneMerge
+} from "./chunk-AQZCWJOG.js";
 import {
   createCliLocalRuntimeAdapter,
   initCliLocale,
-  isQuotaExhaustedError,
   parseCliLocale,
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-23FZYPLC.js";
-import "./chunk-OK6YSWLH.js";
-import "./chunk-SWDPIPOY.js";
+} from "./chunk-OJFYT3ZQ.js";
+import "./chunk-IICW77GI.js";
+import {
+  getReadableCliDb
+} from "./chunk-WFHXMLHZ.js";
+import {
+  deleteDbRecord,
+  queryUserRecords,
+  readDbRecord
+} from "./chunk-JBLY6HQP.js";
+import "./chunk-ZGVW7MSZ.js";
 import {
+  NOLO_DEFAULT_AGENT_KEY,
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";
 import "./chunk-LTRXGFMS.js";
-import "./chunk-MVQ4TBSD.js";
-import "./chunk-6HYVJV7B.js";
+import "./chunk-54VHTARN.js";
 import "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-CZ6NYQTV.js";
-import "./chunk-FXUSIQC2.js";
-import {
-  expandEnabledPacks
-} from "./chunk-EDV7EBOI.js";
+} from "./chunk-P4QWLZGU.js";
+import "./chunk-SROR5TSM.js";
+import "./chunk-4ZH6GUJF.js";
 import "./chunk-RQSOAMPJ.js";
-import "./chunk-3ZX7PERL.js";
+import "./chunk-I6RJGORZ.js";
+import "./chunk-LALVWNE4.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-4T5F7YZQ.js";
 import "./chunk-3LY4F7SV.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-G5U6LDLG.js";
-import {
-  initialRunOverlayState,
-  reduceRunOverlay
-} from "./chunk-DL6EPNIK.js";
-import "./chunk-OWOHNGCN.js";
-import "./chunk-JLA4FXYC.js";
+import "./chunk-NVHPMDSZ.js";
+import "./chunk-MALVZUYL.js";
 import "./chunk-VP4WJWKW.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-WJRJDX2W.js";
-import "./chunk-LM6IYQ3F.js";
-import "./chunk-IYEXFJPC.js";
+import "./chunk-TW35GDNW.js";
 import {
   extractReferenceKeysFromMessage
-} from "./chunk-SCTYAHYK.js";
+} from "./chunk-H2NAWOLH.js";
 import {
   buildBuiltinSummaryContent
 } from "./chunk-XOIF2TNF.js";
-import "./chunk-B5TOXZAK.js";
 import "./chunk-MRC4Q34M.js";
-import "./chunk-REA4JLBH.js";
+import "./chunk-SIZQB7BD.js";
+import "./chunk-M5OZCOBV.js";
+import "./chunk-YYLHWIW6.js";
 import "./chunk-CWMSB67P.js";
-import "./chunk-XHG22OEX.js";
-import "./chunk-Z4NR32XR.js";
+import "./chunk-ROJI6DRT.js";
+import "./chunk-5RGU3J7P.js";
 import "./chunk-M76ECQRD.js";
-import "./chunk-3Q7WHGCB.js";
+import "./chunk-L65QKSVJ.js";
 import {
   buildSkillDiscoveryContextBlock
 } from "./chunk-7OBMZCRD.js";
-import "./chunk-7BUYEZ6U.js";
-import "./chunk-VC6OZXO5.js";
+import "./chunk-7H3UTGPM.js";
+import {
+  expandEnabledPacks
+} from "./chunk-CF7S2RYZ.js";
+import "./chunk-ZWJOGMKH.js";
 import "./chunk-WZSRQNQG.js";
 import {
   buildLocalWorkspaceOpenAiTools,
   buildLocalWorkspaceToolset,
   getProcessRegistry
-} from "./chunk-R35XMF6F.js";
+} from "./chunk-H73ZV2GL.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-N54HIJVJ.js";
+import "./chunk-KFUCLS7Z.js";
 import "./chunk-OIQPORYI.js";
 import {
   readCommandActionGatePayload,
   resolveAgentImageInputSupport
-} from "./chunk-YGW4G5W5.js";
-import "./chunk-LSFAWXKC.js";
+} from "./chunk-X546QUDT.js";
+import "./chunk-N7J63Q6C.js";
 import {
   buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks
-} from "./chunk-34WPV75U.js";
-import "./chunk-KFEVY3ST.js";
+} from "./chunk-ZUXIXYJI.js";
+import "./chunk-D34RI6NI.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-MHSGJW4Z.js";
-import "./chunk-DKZFOK24.js";
+} from "./chunk-EHOYZRTI.js";
+import "./chunk-UZH44DWK.js";
+import "./chunk-2MBTWINN.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   estimateTokenCount,
   getModelContextWindow,
   planCompression,
   serializeMessageContent
-} from "./chunk-I2ZJKTG5.js";
+} from "./chunk-CGVRC2TB.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
 import "./chunk-5CS33IBL.js";
 import "./chunk-JZPBVBIY.js";
-import "./chunk-UAIVG4J6.js";
+import "./chunk-CHSCAUZN.js";
 import "./chunk-ZHXJ6M7T.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
-import "./chunk-ELT65PZW.js";
 import "./chunk-AL2V7U3E.js";
 import "./chunk-4PWB7JRR.js";
 import {
   canonicalizeToolNames
 } from "./chunk-ZZ2MH7LE.js";
-import "./chunk-5MIDPSSK.js";
-import {
-  extractCustomId
-} from "./chunk-DFFIZ25G.js";
+import "./chunk-PB7G5MAM.js";
 import "./chunk-3ASDTTEI.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
 import {
   checkStaleRun,
-  queryRunRecords,
   readRunRecord
-} from "./chunk-VNAEBGDK.js";
+} from "./chunk-RZNYL4LW.js";
 import {
   clipText,
   formatDuration,
@@ -213,17 +202,21 @@ import {
   resolveRunLabel,
   runShowsLogTail,
   shortRunId
-} from "./chunk-FQZZLA3C.js";
-import "./chunk-X7W4TNB4.js";
-import "./chunk-ATNTHIZI.js";
+} from "./chunk-KXKQO4Q6.js";
+import "./chunk-CMKUBIGW.js";
 import "./chunk-JBTJAPUF.js";
+import "./chunk-ATNTHIZI.js";
+import "./chunk-LM6IYQ3F.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   runSelfUpdate
-} from "./chunk-K6EUAOW3.js";
+} from "./chunk-35RYGII3.js";
 import {
   saveProfileAgentSelection,
   saveProfileLocale
-} from "./chunk-ROWQEJRP.js";
+} from "./chunk-DXJS7VSG.js";
 import {
   readPipeText,
   spawnProcess
@@ -237,27 +230,31 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import "./chunk-LLWKHDG4.js";
-import "./chunk-MKA6QE5E.js";
-import "./chunk-UGUW3FHG.js";
-import "./chunk-RVOUXDFU.js";
+import "./chunk-4ULSC37S.js";
+import "./chunk-2IPEVBUO.js";
+import "./chunk-JMSCXQUG.js";
+import "./chunk-S6KVFOUG.js";
 import "./chunk-Y5GCAMGP.js";
+import "./chunk-UZ6XXCVR.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-XRZJGPFI.js";
-import "./chunk-6Y7A3OQQ.js";
+import "./chunk-OXLLFZNF.js";
+import "./chunk-FON47ACC.js";
+import "./chunk-NRY4GCKJ.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-SKDNBYZK.js";
 import "./chunk-I42VC5KR.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
-import "./chunk-X4Q4UZEY.js";
-import "./chunk-3ND52WIL.js";
+import "./chunk-ATWUOTJP.js";
 import "./chunk-XMLRJUU5.js";
 import "./chunk-R5V5G73M.js";
 import "./chunk-GBRG75BQ.js";
 import "./chunk-3EUW3WEO.js";
 import "./chunk-U6VC4MU4.js";
+import {
+  extractCustomId
+} from "./chunk-SLOGKB7M.js";
 import "./chunk-KUG52IAP.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";
@@ -526,6 +523,7 @@ async function compactDialog(options) {
     dialogKey
   );
   let summaryGenerated = false;
+  let compactedMessageCount = 0;
   if (options.summaryLlmCaller) {
     const allMsgs = await readDialogMessages(
       fetchImpl,
@@ -580,6 +578,7 @@ async function compactDialog(options) {
             current.compressionCount = compressionCount + 1;
             current.referenceKeys = Array.from(extractedKeys);
             summaryGenerated = true;
+            compactedMessageCount = plan.compressCount;
             console.log(
               `[nolo] compact: compressed ${plan.compressCount} messages into summary (len: ${newSummary.trim().length})`
             );
@@ -602,7 +601,8 @@ async function compactDialog(options) {
     dialogId: extractCustomId(next.dbKey),
     dialogKey: next.dbKey,
     spaceId: typeof next.spaceId === "string" ? next.spaceId : void 0,
-    summaryGenerated
+    summaryGenerated,
+    compactedMessageCount
   };
 }
 
@@ -612,7 +612,7 @@ var DIALOG_CHECKED = "\u25C9";
 var DIALOG_UNCHECKED = "\u25CB";
 function renderDialogTitle(title, colorEnabled = resolveCliColorEnabled()) {
   if (!colorEnabled) return title;
-  return `\x1B[1m${themeColorSequence("accent")}${title}\x1B[0m`;
+  return `${themeColorSequence("accent")}${title}\x1B[0m`;
 }
 function renderDialogRow(args, colorEnabled = resolveCliColorEnabled()) {
   const marker = args.focused ? DIALOG_CURSOR : " ";
@@ -620,7 +620,7 @@ function renderDialogRow(args, colorEnabled = resolveCliColorEnabled()) {
   const detail = args.detail ? `  ${themeText(args.detail, "muted", colorEnabled)}` : "";
   const row = `${marker} ${checkbox}${args.label}${detail}`;
   if (!args.focused || !colorEnabled) return row;
-  return `${surfaceBackgroundSequence()}${themeColorSequence("accent")}\x1B[1m${row}\x1B[0m`;
+  return `${surfaceBackgroundSequence()}${themeColorSequence("accent")}${row}\x1B[0m`;
 }
 function renderDialogOverflow(text, colorEnabled = resolveCliColorEnabled()) {
   return themeText(`  ${text}`, "chrome", colorEnabled);
@@ -1328,7 +1328,7 @@ function renderTabBar(questions, activeIndex, colorEnabled) {
   const tabs = questions.map((q, i) => {
     const label = `Q${i + 1}`;
     if (i === activeIndex) {
-      return colorEnabled ? `${themeColorSequence("accent")}\x1B[1m ${label} \x1B[0m` : `[${label}]`;
+      return colorEnabled ? `${themeColorSequence("accent")} ${label} \x1B[0m` : `[${label}]`;
     }
     return colorEnabled ? themeText(` ${label} `, "muted", colorEnabled) : ` ${label} `;
   });
@@ -1395,7 +1395,7 @@ function renderAskChoiceFrame(state) {
       const plainRow = `${plainPrefix}${qs.otherText}`;
       if (focused && colorEnabled) {
         lines.push(
-          `\x1B[1m${themeColorSequence("accent")}${plainRow}\x1B[0m`
+          `${themeColorSequence("accent")}${plainRow}\x1B[0m`
         );
       } else {
         lines.push(plainRow);
@@ -2159,6 +2159,7 @@ function createRunRegistryPoller(deps) {
       return;
     }
     const alive = /* @__PURE__ */ new Set();
+    const polled = [];
     for (const run of active) {
       alive.add(run.runId);
       let record;
@@ -2172,6 +2173,7 @@ function createRunRegistryPoller(deps) {
         continue;
       }
       if (!record) continue;
+      polled.push(record);
       const snapshot = snapshotFromRunRecord(record, at);
       const mark = fingerprint(snapshot);
       if (lastEmitted.get(run.runId) === mark) continue;
@@ -2184,6 +2186,12 @@ function createRunRegistryPoller(deps) {
     for (const runId of [...lastReconciledAt.keys()]) {
       if (!alive.has(runId)) lastReconciledAt.delete(runId);
     }
+    if (polled.length > 0 && deps.onRecordsPolled) {
+      try {
+        deps.onRecordsPolled(polled);
+      } catch {
+      }
+    }
   };
   return {
     ensureRunning() {
@@ -2199,6 +2207,163 @@ function createRunRegistryPoller(deps) {
   };
 }
 
+// packages/core/chat/internalTurnEvent.ts
+function normalizeRunCompletionShape(record) {
+  const runId = String(record.runId ?? record.id ?? "");
+  const agentKey = String(record.agentKey ?? record.agent ?? "");
+  const status = String(record.status ?? "done");
+  const counters = record.activity?.counters;
+  return {
+    runId,
+    agentKey,
+    ...typeof record.agentName === "string" ? { agentName: record.agentName } : {},
+    status,
+    ...typeof record.exitCode === "number" ? { exitCode: record.exitCode } : {},
+    ...typeof record.parentDialogId === "string" ? { parentDialogId: record.parentDialogId } : {},
+    ...typeof record.dialogId === "string" ? { dialogId: record.dialogId } : {},
+    ...typeof record.ephemeral === "boolean" ? { ephemeral: record.ephemeral } : {},
+    ...record.startedAt !== void 0 ? { startedAt: record.startedAt } : {},
+    ...record.endedAt !== void 0 ? { endedAt: record.endedAt } : {},
+    ...typeof record.note === "string" ? { note: record.note } : {},
+    ...typeof record.error === "string" ? { error: record.error } : {},
+    ...typeof record.ack === "boolean" ? { ack: record.ack } : {},
+    ...counters ? {
+      activity: {
+        counters: {
+          toolCalls: typeof counters.toolCalls === "number" ? counters.toolCalls : 0,
+          llmCalls: typeof counters.llmCalls === "number" ? counters.llmCalls : 0,
+          fileEdits: typeof counters.fileEdits === "number" ? counters.fileEdits : 0
+        }
+      }
+    } : {}
+  };
+}
+function createTurnRequest(input) {
+  if (typeof input === "string") {
+    return {
+      event: { kind: "user", text: input },
+      text: input
+    };
+  }
+  if ("event" in input && typeof input.event === "object" && typeof input.text === "string") {
+    return input;
+  }
+  const event = input;
+  return {
+    event,
+    text: event.text
+  };
+}
+
+// packages/cli/tui/runCompletionWatcher.ts
+var WAKE_NOTE_MAX_CHARS = 300;
+function createRunCompletionWatcher(deps) {
+  const now = deps.now ?? (() => Date.now());
+  const createdAt = now();
+  const lastStatusByRunId = /* @__PURE__ */ new Map();
+  const notifiedRunIds = /* @__PURE__ */ new Set();
+  const describeRun = (record) => {
+    const lines = [
+      `runId: ${record.runId}`,
+      `agent: ${resolveRunLabel(record)}`,
+      `status: ${record.status}`
+    ];
+    if (typeof record.exitCode === "number") {
+      lines.push(`exitCode: ${record.exitCode}`);
+    }
+    if (record.dialogId) {
+      lines.push(`childDialogId: ${record.dialogId}`);
+    } else if (record.ephemeral) {
+      lines.push(`ephemeral: true (no persisted child dialog)`);
+    } else {
+      lines.push(`childDialogId: missing (result unpersisted or ephemeral)`);
+    }
+    const duration = formatRunAge(
+      {
+        startedAt: readTimestamp(record.startedAt),
+        finishedAt: readTimestamp(record.endedAt ?? record.finishedAt)
+      },
+      now()
+    );
+    if (duration) lines.push(`duration: ${duration}`);
+    const recordError = "error" in record && typeof record.error === "string" ? record.error : void 0;
+    const note = typeof record.note === "string" ? clipText(record.note, WAKE_NOTE_MAX_CHARS) : typeof recordError === "string" ? clipText(recordError, WAKE_NOTE_MAX_CHARS) : "";
+    if (note) lines.push(`note: ${note}`);
+    const counters = record.activity?.counters;
+    if (counters && typeof counters.toolCalls === "number" && typeof counters.llmCalls === "number" && typeof counters.fileEdits === "number") {
+      lines.push(
+        `activity: ${counters.toolCalls} tool calls \xB7 ${counters.llmCalls} llm calls \xB7 ${counters.fileEdits} edits`
+      );
+    }
+    return lines;
+  };
+  const buildWakeMessage = (finished) => {
+    const lines = [
+      `\u3010\u540E\u53F0 run \u7EC8\u6001\u901A\u77E5\u3011\u4F60\u6D3E\u51FA\u7684 ${finished.length} \u6761\u540E\u53F0 run \u5DF2\u5230\u8FBE\u7EC8\u6001\uFF1A`
+    ];
+    for (const record of finished) {
+      lines.push("", ...describeRun(record));
+    }
+    lines.push(
+      "",
+      '\u4EE5\u4E0A\u662F\u4F60\u901A\u8FC7 startAgentRun \u6D3E\u51FA\u7684\u540E\u53F0 run \u7684\u7EC8\u6001\u901A\u77E5\uFF08\u7CFB\u7EDF\u5185\u90E8\u4E8B\u4EF6\uFF0C\u4E0D\u662F\u7528\u6237\u6D88\u606F\uFF09\u3002\u8BF7\u9605\u8BFB\u4E0A\u9762\u7684\u6458\u8981\u5E76\u81EA\u5DF1\u51B3\u5B9A\u4E0B\u4E00\u6B65\uFF1A\u6C47\u603B\u7ED3\u679C\u3001\u7EE7\u7EED\u540E\u7EED\u5DE5\u4F5C\u3001\u6216\u5411\u7528\u6237\u6C47\u62A5\u7ED3\u8BBA\u3002\u9700\u8981\u5B8C\u6574\u8F93\u51FA\u65F6\u7528 controlAgentRun(action:"status", runId, tailLines:30) \u62C9\u53D6\u5BF9\u5E94 run \u7684\u65E5\u5FD7\u3002'
+    );
+    return lines.join("\n");
+  };
+  return {
+    observe(records) {
+      const finished = [];
+      const currentDialogId = deps.getCurrentDialogId();
+      for (const rawRecord of records) {
+        try {
+          if (!rawRecord || typeof rawRecord.runId !== "string" || !rawRecord.runId) continue;
+          const record = rawRecord;
+          if (notifiedRunIds.has(record.runId)) continue;
+          if (record.ack === true) {
+            notifiedRunIds.add(record.runId);
+            continue;
+          }
+          const status = record.status;
+          if (typeof status !== "string") continue;
+          if (record.parentDialogId !== currentDialogId) continue;
+          const previous = lastStatusByRunId.get(record.runId);
+          lastStatusByRunId.set(record.runId, status);
+          if (!isAgentRunTerminalStatus(status)) continue;
+          if (previous === void 0) {
+            const startedMs = readTimestamp(record.startedAt);
+            if (startedMs === void 0 || startedMs < createdAt) continue;
+          } else if (isAgentRunTerminalStatus(previous)) {
+            continue;
+          }
+          notifiedRunIds.add(record.runId);
+          finished.push(record);
+        } catch {
+          continue;
+        }
+      }
+      if (finished.length === 0) return;
+      const shapes = finished.map((r) => normalizeRunCompletionShape(r));
+      const summaryText = buildWakeMessage(finished);
+      const event = {
+        kind: "child-run-completed",
+        runs: shapes,
+        text: summaryText
+      };
+      deps.onWake(event);
+    },
+    markAcknowledged(runId) {
+      if (runId) notifiedRunIds.add(runId);
+    },
+    isAcknowledged(runId) {
+      return Boolean(runId && notifiedRunIds.has(runId));
+    },
+    dispose() {
+      lastStatusByRunId.clear();
+      notifiedRunIds.clear();
+    }
+  };
+}
+
 // packages/ai/agent/utils/sortUtils.ts
 function sortAgentsFavoriteOwnedPublic(items) {
   const map = /* @__PURE__ */ new Map();
@@ -2245,7 +2410,7 @@ function sortAgentsFavoriteOwnedPublic(items) {
 }
 
 // packages/cli/tui/agentCatalog.ts
-var DEFAULT_TUI_AGENT_KEY = "agent-pub-01NOLOAPPBLD000000019KCKT0";
+var DEFAULT_TUI_AGENT_KEY = NOLO_DEFAULT_AGENT_KEY;
 function formatAgentSourceLabel(entry) {
   if (entry.kind === "platform" || entry.apiSource === "platform") return t("agentSourcePlatform");
   if (entry.apiSource === "cli") {
@@ -2300,7 +2465,7 @@ function listedAgentToCatalogEntry(agent) {
     ...agent.cliProvider ? { cliProvider: agent.cliProvider } : {}
   };
 }
-function mergeCatalogEntries(currentKey, platformAgents, privateAgents, favoritedAtByKey = {}) {
+function mergeCatalogEntries(currentKey, privateAgents, favoritedAtByKey = {}) {
   const seen = /* @__PURE__ */ new Set();
   const merged = [];
   const push = (entry) => {
@@ -2309,12 +2474,9 @@ function mergeCatalogEntries(currentKey, platformAgents, privateAgents, favorite
     const favoritedAt = favoritedAtByKey[entry.key];
     merged.push(favoritedAt ? { ...entry, favoritedAt } : entry);
   };
-  const current = [...platformAgents, ...privateAgents].find((entry) => entry.key === currentKey) ?? null;
+  const current = privateAgents.find((entry) => entry.key === currentKey) ?? null;
   if (current) push(current);
-  for (const entry of platformAgents) {
-    if (entry.key !== currentKey) push(entry);
-  }
-  const sortablePrivate = privateAgents.map((entry) => ({
+  const sortablePrivate = privateAgents.filter((entry) => favoritedAtByKey[entry.key] !== void 0).map((entry) => ({
     key: entry.key,
     favoritedAt: favoritedAtByKey[entry.key],
     isOwned: true,
@@ -2322,7 +2484,7 @@ function mergeCatalogEntries(currentKey, platformAgents, privateAgents, favorite
   }));
   const sortedKeys = sortAgentsFavoriteOwnedPublic(sortablePrivate);
   const sortedKeyOrder = new Map(sortedKeys.map((item, i) => [item.key, i]));
-  const sortedPrivate = [...privateAgents].sort(
+  const sortedPrivate = privateAgents.filter((entry) => favoritedAtByKey[entry.key] !== void 0).sort(
     (a, b) => (sortedKeyOrder.get(a.key) ?? 0) - (sortedKeyOrder.get(b.key) ?? 0)
   );
   for (const entry of sortedPrivate) {
@@ -2362,7 +2524,6 @@ async function loadAgentCatalog(args) {
   }
   const entries = mergeCatalogEntries(
     args.currentKey,
-    resolveCatalogPlatformAgents(env),
     rawData.privateAgents,
     rawData.favoritedAtByKey
   );
@@ -2374,7 +2535,6 @@ function refreshAgentCatalogInBackground(args, env, cacheKey) {
   agentCatalogRefreshInFlight = fetchRawCatalogData(args, env).then((rawData) => {
     const entries = mergeCatalogEntries(
       args.currentKey,
-      resolveCatalogPlatformAgents(env),
       rawData.privateAgents,
       rawData.favoritedAtByKey
     );
@@ -2384,9 +2544,15 @@ function refreshAgentCatalogInBackground(args, env, cacheKey) {
     agentCatalogRefreshInFlight = null;
   });
 }
+async function prefillCatalogFromLocalDb(_args) {
+}
 function prefetchAgentCatalog(args) {
-  void loadAgentCatalog({ ...args, currentKey: "" }).catch(() => {
-  });
+  void (async () => {
+    await prefillCatalogFromLocalDb({ env: args.env, getDb: args.getDb }).catch(() => {
+    });
+    void loadAgentCatalog({ ...args, currentKey: "" }).catch(() => {
+    });
+  })();
 }
 async function fetchRawCatalogData(args, env) {
   const fetchImpl = args.fetchImpl ?? fetch;
@@ -2398,7 +2564,7 @@ async function fetchRawCatalogData(args, env) {
   }
   const serverUrl = resolveServerUrl(env);
   const serverUrls = resolveServerCandidates([], env, serverUrl);
-  let privateAgents = [];
+  let listedAgents = [];
   const favoritesPromise = listFavoriteAgentIdsAcrossServers({
     authToken,
     fetchImpl,
@@ -2412,15 +2578,14 @@ async function fetchRawCatalogData(args, env) {
       serverUrls,
       userId
     });
-    privateAgents = remoteResult.agents.map(listedAgentToCatalogEntry);
+    listedAgents = remoteResult.agents;
   } catch {
     try {
       const db = await getReadableCliDb({ write: () => {
       } });
-      const cached = await listLocalCachedAgents({ db, userId });
-      privateAgents = cached.map(listedAgentToCatalogEntry);
+      listedAgents = await listLocalCachedAgents({ db, userId });
     } catch {
-      privateAgents = (await listRemoteAgents({
+      listedAgents = await listRemoteAgents({
         authToken,
         fallbackFetchImpl,
         fetchImpl,
@@ -2428,10 +2593,47 @@ async function fetchRawCatalogData(args, env) {
         userId,
         queryUserRecords,
         readDbRecord
-      })).map(listedAgentToCatalogEntry);
+      });
     }
   }
+  const privateAgents = listedAgents.map(listedAgentToCatalogEntry);
   const favoritedAtByKey = await favoritesPromise;
+  for (const agent of listedAgents) {
+    const favoritedAt = [agent.privateKey, agent.publicKey, agent.id].map((key) => favoritedAtByKey[key]).find((value) => value !== void 0);
+    if (favoritedAt !== void 0) favoritedAtByKey[agent.privateKey] = favoritedAt;
+  }
+  const existingKeys = /* @__PURE__ */ new Set();
+  for (const agent of listedAgents) {
+    existingKeys.add(agent.privateKey);
+    existingKeys.add(agent.publicKey);
+    existingKeys.add(agent.id);
+  }
+  await Promise.all(
+    Object.keys(favoritedAtByKey).map(async (favKey) => {
+      if (existingKeys.has(favKey)) return;
+      try {
+        const favRead = await readLiveDbRecordAfterTombstoneMerge({
+          authToken,
+          dbKey: favKey,
+          fallbackFetchImpl,
+          fetchImpl,
+          serverUrls
+        });
+        const record = favRead.record;
+        if (!record || record.type && record.type !== "agent") return;
+        const norm = normalizeListedAgent(record);
+        if (!norm) return;
+        if (existingKeys.has(norm.privateKey) || existingKeys.has(norm.publicKey) || existingKeys.has(norm.id)) {
+          return;
+        }
+        existingKeys.add(norm.privateKey);
+        existingKeys.add(norm.publicKey);
+        existingKeys.add(norm.id);
+        privateAgents.push(listedAgentToCatalogEntry(norm));
+      } catch {
+      }
+    })
+  );
   return { privateAgents, favoritedAtByKey };
 }
 function renderAgentCatalogList(entries, currentKey) {
@@ -3096,7 +3298,7 @@ function renderWelcome(state, frame = 0, maxFrames = 0, columns) {
     const widestSceneCol = sceneArt.split("\n").reduce((max, line) => Math.max(max, displayWidth(stripAnsi(line))), 0);
     if (columns < widestSceneCol) sceneArt = "";
   }
-  const versionLine = colorEnabled ? `\x1B[1m${themeColorSequence("accent")}nolo\x1B[0m ${state.cliVersion ?? ""} | server ${state.serverUrl}`.replace("  |", " |") : `nolo ${state.cliVersion ?? ""} | server ${state.serverUrl}`.replace("  |", " |");
+  const versionLine = colorEnabled ? `${themeColorSequence("accent")}nolo\x1B[0m ${state.cliVersion ?? ""} | server ${state.serverUrl}`.replace("  |", " |") : `nolo ${state.cliVersion ?? ""} | server ${state.serverUrl}`.replace("  |", " |");
   const body = sceneArt ? [sceneArt, versionLine, t("welcomeHint"), ""] : [versionLine, t("welcomeHint"), ""];
   return body.join("\n");
 }
@@ -3760,7 +3962,16 @@ function handleTuiInput(input, state) {
         };
       }
       return {
-        nextState: state,
+        nextState: {
+          ...state,
+          dialogId: void 0,
+          dialogKey: void 0,
+          dialogLabel: t("newDialog"),
+          attachedDocs: [],
+          attachedSkills: [],
+          attachedImages: [],
+          turnTokens: void 0
+        },
         output: t("clearingDialog"),
         action: { type: "clear", dialogId: state.dialogId }
       };
@@ -4127,52 +4338,65 @@ var initialChatQueueState = {
 function reduceChatQueue(state, event) {
   switch (event.type) {
     case "turn-start":
-      if (state.running) return state;
-      return { ...state, running: true, lastDrainError: null };
-    case "turn-end": {
-      if (!state.running) return state;
-      if (event.aborted) {
-        return {
-          ...state,
-          running: false,
-          queue: [],
-          lastDrainError: null
-        };
-      }
+      if (state.running && state.lastDrainError === null) return state;
+      return {
+        ...state,
+        running: true,
+        lastDrainError: null
+      };
+    case "turn-end":
       return {
         ...state,
         running: false,
-        ...event.ok ? {} : { lastDrainError: "previous turn failed" }
+        queue: event.aborted ? [] : state.queue,
+        lastDrainError: !event.ok && !event.aborted ? "previous turn failed" : state.lastDrainError
       };
-    }
     case "enqueue": {
-      const text = event.text;
-      if (!text) return state;
-      return { ...state, queue: [...state.queue, text], lastDrainError: null };
+      const req = createTurnRequest(event.text);
+      if (!req.text.trim() && req.event.kind === "user") {
+        return state;
+      }
+      return {
+        ...state,
+        queue: [...state.queue, req]
+      };
     }
-    case "dequeue": {
+    case "dequeue":
       if (state.queue.length === 0) return state;
-      return { ...state, queue: state.queue.slice(1) };
-    }
+      return {
+        ...state,
+        queue: state.queue.slice(1)
+      };
     case "clear":
-      if (state.queue.length === 0 && !state.lastDrainError) return state;
-      return { ...state, queue: [], lastDrainError: null };
+      if (state.queue.length === 0 && state.lastDrainError === null) return state;
+      return {
+        ...state,
+        queue: [],
+        lastDrainError: null
+      };
     case "pause-drain":
       if (state.drainPaused) return state;
-      return { ...state, drainPaused: true };
+      return {
+        ...state,
+        drainPaused: true
+      };
     case "resume-drain":
       if (!state.drainPaused) return state;
-      return { ...state, drainPaused: false };
+      return {
+        ...state,
+        drainPaused: false
+      };
     case "drain-error":
-      return { ...state, lastDrainError: event.message };
-    default: {
-      const _exhaustive = event;
+      return {
+        ...state,
+        lastDrainError: event.message || null
+      };
+    default:
       return state;
-    }
   }
 }
-function shouldDrainAfterTurnEnd(state, prevEndedOk) {
-  return !state.running && !state.drainPaused && state.queue.length > 0 && prevEndedOk;
+function shouldDrainAfterTurnEnd(state, cleanTurnEnd) {
+  return cleanTurnEnd && !state.running && !state.drainPaused && state.queue.length > 0;
 }
 function applyChatQueueEvent(state, event) {
   const prevQueueLen = state.queue.length;
@@ -4191,7 +4415,8 @@ function applyChatQueueEvent(state, event) {
   }
   if (event.type === "turn-end" && !event.aborted && event.ok) {
     if (shouldDrainAfterTurnEnd(next, true)) {
-      outgoing.push({ type: "drain-ready", text: next.queue[0] });
+      const head = next.queue[0];
+      outgoing.push({ type: "drain-ready", text: head.text, request: head });
     }
   }
   return { state: next, outgoing };
@@ -4273,7 +4498,8 @@ function projectChatQueueStatus({
 }) {
   const preview = [];
   for (let i = 0; i < Math.min(maxPreview, state.queue.length); i++) {
-    const text = state.queue[i] ?? "";
+    const item = state.queue[i];
+    const text = typeof item === "string" ? item : item?.text ?? "";
     preview.push(text.length > previewCharLimit ? text.slice(0, previewCharLimit) + "\u2026" : text);
   }
   let composerPlaceholderKey = "default";
@@ -4312,10 +4538,19 @@ function createChatQueueTuiBinding(runTurn) {
       isCompactDialogSlashCommand: (s) => s === "/compact"
     });
   };
-  const enqueue = (text) => {
-    runtime.send({ type: "enqueue", text });
+  const enqueue = (input) => {
+    runtime.send({ type: "enqueue", text: input });
     return projectChatQueueStatus({ state: runtime.getState() });
   };
+  const enqueueAndMaybeRun = async (input) => {
+    enqueue(input);
+    const status = runtime.getState();
+    if (!status.running && !status.drainPaused) {
+      await notifyTurnEnd({ ok: true, aborted: false });
+      return true;
+    }
+    return false;
+  };
   const notifyTurnStart = () => {
     runtime.send({ type: "turn-start" });
   };
@@ -4338,23 +4573,22 @@ function createChatQueueTuiBinding(runTurn) {
     while (true) {
       const status = runtime.getState();
       if (!status.running && !status.drainPaused && status.queue.length > 0 && lastOk) {
-        const text = status.queue[0];
+        const req = status.queue[0];
         runtime.send({ type: "turn-start" });
         runtime.send({ type: "dequeue" });
         let turnOutcome;
         try {
-          turnOutcome = await runTurn(text);
+          turnOutcome = await runTurn(req);
         } catch {
           turnOutcome = { ok: false, aborted: false };
         }
-        const { outcome: cascadeOutcome, mode: cascadeMode } = consumePreempt(turnOutcome);
-        runtime.send({ type: "turn-end", ...cascadeOutcome });
-        if (cascadeMode === "stop") {
+        const consumed = consumePreempt(turnOutcome);
+        const effectiveTurnOutcome = consumed.outcome;
+        runtime.send({ type: "turn-end", ...effectiveTurnOutcome });
+        if (consumed.mode === "stop") {
           runtime.send({ type: "drain-error", message: "" });
         }
-        lastOk = cascadeOutcome.ok && !cascadeOutcome.aborted;
-        if (cascadeOutcome.aborted) break;
-        if (!lastOk) break;
+        lastOk = effectiveTurnOutcome.ok && !effectiveTurnOutcome.aborted;
       } else {
         break;
       }
@@ -4362,11 +4596,11 @@ function createChatQueueTuiBinding(runTurn) {
   };
   const drainHeadForManualTurn = () => {
     const status = runtime.getState();
-    if (status.running || status.drainPaused || status.queue.length === 0) return null;
-    const text = status.queue[0];
+    if (status.running || status.queue.length === 0) return null;
+    const head = status.queue[0];
     runtime.send({ type: "turn-start" });
     runtime.send({ type: "dequeue" });
-    return text;
+    return head;
   };
   const preemptForDrain = () => {
     const status = runtime.getState();
@@ -4383,7 +4617,7 @@ function createChatQueueTuiBinding(runTurn) {
   const snapshotAndClearQueue = () => {
     const status = runtime.getState();
     if (status.queue.length === 0) return null;
-    const merged = status.queue.join("\n");
+    const merged = status.queue.map((req) => req.text).join("\n");
     runtime.send({ type: "clear" });
     return merged;
   };
@@ -4398,6 +4632,7 @@ function createChatQueueTuiBinding(runTurn) {
   return {
     resolveSubmit,
     enqueue,
+    enqueueAndMaybeRun,
     notifyTurnStart,
     notifyTurnEnd,
     drainHeadForManualTurn,
@@ -4411,9 +4646,22 @@ function createChatQueueTuiBinding(runTurn) {
   };
 }
 
+// packages/cli/tui/terminalNotification.ts
+function shouldEmitTerminalBell(decision) {
+  return !decision.wasAborted && !decision.streamInterrupted && decision.exitCode === 0 && decision.interactive;
+}
+function emitTerminalBell(output) {
+  try {
+    output.write("\x07");
+  } catch {
+  }
+}
+
 // packages/cli/tui/tuiHistory.ts
 var MAX_TUI_HISTORY_TURNS = 500;
 var turnLineCache = /* @__PURE__ */ new WeakMap();
+var turnLineCountCache = /* @__PURE__ */ new WeakMap();
+var renderCacheMissCount = 0;
 function createTurnHistory() {
   return {
     turns: [],
@@ -4432,6 +4680,7 @@ function startTurn(history, role) {
   }
   history.currentRole = role;
   history.currentContent = "";
+  resetStreamingTurnCache();
 }
 function appendToCurrentTurn(history, chunk) {
   history.currentContent += chunk;
@@ -4444,6 +4693,7 @@ function finalizeCurrentTurn(history) {
     });
     history.currentRole = null;
     history.currentContent = "";
+    resetStreamingTurnCache();
     if (history.turns.length > MAX_TUI_HISTORY_TURNS) {
       history.turns = history.turns.slice(history.turns.length - MAX_TUI_HISTORY_TURNS);
     }
@@ -4467,23 +4717,33 @@ function styleAssistantTurn(content, colorEnabled) {
   });
   return styledLines.join("\n");
 }
+function fillUserBubbleRow(row, surfaceSeq, contentWidth) {
+  const visible = visibleWidth(row);
+  if (visible > contentWidth) {
+    const truncated = truncateAnsi(row, contentWidth);
+    const padAfter = Math.max(0, contentWidth - visibleWidth(truncated));
+    return `${surfaceSeq}${truncated}${" ".repeat(padAfter)}\x1B[0m`;
+  }
+  return renderSurfaceLine({ text: row, surface: surfaceSeq, padTo: contentWidth });
+}
 function renderTurnBlock(role, content, contentWidth, colorEnabled) {
+  content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
   const lines = [];
   if (role === "user") {
     const logicalLines = content.split("\n");
     const accentSeq = colorEnabled ? themeColorSequence("accent") : "";
-    const chromeSeq = colorEnabled ? themeColorSequence("chrome") : "";
+    const firstPrefix = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
+    const multilinePrefix = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
+    const hangingIndent = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
+    const surfaceSeq = colorEnabled ? userSurfaceBackgroundSequence() : "";
     for (let i = 0; i < logicalLines.length; i++) {
       const line = logicalLines[i];
-      let styledLine;
-      if (colorEnabled) {
-        const prefix = i === 0 ? `${accentSeq}\u276F ` : `${chromeSeq}\u2502 `;
-        styledLine = `${prefix}\x1B[1m${accentSeq}${line}`;
-      } else {
-        const prefix = i === 0 ? "\u276F " : "  ";
-        styledLine = `${prefix}${line}`;
-      }
-      lines.push(...wrapTranscriptLine(styledLine, contentWidth, "  "));
+      const prefix = i === 0 ? firstPrefix : multilinePrefix;
+      const styledLine = `${prefix}${line}`;
+      const rows = wrapTranscriptLine(styledLine, contentWidth, hangingIndent);
+      lines.push(
+        ...surfaceSeq ? rows.map((row) => fillUserBubbleRow(row, surfaceSeq, contentWidth)) : rows
+      );
     }
   } else {
     const styledEntry = styleAssistantTurn(content, colorEnabled);
@@ -4493,57 +4753,184 @@ function renderTurnBlock(role, content, contentWidth, colorEnabled) {
   }
   return lines;
 }
-function buildCopyViewLines(history) {
-  const turns = [...history.turns];
-  if (history.currentRole !== null) {
-    turns.push({ role: history.currentRole, content: history.currentContent });
+var streamingTurnCache = null;
+function resetStreamingTurnCache() {
+  streamingTurnCache = null;
+}
+function renderPrefixTurnBlock(role, content, contentWidth, colorEnabled) {
+  content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  if (role === "user") {
+    return renderTurnBlock(role, content, contentWidth, colorEnabled);
   }
+  const highlighted = colorEnabled ? formatAssistantDisplay(content, { trimEdges: false }) : stripAnsi(formatAssistantDisplay(content, { trimEdges: false }));
+  const rawLines = highlighted.split("\n");
+  const styledLines = rawLines.map((line, idx) => {
+    if (idx === 0 && !line.startsWith("[nolo]")) {
+      const anchorPrefix = colorEnabled ? `${themeColorSequence("chrome")}\u25C8\x1B[39m ` : "\u25C8 ";
+      return `${anchorPrefix}${line}`;
+    }
+    return line.startsWith("[nolo]") && colorEnabled ? themeText(line, "chrome", true) : line;
+  });
   const lines = [];
-  for (const [index, turn] of turns.entries()) {
-    if (index > 0) lines.push("");
-    const normalized = stripAnsi(turn.content).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-    lines.push(...normalized.split("\n"));
+  for (const logicalLine of styledLines) {
+    lines.push(...wrapTranscriptLine(logicalLine, contentWidth));
   }
   return lines;
 }
-function buildHistoryLines(history, contentWidth) {
-  const colorEnabled = resolveCliColorEnabled();
+function renderTailTurnBlock(role, content, contentWidth, colorEnabled) {
+  content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  const lines = [];
+  if (role === "user") {
+    const surfaceSeq = colorEnabled ? userSurfaceBackgroundSequence() : "";
+    const accentSeq = colorEnabled ? themeColorSequence("accent") : "";
+    const multilinePrefix = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
+    const hangingIndent = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
+    for (const rawLine of content.split("\n")) {
+      const styledLine = `${multilinePrefix}${rawLine}`;
+      const rows = wrapTranscriptLine(styledLine, contentWidth, hangingIndent);
+      lines.push(
+        ...surfaceSeq ? rows.map((row) => fillUserBubbleRow(row, surfaceSeq, contentWidth)) : rows
+      );
+    }
+  } else {
+    const highlighted = colorEnabled ? formatAssistantDisplay(content) : stripAnsi(formatAssistantDisplay(content));
+    const rawLines = highlighted.split("\n");
+    const styledLines = rawLines.map((line) => {
+      return line.startsWith("[nolo]") && colorEnabled ? themeText(line, "chrome", true) : line;
+    });
+    for (const logicalLine of styledLines) {
+      lines.push(...wrapTranscriptLine(logicalLine, contentWidth));
+    }
+  }
+  return lines;
+}
+function getStreamingTurnLines(role, content, contentWidth, colorEnabled, density, surface) {
+  if (streamingTurnCache && (streamingTurnCache.role !== role || streamingTurnCache.contentWidth !== contentWidth || streamingTurnCache.colorEnabled !== colorEnabled || streamingTurnCache.density !== density || streamingTurnCache.surface !== surface || !content.startsWith(streamingTurnCache.fullContent.slice(0, streamingTurnCache.prefixLength)))) {
+    streamingTurnCache = null;
+  }
+  if (!streamingTurnCache) {
+    streamingTurnCache = {
+      role,
+      contentWidth,
+      colorEnabled,
+      density,
+      surface,
+      fullContent: content,
+      prefixLength: 0,
+      prefixLines: []
+    };
+  }
+  if (content.length > streamingTurnCache.fullContent.length) {
+    let searchPos = streamingTurnCache.prefixLength;
+    let candidateCut = -1;
+    while (true) {
+      const idx = content.indexOf("\n\n", searchPos);
+      if (idx === -1) break;
+      const cut = idx + 1;
+      searchPos = idx + 2;
+      const prefixSub = content.slice(0, cut);
+      const fenceCount = (prefixSub.match(/^```/gm) || []).length;
+      if (fenceCount % 2 === 0) {
+        candidateCut = cut;
+        break;
+      }
+    }
+    if (candidateCut > streamingTurnCache.prefixLength) {
+      const candidatePrefix = content.slice(0, candidateCut);
+      const candidateTail = content.slice(candidateCut);
+      const candPrefixLines = renderPrefixTurnBlock(role, candidatePrefix, contentWidth, colorEnabled);
+      const candTailLines = renderTailTurnBlock(role, candidateTail, contentWidth, colorEnabled);
+      const candCombined = [...candPrefixLines, ...candTailLines];
+      const fullCheckLines = renderTurnBlock(role, content, contentWidth, colorEnabled);
+      if (JSON.stringify(candCombined) === JSON.stringify(fullCheckLines)) {
+        streamingTurnCache.prefixLength = candidateCut;
+        streamingTurnCache.prefixLines = candPrefixLines;
+        streamingTurnCache.fullContent = content;
+      } else {
+        streamingTurnCache.fullContent = content;
+      }
+    } else {
+      streamingTurnCache.fullContent = content;
+    }
+  }
+  if (streamingTurnCache.prefixLength === 0) {
+    return renderTurnBlock(role, content, contentWidth, colorEnabled);
+  }
+  const tailContent = content.slice(streamingTurnCache.prefixLength);
+  const tailLines = renderTailTurnBlock(role, tailContent, contentWidth, colorEnabled);
+  return [...streamingTurnCache.prefixLines, ...tailLines];
+}
+var assistantPlainLinesCache = /* @__PURE__ */ new Map();
+function getAssistantPlainLines(content) {
+  let plainLines = assistantPlainLinesCache.get(content);
+  if (plainLines !== void 0) {
+    return plainLines;
+  }
+  if (!/[\r\x00#|\-*_~`>+\[\]()•☐☑]|\b\d+\./.test(content)) {
+    plainLines = content.trim().split("\n");
+  } else {
+    plainLines = stripAnsi(formatAssistantDisplay(content)).split("\n");
+  }
+  if (assistantPlainLinesCache.size > 2e3) {
+    const firstKey = assistantPlainLinesCache.keys().next().value;
+    if (firstKey !== void 0) assistantPlainLinesCache.delete(firstKey);
+  }
+  assistantPlainLinesCache.set(content, plainLines);
+  return plainLines;
+}
+function countTurnLines(role, content, contentWidth) {
+  content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  let count = 0;
+  if (role === "user") {
+    for (const line of content.split("\n")) {
+      count += wrapTranscriptLine(`\u2503  ${line}`, contentWidth, "\u2503  ").length;
+    }
+  } else {
+    const plainLines = getAssistantPlainLines(content);
+    for (let i = 0; i < plainLines.length; i++) {
+      const line = plainLines[i];
+      const wrapped = i === 0 && !line.startsWith("[nolo]") ? wrapTranscriptLine(`\u25C8 ${line}`, contentWidth) : wrapTranscriptLine(line, contentWidth);
+      count += wrapped.length;
+    }
+  }
+  return count;
+}
+function buildTurnOffsets(history, contentWidth) {
   const density = getActiveDensity();
-  const wrapped = [];
+  const entries = [];
+  let offset = 0;
   for (let i = 0; i < history.turns.length; i++) {
     const turn = history.turns[i];
-    if (density === "spacious" && (i > 0 || turn.role === "user")) {
-      wrapped.push("");
-    }
-    const cached = turnLineCache.get(turn);
-    if (cached && cached.width === contentWidth && cached.color === colorEnabled && cached.density === density) {
-      wrapped.push(...cached.lines);
+    const separatorAbove = density === "spacious" && (i > 0 || turn.role === "user") ? 1 : 0;
+    offset += separatorAbove;
+    const cached = turnLineCountCache.get(turn);
+    let lineCount;
+    if (cached && cached.width === contentWidth) {
+      lineCount = cached.count;
     } else {
-      const lines = renderTurnBlock(turn.role, turn.content, contentWidth, colorEnabled);
-      turnLineCache.set(turn, {
-        width: contentWidth,
-        color: colorEnabled,
-        density,
-        lines
-      });
-      wrapped.push(...lines);
+      lineCount = countTurnLines(turn.role, turn.content, contentWidth);
+      turnLineCountCache.set(turn, { width: contentWidth, count: lineCount });
     }
+    entries.push({ startRow: offset, lineCount, separatorAbove });
+    offset += lineCount;
   }
-  if (history.currentRole !== null && history.currentContent) {
-    const i = history.turns.length;
-    if (density === "spacious" && (i > 0 || history.currentRole === "user")) {
-      wrapped.push("");
-    }
-    wrapped.push(
-      ...renderTurnBlock(
-        history.currentRole,
-        history.currentContent,
-        contentWidth,
-        colorEnabled
-      )
-    );
+  return { entries, totalLines: offset };
+}
+function currentTurnSeparator(history, density) {
+  return density === "spacious" && (history.turns.length > 0 || history.currentRole === "user") ? 1 : 0;
+}
+function buildCopyViewLines(history) {
+  const turns = [...history.turns];
+  if (history.currentRole !== null) {
+    turns.push({ role: history.currentRole, content: history.currentContent });
+  }
+  const lines = [];
+  for (const [index, turn] of turns.entries()) {
+    if (index > 0) lines.push("");
+    const normalized = stripAnsi(turn.content).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+    lines.push(...normalized.split("\n"));
   }
-  return wrapped;
+  return lines;
 }
 function renderHistory(output, history, inputLines) {
   const tty = output;
@@ -4552,8 +4939,28 @@ function renderHistory(output, history, inputLines) {
   const columns = tty.columns ?? 80;
   const visibleHeight = Math.max(1, rows - inputLines);
   const contentWidth = Math.max(1, columns - 1);
-  const lines = buildHistoryLines(history, contentWidth);
-  const totalLines = lines.length;
+  const colorEnabled = resolveCliColorEnabled();
+  const density = getActiveDensity();
+  const surface = colorEnabled ? userSurfaceBackgroundSequence() : "";
+  const { entries, totalLines: finalizedLines } = buildTurnOffsets(
+    history,
+    contentWidth
+  );
+  let totalLines = finalizedLines;
+  let currentStart = -1;
+  let currentLines = [];
+  if (history.currentRole !== null && history.currentContent) {
+    currentLines = getStreamingTurnLines(
+      history.currentRole,
+      history.currentContent,
+      contentWidth,
+      colorEnabled,
+      density,
+      surface
+    );
+    currentStart = finalizedLines + currentTurnSeparator(history, density);
+    totalLines = currentStart + currentLines.length;
+  }
   if (history.followBottom) {
     history.scrollTop = Math.max(0, totalLines - visibleHeight);
   } else {
@@ -4564,19 +4971,71 @@ function renderHistory(output, history, inputLines) {
   }
   history.hasMoreAbove = history.scrollTop > 0;
   history.hasMoreBelow = history.scrollTop + visibleHeight < totalLines;
-  const visibleStart = history.scrollTop;
-  const visibleEnd = Math.min(totalLines, visibleStart + visibleHeight);
-  const visibleLines = lines.slice(visibleStart, visibleEnd);
+  const winStart = history.scrollTop;
+  const winEnd = Math.min(totalLines, winStart + visibleHeight);
+  const visibleLines = new Array(visibleHeight).fill("");
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    if (entry.separatorAbove > 0) {
+      const sepRow = entry.startRow - 1;
+      if (sepRow >= winStart && sepRow < winEnd) {
+        visibleLines[sepRow - winStart] = "";
+      }
+    }
+    const turnStart = entry.startRow;
+    const turnEnd = turnStart + entry.lineCount;
+    if (turnEnd <= winStart || turnStart >= winEnd) continue;
+    const turn = history.turns[i];
+    const cached = turnLineCache.get(turn);
+    let lines;
+    if (cached && cached.width === contentWidth && cached.color === colorEnabled && cached.density === density && cached.surface === surface) {
+      lines = cached.lines;
+    } else {
+      renderCacheMissCount += 1;
+      lines = renderTurnBlock(turn.role, turn.content, contentWidth, colorEnabled);
+      turnLineCache.set(turn, {
+        width: contentWidth,
+        color: colorEnabled,
+        density,
+        surface,
+        lines
+      });
+    }
+    const interStart = Math.max(turnStart, winStart);
+    const interEnd = Math.min(turnEnd, winEnd);
+    for (let r = interStart; r < interEnd; r++) {
+      visibleLines[r - winStart] = lines[r - turnStart] ?? "";
+    }
+  }
+  if (currentStart >= 0) {
+    const separatorAbove = currentTurnSeparator(history, density);
+    if (separatorAbove > 0) {
+      const sepRow = currentStart - 1;
+      if (sepRow >= winStart && sepRow < winEnd) {
+        visibleLines[sepRow - winStart] = "";
+      }
+    }
+    const currentEnd = currentStart + currentLines.length;
+    if (currentEnd > winStart && currentStart < winEnd) {
+      const interStart = Math.max(currentStart, winStart);
+      const interEnd = Math.min(currentEnd, winEnd);
+      for (let r = interStart; r < interEnd; r++) {
+        visibleLines[r - winStart] = currentLines[r - currentStart] ?? "";
+      }
+    }
+  }
   let frame = "";
   for (let i = 0; i < visibleHeight; i++) {
     const line = visibleLines[i] ?? "";
     const padded = padOrTruncateToWidth(line, contentWidth);
     const thumb = renderScrollbarRow(i, visibleHeight, totalLines, history.scrollTop);
+    const scrollbarPrefix = colorEnabled ? themeColorSequence("chrome") : "";
+    const scrollbarSuffix = colorEnabled ? "\x1B[39m" : "";
     frame += `\x1B[${i + 1};1H`;
     frame += "\x1B[2K";
     frame += padded;
     frame += `\x1B[${columns}G`;
-    frame += thumb;
+    frame += `${scrollbarPrefix}${thumb}${scrollbarSuffix}`;
   }
   const mainBottom = Math.max(1, rows - inputLines);
   frame += `\x1B[${mainBottom};1H`;
@@ -4603,7 +5062,11 @@ function applyScrollAction(history, action, output, inputLines) {
   const columns = tty.columns ?? 80;
   const visibleHeight = Math.max(1, rows - inputLines);
   const contentWidth = Math.max(1, columns - 1);
-  const totalLines = buildHistoryLines(history, contentWidth).length;
+  const { totalLines: finalizedLines } = buildTurnOffsets(history, contentWidth);
+  let totalLines = finalizedLines;
+  if (history.currentRole !== null && history.currentContent) {
+    totalLines += currentTurnSeparator(history, getActiveDensity()) + countTurnLines(history.currentRole, history.currentContent, contentWidth);
+  }
   const maxScrollTop = Math.max(0, totalLines - visibleHeight);
   history.followBottom = false;
   switch (action) {
@@ -5211,70 +5674,21 @@ ${content}`;
   return null;
 }
 var autoRouteByDialog = /* @__PURE__ */ new Map();
-function toOverlayStatus(status) {
-  switch (status) {
-    case "running":
-      return "running";
-    case "done":
-      return "done";
-    case "failed":
-    case "timeout":
-    case "killed":
-      return "failed";
-    case "orphaned":
-      return "orphaned";
-    default:
-      return "running";
-  }
-}
-function buildTuiRunOverlay(parentDialogId, reported) {
-  if (!parentDialogId) return null;
-  let runs;
-  try {
-    runs = queryRunRecords({ parentDialogId }, { env: process.env }).runs;
-  } catch {
-    return null;
-  }
-  if (runs.length === 0) return null;
-  if (reported) {
-    runs = runs.filter((run) => reported.get(run.runId) !== run.status);
-    for (const run of runs) reported.set(run.runId, run.status);
-    if (runs.length === 0) return null;
-  }
-  let overlay = initialRunOverlayState;
-  for (const run of runs) {
-    overlay = reduceRunOverlay(overlay, {
-      type: "run-state-chg",
-      runId: run.runId,
-      info: {
-        name: run.agentName ?? run.agentKey ?? run.runId,
-        status: toOverlayStatus(run.status),
-        batchId: run.batchId,
-        parentDialogId: run.parentDialogId,
-        ...run.status === "failed" && run.note ? { errorMessage: run.note } : {}
-      }
-    });
-  }
-  return buildOverlayPresentation(overlay);
-}
 async function runAgentChat(scriptDir, state, message, env, output, agentRunner = runAgentTurn, options = {}) {
   let effectiveAgentKey = state.agentKey;
   let effectiveAgentName = state.agentName;
   const continueId = state.dialogId;
   const cachedRoute = continueId ? autoRouteByDialog.get(continueId) : void 0;
+  const hasImages = options.imageUrls && options.imageUrls.length > 0;
   if (cachedRoute && !options.explicitAgentSwitch) {
     effectiveAgentKey = cachedRoute.agentKey;
     effectiveAgentName = cachedRoute.agentName;
   } else if (!continueId && env.NOLO_AUTO_ROUTE !== "0" && state.agentKey === DEFAULT_TUI_AGENT_KEY) {
-    const authToken = resolvePlatformAuthToken(env);
-    const route = authToken ? await classifyCliAutoRoute(message, {
+    const route = classifyCliAutoRoute(message, {
       serverUrl: state.serverUrl,
-      authToken
-    }) : {
-      agentKey: CLI_AUTO_TIER_AGENT_KEYS[resolveCliAutoFallbackTier(message)],
-      tier: resolveCliAutoFallbackTier(message),
-      classified: false
-    };
+      authToken: resolvePlatformAuthToken(env),
+      hasImages
+    });
     effectiveAgentKey = route.agentKey;
     effectiveAgentName = `auto\u2192${route.tier}`;
     if (effectiveAgentKey !== state.agentKey) {
@@ -5285,7 +5699,6 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
       );
     }
   }
-  const hasImages = options.imageUrls && options.imageUrls.length > 0;
   const userSelectedAgent = state.agentKey !== DEFAULT_TUI_AGENT_KEY;
   const visionProbeKey = hasImages && userSelectedAgent ? state.agentKey : effectiveAgentKey;
   if (hasImages && effectiveAgentKey !== CLI_IMAGE_AGENT_KEY) {
@@ -5398,18 +5811,22 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
     // inside a TUI turn are stamped with the current conversation. Previously
     // this factory only existed when pasted text was present, which meant a
     // plain (no-paste) turn had no injection point for parentDialogId and the
-    // run-overlay could never see runs spawned this turn.
+    // run-completion watcher could never attribute runs spawned this turn.
     ...options.pastedTextStore?.items.size ? { pastedTextStore: options.pastedTextStore } : {},
     localRuntimeAdapterFactory: (factoryEnv, factoryOptions) => createCliLocalRuntimeAdapter({
       env: factoryEnv,
       cwd: factoryOptions?.cwd ?? state.cwd,
       ...options.pastedTextStore ? { pastedTextStore: options.pastedTextStore } : {},
       // Stamp spawned background runs with the current TUI dialog so the
-      // run-overlay can filter runs belonging to this conversation.
+      // run-completion watcher can attribute terminal-state wakes to this
+      // conversation.
       ...state.dialogId ? { parentDialogId: state.dialogId } : {},
       ...options.activityReporter ? { activityReporter: options.activityReporter } : {}
     }),
     ...options.activityReporter ? { activityReporter: options.activityReporter } : {},
+    // 转发 dock 订阅：runAgentTurn 的输出层靠它判断「有面板」从而抑制
+    // transcript 的进展卡片；dock 本身也靠它接收模型轮询带回来的快照。
+    ...options.onAgentRunStatus ? { onAgentRunStatus: options.onAgentRunStatus } : {},
     ...skillAllowedTools !== void 0 ? { allowedToolNames: skillAllowedTools } : {},
     ...contextBlockScopes.length > 0 ? { contextBlockScopes } : {}
   });
@@ -5514,9 +5931,9 @@ function waitForActionGate(rl, input, output, gate, spawnRunner) {
     });
   });
 }
-function persistAgentSelection(state, env) {
+function persistAgentSelection(state, env, saveSelection = saveProfileAgentSelection) {
   try {
-    saveProfileAgentSelection({
+    saveSelection({
       agentKey: state.agentKey,
       agentName: state.agentName
     });
@@ -5696,12 +6113,20 @@ async function startTuiWorkspace(options) {
     }
   });
   const activityReporter = (label) => activityIndicator.report(label);
-  const reportedRunStatuses = /* @__PURE__ */ new Map();
+  let runWakeHandler = null;
+  const runCompletionWatcher = createRunCompletionWatcher({
+    getCurrentDialogId: () => state.dialogId ?? null,
+    onWake: (text) => runWakeHandler?.(text)
+  });
   const runRegistryPoller = createRunRegistryPoller({
     getDockedRuns: () => activityIndicator.getAgentRuns(),
     update: (snapshot) => activityIndicator.updateAgentRun(snapshot),
-    readRecord: (runId) => readRunRecord(runId),
-    reconcile: (runId) => checkStaleRun(runId)
+    // 显式传 env：resolveNoloHome 只认传入 env 的 NOLO_HOME，不传则永远读
+    // ~/.nolo——设了 NOLO_HOME 的环境（dev、测试）会读错目录。run 记录读取
+    // 与 reconcile 的调用点也是同样写法。
+    readRecord: (runId) => readRunRecord(runId, { env: process.env }),
+    reconcile: (runId) => checkStaleRun(runId, { env: process.env }),
+    onRecordsPolled: (records) => runCompletionWatcher.observe(records)
   });
   let explicitAgentSwitch = false;
   let copyViewExitResolver = null;
@@ -5864,11 +6289,17 @@ async function startTuiWorkspace(options) {
       void maybeAutoRefreshTheme();
     }, AUTO_THEME_POLL_MS);
   }
-  const runOneAgentTurn = async (message, imageUrls, actionGateHandler, confirmDestructiveAction) => {
+  const runOneAgentTurn = async (inputMsg, imageUrls, actionGateHandler, confirmDestructiveAction) => {
+    const req = createTurnRequest(inputMsg);
+    if (req.event.kind === "child-run-completed") {
+      for (const r of req.event.runs) {
+        runCompletionWatcher.markAcknowledged(r.runId);
+      }
+    }
+    const message = req.text;
     forcedStop = false;
     turnEpoch += 1;
     const myEpoch = turnEpoch;
-    const turnParentDialogId = state.dialogId;
     history.followBottom = true;
     startTurn(history, "user");
     appendToCurrentTurn(history, message);
@@ -5879,12 +6310,12 @@ async function startTuiWorkspace(options) {
     const agentOutput = isInteractiveInput(input) ? createHistoryOutputStream(history, () => {
       scheduleRender();
     }) : output;
-    const requestUserChoice = isInteractiveInput(input) && dialogHost ? async (req) => {
+    const requestUserChoice = isInteractiveInput(input) && dialogHost ? async (req2) => {
       modalOwnsKeyboard = true;
       try {
         return await dialogHost.run(
           (anchor) => runAskChoiceDialog({
-            request: req,
+            request: req2,
             input,
             output,
             ...anchor
@@ -5934,7 +6365,8 @@ async function startTuiWorkspace(options) {
             ...runResult.dialogId ? {
               dialogId: runResult.dialogId,
               dialogKey: nextDialogKey,
-              dialogLabel: runResult.title || runResult.dialogId
+              dialogLabel: runResult.title || runResult.dialogId,
+              ...runResult.title ? { dialogTitle: runResult.title } : {}
             } : {},
             ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {}
           };
@@ -5943,6 +6375,14 @@ async function startTuiWorkspace(options) {
       }
       const wasAborted = activeTurnAbort.signal.aborted;
       activeTurnAbort = null;
+      if (shouldEmitTerminalBell({
+        wasAborted,
+        streamInterrupted: runResult.streamInterrupted,
+        exitCode: runResult.exitCode,
+        interactive: isInteractiveInput(input)
+      })) {
+        emitTerminalBell(output);
+      }
       explicitAgentSwitch = false;
       if (isInteractiveInput(input)) {
         finalizeCurrentTurn(history);
@@ -5964,7 +6404,8 @@ async function startTuiWorkspace(options) {
           ...runResult.dialogId ? {
             dialogId: runResult.dialogId,
             dialogKey: nextDialogKey,
-            dialogLabel: runResult.title || runResult.dialogId
+            dialogLabel: runResult.title || runResult.dialogId,
+            ...runResult.title ? { dialogTitle: runResult.title } : {}
           } : {},
           ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {},
           ...runResult.contextWindow ? { contextWindow: runResult.contextWindow } : {},
@@ -5985,14 +6426,6 @@ async function startTuiWorkspace(options) {
           emitCommandOutput(t("dialogNotSavedHint"));
         }
       }
-      if (!wasAborted) {
-        const overlayText = buildTuiRunOverlay(turnParentDialogId, reportedRunStatuses);
-        if (overlayText) {
-          emitCommandOutput(`
-\u4F60\u7684 run \u8FDB\u5C55\uFF1A
-${overlayText}`);
-        }
-      }
       return { ok: !wasAborted, aborted: wasAborted };
     } finally {
       activityIndicator.stop();
@@ -6027,6 +6460,17 @@ ${overlayText}`);
     renderHistoryToOutput();
     if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
   };
+  const persistExplicitAgentSwitch = (previousAgentKey) => {
+    if (state.agentKey === previousAgentKey) return false;
+    if (state.dialogId) autoRouteByDialog.delete(state.dialogId);
+    explicitAgentSwitch = true;
+    persistAgentSelection(
+      state,
+      options.env ?? process.env,
+      options.saveAgentSelection
+    );
+    return true;
+  };
   const runSubmittedLine = async (line, actionGateHandler, confirmDestructiveAction) => {
     if (!line.trim()) return false;
     const result = handleTuiInput(line, state);
@@ -6045,9 +6489,7 @@ ${overlayText}`);
       emitCommandOutput(result.output);
     }
     if (state.agentKey !== previousAgentKey) {
-      if (state.dialogId) autoRouteByDialog.delete(state.dialogId);
-      explicitAgentSwitch = true;
-      persistAgentSelection(state, options.env ?? process.env);
+      persistExplicitAgentSwitch(previousAgentKey);
     }
     if (result.action?.type === "exit") return true;
     if (result.action?.type === "clear") {
@@ -6098,6 +6540,7 @@ ${overlayText}`);
     if (result.action?.type === "compact") {
       const runner = options.compactRunner ?? compactDialog;
       const authToken = resolvePlatformAuthToken(options.env ?? {});
+      const compactStart = Date.now();
       try {
         const compactResult = await runner({
           serverUrl: state.serverUrl,
@@ -6105,20 +6548,45 @@ ${overlayText}`);
           dialogId: result.action.dialogId,
           summaryLlmCaller: options.summaryLlmCaller
         });
+        const elapsedSec = ((Date.now() - compactStart) / 1e3).toFixed(1);
         state = {
           ...state,
           dialogId: compactResult.dialogId,
           dialogKey: compactResult.dialogKey,
-          dialogLabel: compactResult.dialogId
+          dialogLabel: compactResult.dialogId,
+          dialogTitle: state.dialogTitle,
+          // Compact forks into a fresh dialog that only inherits the summary,
+          // not the full message history. Drop usage-derived context so the
+          // composer chip falls back to the default CLI surface estimate and
+          // the context percentage visibly drops. Mirrors the /clear reset.
+          turnTokens: void 0,
+          estimatedContextTokens: estimateDefaultCliContextTokens({
+            cwd: state.cwd,
+            agentKey: state.agentKey,
+            agentName: state.agentKey === DEFAULT_TUI_AGENT_KEY && (options.env ?? process.env).NOLO_AUTO_ROUTE !== "0" ? "DeepSeek V4 Flash" : state.agentName,
+            model: state.agentKey === DEFAULT_TUI_AGENT_KEY && (options.env ?? process.env).NOLO_AUTO_ROUTE !== "0" ? "deepseek-v4-flash" : void 0
+          })
         };
-        output.write(
-          `${t(
-            compactResult.summaryGenerated ? "compactDone" : "compactDoneNoSummary",
-            result.action.dialogId,
-            compactResult.dialogId
-          )}
-`
+        const elapsed = `${elapsedSec}s`;
+        const message = compactResult.summaryGenerated ? compactResult.compactedMessageCount > 0 ? t(
+          "compactSuccessWithCount",
+          result.action.dialogId,
+          compactResult.dialogId,
+          elapsed,
+          String(compactResult.compactedMessageCount)
+        ) : t(
+          "compactSuccess",
+          result.action.dialogId,
+          compactResult.dialogId,
+          elapsed
+        ) : t(
+          "compactForked",
+          result.action.dialogId,
+          compactResult.dialogId,
+          elapsed
         );
+        output.write(`${message}
+`);
       } catch (error) {
         output.write(
           `[nolo] Compact failed: ${toErrorMessage(error)}
@@ -6282,6 +6750,7 @@ ${overlayText}`);
             dialogId: pickResult.dialog.id,
             dialogKey: pickResult.dialog.dbKey,
             dialogLabel: pickResult.dialog.title || pickResult.dialog.id,
+            dialogTitle: pickResult.dialog.title,
             turnTokens: void 0
           };
           clearCollapsedPasteStore(pasteStore);
@@ -6418,12 +6887,6 @@ ${err.message}` : ""}`
             resolveCliColorEnabled()
           );
         }
-        if (history.hasMoreAbove || history.hasMoreBelow) {
-          const scrollHints = [];
-          if (history.hasMoreAbove) scrollHints.push("\u25B2 PgUp");
-          if (history.hasMoreBelow) scrollHints.push("\u25BC PgDn");
-          base += dimCliText(` \xB7 \u2195 ${scrollHints.join("/")}`, resolveCliColorEnabled());
-        }
         return base;
       },
       getActivityLines: () => activityIndicator.getActivityLines(resolveCliColorEnabled()),
@@ -6476,6 +6939,7 @@ ${err.message}` : ""}`
         autoThemeTimer = null;
       }
       runRegistryPoller.dispose();
+      runCompletionWatcher.dispose();
       activityIndicator.dispose();
       resolveDone?.();
       clearCollapsedPasteStore(pasteStore);
@@ -6486,6 +6950,83 @@ ${err.message}` : ""}`
       output.write("\x1B[?25h\x1B[?2026l");
       input.setRawMode?.(false);
     };
+    const buildInteractiveTurnHandlers = () => {
+      const actionGateHandler = async (gate) => {
+        modalOwnsKeyboard = true;
+        try {
+          return await waitForRawActionGate(input, output, gate, spawnRunner, {
+            beforeSubprocess: () => fixedInput.pause(),
+            afterSubprocess: () => fixedInput.resumeFromSubprocess(),
+            registerToken: (handler) => {
+              rawActionGateTokenHandler = handler;
+            }
+          });
+        } finally {
+          modalOwnsKeyboard = false;
+        }
+      };
+      const confirmDestructiveAction = async (request) => {
+        modalOwnsKeyboard = true;
+        try {
+          return await dialogHost.run(
+            (anchor) => runConfirmDialog({
+              request,
+              input,
+              output,
+              ...anchor
+            })
+          );
+        } finally {
+          modalOwnsKeyboard = false;
+        }
+      };
+      return { actionGateHandler, confirmDestructiveAction };
+    };
+    const runIdleTextTurn = async (inputMsg) => {
+      const req = createTurnRequest(inputMsg);
+      const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
+      const binding = ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction);
+      binding.notifyTurnStart();
+      busy = true;
+      fixedInput.enterOutputMode(req.text);
+      try {
+        const outcome = await runOneAgentTurn(
+          req,
+          [],
+          actionGateHandler,
+          confirmDestructiveAction
+        );
+        await binding.notifyTurnEnd(outcome);
+      } catch (err) {
+        await binding.notifyTurnEnd({ ok: false, aborted: false });
+        emitCommandOutput(
+          `${t("turnFailed")}${err instanceof Error && err.message ? `
+${err.message}` : ""}`
+        );
+      } finally {
+        busy = false;
+      }
+      refreshGitStatus();
+      flushPendingRender();
+      fixedInput.exitOutputMode(buffer, cursorPos);
+    };
+    runWakeHandler = (event) => {
+      if (done) return;
+      if (busy || fixedInput.isPaused() || copyViewExitResolver) {
+        const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
+        ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction).enqueue(event);
+        if (fixedInput.active && !fixedInput.isPaused()) {
+          fixedInput.repaint(buffer, cursorPos);
+        }
+        return;
+      }
+      void runIdleTextTurn(event).catch((err) => {
+        emitCommandOutput(
+          `${t("turnFailed")}${err instanceof Error && err.message ? `
+${err.message}` : ""}`
+        );
+      });
+    };
     const handleInputToken = async (sequence) => {
       if (done) return;
       if (copyViewExitResolver) {
@@ -6619,18 +7160,41 @@ ${merged}` : merged;
         if (busyLock) {
           const trimmedText = submittedText.trim();
           const busySlashCommand = trimmedText.split(/\s+/)[0]?.toLowerCase();
-          const isBusyLocalSlash = busySlashCommand === "/context" || busySlashCommand === "/ctx" || busySlashCommand === "/switch";
+          const isBusyLocalSlash = busySlashCommand === "/context" || busySlashCommand === "/ctx" || busySlashCommand === "/switch" || busySlashCommand === "/theme" || busySlashCommand === "/density" || busySlashCommand === "/runtime" || busySlashCommand === "/tools" || busySlashCommand === "/tasks" || busySlashCommand === "/jobs" || busySlashCommand === "/procs" || busySlashCommand === "/agents" || busySlashCommand === "/doc" || busySlashCommand === "/skill" || busySlashCommand === "/customize" || busySlashCommand === "/login" || busySlashCommand === "/profile" || busySlashCommand === "/version";
           if (isBusyLocalSlash) {
+            releaseCollapsedPasteReferences(submittedText, pasteStore);
+            buffer = "";
+            cursorPos = 0;
+            if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
             const beforeAgentKey = state.agentKey;
             const res = handleTuiInput(submittedText, state);
-            if (res.action) {
+            if (res.action?.type === "theme-refresh") {
+              state = res.nextState;
+              const detected2 = await detectTerminalBackground({
+                stdin: input,
+                stdout: output,
+                allowSystemFallback: true
+              });
+              let refreshMsg = "";
+              if (detected2 && applyDetectedBackground(detected2)) {
+                refreshMsg = t("themeRefreshed", detected2.brightness);
+              } else if (detected2) {
+                refreshMsg = t("themeRefreshed", detected2.brightness);
+              } else {
+                refreshMsg = t("themeRefreshFailed");
+              }
+              if (refreshMsg) {
+                output.write(`${refreshMsg}
+`);
+              }
+            } else if (res.action) {
               output.write(
                 "Model picker isn't available while a reply is running. Use `/switch <name>` to switch now (takes effect on the next turn), or wait for the reply to finish.\n"
               );
             } else {
               state = res.nextState;
               let msg = res.output;
-              if (busySlashCommand === "/switch" && res.nextState.agentKey !== beforeAgentKey) {
+              if (busySlashCommand === "/switch" && persistExplicitAgentSwitch(beforeAgentKey)) {
                 const hint = "Note: the new model takes effect on the next turn. Switching models may consume more tokens because the conversation context is re-sent to the new model.";
                 msg = msg ? `${msg}
 ${hint}` : hint;
@@ -6640,43 +7204,10 @@ ${hint}` : hint;
 `);
               }
             }
-            releaseCollapsedPasteReferences(submittedText, pasteStore);
-            buffer = "";
-            cursorPos = 0;
-            if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
             return;
           }
-          const binding = ensureChatQueueBinding(
-            async (gate) => {
-              modalOwnsKeyboard = true;
-              try {
-                return await waitForRawActionGate(input, output, gate, spawnRunner, {
-                  beforeSubprocess: () => fixedInput.pause(),
-                  afterSubprocess: () => fixedInput.resumeFromSubprocess(),
-                  registerToken: (handler) => {
-                    rawActionGateTokenHandler = handler;
-                  }
-                });
-              } finally {
-                modalOwnsKeyboard = false;
-              }
-            },
-            async (request) => {
-              modalOwnsKeyboard = true;
-              try {
-                return await dialogHost.run(
-                  (anchor) => runConfirmDialog({
-                    request,
-                    input,
-                    output,
-                    ...anchor
-                  })
-                );
-              } finally {
-                modalOwnsKeyboard = false;
-              }
-            }
-          );
+          const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
+          const binding = ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction);
           const decision = binding.resolveSubmit({
             text: submittedText,
             isRunning: true
@@ -6693,62 +7224,13 @@ ${hint}` : hint;
           return;
         }
         if (!submittedText.trim() && chatQueueBinding && chatQueueBinding.queueLength() > 0) {
-          const actionGateHandler = async (gate) => {
-            modalOwnsKeyboard = true;
-            try {
-              return await waitForRawActionGate(input, output, gate, spawnRunner, {
-                beforeSubprocess: () => fixedInput.pause(),
-                afterSubprocess: () => fixedInput.resumeFromSubprocess(),
-                registerToken: (handler) => {
-                  rawActionGateTokenHandler = handler;
-                }
-              });
-            } finally {
-              modalOwnsKeyboard = false;
-            }
-          };
-          const confirmDestructiveAction = async (request) => {
-            modalOwnsKeyboard = true;
-            try {
-              return await dialogHost.run(
-                (anchor) => runConfirmDialog({
-                  request,
-                  input,
-                  output,
-                  ...anchor
-                })
-              );
-            } finally {
-              modalOwnsKeyboard = false;
-            }
-          };
+          const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
           const manualBinding = ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction);
           const drainedText = manualBinding.drainHeadForManualTurn();
           if (drainedText !== null) {
-            busy = true;
             buffer = "";
             cursorPos = 0;
-            fixedInput.enterOutputMode(drainedText);
-            try {
-              const outcome = await runOneAgentTurn(
-                drainedText,
-                [],
-                actionGateHandler,
-                confirmDestructiveAction
-              );
-              await manualBinding.notifyTurnEnd(outcome);
-            } catch (err) {
-              await manualBinding.notifyTurnEnd({ ok: false, aborted: false });
-              emitCommandOutput(
-                `${t("turnFailed")}${err instanceof Error && err.message ? `
-${err.message}` : ""}`
-              );
-            } finally {
-              busy = false;
-            }
-            refreshGitStatus();
-            flushPendingRender();
-            fixedInput.exitOutputMode(buffer, cursorPos);
+            await runIdleTextTurn(drainedText);
             return;
           }
         }
@@ -6758,37 +7240,11 @@ ${err.message}` : ""}`
         fixedInput.enterOutputMode(submittedText);
         let shouldExit = false;
         try {
+          const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
           shouldExit = await runSubmittedLine(
             submittedText,
-            async (gate) => {
-              modalOwnsKeyboard = true;
-              try {
-                return await waitForRawActionGate(input, output, gate, spawnRunner, {
-                  beforeSubprocess: () => fixedInput.pause(),
-                  afterSubprocess: () => fixedInput.resumeFromSubprocess(),
-                  registerToken: (handler) => {
-                    rawActionGateTokenHandler = handler;
-                  }
-                });
-              } finally {
-                modalOwnsKeyboard = false;
-              }
-            },
-            async (request) => {
-              modalOwnsKeyboard = true;
-              try {
-                return await dialogHost.run(
-                  (anchor) => runConfirmDialog({
-                    request,
-                    input,
-                    output,
-                    ...anchor
-                  })
-                );
-              } finally {
-                modalOwnsKeyboard = false;
-              }
-            }
+            actionGateHandler,
+            confirmDestructiveAction
           );
         } finally {
           busy = false;
@@ -6871,7 +7327,6 @@ export {
   applyOutputChunkToCurrentTurn,
   applyScrollAction,
   applyTerminalOutputToText,
-  buildTuiRunOverlay,
   buildWindowTitle,
   countPhysicalLines,
   createFixedInput,