nolo-cli 0.54.0-alpha.2 → 0.54.0

package/{chunk-6FQ2552G.js → chunk-UOWXD4VN.js}

@@ -1,6 +1,6 @@
 import {
-  generateRunReport
-} from "./chunk-J3UALFHL.js";
+  findPotentialSecrets
+} from "./chunk-S7Z2HMCN.js";
 import {
   buildLocalRunEnv,
   isFullstackCodingAgentRef,
@@ -10,6 +10,9 @@ import {
   resolveServerUrl,
   writeUsage
 } from "./chunk-LYGNQHUW.js";
+import {
+  resolveMachineId
+} from "./chunk-ESHYE7WU.js";
 import {
   agentRunCardLabels,
   createCliLocalRuntimeAdapter,
@@ -19,7 +22,12 @@ import {
   parseAgentRunEvent,
   t,
   toolLabel
-} from "./chunk-GV35EHNA.js";
+} from "./chunk-5FCIPEKT.js";
+import {
+  readCredentialEntry,
+  recordCredentialProbe,
+  resolveCredentialKeyWithFallback
+} from "./chunk-NI2BS6UD.js";
 import {
   getReadableCliDb
 } from "./chunk-43CXXVJD.js";
@@ -27,11 +35,14 @@ import {
   normalizeAgentHandle,
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-DQLYEGP7.js";
+} from "./chunk-SYYUU7EV.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
 } from "./chunk-EKLRRZIN.js";
+import {
+  generateRunReport
+} from "./chunk-HJTAGT3W.js";
 import {
   CliProviderQuotaError
 } from "./chunk-JDSUTNYY.js";
@@ -42,17 +53,14 @@ import {
   readRunRecord,
   resolveRunQueuePath,
   spawnLocalBackgroundRun
-} from "./chunk-WHVQA7PJ.js";
-import {
-  resolveMachineId
-} from "./chunk-ESHYE7WU.js";
+} from "./chunk-SSXTSPSG.js";
 import {
   applyModelLayerOverride,
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
 import {
   formatAgentListCard
-} from "./chunk-V4KZGLOI.js";
+} from "./chunk-TR4DXUYX.js";
 import {
   isTransientFetchError
 } from "./chunk-5XTOKQLW.js";
@@ -66,26 +74,25 @@ import {
   formatStartRunCard,
   formatStatusRunCard,
   formatStopRunCard,
-  isAgentRunTerminalStatus,
-  runShowsLogTail
+  isAgentRunTerminalStatus
 } from "./chunk-KXKQO4Q6.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-6SZ52ORL.js";
+} from "./chunk-FJHMLRDQ.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-BJLYCOZK.js";
+} from "./chunk-YBFJQC2M.js";
 import {
   getDefaultCliLocalRuntimeDb
 } from "./chunk-IA3A5373.js";
 import {
   buildSkillDiscoveryContextLayer
-} from "./chunk-2BWU4ORW.js";
+} from "./chunk-SUEIAK5N.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
@@ -93,12 +100,11 @@ import {
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
-  readActionGate,
-  readCommandActionGatePayload
-} from "./chunk-6BGAQ3KR.js";
+  readActionGate
+} from "./chunk-EJE33XNR.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-CVT7L2WZ.js";
+} from "./chunk-A65UV3M5.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -107,20 +113,22 @@ import {
 import {
   resolveClientVersion,
   resolvePlatformAuthToken
-} from "./chunk-SP3DPVBH.js";
+} from "./chunk-KLIBF3BY.js";
 import {
-  isQuotaExhaustedError
+  isQuotaExhaustedError,
+  mergeAvailabilityDeadline,
+  resolveCooldownGate
 } from "./chunk-IWUMSAQF.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-KUUTWU4I.js";
+} from "./chunk-K4NISKOR.js";
 import {
   clipCompactText
-} from "./chunk-H4RYESI6.js";
+} from "./chunk-BBTN4NQD.js";
 import {
   findModelConfig
-} from "./chunk-QDHZCAH3.js";
+} from "./chunk-SVDMVX4G.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -133,7 +141,7 @@ import {
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-3AOLVADY.js";
+} from "./chunk-DVINR3PL.js";
 import {
   readPipeText,
   spawnProcess
@@ -145,13 +153,13 @@ import {
   CLIENT_VERSION_TOO_OLD_CODE,
   NOLO_CLIENT_VERSION_HEADER,
   buildClientVersionUpgradeMessage
-} from "./chunk-WL3UOGYO.js";
+} from "./chunk-HPW5MNDQ.js";
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
 import {
   createMemoryKey
-} from "./chunk-SVEUG45B.js";
+} from "./chunk-NHRQCXIQ.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
@@ -159,7 +167,7 @@ import {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById
-} from "./chunk-VULELK4T.js";
+} from "./chunk-2WBFJHQA.js";
 import {
   parsePublicAgentId
 } from "./chunk-BJIRLHJR.js";
@@ -174,6 +182,7 @@ import {
 } from "./chunk-G3SUCT4W.js";
 
 // packages/cli/client/tokenUsage.ts
