nolo-cli 0.50.0-alpha.1 → 0.50.0

package/{chunk-WWXZYFWM.js → chunk-2TLYVDTN.js}

@@ -1,6 +1,3 @@
-import {
-  generateRunReport
-} from "./chunk-J3UALFHL.js";
 import {
   buildLocalRunEnv,
   isFullstackCodingAgentRef,
@@ -10,6 +7,9 @@ import {
   resolveServerUrl,
   writeUsage
 } from "./chunk-LYGNQHUW.js";
+import {
+  resolveMachineId
+} from "./chunk-ESHYE7WU.js";
 import {
   agentRunCardLabels,
   createCliLocalRuntimeAdapter,
@@ -19,7 +19,12 @@ import {
   parseAgentRunEvent,
   t,
   toolLabel
-} from "./chunk-27MWS6HD.js";
+} from "./chunk-EAYBPWHX.js";
+import {
+  readCredentialEntry,
+  recordCredentialProbe,
+  resolveCredentialKeyWithFallback
+} from "./chunk-NI2BS6UD.js";
 import {
   getReadableCliDb
 } from "./chunk-43CXXVJD.js";
@@ -27,11 +32,14 @@ import {
   normalizeAgentHandle,
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-DQLYEGP7.js";
+} from "./chunk-EGVY3GMT.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
 } from "./chunk-EKLRRZIN.js";
+import {
+  generateRunReport
+} from "./chunk-GHE5XMVR.js";
 import {
   CliProviderQuotaError
 } from "./chunk-JDSUTNYY.js";
@@ -42,17 +50,14 @@ import {
   readRunRecord,
   resolveRunQueuePath,
   spawnLocalBackgroundRun
-} from "./chunk-WHVQA7PJ.js";
-import {
-  resolveMachineId
-} from "./chunk-ESHYE7WU.js";
+} from "./chunk-SCBBGS2N.js";
 import {
   applyModelLayerOverride,
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
 import {
   formatAgentListCard
-} from "./chunk-72COHDZR.js";
+} from "./chunk-OSUZKICS.js";
 import {
   isTransientFetchError
 } from "./chunk-5XTOKQLW.js";
@@ -66,26 +71,25 @@ import {
   formatStartRunCard,
   formatStatusRunCard,
   formatStopRunCard,
-  isAgentRunTerminalStatus,
-  runShowsLogTail
+  isAgentRunTerminalStatus
 } from "./chunk-KXKQO4Q6.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-IERBSHMR.js";
+} from "./chunk-X5LRMXTS.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-MCX2LX27.js";
+} from "./chunk-UMCMW5R3.js";
 import {
   getDefaultCliLocalRuntimeDb
 } from "./chunk-IA3A5373.js";
 import {
   buildSkillDiscoveryContextLayer
-} from "./chunk-OFZPJ3NT.js";
+} from "./chunk-E4MARS3Q.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
@@ -93,12 +97,11 @@ import {
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
-  readActionGate,
-  readCommandActionGatePayload
-} from "./chunk-S3HB4CQY.js";
+  readActionGate
+} from "./chunk-GKNGRBE6.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-VKSBVRGP.js";
+} from "./chunk-LVCAWHI5.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -107,20 +110,22 @@ import {
 import {
   resolveClientVersion,
   resolvePlatformAuthToken
-} from "./chunk-JBL24PK6.js";
+} from "./chunk-DEIGUGP6.js";
 import {
-  isQuotaExhaustedError
+  isQuotaExhaustedError,
+  mergeAvailabilityDeadline,
+  resolveCooldownGate
 } from "./chunk-IWUMSAQF.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-F22JQTSX.js";
+} from "./chunk-UEV5WVQV.js";
 import {
   clipCompactText
-} from "./chunk-HR5XDXYM.js";
+} from "./chunk-G5SQVIFZ.js";
 import {
   findModelConfig
-} from "./chunk-BO3YFOZR.js";
+} from "./chunk-KNQ5LYVZ.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -133,7 +138,7 @@ import {
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-3AOLVADY.js";
+} from "./chunk-DVINR3PL.js";
 import {
   readPipeText,
   spawnProcess
@@ -145,7 +150,7 @@ import {
   CLIENT_VERSION_TOO_OLD_CODE,
   NOLO_CLIENT_VERSION_HEADER,
   buildClientVersionUpgradeMessage
-} from "./chunk-VFN256RI.js";
+} from "./chunk-G4WSLTQF.js";
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
@@ -159,7 +164,7 @@ import {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById
-} from "./chunk-2JYSSXLY.js";
+} from "./chunk-EJFW7TRP.js";
 import {
   parsePublicAgentId
 } from "./chunk-BJIRLHJR.js";
