nolo-cli 0.107.0-alpha.3 → 0.107.0

package/{chunk-C63CN6KA.js → chunk-6IJDSYUA.js}

@@ -1,6 +1,6 @@
 import {
   findPotentialSecrets
-} from "./chunk-S7Z2HMCN.js";
+} from "./chunk-VJVNU77E.js";
 import {
   buildLocalRunEnv,
   isFullstackCodingAgentRef,
@@ -10,9 +10,6 @@ import {
   resolveServerUrl,
   writeUsage
 } from "./chunk-V7E4PXQD.js";
-import {
-  resolveMachineId
-} from "./chunk-ESHYE7WU.js";
 import {
   agentRunCardLabels,
   createCliLocalRuntimeAdapter,
@@ -29,57 +26,55 @@ import {
   resolveFileWriteGateEnabled,
   resolveLocalUserId,
   t,
-  toolLabel
-} from "./chunk-VFEJQMH4.js";
-import {
-  createRunActivityTracker,
-  popSingleQueueMessage,
-  readRunRecord,
-  resolveRunQueuePath,
-  settleRunTerminalAuthoritatively,
-  spawnLocalBackgroundRun
-} from "./chunk-I3TQJXQ7.js";
+  toolLabel,
+  toolLabelVariants
+} from "./chunk-SQHMSDDU.js";
 import {
   clearCredentialAvailability,
   readCredentialEntry,
-  recordCredentialProbe,
-  resolveCredentialKeyWithFallback
-} from "./chunk-42V6BK2E.js";
+  recordCredentialProbe
+} from "./chunk-62IL3KQV.js";
 import {
   getReadableCliDb
-} from "./chunk-LS2ZANRJ.js";
+} from "./chunk-LOCNXNOU.js";
+import {
+  _appendEntityBatch,
+  _appendEvidenceBatch,
+  _appendRelationBatch,
+  _appendRetiredStateBatch,
+  _appendStateBatch,
+  getMemoryEntityVNext,
+  getMemoryEvidenceVNext,
+  getMemoryEvidenceVNextStrict,
+  getMemoryStateVNext,
+  listMemoryStatesForEntityVNext,
+  loadMemoryVNextCatalog,
+  putMemoryEvidenceVNext
+} from "./chunk-TY3TIUJK.js";
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-AEOE4Z6Q.js";
+} from "./chunk-K6L5PNXK.js";
 import {
   isLocalCliAgentKey
 } from "./chunk-SV5IJK6K.js";
 import {
   CliProviderQuotaError
 } from "./chunk-MP64VFGD.js";
+import {
+  resolveMachineId
+} from "./chunk-ESHYE7WU.js";
 import {
   applyModelLayerOverride,
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
-import {
-  formatAgentListCard
-} from "./chunk-C3M4465B.js";
-import {
-  isTransientFetchError
-} from "./chunk-5UTFL4QJ.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
 import {
-  formatFinishedRunCard,
-  formatListRunsCard,
-  formatNotFoundRunCard,
-  formatStartRunCard,
-  formatStatusRunCard,
-  formatStopRunCard,
-  isAgentRunTerminalStatus
-} from "./chunk-3VNWWVKB.js";
+  isTransientFetchError,
+  parsePositiveFiniteNumberOrFallback
+} from "./chunk-AOTBKDRK.js";
 import {
   extractGoogleValidationLink
 } from "./chunk-BMQ2MJUK.js";
@@ -88,37 +83,55 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-IBOZNTG2.js";
+} from "./chunk-DGEUP3DK.js";
 import {
-  API_REPORTED_COST_MULTIPLIER,
-  parseUiAskChoiceContent
-} from "./chunk-T75QD6AB.js";
+  createRunActivityTracker,
+  popSingleQueueMessage,
+  readRunRecord,
+  resolveRunQueuePath,
+  settleRunTerminalAuthoritatively,
+  spawnLocalBackgroundRun
+} from "./chunk-U3C3IA32.js";
 import {
-  isOAuthApiKeyRef
-} from "./chunk-YYLHWIW6.js";
+  formatAgentListCard,
+  formatFinishedRunCard,
+  formatListRunsCard,
+  formatNotFoundRunCard,
+  formatStartRunCard,
+  formatStatusRunCard,
+  formatStopRunCard,
+  isAgentRunTerminalStatus
+} from "./chunk-E3YWHWCR.js";
 import {
   isCliAuthorityBrokerProtocolError,
   isCliAuthorityBrokerTimeoutError,
   isCliAuthorityBrokerUnavailableError
-} from "./chunk-TRV2MIDW.js";
+} from "./chunk-EXAJ6DCR.js";
 import {
   getDefaultCliLocalRuntimeDb
-} from "./chunk-2F7RJC6L.js";
+} from "./chunk-FOXQ7BAB.js";
+import {
+  API_REPORTED_COST_MULTIPLIER,
+  parseUiAskChoiceContent
+} from "./chunk-7AY2H3GA.js";
+import {
+  isOAuthApiKeyRef
+} from "./chunk-UKZX3NHN.js";
 import {
   buildSkillDiscoveryContextLayer
-} from "./chunk-E4MARS3Q.js";
+} from "./chunk-5GVBDNTO.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
-} from "./chunk-Q554LLSI.js";
+} from "./chunk-DMXLXZKL.js";
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-62CATUYY.js";
+} from "./chunk-CBUMFIFE.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-4MK3I7Y4.js";
+} from "./chunk-6MAW4XOF.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -129,57 +142,55 @@ import {
   isQuotaExhaustedError,
   isQuotaLimited403Body,
   mergeAvailabilityDeadline,
-  resolveCooldownGate
-} from "./chunk-FDTR4QJ6.js";
-import {
-  isAntigravityOAuthAgent
-} from "./chunk-UZGQNTVW.js";
-import {
-  resolveClientVersion
-} from "./chunk-6OZ36FXI.js";
+  resolveCooldownGate,
+  resolveCredentialKeyWithFallback
+} from "./chunk-H6A6X4EK.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow,
   normalizeUsage
-} from "./chunk-HKNXJGEC.js";
+} from "./chunk-ECFHBYUW.js";
 import {
   clipCompactText
-} from "./chunk-P5EVSOPA.js";
-import {
-  findModelConfig
-} from "./chunk-OIVSQH2O.js";
+} from "./chunk-5MMAK75Q.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
 import {
   buildAgentsMdLayer,
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-DVINR3PL.js";
+} from "./chunk-HDLLCBRF.js";
 import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-X7HHHIOZ.js";
+  isAntigravityOAuthAgent
+} from "./chunk-KHKTDMYG.js";
+import {
+  resolveClientVersion
+} from "./chunk-BIPGGSJS.js";
+import {
+  findModelConfig
+} from "./chunk-CDEEFJXN.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
+import {
+  getLogger,
+  normalizeError
+} from "./chunk-YV25TM3R.js";
 import {
   resolveAuthToken
 } from "./chunk-A7GB5UGH.js";
