nolo-cli 0.54.0-alpha.2 → 0.54.0

package/{readlineWorkspace-YRPV6JPN.js → readlineWorkspace-XUFJV3RS.js}

@@ -3,11 +3,12 @@ import {
   normalizeDialogRecord,
   readDialogSnapshot,
   sortDialogs
-} from "./chunk-GLGD2JGY.js";
+} from "./chunk-XIJZOCSP.js";
 import {
   ANSI_ESCAPE_REGEX,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   THEME_PALETTES,
+  TUI_TREE_MARKER,
   allocateCollapsedPaste,
   applyDetectedBackground,
   applyTerminalOutputToText,
@@ -24,12 +25,15 @@ import {
   findCollapsedPasteSpanAt,
   fitAnsiLine,
   formatAssistantDisplay,
+  formatCreditsChip,
   formatTokenCount,
   getActiveThemeMode,
   getActiveThemeName,
   isBalanceExhaustedError,
-  normalizeToolDisplayMode,
   padOrTruncateToWidth,
+  polishBreathInsertsBlankBetween,
+  readAgentsMdLayerFromDisk,
+  redactSecrets,
   releaseCollapsedPaste,
   releaseCollapsedPasteReferences,
   renderSurfaceLine,
@@ -62,30 +66,32 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-6FQ2552G.js";
+} from "./chunk-UOWXD4VN.js";
+import "./chunk-S7Z2HMCN.js";
+import "./chunk-LYGNQHUW.js";
+import "./chunk-ESHYE7WU.js";
 import {
   listFavoriteAgentIdsAcrossServers,
   listLocalCachedAgents,
   listRemoteAgents,
   listRemoteAgentsAcrossServers,
   normalizeListedAgent
-} from "./chunk-5WADL4O7.js";
+} from "./chunk-UR66XPVF.js";
 import "./chunk-ID4G2MAR.js";
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-Q24S4NDF.js";
-import "./chunk-J3UALFHL.js";
-import "./chunk-LYGNQHUW.js";
+} from "./chunk-Q4XZVZPN.js";
 import {
+  RUN_WAKE_CHANNEL_ENV,
   createCliLocalRuntimeAdapter,
   initCliLocale,
   parseCliLocale,
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-GV35EHNA.js";
-import "./chunk-U5Z7LFZF.js";
+} from "./chunk-5FCIPEKT.js";
+import "./chunk-NFLA6GSU.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";
 import {
@@ -95,37 +101,46 @@ import {
   deleteDbRecord,
   queryUserRecords,
   readDbRecord
-} from "./chunk-DQLYEGP7.js";
-import "./chunk-OYNDYVSE.js";
+} from "./chunk-SYYUU7EV.js";
+import "./chunk-JON2PHYT.js";
 import {
   NOLO_DEFAULT_AGENT_KEY,
   resolveCliAgentKeyInput
 } from "./chunk-EKLRRZIN.js";
+import "./chunk-HJTAGT3W.js";
+import {
+  createChatQueueRuntime,
+  createTurnRequest,
+  normalizeRunCompletionShape
+} from "./chunk-YPREESF4.js";
 import "./chunk-JDSUTNYY.js";
+import "./chunk-JBTJAPUF.js";
 import {
+  backfillRunRecordParentDialog,
   checkStaleRun,
   isRunRecordClaimed,
   listRunRecords,
   readRunRecord
-} from "./chunk-WHVQA7PJ.js";
-import "./chunk-ESHYE7WU.js";
-import "./chunk-JBTJAPUF.js";
+} from "./chunk-SSXTSPSG.js";
 import "./chunk-LTRXGFMS.js";
-import "./chunk-4NN3EK7H.js";
+import "./chunk-EICIFHVS.js";
 import "./chunk-ATNTHIZI.js";
 import "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-UW4INMD2.js";
+} from "./chunk-RHMDMTDK.js";
+import {
+  buildResponseGuidelines
+} from "./chunk-6IGD47IC.js";
 import "./chunk-HS7MLR74.js";
-import "./chunk-757BGY6Y.js";
-import "./chunk-V4KZGLOI.js";
+import "./chunk-BG7J6Y5X.js";
+import "./chunk-TR4DXUYX.js";
 import "./chunk-5XTOKQLW.js";
 import "./chunk-NF64D32W.js";
 import "./chunk-3L2WKC3W.js";
-import "./chunk-RU5D3B22.js";
+import "./chunk-GRFK2XP4.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-VRZIH5JO.js";
+import "./chunk-3ZTR7ZO4.js";
 import {
   clipText,
   formatDuration,
@@ -137,39 +152,38 @@ import {
   runShowsLogTail,
   shortRunId
 } from "./chunk-KXKQO4Q6.js";
+import "./chunk-LRGKOI5Y.js";
+import "./chunk-TY3ADTX5.js";
+import "./chunk-UGBHDMHI.js";
 import "./chunk-INZZJSQF.js";
-import "./chunk-Y7LNKP32.js";
-import "./chunk-BANYWEYY.js";
-import "./chunk-PAHILFNT.js";
 import "./chunk-MEYIRKDN.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-VF4K2QE6.js";
+import "./chunk-6HDYSFLO.js";
+import "./chunk-FJHMLRDQ.js";
+import "./chunk-WQHGJHAL.js";
+import "./chunk-ZJ7UHBJS.js";
 import {
-  createChatQueueRuntime,
-  createTurnRequest,
-  normalizeRunCompletionShape
-} from "./chunk-YPREESF4.js";
-import "./chunk-6SZ52ORL.js";
-import "./chunk-LA4IDAK7.js";
-import {
-  extractReferenceKeysFromMessage
-} from "./chunk-BJLYCOZK.js";
+  extractReferenceKeysFromMessage,
+  normalizeUsage
+} from "./chunk-YBFJQC2M.js";
 import "./chunk-EVBFYPDC.js";
-import "./chunk-H2G6JXTR.js";
+import "./chunk-HQUORJTM.js";
 import "./chunk-YYLHWIW6.js";
-import "./chunk-U2A47SVI.js";
 import "./chunk-AGGIDPCZ.js";
-import "./chunk-32I5RVMY.js";
+import "./chunk-TC6P4NDR.js";
+import "./chunk-YLCUU3WM.js";
 import "./chunk-5RGU3J7P.js";
+import "./chunk-6YTOJY35.js";
 import "./chunk-M76ECQRD.js";
-import "./chunk-MRWGHF56.js";
+import "./chunk-YDH3FDFQ.js";
 import "./chunk-URMS4XY2.js";
 import "./chunk-IA3A5373.js";
 import "./chunk-GLKOYSRU.js";
 import {
   buildSkillDiscoveryContextBlock,
   buildSkillDiscoveryContextLayer
-} from "./chunk-2BWU4ORW.js";
+} from "./chunk-SUEIAK5N.js";
 import "./chunk-AA564GBL.js";
 import {
   expandEnabledPacks
@@ -180,23 +194,23 @@ import {
   buildLocalWorkspaceToolset,
   getProcessRegistry,
   readCommandActionGatePayload
-} from "./chunk-6BGAQ3KR.js";
-import "./chunk-INXBNYCG.js";
+} from "./chunk-EJE33XNR.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-CVT7L2WZ.js";
-import "./chunk-T27IEBNQ.js";
+import "./chunk-3Y2K5O2R.js";
+import "./chunk-A65UV3M5.js";
+import "./chunk-2QDDKFG5.js";
 import "./chunk-N7J63Q6C.js";
 import {
   buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks,
   resolveToolGuidedSections
-} from "./chunk-YBV6QJKM.js";
-import "./chunk-6BYAXNH5.js";
+} from "./chunk-BY2FF2C4.js";
+import "./chunk-VZMUOPYG.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-SP3DPVBH.js";
-import "./chunk-TNPCQNGQ.js";
+} from "./chunk-KLIBF3BY.js";
+import "./chunk-ZVOHVJI3.js";
 import {
   isQuotaExhaustedError
 } from "./chunk-IWUMSAQF.js";
@@ -204,7 +218,7 @@ import "./chunk-2MBTWINN.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-KUUTWU4I.js";
+} from "./chunk-K4NISKOR.js";
 import {
   buildCompactionMetricsFromPlan,
   buildCompactionUserContent,
@@ -215,32 +229,32 @@ import {
   formatMessagesForSummaryWithTruncation,
   planCompression,
   serializeMessageContent
-} from "./chunk-H4RYESI6.js";
-import "./chunk-VRJUIUIY.js";
-import "./chunk-NQ4N4IGO.js";
-import "./chunk-FD36SCCD.js";
-import "./chunk-QDHZCAH3.js";
+} from "./chunk-BBTN4NQD.js";
+import "./chunk-N4JKMCY3.js";
+import "./chunk-BYXBJQAS.js";
+import "./chunk-SVDMVX4G.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
+import "./chunk-CS6TCJ7E.js";
+import "./chunk-FD36SCCD.js";
 import "./chunk-ZHXJ6M7T.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import {