+var PLATFORM_CREDIT_UNIT = "credits";
 var isUsableModelId = (model) => {
   const raw = model?.trim();
   return Boolean(raw) && raw !== "-" && raw !== "auto";
@@ -245,7 +254,7 @@ function buildTurnTokenUsage(usage, model) {
   const contextWindow = resolveContextWindow(model);
   const remaining = contextWindow && parsed.input > 0 ? Math.max(0, contextWindow - parsed.input) : void 0;
   const rawCost = typeof usage?.cost === "number" ? usage.cost : void 0;
-  const isPlatformBilled = usage?.billing_unit === "credits";
+  const isPlatformBilled = usage?.billing_unit === PLATFORM_CREDIT_UNIT;
   const credits = rawCost !== void 0 && rawCost > 0 ? isPlatformBilled ? rawCost : rawCost * API_REPORTED_COST_MULTIPLIER : void 0;
   return {
     ...parsed,
@@ -254,6 +263,31 @@ function buildTurnTokenUsage(usage, model) {
     ...credits !== void 0 ? { credits } : {}
   };
 }
+function sumPlatformCredits(records) {
+  if (!records?.length) return void 0;
+  let total = 0;
+  let sawPlatformCall = false;
+  for (const record of records) {
+    const credits = platformCreditsFromUsage(record?.usage);
+    if (credits === void 0) continue;
+    sawPlatformCall = true;
+    total += credits;
+  }
+  return sawPlatformCall ? total : void 0;
+}
+function platformCreditsFromUsage(usage) {
+  if (!usage || usage.billing_unit !== PLATFORM_CREDIT_UNIT) return void 0;
+  const cost = typeof usage.cost === "number" ? usage.cost : 0;
+  return Number.isFinite(cost) && cost > 0 ? cost : 0;
+}
+function withTurnCredits(tokens, credits) {
+  if (!tokens) return tokens;
+  if (credits === void 0) return tokens;
+  return { ...tokens, credits };
+}
+function formatCreditsChip(credits, options) {
+  return options?.compact ? `\u26A1${credits.toFixed(2)}` : `\u26A1 ${credits.toFixed(2)} \u79EF\u5206`;
+}
 function formatTokenCount(value) {
   if (!Number.isFinite(value) || value < 0) return "\u2014";
   if (value < 1e3) return String(Math.round(value));
@@ -2908,6 +2942,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 = [];
@@ -2975,7 +3017,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++) {
@@ -3333,130 +3375,16 @@ function formatAssistantTextForCli(text) {
   return text.replace(/\u003cthink\u003e[\s\S]*?\u003c\/think\u003e\s*/gi, "").replace(/\n{3,}/g, "\n\n").trim();
 }
 
-// packages/cli/client/formatReadPathTree.ts
-import { homedir as osHomedir } from "node:os";
-
-// packages/core/foldHomePath.ts
-function foldHomePath(path, home) {
-  if (!path) return path;
-  if (home) {
-    const cleanHome = home.endsWith("/") ? home.slice(0, -1) : home;
-    if (path === cleanHome) return "~";
-    if (path.startsWith(cleanHome + "/")) return `~${path.slice(cleanHome.length)}`;
-  }
-  return path.replace(/^(\/Users\/[^/]+|\/home\/[^/]+)(\/|$)/, "~$2");
-}
-
-// packages/cli/client/formatReadPathTree.ts
-function clipPathAware(value, max = 72) {
-  const compact = compactWhitespace(value);
-  if (compact.length <= max) return compact;
-  if (compact.includes(" ") || !compact.includes("/") && !compact.includes("\\")) {
-    return clipCompactText(value, max, "\u2026");
-  }
-  const segments = compact.split(/[/\\]/);
-  const filename = segments[segments.length - 1];
-  if (filename.length >= max) {
-    return clipCompactText(value, max, "\u2026");
-  }
-  const ELISION = "/\u2026/";
-  let prefix = "";
-  for (let i = 0; i < segments.length - 1; i += 1) {
-    const candidate = segments.slice(0, i + 1).join("/");
-    if (candidate.length + ELISION.length + filename.length > max) break;
-    prefix = candidate;
-  }
-  if (prefix) return `${prefix}${ELISION}${filename}`;
-  const filenameOnly = `\u2026/${filename}`;
-  if (filenameOnly.length <= max) return filenameOnly;
-  return clipCompactText(value, max, "\u2026");
-}
-function formatHomePath(path, customHomedir) {
-  if (!path) return "";
-  const home = customHomedir || (typeof process !== "undefined" ? process.env?.HOME : void 0) || (typeof osHomedir === "function" ? osHomedir() : "");
-  return foldHomePath(path, home);
-}
-function formatReadItemPath(rawPath, metadata, customHomedir) {
-  const inputPath = rawPath || (typeof metadata?.path === "string" ? metadata.path : void 0) || (typeof metadata?.filePath === "string" ? metadata.filePath : void 0) || "file";
-  let formattedPath = formatHomePath(inputPath, customHomedir);
-  if (!formattedPath) return "file";
-  let rangePart = "";
-  const match = formattedPath.match(/(:[0-9]+(-[0-9]+)?(,[0-9]+(-[0-9]+)?)*)$/);
-  if (match) {
-    rangePart = match[1];
-    formattedPath = formattedPath.slice(0, -rangePart.length);
-  } else if (metadata && typeof metadata.startLine === "number" && typeof metadata.endLine === "number" && typeof metadata.totalLines === "number") {
-    const { startLine, endLine, totalLines, truncated } = metadata;
-    if (truncated || startLine !== 1 || endLine !== totalLines) {
-      rangePart = `:${startLine}-${endLine}`;
-    }
-  }
-  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) {
-    const formattedPath = formatHomePath(path, customHomedir);
-    if (formattedPath) {
-      text = text ? `${text} in ${formattedPath}` : formattedPath;
-    }
-  }
-  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";
-  text = text.length > 80 ? `${text.slice(0, 79)}\u2026` : text;
-  if (timedOut) return `${text} (timed out)`;
-  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 };
+// packages/cli/tui/redactSecrets.ts
+var REDACTED = "\u27E8redacted\u27E9";
+function redactSecrets(text) {
+  return text.replace(/\b(?:sk|pk)-[A-Za-z0-9_-]{10,}/g, REDACTED).replace(/\b(Bearer\s+)[A-Za-z0-9._~+/=-]{12,}/gi, `$1${REDACTED}`).replace(
+    /\b((?:api[_-]?key|apikey|access[_-]?token|auth[_-]?token|token|secret|password|passwd|credential)s?\s*[=:]\s*["']?)[^\s"',;]{8,}/gi,
+    `$1${REDACTED}`
+  ).replace(
+    /\b((?:--[a-z-]*(?:token|key|secret|password|credential)[a-z-]*)\s+)[^\s"']{8,}/gi,
+    `$1${REDACTED}`
+  );
 }
 
 // node_modules/diff/libesm/diff/base.js
@@ -3709,186 +3637,110 @@ function tokenize(value, options) {
   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";
+// packages/cli/client/formatReadPathTree.ts
+import { homedir as osHomedir } from "node:os";
+
+// packages/core/foldHomePath.ts
+function foldHomePath(path, home) {
+  if (!path) return path;
+  if (home) {
+    const cleanHome = home.endsWith("/") ? home.slice(0, -1) : home;
+    if (path === cleanHome) return "~";
+    if (path.startsWith(cleanHome + "/")) return `~${path.slice(cleanHome.length)}`;
   }
-  if (normalized === "verbose" || normalized === "debug" || normalized === "trace" || normalized === "full") {
-    return "verbose";
+  return path.replace(/^(\/Users\/[^/]+|\/home\/[^/]+)(\/|$)/, "~$2");
+}
+
+// packages/cli/client/formatReadPathTree.ts
+function clipPathAware(value, max = 72) {
+  const compact = compactWhitespace(value);
+  if (compact.length <= max) return compact;
+  if (compact.includes(" ") || !compact.includes("/") && !compact.includes("\\")) {
+    return clipCompactText(value, max, "\u2026");
   }
-  if (normalized === "normal" || normalized === "summary" || normalized === "on") {
-    return "normal";
+  const segments = compact.split(/[/\\]/);
+  const filename = segments[segments.length - 1];
+  if (filename.length >= max) {
+    return clipCompactText(value, max, "\u2026");
   }
-  if (normalized === "pro" || normalized === "compact" || normalized === "minimal" || normalized === "short") {
-    return "pro";
+  const ELISION = "/\u2026/";
+  let prefix = "";
+  for (let i = 0; i < segments.length - 1; i += 1) {
+    const candidate = segments.slice(0, i + 1).join("/");
+    if (candidate.length + ELISION.length + filename.length > max) break;
+    prefix = candidate;
   }
-  return fallback;
+  if (prefix) return `${prefix}${ELISION}${filename}`;
+  const filenameOnly = `\u2026/${filename}`;
+  if (filenameOnly.length <= max) return filenameOnly;
+  return clipCompactText(value, max, "\u2026");
+}
+function formatHomePath(path, customHomedir) {
+  if (!path) return "";
+  const home = customHomedir || (typeof process !== "undefined" ? process.env?.HOME : void 0) || (typeof osHomedir === "function" ? osHomedir() : "");
+  return foldHomePath(path, home);
 }
-function resolveToolDisplayMode(env = process.env) {
-  const legacyTrace = asTrimmedLowercaseString(env.NOLO_TRACE_TOOLS);
-  if (legacyTrace === "0" || legacyTrace === "false" || legacyTrace === "off") {
-    return "hide";
+function formatReadItemPath(rawPath, metadata, customHomedir) {
+  const inputPath = rawPath || (typeof metadata?.path === "string" ? metadata.path : void 0) || (typeof metadata?.filePath === "string" ? metadata.filePath : void 0) || "file";
+  let formattedPath = formatHomePath(inputPath, customHomedir);
+  if (!formattedPath) return "file";
+  let rangePart = "";
+  const match = formattedPath.match(/(:[0-9]+(-[0-9]+)?(,[0-9]+(-[0-9]+)?)*)$/);
+  if (match) {
+    rangePart = match[1];
+    formattedPath = formattedPath.slice(0, -rangePart.length);
+  } else if (metadata && typeof metadata.startLine === "number" && typeof metadata.endLine === "number" && typeof metadata.totalLines === "number") {
+    const { startLine, endLine, totalLines, truncated } = metadata;
+    if (truncated || startLine !== 1 || endLine !== totalLines) {
+      rangePart = `:${startLine}-${endLine}`;
+    }
   }
-  if (legacyTrace === "verbose" || legacyTrace === "full") {
-    return "verbose";
+  const clippedPath = clipPathAware(formattedPath, 72);
+  return `${clippedPath}${rangePart}`;
+}
+function formatSearchItemQuery(query, path, customHomedir) {
+  let text = (query || "").trim();
+  if (path) {
+    const formattedPath = formatHomePath(path, customHomedir);
+    if (formattedPath) {
+      text = text ? `${text} in ${formattedPath}` : formattedPath;
+    }
   }
-  return normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "normal");
+  if (!text) return "search";
+  return text.length > 80 ? `${text.slice(0, 79)}\u2026` : text;
+}
+function formatRunItemCommand(command, exitCode, timedOut) {
+  let text = compactWhitespace(command || "");
+  if (!text) text = "command";
+  text = text.length > 80 ? `${text.slice(0, 79)}\u2026` : text;
+  if (timedOut) return `${text} (timed out)`;
+  if (typeof exitCode === "number" && exitCode !== 0) return `${text} (exit ${exitCode})`;
+  return text;
 }
-function shouldEmitToolEvents(mode) {
-  return mode !== "hide";
+function formatFetchItemUrl(url) {
+  const text = (url || "").trim();
+  if (!text) return "webpage";
+  return text.length > 80 ? `${text.slice(0, 79)}\u2026` : text;
 }
+
+// packages/cli/client/toolOutput.ts
 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 isRunToolName(name) {
+  return name === "execShell" || name === "runCommand" || name === "launchProcess";
 }
-function buildEditLine(kind, body, maxWidth = resolveEditSnippetMaxWidth()) {
-  return { kind, text: prefixFor(kind) + truncateByDisplayWidth(body, maxWidth) };
+function isReadToolName(name) {
+  return name === "readFile";
 }
-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 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 isFailedToolResult(event) {
-  const exitCode = event.metadata?.exitCode;
-  if (event.metadata?.actionGate) return false;
-  if (typeof exitCode === "number" && exitCode !== 0) return true;
-  return Boolean(event.metadata?.timedOut);
-}
-function isNeedsActionToolResult(event) {
-  return Boolean(event.metadata?.actionGate);
+function isFailedToolResult(event) {
+  const exitCode = event.metadata?.exitCode;
+  if (event.metadata?.actionGate) return false;
+  if (typeof exitCode === "number" && exitCode !== 0) return true;
+  return Boolean(event.metadata?.timedOut);
 }
 function parseUiAskChoiceForCli(event) {
   if (event.toolName !== "ask_user" && !event.metadata?.uiAskChoice) {
@@ -4006,7 +3858,10 @@ function renderRunCard(snapshot, opts) {
     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 errorFields = safe ? {
+    errorMessage: hadError ? clip(redactSecrets(cleanUserText(source.errorMessage)), 160) : 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,
@@ -4026,8 +3881,7 @@ function renderRunCard(snapshot, opts) {
     ...opts?.includeLogTail !== void 0 ? { includeLogTail: opts.includeLogTail } : {},
     labels
   });
-  return hadError ? `${body}
-  error   ${t("runDiagnosticsHidden")}` : body;
+  return body;
 }
 function recoverOrchestrationCard(event, toolName, opts) {
   const safe = opts?.safe === true;
@@ -4073,10 +3927,6 @@ function recoverOrchestrationCard(event, toolName, opts) {
   if (kind === "stop") return formatStopRunCard(snapshot.status, labels);
   return renderRunCard(snapshot, opts);
 }
-function parseControlAgentRunStatusEvent(event) {
-  const parsed = parseAgentRunEvent(event);
-  return parsed?.kind === "status" ? parsed.snapshot : null;
-}
 function formatOrchestrationCardBlock(event, toolName, colorEnabled, opts) {
   const safe = opts?.safe === true;
   const rawLabel = toolLabel(toolName);
@@ -4084,8 +3934,8 @@ function formatOrchestrationCardBlock(event, toolName, colorEnabled, opts) {
   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 = safe ? t("toolFailed") : rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed");
-    const message = clip(firstLine, 96);
+    const firstLine = stripAnsi2(rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed"));
+    const message = clip(redactSecrets(firstLine), 96);
     if (!colorEnabled) {
       return `\u2717 ${rawLabel}  ${message}
 `;
@@ -4127,7 +3977,7 @@ function sanitizeRunCardForNormal(lines) {
       break;
     }
     if (/^\s*error\b/i.test(line)) {
-      out.push(`  error   ${t("runDiagnosticsHidden")}`);
+      out.push(clip(redactSecrets(stripAnsi2(line)), 160));
       errorIndent = line.length - line.trimStart().length;
       continue;
     }
@@ -4146,59 +3996,207 @@ function sanitizeRunCardForNormal(lines) {
   }
   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
-  };
+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 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
-  );
+var DEFAULT_RUN_GIST_MAX = 96;
+function normalRunGistMaxWidth(env = process.env, columns) {
+  const pinned = parseInt(env.NOLO_TEST_RUN_GIST_WIDTH ?? "", 10);
+  if (!Number.isNaN(pinned) && pinned > 0) return pinned;
+  const cols = typeof columns === "number" ? columns : typeof process !== "undefined" && typeof process.stdout?.columns === "number" ? process.stdout.columns : 0;
+  if (cols > 0) {
+    return Math.max(48, Math.min(160, cols - 32));
+  }
+  return DEFAULT_RUN_GIST_MAX;
+}
+function commandFullGist(command, max) {
+  const oneLine = command.replace(/\s+/g, " ").trim();
+  if (!oneLine) return "";
+  return truncateByDisplayWidth(redactSecrets(oneLine), max);
 }
-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);
+function pathBasenameGist(path) {
+  const segments = path.split(/[\\/]/).filter((segment) => segment.length > 0);
+  const base = segments.pop();
+  return base ? gistClip(base) : "";
+}
+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;
   }
-  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 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));
   }
-  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}`;
+  return DEFAULT_EDIT_SNIPPET_MAX_WIDTH;
+}
+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/);
+  if (lines.at(-1) === "") lines.pop();
+  return lines.slice(0, EDIT_SNIPPET_MAX_LINES).map((line) => buildEditLine(kind, line, maxWidth));
+}
+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;
   }
-  const summary = event.summary ? ` ${event.summary}` : "";
-  return formatToolTraceLine(
-    `[nolo:tool] #${round} <- ${event.toolName}${elapsed}${summary}`,
-    colorEnabled
-  );
+  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 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 bodyLines = part.value.replace(/\n$/, "").split("\n");
+    for (const line of bodyLines) {
+      if (kind === "added") addedCount++;
+      if (kind === "removed") removedCount++;
+      all.push(buildEditLine(kind, line, maxWidth));
+    }
+  }
+  return {
+    lines: windowAndTruncate(all, EDIT_SNIPPET_MAX_LINES),
+    addedCount,
+    removedCount
+  };
+}
+function editFileResultHint(event) {
+  if (event.toolName !== "editFile" || !event.metadata) return null;
+  const res = formatEditFileSnippet(event.metadata);
+  if (!res) return null;
+  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 };
+}
+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 normalToolGistRaw(event) {
+  const metadata = event.metadata ?? {};
+  const toolName = event.toolName || "";
+  if (toolName === "readFile") {
+    const path2 = typeof metadata.path === "string" ? metadata.path : typeof metadata.filePath === "string" ? metadata.filePath : "";
+    if (path2) return gistClip(formatReadItemPath(path2, metadata), 52);
+  }
+  if (toolName === "fetchWebpage") {
+    const url = typeof metadata.url === "string" ? metadata.url : "";
+    if (url) return formatFetchItemUrl(url);
+  }
+  if (toolName === "exa_search") {
+    const query2 = typeof metadata.query === "string" ? metadata.query : typeof metadata.pattern === "string" ? metadata.pattern : "";
+    const path2 = typeof metadata.path === "string" ? metadata.path : void 0;
+    if (query2 || path2) return formatSearchItemQuery(query2, path2);
+  }
+  if (isRunToolName(toolName)) {
+    const command2 = typeof metadata.command === "string" ? metadata.command : "";
+    if (command2) {
+      return commandFullGist(command2, normalRunGistMaxWidth());
+    }
+  }
+  const path = typeof metadata.path === "string" ? metadata.path : "";
+  if (path) return pathBasenameGist(path);
+  const command = typeof metadata.command === "string" ? metadata.command : "";
+  if (command) return commandFullGist(command, normalRunGistMaxWidth());
+  const query = typeof metadata.query === "string" ? metadata.query : "";
+  if (query) return clipCompactText(query, 64, "\u2026");
+  const remembered = event.toolName === "rememberMemory" && typeof metadata.content === "string" ? metadata.content : "";
+  if (remembered) return clipCompactText(redactSecrets(remembered), 64, "\u2026");
+  return "";
+}
+var NORMAL_GIST_SECRET_PATTERNS = [
+  /\bbearer\s+[A-Za-z0-9._~+/=-]{8,}/i,
+  /\bsk-(?:ant-)?(?:api)?[0-9a-zA-Z-]{10,}/,
+  /\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9]{10,}/,
+  /\bxox[baprs]-[A-Za-z0-9-]{10,}/
+];
+function withholdIfSecretLike(gist) {
+  if (!gist) return "";
+  if (findPotentialSecrets(gist).length > 0) return "";
+  if (NORMAL_GIST_SECRET_PATTERNS.some((pattern) => pattern.test(gist))) return "";
+  return gist;
+}
+function normalToolGist(event) {
+  return withholdIfSecretLike(normalToolGistRaw(event));
+}
+function formatNormalToolDuration(elapsedMs) {
+  if (typeof elapsedMs !== "number" || !Number.isFinite(elapsedMs) || elapsedMs <= 500) return "";
+  if (elapsedMs < 1e3) return `${Math.round(elapsedMs)}ms`;
+  return `${(elapsedMs / 1e3).toFixed(1)}s`;
 }
 function formatNormalToolLine(event, pending, colorEnabled) {
   if (event.type === "tool-call") return "";
@@ -4220,158 +4218,42 @@ function formatNormalToolLine(event, pending, colorEnabled) {
     return formatToolTraceLine(`\u25B8 ${label}  ! ${t("toolNeedsAction")}`, colorEnabled, "error");
   }
   if (event.type === "tool-error") {
-    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${t("toolFailed")}`, colorEnabled, "error");
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${toolFailureReason(event) || t("toolFailed")}`, colorEnabled, "error");
   }
   if (event.metadata?.timedOut) {
     return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${t("toolTimedOut")}`, colorEnabled, "error");
   }
   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}
-`;
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${toolFailureReason(event) || t("toolFailed")}`, colorEnabled, "error");
+  }
+  const gist = normalToolGist(event);
+  const hint = editFileResultHint(event);
+  const statsInline = hint?.inline ? ` ${hint.inline}` : "";
+  const durationInline = formatNormalToolDuration(event.elapsedMs);
+  const tail = durationInline ? `  \u2713 ${durationInline}` : "  \u2713";
+  const mainLine = formatToolTraceLine(
+    gist ? `\u25B8 ${label} \xB7 ${gist}${statsInline}${tail}` : `\u25B8 ${label}${statsInline}${tail}`,
+    colorEnabled
+  );
+  if (hint?.detail?.length) {
+    const filePath = typeof event.metadata?.path === "string" ? event.metadata.path : void 0;
+    return `${mainLine}${formatEditDetailBlock(hint.detail, colorEnabled, filePath)}`;
+  }
+  return mainLine;
+}
+function toolFailureReason(event) {
+  const metadata = event.metadata ?? {};
+  const rawError = metadata.error ?? metadata.errorMessage;
+  const raw = typeof rawError === "string" && rawError.trim() || event.message?.trim() || typeof event.content === "string" && event.content.trim() || event.summary?.trim() || "";
+  const lines = raw.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  const sectionLines = (section) => {
+    const start = lines.findIndex((line) => new RegExp(`^${section}\\s*:$`, "i").test(line));
+    if (start < 0) return [];
+    const end = lines.findIndex((line, index) => index > start && /^(stdout|stderr|exitCode)\s*:/i.test(line));
+    return lines.slice(start + 1, end < 0 ? lines.length : end);
+  };
+  const reasonLine = sectionLines("stderr")[0] ?? sectionLines("stdout")[0] ?? lines.find((line) => !/^(stdout|stderr|exitCode)\s*:/i.test(line)) ?? lines[0] ?? "";
+  return reasonLine ? clip(redactSecrets(stripAnsi2(reasonLine)), 96) : "";
 }
 function resolveLoadSkillName(event) {
   const metaName = typeof event.metadata?.name === "string" ? event.metadata.name : void 0;
@@ -4436,326 +4318,63 @@ function formatLoadSkillBlock(event, colorEnabled, opts) {
   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");
+    item = withholdIfSecretLike(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;
@@ -4973,10 +4592,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;
@@ -4995,6 +4612,7 @@ function createCliTurnOutput(params) {
     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)))}
 `);
   };
@@ -5003,7 +4621,7 @@ function createCliTurnOutput(params) {
   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);
     }
@@ -5013,6 +4631,7 @@ 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;
@@ -5036,7 +4655,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);
@@ -5054,8 +4672,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);
     }
@@ -5068,16 +4686,8 @@ ${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) {
@@ -5105,10 +4715,6 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       if (flushedThink.content) {
         writeVisibleAssistantChunk(flushedThink.content);
       }
-      const pendingToolOutput = formatToolEvent.flush ? formatToolEvent.flush() : "";
-      if (pendingToolOutput) {
-        writeToolOutput(pendingToolOutput);
-      }
       if (streamedAssistantText) {
         renderWriter.flush();
         options.output.write("\n");
@@ -5309,10 +4915,12 @@ ${describeClientVersionTooOldFailure(message, error)}`);
   if (usageText && shouldShowUsage(options.env))
     options.output.write(`${usageText}
 `);
+  const turnCredits = platformCreditsFromUsage(usage);
   return {
     exitCode: 0,
     ...dialogId ? { dialogId } : {},
-    turnTokens: buildTurnTokenUsage(usage, options.agentKey)
+    turnTokens: buildTurnTokenUsage(usage, options.agentKey),
+    ...turnCredits !== void 0 ? { turnCredits } : {}
   };
 }
 
@@ -5592,10 +5200,14 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-PCJJ56J2.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-K327ELSL.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();
+var pickEmptyAssistantFlags = (result) => ({
+  ...result.emptyAssistantFallbackReason ? { emptyAssistantFallbackReason: result.emptyAssistantFallbackReason } : {},
+  ...result.emptyAssistantOutputUsable ? { emptyAssistantOutputUsable: true } : {}
+});
 function extractEmbeddedErrorMessage(message) {
   const match = /"message"\s*:\s*"((?:[^"\\]|\\.)*)"/.exec(message);
   if (!match) return void 0;
@@ -6133,13 +5745,17 @@ ${options.agentName} > (no text response)
   const usage = formatUsage(data?.usage, data?.dialogId);
   if (usage && shouldShowUsage(options.env)) options.output.write(`${usage}
 `);
+  const turnCredits = platformCreditsFromUsage(
+    data?.usage
+  );
   return {
     exitCode: 0,
     ...typeof data?.dialogId === "string" && data.dialogId ? { dialogId: data.dialogId } : {},
     turnTokens: buildTurnTokenUsage(
       data?.usage,
       typeof data?.model === "string" ? data.model : options.agentKey
-    )
+    ),
+    ...turnCredits !== void 0 ? { turnCredits } : {}
   };
 }
 async function runInjectedLocalAgentTurn(options) {
@@ -6244,11 +5860,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);
@@ -6259,24 +5877,35 @@ async function runLocalAgentTurnForCli(options, settings) {
       } : {}
     });
     turnOutput.finish(result.content);
+    const turnCredits = sumPlatformCredits(result.usageRecords);
     return {
       exitCode: 0,
       dialogId: result.dialogId,
       title: result.title,
       ...result.titlePatchPromise ? { titlePatchPromise: result.titlePatchPromise } : {},
-      ...result.emptyAssistantFallbackReason ? { emptyAssistantFallbackReason: result.emptyAssistantFallbackReason } : {},
-      turnTokens: buildTurnTokenUsage(result.usage, result.model)
+      ...pickEmptyAssistantFlags(result),
+      // 积分口径按「全轮」而非「最后一次调用」：result.usage 只是收尾那次
+      // provider 调用的 usage，本轮前面 N-1 次工具循环调用（以及自动压缩摘要）
+      // 的 cost 都只存在于 usageRecords 里。token 字段仍取 result.usage——
+      // 上下文占用本来就该看最后一次调用的累计输入，不是各次相加。
+      turnTokens: withTurnCredits(buildTurnTokenUsage(result.usage, result.model), turnCredits),
+      ...turnCredits !== void 0 ? { turnCredits } : {},
+      ...result.usageRecords?.length ? { usageRecords: result.usageRecords } : {}
     };
   } catch (error) {
     turnOutput.spinner.stop();
     const savedDialogId = error?.dialogId;
+    const abortedUsageRecords = error?.usageRecords;
+    const abortedTurnCredits = sumPlatformCredits(abortedUsageRecords);
     if (error?.code === LOCAL_TURN_ABORTED_CODE || options.abortSignal?.aborted) {
       const pendingToolName = error?.pendingToolName;
       return {
         exitCode: 0,
         streamInterrupted: true,
         ...savedDialogId ? { dialogId: savedDialogId } : {},
-        ...pendingToolName ? { pendingToolName } : {}
+        ...pendingToolName ? { pendingToolName } : {},
+        ...abortedTurnCredits !== void 0 ? { turnCredits: abortedTurnCredits } : {},
+        ...abortedUsageRecords?.length ? { usageRecords: abortedUsageRecords } : {}
       };
     }
     const cooldownUntil = await markStartupRateLimitCooldown(
@@ -6302,10 +5931,70 @@ async function runLocalAgentTurnForCli(options, settings) {
     return {
       exitCode: 1,
       localError: error,
-      ...savedDialogId ? { dialogId: savedDialogId } : {}
+      ...savedDialogId ? { dialogId: savedDialogId } : {},
+      ...abortedTurnCredits !== void 0 ? { turnCredits: abortedTurnCredits } : {},
+      ...abortedUsageRecords?.length ? { usageRecords: abortedUsageRecords } : {}
     };
   }
 }
+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 };
+}
+function foldLocalResultForTui(localResult) {
+  return {
+    exitCode: localResult.exitCode,
+    ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
+    title: localResult.title,
+    ...localResult.titlePatchPromise ? { titlePatchPromise: localResult.titlePatchPromise } : {},
+    // 空 assistant 兜底成因必须随行：后台 run 的结算（resolveRunOutcome 的
+    // isStalledOrTruncated）靠它把截断轮判成 stalled 而不是 clean 失败。
+    ...pickEmptyAssistantFlags(localResult),
+    ...localResult.turnTokens ? { turnTokens: localResult.turnTokens } : {},
+    // 平台积分必须随行：runLocalAgentTurnForCli 里 sumPlatformCredits 已按
+    // 「全轮逐次求和」算好（只认 billing_unit === "credits" 的平台计费帧）。
+    ...localResult.turnCredits !== void 0 ? { turnCredits: localResult.turnCredits } : {},
+    // 逐帧用量明细必须随行：cli-local 计费走 fail-open 客户端记账，服务端没有
+    // 逐帧记录，TUI 计费审计（appendTurnBillingAudit）要靠它对账。白名单历史上
+    // 漏过 turnCredits（fix/tui-session-credits），usageRecords 是同坑位新字段。
+    ...localResult.usageRecords?.length ? { usageRecords: localResult.usageRecords } : {},
+    ...localResult.streamInterrupted ? { streamInterrupted: localResult.streamInterrupted } : {},
+    ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {}
+  };
+}
 async function runAgentTurn(options) {
   const authToken = resolveAuthToken2(options.env);
   const runtimeMode = resolveRequestedRuntimeMode(options);
@@ -6319,15 +6008,7 @@ async function runAgentTurn(options) {
         reportFailure: false
       });
       if (localResult.exitCode === 0) {
-        return {
-          exitCode: localResult.exitCode,
-          ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
-          title: localResult.title,
-          ...localResult.titlePatchPromise ? { titlePatchPromise: localResult.titlePatchPromise } : {},
-          ...localResult.turnTokens ? { turnTokens: localResult.turnTokens } : {},
-          ...localResult.streamInterrupted ? { streamInterrupted: localResult.streamInterrupted } : {},
-          ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {}
-        };
+        return foldLocalResultForTui(localResult);
       }
       if (isMissingLocalAgentConfigError(localResult.localError, options.agentKey)) {
         options.output.write(
@@ -6341,13 +6022,7 @@ async function runAgentTurn(options) {
               reportFailure: false
             });
             if (retriedLocalResult.exitCode === 0) {
-              return {
-                exitCode: retriedLocalResult.exitCode,
-                ...retriedLocalResult.dialogId ? { dialogId: retriedLocalResult.dialogId } : {},
-                title: retriedLocalResult.title,
-                ...retriedLocalResult.titlePatchPromise ? { titlePatchPromise: retriedLocalResult.titlePatchPromise } : {},
-                ...retriedLocalResult.turnTokens ? { turnTokens: retriedLocalResult.turnTokens } : {}
-              };
+              return foldLocalResultForTui(retriedLocalResult);
             }
           }
         } catch {
@@ -6360,7 +6035,11 @@ async function runAgentTurn(options) {
         ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
         // Keep localError so TUI can show balance/quota/dialog-preserved hints
         // instead of only the raw auto-runtime line.
-        ...localResult.localError ? { localError: localResult.localError } : {}
+        ...localResult.localError ? { localError: localResult.localError } : {},
+        // 失败轮同样可能已发生平台计费（abort/失败照样扣费）：turnCredits 与
+        // 逐帧明细一起随行，否则审计日志在 auto 失败路径上缺账。
+        ...localResult.turnCredits !== void 0 ? { turnCredits: localResult.turnCredits } : {},
+        ...localResult.usageRecords?.length ? { usageRecords: localResult.usageRecords } : {}
       };
     }
   }
@@ -6370,26 +6049,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`);
@@ -6402,21 +6105,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,
@@ -6433,8 +6136,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}
@@ -6445,8 +6148,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 [
@@ -6473,10 +6176,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);
   }
@@ -6581,8 +6284,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) {
@@ -6665,6 +6368,19 @@ var touchMemoryItemsInDb = async (db, items, now = (/* @__PURE__ */ new Date()).
 // packages/ai/memory/constants.ts
 var EXPLICIT_REMEMBER_PREFIX_REGEX = /^(你要记住|请记住|以后记住|记住)[，,。.\s:：]*/u;
 
+// packages/ai/memory/source.ts
+var getMemorySourceKind = (item) => {
+  if (item.sourceKind) return item.sourceKind;
+  if (item.patternKey === "explicit-remember") return "explicit-user-directive";
+  if (item.patternKey === "agent-remember" || item.patternKey === "procedural-runbook")
+    return "agent-tool";
+  if (item.patternKey?.startsWith("dialog-learning:"))
+    return "dialog-learning";
+  if (item.tags?.includes("understanding-memory"))
+    return "inferred-understanding";
+  return "agent-tool";
+};
+
 // packages/ai/memory/overlay.ts
 var KIND_TITLES = {
   episodic: "Episodic",
@@ -6698,6 +6414,8 @@ var FACET_DISPLAY = {
   style: { label: "\u66F4\u504F\u597D", strip: "\u66F4\u559C\u6B22" },
   goal: { label: "\u60F3\u63A8\u8FDB", strip: "\u60F3\u63A8\u8FDB" }
 };
+var INFERRED_SOURCE_KINDS = /* @__PURE__ */ new Set(["inferred-understanding", "dialog-learning"]);
+var isInferredMemory = (item) => INFERRED_SOURCE_KINDS.has(getMemorySourceKind(item));
 var formatFacetContent = (facet, normalized, prefix) => {
   const { label, strip } = FACET_DISPLAY[facet];
   const stripped = normalized.startsWith(strip) ? normalized.slice(strip.length).trim() : normalized;
@@ -6719,9 +6437,79 @@ var normalizeDisplayContent = (item) => {
   }
   return normalized;
 };
+var pickWithinKind = (list, perKindLimit) => {
+  if (perKindLimit <= 0) return [];
+  const head = list.slice(0, perKindLimit);
+  if (head.length < perKindLimit) return head;
+  if (head.some((item) => item.subjectType === "user")) return head;
+  const firstUserSubject = list.find((item) => item.subjectType === "user");
+  if (!firstUserSubject) return head;
+  return [...head.slice(0, perKindLimit - 1), firstUserSubject];
+};
+var DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET = 3200;
+var MIN_TRUNCATED_TOKENS = 20;
+var TRUNCATED_SUFFIX = "\u2026\uFF08\u672C\u6761\u5DF2\u622A\u65AD\uFF09";
+var truncateLineToTokens = (lineText, budgetTokens) => {
+  if (budgetTokens < MIN_TRUNCATED_TOKENS) return null;
+  const suffixTokens = estimateTokens(TRUNCATED_SUFFIX);
+  const bodyBudget = budgetTokens - suffixTokens;
+  if (bodyBudget < MIN_TRUNCATED_TOKENS / 2) return null;
+  let used = 0;
+  let cut = 0;
+  for (const ch of lineText) {
+    const chTokens = estimateTokens(ch);
+    if (used + chTokens > bodyBudget) break;
+    used += chTokens;
+    cut += ch.length;
+  }
+  if (cut <= 2) return null;
+  return `${lineText.slice(0, cut).trimEnd()}${TRUNCATED_SUFFIX}`;
+};
+var fitLinesToBudget = (allLines, remainingBudget) => {
+  let usedTokens = 0;
+  const keptByKind = {};
+  let truncatedCount = 0;
+  let droppedCount = 0;
+  const pushLine = (kind, lineText) => {
+    if (!keptByKind[kind]) keptByKind[kind] = [];
+    keptByKind[kind].push(lineText);
+  };
+  for (const candidate of allLines) {
+    const remaining = remainingBudget - usedTokens;
+    if (remaining <= 0) {
+      droppedCount += 1;
+      continue;
+    }
+    if (candidate.lineTokens <= remaining) {
+      usedTokens += candidate.lineTokens;
+      pushLine(candidate.kind, candidate.lineText);
+      continue;
+    }
+    const truncated = truncateLineToTokens(candidate.lineText, remaining);
+    if (!truncated) {
+      droppedCount += 1;
+      continue;
+    }
+    usedTokens += estimateTokens(truncated);
+    pushLine(candidate.kind, truncated);
+    truncatedCount += 1;
+  }
+  return { keptByKind, truncatedCount, droppedCount };
+};
+var buildBudgetFooter = (fit) => {
+  const notices = [];
+  if (fit.truncatedCount > 0) {
+    notices.push(`${fit.truncatedCount} \u6761\u56E0\u9884\u7B97\u88AB\u622A\u65AD`);
+  }
+  if (fit.droppedCount > 0) {
+    notices.push(`${fit.droppedCount} \u6761\u672A\u663E\u793A`);
+  }
+  if (notices.length === 0) return [];
+  return [`\uFF08${notices.join("\u3001")}\uFF1B\u9700\u8981\u5B8C\u6574\u5185\u5BB9\u6216\u66F4\u591A\u76F8\u5173\u8BB0\u5FC6\u65F6\u7528 queryMemory \u68C0\u7D22\uFF09`];
+};
 var buildMemoryOverlay = (items, options) => {
   if (items.length === 0) return null;
-  const maxTokens = options?.maxTokens ?? 2e3;
+  const maxTokens = options?.maxTokens ?? DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET;
   const perKindLimit = options?.perKindLimit ?? 3;
   const byKind = {
     episodic: [],
@@ -6736,19 +6524,15 @@ var buildMemoryOverlay = (items, options) => {
     return OVERLAY_HEADER_LINES.join("\n");
   }
   const allLines = Object.entries(byKind).filter(([, list]) => list.length > 0).flatMap(
-    ([kind, list]) => list.slice(0, perKindLimit).map((item) => {
-      const lineText = `- ${normalizeDisplayContent(item)}`;
+    ([kind, list]) => pickWithinKind(list, perKindLimit).map((item) => {
+      const lineText = `- ${isInferredMemory(item) ? "\uFF08\u63A8\u65AD\uFF09" : ""}${normalizeDisplayContent(item)}`;
       return { kind, lineText, lineTokens: estimateTokens(lineText) };
     })
   ).sort((a, b) => (KIND_PRIORITY[a.kind] ?? 99) - (KIND_PRIORITY[b.kind] ?? 99));
-  let usedTokens = 0;
-  const keptByKind = {};
-  for (const candidate of allLines) {
-    if (usedTokens + candidate.lineTokens > remainingBudget) continue;
-    usedTokens += candidate.lineTokens;
-    if (!keptByKind[candidate.kind]) keptByKind[candidate.kind] = [];
-    keptByKind[candidate.kind].push(candidate.lineText);
-  }
+  const { keptByKind, truncatedCount, droppedCount } = fitLinesToBudget(
+    allLines,
+    remainingBudget
+  );
   const kindOrder = ["semantic", "procedural", "episodic"];
   const sections = kindOrder.filter((kind) => keptByKind[kind] && keptByKind[kind].length > 0).map((kind) => {
     return [`[${KIND_TITLES[kind]}]`, ...keptByKind[kind]].join("\n");
@@ -6756,7 +6540,7 @@ var buildMemoryOverlay = (items, options) => {
   if (sections.length === 0) {
     return OVERLAY_HEADER_LINES.join("\n");
   }
-  return [...OVERLAY_HEADER_LINES, ...sections].join("\n");
+  return [...OVERLAY_HEADER_LINES, ...sections, ...buildBudgetFooter({ keptByKind, truncatedCount, droppedCount })].join("\n");
 };
 
 // packages/ai/memory/rank.ts
@@ -6803,13 +6587,28 @@ var identifierScore = (query, item) => {
   ).length;
   return matches / identifiers.length;
 };
-var activationScore = (item, nowMs) => {
+var DAY_MS = 864e5;
+var UNPROVEN_MEMORY_GRACE_DAYS = 3;
+var MIN_UNPROVEN_SCORE_FACTOR = 0.3;
+var UNPROVEN_DECAY_HALF_LIFE_DAYS = 7;
+var provenActivationScore = (item, nowMs) => {
   const lastActivatedMs = Date.parse(item.lastActivatedAt || item.createdAt);
-  const ageDays = Math.max(0, (nowMs - lastActivatedMs) / 864e5);
+  const ageDays = Math.max(0, (nowMs - lastActivatedMs) / DAY_MS);
   const recency = 1 / (1 + ageDays / 7);
   const reinforcement = Math.min(1, Math.log1p(item.activationCount ?? 0) / 3);
   return 0.7 * recency + 0.3 * reinforcement;
 };
+var unprovenDecayFactor = (item, nowMs) => {
+  if ((item.activationCount ?? 0) !== 0) return 1;
+  const createdAgeDays = Math.max(0, (nowMs - Date.parse(item.createdAt)) / DAY_MS);
+  if (createdAgeDays <= UNPROVEN_MEMORY_GRACE_DAYS) return 1;
+  const overdue = createdAgeDays - UNPROVEN_MEMORY_GRACE_DAYS;
+  return Math.max(
+    MIN_UNPROVEN_SCORE_FACTOR,
+    1 / (1 + overdue / UNPROVEN_DECAY_HALF_LIFE_DAYS)
+  );
+};
+var activationScore = (item, nowMs) => provenActivationScore(item, nowMs) * unprovenDecayFactor(item, nowMs);
 var creationRecencyScore = (item, nowMs) => {
   const createdMs = Date.parse(item.createdAt);
   const ageDays = Math.max(0, (nowMs - createdMs) / 864e5);
@@ -6865,7 +6664,7 @@ var rankMemoryCandidates = (items, query, context) => {
 
 // packages/ai/memory/runtime.ts
 var COLD_STORAGE_CONFIDENCE = 0.3;
-var MEMORY_OVERLAY_TOKEN_BUDGET = 2e3;
+var MEMORY_OVERLAY_TOKEN_BUDGET = DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET;
 var normalizeSelectedContent = (text) => text.trim().replace(EXPLICIT_REMEMBER_PREFIX_REGEX, "").replace(/[。！？!?]+$/u, "").trim();
 var STACK_TERMS = [
   "typescript",
@@ -6967,6 +6766,7 @@ var selectRuntimeMemoryItems = (items, context, userInput = "") => {
   );
   add(unique.find((item) => item.ownerType === "user"));
   add(unique.find((item) => item.ownerType === "space"));
+  add(unique.find((item) => item.subjectType === "user"));
   add(unique.find((item) => item.kind === "procedural"));
   for (const item of unique) {
     add(item);
@@ -7086,6 +6886,36 @@ 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 };
+    }
+  }
+}
+var FAILED_EMPTY_ASSISTANT_REASONS = /* @__PURE__ */ new Set([
+  "length_truncated",
+  "stream_truncated",
+  "repetition_loop",
+  "stagnant_tool_calls"
+]);
+var isRunResultStalledOrTruncated = (result) => !result.emptyAssistantOutputUsable && FAILED_EMPTY_ASSISTANT_REASONS.has(result.emptyAssistantFallbackReason ?? "");
+var resolveRunSettlementNote = (result) => {
+  const reason = result.emptyAssistantFallbackReason;
+  if (!reason || !FAILED_EMPTY_ASSISTANT_REASONS.has(reason)) return {};
+  if (result.emptyAssistantOutputUsable) {
+    return { note: `output complete but stream lacked finish frame: ${reason}` };
+  }
+  return { note: `empty assistant output: ${reason}` };
+};
 async function resolveAgentRunAgentKey(args) {
   if (!args.agentInput.trim() || args.agentInput.startsWith("agent-")) {
     return void 0;
@@ -7121,11 +6951,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,
@@ -7138,7 +6971,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;
@@ -7148,7 +6981,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();
@@ -7166,31 +7007,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;
@@ -7345,22 +7180,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) {
@@ -7441,6 +7262,7 @@ async function runAgentRunCommand(args, deps) {
     })
   );
   clearWatchdogs();
+  let runCreditsTotal = result.turnCredits;
   if (result.exitCode !== 0 && isQuotaExhaustedError(result.localError) && isLocalRun && parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0) {
     const fallbackAgentKey = parsed.fallbackAgentKeys[0];
     output.write(
@@ -7456,7 +7278,11 @@ async function runAgentRunCommand(args, deps) {
     clearWatchdogs();
     if (fallbackResult.exitCode === 0) {
       result = fallbackResult;
-    } else {
+    }
+    if (fallbackResult.turnCredits !== void 0) {
+      runCreditsTotal = (runCreditsTotal ?? 0) + fallbackResult.turnCredits;
+    }
+    if (fallbackResult.exitCode !== 0) {
       result = {
         ...fallbackResult,
         ...fallbackResult.dialogId || result.dialogId ? { dialogId: fallbackResult.dialogId ?? result.dialogId } : {}
@@ -7499,6 +7325,9 @@ async function runAgentRunCommand(args, deps) {
         );
         clearWatchdogs();
         result = turnResult;
+        if (turnResult.turnCredits !== void 0) {
+          runCreditsTotal = (runCreditsTotal ?? 0) + turnResult.turnCredits;
+        }
         if (result.exitCode !== 0) {
           break;
         }
@@ -7549,15 +7378,22 @@ 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 isStalledOrTruncated = isRunResultStalledOrTruncated(result);
+    const truncationNote = resolveRunSettlementNote(result);
+    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,
+        // run 级累计的平台积分（主轮 + fallback + drain 轮）：dock 行据此显示
+        // 「⚡ x.xx」，让派发任务的消耗可见。undefined = 全程无平台计费。
+        ...runCreditsTotal !== void 0 ? { credits: runCreditsTotal } : {},
         ...truncationNote
       },
       {
@@ -7602,6 +7438,7 @@ function isBalanceExhaustedError(error) {
 export {
   resolveAgentModelIdentity,
   resolveAgentContextWindow,
+  formatCreditsChip,
   formatTokenCount,
   renderTokenStatus,
   resolveCliColorEnabled,
@@ -7640,8 +7477,10 @@ export {
   themeText,
   tuiRenderThemeFingerprint,
   setMathRenderingEnabled,
+  polishBreathInsertsBlankBetween,
   formatAssistantDisplay,
-  normalizeToolDisplayMode,
+  redactSecrets,
+  TUI_TREE_MARKER,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,
   createCollapsedPasteStore,
@@ -7653,6 +7492,7 @@ export {
   expandRangeToCollapsedPasteChips,
   findCollapsedPasteSpanAt,
   runAgentTurn,
+  readAgentsMdLayerFromDisk,
   resolveWorkflowReference,
   resolveSkillReference,
   buildSkillContextBlocks,
@@ -7660,6 +7500,9 @@ export {
   normalizeCliImageInput,
   inspectLocalRunWorkspace,
   resolveCliMemory,
+  resolveRunOutcome,
+  isRunResultStalledOrTruncated,
+  resolveRunSettlementNote,
   runAgentRunCommand,
   isBalanceExhaustedError
 };