@@ -1240,13 +1245,6 @@ function setActiveThemeMode(mode) {
 function setActiveBrightness(brightness) {
   setActiveThemeMode(brightness ?? "terminal");
 }
-var activeDensity = "spacious";
-function getActiveDensity() {
-  return activeDensity;
-}
-function setActiveDensity(density) {
-  activeDensity = density;
-}
 var TRUECOLOR_TERM_PROGRAMS = /* @__PURE__ */ new Set([
   "iterm.app",
   "wezterm",
@@ -2824,11 +2822,6 @@ function scanStringCommentRegions(line, lang) {
   }
   return regions;
 }
-function detectCodeLangFromPath(filePath) {
-  if (!filePath) return "unknown";
-  const ext = filePath.split(".").pop() ?? "";
-  return normalizeCodeLang(ext);
-}
 function highlightCodeLine(line, lang, brightness) {
   const info = colorSeq("info", brightness);
   if (lang === "unknown") {
@@ -2915,6 +2908,14 @@ function normalizeListLine(line) {
   }
   return line;
 }
+function isPolishListLikeLine(line) {
+  return LIST_LIKE_RE_FOR_GUARD.test(normalizeListLine(line));
+}
+var LIST_LIKE_RE_FOR_GUARD = /^\s*(?:•|☐|☑|\d+\.)\s|^\s*[\u2460-\u2473]|^\s*[├└]──\s/;
+function polishBreathInsertsBlankBetween(cur, next) {
+  if (cur === "" || next === "") return false;
+  return isPolishListLikeLine(cur) !== isPolishListLikeLine(next);
+}
 function convertMarkdownTablesForTerminal(text) {
   const lines = text.split("\n");
   const out = [];
@@ -2982,7 +2983,7 @@ function polishAssistantStructure(text, options = {}) {
     return line;
   });
   const afterHeading = maskedLines.join("\n").replace(/([^\n])\n(#{1,3} )/g, "$1\n\n$2").replace(/^(#{1,3} .+)\n(?!\n)/gm, "$1\n\n").replace(/\n{4,}/g, "\n\n\n");
-  const LIST_LIKE = /^\s*(?:•|☐|☑|\d+\.)\s|^\s*[\u2460-\u2473]/;
+  const LIST_LIKE = /^\s*(?:•|☐|☑|\d+\.)\s|^\s*[\u2460-\u2473]|^\s*[├└]──\s/;
   const headingLines = afterHeading.split("\n");
   const breathed = [];
   for (let i = 0; i < headingLines.length; i++) {
@@ -3401,16 +3402,6 @@ function formatReadItemPath(rawPath, metadata, customHomedir) {
   const clippedPath = clipPathAware(formattedPath, 72);
   return `${clippedPath}${rangePart}`;
 }
-function formatReadTreeLines(items, customHomedir) {
-  const count = items.length;
-  const header = `Read (${count})`;
-  const lines = items.map((item, index) => {
-    const connector = index === items.length - 1 ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
-    const pathWithRange = formatReadItemPath(item.path, item.metadata, customHomedir);
-    return { connector, pathWithRange };
-  });
-  return { header, count, lines };
-}
 function formatSearchItemQuery(query, path, customHomedir) {
   let text = (query || "").trim();
   if (path) {
@@ -3422,16 +3413,6 @@ function formatSearchItemQuery(query, path, customHomedir) {
   if (!text) return "search";
   return text.length > 80 ? `${text.slice(0, 79)}\u2026` : text;
 }
-function formatSearchTreeLines(items, customHomedir) {
-  const count = items.length;
-  const header = `Search (${count})`;
-  const lines = items.map((item, index) => {
-    const connector = index === items.length - 1 ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
-    const queryText = formatSearchItemQuery(item.query, item.path, customHomedir);
-    return { connector, queryText };
-  });
-  return { header, count, lines };
-}
 function formatRunItemCommand(command, exitCode, timedOut) {
   let text = compactWhitespace(command || "");
   if (!text) text = "command";
@@ -3440,453 +3421,24 @@ function formatRunItemCommand(command, exitCode, timedOut) {
   if (typeof exitCode === "number" && exitCode !== 0) return `${text} (exit ${exitCode})`;
   return text;
 }
-function formatRunTreeLines(items) {
-  const count = items.length;
-  const header = `Run (${count})`;
-  const lines = items.map((item, index) => {
-    const connector = index === items.length - 1 ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
-    const commandText = formatRunItemCommand(item.command, item.exitCode, item.timedOut);
-    return { connector, commandText };
-  });
-  return { header, count, lines };
-}
 function formatFetchItemUrl(url) {
   const text = (url || "").trim();
   if (!text) return "webpage";
   return text.length > 80 ? `${text.slice(0, 79)}\u2026` : text;
 }
-function formatFetchTreeLines(items) {
-  const count = items.length;
-  const header = `Fetch (${count})`;
-  const lines = items.map((item, index) => {
-    const connector = index === items.length - 1 ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
-    const urlText = formatFetchItemUrl(item.url);
-    return { connector, urlText };
-  });
-  return { header, count, lines };
-}
-
-// node_modules/diff/libesm/diff/base.js
-var Diff = class {
-  diff(oldStr, newStr, options = {}) {
-    let callback;
-    if (typeof options === "function") {
-      callback = options;
-      options = {};
-    } else if ("callback" in options) {
-      callback = options.callback;
-    }
-    const oldString = this.castInput(oldStr, options);
-    const newString = this.castInput(newStr, options);
-    const oldTokens = this.removeEmpty(this.tokenize(oldString, options));
-    const newTokens = this.removeEmpty(this.tokenize(newString, options));
-    return this.diffWithOptionsObj(oldTokens, newTokens, options, callback);
-  }
-  diffWithOptionsObj(oldTokens, newTokens, options, callback) {
-    var _a;
-    const done = (value) => {
-      value = this.postProcess(value, options);
-      if (callback) {
-        setTimeout(function() {
-          callback(value);
-        }, 0);
-        return void 0;
-      } else {
-        return value;
-      }
-    };
-    const newLen = newTokens.length, oldLen = oldTokens.length;
-    let editLength = 1;
-    let maxEditLength = newLen + oldLen;
-    if (options.maxEditLength != null) {
-      maxEditLength = Math.min(maxEditLength, options.maxEditLength);
-    }
-    const maxExecutionTime = (_a = options.timeout) !== null && _a !== void 0 ? _a : Infinity;
-    const abortAfterTimestamp = Date.now() + maxExecutionTime;
-    const bestPath = [{ oldPos: -1, lastComponent: void 0 }];
-    let newPos = this.extractCommon(bestPath[0], newTokens, oldTokens, 0, options);
-    if (bestPath[0].oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
-      return done(this.buildValues(bestPath[0].lastComponent, newTokens, oldTokens));
-    }
-    let minDiagonalToConsider = -Infinity, maxDiagonalToConsider = Infinity;
-    const execEditLength = () => {
-      for (let diagonalPath = Math.max(minDiagonalToConsider, -editLength); diagonalPath <= Math.min(maxDiagonalToConsider, editLength); diagonalPath += 2) {
-        let basePath;
-        const removePath = bestPath[diagonalPath - 1], addPath = bestPath[diagonalPath + 1];
-        if (removePath) {
-          bestPath[diagonalPath - 1] = void 0;
-        }
-        let canAdd = false;
-        if (addPath) {
-          const addPathNewPos = addPath.oldPos - diagonalPath;
-          canAdd = addPath && 0 <= addPathNewPos && addPathNewPos < newLen;
-        }
-        const canRemove = removePath && removePath.oldPos + 1 < oldLen;
-        if (!canAdd && !canRemove) {
-          bestPath[diagonalPath] = void 0;
-          continue;
-        }
-        if (!canRemove || canAdd && removePath.oldPos < addPath.oldPos) {
-          basePath = this.addToPath(addPath, true, false, 0, options);
-        } else {
-          basePath = this.addToPath(removePath, false, true, 1, options);
-        }
-        newPos = this.extractCommon(basePath, newTokens, oldTokens, diagonalPath, options);
-        if (basePath.oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
-          return done(this.buildValues(basePath.lastComponent, newTokens, oldTokens)) || true;
-        } else {
-          bestPath[diagonalPath] = basePath;
-          if (basePath.oldPos + 1 >= oldLen) {
-            maxDiagonalToConsider = Math.min(maxDiagonalToConsider, diagonalPath - 1);
-          }
-          if (newPos + 1 >= newLen) {
-            minDiagonalToConsider = Math.max(minDiagonalToConsider, diagonalPath + 1);
-          }
-        }
-      }
-      editLength++;
-    };
-    if (callback) {
-      (function exec() {
-        setTimeout(function() {
-          if (editLength > maxEditLength || Date.now() > abortAfterTimestamp) {
-            return callback(void 0);
-          }
-          if (!execEditLength()) {
-            exec();
-          }
-        }, 0);
-      })();
-    } else {
-      while (editLength <= maxEditLength && Date.now() <= abortAfterTimestamp) {
-        const ret = execEditLength();
-        if (ret) {
-          return ret;
-        }
-      }
-    }
-  }
-  addToPath(path, added, removed, oldPosInc, options) {
-    const last = path.lastComponent;
-    if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
-      return {
-        oldPos: path.oldPos + oldPosInc,
-        lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
-      };
-    } else {
-      return {
-        oldPos: path.oldPos + oldPosInc,
-        lastComponent: { count: 1, added, removed, previousComponent: last }
-      };
-    }
-  }
-  extractCommon(basePath, newTokens, oldTokens, diagonalPath, options) {
-    const newLen = newTokens.length, oldLen = oldTokens.length;
-    let oldPos = basePath.oldPos, newPos = oldPos - diagonalPath, commonCount = 0;
-    while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(oldTokens[oldPos + 1], newTokens[newPos + 1], options)) {
-      newPos++;
-      oldPos++;
-      commonCount++;
-      if (options.oneChangePerToken) {
-        basePath.lastComponent = { count: 1, previousComponent: basePath.lastComponent, added: false, removed: false };
-      }
-    }
-    if (commonCount && !options.oneChangePerToken) {
-      basePath.lastComponent = { count: commonCount, previousComponent: basePath.lastComponent, added: false, removed: false };
-    }
-    basePath.oldPos = oldPos;
-    return newPos;
-  }
-  equals(left, right, options) {
-    if (options.comparator) {
-      return options.comparator(left, right);
-    } else {
-      return left === right || !!options.ignoreCase && left.toLowerCase() === right.toLowerCase();
-    }
-  }
-  removeEmpty(array) {
-    const ret = [];
-    for (let i = 0; i < array.length; i++) {
-      if (array[i]) {
-        ret.push(array[i]);
-      }
-    }
-    return ret;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  castInput(value, options) {
-    return value;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  tokenize(value, options) {
-    return Array.from(value);
-  }
-  join(chars) {
-    return chars.join("");
-  }
-  postProcess(changeObjects, options) {
-    return changeObjects;
-  }
-  get useLongestToken() {
-    return false;
-  }
-  buildValues(lastComponent, newTokens, oldTokens) {
-    const components = [];
-    let nextComponent;
-    while (lastComponent) {
-      components.push(lastComponent);
-      nextComponent = lastComponent.previousComponent;
-      delete lastComponent.previousComponent;
-      lastComponent = nextComponent;
-    }
-    components.reverse();
-    const componentLen = components.length;
-    let componentPos = 0, newPos = 0, oldPos = 0;
-    for (; componentPos < componentLen; componentPos++) {
-      const component = components[componentPos];
-      if (!component.removed) {
-        if (!component.added && this.useLongestToken) {
-          let value = newTokens.slice(newPos, newPos + component.count);
-          value = value.map(function(value2, i) {
-            const oldValue = oldTokens[oldPos + i];
-            return oldValue.length > value2.length ? oldValue : value2;
-          });
-          component.value = this.join(value);
-        } else {
-          component.value = this.join(newTokens.slice(newPos, newPos + component.count));
-        }
-        newPos += component.count;
-        if (!component.added) {
-          oldPos += component.count;
-        }
-      } else {
-        component.value = this.join(oldTokens.slice(oldPos, oldPos + component.count));
-        oldPos += component.count;
-      }
-    }
-    return components;
-  }
-};
-
-// node_modules/diff/libesm/diff/line.js
-var LineDiff = class extends Diff {
-  constructor() {
-    super(...arguments);
-    this.tokenize = tokenize;
-  }
-  equals(left, right, options) {
-    if (options.ignoreWhitespace) {
-      if (!options.newlineIsToken || !left.includes("\n")) {
-        left = left.trim();
-      }
-      if (!options.newlineIsToken || !right.includes("\n")) {
-        right = right.trim();
-      }
-    } else if (options.ignoreNewlineAtEof && !options.newlineIsToken) {
-      if (left.endsWith("\n")) {
-        left = left.slice(0, -1);
-      }
-      if (right.endsWith("\n")) {
-        right = right.slice(0, -1);
-      }
-    }
-    return super.equals(left, right, options);
-  }
-};
-var lineDiff = new LineDiff();
-function diffLines(oldStr, newStr, options) {
-  return lineDiff.diff(oldStr, newStr, options);
-}
-function tokenize(value, options) {
-  if (options.stripTrailingCr) {
-    value = value.replace(/\r\n/g, "\n");
-  }
-  const retLines = [], linesAndNewlines = value.split(/(\n|\r\n)/);
-  if (!linesAndNewlines[linesAndNewlines.length - 1]) {
-    linesAndNewlines.pop();
-  }
-  for (let i = 0; i < linesAndNewlines.length; i++) {
-    const line = linesAndNewlines[i];
-    if (i % 2 && !options.newlineIsToken) {
-      retLines[retLines.length - 1] += line;
-    } else {
-      retLines.push(line);
-    }
-  }
-  return retLines;
-}
 
 // packages/cli/client/toolOutput.ts
-function normalizeToolDisplayMode(raw, fallback = "normal") {
-  const normalized = asTrimmedLowercaseString(raw);
-  if (normalized === "hide" || normalized === "off" || normalized === "false" || normalized === "0") {
-    return "hide";
-  }
-  if (normalized === "verbose" || normalized === "debug" || normalized === "trace" || normalized === "full") {
-    return "verbose";
-  }
-  if (normalized === "normal" || normalized === "summary" || normalized === "on") {
-    return "normal";
-  }
-  if (normalized === "pro" || normalized === "compact" || normalized === "minimal" || normalized === "short") {
-    return "pro";
-  }
-  return fallback;
-}
-function resolveToolDisplayMode(env = process.env) {
-  const legacyTrace = asTrimmedLowercaseString(env.NOLO_TRACE_TOOLS);
-  if (legacyTrace === "0" || legacyTrace === "false" || legacyTrace === "off") {
-    return "hide";
-  }
-  if (legacyTrace === "verbose" || legacyTrace === "full") {
-    return "verbose";
-  }
-  return normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "normal");
-}
-function shouldEmitToolEvents(mode) {
-  return mode !== "hide";
-}
 function clip(value, max = 72) {
   return clipCompactText(value, max, "\u2026");
 }
-function formatActiveToolLabel(event) {
-  const toolName = event.toolName || "tool";
-  const args = clipPathAware(event.argumentsPreview ?? "");
-  const label = toolLabel(toolName);
-  return args ? `${label} ${args}` : label;
-}
 function formatConservativeActiveToolLabel(event) {
   return toolLabel(event.toolName || "tool");
 }
-function compactResultHint(event) {
-  const gate = readActionGate(event.metadata?.actionGate);
-  if (gate) {
-    const commandPayload = gate.kind === "handoff" ? readCommandActionGatePayload(gate.payload) : null;
-    const command = commandPayload?.displayCommand ?? commandPayload?.command.join(" ") ?? "";
-    const detail = command.trim() ? command : gate.title;
-    return { inline: `${t("toolNeedsAction")}: ${clip(detail, 120)}` };
-  }
-  if (event.metadata?.timedOut) return { inline: t("toolTimedOut") };
-  if (event.toolName === "readFile" && event.metadata) {
-    const range = readReadFileRange(event.metadata);
-    if (range) return { inline: range };
-  }
-  if (event.toolName === "editFile" && event.metadata) {
-    const res = formatEditFileSnippet(event.metadata);
-    if (res) {
-      const stats = [];
-      if (res.addedCount > 0) stats.push(`+${res.addedCount}`);
-      if (res.removedCount > 0) stats.push(`-${res.removedCount}`);
-      const inline = stats.length > 0 ? `(${stats.join(", ")})` : "";
-      return { inline, detail: res.lines };
-    }
-  }
-  if (event.toolName === "writeFile" && event.metadata) {
-    const totalLines = event.metadata.totalLines ?? event.metadata.lines;
-    if (typeof totalLines === "number" && totalLines > 0) {
-      return { inline: `(+${totalLines})` };
-    }
-  }
-  const summary = event.summary;
-  if (!summary) return { inline: "" };
-  const exitMatch = summary.match(/exit=(\d+)/);
-  if (exitMatch && exitMatch[1] !== "0") return { inline: `${t("toolExitCode")} ${exitMatch[1]}` };
-  return { inline: "" };
-}
-function readReadFileRange(metadata) {
-  const startLine = metadata.startLine;
-  const endLine = metadata.endLine;
-  const totalLines = metadata.totalLines;
-  const truncated = metadata.truncated;
-  if (typeof startLine !== "number" || typeof endLine !== "number" || typeof totalLines !== "number") {
-    return void 0;
-  }
-  if (!truncated && startLine === 1 && endLine === totalLines) return void 0;
-  return `${startLine}-${endLine}/${totalLines}`;
-}
-var EDIT_SNIPPET_MAX_LINES = 24;
-var DEFAULT_EDIT_SNIPPET_MAX_WIDTH = 96;
-function resolveEditSnippetMaxWidth(env = process.env, columns) {
-  if (env.NOLO_TEST_DIFF_WIDTH) {
-    const parsed = parseInt(env.NOLO_TEST_DIFF_WIDTH, 10);
-    if (!Number.isNaN(parsed) && parsed > 0) return parsed;
-  }
-  const cols = typeof columns === "number" ? columns : typeof process !== "undefined" && typeof process.stdout?.columns === "number" ? process.stdout.columns : 0;
-  if (cols > 0) {
-    return Math.max(80, Math.min(160, cols - 8));
-  }
-  return DEFAULT_EDIT_SNIPPET_MAX_WIDTH;
-}
-function formatEditFileSnippet(metadata) {
-  const oldSnippet = typeof metadata.oldSnippet === "string" ? metadata.oldSnippet : void 0;
-  const newSnippet = typeof metadata.newSnippet === "string" ? metadata.newSnippet : void 0;
-  if (!oldSnippet && !newSnippet) return void 0;
-  const maxWidth = resolveEditSnippetMaxWidth();
-  if (oldSnippet && !newSnippet) {
-    const lines = snippetLinesWithKind(oldSnippet, "removed", maxWidth);
-    return { lines, addedCount: 0, removedCount: lines.length };
-  }
-  if (newSnippet && !oldSnippet) {
-    const lines = snippetLinesWithKind(newSnippet, "added", maxWidth);
-    return { lines, addedCount: lines.length, removedCount: 0 };
-  }
-  const parts = diffLines(oldSnippet, newSnippet);
-  const all = [];
-  let addedCount = 0;
-  let removedCount = 0;
-  for (const part of parts) {
-    const kind = part.added ? "added" : part.removed ? "removed" : "context";
-    const raw = part.value.split("\n");
-    if (raw.length > 0 && raw[raw.length - 1] === "") raw.pop();
-    for (const line of raw) {
-      if (kind === "added") addedCount++;
-      if (kind === "removed") removedCount++;
-      all.push(buildEditLine(kind, line, maxWidth));
-    }
-  }
-  const changeCount = all.filter((l) => l.kind !== "context").length;
-  if (changeCount === 0) return void 0;
-  return {
-    lines: windowAndTruncate(all, EDIT_SNIPPET_MAX_LINES),
-    addedCount,
-    removedCount
-  };
-}
-function prefixFor(kind) {
-  return kind === "added" ? "+ " : kind === "removed" ? "- " : "  ";
-}
-function buildEditLine(kind, body, maxWidth = resolveEditSnippetMaxWidth()) {
-  return { kind, text: prefixFor(kind) + truncateByDisplayWidth(body, maxWidth) };
-}
-function snippetLinesWithKind(snippet, kind, maxWidth = resolveEditSnippetMaxWidth()) {
-  const lines = snippet.split(/\r?\n/).filter((line) => line.length > 0);
-  return lines.slice(0, EDIT_SNIPPET_MAX_LINES).map((line) => buildEditLine(kind, line, maxWidth));
+function isRunToolName(name) {
+  return name === "execShell" || name === "runCommand" || name === "launchProcess";
 }
-function truncateByDisplayWidth(line, maxWidth) {
-  if (displayWidth(line) <= maxWidth) return line;
-  let width = 0;
-  let kept = "";
-  for (const char of line) {
-    const w = displayWidth(char);
-    if (width + w + 1 > maxWidth) break;
-    kept += char;
-    width += w;
-  }
-  return `${kept}\u2026`;
-}
-function windowAndTruncate(lines, maxLines) {
-  if (lines.length <= maxLines) return lines;
-  const firstChange = lines.findIndex((l) => l.kind !== "context");
-  if (firstChange === -1) return lines.slice(0, maxLines);
-  const half = Math.floor(maxLines / 2);
-  let start = Math.max(0, firstChange - half);
-  if (start + maxLines > lines.length) start = Math.max(0, lines.length - maxLines);
-  const kept = lines.slice(start, start + maxLines);
-  const omitted = lines.length - kept.length;
-  if (omitted > 0) {
-    kept.push({ kind: "context", text: `  \u2026 +${omitted} more lines` });
-  }
-  return kept;
+function isReadToolName(name) {
+  return name === "readFile";
 }
 function isFailedToolResult(event) {
   const exitCode = event.metadata?.exitCode;
@@ -3894,9 +3446,6 @@ function isFailedToolResult(event) {
   if (typeof exitCode === "number" && exitCode !== 0) return true;
   return Boolean(event.metadata?.timedOut);
 }
-function isNeedsActionToolResult(event) {
-  return Boolean(event.metadata?.actionGate);
-}
 function parseUiAskChoiceForCli(event) {
   if (event.toolName !== "ask_user" && !event.metadata?.uiAskChoice) {
     return null;
@@ -3999,36 +3548,45 @@ function formatToolTraceLine(text, colorEnabled, accent = "none") {
   return `${dimCliText(text, true)}
 `;
 }
+var cleanUserText = (value) => stripAnsi2(value).replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
 function renderRunCard(snapshot, opts) {
   const labels = agentRunCardLabels();
   const timing = { startedAt: snapshot.startedAt, finishedAt: snapshot.finishedAt };
-  const name = snapshot.agentName ?? "agent";
-  if (isAgentRunTerminalStatus(snapshot.status)) {
-    return formatFinishedRunCard(name, snapshot.status, {
-      runId: snapshot.runId,
-      toolCallCount: snapshot.toolCallCount,
-      lastToolNames: snapshot.lastToolNames,
-      lastAssistantText: snapshot.lastAssistantText,
-      errorMessage: snapshot.errorMessage,
-      logLines: snapshot.logLines,
-      timing,
-      ...opts?.includeLogTail !== void 0 ? { includeLogTail: opts.includeLogTail } : {},
-      labels
-    });
-  }
-  return formatStatusRunCard(name, snapshot.status, {
+  const safe = opts?.safe === true;
+  const name = safe ? cleanUserText(snapshot.agentName ?? "agent") : snapshot.agentName ?? "agent";
+  const source = safe ? {
+    ...snapshot,
+    agentName: snapshot.agentName ? cleanUserText(snapshot.agentName) : snapshot.agentName,
+    taskPreview: snapshot.taskPreview ? cleanUserText(snapshot.taskPreview) : snapshot.taskPreview,
+    lastAssistantText: snapshot.lastAssistantText ? cleanUserText(snapshot.lastAssistantText) : snapshot.lastAssistantText,
+    lastToolNames: snapshot.lastToolNames?.map(cleanUserText)
+  } : snapshot;
+  const hadError = safe && Boolean(source.errorMessage?.trim());
+  const errorFields = safe ? { errorMessage: void 0, logLines: void 0 } : { errorMessage: source.errorMessage, logLines: source.logLines };
+  const body = isAgentRunTerminalStatus(snapshot.status) ? formatFinishedRunCard(name, snapshot.status, {
+    runId: snapshot.runId,
+    toolCallCount: source.toolCallCount,
+    lastToolNames: source.lastToolNames,
+    lastAssistantText: source.lastAssistantText,
+    ...errorFields,
+    timing,
+    ...opts?.includeLogTail !== void 0 ? { includeLogTail: opts.includeLogTail } : {},
+    labels
+  }) : formatStatusRunCard(name, snapshot.status, {
     runId: snapshot.runId,
-    toolCallCount: snapshot.toolCallCount,
-    lastToolNames: snapshot.lastToolNames,
-    lastAssistantText: snapshot.lastAssistantText,
-    errorMessage: snapshot.errorMessage,
-    logLines: snapshot.logLines,
+    toolCallCount: source.toolCallCount,
+    lastToolNames: source.lastToolNames,
+    lastAssistantText: source.lastAssistantText,
+    ...errorFields,
     timing,
     ...opts?.includeLogTail !== void 0 ? { includeLogTail: opts.includeLogTail } : {},
     labels
   });
+  return hadError ? `${body}
+  error   ${t("runDiagnosticsHidden")}` : body;
 }
-function recoverOrchestrationCard(event, toolName) {
+function recoverOrchestrationCard(event, toolName, opts) {
+  const safe = opts?.safe === true;
   const content = typeof event.content === "string" ? event.content : "";
   const trimmed = content.trim();
   if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return null;
@@ -4059,27 +3617,26 @@ function recoverOrchestrationCard(event, toolName) {
   if (!parsedEvent) return null;
   const { kind, snapshot } = parsedEvent;
   if (kind === "start") {
-    return formatStartRunCard(snapshot.agentName ?? "agent", snapshot.status, {
-      task: snapshot.taskPreview,
+    const name = safe ? cleanUserText(snapshot.agentName ?? "agent") : snapshot.agentName ?? "agent";
+    const task = snapshot.taskPreview ? safe ? cleanUserText(snapshot.taskPreview) : snapshot.taskPreview : snapshot.taskPreview;
+    return formatStartRunCard(name, snapshot.status, {
+      task,
       runId: snapshot.runId,
       labels
     });
   }
   if (kind === "gone") return formatNotFoundRunCard(labels);
   if (kind === "stop") return formatStopRunCard(snapshot.status, labels);
-  return renderRunCard(snapshot);
+  return renderRunCard(snapshot, opts);
 }
-function parseControlAgentRunStatusEvent(event) {
-  const parsed = parseAgentRunEvent(event);
-  return parsed?.kind === "status" ? parsed.snapshot : null;
-}
-function formatOrchestrationCardBlock(event, toolName, colorEnabled) {
+function formatOrchestrationCardBlock(event, toolName, colorEnabled, opts) {
+  const safe = opts?.safe === true;
   const rawLabel = toolLabel(toolName);
   const bakedCard = typeof event.metadata?.displayData === "string" && event.metadata.displayData.trim() ? event.metadata.displayData : "";
-  const rawDataStr = recoverOrchestrationCard(event, toolName) || bakedCard || (typeof event.content === "string" ? event.content : "");
+  const rawDataStr = recoverOrchestrationCard(event, toolName, { safe }) || bakedCard || (typeof event.content === "string" ? event.content : "");
   const failed = event.type === "tool-error" || isFailedToolResult(event) || Boolean(event.metadata?.failed) || /^Error:/i.test(rawDataStr.trim());
   if (failed) {
-    const firstLine = rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed");
+    const firstLine = safe ? t("toolFailed") : rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed");
     const message = clip(firstLine, 96);
     if (!colorEnabled) {
       return `\u2717 ${rawLabel}  ${message}
@@ -4092,11 +3649,12 @@ function formatOrchestrationCardBlock(event, toolName, colorEnabled) {
 `;
   }
   const displayData = rawDataStr.trim();
-  const lines = displayData ? displayData.split("\n").filter((line) => !/^\s*agent\s+agent\s*$/.test(line)) : [];
+  const lines = displayData ? displayData.split("\n") : [];
+  const projected = safe ? sanitizeRunCardForNormal(lines) : lines;
   if (!colorEnabled) {
     let out2 = `\u25CF ${rawLabel}
 `;
-    for (const line of lines) {
+    for (const line of projected) {
       out2 += `  ${line}
 `;
     }
@@ -4106,65 +3664,66 @@ function formatOrchestrationCardBlock(event, toolName, colorEnabled) {
   const labelPart = themeText(rawLabel, "muted", true);
   let out = `${bullet} ${labelPart}
 `;
-  for (const line of lines) {
+  for (const line of projected) {
     out += `  ${themeText(line, "muted", true)}
 `;
   }
   return out;
 }
-function mergeRunSnapshot(previous, next) {
-  return {
-    ...previous,
-    ...next,
-    errorMessage: next.errorMessage ?? previous.errorMessage,
-    logLines: next.logLines ?? previous.logLines,
-    logKey: next.logKey || previous.logKey,
-    toolCallCount: next.toolCallCount ?? previous.toolCallCount,
-    lastToolNames: next.lastToolNames ?? previous.lastToolNames,
-    lastAssistantText: next.lastAssistantText ?? previous.lastAssistantText,
-    startedAt: next.startedAt ?? previous.startedAt,
-    finishedAt: next.finishedAt ?? previous.finishedAt
-  };
-}
-function formatFoldedControlStatusCard(snapshot, colorEnabled) {
-  const body = renderRunCard(snapshot, { includeLogTail: snapshot.includeLogTail });
-  return formatOrchestrationCardBlock(
-    {
-      type: "tool-result",
-      round: 0,
-      toolCallId: `fold-${snapshot.runId}`,
-      toolName: "controlAgentRun",
-      content: "",
-      metadata: { displayData: body }
-    },
-    "controlAgentRun",
-    colorEnabled
-  );
-}
-function formatVerboseToolEvent(event, colorEnabled) {
-  const round = event.round + 1;
-  const detail = event.argumentsPreview ? ` ${event.argumentsPreview}` : "";
-  if (event.type === "tool-call") {
-    return formatToolTraceLine(`[nolo:tool] #${round} -> ${event.toolName}${detail}`, colorEnabled);
-  }
-  if (event.type === "tool-error") {
-    const elapsed2 = typeof event.elapsedMs === "number" ? ` ${event.elapsedMs}ms` : "";
-    return formatToolTraceLine(
-      `[nolo:tool] #${round} !! ${event.toolName}${elapsed2}: ${event.message ?? "failed"}`,
-      colorEnabled,
-      "error"
-    );
-  }
-  const elapsed = typeof event.elapsedMs === "number" ? ` ${event.elapsedMs}ms` : "";
-  if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
-    const block = formatUiAskChoiceBlock(event, colorEnabled);
-    if (block) return `${formatToolTraceLine(`[nolo:tool] #${round} <- ${event.toolName}${elapsed}`, colorEnabled)}${block}`;
+function sanitizeRunCardForNormal(lines) {
+  const out = [];
+  let errorIndent = null;
+  for (const line of lines) {
+    if (/^(log tail:?|日志尾部：?)$/i.test(line.trim())) {
+      if (out.length > 0 && out[out.length - 1].trim() === "") out.pop();
+      break;
+    }
+    if (/^\s*error\b/i.test(line)) {
+      out.push(`  error   ${t("runDiagnosticsHidden")}`);
+      errorIndent = line.length - line.trimStart().length;
+      continue;
+    }
+    if (errorIndent !== null) {
+      if (line.trim() === "") {
+        errorIndent = null;
+        out.push(line);
+        continue;
+      }
+      const indent = line.length - line.trimStart().length;
+      const isLabelRow = /^\s{2}[a-z][a-zA-Z0-9]*\s{2,}/.test(line);
+      if (indent > errorIndent && !isLabelRow) continue;
+      errorIndent = null;
+    }
+    out.push(line);
   }
-  const summary = event.summary ? ` ${event.summary}` : "";
-  return formatToolTraceLine(
-    `[nolo:tool] #${round} <- ${event.toolName}${elapsed}${summary}`,
-    colorEnabled
-  );
+  return out;
+}
+var NORMAL_TOOL_GIST_MAX = 28;
+function gistClip(value, max = NORMAL_TOOL_GIST_MAX) {
+  const oneLine = value.replace(/\s+/g, " ").trim();
+  if (!oneLine) return "";
+  return oneLine.length <= max ? oneLine : `${oneLine.slice(0, max - 1)}\u2026`;
+}
+function commandHeadGist(command) {
+  const trimmed = command.replace(/\s+/g, " ").trim();
+  if (!trimmed || /[|;&<>`$]/.test(trimmed)) return "";
+  const tokens = trimmed.split(" ");
+  if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[0])) return "";
+  if (["cd", "pushd", "popd", "source", "."].includes(tokens[0])) return "";
+  return gistClip(tokens.slice(0, 2).join(" "), 24);
+}
+function pathBasenameGist(path) {
+  const segments = path.split(/[\\/]/).filter((segment) => segment.length > 0);
+  const base = segments.pop();
+  return base ? gistClip(base) : "";
+}
+function normalToolGist(event) {
+  const metadata = event.metadata ?? {};
+  const path = typeof metadata.path === "string" ? metadata.path : "";
+  if (path) return pathBasenameGist(path);
+  const command = typeof metadata.command === "string" ? metadata.command : "";
+  if (command) return commandHeadGist(command);
+  return "";
 }
 function formatNormalToolLine(event, pending, colorEnabled) {
   if (event.type === "tool-call") return "";
@@ -4176,10 +3735,10 @@ function formatNormalToolLine(event, pending, colorEnabled) {
     if (block) return block;
   }
   if (event.type === "tool-result" && (toolName === "listAgents" || toolName === "startAgentRun" || toolName === "controlAgentRun")) {
-    return formatOrchestrationCardBlock(event, toolName, colorEnabled);
+    return formatOrchestrationCardBlock(event, toolName, colorEnabled, { safe: true });
   }
   if (event.type === "tool-result" && toolName === "loadSkill") {
-    return formatLoadSkillBlock(event, colorEnabled) ?? "";
+    return formatLoadSkillBlock(event, colorEnabled, { safe: true }) ?? "";
   }
   const label = toolLabel(toolName);
   if (readActionGate(event.metadata?.actionGate)) {
@@ -4194,150 +3753,8 @@ function formatNormalToolLine(event, pending, colorEnabled) {
   if (isFailedToolResult(event)) {
     return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${t("toolFailed")}`, colorEnabled, "error");
   }
-  return formatToolTraceLine(`\u25B8 ${label}  \u2713`, colorEnabled);
-}
-function isReadToolName(name) {
-  if (!name) return false;
-  return name === "read" || name === "readFile" || name === "read_file" || name === "readWorkspaceFile";
-}
-function isSearchToolName(name) {
-  if (!name) return false;
-  return name === "grep" || name === "codeSearch" || name === "code_search" || name === "globFiles" || name === "glob_files" || name === "glob" || name === "searchWorkspace" || name === "search_workspace" || name === "search_all_spaces" || name === "search";
-}
-function isRunToolName(name) {
-  if (!name) return false;
-  return name === "execShell" || name === "runCommand" || name === "run_command" || name === "launchProcess";
-}
-function isFetchToolName(name) {
-  if (!name) return false;
-  return name === "fetchWebpage" || name === "fetch_webpage";
-}
-function isWebSearchToolName(name) {
-  if (!name) return false;
-  return name === "exa_search" || name === "exaSearch";
-}
-function isRunResultFoldable(event) {
-  return Boolean(event.metadata?.actionGate) === false;
-}
-function formatSearchTreeBlockForCli(items, colorEnabled) {
-  if (items.length === 0) return "";
-  const { count, lines } = formatSearchTreeLines(items);
-  const titleText = toolLabel("codeSearch");
-  if (!colorEnabled) {
-    const headerLine2 = `\u2022 ${titleText} (${count})
-`;
-    const treeLines2 = lines.map((l) => `  ${l.connector}${l.queryText}`).join("\n");
-    return `${headerLine2}${treeLines2}
-`;
-  }
-  const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText(titleText, "bold", true);
-  const countText = themeText(`(${count})`, "muted", true);
-  const headerLine = `${bullet} ${title} ${countText}
-`;
-  const treeLines = lines.map((l) => {
-    const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const queryText = themeText(l.queryText, "muted", true);
-    return `${connector}${queryText}`;
-  }).join("\n");
-  return `${headerLine}${treeLines}
-`;
-}
-function formatReadTreeBlockForCli(items, colorEnabled) {
-  if (items.length === 0) return "";
-  const { count, lines } = formatReadTreeLines(items);
-  const titleText = toolLabel("readFile");
-  if (!colorEnabled) {
-    const headerLine2 = `\u2022 ${titleText} (${count})
-`;
-    const treeLines2 = lines.map((l) => `  ${l.connector}${l.pathWithRange}`).join("\n");
-    return `${headerLine2}${treeLines2}
-`;
-  }
-  const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText(titleText, "bold", true);
-  const countText = themeText(`(${count})`, "muted", true);
-  const headerLine = `${bullet} ${title} ${countText}
-`;
-  const treeLines = lines.map((l) => {
-    const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const pathText = themeText(l.pathWithRange, "muted", true);
-    return `${connector}${pathText}`;
-  }).join("\n");
-  return `${headerLine}${treeLines}
-`;
-}
-function formatRunTreeBlockForCli(items, colorEnabled) {
-  if (items.length === 0) return "";
-  const { count, lines } = formatRunTreeLines(items);
-  const titleText = toolLabel("execShell");
-  if (!colorEnabled) {
-    const headerLine2 = `\u2022 ${titleText} (${count})
-`;
-    const treeLines2 = lines.map((l) => `  ${l.connector}${l.commandText}`).join("\n");
-    return `${headerLine2}${treeLines2}
-`;
-  }
-  const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText(titleText, "bold", true);
-  const countText = themeText(`(${count})`, "muted", true);
-  const headerLine = `${bullet} ${title} ${countText}
-`;
-  const treeLines = lines.map((l) => {
-    const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const commandText = themeText(l.commandText, "muted", true);
-    return `${connector}${commandText}`;
-  }).join("\n");
-  return `${headerLine}${treeLines}
-`;
-}
-function formatWebSearchTreeBlockForCli(items, colorEnabled) {
-  if (items.length === 0) return "";
-  const { count, lines } = formatSearchTreeLines(items);
-  const titleText = toolLabel("exa_search");
-  if (!colorEnabled) {
-    const headerLine2 = `\u2022 ${titleText} (${count})
-`;
-    const treeLines2 = lines.map((l) => `  ${l.connector}${l.queryText}`).join("\n");
-    return `${headerLine2}${treeLines2}
-`;
-  }
-  const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText(titleText, "bold", true);
-  const countText = themeText(`(${count})`, "muted", true);
-  const headerLine = `${bullet} ${title} ${countText}
-`;
-  const treeLines = lines.map((l) => {
-    const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const queryText = themeText(l.queryText, "muted", true);
-    return `${connector}${queryText}`;
-  }).join("\n");
-  return `${headerLine}${treeLines}
-`;
-}
-function formatFetchTreeBlockForCli(items, colorEnabled) {
-  if (items.length === 0) return "";
-  const { count, lines } = formatFetchTreeLines(items);
-  const titleText = toolLabel("fetchWebpage");
-  if (!colorEnabled) {
-    const headerLine2 = `\u2022 ${titleText} (${count})
-`;
-    const treeLines2 = lines.map((l) => `  ${l.connector}${l.urlText}`).join("\n");
-    return `${headerLine2}${treeLines2}
-`;
-  }
-  const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText(titleText, "bold", true);
-  const countText = themeText(`(${count})`, "muted", true);
-  const headerLine = `${bullet} ${title} ${countText}
-`;
-  const treeLines = lines.map((l) => {
-    const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const urlText = themeText(l.urlText, "muted", true);
-    return `${connector}${urlText}`;
-  }).join("\n");
-  return `${headerLine}${treeLines}
-`;
+  const gist = normalToolGist(event);
+  return formatToolTraceLine(gist ? `\u25B8 ${label} \xB7 ${gist}  \u2713` : `\u25B8 ${label}  \u2713`, colorEnabled);
 }
 function resolveLoadSkillName(event) {
   const metaName = typeof event.metadata?.name === "string" ? event.metadata.name : void 0;
@@ -4382,14 +3799,14 @@ function formatTodoListForCli(event, colorEnabled) {
   const text = [`\u2611 Todo (${todos.length})`, ...lines].join("\n") + "\n";
   return colorEnabled ? themeText(text, "chrome") : text;
 }
-function formatLoadSkillBlock(event, colorEnabled) {
+function formatLoadSkillBlock(event, colorEnabled, opts) {
   if (event.type !== "tool-result" || event.toolName !== "loadSkill") return null;
   const skillName = resolveLoadSkillName(event);
   const content = typeof event.content === "string" ? event.content : "";
   const failed = /^Skill\s+"[^"]*"\s+not found/.test(content) || isFailedToolResult(event);
   const labelText = t("usedSkillLabel");
   if (failed) {
-    const message = clip(content.split("\n")[0] || t("toolFailed"), 96);
+    const message = opts?.safe === true ? t("toolFailed") : clip(content.split("\n")[0] || t("toolFailed"), 96);
     return formatToolTraceLine(`\u25B8 ${labelText} (${skillName})  \u2717 ${message}`, colorEnabled, "error");
   }
   if (!colorEnabled) {
@@ -4402,326 +3819,63 @@ function formatLoadSkillBlock(event, colorEnabled) {
   return `${star} ${labelPart}: ${namePart}
 `;
 }
-function formatCompactToolLine(event, pending, colorEnabled) {
-  const toolName = event.toolName || pending?.toolName || "tool";
-  const todoBlock = formatTodoListForCli(event, colorEnabled);
-  if (todoBlock) return todoBlock;
-  if (isReadToolName(toolName) && event.type === "tool-result") {
-    const rawPath = (typeof event.metadata?.path === "string" ? event.metadata.path : void 0) || (typeof event.metadata?.filePath === "string" ? event.metadata.filePath : void 0) || event.argumentsPreview || pending?.argumentsPreview || "";
-    return formatReadTreeBlockForCli([{ path: rawPath, metadata: event.metadata }], colorEnabled);
-  }
-  if (isSearchToolName(toolName) && event.type === "tool-result") {
-    const rawQuery = (typeof event.metadata?.query === "string" ? event.metadata.query : void 0) || (typeof event.metadata?.pattern === "string" ? event.metadata.pattern : void 0) || event.argumentsPreview || pending?.argumentsPreview || "";
-    const rawPath = typeof event.metadata?.path === "string" ? event.metadata.path : void 0;
-    return formatSearchTreeBlockForCli([{ query: rawQuery, path: rawPath }], colorEnabled);
-  }
-  if (isFetchToolName(toolName) && event.type === "tool-result") {
-    const rawUrl = (typeof event.metadata?.url === "string" ? event.metadata.url : void 0) || event.argumentsPreview || pending?.argumentsPreview || "";
-    return formatFetchTreeBlockForCli([{ url: rawUrl }], colorEnabled);
-  }
-  if (isRunToolName(toolName) && event.type === "tool-result" && isRunResultFoldable(event)) {
-    const rawCommand = (typeof event.metadata?.command === "string" ? event.metadata.command : void 0) || event.argumentsPreview || pending?.argumentsPreview || "";
-    const exitCode = typeof event.metadata?.exitCode === "number" ? event.metadata.exitCode : void 0;
-    const timedOut = Boolean(event.metadata?.timedOut);
-    return formatRunTreeBlockForCli([{ command: rawCommand, exitCode, timedOut }], colorEnabled);
-  }
-  const rawArgs = clipPathAware(event.argumentsPreview || pending?.argumentsPreview || "", 72);
-  const rawLabel = toolLabel(toolName);
-  const label = rawArgs ? `${rawLabel} ${rawArgs}` : rawLabel;
-  if (event.type === "tool-error") {
-    const message = clip(event.message ?? t("toolFailed"), 96);
-    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${message}`, colorEnabled, "error");
-  }
-  const loadSkillBlock = formatLoadSkillBlock(event, colorEnabled);
-  if (loadSkillBlock) return loadSkillBlock;
-  if (event.type === "tool-result" && (toolName === "listAgents" || toolName === "startAgentRun" || toolName === "controlAgentRun")) {
-    return formatOrchestrationCardBlock(event, toolName, colorEnabled);
-  }
-  if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
-    const block = formatUiAskChoiceBlock(event, colorEnabled);
-    if (block) return block;
-  }
-  const hint = compactResultHint(event);
-  const suffix = hint.inline ? ` ${hint.inline}` : "";
-  const failed = isFailedToolResult(event);
-  const marker = failed ? "\u2717" : isNeedsActionToolResult(event) ? "!" : "\u2713";
-  let mainLine;
-  if (!colorEnabled) {
-    mainLine = `\u25B8 ${label}  ${marker}${suffix}
-`;
-  } else {
-    const chromePointer = themeText("\u25B8", "chrome", true);
-    const mutedLabel = themeText(rawLabel, "muted", true);
-    const argsPart = rawArgs ? ` ${dimCliText(rawArgs, true)}` : "";
-    const statusToken = failed ? themeText("\u2717", "danger", true) : isNeedsActionToolResult(event) ? themeText("!", "warning", true) : themeText("\u2713", "success", true);
-    const suffixPart = hint.inline ? ` ${dimCliText(hint.inline, true)}` : "";
-    mainLine = `${chromePointer} ${mutedLabel}${argsPart}  ${statusToken}${suffixPart}
-`;
-  }
-  if (!hint.detail?.length) return mainLine;
-  const filePath = typeof event.metadata?.path === "string" ? event.metadata.path : event.argumentsPreview;
-  return `${mainLine}${formatEditDetailBlock(hint.detail, colorEnabled, filePath)}`;
-}
-function formatEditDetailBlock(lines, colorEnabled, filePath, env = process.env) {
-  if (!colorEnabled) {
-    return lines.map((line) => `  ${line.text}
-`).join("");
-  }
-  const isTruecolor = supportsTruecolor(env);
-  const lang = isTruecolor ? detectCodeLangFromPath(filePath) : "unknown";
-  const brightness = resolveTuiBrightness(env);
-  const padTo = Math.max(...lines.map((line) => displayWidth(line.text))) + 1;
-  return lines.map((line) => `  ${renderDiffLine({
-    kind: line.kind,
-    text: line.text,
-    highlightedText: shouldHighlightEditLine(line, lang, isTruecolor) ? buildHighlightedEditLine(line, lang, brightness, env) : void 0,
-    padTo,
-    colorEnabled: true,
-    env
-  })}
-`).join("");
-}
-function shouldHighlightEditLine(line, lang, isTruecolor) {
-  if (!isTruecolor || lang === "unknown") return false;
-  if (line.text.startsWith("  \u2026") || line.text.startsWith("\u2026")) return false;
-  return line.text.length >= 2;
-}
-function buildHighlightedEditLine(line, lang, brightness, env) {
-  const prefix = line.text.slice(0, 2);
-  const body = line.text.slice(2);
-  const prefixToken = line.kind === "added" ? "success" : line.kind === "removed" ? "danger" : "chrome";
-  const coloredPrefix = themeText(prefix, prefixToken, true, env);
-  const highlightedBody = highlightCodeLine(body, lang, brightness);
-  return `${coloredPrefix}${highlightedBody}`;
-}
-function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled(), opts = {}) {
-  const suppressRunProgressCards = opts.suppressRunProgressCards === true;
+var TUI_TREE_MARKER = "
TUI_TREE\n";
+var TUI_TREE_END = "";
+function createToolEventFormatter(colorEnabled = resolveCliColorEnabled(), opts = {}) {
   const pending = /* @__PURE__ */ new Map();
-  let readBuffer = [];
-  let searchBuffer = [];
-  let runBuffer = [];
-  let fetchBuffer = [];
-  let webSearchBuffer = [];
-  let statusFold = null;
-  const lastEmittedLogByRunId = /* @__PURE__ */ new Map();
-  const lastPrintedCardByRunId = /* @__PURE__ */ new Map();
-  const cardSubstance = (snapshot) => JSON.stringify([
-    snapshot.status,
-    snapshot.toolCallCount ?? -1,
-    snapshot.lastToolNames ?? [],
-    snapshot.lastAssistantText ?? "",
-    snapshot.errorMessage ?? "",
-    snapshot.logKey
-  ]);
-  const flushStatusFold = () => {
-    if (!statusFold) return "";
-    const fold = statusFold;
-    statusFold = null;
-    const substance = cardSubstance(fold);
-    if (lastPrintedCardByRunId.get(fold.runId) === substance) return "";
-    const prevLog = lastEmittedLogByRunId.get(fold.runId);
-    const changed = Boolean(fold.logKey) && fold.logKey !== prevLog;
-    if (suppressRunProgressCards) {
-      const terminal = isAgentRunTerminalStatus(fold.status);
-      if (!terminal && !fold.errorMessage && !changed) {
-        lastPrintedCardByRunId.set(fold.runId, substance);
-        return "";
-      }
-    }
-    lastPrintedCardByRunId.set(fold.runId, substance);
-    if (changed && runShowsLogTail(fold.status)) {
-      lastEmittedLogByRunId.set(fold.runId, fold.logKey);
-    }
-    return formatFoldedControlStatusCard({ ...fold, includeLogTail: changed }, colorEnabled);
-  };
-  const flushToolBuffers = () => {
-    let out = "";
-    if (readBuffer.length > 0) {
-      const items = readBuffer.map((evt) => {
-        const call = pending.get(evt.toolCallId);
-        const rawPath = (typeof evt.metadata?.path === "string" ? evt.metadata.path : void 0) || (typeof evt.metadata?.filePath === "string" ? evt.metadata.filePath : void 0) || evt.argumentsPreview || call?.argumentsPreview || "";
-        return { path: rawPath, metadata: evt.metadata };
-      });
-      for (const evt of readBuffer) pending.delete(evt.toolCallId);
-      readBuffer = [];
-      out += formatReadTreeBlockForCli(items, colorEnabled);
-    }
-    if (searchBuffer.length > 0) {
-      const items = searchBuffer.map((evt) => {
-        const call = pending.get(evt.toolCallId);
-        const rawQuery = (typeof evt.metadata?.query === "string" ? evt.metadata.query : void 0) || (typeof evt.metadata?.pattern === "string" ? evt.metadata.pattern : void 0) || evt.argumentsPreview || call?.argumentsPreview || "";
-        const rawPath = typeof evt.metadata?.path === "string" ? evt.metadata.path : void 0;
-        return { query: rawQuery, path: rawPath };
-      });
-      for (const evt of searchBuffer) pending.delete(evt.toolCallId);
-      searchBuffer = [];
-      out += formatSearchTreeBlockForCli(items, colorEnabled);
-    }
-    if (runBuffer.length > 0) {
-      const items = runBuffer.map((evt) => {
-        const call = pending.get(evt.toolCallId);
-        const rawCommand = (typeof evt.metadata?.command === "string" ? evt.metadata.command : void 0) || evt.argumentsPreview || call?.argumentsPreview || "";
-        const exitCode = typeof evt.metadata?.exitCode === "number" ? evt.metadata.exitCode : void 0;
-        const timedOut = Boolean(evt.metadata?.timedOut);
-        return { command: rawCommand, exitCode, timedOut };
-      });
-      for (const evt of runBuffer) pending.delete(evt.toolCallId);
-      runBuffer = [];
-      out += formatRunTreeBlockForCli(items, colorEnabled);
-    }
-    if (fetchBuffer.length > 0) {
-      const items = fetchBuffer.map((evt) => {
-        const call = pending.get(evt.toolCallId);
-        const rawUrl = (typeof evt.metadata?.url === "string" ? evt.metadata.url : void 0) || evt.argumentsPreview || call?.argumentsPreview || "";
-        return { url: rawUrl };
-      });
-      for (const evt of fetchBuffer) pending.delete(evt.toolCallId);
-      fetchBuffer = [];
-      out += formatFetchTreeBlockForCli(items, colorEnabled);
-    }
-    if (webSearchBuffer.length > 0) {
-      const items = webSearchBuffer.map((evt) => {
-        const call = pending.get(evt.toolCallId);
-        const rawQuery = (typeof evt.metadata?.query === "string" ? evt.metadata.query : void 0) || (typeof evt.metadata?.pattern === "string" ? evt.metadata.pattern : void 0) || evt.argumentsPreview || call?.argumentsPreview || "";
-        return { query: rawQuery };
-      });
-      for (const evt of webSearchBuffer) pending.delete(evt.toolCallId);
-      webSearchBuffer = [];
-      out += formatWebSearchTreeBlockForCli(items, colorEnabled);
-    }
-    return out;
-  };
-  const flushBuffers = () => `${flushStatusFold()}${flushToolBuffers()}`;
-  const bufferToolResult = (buffer, event) => {
-    const flushed = flushStatusFold();
-    buffer.push(event);
-    return flushed;
+  let tree = null;
+  const treeKind = (name) => isRunToolName(name) ? "Run" : isReadToolName(name) ? "Read" : name === "exa_search" ? "Search" : name === "fetchWebpage" ? "Fetch" : null;
+  const treeLine = (kind, items) => {
+    const label = kind === "Run" ? toolLabel("execShell") : kind === "Read" ? toolLabel("readFile") : kind === "Fetch" ? toolLabel("fetchWebpage") : toolLabel("exa_search");
+    return `${TUI_TREE_MARKER}${label} (${items.length})
+${items.map((item, i) => `${i === items.length - 1 ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 "}${item}  \u2713`).join("\n")}${TUI_TREE_END}
+`;
   };
-  const formatter = (event) => {
-    if (mode === "hide") return "";
-    if (mode === "verbose") return formatVerboseToolEvent(event, colorEnabled);
-    if (mode === "normal") {
-      if (event.type === "tool-call") {
-        pending.set(event.toolCallId, {
-          toolName: event.toolName,
-          argumentsPreview: event.argumentsPreview
-        });
-        return "";
-      }
-      const call2 = pending.get(event.toolCallId);
-      pending.delete(event.toolCallId);
-      return formatNormalToolLine(event, call2, colorEnabled);
-    }
-    if (event.toolName === "controlAgentRun") {
-      if (event.type === "tool-call") {
-        pending.set(event.toolCallId, {
-          toolName: event.toolName,
-          argumentsPreview: event.argumentsPreview
-        });
-        return "";
-      }
-      if (event.type === "tool-result") {
-        const snapshot = parseControlAgentRunStatusEvent(event);
-        if (snapshot) {
-          let out = flushToolBuffers();
-          const open = statusFold;
-          const sameRun = open?.runId === snapshot.runId;
-          if (open && (!sameRun || open.status !== snapshot.status)) {
-            out += flushStatusFold();
-          }
-          statusFold = open && sameRun ? mergeRunSnapshot(open, snapshot) : snapshot;
-          pending.delete(event.toolCallId);
-          if (isAgentRunTerminalStatus(snapshot.status)) {
-            out += flushBuffers();
-          }
-          return out;
-        }
-        const flushed2 = flushBuffers();
-        const call2 = pending.get(event.toolCallId);
-        pending.delete(event.toolCallId);
-        return `${flushed2}${formatCompactToolLine(event, call2, colorEnabled)}`;
-      }
-    }
-    if (isReadToolName(event.toolName)) {
-      if (event.type === "tool-call") {
-        pending.set(event.toolCallId, {
-          toolName: event.toolName,
-          argumentsPreview: event.argumentsPreview
-        });
-        return "";
-      }
-      if (event.type === "tool-result") {
-        return bufferToolResult(readBuffer, event);
-      }
-    }
-    if (isSearchToolName(event.toolName)) {
-      if (event.type === "tool-call") {
-        pending.set(event.toolCallId, {
-          toolName: event.toolName,
-          argumentsPreview: event.argumentsPreview
-        });
-        return "";
-      }
-      if (event.type === "tool-result") {
-        return bufferToolResult(searchBuffer, event);
-      }
-    }
-    if (isRunToolName(event.toolName)) {
-      if (event.type === "tool-result" && !isRunResultFoldable(event)) {
-        const flushed2 = flushBuffers();
-        const call2 = pending.get(event.toolCallId);
-        pending.delete(event.toolCallId);
-        return `${flushed2}${formatCompactToolLine(event, call2, colorEnabled)}`;
-      }
-      if (event.type === "tool-call") {
-        pending.set(event.toolCallId, {
-          toolName: event.toolName,
-          argumentsPreview: event.argumentsPreview
-        });
-        return "";
-      }
-      if (event.type === "tool-result") {
-        return bufferToolResult(runBuffer, event);
-      }
-    }
-    if (isFetchToolName(event.toolName)) {
-      if (event.type === "tool-call") {
-        pending.set(event.toolCallId, {
-          toolName: event.toolName,
-          argumentsPreview: event.argumentsPreview
-        });
-        return "";
-      }
-      if (event.type === "tool-result") {
-        return bufferToolResult(fetchBuffer, event);
-      }
+  const formatTreeEvent = (event, call) => {
+    if (!opts.tuiTrees || event.type !== "tool-result") return null;
+    if (isFailedToolResult(event) || event.metadata?.failed || event.metadata?.timedOut || readActionGate(event.metadata?.actionGate)) {
+      tree = null;
+      return null;
     }
-    if (isWebSearchToolName(event.toolName)) {
-      if (event.type === "tool-call") {
-        pending.set(event.toolCallId, {
-          toolName: event.toolName,
-          argumentsPreview: event.argumentsPreview
-        });
-        return "";
-      }
-      if (event.type === "tool-result") {
-        return bufferToolResult(webSearchBuffer, event);
-      }
+    const name = event.toolName || call?.toolName || "tool";
+    const kind = treeKind(name);
+    if (!kind) {
+      tree = null;
+      return null;
     }
-    const flushed = flushBuffers();
+    let item = "";
+    const m = event.metadata ?? {};
+    if (kind === "Run") {
+      const command = typeof m.command === "string" ? m.command : "";
+      item = command ? formatRunItemCommand(command, typeof m.exitCode === "number" ? m.exitCode : void 0, Boolean(m.timedOut)) : "command";
+    }
+    if (kind === "Read") item = formatReadItemPath(typeof m.path === "string" ? m.path : typeof m.filePath === "string" ? m.filePath : "file", m);
+    if (kind === "Search") item = formatSearchItemQuery(typeof m.query === "string" ? m.query : typeof m.pattern === "string" ? m.pattern : "search", typeof m.path === "string" ? m.path : void 0);
+    if (kind === "Fetch") item = formatFetchItemUrl(typeof m.url === "string" ? m.url : "webpage");
+    if (!item) item = toolLabel(name);
+    if (tree?.kind !== kind) tree = { kind, items: [] };
+    tree.items.push(item);
+    if (tree.items.length < 2) return formatNormalToolLine(event, call, colorEnabled);
+    return treeLine(kind, tree.items);
+  };
+  const format = (event) => {
     if (event.type === "tool-call") {
       pending.set(event.toolCallId, {
         toolName: event.toolName,
         argumentsPreview: event.argumentsPreview
       });
-      return flushed;
+      return "";
     }
     const call = pending.get(event.toolCallId);
     pending.delete(event.toolCallId);
-    return `${flushed}${formatCompactToolLine(event, call, colorEnabled)}`;
+    const treeOutput = formatTreeEvent(event, call);
+    if (treeOutput !== null) return treeOutput;
+    return formatNormalToolLine(event, call, colorEnabled);
+  };
+  format.reset = () => {
+    tree = null;
   };
-  formatter.flush = flushBuffers;
-  return formatter;
+  return format;
 }
 function createSseToolEventAdapter(onEvent) {
   let round = 0;
@@ -4882,7 +4036,7 @@ ${this.text}
       0,
       Math.floor((Date.now() - this.startTime) / 1e3)
     );
-    const thinkingPart = this.thinkingHint ? `: ${truncateThinkingHint(this.thinkingHint, 60)}` : "";
+    const thinkingPart = this.thinkingHint ? dimCliText(`: ${truncateThinkingHint(this.thinkingHint, 60)}`) : "";
     return `${themeColorSequence("accent")}${frame}\x1B[39m ${this.text}${thinkingPart} (${formatElapsed(elapsedSeconds)})`;
   }
 };
@@ -4939,10 +4093,8 @@ function createCliTurnOutput(params) {
   const { options } = params;
   const workingLabel = params.workingLabel ?? `${options.agentName} -> working`;
   const spinner = params.spinner ?? new Spinner(options.output, workingLabel, Boolean(options.activityReporter));
-  const toolDisplayMode = resolveToolDisplayMode(options.env);
-  const traceLocalTools = shouldEmitToolEvents(toolDisplayMode);
-  const formatToolEvent = createToolEventFormatter(toolDisplayMode, void 0, {
-    suppressRunProgressCards: typeof options.onAgentRunStatus === "function"
+  const formatToolEvent = createToolEventFormatter(void 0, {
+    tuiTrees: options.output.tuiTrees === true
   });
   const eventMode = resolveAgentEventMode(options);
   const showThinking = options.showThinking !== false;
@@ -4950,12 +4102,27 @@ function createCliTurnOutput(params) {
   let everStreamedAnyText = false;
   let printedAssistantLabel = false;
   let thinkState = createThinkParserState();
+  let thinkingFirstAt = null;
+  let thinkingLastAt = 0;
+  const markThinkingActivity = () => {
+    const now = Date.now();
+    if (thinkingFirstAt === null) thinkingFirstAt = now;
+    thinkingLastAt = now;
+  };
+  const writeThinkingTrace = () => {
+    if (thinkingFirstAt === null) return;
+    const seconds = Math.max(0, Math.round((thinkingLastAt - thinkingFirstAt) / 1e3));
+    thinkingFirstAt = null;
+    if (seconds < 1) return;
+    options.output.write(`${dimCliText(t("thinkingTraceLine", formatElapsed(seconds)))}
+`);
+  };
   let compactionEvent = null;
   const assistantLabelManaged = options.output.assistantLabelManaged === true;
   const writeToolOutput = (chunk) => {
     if (!chunk) return;
     if (typeof options.output.writeToolBlock === "function") {
-      options.output.writeToolBlock(chunk);
+      if (!options.output.writeToolBlock(chunk)) formatToolEvent.reset?.();
     } else {
       options.output.write(chunk);
     }
@@ -4965,13 +4132,16 @@ function createCliTurnOutput(params) {
   });
   const writeVisibleAssistantChunk = (chunk) => {
     if (!chunk) return;
+    formatToolEvent.reset?.();
     const parsed = processThinkChunk(chunk, thinkState);
     thinkState = parsed.state;
     if (!parsed.content && !parsed.reasoning) return;
     if (showThinking && parsed.reasoning) {
+      markThinkingActivity();
       spinner.setThinkingHint(parsed.reasoning);
     }
     if (!parsed.content) return;
+    writeThinkingTrace();
     spinner.stop();
     options.activityReporter?.(null);
     if (!printedAssistantLabel) {
@@ -4986,7 +4156,6 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
     renderWriter.push(parsed.content);
   };
   const handleToolEvent = (event) => {
-    if (!traceLocalTools) return;
     const chunk = eventMode === "jsonl" ? formatToolJsonEvent(event) : formatToolEvent(event);
     if (eventMode === "jsonl") {
       options.output.write(chunk);
@@ -5004,8 +4173,8 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
     if (chunk) {
       writeToolOutput(chunk);
     }
-    if ((toolDisplayMode === "compact" || toolDisplayMode === "pro" || toolDisplayMode === "normal") && event.type === "tool-call") {
-      const activeLabel = toolDisplayMode === "normal" ? formatConservativeActiveToolLabel(event) : formatActiveToolLabel(event);
+    if (event.type === "tool-call") {
+      const activeLabel = formatConservativeActiveToolLabel(event);
       spinner.show(activeLabel);
       options.activityReporter?.(activeLabel);
     }
@@ -5018,20 +4187,15 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
   };
   return {
     spinner,
-    toolDisplayMode,
-    traceLocalTools,
     eventMode,
     pushText(chunk) {
-      if (eventMode !== "jsonl" && formatToolEvent.flush) {
-        const pendingToolOutput = formatToolEvent.flush();
-        if (pendingToolOutput) {
-          writeToolOutput(pendingToolOutput);
-        }
-      }
       writeVisibleAssistantChunk(chunk);
     },
     pushThinking(chunk) {
-      if (showThinking) spinner.setThinkingHint(chunk);
+      if (showThinking) {
+        markThinkingActivity();
+        spinner.setThinkingHint(chunk);
+      }
     },
     handleToolEvent,
     /** 记录一条 compaction 观测事件（TUI 在 turn 结束时渲染一行 dim 摘要）。 */
@@ -5046,15 +4210,12 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
     finish(fallbackContent) {
       spinner.stop();
       options.activityReporter?.(null);
+      writeThinkingTrace();
       const flushedThink = flushThinkParser(thinkState);
       thinkState = flushedThink.state;
       if (flushedThink.content) {
         writeVisibleAssistantChunk(flushedThink.content);
       }
-      const pendingToolOutput = formatToolEvent.flush ? formatToolEvent.flush() : "";
-      if (pendingToolOutput) {
-        writeToolOutput(pendingToolOutput);
-      }
       if (streamedAssistantText) {
         renderWriter.flush();
         options.output.write("\n");
@@ -5266,6 +4427,10 @@ ${describeClientVersionTooOldFailure(message, error)}`);
 function resolveAuthToken2(env) {
   return resolvePlatformAuthToken(env);
 }
+function resolveFileWriteGateEnabled(env) {
+  const raw = (env.NOLO_CLI_WRITE_GATE ?? "").trim().toLowerCase();
+  return raw !== "off" && raw !== "0" && raw !== "false";
+}
 function isMachineBoundLocalhostCustomProvider(agentConfig) {
   const machineId = agentConfig?.runtimeBinding && typeof agentConfig.runtimeBinding === "object" ? String(agentConfig.runtimeBinding.machineId ?? "").trim() : "";
   const providerUrl = asTrimmedString(agentConfig?.customProviderUrl);
@@ -5357,7 +4522,16 @@ function isKnownServerPlatformAgent(options) {
 // packages/core/collapsedPaste.ts
 var COLLAPSE_PASTE_MIN_LINES = 8;
 var COLLAPSE_PASTE_MIN_CHARS = 400;
-var COLLAPSED_PASTE_PLACEHOLDER_RE = /\[paste #(\d+) · (\d+) lines\]/g;
+var COLLAPSED_PASTE_PLACEHOLDER_RE = (
+  // 兼容两种格式：旧 `[paste #N · L lines]` 与新 `[paste #N · L lines · preview]`。
+  // preview 段用负向先行断言排除模型引用（`…; full content available via
+  // readPastedText(pasteId=N)`）：legacy 无 scope 的模型引用与新 chip 形状重叠，
+  // 若被当作 chip 匹配，跨会话残留的引用会被错误展开/替换（破坏 durable
+  // fallback 语义）。preview 与模型引用尾段在生成时都不会包含该标记原文之外
+  // 的歧义，此处按"完整模型引用尾段"精确排除。
+  /\[paste #(\d+) · (\d+) lines(?: · (?![^\]]*; full content available via readPastedText\(pasteId=\d+\))([^\]]*))?\]/g
+);
+var COLLAPSED_PASTE_PREVIEW_MAX_CHARS = 24;
 var COLLAPSED_PASTE_MODEL_REFERENCE_RE = /\[paste #(\d+)(?: scope:([a-zA-Z0-9_-]+))? · [^\]]+; full content available via readPastedText\(pasteId=(\d+)\)\]/g;
 function countTextLines(text) {
   if (text.length === 0) return 0;
@@ -5397,9 +4571,22 @@ function estimatePasteBytes(text) {
   }
   return bytes;
 }
+function buildCollapsedPastePreview(text) {
+  const firstNonEmptyLine = text.split(/\r\n|\r|\n/).find((line) => line.trim().length > 0) ?? "";
+  let preview = compactWhitespace(firstNonEmptyLine);
+  preview = preview.replace(new RegExp("\\]|\\p{C}", "gu"), "").trim();
+  if (preview.length === 0) return "";
+  const chars = Array.from(preview);
+  if (chars.length > COLLAPSED_PASTE_PREVIEW_MAX_CHARS) {
+    return chars.slice(0, COLLAPSED_PASTE_PREVIEW_MAX_CHARS).join("") + "\u2026";
+  }
+  return preview;
+}
 function formatCollapsedPastePlaceholder(id, text) {
   const lines = countTextLines(text);
-  return `[paste #${id} \xB7 ${lines} lines]`;
+  const preview = buildCollapsedPastePreview(text);
+  if (!preview) return `[paste #${id} \xB7 ${lines} lines]`;
+  return `[paste #${id} \xB7 ${lines} lines \xB7 ${preview}]`;
 }
 function generatePasteScope() {
   if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
@@ -5512,9 +4699,65 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-SIQYQGSK.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-SBG7BDFQ.js");
   return runLocalAgentTurn;
 }
+var stripDebugNoise = (s) => s.replace(/\s*raw="[\s\S]*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();
+function extractEmbeddedErrorMessage(message) {
+  const match = /"message"\s*:\s*"((?:[^"\\]|\\.)*)"/.exec(message);
+  if (!match) return void 0;
+  try {
+    const decoded = JSON.parse(`"${match[1]}"`);
+    if (typeof decoded !== "string" || !decoded.trim()) return void 0;
+    const cleaned = decoded.replace(/[\u0000-\u001f\u007f]/g, "");
+    return cleaned.trim() ? cleaned : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function parseEmbeddedBalanceDetails(message) {
+  const jsonStart = message.indexOf('{"error"');
+  if (jsonStart < 0) return void 0;
+  try {
+    let depth = 0;
+    let inString = false;
+    let escaped = false;
+    let jsonEnd = -1;
+    for (let i = jsonStart; i < message.length; i += 1) {
+      const char = message[i];
+      if (inString) {
+        if (escaped) escaped = false;
+        else if (char === "\\") escaped = true;
+        else if (char === '"') inString = false;
+      } else if (char === '"') {
+        inString = true;
+      } else if (char === "{") {
+        depth += 1;
+      } else if (char === "}" && --depth === 0) {
+        jsonEnd = i + 1;
+        break;
+      }
+    }
+    if (jsonEnd < 0) return void 0;
+    const parsed = JSON.parse(message.slice(jsonStart, jsonEnd));
+    if (!parsed || typeof parsed !== "object") return void 0;
+    const error = parsed.error;
+    if (!error || typeof error !== "object") return void 0;
+    const details = error.details;
+    if (!details || typeof details !== "object") return void 0;
+    const requiredBalance = details.requiredBalance;
+    const currentBalance = details.currentBalance;
+    if (typeof requiredBalance !== "number" || typeof currentBalance !== "number") {
+      return void 0;
+    }
+    if (!Number.isFinite(requiredBalance) || !Number.isFinite(currentBalance) || requiredBalance <= 0) {
+      return void 0;
+    }
+    return { required: String(requiredBalance), current: String(currentBalance) };
+  } catch {
+    return void 0;
+  }
+}
 async function resolveCurrentMachineId(options) {
   return options.currentMachineIdResolver ? options.currentMachineIdResolver(options.env) : detectCurrentMachineId(options.env);
 }
@@ -5745,7 +4988,6 @@ function describeLocalRunFailure(message, rawError) {
     busyDetail = rawError.detail.trim();
   }
   if (/PLATFORM_LLM_BUSY|服务器紧张/.test(message)) {
-    const stripDebugNoise = (s) => s.replace(/\s*raw=".*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();
     const shown = stripDebugNoise(
       message.replace(/\s*\(PLATFORM_LLM_BUSY\)\s*$/, "")
     );
@@ -5756,7 +4998,18 @@ function describeLocalRunFailure(message, rawError) {
   if (/UPSTREAM_402|Insufficient Balance|余额不足|insufficient\s+balance/i.test(
     message
   )) {
-    return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} Top up your balance, then send again (or say "\u7EE7\u7EED") \u2014 if a dialog was kept, context is preserved.
+    const cleanedMessage = stripDebugNoise(message);
+    const fallback = cleanedMessage.replace(
+      /^[^:]*provider failed: HTTP \d{3}\s*/,
+      ""
+    );
+    const balanceDetails = parseEmbeddedBalanceDetails(cleanedMessage);
+    const shownMessage = balanceDetails ? t(
+      "balanceInsufficientReason",
+      balanceDetails.required,
+      balanceDetails.current
+    ) : extractEmbeddedErrorMessage(cleanedMessage) ?? fallback;
+    return `[nolo] ${shownMessage}
 `;
   }
   const cls = classifyLocalRunError(message);
@@ -6071,6 +5324,8 @@ async function runLocalAgentTurnForCli(options, settings) {
         contextReferenceResolver: (reference) => canResolveCollapsedPasteReference(options.pastedTextStore, reference)
       } : {},
       continueDialogId: currentDialogId,
+      fileWriteSessionId: currentDialogId,
+      fileWriteGateEnabled: resolveFileWriteGateEnabled(options.env),
       spaceId: options.spaceId,
       category: options.category,
       inheritedFromDialogKey: options.inheritedFromDialogKey,
@@ -6096,11 +5351,13 @@ async function runLocalAgentTurnForCli(options, settings) {
         options.onLoopEvent?.(event);
       },
       ...options.abortSignal ? { abortSignal: options.abortSignal } : {},
-      ...turnOutput.traceLocalTools ? {
-        onToolEvent: (event) => {
-          turnOutput.handleToolEvent(event);
-        }
-      } : {},
+      // 回合内注入（TUI 后台 run 唤醒直投）：透传给 local loop。
+      ...options.drainInjections ? { drainInjections: options.drainInjections } : {},
+      // tool-gist-fold 后 onToolEvent 无条件挂载（不再受 traceLocalTools 开关
+      // 控制，显示模式合并为单一 gist/折叠通道）——保留 alpha 的新形态。
+      onToolEvent: (event) => {
+        turnOutput.handleToolEvent(event);
+      },
       ...!options.noStream ? {
         onTextDelta: (chunk) => {
           turnOutput.pushText(chunk);
@@ -6158,6 +5415,43 @@ async function runLocalAgentTurnForCli(options, settings) {
     };
   }
 }
+async function checkLocalAvailabilityBeforeHttpDispatch(options) {
+  const adapter = resolveLocalRuntimeAdapter(options);
+  if (!adapter || typeof adapter.loadAgentConfig !== "function") return null;
+  let config;
+  try {
+    config = await adapter.loadAgentConfig(options.agentKey);
+  } catch {
+    return null;
+  }
+  if (!config || typeof config !== "object") return null;
+  const baseRecord = config.rawRecord ?? config;
+  const credentialKey = resolveCredentialKeyWithFallback(baseRecord);
+  const agentLevelAt = baseRecord.nextAvailableAt;
+  const agentLevelNextAvailableAt = typeof agentLevelAt === "number" && Number.isFinite(agentLevelAt) ? agentLevelAt : void 0;
+  if (!credentialKey && agentLevelNextAvailableAt === void 0) return null;
+  const env = options.env;
+  const now = Date.now();
+  const entry = credentialKey ? await readCredentialEntry(credentialKey, env, now).catch(() => void 0) : void 0;
+  const entryAt = entry?.nextAvailableAt;
+  const effectiveNextAvailableAt = typeof entryAt === "number" ? mergeAvailabilityDeadline(agentLevelNextAvailableAt, entryAt) : agentLevelNextAvailableAt;
+  if (typeof effectiveNextAvailableAt !== "number") return null;
+  const gateDecision = resolveCooldownGate(
+    { nextAvailableAt: effectiveNextAvailableAt, lastProbeAt: entry?.lastProbeAt },
+    now
+  );
+  if (gateDecision === "probe" && credentialKey) {
+    await recordCredentialProbe(credentialKey, env, now).catch(() => void 0);
+    return null;
+  }
+  if (gateDecision !== "blocked") return null;
+  options.output.write(
+    `[nolo] Agent ${options.agentName || options.agentKey} is temporarily unavailable (429 cooldown) until ${new Date(Number(effectiveNextAvailableAt)).toISOString()}.
+Dispatch aborted before reaching the server. Pick another agent via listAgents, or retry after the cooldown.
+`
+  );
+  return { exitCode: 1 };
+}
 async function runAgentTurn(options) {
   const authToken = resolveAuthToken2(options.env);
   const runtimeMode = resolveRequestedRuntimeMode(options);
@@ -6222,26 +5516,50 @@ async function runAgentTurn(options) {
     );
     return { exitCode: 1 };
   }
+  const localBlock = await checkLocalAvailabilityBeforeHttpDispatch(options);
+  if (localBlock) {
+    return { exitCode: localBlock.exitCode };
+  }
   return runHttpAgentTurn(options, authToken);
 }
 
 // packages/cli/agentRunCommand.ts
 import * as nodeFs from "node:fs";
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
-import { join as join2 } from "node:path";
 
 // packages/cli/client/autoModelRouter.ts
 var CLI_AUTO_ROUTE_AGENT_KEY = BUILTIN_NOLO_AGENT_KEY;
 
+// packages/agent-runtime/agentsMd.ts
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+var AGENTS_MD_MAX_BYTES = 8192;
+var AGENTS_MD_CANDIDATES = ["AGENTS.md", "CLAUDE.md"];
+function readAgentsMdLayerFromDisk(cwd) {
+  for (const name of AGENTS_MD_CANDIDATES) {
+    const filePath = join(cwd, name);
+    if (!existsSync(filePath)) continue;
+    try {
+      let content = readFileSync(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;
+}
+
 // packages/cli/agentRunPrompts.ts
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
-import { dirname, extname, isAbsolute, join, relative as relativePath, resolve, sep } from "node:path";
+import { existsSync as existsSync2, readFileSync as readFileSync2, readdirSync, statSync } from "node:fs";
+import { dirname, extname, isAbsolute, join as join2, relative as relativePath, resolve, sep } from "node:path";
 function workflowRefToCandidatePath(cwd, ref) {
   const normalized = ref.trim();
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
     const directPath = resolve(cwd, normalized);
-    if (existsSync(directPath)) return directPath;
+    if (existsSync2(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
   return resolve(cwd, "docs", "workflows", `${fileName}.md`);
@@ -6254,21 +5572,21 @@ function skillRefToCandidatePath(cwd, ref) {
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
     const directPath = resolve(cwd, normalized);
-    if (existsSync(directPath)) return directPath;
+    if (existsSync2(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
   for (const dir of SKILL_SEARCH_DIRS) {
     const skillMdPath = resolve(cwd, dir, fileName, "SKILL.md");
-    if (existsSync(skillMdPath)) return skillMdPath;
+    if (existsSync2(skillMdPath)) return skillMdPath;
   }
   return resolve(cwd, ".agents", "skills", fileName, "SKILL.md");
 }
 async function resolveWorkflowReference(ref, cwd = process.cwd()) {
   const path = workflowRefToCandidatePath(cwd, ref);
-  if (!path || !existsSync(path)) {
+  if (!path || !existsSync2(path)) {
     throw new Error(`Workflow reference not found: ${ref}`);
   }
-  const markdown = readFileSync(path, "utf8");
+  const markdown = readFileSync2(path, "utf8");
   const parsed = parseSkillDocProtocol(markdown);
   return {
     ref,
@@ -6285,8 +5603,8 @@ function inlineRelativeRefs(body, skillDir) {
     const absPath = resolve(skillDir, cleaned);
     const relative = relativePath(normalizedSkillDir, absPath);
     if (relative.startsWith("..") || isAbsolute(relative)) return match;
-    if (!existsSync(absPath) || !absPath.endsWith(".md")) return match;
-    const refContent = readFileSync(absPath, "utf8");
+    if (!existsSync2(absPath) || !absPath.endsWith(".md")) return match;
+    const refContent = readFileSync2(absPath, "utf8");
     return `
 
 ### ${label}
@@ -6297,8 +5615,8 @@ ${refContent}
   });
 }
 function listSkillScripts(skillDir) {
-  const scriptsDir = join(skillDir, "scripts");
-  if (!existsSync(scriptsDir) || !statSync(scriptsDir).isDirectory()) return null;
+  const scriptsDir = join2(skillDir, "scripts");
+  if (!existsSync2(scriptsDir) || !statSync(scriptsDir).isDirectory()) return null;
   const entries = readdirSync(scriptsDir).filter((e) => !e.startsWith("."));
   if (entries.length === 0) return null;
   return [
@@ -6325,10 +5643,10 @@ async function resolveSkillReference(ref, options = {}) {
   } else {
     const cwd = options.cwd ?? process.cwd();
     const path = skillRefToCandidatePath(cwd, ref);
-    if (!path || !existsSync(path)) {
+    if (!path || !existsSync2(path)) {
       throw new Error(`Skill reference not found: ${ref}`);
     }
-    markdown = readFileSync(path, "utf8");
+    markdown = readFileSync2(path, "utf8");
     filePath = path;
     skillDir = dirname(path);
   }
@@ -6433,8 +5751,8 @@ function prependSubjectDialogMarker(message, subjectDialogKey) {
 function normalizeCliImageInput(input) {
   if (/^(https?:|data:|file:)/i.test(input)) return input;
   const absolutePath = resolve(input);
-  if (!existsSync(absolutePath)) return input;
-  const base64 = readFileSync(absolutePath).toString("base64");
+  if (!existsSync2(absolutePath)) return input;
+  const base64 = readFileSync2(absolutePath).toString("base64");
   return `data:${imageMimeTypeForPath(absolutePath)};base64,${base64}`;
 }
 function imageMimeTypeForPath(path) {
@@ -6627,16 +5945,16 @@ var buildCjkTokens = (text) => {
   }
   return tokens;
 };
-var tokenize2 = (text) => {
+var tokenize = (text) => {
   const normalized = text.toLowerCase();
   const wordTokens = normalized.split(/[\s,.;:!?()[\]{}"'`，。！？：；、]+/).map((token) => token.trim()).filter((token) => token.length >= 2);
   return [...wordTokens, ...buildCjkTokens(normalized)];
 };
 var keywordScore = (query, item) => {
-  const queryTokens = new Set(tokenize2(query));
+  const queryTokens = new Set(tokenize(query));
   if (queryTokens.size === 0) return 0;
   const haystack = /* @__PURE__ */ new Set([
-    ...tokenize2(item.content),
+    ...tokenize(item.content),
     ...(item.tags ?? []).map((tag) => tag.toLowerCase()),
     item.patternKey?.toLowerCase() ?? ""
   ]);
@@ -6938,6 +6256,21 @@ var resolveCliMemory = async (input) => {
 function resolvePositiveMs(value, fallback) {
   return parsePositiveFiniteNumberOrFallback(value, fallback);
 }
+function resolveRunOutcome(input) {
+  switch (input.kind) {
+    case "stall":
+      return { status: "failed", exitCode: 1 };
+    case "timeout":
+      return { status: "timeout", exitCode: 124 };
+    case "result": {
+      const failed = input.isStalledOrTruncated || input.exitCode !== 0;
+      if (!failed) {
+        return { status: "done", exitCode: 0 };
+      }
+      return { status: "failed", exitCode: input.exitCode !== 0 ? input.exitCode : 1 };
+    }
+  }
+}
 async function resolveAgentRunAgentKey(args) {
   if (!args.agentInput.trim() || args.agentInput.startsWith("agent-")) {
     return void 0;
@@ -6973,11 +6306,14 @@ async function runAgentRunCommand(args, deps) {
     deps.stallTimeoutMs ?? env.NOLO_LOCAL_RUN_STALL_TIMEOUT_MS,
     5 * 6e4
   );
+  const stallEnvExplicitlySet = typeof env.NOLO_LOCAL_RUN_STALL_TIMEOUT_MS === "string" && env.NOLO_LOCAL_RUN_STALL_TIMEOUT_MS.trim().length > 0;
+  const armStallWatchdog = hasRegistry || stallEnvExplicitlySet;
+  const armTimeoutWatchdog = typeof parsed.timeoutMs === "number" && parsed.timeoutMs > 0;
   let timedOut = false;
   let stalled = false;
   let timeoutTimer;
   let stallTimer;
-  const activityTracker = hasRegistry ? createRunActivityTracker(childRunId, {
+  const activityTracker = armStallWatchdog ? createRunActivityTracker(childRunId ?? "__foreground__", {
     env,
     homedir: deps.homedir,
     fs: deps.fs,
@@ -6990,7 +6326,7 @@ async function runAgentRunCommand(args, deps) {
     activityTracker?.dispose();
   };
   let rejectOnWatchdogFailure;
-  const watchdogFailure = hasRegistry ? new Promise((_, reject) => {
+  const watchdogFailure = armStallWatchdog || armTimeoutWatchdog ? new Promise((_, reject) => {
     rejectOnWatchdogFailure = reject;
   }) : void 0;
   const raceWithWatchdog = (work) => watchdogFailure ? Promise.race([work, watchdogFailure]) : work;
@@ -7000,7 +6336,15 @@ async function runAgentRunCommand(args, deps) {
     } catch {
     }
   };
-  if (hasRegistry) {
+  const finalizeWatchdogOutcome = (outcome, note) => {
+    if (!hasRegistry) return;
+    (deps.finalizeRunRecord ?? finalizeRunRecord)(
+      childRunId,
+      { status: outcome.status, exitCode: outcome.exitCode, note },
+      { env, homedir: deps.homedir, fs: deps.fs, now: deps.now }
+    );
+  };
+  if (armStallWatchdog) {
     stallTimer = setInterval(() => {
       if (timedOut || stalled) return;
       const activity = activityTracker?.getActivity();
@@ -7018,31 +6362,25 @@ async function runAgentRunCommand(args, deps) {
         const note = `stalled: no progress for ${stallTimeoutMs}ms`;
         output.write(`[nolo] local run ${note}
 `);
-        (deps.finalizeRunRecord ?? finalizeRunRecord)(
-          childRunId,
-          { status: "failed", note },
-          { env, homedir: deps.homedir, fs: deps.fs, now: deps.now }
-        );
+        const outcome = resolveRunOutcome({ kind: "stall" });
+        finalizeWatchdogOutcome(outcome, note);
         rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
-        exitFromWatchdog(1);
+        exitFromWatchdog(outcome.exitCode);
       }
     }, Math.min(stallTimeoutMs, 1e4));
-    if (typeof parsed.timeoutMs === "number" && parsed.timeoutMs > 0) {
-      timeoutTimer = setTimeout(() => {
-        timedOut = true;
-        clearWatchdogs();
-        const note = `timed out after ${parsed.timeoutMs}ms`;
-        output.write(`[nolo] local run ${note}
+  }
+  if (armTimeoutWatchdog) {
+    timeoutTimer = setTimeout(() => {
+      timedOut = true;
+      clearWatchdogs();
+      const note = `timed out after ${parsed.timeoutMs}ms`;
+      output.write(`[nolo] local run ${note}
 `);
-        (deps.finalizeRunRecord ?? finalizeRunRecord)(
-          childRunId,
-          { status: "timeout", note },
-          { env, homedir: deps.homedir, fs: deps.fs, now: deps.now }
-        );
-        rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
-        exitFromWatchdog(124);
-      }, parsed.timeoutMs);
-    }
+      const outcome = resolveRunOutcome({ kind: "timeout" });
+      finalizeWatchdogOutcome(outcome, note);
+      rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
+      exitFromWatchdog(outcome.exitCode);
+    }, parsed.timeoutMs);
   }
   const wantsFallbackSuggestions = parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0;
   const rawAgentInput = resolveRawAgentInput(args, deps.commandPath) ?? parsed.agentKey;
@@ -7197,22 +6535,8 @@ async function runAgentRunCommand(args, deps) {
   let memoryOverlayLayer = null;
   let memoryUseGuidanceLayer = null;
   if (!isSubtask) {
-    const AGENTS_MD_MAX = 8192;
-    for (const name of ["AGENTS.md", "CLAUDE.md"]) {
-      const agentsMdPath = join2(cliCwd, name);
-      if (existsSync2(agentsMdPath)) {
-        try {
-          let mdContent = readFileSync2(agentsMdPath, "utf8").trim();
-          if (!mdContent) continue;
-          if (Buffer.byteLength(mdContent, "utf8") > AGENTS_MD_MAX) {
-            mdContent = Buffer.from(mdContent, "utf8").subarray(0, AGENTS_MD_MAX).toString("utf8") + "\n\n<!-- AGENTS.md truncated -->";
-          }
-          scopedLayers.push(buildAgentsMdLayer(mdContent, name));
-          break;
-        } catch {
-        }
-      }
-    }
+    const agentsMdLayer = readAgentsMdLayerFromDisk(cliCwd);
+    if (agentsMdLayer) scopedLayers.push(agentsMdLayer);
     skillContentBlocks.push(...buildSkillContextBlocks(skillReferences));
     scopedLayers.push(buildSkillDiscoveryContextLayer(cliCwd));
     if (!deps.memoryRecallDisabled) {
@@ -7403,12 +6727,16 @@ async function runAgentRunCommand(args, deps) {
   if (typeof childRunId === "string" && childRunId.length > 0) {
     const isStalledOrTruncated = result.emptyAssistantFallbackReason === "length_truncated" || result.emptyAssistantFallbackReason === "stream_truncated" || result.emptyAssistantFallbackReason === "repetition_loop" || result.emptyAssistantFallbackReason === "stagnant_tool_calls";
     const truncationNote = isStalledOrTruncated ? { note: `empty assistant output: ${result.emptyAssistantFallbackReason}` } : {};
-    const finalStatus = isStalledOrTruncated || result.exitCode !== 0 ? "failed" : "done";
+    const outcome = resolveRunOutcome({
+      kind: "result",
+      exitCode: result.exitCode,
+      isStalledOrTruncated
+    });
     await (deps.finalizeRunRecord ?? finalizeRunRecord)(
       childRunId,
       {
-        status: finalStatus,
-        exitCode: result.exitCode,
+        status: outcome.status,
+        exitCode: outcome.exitCode,
         dialogId: result.dialogId,
         ...truncationNote
       },
@@ -7480,8 +6808,6 @@ export {
   getActiveThemeMode,
   setActiveThemeMode,
   setActiveBrightness,
-  getActiveDensity,
-  setActiveDensity,
   detectSystemBrightnessFromEnv,
   resolveTuiBrightness,
   resolveTuiThemeMode,
@@ -7494,8 +6820,9 @@ export {
   themeText,
   tuiRenderThemeFingerprint,
   setMathRenderingEnabled,
+  polishBreathInsertsBlankBetween,
   formatAssistantDisplay,
-  normalizeToolDisplayMode,
+  TUI_TREE_MARKER,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,
   createCollapsedPasteStore,
@@ -7507,6 +6834,7 @@ export {
   expandRangeToCollapsedPasteChips,
   findCollapsedPasteSpanAt,
   runAgentTurn,
+  readAgentsMdLayerFromDisk,
   resolveWorkflowReference,
   resolveSkillReference,
   buildSkillContextBlocks,
@@ -7514,6 +6842,7 @@ export {
   normalizeCliImageInput,
   inspectLocalRunWorkspace,
   resolveCliMemory,
+  resolveRunOutcome,
   runAgentRunCommand,
   isBalanceExhaustedError
 };