-  buildAgentsMdLayer,
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-3AOLVADY.js";
+} from "./chunk-DVINR3PL.js";
 import {
   buildUserResponseLanguageContext
-} from "./chunk-7CH6U3FL.js";
+} from "./chunk-2GRGFCF6.js";
 import {
   canonicalizeToolNames
 } from "./chunk-O6OSWFZQ.js";
-import "./chunk-FA4SY4F5.js";
+import "./chunk-BYEJ7K2Z.js";
 import {
   checkForCliUpdate,
   runSelfUpdateDetailed
@@ -265,19 +279,20 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import "./chunk-56W233KG.js";
-import "./chunk-WL3UOGYO.js";
-import "./chunk-7APQB6R6.js";
-import "./chunk-3QJTD6DO.js";
+import "./chunk-NJUQBYFJ.js";
+import "./chunk-HPW5MNDQ.js";
+import "./chunk-AUVFJGPC.js";
+import "./chunk-SVC3GGUA.js";
 import "./chunk-Y5GCAMGP.js";
 import "./chunk-UZ6XXCVR.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-FGEYVPPR.js";
-import "./chunk-AV6KQCM5.js";
-import "./chunk-SVEUG45B.js";
+import "./chunk-MYMBBB6Q.js";
+import "./chunk-UAD2WT54.js";
+import "./chunk-7NYDJAQ7.js";
+import "./chunk-NHRQCXIQ.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-I42VC5KR.js";
-import "./chunk-MFI4FGHX.js";
+import "./chunk-SAJSBPI2.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
@@ -286,18 +301,18 @@ import {
   BUILTIN_NOLO_AGENT_MODEL,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById
-} from "./chunk-VULELK4T.js";
+} from "./chunk-2WBFJHQA.js";
 import {
   extractCustomId,
   parsePublicAgentId
 } from "./chunk-BJIRLHJR.js";
-import "./chunk-PYKV6FSC.js";
+import "./chunk-XOJRZUPF.js";
 import "./chunk-QOKAKDPE.js";
 import "./chunk-OW765XBU.js";
 import "./chunk-GBRG75BQ.js";
-import "./chunk-KUG52IAP.js";
 import "./chunk-3EUW3WEO.js";
 import "./chunk-U6VC4MU4.js";
+import "./chunk-KUG52IAP.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
@@ -1222,7 +1237,81 @@ function appendLocalTurn(history, command, output) {
   trimHistoryToBudget(history);
   resetStreamingTurnCache();
 }