+import {
+  readPipeText,
+  spawnProcess
+} from "./chunk-Y6ROFCZO.js";
 import {
   CLIENT_VERSION_TOO_OLD_CODE,
   NOLO_CLIENT_VERSION_HEADER,
   buildClientVersionUpgradeMessage
-} from "./chunk-Q67DOFOO.js";
-import {
-  parsePositiveFiniteNumberOrFallback
-} from "./chunk-Y5GCAMGP.js";
-import {
-  createMemoryKey,
-  ulid
-} from "./chunk-VMFTFOWF.js";
+} from "./chunk-SZC4REES.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
@@ -187,13 +198,14 @@ import {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById
-} from "./chunk-BNGW5ASC.js";
+} from "./chunk-I2RGRVQ7.js";
 import {
   parsePublicAgentId
 } from "./chunk-M2EJHDJP.js";
 import {
-  isLevelNotFoundError
-} from "./chunk-OW765XBU.js";
+  createMemoryKey,
+  ulid
+} from "./chunk-OKGVNZTL.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
@@ -8206,7 +8218,12 @@ function emitPlainGap(text, keywords, info, accent, warning, reset) {
 var UNORDERED_LIST_RE = /^(\s*)([-*+])\s+(.+)$/;
 var ORDERED_LIST_RE = /^(\s*)(\d+)\.\s+(.+)$/;
 var TASK_LIST_RE = /^(\s*)([-*+])\s+\[([ xX])\]\s+(.+)$/;
+var THEMATIC_BREAK_PATTERN = "(?:(-[ \\t]*){3,}|(\\*[ \\t]*){3,}|(_[ \\t]*){3,})";
+var THEMATIC_BREAK_RE = new RegExp(`^[ ]{0,3}${THEMATIC_BREAK_PATTERN}$`);
 function normalizeListLine(line) {
+  if (THEMATIC_BREAK_RE.test(line)) {
+    return line;
+  }
   const task = line.match(TASK_LIST_RE);
   if (task) {
     const checked = task[3] === "x" || task[3] === "X";
@@ -8222,12 +8239,99 @@ function normalizeListLine(line) {
   }
   return line;
 }
+var TOOL_TREE_HEADER_RE = /^•\s+(.+?)\s+\((\d+)\)$/;
+var TOOL_TREE_LEAF_RE = /^([├└]──\s+)(.*?)\s{2}(✓|✗|!)(?:\s+(.*))?$/;
+var TOOL_SINGLE_RE = /^▸\s+(.+?)(?:\s+·\s+(.*?))?(?:\s{2}(✓|✗|!)(?:\s+(.*))?)$/;
+function plainToolLine(line) {
+  return stripAnsi2(line);
+}
+var TOOL_TREE_GROUP_LABELS = new Set(
+  ["execShell", "readFile", "fetchWebpage", "exa_search"].flatMap(toolLabelVariants)
+);
+function isKnownToolGroupLabel(label) {
+  return TOOL_TREE_GROUP_LABELS.has(label);
+}
+function toolTreeHeaderMatch(line) {
+  const match = plainToolLine(line).match(TOOL_TREE_HEADER_RE);
+  return match && isKnownToolGroupLabel(match[1]) ? match : null;
+}
+function isToolTreeHeaderLine(line) {
+  return toolTreeHeaderMatch(line) !== null;
+}
+function isToolTreeLeafLine(line) {
+  return TOOL_TREE_LEAF_RE.test(plainToolLine(line));
+}
+function isToolSingleLine(line) {
+  return TOOL_SINGLE_RE.test(plainToolLine(line));
+}
+function isToolGroupBoundary(cur, next) {
+  return isToolTreeLeafLine(cur) && isToolTreeHeaderLine(next);
+}
+function statusColorSeq(marker, brightness) {
+  if (marker === "\u2713") return colorSeq("success", brightness);
+  if (marker === "\u2717") return colorSeq("danger", brightness);
+  return colorSeq("warning", brightness);
+}
+function styleTuiToolLine(line, brightness) {
+  const plain = plainToolLine(line);
+  const chrome = colorSeq("chrome", brightness);
+  const muted = colorSeq("muted", brightness);
+  const header = toolTreeHeaderMatch(plain);
+  if (header) {
+    return `${chrome}\u2022${STYLE.reset} ${STYLE.bold}${muted}${header[1]}${STYLE.reset} ${chrome}${STYLE.dim}(${header[2]})${STYLE.reset}`;
+  }
+  const leaf = plain.match(TOOL_TREE_LEAF_RE);
+  if (leaf) {
+    const [, connector, detail, marker, statusDetail] = leaf;
+    let rendered = `${chrome}${connector}${STYLE.reset}${chrome}${detail}${STYLE.reset}`;
+    rendered += `  ${statusColorSeq(marker, brightness)}${marker}${STYLE.reset}`;
+    if (statusDetail) {
+      const metaSeq = marker === "\u2713" ? chrome : statusColorSeq(marker, brightness);
+      rendered += ` ${metaSeq}${STYLE.dim}${statusDetail}${STYLE.reset}`;
+    }
+    return rendered;
+  }
+  const single = plain.match(TOOL_SINGLE_RE);
+  if (single) {
+    const [, label, detail, marker, statusDetail] = single;
+    let rendered = `${chrome}\u25B8${STYLE.reset} ${STYLE.bold}${muted}${label}${STYLE.reset}`;
+    if (detail) rendered += ` ${chrome}\xB7 ${detail}${STYLE.reset}`;
+    rendered += `  ${statusColorSeq(marker, brightness)}${marker}${STYLE.reset}`;
+    if (statusDetail) {
+      const metaSeq = marker === "\u2713" ? chrome : statusColorSeq(marker, brightness);
+      rendered += ` ${metaSeq}${STYLE.dim}${statusDetail}${STYLE.reset}`;
+    }
+    return rendered;
+  }
+  return null;
+}
 function isPolishListLikeLine(line) {
-  return LIST_LIKE_RE_FOR_GUARD.test(normalizeListLine(line));
+  return LIST_LIKE_RE_FOR_GUARD.test(normalizeListLine(plainToolLine(line)));
+}
+var LIST_LIKE_RE_FOR_GUARD = /^\s*(?:•|◦|☐|☑|\d+\.)\s|^\s*[\u2460-\u2473]|^\s*[├└]──\s|^\s*▸\s/;
+function isPolishFenceInteriorLine(line) {
+  return /^\x00F\d+\x00$/.test(line);
+}
+function polishHeadingLevel(line) {
+  const match = stripAnsi2(line).match(/^(#{1,6})\s/);
+  return match ? match[1].length : null;
+}
+function isPolishHeadingLine(line) {
+  return polishHeadingLevel(line) !== null;
+}
+function isPolishIntroLine(line) {
+  const plain = stripAnsi2(line).trimEnd();
+  return plain.endsWith("\uFF1A") || plain.endsWith(":");
 }
-var LIST_LIKE_RE_FOR_GUARD = /^\s*(?:•|☐|☑|\d+\.)\s|^\s*[\u2460-\u2473]|^\s*[├└]──\s/;
 function polishBreathInsertsBlankBetween(cur, next) {
   if (cur === "" || next === "") return false;
+  if (isPolishFenceInteriorLine(cur) || isPolishFenceInteriorLine(next)) {
+    return false;
+  }
+  if (isPolishIntroLine(cur) && isPolishListLikeLine(next)) return false;
+  if (isPolishHeadingLine(cur) || isPolishHeadingLine(next)) return false;
+  if (isCodeFenceLine(cur) !== isCodeFenceLine(next)) return true;
+  if (isToolGroupBoundary(cur, next)) return true;
   return isPolishListLikeLine(cur) !== isPolishListLikeLine(next);
 }
 function convertMarkdownTablesForTerminal(text) {
@@ -8296,17 +8400,15 @@ 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]|^\s*[├└]──\s/;
+  const afterHeading = maskedLines.join("\n").replace(/([^\n])\n(#{1,6} )/g, "$1\n\n$2").replace(/^(#{1,2} .+)\n(?!\n)/gm, "$1\n\n").replace(new RegExp(`([^\\n])\\n([ ]{0,3}${THEMATIC_BREAK_PATTERN})$`, "gm"), "$1\n\n$2").replace(new RegExp(`^([ ]{0,3}${THEMATIC_BREAK_PATTERN})\\n(?!\\n)`, "gm"), "$1\n\n").replace(/\n{3,}/g, "\n\n");
   const headingLines = afterHeading.split("\n");
   const breathed = [];
   for (let i = 0; i < headingLines.length; i++) {
     breathed.push(headingLines[i]);
     const cur = headingLines[i];
     const next = headingLines[i + 1];
-    if (cur === "" || next === void 0 || next === "") continue;
-    if (LIST_LIKE.test(cur) === LIST_LIKE.test(next)) continue;
-    breathed.push("");
+    if (next === void 0) continue;
+    if (polishBreathInsertsBlankBetween(cur, next)) breathed.push("");
   }
   const polishedMasked = breathed.join("\n");
   const polished = polishedMasked.replace(
@@ -8316,17 +8418,23 @@ function polishAssistantStructure(text, options = {}) {
   return options.trimEdges === false ? polished : polished.trim();
 }
 function styleRichMarkdownLine(line, brightness) {
-  const heading = line.match(/^(#{1,3})\s+(.+)$/);
+  const toolLine = styleTuiToolLine(line, brightness);
+  if (toolLine !== null) return toolLine;
+  const heading = line.match(/^(#{1,6})\s+(.+)$/);
   if (heading) {
     const level = heading[1].length;
     const title = heading[2];
+    const styledTitle = styleInlineMarkdown(title, brightness);
     if (level === 1) {
-      return `${STYLE.bold}\x1B[4m${colorSeq("accent", brightness)}${title}${STYLE.reset}`;
+      return `${STYLE.bold}${colorSeq("accent", brightness)}${styledTitle}${STYLE.reset}`;
     }
     if (level === 2) {
-      return `${STYLE.bold}${colorSeq("warning", brightness)}${title}${STYLE.reset}`;
+      return `${STYLE.bold}${colorSeq("warning", brightness)}${styledTitle}${STYLE.reset}`;
     }
-    return `${STYLE.bold}${colorSeq("info", brightness)}${title}${STYLE.reset}`;
+    if (level === 3) {
+      return `${STYLE.bold}${colorSeq("info", brightness)}${styledTitle}${STYLE.reset}`;
+    }
+    return `${STYLE.bold}${colorSeq("muted", brightness)}${styledTitle}${STYLE.reset}`;
   }
   if (line.startsWith("\u8FDB\u5165 nolo-plan")) {
     return `${colorSeq("chrome", brightness)}${STYLE.dim}${line}${STYLE.reset}`;
@@ -8335,15 +8443,19 @@ function styleRichMarkdownLine(line, brightness) {
   if (blockquote) {
     const border = colorSeq("chrome", brightness);
     const content = blockquote[1];
-    return `${border}\u2502${STYLE.reset} ${STYLE.dim}${content}${STYLE.reset}`;
+    const styled = styleInlineMarkdown(content, brightness);
+    return `${border}\u2502${STYLE.reset} ${STYLE.dim}${styled}${STYLE.reset}`;
   }
-  if (/^---+$/.test(line.trim())) {
-    return `${colorSeq("chrome", brightness)}${"\u2500".repeat(Math.min(line.trim().length, 40))}${STYLE.reset}`;
+  if (THEMATIC_BREAK_RE.test(line)) {
+    return `${colorSeq("chrome", brightness)}${STYLE.dim}${"\u2500".repeat(36)}${STYLE.reset}`;
   }
   const bullet = line.match(/^(\s*)(•)\s(.+)$/);
   if (bullet) {
+    const indent = bullet[1];
     const styled = styleInlineMarkdown(bullet[3], brightness);
-    return `${bullet[1]}${colorSeq("accent", brightness)}\u2022${STYLE.reset} ${styled}`;
+    const marker = indent.length >= 2 ? "\u25E6" : "\u2022";
+    const markerColor = indent.length >= 2 ? colorSeq("chrome", brightness) : colorSeq("accent", brightness);
+    return `${indent}${markerColor}${marker}${STYLE.reset} ${styled}`;
   }
   const ordered = line.match(/^(\s*)(\d+\.)\s(.+)$/);
   if (ordered) {
@@ -8467,16 +8579,28 @@ function emitFormattedAssistantBlock(write, text, trailingNewline = false) {
 }
 function classifyStreamLine(line) {
   if (line === "") return "blank";
-  if (TASK_LIST_RE.test(line) || UNORDERED_LIST_RE.test(line) || ORDERED_LIST_RE.test(line) || /^\s*(?:•|☐|☑)\s/.test(line) || /^\s*[\u2460-\u2473]/.test(line)) {
+  const plain = plainToolLine(line);
+  if (isToolTreeHeaderLine(plain)) return "tool-header";
+  if (isToolTreeLeafLine(plain)) return "tool-leaf";
+  if (isToolSingleLine(plain)) return "tool";
+  if (TASK_LIST_RE.test(plain) || UNORDERED_LIST_RE.test(plain) || ORDERED_LIST_RE.test(plain) || /^\s*(?:•|◦|☐|☑)\s/.test(plain) || /^\s*[\u2460-\u2473]/.test(plain)) {
     return "list";
   }
+  if (isPolishListLikeLine(plain)) return "list";
+  if (polishHeadingLevel(plain) !== null) return "heading";
   return "prose";
 }
-function needsListProseBreath(prev, next) {
+function isStreamListLike(kind) {
+  return kind === "list" || kind === "tool-header" || kind === "tool-leaf" || kind === "tool";
+}
+function needsListProseBreath(prev, next, prevLine = "") {
   if (prev === null || prev === "blank" || next === "blank") return false;
-  const prevList = prev === "list";
-  const nextList = next === "list";
-  return prevList !== nextList;
+  if (next === "heading") return true;
+  if (prev === "heading") return (polishHeadingLevel(prevLine) ?? 7) <= 2;
+  if (prev === "fence" !== (next === "fence")) return true;
+  if (isStreamListLike(next) && isPolishIntroLine(prevLine)) return false;
+  if (prev === "tool-leaf" && next === "tool-header") return true;
+  return isStreamListLike(prev) !== isStreamListLike(next);
 }
 function createRenderAwareStreamWriter(args) {
   const brightness = resolveTuiBrightness();
@@ -8486,9 +8610,16 @@ function createRenderAwareStreamWriter(args) {
   let inMermaid = false;
   let mermaidBody = [];
   let lastKind = null;
+  let lastLine = "";
+  let pendingBlankRow = false;
   const PARTIAL_FLUSH_THRESHOLD = 48;
   const emitBreathIfNeeded = (nextKind) => {
-    if (needsListProseBreath(lastKind, nextKind)) args.write("\n");
+    if (pendingBlankRow) {
+      args.write("\n");
+      pendingBlankRow = false;
+      lastKind = "blank";
+    }
+    if (needsListProseBreath(lastKind, nextKind, lastLine)) args.write("\n");
   };
   const flushPartialProse = () => {
     if (inFence || buffer.length < PARTIAL_FLUSH_THRESHOLD) return;
@@ -8506,6 +8637,7 @@ function createRenderAwareStreamWriter(args) {
     emitBreathIfNeeded("prose");
     emitFormattedAssistantBlock(args.write, prefix, false);
     lastKind = "prose";
+    lastLine = prefix;
     buffer = prefix.length === buffer.length ? "" : buffer.slice(prefix.length);
   };
   const flushCompleteBlocks = () => {
@@ -8521,10 +8653,11 @@ function createRenderAwareStreamWriter(args) {
           inMermaid = false;
           inFence = false;
           fenceLang = "unknown";
-          emitBreathIfNeeded("other");
+          emitBreathIfNeeded("fence");
           args.write(`${STYLE.dim}${firstLine}${STYLE.reset}
 `);
-          lastKind = "other";
+          lastKind = "fence";
+          lastLine = firstLine;
           buffer = lines.slice(1).join("\n");
           continue;
         }
@@ -8540,10 +8673,11 @@ function createRenderAwareStreamWriter(args) {
           }
           inFence = true;
         }
-        emitBreathIfNeeded("other");
+        emitBreathIfNeeded("fence");
         args.write(`${STYLE.dim}${firstLine}${STYLE.reset}
 `);
-        lastKind = "other";
+        lastKind = "fence";
+        lastLine = firstLine;
         buffer = lines.slice(1).join("\n");
         continue;
       }
@@ -8555,7 +8689,8 @@ function createRenderAwareStreamWriter(args) {
       if (inFence) {
         args.write(`${highlightCodeLine(firstLine, fenceLang, brightness)}
 `);
-        lastKind = "other";
+        lastKind = "fence";
+        lastLine = firstLine;
         buffer = lines.slice(1).join("\n");
         continue;
       }
@@ -8568,6 +8703,7 @@ function createRenderAwareStreamWriter(args) {
           const inner = trimmedFirst.slice(2, trimmedFirst.length - 2);
           args.write(renderMathBlock(inner) + "\n");
           lastKind = "other";
+          lastLine = trimmedFirst;
           buffer = lines.slice(1).join("\n");
           continue;
         }
@@ -8594,6 +8730,7 @@ function createRenderAwareStreamWriter(args) {
         if (lastInner) innerParts.push(lastInner);
         args.write(renderMathBlock(innerParts.join("\n")) + "\n");
         lastKind = "other";
+        lastLine = trimmedFirst;
         buffer = lines.slice(closeIndex + 1).join("\n");
         continue;
       }
@@ -8614,14 +8751,23 @@ function createRenderAwareStreamWriter(args) {
             true
           );
           lastKind = "list";
+          lastLine = lines[end - 1] ?? firstLine;
           buffer = lines.slice(end).join("\n");
           continue;
         }
       }
       const kind = classifyStreamLine(firstLine);
+      if (kind === "blank") {
+        if (lastKind !== null && lastKind !== "blank") pendingBlankRow = true;
+        lastKind = "blank";
+        lastLine = "";
+        buffer = lines.slice(1).join("\n");
+        continue;
+      }
       emitBreathIfNeeded(kind);
       emitFormattedAssistantBlock(args.write, firstLine, true);
       lastKind = kind;
+      lastLine = firstLine;
       buffer = lines.slice(1).join("\n");
     }
   };
@@ -9481,8 +9627,6 @@ function formatNormalToolDuration(elapsedMs) {
 function formatNormalToolLine(event, pending, colorEnabled) {
   if (event.type === "tool-call") return "";
   const toolName = event.toolName || pending?.toolName || "tool";
-  const todoBlock = formatTodoListForCli(event, colorEnabled);
-  if (todoBlock) return todoBlock;
   if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
     const block = formatUiAskChoiceBlock(event, colorEnabled);
     if (block) return block;
@@ -9545,39 +9689,6 @@ function resolveLoadSkillName(event) {
   if (match?.[1]) return match[1];
   return argName || "skill";
 }
-function formatTodoListForCli(event, colorEnabled) {
-  if (event.type !== "tool-result" || event.toolName !== "setTodoList") {
-    return void 0;
-  }
-  let raw = event.metadata?.displayData;
-  let parsed = typeof raw === "object" && raw !== null;
-  if (typeof raw === "string") {
-    try {
-      raw = JSON.parse(raw);
-      parsed = true;
-    } catch {
-      raw = void 0;
-    }
-  }
-  if (!parsed && typeof event.content === "string") {
-    try {
-      raw = JSON.parse(event.content);
-      parsed = true;
-    } catch {
-      raw = void 0;
-    }
-  }
-  const todos = Array.isArray(raw?.todos) ? raw.todos : void 0;
-  if (!todos) return void 0;
-  if (todos.length === 0) return "\u2611 Todo\n  (empty)\n";
-  const lines = todos.map((todo) => {
-    const status = todo?.status === "done" ? "\u2713" : todo?.status === "in_progress" ? "\u25D0" : "\u25CB";
-    const title = typeof todo?.title === "string" ? todo.title : "Untitled task";
-    return `  ${status} ${title}`;
-  });
-  const text = [`\u2611 Todo (${todos.length})`, ...lines].join("\n") + "\n";
-  return colorEnabled ? themeText(text, "chrome") : text;
-}
 function formatLoadSkillBlock(event, colorEnabled, opts) {
   if (event.type !== "tool-result" || event.toolName !== "loadSkill") return null;
   const skillName = resolveLoadSkillName(event);
@@ -9834,6 +9945,7 @@ ${this.text}
 // packages/cli/client/agentRunOutput.ts
 var IDENTITY_LABEL_SEPARATOR = " > ";
 var THINKING_PREVIEW_BUFFER_LIMIT = 512;
+var TUI_PROGRESS_BUFFER_LIMIT = 1200;
 function appendThinkingPreview(current, chunk, limit = THINKING_PREVIEW_BUFFER_LIMIT) {
   if (limit <= 0) return "";
   const combined = current + chunk;
@@ -9895,6 +10007,14 @@ function formatToolJsonEvent(event) {
   })}
 `;
 }
+function shouldPromoteTuiNarration(text) {
+  if (text.length >= TUI_PROGRESS_BUFFER_LIMIT) return true;
+  return /(^|\n)\s*(?:#{1,3}\s|```|[-*+]\s|\d+[.)]\s)/.test(text);
+}
+function narrationActivityLabel(text) {
+  const oneLine = stripAnsi2(text).replace(/[`*_#>]/g, "").replace(/\s+/g, " ").trim();
+  return truncateThinkingHint(oneLine, 60);
+}
 function createCliTurnOutput(params) {
   const { options } = params;
   const workingLabel = params.workingLabel ?? `${options.agentName} -> working`;
@@ -9903,14 +10023,36 @@ function createCliTurnOutput(params) {
     tuiTrees: options.output.tuiTrees === true
   });
   const eventMode = resolveAgentEventMode(options);
-  const showThinking = options.showThinking !== false;
+  const assistantLabelManaged = options.output.assistantLabelManaged === true;
+  const showThinking = !assistantLabelManaged && options.showThinking !== false;
+  const hidesRoutineTuiToolDetail = (event) => {
+    if (!assistantLabelManaged || event.toolName !== "editFile") return false;
+    if (event.type === "tool-error") return false;
+    if (readActionGate(event.metadata?.actionGate)) return false;
+    if (event.metadata?.timedOut || event.metadata?.failed || event.metadata?.error) return false;
+    if (typeof event.metadata?.exitCode === "number" && event.metadata.exitCode !== 0) return false;
+    return true;
+  };
   let streamedAssistantText = false;
   let everStreamedAnyText = false;
   let printedAssistantLabel = false;
   let thinkState = createThinkParserState();
   let thinkingFirstAt = null;
   let thinkingPreview = "";
+  let tuiThinkingReported = false;
+  const clearTuiThinkingLabel = () => {
+    if (!tuiThinkingReported) return;
+    tuiThinkingReported = false;
+    options.activityReporter?.(null);
+  };
   const markThinkingDelta = (chunk) => {
+    if (assistantLabelManaged) {
+      if (!tuiThinkingReported && !streamedAssistantText) {
+        tuiThinkingReported = true;
+        options.activityReporter?.(t("thinkingActive"));
+      }
+      return;
+    }
     if (!showThinking) return;
     if (streamedAssistantText) return;
     if (thinkingFirstAt === null) {
@@ -9928,6 +10070,7 @@ function createCliTurnOutput(params) {
     options.activityReporter?.(label);
   };
   const endThinkingPhase = () => {
+    clearTuiThinkingLabel();
     if (thinkingFirstAt === null) return;
     const seconds = Math.max(0, Math.round((Date.now() - thinkingFirstAt) / 1e3));
     thinkingFirstAt = null;
@@ -9940,7 +10083,6 @@ function createCliTurnOutput(params) {
     }
   };
   let compactionEvent = null;
-  const assistantLabelManaged = options.output.assistantLabelManaged === true;
   const writeToolOutput = (chunk) => {
     if (!chunk) return;
     if (typeof options.output.writeToolBlock === "function") {
@@ -9952,9 +10094,25 @@ function createCliTurnOutput(params) {
   const renderWriter = createRenderAwareStreamWriter({
     write: (chunk) => options.output.write(chunk)
   });
+  let pendingTuiNarration = "";
+  let tuiNarrationPromoted = false;
+  const flushPendingTuiNarration = () => {
+    if (!pendingTuiNarration) return;
+    formatToolEvent.reset?.();
+    renderWriter.push(pendingTuiNarration);
+    pendingTuiNarration = "";
+    tuiNarrationPromoted = true;
+    streamedAssistantText = true;
+    options.activityReporter?.(null);
+  };
+  const dropPendingTuiProgress = () => {
+    pendingTuiNarration = "";
+    tuiNarrationPromoted = false;
+    options.activityReporter?.(null);
+  };
   const writeVisibleAssistantChunk = (chunk) => {
     if (!chunk) return;
-    formatToolEvent.reset?.();
+    if (!assistantLabelManaged) formatToolEvent.reset?.();
     const parsed = processThinkChunk(chunk, thinkState);
     thinkState = parsed.state;
     if (!parsed.content && !parsed.reasoning) return;
@@ -9970,8 +10128,23 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       }
       printedAssistantLabel = true;
     }
-    streamedAssistantText = true;
     everStreamedAnyText = true;
+    if (assistantLabelManaged) {
+      if (tuiNarrationPromoted) {
+        renderWriter.push(parsed.content);
+        streamedAssistantText = true;
+        return;
+      }
+      pendingTuiNarration += parsed.content;
+      if (shouldPromoteTuiNarration(pendingTuiNarration)) {
+        flushPendingTuiNarration();
+      } else {
+        const label = narrationActivityLabel(pendingTuiNarration);
+        if (label) options.activityReporter?.(label);
+      }
+      return;
+    }
+    streamedAssistantText = true;
     renderWriter.push(parsed.content);
   };
   const handleToolEvent = (event) => {
@@ -9987,13 +10160,19 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       return;
     }
     if (event.type === "tool-call") {
+      if (assistantLabelManaged && pendingTuiNarration) {
+        dropPendingTuiProgress();
+      }
       renderWriter.flush();
-      formatToolEvent(event);
+      if (!hidesRoutineTuiToolDetail(event)) {
+        formatToolEvent(event);
+      }
       endThinkingPhase();
       if (streamedAssistantText) {
         options.output.write("\n");
         streamedAssistantText = false;
       }
+      if (assistantLabelManaged) tuiNarrationPromoted = false;
       const activeLabel = formatConservativeActiveToolLabel(event);
       spinner.show(activeLabel);
       options.activityReporter?.(activeLabel);
@@ -10005,6 +10184,9 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
     }
     spinner.stop();
     options.activityReporter?.(null);
+    if (hidesRoutineTuiToolDetail(event)) {
+      return;
+    }
     if (isLiveAgentRunObservation(event, parsedRunEvent)) {
       formatToolEvent.consume?.(event);
       return;
@@ -10017,6 +10199,26 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
   return {
     spinner,
     eventMode,
+    /**
+     * Terminal cleanup for abort/error paths that never reach `finish()`.
+     *
+     * A user abort discards the transient TUI progress buffer: the user stopped
+     * on purpose and the dock already showed that text as activity. A genuine
+     * failure must not swallow prose that never got the chance to be *proven*
+     * durable (only a following tool call proves "progress"), so it promotes the
+     * pending buffer and flushes what was already promoted — otherwise a short
+     * final answer followed by a transport error disappears from the transcript.
+     */
+    cancel(cleanup) {
+      if (assistantLabelManaged && cleanup?.preservePendingNarration) {
+        flushPendingTuiNarration();
+        if (streamedAssistantText) {
+          renderWriter.flush();
+          options.output.write("\n");
+        }
+      }
+      dropPendingTuiProgress();
+    },
     pushText(chunk) {
       writeVisibleAssistantChunk(chunk);
     },
@@ -10024,10 +10226,6 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       markThinkingDelta(chunk);
     },
     handleToolEvent,
-    /** 记录一条 compaction 观测事件（TUI 在 turn 结束时渲染一行 dim 摘要）。
-     *  一轮内可能来多条（轮开始 + 每个 round），按显著性保留最高者：
-     *  失败 > 新生成摘要 > 投影复用 > 跳过，避免末尾的例行跳过事件
-     *  覆盖掉中途真正发生的压缩。 */
     recordCompaction(event) {
       const significance = (e) => e.failed ? 4 : e.summaryGenerated ? 3 : e.compressed ? 2 : 1;
       if (!compactionEvent || significance(event) >= significance(compactionEvent)) {
@@ -10039,12 +10237,28 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       spinner.show(activeLabel);
       options.activityReporter?.(activeLabel);
     },
+    /**
+     * Pre-delta turn phase label (ctx-overflow-feedback batch 3).
+     *
+     * localLoop 在首个 provider delta 之前依次发出 turn-phase 事件
+     * （validating-context → compacting → waiting-provider）；此前 CLI 只有
+     * llm-start 才进入明确 working 状态，压缩期间 spinner 停在通用
+     * working 文案上，用户无法区分「卡在检查上下文 / 压缩 / 等模型」。
+     * 两个显示面（bare CLI 的 spinner 与 TUI 的 dock activityReporter）与
+     * showWorking 走同一条投影，保证两端文案不漂移。
+     */
+    showPhase(phase) {
+      const label = phase === "validating-context" ? t("contextChecking") : phase === "compacting" ? t("contextCompacting") : t("waitingForModel");
+      spinner.show(label);
+      options.activityReporter?.(label);
+    },
     finish(fallbackContent) {
       const flushedThink = flushThinkParser(thinkState);
       thinkState = flushedThink.state;
       if (flushedThink.content) {
         writeVisibleAssistantChunk(flushedThink.content);
       }
+      if (assistantLabelManaged) flushPendingTuiNarration();
       endThinkingPhase();
       spinner.stop();
       options.activityReporter?.(null);
@@ -10149,6 +10363,7 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
   let content = "";
   let dialogId;
   let usage;
+  let sawDone = false;
   const handlePayload = (payload) => {
     if (typeof payload?.dialogId === "string" && payload.dialogId.trim()) {
       dialogId = payload.dialogId;
@@ -10161,6 +10376,7 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
     }
     if (payload?.type === "done") {
       usage = payload.usage;
+      sawDone = true;
       return;
     }
     if (payload?.type === "dialog" || payload?.type === "status") {
@@ -10214,6 +10430,9 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
     }
   } catch (error) {
     turnOutput.spinner.stop();
+    turnOutput.cancel({
+      preservePendingNarration: !options.abortSignal?.aborted
+    });
     if (options.abortSignal?.aborted) {
       return {
         exitCode: 0,
@@ -10243,6 +10462,15 @@ ${describeClientVersionTooOldFailure(message, error)}`);
 `);
     return { exitCode: 1 };
   }
+  if (options.abortSignal?.aborted && !sawDone) {
+    turnOutput.spinner.stop();
+    turnOutput.cancel();
+    return {
+      exitCode: 0,
+      ...dialogId ? { dialogId } : {},
+      streamInterrupted: true
+    };
+  }
   turnOutput.finish(content);
   const usageText = formatUsage(usage, dialogId);
   if (usageText && shouldShowUsage(options.env))
@@ -10459,7 +10687,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid as ulid2 } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-KCMC2TBD.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-N4YGKL7M.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();
@@ -10779,7 +11007,8 @@ function classifyLocalRunError(message) {
   }
   return { kind: "generic" };
 }
-var HISTORY_REPLAY_REJECTION_RE = /invalid_request_error|invalid\s+tool\s+call\s+arguments?/i;
+var HISTORY_REPLAY_REJECTION_RE = /invalid\s+tool\s+call\s+arguments?/i;
+var REASONING_REPLAY_CONTRACT_RE = /reasoning_content[^.]*must be passed back/i;
 var RUN_UNAVAILABLE_PREFIX = "[nolo] auto runtime: local run unavailable";
 var NO_FALLBACK = "Not falling back to server.";
 var SERVER_FALLBACK_HINT = "or use --server to run on the server explicitly.";
@@ -10788,27 +11017,30 @@ function buildAuthFailure(ctx) {
   const fix = platformNoToken ? `This install is not logged in \u2014 run \`nolo login\`, or set AUTH_TOKEN / NOLO_SERVER` : ctx.where === "server chat proxy" ? `Check the agent's provider/api-key settings on nolo.chat` : `Fix the local credential/config and retry`;
   const { url: validationUrl, text: validationText } = extractGoogleValidationLink(ctx.message);
   const validationLabel = validationText || "Verify your account";
-  const validationHint = validationUrl ? `
-  \u24D8 This provider requires a one-time account verification. Open this link in a browser signed into that account, then retry:
-    ${formatCliHyperlink(
-    validationUrl,
-    validationLabel
-  )}` + // A 200-char Google url wraps on a narrow terminal, and a wrapped link
-  // loses its hit area in several terminals — so even when the clickable
-  // form is available, the raw url still gets its own copyable line. (In
-  // the disabled path `label (url)` already carries it.)
-  (resolveCliHyperlinkEnabled() ? `
-    \u6216\u590D\u5236\u6B64\u94FE\u63A5: ${validationUrl}` : "") : "";
-  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, auth rejected).${validationHint ? `${validationHint}
-  ` : " "}Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}.
+  if (validationUrl) {
+    const linkLine = `
+    ${formatCliHyperlink(validationUrl, validationLabel)}`;
+    const rawLine = resolveCliHyperlinkEnabled() ? `
+    \u70B9\u4E0D\u4E86\u5C31\u590D\u5236\u8FD9\u884C: ${validationUrl}` : "";
+    const verifyHint = `
+  \u24D8 \u60F3\u4E00\u952E\u6253\u5F00\uFF1F\u8DD1 \`nolo auth antigravity --verify\` \u2014\u2014 \u5B83\u4F1A\u7528\u672C\u5730\u51ED\u8BC1\u62FF\u5230\u5F53\u524D\u9A8C\u8BC1\u94FE\u63A5\u5E76\u76F4\u63A5\u62C9\u8D77\u6D4F\u89C8\u5668\u3002`;
+    const retryLine = `
+  \u9A8C\u8BC1\u5B8C\u6210\u540E\u76F4\u63A5\u91CD\u8BD5\u521A\u624D\u7684\u547D\u4EE4\u5373\u53EF\uFF0Ctoken \u4E0D\u7528\u91CD\u65B0\u767B\u5F55\u3002`;
+    return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}: Google requires a one-time account verification \u2014 your credential is fine).
+  Open this link in a browser signed into ${ctx.credentialAccountId ? `\`${ctx.credentialAccountId}\`` : "the Google account behind this credential"}:${linkLine}${rawLine}${verifyHint}${retryLine}
+  Detail: ${ctx.message} ${NO_FALLBACK} Use --server to run on the server explicitly.
+`;
+  }
+  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, auth rejected). Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}.
 `;
 }
 function isAuthNoTokenBody(message) {
   return /"authCode"\s*:\s*"AUTH_NO_TOKEN"/i.test(message) || /no authentication token provided/i.test(message);
 }
 function buildRejectedPayloadFailure(ctx) {
-  const looksLikeHistoryReplay = HISTORY_REPLAY_REJECTION_RE.test(ctx.message);
-  const cause = looksLikeHistoryReplay ? ` This usually happens when the dialog history contains tool_calls or reasoning produced by a different model/provider (e.g. after /switch); the new provider rejects that history. Start a fresh dialog, or clean the offending history.` : "";
+  const looksLikeReasoningReplay = REASONING_REPLAY_CONTRACT_RE.test(ctx.message);
+  const looksLikeHistoryReplay = !looksLikeReasoningReplay && HISTORY_REPLAY_REJECTION_RE.test(ctx.message);
+  const cause = looksLikeReasoningReplay ? ` This is a thinking-mode replay contract violation: the history contains an assistant tool-call turn without reasoning_content, but this model requires every such turn to pass reasoning back to the API. The upstream may not have returned reasoning for that turn, or the history came from a different model.` : looksLikeHistoryReplay ? ` This usually happens when the dialog history contains tool_calls or reasoning produced by a different model/provider (e.g. after /switch); the new provider rejects that history. Start a fresh dialog, or clean the offending history.` : "";
   return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, the provider rejected the request body \u2014 this is NOT a local credential/config issue). Detail: ${ctx.message}${cause} ${NO_FALLBACK} Use --server to run on the server explicitly, or start a fresh dialog.
 `;
 }
@@ -10835,6 +11067,17 @@ function buildUpstreamFailure(ctx) {
   return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}). Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}.
 `;
 }
+function formatLocalTurnFailureLine(error) {
+  const message = toErrorMessage(error);
+  if (error?.code === "LLM_REQUEST_TIMEOUT") {
+    const msMatch = /after (\d+)ms/.exec(message);
+    const deadline = msMatch && Number.isFinite(Number(msMatch[1])) ? formatElapsed(Math.round(Number(msMatch[1]) / 1e3)) : "the configured window";
+    return `[nolo] ${t("llmRequestTimedOut", deadline)}
+`;
+  }
+  return `[nolo] Local agent run failed: ${message}
+`;
+}
 var FAILURE_BUILDERS = {
   auth: buildAuthFailure,
   "rejected-payload": buildRejectedPayloadFailure,
@@ -10843,6 +11086,7 @@ var FAILURE_BUILDERS = {
   upstream: buildUpstreamFailure
 };
 function describeLocalRunFailure(message, rawError) {
+  const credentialAccountId = rawError && typeof rawError === "object" && typeof rawError.credentialAccountId === "string" ? rawError.credentialAccountId.trim() || void 0 : void 0;
   if (rawError && typeof rawError === "object" && "code" in rawError && rawError.code === "PLATFORM_STREAM_INTERRUPTED") {
     return "[nolo] The platform LLM stream was interrupted before the turn completed. Your conversation was preserved. Send another message to continue.\n";
   }
@@ -10891,6 +11135,10 @@ function describeLocalRunFailure(message, rawError) {
   }
   if (/CLI authority broker could not attach or take ownership/i.test(message)) {
     const cleaned = stripDebugNoise(message);
+    if (/EADDRINUSE/i.test(message)) {
+      return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} Use --server to run on the server explicitly.
+`;
+    }
     return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local runtime could not attach to an existing broker or take database ownership. Check running broker processes holding the local authority store or retry, ${SERVER_FALLBACK_HINT}.
 `;
   }
@@ -10920,7 +11168,8 @@ function describeLocalRunFailure(message, rawError) {
     status: cls.status,
     ...cls.statusInferred ? { statusInferred: true } : {},
     ...cls.quotaExhausted ? { quotaExhausted: true } : {},
-    ...cooldownUntil ? { cooldownUntil } : {}
+    ...cooldownUntil ? { cooldownUntil } : {},
+    ...credentialAccountId ? { credentialAccountId } : {}
   };
   return FAILURE_BUILDERS[cls.kind](ctx);
 }
@@ -11237,6 +11486,18 @@ async function runLocalAgentTurnForCli(options, settings) {
         if (event.kind === "llm-start") {
           turnOutput.showWorking();
         }
+        if (event.kind === "turn-phase") {
+          turnOutput.showPhase(event.phase);
+        }
+        if (event.kind === "compaction-start") {
+          turnOutput.showPhase("compacting");
+        }
+        if (event.kind === "compaction-end" || // 压缩失败（timeout/provider-error）时 localLoop 按失败原子性语义
+        // 带着裁剪后的历史继续本轮，切回等待模型文案；aborted 时 turn 随即
+        // 结束，不再切文案（终态由 abort 路径收尾）。
+        event.kind === "compaction-failed" && event.reason !== "aborted") {
+          turnOutput.showPhase("waiting-provider");
+        }
         if (event.kind === "image-downgraded") {
           options.output.write(
             "[nolo] \u5F53\u524D agent \u88AB\u914D\u7F6E\u4E3A\u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF0C\u56FE\u7247\u5DF2\u7528\u5360\u4F4D\u6587\u672C\u66FF\u4EE3\u3002\u8BF7\u68C0\u67E5\u6A21\u578B\u7684\u56FE\u7247\u80FD\u529B\u914D\u7F6E\uFF0C\u6216\u7528 /switch \u9009\u62E9\u652F\u6301\u56FE\u7247\u7684 agent \u540E\u91CD\u65B0\u53D1\u9001\u56FE\u7247\u3002\n"
@@ -11282,6 +11543,9 @@ async function runLocalAgentTurnForCli(options, settings) {
     };
   } catch (error) {
     turnOutput.spinner.stop();
+    turnOutput.cancel({
+      preservePendingNarration: error?.code !== LOCAL_TURN_ABORTED_CODE && !options.abortSignal?.aborted
+    });
     const savedDialogId = error?.dialogId;
     const abortedUsageRecords = error?.usageRecords;
     const abortedTurnCredits = sumPlatformCredits(abortedUsageRecords);
@@ -11305,10 +11569,12 @@ async function runLocalAgentTurnForCli(options, settings) {
       error.cooldownUntil = cooldownUntil;
     }
     if (settings.reportFailure) {
-      options.output.write(
-        `[nolo] Local agent run failed: ${toErrorMessage(error)}
-`
-      );
+      const failureLine = formatLocalTurnFailureLine(error);
+      if (typeof options.output.writeErr === "function") {
+        options.output.writeErr(failureLine);
+      } else {
+        options.output.write(failureLine);
+      }
       if (cooldownUntil) {
         options.output.write(
           `[nolo] \u5DF2\u6807\u8BB0\u51B7\u5374\u81F3 ${cooldownUntil}\uFF0C\u5230\u671F\u524D\u6D3E\u53D1\u8BE5 agent \u4F1A\u88AB\u51B7\u5374\u95E8\u63A7\u62E6\u622A\u3002
@@ -11446,7 +11712,7 @@ async function runAgentTurn(options) {
     return { exitCode: 1 };
   }
   const localAvailability = await checkLocalAvailabilityBeforeHttpDispatch(options);
-  if (localAvailability?.exitCode) {
+  if (localAvailability && "exitCode" in localAvailability) {
     return { exitCode: localAvailability.exitCode };
   }
   const httpResult = await runHttpAgentTurn(options, authToken);
@@ -12188,72 +12454,6 @@ var rankMemoryCandidates = (items, query, context) => {
   });
 };
 
-// packages/ai/memory/vnext/store.ts
-var enc = (value) => encodeURIComponent(value).replace(/-/g, "%2D");
-var rangeOf = (prefix) => ({ gte: prefix, lte: `${prefix}\uFFFF` });
-var entityKey = (ownerId, id) => `mem2-e-${enc(ownerId)}-${enc(id)}`;
-var entityOwnerPrefix = (ownerId) => `mem2-e-${enc(ownerId)}-`;
-var stateKey = (ownerId, id) => `mem2-s-${enc(ownerId)}-${enc(id)}`;
-var stateEntityIndexKey = (ownerId, entityId, stateId) => `mem2-si-${enc(ownerId)}-${enc(entityId)}-${enc(stateId)}`;
-var stateEntityIndexPrefix = (ownerId, entityId) => `mem2-si-${enc(ownerId)}-${enc(entityId)}-`;
-var evidenceKey = (ownerId, id) => `mem2-v-${enc(ownerId)}-${enc(id)}`;
-var relationKey = (ownerId, id) => `mem2-r-${enc(ownerId)}-${enc(id)}`;
-var relationFromIndexKey = (ownerId, from, relationId) => `mem2-rf-${enc(ownerId)}-${enc(from)}-${enc(relationId)}`;
-var relationToIndexKey = (ownerId, to, relationId) => `mem2-rt-${enc(ownerId)}-${enc(to)}-${enc(relationId)}`;
-var readIndexed = async (db, prefix) => {
-  const refs = [];
-  for await (const [, value] of db.iterator({ ...rangeOf(prefix), reverse: false })) {
-    if (typeof value?.key === "string") refs.push(value.key);
-  }
-  const rows = await Promise.all(refs.map((key) => db.get(key).catch(() => null)));
-  return rows.filter((row) => !!row);
-};
-var getMemoryEntityVNext = async (db, ownerId, entityId) => db.get(entityKey(ownerId, entityId)).catch(() => null);
-var listMemoryEntitiesVNext = async (db, ownerId) => {
-  const rows = [];
-  for await (const [, value] of db.iterator({
-    ...rangeOf(entityOwnerPrefix(ownerId)),
-    reverse: false
-  })) {
-    if (value) rows.push(value);
-  }
-  return rows;
-};
-var getMemoryStateVNext = async (db, ownerId, stateId) => db.get(stateKey(ownerId, stateId)).catch(() => null);
-var listMemoryStatesForEntityVNext = (db, ownerId, entityId) => readIndexed(db, stateEntityIndexPrefix(ownerId, entityId));
-var putMemoryEvidenceVNext = async (db, evidence) => {
-  await db.put(evidenceKey(evidence.ownerId, evidence.id), evidence);
-};
-var getMemoryEvidenceVNext = async (db, ownerId, evidenceId) => db.get(evidenceKey(ownerId, evidenceId)).catch(() => null);
-var getMemoryEvidenceVNextStrict = async (db, ownerId, evidenceId) => {
-  try {
-    return await db.get(evidenceKey(ownerId, evidenceId));
-  } catch (error) {
-    if (isLevelNotFoundError(error)) return null;
-    throw error;
-  }
-};
-var _appendEntityBatch = (batch, entity) => {
-  batch.put(entityKey(entity.ownerId, entity.id), entity);
-};
-var _appendEvidenceBatch = (batch, evidence) => {
-  batch.put(evidenceKey(evidence.ownerId, evidence.id), evidence);
-};
-var _appendStateBatch = (batch, state2) => {
-  const key = stateKey(state2.ownerId, state2.id);
-  batch.put(key, state2);
-  batch.put(stateEntityIndexKey(state2.ownerId, state2.entityId, state2.id), { key });
-};
-var _appendRetiredStateBatch = (batch, state2) => {
-  batch.put(stateKey(state2.ownerId, state2.id), state2);
-};
-var _appendRelationBatch = (batch, relation) => {
-  const key = relationKey(relation.ownerId, relation.id);
-  batch.put(key, relation);
-  batch.put(relationFromIndexKey(relation.ownerId, relation.from, relation.id), { key });
-  batch.put(relationToIndexKey(relation.ownerId, relation.to, relation.id), { key });
-};
-
 // packages/ai/memory/vnext/recall.ts
 var MAX_RECALL_REFS = 6;
 var stripFence = (raw) => {
@@ -12283,14 +12483,6 @@ var parseSelection = (raw) => {
     reason: obj.reason
   };
 };
-var buildCatalog = async (db, ownerId) => {
-  const entities = await listMemoryEntitiesVNext(db, ownerId);
-  const states = [];
-  for (const entity of entities) {
-    states.push(...await listMemoryStatesForEntityVNext(db, ownerId, entity.id));
-  }
-  return { entities, states };
-};
 var catalogText = (entities, states) => JSON.stringify(
   {
     entities: entities.map((entity) => ({
@@ -12316,7 +12508,7 @@ var catalogText = (entities, states) => JSON.stringify(
 );
 var createMemoryVNextRecall = (input) => async (query) => {
   const startedAt = performance.now();
-  const { entities, states } = await buildCatalog(input.db, input.ownerId);
+  const { entities, states } = await loadMemoryVNextCatalog(input.db, input.ownerId);
   if (entities.length === 0 && states.length === 0) {
     return {
       query,
@@ -13187,14 +13379,74 @@ var shortError2 = (error) => {
   return message.length > ERROR_MESSAGE_MAX2 ? `${message.slice(0, ERROR_MESSAGE_MAX2)}\u2026` : message;
 };
 var loadExistingContext = async (db, ownerId) => {
-  const entities = await listMemoryEntitiesVNext(db, ownerId);
-  const states = (await Promise.all(
-    entities.map((entity) => listMemoryStatesForEntityVNext(db, ownerId, entity.id))
-  )).flat();
-  return {
-    entityIds: entities.map((entity) => entity.id),
-    states
+  const { entities, states } = await loadMemoryVNextCatalog(db, ownerId);
+  return { entityIds: entities.map((entity) => entity.id), states };
+};
+var currentStatesCitingEvidence = (states, evidenceId) => states.filter((state2) => !state2.retiredAt && (state2.evidenceIds ?? []).includes(evidenceId));
+var isEvidenceCoveredByCurrentStates = (states, evidenceId) => currentStatesCitingEvidence(states, evidenceId).length > 0;
+var memoryVNextContextFingerprint = (existing) => {
+  const states = existing.states ?? [];
+  const entityIds = existing.entityIds ?? [];
+  const canonical = [
+    ...entityIds.map((id) => `e\0${id}`),
+    ...states.map((state2) => `s\0${state2.id}\0${state2.updatedAt}\0${state2.retiredAt ?? ""}`)
+  ].sort().join("
");
+  let hash = 2166136261;
+  for (let i = 0; i < canonical.length; i++) {
+    hash ^= canonical.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return `${entityIds.length}.${states.length}:${(hash >>> 0).toString(16)}`;
+};
+var MAX_NOOP_SUPPRESSIONS = 512;
+var noOpSuppressions = /* @__PURE__ */ new Map();
+var suppressionKey = (ownerId, evidenceId) => `${ownerId}\0${evidenceId}`;
+var recordNoOpSuppression = (ownerId, evidenceId, fingerprint) => {
+  const key = suppressionKey(ownerId, evidenceId);
+  noOpSuppressions.delete(key);
+  noOpSuppressions.set(key, fingerprint);
+  while (noOpSuppressions.size > MAX_NOOP_SUPPRESSIONS) {
+    noOpSuppressions.delete(noOpSuppressions.keys().next().value);
+  }
+};
+var noOpHistory = (ownerId, evidenceId, fingerprint) => {
+  const recorded = noOpSuppressions.get(suppressionKey(ownerId, evidenceId));
+  if (recorded === void 0) return "fresh";
+  return recorded === fingerprint ? "suppressed" : "stale";
+};
+var pickFirstUncoveredLazyPromotionItem = async (db, selected) => {
+  const contextByOwner = /* @__PURE__ */ new Map();
+  const contextFor = (ownerId) => {
+    let pending = contextByOwner.get(ownerId);
+    if (!pending) {
+      pending = loadExistingContext(db, ownerId).then((existing) => ({
+        states: existing.states ?? [],
+        fingerprint: memoryVNextContextFingerprint(existing)
+      }));
+      contextByOwner.set(ownerId, pending);
+    }
+    return pending;
   };
+  let skippedCoveredCount = 0;
+  let skippedNoOpCount = 0;
+  let firstStale = null;
+  for (const [selectedIndex, item] of selected.entries()) {
+    const evidence = buildLegacyMemoryEvidence(item);
+    const context = await contextFor(evidence.ownerId);
+    if (isEvidenceCoveredByCurrentStates(context.states, evidence.id)) {
+      skippedCoveredCount++;
+      continue;
+    }
+    const history = noOpHistory(evidence.ownerId, evidence.id, context.fingerprint);
+    if (history === "fresh") {
+      return { item, selectedIndex, skippedCoveredCount, skippedNoOpCount };
+    }
+    if (history === "stale" && !firstStale) {
+      firstStale = { item, selectedIndex, skippedCoveredCount, skippedNoOpCount };
+    }
+    skippedNoOpCount++;
+  }
+  return firstStale;
 };
 var withoutImportedEvidence = (mutation, importedEvidenceId) => ({
   ...mutation,
@@ -13210,6 +13462,11 @@ var runMemoryVNextLazyPromotion = async (input) => {
   }));
   const finish = (partial) => {
     const observation = {
+      legacyItemId: input.item.id,
+      evidenceId: deterministicEvidence.id,
+      ...input.selectedIndex === void 0 ? {} : { selectedIndex: input.selectedIndex },
+      ...input.skippedCoveredCount === void 0 ? {} : { skippedCoveredCount: input.skippedCoveredCount },
+      ...input.skippedNoOpCount === void 0 ? {} : { skippedNoOpCount: input.skippedNoOpCount },
       ...partial,
       latencyMs: Math.round((clock() - startedAt) * 10) / 10
     };
@@ -13232,8 +13489,9 @@ var runMemoryVNextLazyPromotion = async (input) => {
     }
     const evidence = evidenceResult.evidence;
     const existing = await loadExistingContext(input.db, evidence.ownerId);
-    const alreadyCovered = (existing.states ?? []).some(
-      (state2) => !state2.retiredAt && state2.evidenceIds.includes(evidence.id)
+    const alreadyCovered = isEvidenceCoveredByCurrentStates(
+      existing.states ?? [],
+      evidence.id
     );
     if (alreadyCovered) {
       return finish({ status: "already_covered" });
@@ -13248,6 +13506,11 @@ var runMemoryVNextLazyPromotion = async (input) => {
     });
     const semanticMutation = withoutImportedEvidence(interpreted.mutation, evidence.id);
     if (!hasWrites(semanticMutation)) {
+      recordNoOpSuppression(
+        evidence.ownerId,
+        evidence.id,
+        memoryVNextContextFingerprint(existing)
+      );
       return finish({ status: "no_op", action: semanticMutation.action });
     }
     await applyMemoryInterpreterMutation(input.db, evidence.ownerId, semanticMutation);
@@ -13260,6 +13523,179 @@ var runMemoryVNextLazyPromotion = async (input) => {
 };
 var isMemoryVNextLazyPromotionEnabled = (env = typeof process !== "undefined" ? process.env : {}) => env.NOLO_MEMORY_VNEXT_LAZY_PROMOTION === "1" || env.NOLO_MEMORY_VNEXT_LAZY_PROMOTION === "true";
 
+// packages/ai/memory/vnext/pureReadGate.ts
+var isMemoryVNextPureReadEnabled = (env = typeof process !== "undefined" ? process.env : {}) => env.NOLO_MEMORY_VNEXT_PURE_READ === "1" || env.NOLO_MEMORY_VNEXT_PURE_READ === "true";
+
+// packages/ai/memory/vnext/localRecall.ts
+var MIN_SHARED_TOKENS = 2;
+var MAX_LOCAL_RECALL_STATES = 8;
+var SAFE_TECHNICAL_SYNONYMS = {
+  pr: ["\u5BA1\u67E5", "\u4EE3\u7801\u5BA1\u67E5", "diff"],
+  diff: ["\u5BA1\u67E5", "\u4EE3\u7801\u5BA1\u67E5"],
+  review: ["\u5BA1\u67E5", "\u4EE3\u7801\u5BA1\u67E5"],
+  deploy: ["\u90E8\u7F72", "\u53D1\u7248"],
+  release: ["\u53D1\u7248", "\u53D1\u5E03"],
+  desktop: ["\u684C\u9762", "\u684C\u9762\u7AEF"]
+};
+var distinctTokens = (text) => new Set(tokenize2(text).filter((token) => token.length >= 2));
+var recallMemoryVNextLocal = (input) => {
+  const rawTokens = distinctTokens(input.query);
+  if (rawTokens.size === 0) return [];
+  const queryTokens = new Set(rawTokens);
+  for (const token of rawTokens) {
+    const syns = SAFE_TECHNICAL_SYNONYMS[token.toLowerCase()];
+    if (syns) {
+      for (const syn of syns) {
+        for (const t2 of distinctTokens(syn)) queryTokens.add(t2);
+      }
+    }
+  }
+  const entityById = new Map(input.entities.map((entity) => [entity.id, entity]));
+  const hits = [];
+  for (const state2 of input.states) {
+    if (state2.retiredAt || !state2.text.trim()) continue;
+    const entity = entityById.get(state2.entityId);
+    const haystack = distinctTokens(
+      [state2.facet, state2.text, entity?.name ?? "", ...entity?.aliases ?? []].join(" ")
+    );
+    let sharedTokens = 0;
+    for (const token of queryTokens) if (haystack.has(token)) sharedTokens++;
+    if (sharedTokens >= MIN_SHARED_TOKENS) hits.push({ state: state2, sharedTokens });
+  }
+  return hits.sort((a, b) => b.sharedTokens - a.sharedTokens || a.state.id.localeCompare(b.state.id)).slice(0, input.limit ?? MAX_LOCAL_RECALL_STATES);
+};
+
+// packages/ai/memory/vnext/pureVNextRuntime.ts
+var buildSynthesizedStateItem = (state2, entity, ownerType, ownerId) => ({
+  id: `vnext-state-${state2.id}`,
+  ownerType,
+  ownerId,
+  visibility: "private",
+  subjectType: "user",
+  subjectId: ownerId,
+  kind: "semantic",
+  content: state2.text.trim(),
+  createdAt: state2.createdAt,
+  lastActivatedAt: state2.createdAt,
+  activationCount: 1,
+  importance: 0.9,
+  confidence: 0.9,
+  resident: state2.facet === "preference" || state2.facet === "style"
+});
+async function resolvePureVNextRuntime(input) {
+  const { db, owners, userInput } = input;
+  if (owners.length === 0 || !userInput.trim()) {
+    return { selectedItems: [], promptBlock: null, recalledStateCount: 0 };
+  }
+  const ownerIds = owners.map((o) => `${o.ownerType}:${encodeURIComponent(o.ownerId)}`);
+  const catalogs = await Promise.all(
+    ownerIds.map((ownerId) => loadMemoryVNextCatalog(db, ownerId))
+  );
+  const selectedItems = [];
+  const seenStateKeys = /* @__PURE__ */ new Set();
+  for (let i = 0; i < owners.length; i++) {
+    const owner = owners[i];
+    const catalog = catalogs[i];
+    const currentStates = catalog.states.filter((s) => !s.retiredAt && s.text.trim());
+    const hits = recallMemoryVNextLocal({
+      query: userInput,
+      entities: catalog.entities,
+      states: currentStates
+    });
+    const entityById = new Map(catalog.entities.map((e) => [e.id, e]));
+    for (const hit of hits) {
+      const stateKey = `${hit.state.ownerId}\0${hit.state.id}`;
+      if (seenStateKeys.has(stateKey)) continue;
+      seenStateKeys.add(stateKey);
+      selectedItems.push(
+        buildSynthesizedStateItem(hit.state, entityById.get(hit.state.entityId), owner.ownerType, owner.ownerId)
+      );
+    }
+  }
+  const promptBlock = selectedItems.length === 0 ? null : buildMemoryOverlay(selectedItems, {
+    maxTokens: input.maxTokens ?? DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET
+  });
+  return {
+    selectedItems,
+    promptBlock,
+    recalledStateCount: selectedItems.length
+  };
+}
+
+// packages/ai/memory/vnext/primaryRead.ts
+var MEMORY_VNEXT_PRIMARY_READ_TIMEOUT_MS = 300;
+var isMemoryVNextPrimaryReadEnabled = (env = typeof process !== "undefined" ? process.env : {}) => env.NOLO_MEMORY_VNEXT_PRIMARY_READ === "1" || env.NOLO_MEMORY_VNEXT_PRIMARY_READ === "true";
+var buildSynthesizedStateItem2 = (state2, entity, ownerType, ownerId) => ({
+  id: `vnext-state-${state2.id}`,
+  ownerType,
+  ownerId,
+  visibility: "private",
+  subjectType: "user",
+  subjectId: ownerId,
+  kind: "semantic",
+  content: state2.text.trim(),
+  createdAt: state2.createdAt,
+  importance: 0.9,
+  confidence: 0.9,
+  // Flag resident preferences so they flow into overlay's resident section.
+  resident: state2.facet === "preference" || state2.facet === "style",
+  lastActivatedAt: state2.createdAt,
+  activationCount: 1
+});
+var resolveMemoryVNextM4Selection = async (input) => {
+  const { db, owners, query, selected } = input;
+  const ownerIds = owners.map((o) => `${o.ownerType}:${encodeURIComponent(o.ownerId)}`);
+  const catalogs = new Map(
+    await Promise.all(
+      ownerIds.map(async (ownerId) => [
+        ownerId,
+        await loadMemoryVNextCatalog(db, ownerId)
+      ])
+    )
+  );
+  const recalledStates = [];
+  const recalledStateIds = /* @__PURE__ */ new Set();
+  for (const owner of owners) {
+    const principalId = `${owner.ownerType}:${encodeURIComponent(owner.ownerId)}`;
+    const catalog = catalogs.get(principalId);
+    if (!catalog) continue;
+    const currentStates = catalog.states.filter((s) => !s.retiredAt && s.text.trim());
+    const hits = recallMemoryVNextLocal({
+      query,
+      entities: catalog.entities,
+      states: currentStates
+    });
+    const entityById = new Map(catalog.entities.map((e) => [e.id, e]));
+    for (const hit of hits) {
+      if (recalledStateIds.has(hit.state.id)) continue;
+      recalledStateIds.add(hit.state.id);
+      recalledStates.push(
+        buildSynthesizedStateItem2(hit.state, entityById.get(hit.state.entityId), owner.ownerType, owner.ownerId)
+      );
+    }
+  }
+  const uncoveredLegacy = [];
+  let coveredSuppressedCount = 0;
+  for (const item of selected) {
+    const evidence = buildLegacyMemoryEvidence(item);
+    const catalog = catalogs.get(evidence.ownerId);
+    const states = catalog?.states ?? [];
+    const covering = currentStatesCitingEvidence(states, evidence.id);
+    if (covering.length > 0) {
+      coveredSuppressedCount++;
+    } else {
+      uncoveredLegacy.push(item);
+    }
+  }
+  const renderItems = [...recalledStates, ...uncoveredLegacy];
+  return {
+    renderItems,
+    recalledStateCount: recalledStates.length,
+    uncoveredLegacyCount: uncoveredLegacy.length,
+    coveredSuppressedCount
+  };
+};
+
 // packages/ai/memory/runtime.ts
 var COLD_STORAGE_CONFIDENCE = 0.3;
 var MEMORY_OVERLAY_TOKEN_BUDGET = DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET;
@@ -13382,6 +13818,18 @@ var resolveMemoryRuntime = async (input) => {
   if (owners.length === 0) {
     return { selectedItems: [], promptBlock: null };
   }
+  if (isMemoryVNextPureReadEnabled()) {
+    const pure = await resolvePureVNextRuntime({
+      db: input.db,
+      owners,
+      userInput: input.userInput,
+      maxTokens: MEMORY_OVERLAY_TOKEN_BUDGET
+    });
+    return {
+      selectedItems: pure.selectedItems,
+      promptBlock: pure.promptBlock
+    };
+  }
   const policy = resolveAgentMemoryPolicy({ agentKey: input.agentKey });
   const legacyStartedAt = performance.now();
   const candidates = await loadMemoryCandidatesFromDb(input.db, {
@@ -13411,10 +13859,62 @@ var resolveMemoryRuntime = async (input) => {
   );
   const selected = [...residentItems, ...ranked];
   const legacyLatencyMs = Math.round((performance.now() - legacyStartedAt) * 10) / 10;
-  const promptBlock = selected.length === 0 ? null : buildMemoryOverlay(selected, { maxTokens: MEMORY_OVERLAY_TOKEN_BUDGET });
-  const shadowEnabled = input.vNextShadowProvider != null && isMemoryVNextShadowReadEnabled();
+  const renderOverlay = (items) => items.length === 0 ? null : buildMemoryOverlay(items, { maxTokens: MEMORY_OVERLAY_TOKEN_BUDGET });
+  let promptBlock = renderOverlay(selected);
+  const primaryRead = isMemoryVNextPrimaryReadEnabled();
+  let allCoveredByVNext = false;
+  if (primaryRead) {
+    const emitPrimary = (observation) => {
+      try {
+        (input.primaryReadEmit ?? ((o) => console.info("[memory] vnext primary read", { event: "memory_vnext_primary_read", ...o })))(observation);
+      } catch {
+      }
+    };
+    const base = { legacyHitCount: selected.length, legacyLatencyMs };
+    const vnextStartedAt = performance.now();
+    const vnextLatency = () => Math.round((performance.now() - vnextStartedAt) * 10) / 10;
+    if (selected.length === 0) {
+      emitPrimary({ ...base, source: "none" });
+    } else {
+      try {
+        let timer;
+        const m4 = await Promise.race([
+          resolveMemoryVNextM4Selection({ db: input.db, owners, query: input.userInput, selected }),
+          new Promise((_, reject) => {
+            timer = setTimeout(
+              () => reject(Object.assign(new Error("timeout"), { name: "TimeoutError" })),
+              MEMORY_VNEXT_PRIMARY_READ_TIMEOUT_MS
+            );
+          })
+        ]).finally(() => clearTimeout(timer));
+        promptBlock = renderOverlay(m4.renderItems);
+        allCoveredByVNext = m4.uncoveredLegacyCount === 0 && m4.recalledStateCount > 0;
+        const source = m4.recalledStateCount > 0 ? m4.uncoveredLegacyCount === 0 ? "vnext" : "hybrid" : m4.uncoveredLegacyCount > 0 ? "legacy_fallback" : "none";
+        emitPrimary({
+          ...base,
+          source,
+          uncoveredLegacyCount: m4.uncoveredLegacyCount,
+          coveredSuppressedCount: m4.coveredSuppressedCount,
+          recalledStateCount: m4.recalledStateCount,
+          vnextLatencyMs: vnextLatency(),
+          contextChars: promptBlock?.length ?? 0,
+          ...source === "legacy_fallback" ? { fallbackReason: "no_vnext_context" } : {}
+        });
+      } catch (error) {
+        emitPrimary({
+          ...base,
+          source: "legacy_fallback",
+          vnextLatencyMs: vnextLatency(),
+          contextChars: promptBlock?.length ?? 0,
+          fallbackReason: "vnext_error",
+          error: error instanceof Error ? error.name : "UnknownError"
+        });
+      }
+    }
+  }
+  const shadowEnabled = !primaryRead && input.vNextShadowProvider != null && isMemoryVNextShadowReadEnabled();
   if (shadowEnabled) {
-    await runMemoryVNextShadowRead({
+    void runMemoryVNextShadowRead({
       ctx: {
         db: input.db,
         owners,
@@ -13424,17 +13924,28 @@ var resolveMemoryRuntime = async (input) => {
       legacyItems: selected,
       legacyLatencyMs,
       legacyContextChars: promptBlock?.length ?? 0
+    }).catch(() => {
     });
   }
-  const promotionCandidate = selected[0];
   const lazyPromotionEnabled = input.vNextShadowProvider != null && isMemoryVNextLazyPromotionEnabled();
-  if (lazyPromotionEnabled && promotionCandidate) {
-    void runMemoryVNextLazyPromotion({
-      db: input.db,
-      item: promotionCandidate,
-      provider: input.vNextShadowProvider,
-      ...input.lazyPromotionEmit ? { emit: input.lazyPromotionEmit } : {}
-    }).catch(() => {
+  if (lazyPromotionEnabled && selected.length > 0 && !allCoveredByVNext) {
+    void (async () => {
+      const promotionPick = await pickFirstUncoveredLazyPromotionItem(
+        input.db,
+        selected
+      );
+      if (promotionPick) {
+        await runMemoryVNextLazyPromotion({
+          db: input.db,
+          item: promotionPick.item,
+          selectedIndex: promotionPick.selectedIndex,
+          skippedCoveredCount: promotionPick.skippedCoveredCount,
+          skippedNoOpCount: promotionPick.skippedNoOpCount,
+          provider: input.vNextShadowProvider,
+          ...input.lazyPromotionEmit ? { emit: input.lazyPromotionEmit } : {}
+        });
+      }
+    })().catch(() => {
     });
   }
   if (selected.length === 0) {
@@ -13448,6 +13959,52 @@ var resolveMemoryRuntime = async (input) => {
 };
 
 // packages/cli/memoryRecall.ts
+var logger = getLogger("cli.memoryRecall");
+var DEDUP_WINDOW_MS = 5 * 60 * 1e3;
+var DEDUP_MAX_KEYS = 100;
+var dedupMap = /* @__PURE__ */ new Map();
+function evictDedupIfNeeded() {
+  if (dedupMap.size < DEDUP_MAX_KEYS) return;
+  let oldestKey = null;
+  let oldestTs = Infinity;
+  for (const [k, v] of dedupMap) {
+    if (v.lastLog < oldestTs) {
+      oldestTs = v.lastLog;
+      oldestKey = k;
+    }
+  }
+  if (oldestKey !== null) dedupMap.delete(oldestKey);
+}
+function logDeduped(level, fingerprint, message, error) {
+  const now = Date.now();
+  const entry = dedupMap.get(fingerprint);
+  if (!entry) {
+    evictDedupIfNeeded();
+    dedupMap.set(fingerprint, { count: 1, suppressed: 0, lastLog: now });
+    if (error !== void 0) logger[level](message, error);
+    else logger[level](message);
+    return;
+  }
+  entry.count += 1;
+  if (now - entry.lastLog >= DEDUP_WINDOW_MS) {
+    const suppressed = entry.suppressed;
+    const summary = `${message} (deduplicated: ${entry.count} occurrences, ${suppressed} suppressed over ${Math.round((now - entry.lastLog) / 1e3)}s)`;
+    if (error !== void 0) logger[level](summary, error);
+    else logger[level](summary);
+    entry.count = 1;
+    entry.suppressed = 0;
+    entry.lastLog = now;
+  } else {
+    entry.suppressed += 1;
+  }
+}
+function fingerprintFor(kind, detail) {
+  const d = detail === void 0 ? "" : sanitizeFp(String(detail));
+  return `mem-${kind}:${d}`;
+}
+function sanitizeFp(s) {
+  return s.replace(/\s+/g, " ").slice(0, 80);
+}
 var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceId) => {
   try {
     const response = await fetch(`${serverUrl}/api/memory/query`, {
@@ -13464,10 +14021,10 @@ var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceI
       signal: AbortSignal.timeout(5e3)
     });
     if (!response.ok) {
-      console.warn(
-        "[cli-memory] remote query returned non-ok status:",
-        response.status,
-        "\u2014 falling back to local"
+      logDeduped(
+        "warn",
+        fingerprintFor("remote-nonok", response.status),
+        `remote query returned non-ok status ${response.status} \u2014 falling back to local`
       );
       return null;
     }
@@ -13475,7 +14032,12 @@ var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceI
     const block = typeof payload?.promptBlock === "string" ? payload.promptBlock.trim() : "";
     return block || null;
   } catch (error) {
-    console.warn("[cli-memory] remote query failed, falling back to local:", error);
+    logDeduped(
+      "info",
+      fingerprintFor("remote-failed", error instanceof Error ? error.name : void 0),
+      "remote query failed, falling back to local",
+      normalizeError(error)
+    );
     return null;
   }
 };
@@ -13511,7 +14073,12 @@ var resolveCliMemory = async (input) => {
       input.spaceId
     );
   } catch (error) {
-    console.warn("[cli-memory] local recall failed, omitting memory layer:", error);
+    logDeduped(
+      "warn",
+      fingerprintFor("local-failed", error instanceof Error ? error.name : void 0),
+      "local recall failed, omitting memory layer",
+      normalizeError(error)
+    );
     return null;
   }
 };
@@ -13566,7 +14133,10 @@ async function resolveAgentRunAgentKey(args) {
 }
 async function runAgentRunCommand(args, deps) {
   const env = deps.env ?? process.env;
-  const output = deps.output ?? process.stdout;
+  const output = deps.output ?? {
+    write: (chunk) => process.stdout.write(chunk),
+    writeErr: (chunk) => process.stderr.write(chunk)
+  };
   if (args.includes("--help") || args.includes("-h")) {
     writeUsage(output, deps.commandPath);
     return 0;
@@ -14108,12 +14678,6 @@ function isBalanceExhaustedError(error) {
 }
 
 export {
-  resolveAgentModelIdentity,
-  resolveAgentContextWindow,
-  platformCreditsFromUsage,
-  formatCreditsChip,
-  formatTokenCount,
-  renderTokenStatus,
   resolveCliColorEnabled,
   dimCliText,
   ANSI_ESCAPE_REGEX,
@@ -14154,6 +14718,12 @@ export {
   formatAssistantDisplay,
   redactSecrets,
   TUI_TREE_MARKER,
+  resolveAgentModelIdentity,
+  resolveAgentContextWindow,
+  platformCreditsFromUsage,
+  formatCreditsChip,
+  formatTokenCount,
+  renderTokenStatus,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,
   createCollapsedPasteStore,
@@ -14165,14 +14735,14 @@ export {
   expandRangeToCollapsedPasteChips,
   findCollapsedPasteSpanAt,
   runAgentTurn,
-  readAgentsMdLayerFromDisk,
   resolveWorkflowReference,
   resolveSkillReference,
   buildSkillContextBlocks,
   prependSubjectDialogMarker,
   normalizeCliImageInput,
-  inspectLocalRunWorkspace,
+  readAgentsMdLayerFromDisk,
   resolveCliMemory,
+  inspectLocalRunWorkspace,
   resolveRunOutcome,
   isRunResultStalledOrTruncated,
   resolveRunSettlementNote,