+var TOOL_SUCCESS_LINE_RE = /^(▸ .*?)(?: ×(\d+))?(  ✓)$/;
+function applyTreeRewrite(text, chunk) {
+  if (!chunk.startsWith(TUI_TREE_MARKER)) return null;
+  const payload = chunk.slice(TUI_TREE_MARKER.length).replace(/\u0002\n?$/, "");
+  const tree = `\u2022 ${payload}`;
+  const hadTrailingNewline = text.endsWith("\n");
+  const body = hadTrailingNewline ? text.slice(0, -1) : text;
+  const bodyLines = body.split("\n");
+  const plainLines = bodyLines.map((line) => stripAnsi(line));
+  const tail = plainLines.at(-1) ?? "";
+  let prefix;
+  if (tail.trimStart().startsWith("\u25B8 ")) {
+    prefix = bodyLines.length < 2 ? "" : `${bodyLines.slice(0, -1).join("\n")}
+`;
+  } else if (tail.trimStart().startsWith("\u2514\u2500\u2500 ")) {
+    const headerIndex = plainLines.findLastIndex((line) => line.trimStart().startsWith("\u2022 "));
+    if (headerIndex < 0) return null;
+    prefix = `${bodyLines.slice(0, headerIndex).join("\n")}${headerIndex > 0 ? "\n" : ""}`;
+  } else return null;
+  return `${prefix}${tree}
+`;
+}
+function foldToolSuccessLine(text, chunk) {
+  const plain = stripAnsi(chunk).replace(/\n+$/, "");
+  if (!plain || plain.includes("\n") || !TOOL_SUCCESS_LINE_RE.test(plain)) return null;
+  const hadTrailingNewline = text.endsWith("\n");
+  const body = hadTrailingNewline ? text.slice(0, -1) : text;
+  const newlineAt = body.lastIndexOf("\n");
+  const tail = newlineAt === -1 ? body : body.slice(newlineAt + 1);
+  const match = TOOL_SUCCESS_LINE_RE.exec(stripAnsi(tail));
+  if (!match || `${match[1]}${match[3]}` !== plain) return null;
+  const count = (match[2] ? Number(match[2]) : 1) + 1;
+  const anchor = tail.lastIndexOf("  ");
+  if (anchor < 0) return null;
+  const head = tail.slice(0, anchor).replace(/\s×\d+$/, "");
+  const merged = `${head} \xD7${count}${tail.slice(anchor)}`;
+  const prefix = newlineAt === -1 ? "" : body.slice(0, newlineAt + 1);
+  return `${prefix}${merged}${hadTrailingNewline ? "\n" : ""}`;
+}
 function applyOutputChunkToCurrentTurn(history, chunk, kind = "assistant") {
+  if (kind === "tool") {
+    if (chunk.startsWith(TUI_TREE_MARKER)) {
+      const rewrittenTree = applyTreeRewrite(history.currentContent, chunk);
+      if (rewrittenTree === null) {
+        const safe = chunk.slice(TUI_TREE_MARKER.length).replace(/\u0002/g, "");
+        const leaves = safe.split("\n").filter((line) => /^(?:├── |└── )/.test(line));
+        const newest = leaves.at(-1)?.replace(/^(?:├── |└── )/, "\u25B8 ") ?? "";
+        if (!newest) return false;
+        const flat = `${newest}
+`;
+        history.currentContent = applyTerminalOutputToText(history.currentContent, flat);
+        appendCurrentBlock(history, kind, flat);
+        return false;
+      }
+      const treeContent = rewrittenTree;
+      history.currentContent = treeContent;
+      const lastBlock = history.currentBlocks.at(-1);
+      const treeLines = treeContent.split("\n");
+      const treeHeaderIndex = treeLines.findIndex((line) => line.trimStart().startsWith("\u2022 "));
+      const treeBlock = treeHeaderIndex >= 0 ? treeLines.slice(treeHeaderIndex).join("\n") : treeContent;
+      if (lastBlock?.kind === "tool") lastBlock.content = lastBlock.content.replace(/[^\n]*$/, "") + treeBlock;
+      else history.currentBlocks.push({ kind: "tool", content: treeBlock });
+      return true;
+    }
+    const foldedContent = foldToolSuccessLine(history.currentContent, chunk);
+    if (foldedContent !== null) {
+      history.currentContent = foldedContent;
+      const lastBlock = history.currentBlocks.at(-1);
+      if (lastBlock?.kind === "tool") {
+        const foldedBlock = foldToolSuccessLine(lastBlock.content, chunk);
+        if (foldedBlock !== null) lastBlock.content = foldedBlock;
+      }
+      return true;
+    }
+  }
   const next = applyTerminalOutputToText(history.currentContent, chunk);
   if (next === history.currentContent) return false;
   history.currentContent = next;
@@ -1405,6 +1494,40 @@ var streamingTurnCache = null;
 function resetStreamingTurnCache() {
   streamingTurnCache = null;
 }
+function countFenceFlips(text) {
+  const matches = text.match(/^[ \t]*```/gm);
+  return matches ? matches.length : 0;
+}
+var HEADING_LIKE_RE = /^#{1,3} /;
+function isPipeRowLike(line) {
+  const trimmed = line.trim();
+  return trimmed.length > 0 && trimmed.startsWith("|");
+}
+function isSuspiciousAppend(newTail, fenceParityEven) {
+  if (!fenceParityEven) return true;
+  if (newTail.includes("\r")) return true;
+  if (newTail.includes("```")) return true;
+  if (newTail.includes("$$") || newTail.includes("\\[") || newTail.includes("\\]")) {
+    return true;
+  }
+  if (/\n{4,}/.test(newTail)) return true;
+  if (newTail.includes("\0")) return true;
+  return hasPipeRowLine(newTail);
+}
+function hasPipeRowLine(text) {
+  const lines = text.split("\n");
+  return lines.some((line) => isPipeRowLike(line));
+}
+function isSuspiciousBoundary(committedLastLine, newTail) {
+  const newlineIdx = newTail.indexOf("\n");
+  const firstLine = newlineIdx === -1 ? newTail : newTail.slice(0, newlineIdx);
+  if (HEADING_LIKE_RE.test(firstLine) && committedLastLine !== "") return true;
+  if (HEADING_LIKE_RE.test(committedLastLine) && firstLine !== "") return true;
+  if (isPipeRowLike(firstLine) || isPipeRowLike(committedLastLine)) {
+    return true;
+  }
+  return polishBreathInsertsBlankBetween(committedLastLine, firstLine);
+}
 function renderPrefixTurnBlock(role, content, contentWidth, colorEnabled) {
   content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
   if (role === "user") {
@@ -1447,62 +1570,94 @@ function renderTailTurnBlock(role, content, contentWidth, colorEnabled) {
   }
 }
 function getStreamingTurnLines(role, content, contentWidth, colorEnabled, themeFingerprint) {
-  if (streamingTurnCache && (streamingTurnCache.role !== role || streamingTurnCache.contentWidth !== contentWidth || streamingTurnCache.colorEnabled !== colorEnabled || streamingTurnCache.themeFingerprint !== themeFingerprint || !content.startsWith(streamingTurnCache.fullContent.slice(0, streamingTurnCache.prefixLength)))) {
-    streamingTurnCache = null;
-  }
-  if (!streamingTurnCache) {
-    streamingTurnCache = {
-      role,
-      contentWidth,
-      colorEnabled,
-      themeFingerprint,
-      fullContent: content,
-      prefixLength: 0,
-      prefixLines: [],
-      lastValidatedCut: 0
-    };
-  }
-  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];
-      if (candidateCut !== streamingTurnCache.lastValidatedCut) {
-        const fullCheckLines = renderTurnBlock(role, content, contentWidth, colorEnabled);
-        const sameLines = candCombined.length === fullCheckLines.length && candCombined.every((line, index) => line === fullCheckLines[index]);
-        streamingTurnCache.lastValidatedCut = candidateCut;
-        if (sameLines) {
-          streamingTurnCache.prefixLength = candidateCut;
-          streamingTurnCache.prefixLines = candPrefixLines;
-        }
-      }
-      streamingTurnCache.fullContent = content;
-    } else {
-      streamingTurnCache.fullContent = content;
-    }
-  }
-  if (streamingTurnCache.prefixLength === 0) {
-    return renderTurnBlock(role, content, contentWidth, colorEnabled);
+  const forceValidate = process.env.NOLO_TUI_RENDER_VALIDATE === "1";
+  let cache = streamingTurnCache;
+  const geometryChanged = !cache || cache.role !== role || cache.contentWidth !== contentWidth || cache.colorEnabled !== colorEnabled || cache.themeFingerprint !== themeFingerprint;
+  if (geometryChanged || !content.startsWith(cache.fullContent)) {
+    return rebuildStreamingCache(content, role, contentWidth, colorEnabled, themeFingerprint);
+  }
+  if (content === cache.fullContent && cache.lastResult) {
+    return cache.lastResult;
+  }
+  const suffix = content.slice(cache.fullContent.length);
+  if (suffix === "") {
+    return cache.lastResult ?? cache.committedLines;
+  }
+  const renderFull = () => {
+    const lines = renderTurnBlock(role, content, contentWidth, colorEnabled);
+    cache.fullContent = content;
+    cache.fenceFlips = countFenceFlips(content);
+    const lastNewline = content.lastIndexOf("\n");
+    cache.completeContentLength = lastNewline + 1;
+    cache.committedLines = lastNewline === -1 ? [] : renderTurnBlock(role, content.slice(0, lastNewline), contentWidth, colorEnabled);
+    cache.pendingTail = content.slice(lastNewline + 1);
+    cache.committedLastLine = lastNewline === -1 ? "" : lastLogicalLineOf(content.slice(0, lastNewline + 1));
+    cache.lastResult = lines;
+    return lines;
+  };
+  const newTail = cache.pendingTail + suffix;
+  if (!cache.fastPathEnabled || isSuspiciousAppend(newTail, cache.fenceFlips % 2 === 0) || isSuspiciousBoundary(cache.committedLastLine, newTail)) {
+    return renderFull();
+  }
+  const tailRenderer = cache.completeContentLength === 0 ? renderPrefixTurnBlock : renderTailTurnBlock;
+  const tailLines = tailRenderer(role, newTail, contentWidth, colorEnabled);
+  const composed = cache.completeContentLength === 0 ? tailLines : [...cache.committedLines, ...tailLines];
+  if (!cache.spliceValidated || forceValidate) {
+    const full = renderTurnBlock(role, content, contentWidth, colorEnabled);
+    cache.spliceValidated = true;
+    if (composed.length === full.length && composed.every((line, index) => line === full[index])) {
+      commitCompletedTail(cache, content, newTail, role, contentWidth, colorEnabled);
+      cache.lastResult = composed;
+      return composed;
+    }
+    cache.fastPathEnabled = false;
+    return renderFull();
+  }
+  commitCompletedTail(cache, content, newTail, role, contentWidth, colorEnabled);
+  cache.lastResult = composed;
+  return composed;
+}
+function lastLogicalLineOf(content) {
+  const trimmed = content.replace(/\n$/, "");
+  const idx = trimmed.lastIndexOf("\n");
+  return idx === -1 ? trimmed : trimmed.slice(idx + 1);
+}
+function rebuildStreamingCache(content, role, contentWidth, colorEnabled, themeFingerprint) {
+  const lines = renderTurnBlock(role, content, contentWidth, colorEnabled);
+  const lastNewline = content.lastIndexOf("\n");
+  streamingTurnCache = {
+    role,
+    contentWidth,
+    colorEnabled,
+    themeFingerprint,
+    fullContent: content,
+    // committed 渲染源剥掉段尾 \n（幽灵空行修正，见 renderFull 注释）。
+    committedLines: lastNewline === -1 ? [] : renderTurnBlock(role, content.slice(0, lastNewline), contentWidth, colorEnabled),
+    completeContentLength: lastNewline + 1,
+    pendingTail: content.slice(lastNewline + 1),
+    fenceFlips: countFenceFlips(content),
+    committedLastLine: lastNewline === -1 ? "" : lastLogicalLineOf(content.slice(0, lastNewline + 1)),
+    fastPathEnabled: true,
+    spliceValidated: false,
+    lastResult: lines
+  };
+  return lines;
+}
+function commitCompletedTail(cache, content, newTail, role, contentWidth, colorEnabled) {
+  const lastNewline = newTail.lastIndexOf("\n");
+  if (lastNewline !== -1) {
+    const completePart = newTail.slice(0, lastNewline + 1);
+    const renderSource = completePart.slice(0, -1);
+    const renderer = cache.completeContentLength === 0 ? renderPrefixTurnBlock : renderTailTurnBlock;
+    cache.committedLines.push(
+      ...renderer(role, renderSource, contentWidth, colorEnabled)
+    );
+    cache.completeContentLength += completePart.length;
+    cache.fenceFlips += countFenceFlips(completePart);
+    cache.committedLastLine = lastLogicalLineOf(completePart);
+    cache.pendingTail = newTail.slice(lastNewline + 1);
   }
-  const tailContent = content.slice(streamingTurnCache.prefixLength);
-  const tailLines = renderTailTurnBlock(role, tailContent, contentWidth, colorEnabled);
-  return [...streamingTurnCache.prefixLines, ...tailLines];
+  cache.fullContent = content;
 }
 function countTurnLines(role, content, contentWidth, command) {
   return layoutTurnRows(role, content, contentWidth, false, command).length;
@@ -1737,6 +1892,7 @@ function createHistoryOutputStream(history, onUpdate) {
   const stream = {
     isTTY: true,
     assistantLabelManaged: true,
+    tuiTrees: true,
     write(chunk) {
       const text = typeof chunk === "string" ? chunk : chunk.toString();
       if (applyOutputChunkToCurrentTurn(history, text)) {
@@ -1745,9 +1901,9 @@ function createHistoryOutputStream(history, onUpdate) {
       return true;
     },
     writeToolBlock(chunk) {
-      if (applyOutputChunkToCurrentTurn(history, chunk, "tool")) {
-        onUpdate();
-      }
+      const applied = applyOutputChunkToCurrentTurn(history, chunk, "tool");
+      if (applied) onUpdate();
+      return applied;
     }
   };
   return stream;
@@ -1810,6 +1966,14 @@ function resolveDialogBottomRow(args) {
   return Math.max(1, resolveTtyRows(args.output) - args.inputLines);
 }
 function createDialogHost(args) {
+  let keyboardClaimed = false;
+  const claimKeyboard = () => {
+    keyboardClaimed = true;
+  };
+  const releaseKeyboard = () => {
+    args.drainDecoder?.();
+    keyboardClaimed = false;
+  };
   return {
     async run(body) {
       const anchor = {
@@ -1819,14 +1983,25 @@ function createDialogHost(args) {
           inputLines: args.composer.getInputLines()
         })
       };
+      claimKeyboard();
       args.composer.pause();
       try {
         return await body(anchor);
       } finally {
         resetHistoryFrameDiffCache(args.output);
         args.composer.resumeFromDialog();
+        releaseKeyboard();
       }
-    }
+    },
+    async withKeyboard(body) {
+      claimKeyboard();
+      try {
+        return await body();
+      } finally {
+        releaseKeyboard();
+      }
+    },
+    isKeyboardClaimed: () => keyboardClaimed
   };
 }
 
@@ -1852,13 +2027,14 @@ function formatUnassignedFact(snapshot) {
 }
 function sanitizeRunSnapshotForNormal(snapshot) {
   const clean = (value) => stripAnsi(value).replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
+  const errorMessage = snapshot.errorMessage?.trim() ? redactSecrets(clean(snapshot.errorMessage)) : void 0;
   return {
     ...snapshot,
     agentName: snapshot.agentName ? clean(snapshot.agentName) : snapshot.agentName,
     taskPreview: snapshot.taskPreview ? clean(snapshot.taskPreview) : snapshot.taskPreview,
     lastAssistantText: snapshot.lastAssistantText ? clean(snapshot.lastAssistantText) : snapshot.lastAssistantText,
     lastToolNames: snapshot.lastToolNames?.map(clean).filter(Boolean),
-    errorMessage: void 0,
+    errorMessage,
     logLines: void 0
   };
 }
@@ -1899,9 +2075,10 @@ function formatAgentRunPanelLines(snapshot, colorEnabled, now = Date.now()) {
   const progressPart = formatPanelProgress(snapshot, now);
   const age = formatTerminalRunAge(snapshot, now);
   const agePart = age ? ` \xB7 ${age}` : "";
+  const creditsPart = typeof snapshot.credits === "number" && Number.isFinite(snapshot.credits) ? ` \xB7 ${formatCreditsChip(snapshot.credits)}` : "";
   if (!colorEnabled) {
     lines.push(
-      `\u{1F916} Sub-Agent: ${name}${runId} \xB7 ${statusSymbol} ${status}${unassignedPart}${agePart}${progressPart}${errPart}`
+      `\u{1F916} Sub-Agent: ${name}${runId} \xB7 ${statusSymbol} ${status}${unassignedPart}${agePart}${progressPart}${creditsPart}${errPart}`
     );
   } else {
     const botIcon = themeText("\u{1F916}", "accent", true);
@@ -1911,8 +2088,9 @@ function formatAgentRunPanelLines(snapshot, colorEnabled, now = Date.now()) {
     const unassignedText = unassignedPart ? themeText(unassignedPart, "muted") : "";
     const ageText = agePart ? themeText(agePart, "chrome") : "";
     const progressText = progressPart ? themeText(progressPart, "chrome") : "";
+    const creditsText = creditsPart ? themeText(creditsPart, "muted") : "";
     const errorText = errPart ? themeText(errPart, "danger") : "";
-    lines.push(`${botIcon}${labelText}${nameText}${statusText}${unassignedText}${ageText}${progressText}${errorText}`);
+    lines.push(`${botIcon}${labelText}${nameText}${statusText}${unassignedText}${ageText}${progressText}${creditsText}${errorText}`);
   }
   const detail = formatPanelDetail(snapshot);
   if (detail) {
@@ -2036,8 +2214,7 @@ function createRunDock(deps) {
     const ordered = orderedEntries();
     if (ordered.length === 0) return [];
     const at = now();
-    const mode = typeof deps.displayMode === "function" ? deps.displayMode() : deps.displayMode;
-    const displaySnapshots = mode === "normal" || mode === "hide" ? ordered.map((entry) => sanitizeRunSnapshotForNormal(entry.snapshot)) : ordered.map((entry) => entry.snapshot);
+    const displaySnapshots = ordered.map((entry) => sanitizeRunSnapshotForNormal(entry.snapshot));
     if (displaySnapshots.length === 1) {
       return formatAgentRunPanelLines(displaySnapshots[0], colorEnabled, at);
     }
@@ -2109,6 +2286,9 @@ function formatRunDockRow(snapshot, colorEnabled, now) {
   if (typeof snapshot.toolCallCount === "number" && Number.isFinite(snapshot.toolCallCount)) {
     facts.push(`${snapshot.toolCallCount} tools`);
   }
+  if (typeof snapshot.credits === "number" && Number.isFinite(snapshot.credits)) {
+    facts.push(formatCreditsChip(snapshot.credits, { compact: true }));
+  }
   const inFlight = activeInFlight(snapshot);
   if (inFlight) {
     facts.push(formatInFlightFact(inFlight, now));
@@ -2211,8 +2391,7 @@ function createActivityIndicator(deps) {
     onRepaint: deps.onRepaint,
     now,
     setIntervalFn,
-    clearIntervalFn,
-    displayMode: deps.displayMode
+    clearIntervalFn
   });
   const updateAgentRun = (snapshot) => {
     runDock.update(snapshot);
@@ -2296,6 +2475,8 @@ function snapshotFromRunRecord(record, now) {
     ...startedAt !== void 0 ? { startedAt } : {},
     ...endedAt !== void 0 ? { finishedAt: endedAt } : {},
     ...typeof counters?.toolCalls === "number" ? { toolCallCount: counters.toolCalls } : {},
+    // 收尾自报的平台积分 → dock 行「⚡ x.xx 积分」。
+    ...typeof record.credits === "number" && Number.isFinite(record.credits) ? { credits: record.credits } : {},
     // note 在终态时是死因（"orphaned: process gone…"），非终态时只是备注。
     ...record.note && isAgentRunTerminalStatus(record.status) ? { errorMessage: record.note } : {},
     inFlight,
@@ -2310,6 +2491,7 @@ function fingerprint(snapshot) {
     snapshot.toolCallCount ?? -1,
     snapshot.errorMessage ?? "",
     snapshot.finishedAt ?? 0,
+    snapshot.credits ?? -1,
     snapshot.inFlight ? [snapshot.inFlight.kind, snapshot.inFlight.name, snapshot.inFlight.startedAt] : null
   ]);
 }
@@ -3726,6 +3908,12 @@ function renderComposerTokenChip(tokens, fallbackContextWindow, estimatedContext
   const pctText = pct > 0 && pct < 10 ? pct.toFixed(1) : Math.round(pct).toString();
   return `context: ${pctText}% (${formatTokenCount(used)}/${formatTokenCount(cw)})`;
 }
+function resolveStatusLineCredits(state) {
+  const base = state.dialogCreditsBase;
+  const session = state.sessionCredits;
+  if (base === void 0 && session === void 0) return void 0;
+  return (base ?? 0) + (session ?? 0);
+}
 function renderStatusLine(state, maxWidth) {
   const colorEnabled = resolveCliColorEnabled();
   const sep = themeText(" \xB7 ", "chrome", colorEnabled);
@@ -3742,18 +3930,19 @@ function renderStatusLine(state, maxWidth) {
     const untrackedText = untracked > 0 ? ` ${themeText(`?${untracked}`, "muted", colorEnabled)}` : "";
     parts.push(`${branchText}${modifiedText}${untrackedText}`);
   }
-  const credits = state.apiSource === "platform" ? state.dialogTotalCredits ?? state.turnTokens?.credits : void 0;
-  const creditsSuffix = credits !== void 0 && credits > 0 ? ` \xB7 \u26A1 ${credits.toFixed(2)} \u79EF\u5206` : "";
+  const credits = resolveStatusLineCredits(state);
   const tokenSegment = themeText(
     renderComposerTokenChip(
       state.turnTokens,
       state.contextWindow,
       state.estimatedContextTokens
-    ) + creditsSuffix,
+    ),
     "muted",
     colorEnabled
   );
+  const creditsSegment = credits !== void 0 && credits > 0 ? themeText(formatCreditsChip(credits), "muted", colorEnabled) : "";
   parts.push(tokenSegment);
+  if (creditsSegment) parts.push(creditsSegment);
   const runningTaskCount = getProcessRegistry().listBackground().filter((p) => p.status === "running").length;
   if (runningTaskCount > 0) {
     parts.push(themeText(`\u2699 ${runningTaskCount} running`, "info", colorEnabled));
@@ -3764,7 +3953,8 @@ function renderStatusLine(state, maxWidth) {
   let visibleParts = parts;
   if (maxWidth && maxWidth > 0) {
     const widthOf = (segments) => displayWidth(stripAnsi(segments.join(" \xB7 "))) + 2;
-    for (const optional of [tokenSegment, cwdSegment, agentSegment]) {
+    for (const optional of [cwdSegment, agentSegment, tokenSegment, creditsSegment]) {
+      if (!optional) continue;
       if (widthOf(visibleParts) <= maxWidth) break;
       visibleParts = visibleParts.filter((part) => part !== optional);
     }
@@ -3797,6 +3987,9 @@ function renderStatusLine(state, maxWidth) {
           colorEnabled
         ));
       }
+      if (creditsSegment) {
+        emergency.push(themeText(formatCreditsChip(credits ?? 0, { compact: true }), "muted", colorEnabled));
+      }
       visibleParts = [emergency.join(" ")];
     }
   }
@@ -3927,6 +4120,20 @@ function renderTuiHelp(colorEnabled = resolveCliColorEnabled()) {
     return themeText(line, "muted", colorEnabled);
   }).join("\n");
 }
+function renderCreditsDebug(state, colorEnabled = resolveCliColorEnabled()) {
+  const credits = resolveStatusLineCredits(state);
+  const lines = [
+    "[credits debug] \u79EF\u5206\u94FE\u8DEF\u771F\u503C",
+    `\u2022 dialogCreditsBase : ${state.dialogCreditsBase?.toFixed(4) ?? "undefined\uFF08\u670D\u52A1\u7AEF\u57FA\u6570\u672A seed\u2014\u2014/pick \u540E\u9996\u6B21\u8BFB\u53D6\u5931\u8D25\u6216\u670D\u52A1\u7AEF\u672A\u5199 totalCost\uFF09"}`,
+    `\u2022 sessionCredits    : ${state.sessionCredits?.toFixed(4) ?? "undefined\uFF08\u672C\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u5E73\u53F0\u8BA1\u8D39\u8F6E\uFF09"}`,
+    `\u2022 \u72B6\u6001\u884C\u663E\u793A        : ${credits !== void 0 && credits > 0 ? formatCreditsChip(credits) : "\uFF08\u65E0 \u26A1\u2014\u2014\u4E24\u6BB5\u5408\u8BA1\u4E3A 0/undefined\uFF09"}`,
+    `\u2022 turnTokens.credits: ${state.turnTokens?.credits?.toFixed(4) ?? "undefined"}\uFF08\u672C\u8F6E\u6700\u540E\u4E00\u6B21\u8C03\u7528\u7684\u6298\u7B97\u503C\uFF0C\u4EC5\u4F9B\u53C2\u8003\uFF0C\u4E0D\u8FDB\u72B6\u6001\u884C\uFF09`,
+    `\u2022 contextWindow     : ${state.contextWindow ?? "unknown"}`,
+    '\u2022 \u5224\u5B9A\u53E3\u5F84\uFF1A\u53EA\u6709 billing_unit === "credits" \u7684\u5E73\u53F0\u8BA1\u8D39\u5E27\u624D\u7D2F\u8BA1\uFF1B\u81EA\u6709 API / \u8BA2\u9605\u5236\u6052\u4E3A undefined\u3002',
+    "\u2022 \u82E5\u521A\u8DD1\u5B8C\u5E73\u53F0\u8BA1\u8D39\u8F6E\u4ECD\u65E0 \u26A1\uFF1A\u68C0\u67E5 runAgentTurn \u8FD4\u56DE\u662F\u5426\u5E26 turnCredits\uFF08foldLocalResultForTui \u767D\u540D\u5355\uFF09\u3002"
+  ];
+  return lines.map((line) => colorEnabled ? themeText(line, "chrome") : line).join("\n");
+}
 function renderContextPanel(state, colorEnabled = resolveCliColorEnabled()) {
   const docs = state.attachedDocs.length ? state.attachedDocs.join(", ") : "none";
   const skills = state.attachedSkills.length ? state.attachedSkills.join(", ") : "none";
@@ -3938,7 +4145,6 @@ function renderContextPanel(state, colorEnabled = resolveCliColorEnabled()) {
     t("contextFieldSkills"),
     t("contextFieldProfile"),
     t("contextFieldRuntime"),
-    t("contextFieldTools"),
     t("contextFieldServer")
   ];
   let maxW = 0;
@@ -3968,8 +4174,7 @@ function renderContextPanel(state, colorEnabled = resolveCliColorEnabled()) {
     field(labels[4], skills),
     field(labels[5], state.profileName),
     field(labels[6], state.runtimeMode),
-    field(labels[7], state.toolDisplay),
-    field(labels[8], state.serverUrl),
+    field(labels[7], state.serverUrl),
     "",
     themeText(t("contextNext"), "chrome", colorEnabled),
     next("/agents            ", `  ${t("contextNextAgents")}`),
@@ -4226,6 +4431,7 @@ var SLASH_COMMANDS = [
   "/theme",
   "/context",
   "/ctx",
+  "/credits",
   "/cd",
   "/runtime",
   "/auto",
@@ -4395,7 +4601,6 @@ async function runAgentPicker(args) {
     name: selected.name,
     key: selected.key,
     model: selected.model,
-    apiSource: selected.apiSource ?? (selected.kind === "platform" ? "platform" : void 0),
     entries
   };
 }
@@ -4407,10 +4612,7 @@ function resolveAgentSwitchTarget(rawTarget, catalogEntries = []) {
     return {
       name: aliasEntry?.name ?? asTrimmedLowercaseString(target),
       key: resolvedKey,
-      ...aliasEntry?.model ? { model: aliasEntry.model } : {},
-      ...aliasEntry ? {
-        ...aliasEntry.apiSource ? { apiSource: aliasEntry.apiSource } : aliasEntry.kind === "platform" ? { apiSource: "platform" } : {}
-      } : {}
+      ...aliasEntry?.model ? { model: aliasEntry.model } : {}
     };
   }
   return findAgentCatalogEntry(catalogEntries, rawTarget);
@@ -4528,7 +4730,6 @@ function createInitialTuiState(env = process.env) {
     modeLabel: asOptionalTrimmedString(env.NOLO_CLI_STATUS_MODE) ?? runtimeMode,
     userLanguage: asOptionalTrimmedString(env.NOLO_LANG),
     gitStatus: void 0,
-    toolDisplay: normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "normal"),
     thinkingDisplay: resolveThinkingDisplayMode(env),
     contextWindow: resolveAgentContextWindow({ agentKey, agentName }),
     estimatedContextTokens: estimateDefaultCliContextTokens({
@@ -4536,8 +4737,7 @@ function createInitialTuiState(env = process.env) {
       agentKey,
       userLanguage: asOptionalTrimmedString(env.NOLO_LANG),
       ...resolveAgentModelIdentity({ agentKey, agentName })
-    }),
-    apiSource: PLATFORM_AGENTS.some((entry) => entry.key === agentKey) ? "platform" : void 0
+    })
   };
 }
 function applyAgentSwitch(state, target) {
@@ -4558,8 +4758,7 @@ function applyAgentSwitch(state, target) {
         agentName: target.name,
         model: target.model,
         userLanguage: state.userLanguage
-      }),
-      apiSource: target.apiSource
+      })
     },
     output: `Switched to ${target.name}. ${state.dialogId ? `Dialog kept: ${state.dialogId}` : "Dialog kept: new"}`
   };
@@ -4703,6 +4902,8 @@ ${t("cdUsage")}`
     case "/context":
     case "/ctx":
       return { nextState: state, output: renderContextPanel(state) };
+    case "/credits":
+      return { nextState: state, output: renderCreditsDebug(state) };
     case "/runtime": {
       if (argText !== "auto" && argText !== "local" && argText !== "server") {
         return {
@@ -5199,9 +5400,106 @@ function detectSystemBrightness(env = process.env, options = {}) {
   return null;
 }
 
-// packages/cli/tui/tuiTurnRunner.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
+// packages/cli/tui/turnInjectionInbox.ts
+function appendStreamSafeNotice(history, text, deps) {
+  const wasStreamingAssistant = history.currentRole === "assistant";
+  if (wasStreamingAssistant && !history.currentContent) {
+    history.currentRole = null;
+    history.currentBlocks = [];
+  }
+  deps.appendLocalTurn(history, "", text);
+  if (wasStreamingAssistant) deps.startTurn(history, "assistant");
+}
+function createTurnInjectionInbox() {
+  let pending = [];
+  let closed = false;
+  return {
+    push(entry) {
+      if (closed) return false;
+      if (!entry || typeof entry.text !== "string" || !entry.text.trim()) return false;
+      pending.push(entry);
+      return true;
+    },
+    drain() {
+      if (pending.length === 0) return [];
+      const taken = pending;
+      pending = [];
+      return taken.map((entry) => entry.text);
+    },
+    close() {
+      closed = true;
+      const remaining = pending;
+      pending = [];
+      return remaining;
+    },
+    get size() {
+      return pending.length;
+    },
+    get closed() {
+      return closed;
+    }
+  };
+}
+
+// packages/cli/client/turnBillingAudit.ts
+import { appendFileSync, mkdirSync as mkdirSync2 } from "node:fs";
+import { homedir as homedir4 } from "node:os";
 import { join as join3 } from "node:path";
+function projectUsageForAudit(usage) {
+  if (!usage || typeof usage !== "object") return null;
+  const normalized = normalizeUsage(usage);
+  const projected = {
+    input_tokens: normalized.input_tokens,
+    output_tokens: normalized.output_tokens,
+    cache_read_input_tokens: normalized.cache_read_input_tokens,
+    cache_creation_input_tokens: normalized.cache_creation_input_tokens
+  };
+  if (typeof usage.cost === "number" && Number.isFinite(usage.cost)) {
+    projected.cost = usage.cost;
+  }
+  if (typeof usage.billing_unit === "string" && usage.billing_unit.trim()) {
+    projected.billing_unit = usage.billing_unit;
+  }
+  if (typeof usage.provider_call_id === "string" && usage.provider_call_id.trim()) {
+    projected.provider_call_id = usage.provider_call_id.trim();
+  }
+  return projected;
+}
+function resolveTurnBillingAuditLogPath(env = process.env) {
+  const noloHome = env.NOLO_HOME?.trim() || join3(homedir4(), ".nolo");
+  return join3(noloHome, "logs", "turn-billing.jsonl");
+}
+function appendTurnBillingAudit(input) {
+  try {
+    if (process.env.NOLO_TURN_BILLING_AUDIT === "0") return;
+    const calls = (input.usageRecords ?? []).map((record) => {
+      const usage = projectUsageForAudit(record?.usage);
+      if (!usage) return null;
+      return {
+        ...record?.callId ? { callId: record.callId } : {},
+        ...record?.model ? { model: record.model } : {},
+        ...record?.provider ? { provider: record.provider } : {},
+        ...usage
+      };
+    }).filter((call) => call !== null);
+    if (calls.length === 0 && (input.turnCredits === void 0 || input.turnCredits === null)) {
+      return;
+    }
+    const row = {
+      ts: Date.now(),
+      ...input.dialogId ? { dialogId: input.dialogId } : {},
+      ...input.agentKey ? { agentKey: input.agentKey } : {},
+      ...input.turnCredits !== void 0 && input.turnCredits !== null ? { turnCredits: input.turnCredits } : {},
+      ...input.aborted ? { aborted: true } : {},
+      calls
+    };
+    const logPath = resolveTurnBillingAuditLogPath();
+    mkdirSync2(join3(logPath, ".."), { recursive: true });
+    appendFileSync(logPath, `${JSON.stringify(row)}
+`);
+  } catch {
+  }
+}
 
 // packages/ai/tools/askChoiceState.ts
 function normalizeAskChoiceArgs(args) {
@@ -5980,24 +6278,6 @@ function emitTerminalBell(output) {
 }
 
 // packages/cli/tui/tuiTurnRunner.ts
-var AGENTS_MD_MAX_BYTES = 8192;
-function readAgentsMdLayer(cwd) {
-  for (const name of ["AGENTS.md", "CLAUDE.md"]) {
-    const filePath = join3(cwd, name);
-    if (existsSync3(filePath)) {
-      try {
-        let content = readFileSync3(filePath, "utf8").trim();
-        if (!content) continue;
-        if (Buffer.byteLength(content, "utf8") > AGENTS_MD_MAX_BYTES) {
-          content = Buffer.from(content, "utf8").subarray(0, AGENTS_MD_MAX_BYTES).toString("utf8") + "\n\n<!-- AGENTS.md truncated -->";
-        }
-        return buildAgentsMdLayer(content, name);
-      } catch {
-      }
-    }
-  }
-  return null;
-}
 async function runAgentChat(scriptDir, state, message, env, output, agentRunner = runAgentTurn, options = {}) {
   const effectiveAgentKey = state.agentKey;
   const effectiveAgentName = state.agentName;
@@ -6042,12 +6322,16 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
     }
   }
   const layers = [
-    readAgentsMdLayer(state.cwd),
+    readAgentsMdLayerFromDisk(state.cwd),
     // Skill discovery: scan conventional skill dirs for SKILL.md and inject an
     // index layer so the model knows what skills exist and can readFile them
     // on-demand. Mirrors agentRunCommand.ts and desktopAgentRuntimeTurnService.
     buildSkillDiscoveryContextLayer(state.cwd)
   ];
+  const responseGuidelinesBlock = {
+    content: buildResponseGuidelines(true),
+    cacheScope: "session"
+  };
   let memoryPromptBlock = state.cachedMemoryOverlay;
   if (memoryPromptBlock === void 0) {
     memoryPromptBlock = await resolveCliMemory({
@@ -6063,6 +6347,7 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
   const cwdNoticeBlocks = state.pendingCwdNotice ? [{ content: state.pendingCwdNotice, cacheScope: "turn" }] : [];
   const contextBlockScopes = partitionScopedBlocks([
     ...renderTurnContextBlocksWithScope(layers),
+    responseGuidelinesBlock,
     ...renderTurnContextBlocksWithScope([memoryUseGuidanceLayer]),
     // Attached skill bodies are already self-contained sections built by
     // buildSkillContextBlocks; they stay turn-scope because the user can
@@ -6071,6 +6356,7 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
     ...renderTurnContextBlocksWithScope([memoryOverlayLayer]),
     ...cwdNoticeBlocks
   ]);
+  const spawnedRunsMissingParent = [];
   const result = await agentRunner({
     agentName: effectiveAgentName,
     agentKey: effectiveAgentKey,
@@ -6088,10 +6374,12 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
     scriptDir,
     env: {
       ...env,
-      NOLO_LANG: state.userLanguage,
-      NOLO_CLI_TOOLS: state.toolDisplay
+      NOLO_LANG: state.userLanguage
+    },
+    output: {
+      ...output,
+      tuiTrees: output.tuiTrees === true && typeof output.writeToolBlock === "function"
     },
-    output,
     showThinking: state.thinkingDisplay === "show",
     ...options.imageUrls && options.imageUrls.length > 0 ? { imageUrls: options.imageUrls } : {},
     ...options.actionGateHandler ? { actionGateHandler: options.actionGateHandler } : {},
@@ -6115,15 +6403,28 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
       // run-completion watcher can attribute terminal-state wakes to this
       // conversation.
       ...state.dialogId ? { parentDialogId: state.dialogId } : {},
+      // 首轮无 dialogId 时的兜底：收集失归属的 spawn，turn 结束回填。
+      onBackgroundRunSpawned: (runId) => {
+        spawnedRunsMissingParent.push(runId);
+      },
       ...options.activityReporter ? { activityReporter: options.activityReporter } : {}
     }),
     ...options.activityReporter ? { activityReporter: options.activityReporter } : {},
     // 转发 dock 订阅：runAgentTurn 的输出层靠它判断「有面板」从而抑制
     // transcript 的进展卡片；dock 本身也靠它接收模型轮询带回来的快照。
     ...options.onAgentRunStatus ? { onAgentRunStatus: options.onAgentRunStatus } : {},
+    ...options.drainInjections ? { drainInjections: options.drainInjections } : {},
     ...skillAllowedTools !== void 0 ? { allowedToolNames: skillAllowedTools } : {},
     ...contextBlockScopes.length > 0 ? { contextBlockScopes } : {}
   });
+  if (result.dialogId && spawnedRunsMissingParent.length > 0) {
+    for (const runId of spawnedRunsMissingParent) {
+      try {
+        backfillRunRecordParentDialog(runId, result.dialogId, { env });
+      } catch {
+      }
+    }
+  }
   return {
     ...result,
     contextWindow: resolveAgentContextWindow({
@@ -6366,19 +6667,21 @@ async function resolveActionGate(gate, deps) {
     );
     return approved ? buildGateConfirmedResult(gate) : buildGateCancelledResult(gate, "confirmation declined");
   }
-  let subprocessRan = false;
-  deps.pauseComposer();
-  try {
-    return await waitForRawActionGate(deps.input, deps.output, gate, deps.spawnRunner, {
-      beforeSubprocess: () => {
-        subprocessRan = true;
-      },
-      afterSubprocess: deps.resumeComposerFromSubprocess,
-      registerToken: deps.registerToken
-    });
-  } finally {
-    if (!subprocessRan) deps.resumeComposerFromDialog();
-  }
+  return deps.dialogHost.withKeyboard(async () => {
+    let subprocessRan = false;
+    deps.pauseComposer();
+    try {
+      return await waitForRawActionGate(deps.input, deps.output, gate, deps.spawnRunner, {
+        beforeSubprocess: () => {
+          subprocessRan = true;
+        },
+        afterSubprocess: deps.resumeComposerFromSubprocess,
+        registerToken: deps.registerToken
+      });
+    } finally {
+      if (!subprocessRan) deps.resumeComposerFromDialog();
+    }
+  });
 }
 async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, confirmDestructiveAction) {
   const scheduleTitlePatchSync = (runResult) => {
@@ -6451,7 +6754,6 @@ async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, conf
     ctx.scheduleRender();
   }) : ctx.output;
   const requestUserChoice = isInteractiveInput(ctx.input) && ctx.dialogHost ? async (choiceReq) => {
-    ctx.modalOwnsKeyboard = true;
     try {
       return await ctx.dialogHost.run(
         (anchor) => runAskChoiceDialog({
@@ -6463,12 +6765,11 @@ async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, conf
       );
     } catch {
       return { kind: "cancelled" };
-    } finally {
-      ctx.composerDecoderDrain?.();
-      ctx.modalOwnsKeyboard = false;
     }
   } : void 0;
   ctx.runRegistryPoller.beginHold();
+  const injectionInbox = createTurnInjectionInbox();
+  ctx.turnInjectionInbox = injectionInbox;
   try {
     ctx.activeTurnAbort = new AbortController();
     ctx.activeTurnEpoch = myEpoch;
@@ -6485,6 +6786,7 @@ async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, conf
         ...confirmDestructiveAction ? { confirmDestructiveAction } : {},
         ...requestUserChoice ? { requestUserChoice } : {},
         abortSignal: ctx.activeTurnAbort.signal,
+        drainInjections: () => injectionInbox.drain(),
         pastedTextStore: ctx.pasteStore,
         activityReporter: ctx.activityReporter,
         onAgentRunStatus: (snapshot) => {
@@ -6514,10 +6816,14 @@ async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, conf
           // 本轮已发起 agent 调用（消息已注入），消费切换通知。
           pendingCwdNotice: void 0
         };
-        if (runResult.dialogId && nextDialogKey) {
-          ctx.refreshDialogTotalCredits(runResult.dialogId, nextDialogKey);
-        }
       }
+      ctx.accumulateSessionCredits(runResult.turnCredits);
+      appendTurnBillingAudit({
+        dialogId: runResult.dialogId ?? null,
+        turnCredits: runResult.turnCredits ?? null,
+        usageRecords: runResult.usageRecords,
+        aborted: true
+      });
       scheduleTitlePatchSync(runResult);
       return { ok: false, aborted: true };
     }
@@ -6566,10 +6872,16 @@ async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, conf
         // 而非纯 child-run-completed 事件短路）时才清除。
         pendingCwdNotice: void 0
       };
-      if (runResult.dialogId && nextDialogKey) {
-        ctx.refreshDialogTotalCredits(runResult.dialogId, nextDialogKey);
-      }
     }
+    ctx.accumulateSessionCredits(runResult.turnCredits);
+    appendTurnBillingAudit({
+      dialogId: runResult.dialogId ?? null,
+      turnCredits: runResult.turnCredits ?? null,
+      usageRecords: runResult.usageRecords,
+      // 普通中断（Esc）同样属于「账照记、轮未正常收尾」，审计行标注出来，
+      // 与 1028 行 forceStop 路径及正常完成轮区分开。
+      ...wasAborted || runResult.streamInterrupted ? { aborted: true } : {}
+    });
     scheduleTitlePatchSync(runResult);
     if (!wasAborted && runResult.exitCode !== 0) {
       if (isBalanceExhaustedError(runResult.localError) && runResult.dialogId) {
@@ -6587,6 +6899,21 @@ async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, conf
     ctx.runRegistryPoller.endHold();
     ctx.activityIndicator.stop();
     ctx.activeTurnAbort = null;
+    if (ctx.turnInjectionInbox === injectionInbox) ctx.turnInjectionInbox = null;
+    const leftover = injectionInbox.close();
+    if (leftover.length > 0) {
+      const binding = ensureChatQueueBinding(
+        ctx,
+        actionGateHandler,
+        confirmDestructiveAction
+      );
+      for (const entry of leftover) {
+        try {
+          binding.enqueue(entry.fallback);
+        } catch {
+        }
+      }
+    }
   }
 }
 function ensureChatQueueBinding(ctx, actionGateHandler, confirmDestructiveAction) {
@@ -7659,7 +7986,7 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
     emitCommandOutput,
     renderHistoryToOutput,
     scheduleRender,
-    refreshDialogTotalCredits,
+    seedDialogCreditsBase,
     persistExplicitAgentSwitch,
     persistAgentSelection: persistAgentSelection2,
     writeClipboard: writeClipboard2,
@@ -7707,8 +8034,10 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
     host.state = {
       ...host.state,
       turnTokens: void 0,
-      // 新对话累计积分从 0 开始，清掉旧对话残留的累计值，等首轮读取后再回填。
-      dialogTotalCredits: void 0,
+      // 新对话的积分累计从 0 重新开始：既清掉旧对话的本会话累加，也清掉旧对话
+      // 的历史基数（新对话没有历史）。
+      sessionCredits: void 0,
+      dialogCreditsBase: void 0,
       cachedMemoryOverlay: void 0,
       // 新对话重新加载记忆
       estimatedContextTokens: estimateDefaultCliContextTokens({
@@ -7758,9 +8087,10 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
         // composer chip falls back to the default CLI surface estimate and
         // the context percentage visibly drops. Mirrors the /clear reset.
         turnTokens: void 0,
-        // compact fork 出新的官方 dialog，其全量计费投影从新记录累计。
-        // 清掉旧累计值，等首轮读取后再回填新 dialog 的 totalCost。
-        dialogTotalCredits: void 0,
+        // compact fork 出新的官方 dialog，计费从新记录开始累计；新 dialog 没有
+        // 历史基数，本会话累加也随之归零。
+        sessionCredits: void 0,
+        dialogCreditsBase: void 0,
         cachedMemoryOverlay: void 0,
         // compact 创建新 dialog，重新加载记忆
         estimatedContextTokens: estimateDefaultCliContextTokens({
@@ -7875,7 +8205,6 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
             model: pickResult.model,
             userLanguage: host.state.userLanguage
           }),
-          ...pickResult.apiSource ? { apiSource: pickResult.apiSource } : {},
           cachedMemoryOverlay: void 0
           // 切换 agent 后重新加载记忆
         };
@@ -7992,13 +8321,14 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
           dialogLabel: pickResult.dialog.title || pickResult.dialog.id,
           dialogTitle: pickResult.dialog.title,
           turnTokens: void 0,
-          // 切换对话先清空上一个对话的累计积分，等下面异步读取成功后回填；
+          // 切换对话先清空上一个对话的积分，等下面异步 seed 成功后回填历史基数；
           // 若读取失败也不至于把旧对话的累计值残留显示在状态行。
-          dialogTotalCredits: void 0,
+          sessionCredits: void 0,
+          dialogCreditsBase: void 0,
           cachedMemoryOverlay: void 0
           // 切换对话后重新加载记忆
         };
-        refreshDialogTotalCredits(pickResult.dialog.id, pickResult.dialog.dbKey);
+        seedDialogCreditsBase(pickResult.dialog.id, pickResult.dialog.dbKey);
         clearCollapsedPasteStore(pasteStore);
         emitCommandOutput(
           `${t("resumedDialogPrefix")}: ${pickResult.dialog.title} (${pickResult.dialog.id})`
@@ -8275,7 +8605,6 @@ async function runTuiWorkspace(options) {
     isTurnActive: () => activeTurnAbort !== null,
     fallbackLabel: () => `${state.agentName} -> working`,
     stoppingLabel: () => t("turnStopping"),
-    displayMode: () => state.toolDisplay,
     onRepaint: () => {
       if (fixedInput.active && !fixedInput.isPaused()) {
         output.write("\x1B[?2026h\x1B[?25l");
@@ -8319,7 +8648,14 @@ async function runTuiWorkspace(options) {
       getInputLines: () => fixedInput.getInputLines(),
       isPaused: () => fixedInput.isPaused()
     },
-    output
+    output,
+    // The decoder-drain hook is only bound once the interactive raw-mode
+    // composer installs its decoder (inside the `isInteractiveInput` block
+    // below); the non-raw readline path never binds it, so this stays a
+    // no-op there — which is correct, that path has no raw decoder to drain.
+    drainDecoder: () => {
+      if (composerDecoderDrain) composerDecoderDrain();
+    }
   });
   let sessionEnded = false;
   const selectionState = createSelectionState();
@@ -8348,7 +8684,7 @@ async function runTuiWorkspace(options) {
   const repaintBanner = () => {
     if (!output.isTTY) return;
     if (fixedInput.isPaused()) return;
-    if (modalOwnsKeyboard) return;
+    if (dialogHost.isKeyboardClaimed()) return;
     const currentColumns = output.columns ?? 80;
     const welcome = renderWelcome(state, 0, 0, currentColumns);
     const lines = welcome.split("\n");
@@ -8397,9 +8733,8 @@ async function runTuiWorkspace(options) {
     selectionState.anchor = null;
     selectionState.head = null;
   };
-  let modalOwnsKeyboard = false;
   let rawActionGateTokenHandler = null;
-  const refreshDialogTotalCredits = (dialogId, dialogKey) => {
+  const seedDialogCreditsBase = (dialogId, dialogKey) => {
     const env = options.env ?? process.env;
     const authToken = resolvePlatformAuthToken(env);
     if (!authToken) return;
@@ -8411,14 +8746,19 @@ async function runTuiWorkspace(options) {
     }).then((record) => {
       if (sessionEnded) return;
       if (state.dialogId !== dialogId) return;
+      if (state.sessionCredits !== void 0) return;
       const recordObj = record && typeof record === "object" ? record : null;
       const totalCost = recordObj ? Number(recordObj?.totalCost) : NaN;
       if (Number.isFinite(totalCost) && totalCost >= 0) {
-        state = { ...state, dialogTotalCredits: totalCost };
+        state = { ...state, dialogCreditsBase: totalCost };
       }
     }).catch(() => {
     });
   };
+  const accumulateSessionCredits = (credits) => {
+    if (credits === void 0 || !Number.isFinite(credits)) return;
+    state = { ...state, sessionCredits: (state.sessionCredits ?? 0) + credits };
+  };
   let composerDecoderDrain = null;
   const emitCommandOutput = (text, command = "") => {
     if (!text) return;
@@ -8433,6 +8773,7 @@ async function runTuiWorkspace(options) {
     if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
   };
   let chatQueueBinding = null;
+  let turnInjectionInbox = null;
   const turnCtx = {
     get state() {
       return state;
@@ -8470,24 +8811,18 @@ async function runTuiWorkspace(options) {
     set activeTurnEpoch(v) {
       activeTurnEpoch = v;
     },
-    get modalOwnsKeyboard() {
-      return modalOwnsKeyboard;
-    },
-    set modalOwnsKeyboard(v) {
-      modalOwnsKeyboard = v;
-    },
-    get composerDecoderDrain() {
-      return composerDecoderDrain;
-    },
-    set composerDecoderDrain(v) {
-      composerDecoderDrain = v;
-    },
     get chatQueueBinding() {
       return chatQueueBinding;
     },
     set chatQueueBinding(v) {
       chatQueueBinding = v;
     },
+    get turnInjectionInbox() {
+      return turnInjectionInbox;
+    },
+    set turnInjectionInbox(v) {
+      turnInjectionInbox = v;
+    },
     get sessionEnded() {
       return sessionEnded;
     },
@@ -8515,7 +8850,8 @@ async function runTuiWorkspace(options) {
     renderHistoryToOutput,
     scheduleRender,
     flushPendingRender,
-    refreshDialogTotalCredits,
+    seedDialogCreditsBase,
+    accumulateSessionCredits,
     emitCommandOutput
   };
   const persistExplicitAgentSwitch = (previousAgentKey) => {
@@ -8554,7 +8890,7 @@ async function runTuiWorkspace(options) {
     emitCommandOutput,
     renderHistoryToOutput,
     scheduleRender,
-    refreshDialogTotalCredits,
+    seedDialogCreditsBase,
     persistExplicitAgentSwitch,
     persistAgentSelection,
     writeClipboard: writeClipboard2,
@@ -8669,47 +9005,33 @@ async function runTuiWorkspace(options) {
       input.setRawMode?.(false);
     };
     const buildInteractiveTurnHandlers = () => {
-      const releaseKeyboardToComposer = () => {
-        onData.destroy();
-        modalOwnsKeyboard = false;
-      };
       const actionGateHandler = async (gate) => {
         if (state.autoConfirm && isAutoConfirmableFileWriteGate(gate)) {
           return buildGateConfirmedResult(gate);
         }
-        modalOwnsKeyboard = true;
-        try {
-          return await resolveActionGate(gate, {
-            dialogHost,
-            input,
-            output,
-            spawnRunner,
-            registerToken: (handler) => {
-              rawActionGateTokenHandler = handler;
-            },
-            pauseComposer: () => fixedInput.pause(),
-            resumeComposerFromSubprocess: () => fixedInput.resumeFromSubprocess(),
-            resumeComposerFromDialog: () => fixedInput.resumeFromDialog()
-          });
-        } finally {
-          releaseKeyboardToComposer();
-        }
+        return await resolveActionGate(gate, {
+          dialogHost,
+          input,
+          output,
+          spawnRunner,
+          registerToken: (handler) => {
+            rawActionGateTokenHandler = handler;
+          },
+          pauseComposer: () => fixedInput.pause(),
+          resumeComposerFromSubprocess: () => fixedInput.resumeFromSubprocess(),
+          resumeComposerFromDialog: () => fixedInput.resumeFromDialog()
+        });
       };
       const confirmDestructiveAction = async (request) => {
         if (state.autoConfirm) return true;
-        modalOwnsKeyboard = true;
-        try {
-          return await dialogHost.run(
-            (anchor) => runConfirmDialog({
-              request,
-              input,
-              output,
-              ...anchor
-            })
-          );
-        } finally {
-          releaseKeyboardToComposer();
-        }
+        return await dialogHost.run(
+          (anchor) => runConfirmDialog({
+            request,
+            input,
+            output,
+            ...anchor
+          })
+        );
       };
       return { actionGateHandler, confirmDestructiveAction };
     };
@@ -8742,11 +9064,30 @@ ${err.message}` : ""}`
       flushPendingRender();
       fixedInput.exitOutputMode(buffer, cursorPos);
     };
+    (options.env ?? process.env)[RUN_WAKE_CHANNEL_ENV] = "1";
     runWakeHandler = (event) => {
       if (done) return;
       if (busy || fixedInput.isPaused()) {
-        const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
-        ensureChatQueueBinding(turnCtx, actionGateHandler, confirmDestructiveAction).enqueue(event);
+        const text = typeof event === "string" ? event : event.text;
+        const injected = !!turnInjectionInbox && turnInjectionInbox.push({ text, fallback: event });
+        if (injected) {
+          const displayText = typeof event !== "string" && event.kind === "child-run-completed" ? event.displayText ?? event.text : text;
+          const noticeLine = dimCliText(displayText, resolveCliColorEnabled());
+          if (!isInteractiveInput(input)) {
+            output.write(`${noticeLine}
+`);
+          } else {
+            history.followBottom = true;
+            appendStreamSafeNotice(history, noticeLine, {
+              appendLocalTurn,
+              startTurn
+            });
+            renderHistoryToOutput();
+          }
+        } else {
+          const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
+          ensureChatQueueBinding(turnCtx, actionGateHandler, confirmDestructiveAction).enqueue(event);
+        }
         if (fixedInput.active && !fixedInput.isPaused()) {
           fixedInput.repaint(buffer, cursorPos);
         }
@@ -8924,7 +9265,7 @@ ${hint}` : hint;
     };
     const handleInputToken = async (sequence) => {
       if (done) return;
-      if (modalOwnsKeyboard) {
+      if (dialogHost.isKeyboardClaimed()) {
         rawActionGateTokenHandler?.(sequence);
         return;
       }