nolo-cli 0.108.0-alpha.1 → 0.108.0

package/{chunk-R7RHOSZU.js → chunk-KN6MKCS5.js}

@@ -1,6 +1,6 @@
 import {
   findPotentialSecrets
-} from "./chunk-S7Z2HMCN.js";
+} from "./chunk-VJVNU77E.js";
 import {
   buildLocalRunEnv,
   isFullstackCodingAgentRef,
@@ -9,15 +9,34 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-V7E4PXQD.js";
+} from "./chunk-4MSYSHZD.js";
+import {
+  getReadableCliDb
+} from "./chunk-V6WXGTUJ.js";
+import {
+  _appendEntityBatch,
+  _appendEvidenceBatch,
+  _appendRelationBatch,
+  _appendRetiredStateBatch,
+  _appendStateBatch,
+  getMemoryEntityVNext,
+  getMemoryEvidenceVNext,
+  getMemoryEvidenceVNextStrict,
+  getMemoryStateVNext,
+  listMemoryStatesForEntityVNext,
+  loadMemoryVNextCatalog,
+  putMemoryEvidenceVNext
+} from "./chunk-TY3TIUJK.js";
+import {
+  readDbRecord,
+  resolveAgentRecordFromHybridStore
+} from "./chunk-A337PRRR.js";
 import {
   resolveMachineId
 } from "./chunk-ESHYE7WU.js";
 import {
-  agentRunCardLabels,
   createCliLocalRuntimeAdapter,
   detectCurrentMachineId,
-  getCliLocale,
   isBuiltinNoloAgentRef,
   isCliProviderAgentConfig,
   isLiveAgentRunObservation,
@@ -27,179 +46,303 @@ import {
   resolveAuthToken as resolveAuthToken2,
   resolveBoundMachineId,
   resolveFileWriteGateEnabled,
-  resolveLocalUserId,
-  t,
-  toolLabel
-} from "./chunk-BVGTK7MR.js";
-import {
-  createRunActivityTracker,
-  popSingleQueueMessage,
-  readRunRecord,
-  resolveRunQueuePath,
-  settleRunTerminalAuthoritatively,
-  spawnLocalBackgroundRun
-} from "./chunk-I3TQJXQ7.js";
+  resolveLocalUserId
+} from "./chunk-QH2QSBGP.js";
 import {
   clearCredentialAvailability,
   readCredentialEntry,
-  recordCredentialProbe,
-  resolveCredentialKeyWithFallback
-} from "./chunk-42V6BK2E.js";
-import {
-  getReadableCliDb
-} from "./chunk-LS2ZANRJ.js";
+  recordCredentialProbe
+} from "./chunk-6MXDOUMH.js";
 import {
-  readDbRecord,
-  resolveAgentRecordFromHybridStore
-} from "./chunk-AEOE4Z6Q.js";
+  agentRunCardLabels,
+  getCliLocale,
+  t,
+  toolLabel,
+  toolLabelVariants
+} from "./chunk-6CCAXGFK.js";
 import {
   isLocalCliAgentKey
-} from "./chunk-SV5IJK6K.js";
+} from "./chunk-NBTY7YJF.js";
 import {
   CliProviderQuotaError
-} from "./chunk-MP64VFGD.js";
+} from "./chunk-4XEYAFLY.js";
+import {
+  extractGoogleValidationLink
+} from "./chunk-BMQ2MJUK.js";
 import {
   applyModelLayerOverride,
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
-import {
-  formatAgentListCard
-} from "./chunk-AG2AZ6GX.js";
 import {
   isTransientFetchError
-} from "./chunk-5UTFL4QJ.js";
+} from "./chunk-APO5TOXO.js";
+import {
+  parseUiCard,
+  uiCardFallback
+} from "./chunk-DGDGNYI5.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
 import {
-  formatFinishedRunCard,
-  formatListRunsCard,
-  formatNotFoundRunCard,
-  formatStartRunCard,
-  formatStatusRunCard,
-  formatStopRunCard,
-  isAgentRunTerminalStatus
-} from "./chunk-3VNWWVKB.js";
-import {
-  extractGoogleValidationLink
-} from "./chunk-BMQ2MJUK.js";
+  parsePositiveFiniteNumberOrFallback
+} from "./chunk-XPWGOTBQ.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-RRPWH4LX.js";
+} from "./chunk-26UZ2Y4Z.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   parseUiAskChoiceContent
-} from "./chunk-TWQWYIMJ.js";
+} from "./chunk-ROXFUKKL.js";
 import {
   isOAuthApiKeyRef
-} from "./chunk-YYLHWIW6.js";
-import {
-  isCliAuthorityBrokerProtocolError,
-  isCliAuthorityBrokerTimeoutError,
-  isCliAuthorityBrokerUnavailableError
-} from "./chunk-TRV2MIDW.js";
-import {
-  getDefaultCliLocalRuntimeDb
-} from "./chunk-2F7RJC6L.js";
-import {
-  buildSkillDiscoveryContextLayer
-} from "./chunk-E4MARS3Q.js";
+} from "./chunk-UKZX3NHN.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
-} from "./chunk-Q554LLSI.js";
+} from "./chunk-XETG4RIX.js";
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-62CATUYY.js";
+} from "./chunk-NLEJWKF5.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-4MK3I7Y4.js";
+} from "./chunk-G23MQWLJ.js";
 import {
   createThinkParserState,
   flushThinkParser,
   processThinkChunk
-} from "./chunk-N7J63Q6C.js";
+} from "./chunk-56GBUMO5.js";
 import {
+  ATTACHMENT_PART_TYPE,
+  ATTACHMENT_PART_VERSION,
+  describeAttachmentForModel,
+  normalizeAttachmentPart
+} from "./chunk-WJZOQR2J.js";
+import {
+  PROBE_INTERVAL_MS,
   QUOTA_ERROR_PATTERNS,
   isQuotaExhaustedError,
   isQuotaLimited403Body,
   mergeAvailabilityDeadline,
-  resolveCooldownGate
-} from "./chunk-FDTR4QJ6.js";
-import {
-  isAntigravityOAuthAgent
-} from "./chunk-UZGQNTVW.js";
+  resolveCooldownGate,
+  resolveCredentialKeyWithFallback
+} from "./chunk-3MZAGMYY.js";
 import {
-  resolveClientVersion
-} from "./chunk-6OZ36FXI.js";
+  normalizeUsage
+} from "./chunk-VSPO4S33.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
-  getModelContextWindow,
-  normalizeUsage
-} from "./chunk-HKNXJGEC.js";
+  getModelContextWindow
+} from "./chunk-FWY6BHIJ.js";
 import {
   clipCompactText
-} from "./chunk-P5EVSOPA.js";
-import {
-  findModelConfig
-} from "./chunk-OIVSQH2O.js";
+} from "./chunk-5MMAK75Q.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
+import {
+  BUILTIN_NOLO_AGENT_KEY,
+  BUILTIN_NOLO_AGENT_NAME,
+  builtinAgentCatalogEntryById,
+  parseBuiltinPlatformAgentId
+} from "./chunk-3LI5UCTU.js";
+import {
+  parsePublicAgentId
+} from "./chunk-M2EJHDJP.js";
+import {
+  createMemoryKey,
+  ulid
+} from "./chunk-RLRYVSCD.js";
+import {
+  isAntigravityOAuthAgent
+} from "./chunk-TSBCYK5F.js";
+import {
+  createRunActivityTracker,
+  getRunResultHeaderMeta,
+  popSingleQueueMessage,
+  readRunRecord,
+  recordRunResultHeaderMeta,
+  resolveResultServerMeta,
+  resolveRunQueuePath,
+  serverOriginForDialog,
+  settleRunTerminalAuthoritatively,
+  spawnLocalBackgroundRun
+} from "./chunk-MHD5JBSS.js";
+import {
+  formatAgentListCard,
+  formatFinishedRunCard,
+  formatListRunsCard,
+  formatNotFoundRunCard,
+  formatStartRunCard,
+  formatStatusRunCard,
+  formatStopRunCard,
+  isAgentRunTerminalStatus
+} from "./chunk-PJNFNEJE.js";
+import {
+  resolveClientVersion
+} from "./chunk-KY6GPQ7O.js";
+import {
+  findModelConfig
+} from "./chunk-CGEK73JN.js";
+import {
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
+import {
+  isCliAuthorityBrokerProtocolError,
+  isCliAuthorityBrokerTimeoutError,
+  isCliAuthorityBrokerUnavailableError
+} from "./chunk-EXAJ6DCR.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import {
-  buildAgentsMdLayer,
-  buildMemoryOverlayLayer,
-  buildMemoryUseGuidanceLayer,
-  partitionScopedBlocks,
-  renderTurnContextBlocksWithScope
-} from "./chunk-DVINR3PL.js";
+  getDefaultCliLocalRuntimeDb
+} from "./chunk-2C47W7IJ.js";
 import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-X7HHHIOZ.js";
+  getLogger,
+  normalizeError
+} from "./chunk-EYLGAEB4.js";
 import {
   resolveAuthToken
 } from "./chunk-A7GB5UGH.js";
+import {
+  asOptionalTrimmedString
+} from "./chunk-G3SUCT4W.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";
 import {
-  BUILTIN_NOLO_AGENT_KEY,
-  BUILTIN_NOLO_AGENT_NAME,
-  builtinAgentCatalogEntryById
-} from "./chunk-BNGW5ASC.js";
-import {
-  parsePublicAgentId
-} from "./chunk-M2EJHDJP.js";
-import {
-  isLevelNotFoundError
-} from "./chunk-OW765XBU.js";
-import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
+  buildSkillDiscoveryContextLayer
+} from "./chunk-AU7AXHUL.js";
 import {
-  asOptionalTrimmedString
-} from "./chunk-G3SUCT4W.js";
+  buildAgentsMdLayer,
+  buildMemoryOverlayLayer,
+  buildMemoryUseGuidanceLayer,
+  partitionScopedBlocks,
+  renderTurnContextBlocksWithScope
+} from "./chunk-VEA7H5FG.js";
+
+// packages/cli/tui/localAttachmentParts.ts
+import { statSync } from "node:fs";
+import path from "node:path";
+var EXT_MIME = {
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  png: "image/png",
+  gif: "image/gif",
+  webp: "image/webp",
+  bmp: "image/bmp",
+  tif: "image/tiff",
+  tiff: "image/tiff",
+  heic: "image/heic",
+  heif: "image/heif",
+  svg: "image/svg+xml",
+  mp3: "audio/mpeg",
+  m4a: "audio/mp4",
+  wav: "audio/wav",
+  ogg: "audio/ogg",
+  oga: "audio/ogg",
+  opus: "audio/opus",
+  flac: "audio/flac",
+  aac: "audio/aac",
+  amr: "audio/amr",
+  wma: "audio/x-ms-wma",
+  mp4: "video/mp4",
+  m4v: "video/x-m4v",
+  mov: "video/quicktime",
+  mkv: "video/x-matroska",
+  webm: "video/webm",
+  avi: "video/x-msvideo",
+  wmv: "video/x-ms-wmv",
+  mpg: "video/mpeg",
+  mpeg: "video/mpeg",
+  "3gp": "video/3gpp",
+  flv: "video/x-flv",
+  pdf: "application/pdf",
+  txt: "text/plain",
+  md: "text/markdown",
+  json: "application/json",
+  csv: "text/csv",
+  zip: "application/zip",
+  apk: "application/vnd.android.package-archive"
+};
+var mimeTypeForLocalPath = (filePath) => {
+  const ext = path.extname(filePath).slice(1).toLowerCase();
+  return EXT_MIME[ext] ?? "application/octet-stream";
+};
+var defaultStatSize = (filePath) => {
+  try {
+    const stat = statSync(filePath);
+    return stat.isFile() ? stat.size : null;
+  } catch {
+    return null;
+  }
+};
+var buildLocalAttachments = (input) => {
+  const machineId = typeof input.machineId === "string" ? input.machineId.trim() : "";
+  const workspaceRoot = typeof input.workspaceRoot === "string" ? input.workspaceRoot.trim() : "";
+  const statSize = input.statSize ?? defaultStatSize;
+  const mimeTypeOf = input.mimeTypeOf ?? mimeTypeForLocalPath;
+  const parts = [];
+  const skipped = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of input.paths) {
+    const filePath = typeof raw === "string" ? raw.trim() : "";
+    if (!filePath || seen.has(filePath)) continue;
+    seen.add(filePath);
+    if (!machineId) {
+      skipped.push({ path: filePath, reason: "machine-unbound" });
+      continue;
+    }
+    const size = statSize(filePath);
+    if (size === null || !Number.isFinite(size) || size < 0) {
+      skipped.push({ path: filePath, reason: "unreadable" });
+      continue;
+    }
+    const normalized = normalizeAttachmentPart({
+      type: ATTACHMENT_PART_TYPE,
+      v: ATTACHMENT_PART_VERSION,
+      source: {
+        kind: "local-file",
+        path: filePath,
+        machineId,
+        ...workspaceRoot ? { workspaceRoot } : {}
+      },
+      name: path.basename(filePath),
+      mimeType: mimeTypeOf(filePath),
+      size
+    });
+    if (normalized.status !== "valid") {
+      skipped.push({ path: filePath, reason: "invalid-part" });
+      continue;
+    }
+    parts.push(normalized.attachment);
+  }
+  const cardText = parts.map((part) => describeAttachmentForModel(part)).join("\n");
+  return { parts, skipped, cardText };
+};
+var appendAttachmentCard = (message, cardText) => {
+  if (!cardText) return message;
+  return message.trim() ? `${message}
+
+${cardText}` : cardText;
+};
+
+// packages/chat/messages/attachmentWriteRollout.ts
+var ENABLE_REMOTE_ATTACHMENT_PART_WRITES = false;
 
 // packages/cli/client/tokenUsage.ts
 var PLATFORM_CREDIT_UNIT = "credits";
@@ -211,7 +354,9 @@ function resolveEffectiveModel(opts) {
   if (isUsableModelId(opts.model)) return opts.model;
   const agentKey = opts.agentKey?.trim();
   if (!agentKey) return void 0;
-  return builtinAgentCatalogEntryById(parsePublicAgentId(agentKey))?.model;
+  return builtinAgentCatalogEntryById(
+    parseBuiltinPlatformAgentId(agentKey) ?? parsePublicAgentId(agentKey)
+  )?.model;
 }
 function resolveAgentModelIdentity(opts) {
   const model = resolveEffectiveModel(opts);
@@ -1008,11 +1153,17 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
       activeStyles.push(value);
     }
   };
+  let lastContentTokenIndex = -1;
+  for (let i = tokens.length - 1; i >= 0; i -= 1) {
+    if (tokens[i].kind !== "sgr") {
+      lastContentTokenIndex = i;
+      break;
+    }
+  }
+  let plainCharIndexAtStart = 0;
   let start = 0;
   while (start < tokens.length) {
-    if (tokens.slice(start).every((token) => token.kind === "sgr")) {
-      if (rows.length > 0) break;
-    }
+    if (start > lastContentTokenIndex && rows.length > 0) break;
     const openingStyles = [...activeStyles];
     const isContinuation = rows.length > 0;
     const currentPrefixWidth = isContinuation ? visibleWidth(hangingIndent) : prefixWidth;
@@ -1060,13 +1211,7 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
     let segSourceEnd = lineSourceStart;
     let foundFirst = false;
     const rowMapping = [];
-    let plainCharIndex = 0;
-    for (let i = 0; i < start; i++) {
-      const tok = tokens[i];
-      if (tok.kind === "char" && tok.charIndex >= prefixCharCount) {
-        plainCharIndex += tok.value.length;
-      }
-    }
+    let plainCharIndex = plainCharIndexAtStart;
     for (let i = start; i < segmentEnd; i++) {
       const tok = tokens[i];
       if (tok.kind === "char" && tok.charIndex >= prefixCharCount) {
@@ -1103,6 +1248,7 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
     if (start >= tokens.length && rawLineLength !== void 0) {
       segSourceEnd = lineSourceStart + rawLineLength;
     }
+    plainCharIndexAtStart = plainCharIndex;
     rows.push({
       rendered: rowRendered,
       sourceStart: segSourceStart,
@@ -8206,7 +8352,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 +8373,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 +8534,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 +8552,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}`;
+    }
+    if (level === 3) {
+      return `${STYLE.bold}${colorSeq("info", brightness)}${styledTitle}${STYLE.reset}`;
     }
-    return `${STYLE.bold}${colorSeq("info", brightness)}${title}${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 +8577,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 +8713,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 +8744,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 +8771,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 +8787,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 +8807,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 +8823,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 +8837,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 +8864,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 +8885,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");
     }
   };
@@ -8667,6 +8947,34 @@ function redactSecrets(text) {
   );
 }
 
+// packages/cli/tui/askTextSanitize.ts
+var ASK_SECRET_PLACEHOLDER = "\u27E8redacted\u27E9";
+var C0_C1_CONTROL_REGEX = /[\x00-\x1f\x7f-\x9f]/g;
+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 toText(value) {
+  return typeof value === "string" ? value : String(value ?? "");
+}
+function cleanAskText(value) {
+  return stripAnsi2(toText(value)).replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").replace(C0_C1_CONTROL_REGEX, "").replace(/\s+/g, " ").trim();
+}
+function safeAskText(value, max) {
+  const cleaned = redactSecrets(cleanAskText(value));
+  if (!cleaned) return "";
+  const guarded = withholdIfSecretLike(cleaned) || ASK_SECRET_PLACEHOLDER;
+  return max === void 0 ? guarded : clipCompactText(guarded, max, "\u2026");
+}
+
 // node_modules/diff/libesm/diff/base.js
 var Diff = class {
   diff(oldStr, newStr, options = {}) {
@@ -8767,16 +9075,16 @@ var Diff = class {
       }
     }
   }
-  addToPath(path, added, removed, oldPosInc, options) {
-    const last = path.lastComponent;
+  addToPath(path2, added, removed, oldPosInc, options) {
+    const last = path2.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path.oldPos + oldPosInc,
+        oldPos: path2.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path.oldPos + oldPosInc,
+        oldPos: path2.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -8921,14 +9229,14 @@ function tokenize(value, options) {
 import { homedir as osHomedir } from "node:os";
 
 // packages/core/foldHomePath.ts
-function foldHomePath(path, home) {
-  if (!path) return path;
+function foldHomePath(path2, home) {
+  if (!path2) return path2;
   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 (path2 === cleanHome) return "~";
+    if (path2.startsWith(cleanHome + "/")) return `~${path2.slice(cleanHome.length)}`;
   }
-  return path.replace(/^(\/Users\/[^/]+|\/home\/[^/]+)(\/|$)/, "~$2");
+  return path2.replace(/^(\/Users\/[^/]+|\/home\/[^/]+)(\/|$)/, "~$2");
 }
 
 // packages/cli/client/formatReadPathTree.ts
@@ -8955,10 +9263,10 @@ function clipPathAware(value, max = 72) {
   if (filenameOnly.length <= max) return filenameOnly;
   return clipCompactText(value, max, "\u2026");
 }
-function formatHomePath(path, customHomedir) {
-  if (!path) return "";
+function formatHomePath(path2, customHomedir) {
+  if (!path2) return "";
   const home = customHomedir || (typeof process !== "undefined" ? process.env?.HOME : void 0) || (typeof osHomedir === "function" ? osHomedir() : "");
-  return foldHomePath(path, home);
+  return foldHomePath(path2, 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";
@@ -8978,10 +9286,10 @@ function formatReadItemPath(rawPath, metadata, customHomedir) {
   const clippedPath = clipPathAware(formattedPath, 72);
   return `${clippedPath}${rangePart}`;
 }
-function formatSearchItemQuery(query, path, customHomedir) {
+function formatSearchItemQuery(query, path2, customHomedir) {
   let text = (query || "").trim();
-  if (path) {
-    const formattedPath = formatHomePath(path, customHomedir);
+  if (path2) {
+    const formattedPath = formatHomePath(path2, customHomedir);
     if (formattedPath) {
       text = text ? `${text} in ${formattedPath}` : formattedPath;
     }
@@ -9037,7 +9345,7 @@ function parseUiAskChoiceForCli(event) {
     label: String(parsed.selected.label ?? "").trim(),
     userMessage: String(parsed.selected.userMessage ?? "").trim()
   } : void 0;
-  const answers = Array.isArray(parsed.answers) ? parsed.answers : void 0;
+  const answers = Array.isArray(parsed.answers) ? parsed.answers.filter((a) => Boolean(a && typeof a === "object")) : void 0;
   const cancelled = Boolean(parsed.cancelled);
   const resolved = Boolean(
     event.metadata?.resolved || selected || cancelled || answers && answers.length > 0
@@ -9058,7 +9366,7 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
   if (!parsed) return null;
   const lines = [];
   lines.push("");
-  const questionText = parsed.question || "";
+  const questionText = safeAskText(parsed.question, 200);
   if (colorEnabled) {
     lines.push(`${themeText("\u2753 ", "info", true)}${styleCliText(questionText, "cyan", true)}`);
   } else {
@@ -9073,7 +9381,8 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
       return `${lines.join("\n")}
 `;
     }
-    const selectedLabel = parsed.selected?.label || parsed.selected?.userMessage || (parsed.answers ? parsed.answers.map((a) => a.userMessage).filter(Boolean).join(", ") : "");
+    const rawSelected = parsed.selected?.label || parsed.selected?.userMessage;
+    const selectedLabel = rawSelected ? safeAskText(rawSelected, 160) : parsed.answers ? parsed.answers.map((a) => safeAskText(a.userMessage, 160)).filter(Boolean).join(", ") : "";
     const marker = t("askChoiceHistorySelected");
     const displayLabel = selectedLabel || "\u2014";
     if (colorEnabled) {
@@ -9086,8 +9395,9 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
     if (parsed.answers && parsed.answers.length > 1) {
       for (const answer of parsed.answers) {
         if (!answer.userMessage) continue;
+        const answerText = safeAskText(answer.userMessage, 160);
         lines.push(
-          colorEnabled ? `    ${themeText("\xB7", "chrome", true)} ${answer.userMessage}` : `    \xB7 ${answer.userMessage}`
+          colorEnabled ? `    ${themeText("\xB7", "chrome", true)} ${answerText}` : `    \xB7 ${answerText}`
         );
       }
     }
@@ -9096,7 +9406,7 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
   }
   parsed.choices.forEach((choice, i) => {
     const num = String(i + 1);
-    const label = choice.label;
+    const label = safeAskText(choice.label, 160);
     if (colorEnabled) {
       lines.push(
         `  ${themeText(num + ".", "chrome", true)} ${label}`
@@ -9112,6 +9422,87 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
     lines.push(`  ${hint}`);
   }
   return `${lines.join("\n")}
+`;
+}
+function formatShowInteractionBlock(event, colorEnabled) {
+  const label = toolLabel(event.toolName || "show_interaction");
+  let parsedPayload;
+  if (typeof event.content === "string") {
+    try {
+      parsedPayload = JSON.parse(event.content);
+    } catch {
+      const metadata = event.metadata ?? {};
+      const rawMetaError = metadata.error ?? metadata.errorMessage;
+      const rawMessage = event.message?.trim();
+      const rawContent = event.content.trim();
+      let reason = "";
+      if (typeof rawMetaError === "string" && rawMetaError.trim()) {
+        reason = rawMetaError.trim();
+      } else if (rawMessage) {
+        reason = rawMessage;
+      } else if (/^\[工具\s*"[^"]+"\s*执行失败:\s*[^\]]+\]$/.test(rawContent)) {
+        reason = rawContent;
+      }
+      const detail = reason ? clip(redactSecrets(cleanUserText(reason)), 96) : "invalid card payload";
+      return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${detail}`, colorEnabled, "error");
+    }
+  } else if (event.content && typeof event.content === "object") {
+    parsedPayload = event.content;
+  } else {
+    const metadata = event.metadata ?? {};
+    const rawMetaError = metadata.error ?? metadata.errorMessage;
+    const reason = typeof rawMetaError === "string" && rawMetaError.trim() || event.message?.trim() || "";
+    const detail = reason ? clip(redactSecrets(cleanUserText(reason)), 96) : "invalid card payload";
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${detail}`, colorEnabled, "error");
+  }
+  if (parsedPayload && typeof parsedPayload === "object" && parsedPayload.error) {
+    const detail = typeof parsedPayload.detail === "string" && parsedPayload.detail.trim() ? clip(redactSecrets(cleanUserText(parsedPayload.detail)), 96) : "card error";
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${detail}`, colorEnabled, "error");
+  }
+  const rawCard = parsedPayload && typeof parsedPayload === "object" && (parsedPayload.type === "show_interaction" || parsedPayload.card !== void 0) ? parsedPayload.card : parsedPayload;
+  const parsedCard = parseUiCard(rawCard);
+  if (!parsedCard.ok) {
+    const errorText = clip(redactSecrets(cleanUserText(parsedCard.error)), 96);
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${errorText}`, colorEnabled, "error");
+  }
+  const fallback = uiCardFallback(parsedCard.value);
+  const maxLines = 12;
+  const maxDisplayWidth = 400;
+  const rawLines = fallback.split("\n");
+  const clippedLines = [];
+  let currentWidth = 0;
+  let wasClipped = false;
+  for (let i = 0; i < rawLines.length; i++) {
+    if (clippedLines.length >= maxLines) {
+      wasClipped = true;
+      break;
+    }
+    const cleanLine = redactSecrets(cleanUserText(rawLines[i]));
+    const lineWidth = displayWidth(cleanLine);
+    const separatorWidth = clippedLines.length > 0 ? 1 : 0;
+    if (currentWidth + lineWidth + separatorWidth > maxDisplayWidth) {
+      const remainingWidth = maxDisplayWidth - currentWidth - separatorWidth;
+      if (remainingWidth > 0) {
+        clippedLines.push(truncateByDisplayWidth(cleanLine, remainingWidth));
+      }
+      wasClipped = true;
+      break;
+    }
+    clippedLines.push(cleanLine);
+    currentWidth += lineWidth + separatorWidth;
+  }
+  if (clippedLines.length === 0 && rawLines.length > 0 && maxDisplayWidth > 0) {
+    const cleanLine = redactSecrets(cleanUserText(rawLines[0]));
+    clippedLines.push(truncateByDisplayWidth(cleanLine, maxDisplayWidth));
+    wasClipped = true;
+  }
+  if (wasClipped) {
+    clippedLines.push("\u2026");
+  }
+  const cleanLines = clippedLines.map((l) => colorEnabled ? themeText(l, "muted", true) : l);
+  return `
+${cleanLines.join("\n")}
+
 `;
 }
 function formatToolTraceLine(text, colorEnabled, accent = "none") {
@@ -9134,6 +9525,7 @@ function renderRunCard(snapshot, opts) {
     ...snapshot,
     agentName: snapshot.agentName ? cleanUserText(snapshot.agentName) : snapshot.agentName,
     taskPreview: snapshot.taskPreview ? cleanUserText(snapshot.taskPreview) : snapshot.taskPreview,
+    title: snapshot.title ? cleanUserText(snapshot.title) : snapshot.title,
     lastAssistantText: snapshot.lastAssistantText ? cleanUserText(snapshot.lastAssistantText) : snapshot.lastAssistantText,
     lastToolNames: snapshot.lastToolNames?.map(cleanUserText)
   } : snapshot;
@@ -9144,6 +9536,7 @@ function renderRunCard(snapshot, opts) {
   } : { errorMessage: source.errorMessage, logLines: source.logLines };
   const body = isAgentRunTerminalStatus(snapshot.status) ? formatFinishedRunCard(name, snapshot.status, {
     runId: snapshot.runId,
+    ...snapshot.title ? { title: snapshot.title } : {},
     toolCallCount: source.toolCallCount,
     lastToolNames: source.lastToolNames,
     lastAssistantText: source.lastAssistantText,
@@ -9153,6 +9546,7 @@ function renderRunCard(snapshot, opts) {
     labels
   }) : formatStatusRunCard(name, snapshot.status, {
     runId: snapshot.runId,
+    ...snapshot.title ? { title: snapshot.title } : {},
     toolCallCount: source.toolCallCount,
     lastToolNames: source.lastToolNames,
     lastAssistantText: source.lastAssistantText,
@@ -9173,7 +9567,10 @@ function recoverOrchestrationCard(event, toolName, opts) {
     try {
       const parsed = JSON.parse(trimmed);
       const agents = Array.isArray(parsed.agents) ? parsed.agents : [];
-      return formatAgentListCard(agents);
+      const card = formatAgentListCard(agents);
+      const lines = card.split("\n");
+      lines[0] = t("agentsListLabel", String(agents.length));
+      return lines.join("\n");
     } catch {
       return null;
     }
@@ -9197,9 +9594,11 @@ function recoverOrchestrationCard(event, toolName, opts) {
   if (kind === "start") {
     const name = safe ? cleanUserText(snapshot.agentName ?? "agent") : snapshot.agentName ?? "agent";
     const task = snapshot.taskPreview ? safe ? cleanUserText(snapshot.taskPreview) : snapshot.taskPreview : snapshot.taskPreview;
+    const title = snapshot.title ? safe ? cleanUserText(snapshot.title) : snapshot.title : snapshot.title;
     return formatStartRunCard(name, snapshot.status, {
       task,
       runId: snapshot.runId,
+      ...title ? { title } : {},
       labels
     });
   }
@@ -9297,8 +9696,8 @@ function commandFullGist(command, max) {
   if (!oneLine) return "";
   return truncateByDisplayWidth(redactSecrets(oneLine), max);
 }
-function pathBasenameGist(path) {
-  const segments = path.split(/[\\/]/).filter((segment) => segment.length > 0);
+function pathBasenameGist(path2) {
+  const segments = path2.split(/[\\/]/).filter((segment) => segment.length > 0);
   const base = segments.pop();
   return base ? gistClip(base) : "";
 }
@@ -9426,12 +9825,36 @@ function buildHighlightedEditLine(line, lang, brightness, env) {
   const highlightedBody = highlightCodeLine(body, lang, brightness);
   return `${coloredPrefix}${highlightedBody}`;
 }
+var MEMORY_TOOL_GIST_MAX = 64;
+function memoryToolGist(toolName, metadata) {
+  const body = (value) => {
+    if (typeof value !== "string" || !value) return "";
+    return clipCompactText(redactSecrets(value), MEMORY_TOOL_GIST_MAX, "\u2026");
+  };
+  if (toolName === "rememberMemory") {
+    const content = body(metadata.content);
+    return content ? `+ ${content}` : "";
+  }
+  if (toolName === "queryMemory") {
+    const query = body(metadata.query);
+    return query ? `? ${query}` : "";
+  }
+  if (toolName === "deleteMemory") {
+    const reason = body(metadata.reason);
+    if (reason) return `- ${reason}`;
+    const keyword = body(metadata.contentKeyword);
+    if (keyword) return `- ${keyword}`;
+    const idsCount = typeof metadata.idsCount === "number" ? metadata.idsCount : 0;
+    if (idsCount > 0) return `- ${t("memoryDeleteRequestedCount", String(idsCount))}`;
+  }
+  return "";
+}
 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);
+    const path3 = typeof metadata.path === "string" ? metadata.path : typeof metadata.filePath === "string" ? metadata.filePath : "";
+    if (path3) return gistClip(formatReadItemPath(path3, metadata), 52);
   }
   if (toolName === "fetchWebpage") {
     const url = typeof metadata.url === "string" ? metadata.url : "";
@@ -9439,8 +9862,8 @@ function normalToolGistRaw(event) {
   }
   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);
+    const path3 = typeof metadata.path === "string" ? metadata.path : void 0;
+    if (query2 || path3) return formatSearchItemQuery(query2, path3);
   }
   if (isRunToolName(toolName)) {
     const command2 = typeof metadata.command === "string" ? metadata.command : "";
@@ -9448,28 +9871,16 @@ function normalToolGistRaw(event) {
       return commandFullGist(command2, normalRunGistMaxWidth());
     }
   }
-  const path = typeof metadata.path === "string" ? metadata.path : "";
-  if (path) return pathBasenameGist(path);
+  const memoryGist = memoryToolGist(toolName, metadata);
+  if (memoryGist) return memoryGist;
+  const path2 = typeof metadata.path === "string" ? metadata.path : "";
+  if (path2) return pathBasenameGist(path2);
   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));
 }
@@ -9481,8 +9892,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;
@@ -9493,6 +9902,9 @@ function formatNormalToolLine(event, pending, colorEnabled) {
   if (event.type === "tool-result" && toolName === "loadSkill") {
     return formatLoadSkillBlock(event, colorEnabled, { safe: true }) ?? "";
   }
+  if (event.type === "tool-result" && toolName === "show_interaction") {
+    return formatShowInteractionBlock(event, colorEnabled);
+  }
   const label = toolLabel(toolName);
   if (readActionGate(event.metadata?.actionGate)) {
     return formatToolTraceLine(`\u25B8 ${label}  ! ${t("toolNeedsAction")}`, colorEnabled, "error");
@@ -9545,39 +9957,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 +10213,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 +10275,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 +10291,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 +10338,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 +10351,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 +10362,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 +10396,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 +10428,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 +10452,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 +10467,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 +10494,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 +10505,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);
@@ -10119,6 +10601,12 @@ var describeClientVersionTooOldFailure = (message, rawError) => {
 };
 
 // packages/cli/client/agentRunStream.ts
+function isMalformedFunctionCallFailure(message) {
+  return message.includes("MALFORMED_FUNCTION_CALL");
+}
+function shouldAppendStreamRawErrorDetail(env) {
+  return env?.NOLO_DEBUG === "1" || env?.NOLO_CLI_DEBUG_DETAIL === "1";
+}
 async function readStreamingAgentRun(options, res, existingSpinner) {
   const reader = res.body?.getReader();
   if (!reader) {
@@ -10149,6 +10637,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 +10650,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 +10704,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,
@@ -10222,15 +10715,18 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
       };
     }
     const message = toErrorMessage(error);
+    const malformedToolCall = isMalformedFunctionCallFailure(message);
+    const rawDetail = shouldAppendStreamRawErrorDetail(options.env) ? t("agentRunStream.rawErrorDetail", message) : null;
     if (dialogId) {
-      options.output.write(
-        `
-[nolo] Agent stream transport interrupted after dialog ${dialogId} was created: ${message}
-`
-      );
-      options.output.write(
-        "[nolo] The agent run may still finish on the server; read the dialog before retrying.\n"
-      );
+      if (malformedToolCall) {
+        options.output.write(`
+${t("agentRunStream.malformedToolCallRejected", dialogId)}
+`);
+        if (rawDetail) options.output.write(rawDetail);
+        return { exitCode: 0, dialogId, streamInterrupted: true };
+      }
+      options.output.write(t("agentRunStream.interruptedAfterDialog", dialogId, message));
+      options.output.write(t("agentRunStream.mayStillFinishOnServer"));
       return { exitCode: 0, dialogId, streamInterrupted: true };
     }
     if (isClientVersionTooOldFailure(message, error)) {
@@ -10238,11 +10734,25 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
 ${describeClientVersionTooOldFailure(message, error)}`);
       return { exitCode: 1 };
     }
-    options.output.write(`
-[nolo] Agent stream failed: ${message}
+    if (malformedToolCall) {
+      options.output.write(`
+${t("agentRunStream.malformedToolCallRejectedNoDialog")}
 `);
+      if (rawDetail) options.output.write(rawDetail);
+      return { exitCode: 1 };
+    }
+    options.output.write(t("agentRunStream.failed", message));
     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))
@@ -10252,6 +10762,9 @@ ${describeClientVersionTooOldFailure(message, error)}`);
   return {
     exitCode: 0,
     ...dialogId ? { dialogId } : {},
+    // 结论载体与 local / 非流式 HTTP 路径同契约：流式分支已经把 assistant
+    // 正文累加在 content 里，不随行则 server 流式 run 的结算也拿不到结论。
+    ...content ? { finalText: content } : {},
     turnTokens: buildTurnTokenUsage(usage, options.agentKey),
     ...turnCredits !== void 0 ? { turnCredits } : {}
   };
@@ -10459,7 +10972,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-SQUDRZWE.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();
@@ -10557,6 +11070,13 @@ function buildDefaultLocalRuntimeAdapter(options) {
     fetchImpl: options.fetchImpl,
     cwd: options.localRuntimeCwd,
     output: options.output,
+    // TUI 显式注入的真实会话身份；缺省时 adapter 内仍回退 parentDialogId。
+    ...options.originSession ? { originSession: options.originSession } : {},
+    // 分享 OAuth agent 的 shell 会话授权（块 D）：仅 owner-required 场景生效。
+    ...options.shellGrant ? { shellGrant: options.shellGrant } : {},
+    // 运行位置展示（块 D）：TUI 消费 projectToolExecutionLocation 渲染工具实际
+    // 执行设备/工作区；非 owner-required 场景 adapter 不回调。
+    ...options.onToolExecutionLocation ? { onToolExecutionLocation: options.onToolExecutionLocation } : {},
     ...options.confirmDestructiveAction ? { confirmDestructiveAction: options.confirmDestructiveAction } : {},
     ...options.requestUserChoice ? { requestUserChoice: options.requestUserChoice } : {},
     ...options.pastedTextStore?.items.size ? { pastedTextStore: options.pastedTextStore } : {},
@@ -10594,7 +11114,7 @@ function wrapLoadAgentConfigWithModelOverride(adapter, targetAgentKey, override)
     }
   };
 }
-var oauthChannelSkipReportedOutputs = /* @__PURE__ */ new WeakSet();
+var oauthChannelSkipReportedAgentKeys = /* @__PURE__ */ new Set();
 function resolveOAuthChannelOwnerSkip(agentConfig, options) {
   if (!agentConfig) return null;
   const apiKeyRef = typeof agentConfig.apiKeyRef === "string" ? agentConfig.apiKeyRef : void 0;
@@ -10606,8 +11126,12 @@ function resolveOAuthChannelOwnerSkip(agentConfig, options) {
   if (!ownerUserId) return null;
   const localUserId = resolveLocalUserId(options.env);
   if (ownerUserId === localUserId) return null;
-  return `[nolo] auto runtime: skipping local runtime because ${options.agentKey} runs on its owner's OAuth subscription channel (owner ${ownerUserId}, this machine runs as ${localUserId}). Use --local explicitly to force this machine's own subscription.
-`;
+  return t(
+    "agentRun.oauthChannelOwnerSkip",
+    options.agentKey,
+    ownerUserId,
+    localUserId
+  ) + "\n";
 }
 async function shouldSkipAutoLocalForServerPlatformTools(options) {
   if (isBuiltinNoloAgentRef(options.agentKey)) return false;
@@ -10623,13 +11147,13 @@ async function shouldSkipAutoLocalForServerPlatformTools(options) {
   }
   const oauthChannelOwnerSkip = resolveOAuthChannelOwnerSkip(agentConfig, options);
   if (oauthChannelOwnerSkip) {
-    if (!options.output || typeof options.output !== "object" || !oauthChannelSkipReportedOutputs.has(options.output)) {
+    if (!options.output || typeof options.output !== "object" || !oauthChannelSkipReportedAgentKeys.has(options.agentKey)) {
       if (options.output && typeof options.output === "object") {
-        oauthChannelSkipReportedOutputs.add(options.output);
+        oauthChannelSkipReportedAgentKeys.add(options.agentKey);
       }
       options.output.write(oauthChannelOwnerSkip);
     }
-    return true;
+    return false;
   }
   if (options.localRuntimeCwd) {
     return false;
@@ -10668,14 +11192,15 @@ async function shouldSkipAutoLocalForServerPlatformTools(options) {
   );
   return true;
 }
-function buildUserInputContent(message, imageUrls = []) {
-  if (imageUrls.length === 0) return message;
+function buildUserInputContent(message, imageUrls = [], attachmentParts = []) {
+  if (imageUrls.length === 0 && attachmentParts.length === 0) return message;
   return [
     ...message.trim() ? [{ type: "text", text: message }] : [],
     ...imageUrls.map((url) => ({
       type: "image_url",
       image_url: { url }
-    }))
+    })),
+    ...attachmentParts
   ];
 }
 function buildSubjectRefs(options) {
@@ -10720,8 +11245,8 @@ function isMissingLocalAgentConfigError(error, agentRef) {
     error && typeof error === "object" && "code" in error && error.code === LOCAL_AGENT_CONFIG_MISSING_CODE && error.agentRef === agentRef
   );
 }
-var PROVIDER_HTTP_FAILED_RE = /(.+?) provider failed:\s*HTTP\s+(\d+)\b/i;
-var PLATFORM_TRANSPORT_RE = /\bplatform provider failed\b/i;
+var PROVIDER_HTTP_FAILED_RE = /(.+?)(?:\s+provider|\s+proxy) failed:\s*HTTP\s+(\d+)\b/i;
+var PLATFORM_TRANSPORT_RE = /\b(?:platform provider failed|owner-required proxy failed)\b/i;
 var EXTRA_RATE_LIMIT_TEXT_RE = /\brate[\s_-]?limit(?:ed|ing|s)?\b|\bresource[_\s-]?exhausted\b|\bmax_concurrent_reached\b/i;
 function looksLikeRateLimitedText(message) {
   return EXTRA_RATE_LIMIT_TEXT_RE.test(message) || QUOTA_ERROR_PATTERNS.some((pattern) => pattern.test(message));
@@ -10779,36 +11304,52 @@ 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.";
 function buildAuthFailure(ctx) {
   const platformNoToken = ctx.where === "server chat proxy" && isAuthNoTokenBody(ctx.message);
-  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`;
+  if (platformNoToken) {
+    const guidance = `
+  This turn did not run: you are not logged in to Nolo and no local model credential is available.
+    \xB7 Use the Nolo platform: /login (or run \`nolo login\` after exiting the TUI)
+    \xB7 Use your own subscription: nolo auth antigravity | claude | chatgpt | xai
+    \xB7 No login at all: nolo run "<task>" (runs on local Codex)`;
+    const detail = process.env.NOLO_DEBUG === "1" || process.env.NOLO_CLI_DEBUG_DETAIL === "1" ? `
+  Detail: ${ctx.message}` : `
+  Detail: platform returned AUTH_NO_TOKEN (no authentication token provided)`;
+    return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, no token was sent).${guidance}${detail} ${NO_FALLBACK} ${SERVER_FALLBACK_HINT}
+`;
+  }
+  const fix = 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.
 `;
 }
@@ -10818,7 +11359,7 @@ function extractRateLimitResetHint(message) {
   return match ? match[0].trim() : void 0;
 }
 function buildRateLimitFailure(ctx) {
-  const cooldownNote = ctx.cooldownUntil ? ` \u5DF2\u6807\u8BB0\u51B7\u5374\u81F3 ${ctx.cooldownUntil}\uFF0C\u5230\u671F\u524D\u6D3E\u53D1\u4F1A\u88AB\u51B7\u5374\u95E8\u63A7\u62E6\u622A\uFF08\u5230\u671F\u81EA\u52A8 probe \u6062\u590D\uFF09\u3002` : "";
+  const cooldownNote = ctx.cooldownUntil ? ` \u5DF2\u6682\u505C\u8BE5\u51ED\u8BC1\u7684\u6D3E\u53D1\uFF0C\u672C\u5730\u51B7\u5374\u6700\u665A ${ctx.cooldownUntil} \u5230\u671F\uFF08\u4E0D\u4EE3\u8868\u4E0A\u6E38\u989D\u5EA6\u5C4A\u65F6\u4E00\u5B9A\u6062\u590D\uFF09\uFF1B\u51B7\u5374\u671F\u95F4\u518D\u6B21\u6D3E\u53D1\u65F6\uFF0C\u7EA6\u6BCF ${Math.round(PROBE_INTERVAL_MS / 6e4)} \u5206\u949F\u653E\u884C\u4E00\u6B21\u8BD5\u63A2\u8BF7\u6C42\uFF0C\u6210\u529F\u5373\u6062\u590D\u3002\u82E5\u5DF2\u5145\u503C\u6216\u91CD\u7F6E\u989D\u5EA6\uFF0C\u53EF\u8FD0\u884C \`nolo auth cooldown\` \u67E5\u770B\u88AB\u6682\u505C\u7684\u51ED\u8BC1\u540D\uFF0C\u518D\u7528 \`nolo auth cooldown --clear <\u51ED\u8BC1\u540D>\` \u7ACB\u5373\u6062\u590D\u3002` : "";
   const headline = ctx.statusInferred ? `${ctx.where} hit an upstream rate-limit/quota error` : `${ctx.where} returned HTTP ${ctx.status}, rate limited`;
   const cause = ctx.quotaExhausted ? "The upstream quota/balance for this agent is exhausted \u2014 NOT a local credential/config issue" : "This agent is being throttled by the upstream provider \u2014 NOT a local credential/config issue";
   const reset = extractRateLimitResetHint(ctx.message);
@@ -10835,6 +11376,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 +11395,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 +11444,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}.
 `;
   }
@@ -10906,6 +11463,10 @@ function describeLocalRunFailure(message, rawError) {
   }
   const cls = classifyLocalRunError(message);
   if (cls.kind === "generic") {
+    if (/owner-required route not acknowledged/i.test(message)) {
+      return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} The server returned a successful response but did not acknowledge the owner route. Check server version or proxy configuration, ${SERVER_FALLBACK_HINT}.
+`;
+    }
     if (isTransientFetchError(message)) {
       return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} The upstream connection dropped mid-request (transient network/gateway issue \u2014 not a local credential or config problem). Send again (or say "continue") to retry in the same conversation.
 `;
@@ -10920,7 +11481,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);
 }
@@ -11133,15 +11695,24 @@ ${options.agentName} > (no text response)
   const turnCredits = platformCreditsFromUsage(
     data?.usage
   );
-  return {
+  const serverResult = {
     exitCode: 0,
     ...typeof data?.dialogId === "string" && data.dialogId ? { dialogId: data.dialogId } : {},
+    // 结论载体与 local 路径同契约（server 模式 / 本地配置缺失时的兜底通道）：
+    // 结算点只认 result.finalText，HTTP 派发不给就等于这批 run 没有结论载体，
+    // status 里既无 lastAssistantText 也无 resultFile。content 已在上面算好。
+    ...content ? { finalText: content } : {},
     turnTokens: buildTurnTokenUsage(
       data?.usage,
       typeof data?.model === "string" ? data.model : options.agentKey
     ),
     ...turnCredits !== void 0 ? { turnCredits } : {}
   };
+  recordRunResultHeaderMeta(serverResult, {
+    model: typeof data?.model === "string" ? data.model : void 0,
+    dialogServer: serverOriginForDialog(options.serverUrl)
+  });
+  return serverResult;
 }
 async function runInjectedLocalAgentTurn(options) {
   return runLocalAgentTurnForCli(options, { reportFailure: true });
@@ -11200,21 +11771,37 @@ async function runLocalAgentTurnForCli(options, settings) {
   });
   turnOutput.spinner.start();
   try {
+    const localAttachmentPaths = (options.localAttachmentPaths ?? []).filter(
+      (p) => typeof p === "string" && p.trim().length > 0
+    );
+    const { cardText: localAttachmentCard, parts: localAttachmentParts } = buildLocalAttachments({
+      paths: localAttachmentPaths,
+      machineId: localAttachmentPaths.length > 0 ? await resolveCurrentMachineId(options) : void 0,
+      ...options.localRuntimeCwd ? { workspaceRoot: options.localRuntimeCwd } : {}
+    });
+    const messageForLocal = appendAttachmentCard(options.message, localAttachmentCard);
+    const durableAttachmentParts = ENABLE_REMOTE_ATTACHMENT_PART_WRITES ? localAttachmentParts : [];
+    const hasDurableAttachments = durableAttachmentParts.length > 0;
     const runLocalAgentTurn = await loadRunLocalAgentTurn();
     const result = await runLocalAgentTurn({
       adapter,
       agentRef: options.agentKey,
       userLanguage: options.userLanguage ?? options.env.NOLO_LANG ?? null,
-      input: buildUserInputContent(options.message, options.imageUrls),
-      ...expandedMessage !== options.message ? {
-        persistedInput: buildUserInputContent(
+      input: buildUserInputContent(messageForLocal, options.imageUrls),
+      ...expandedMessage !== options.message || localAttachmentCard !== "" ? {
+        persistedInput: hasDurableAttachments ? buildUserInputContent(
           expandedMessage,
+          options.imageUrls,
+          durableAttachmentParts
+        ) : buildUserInputContent(
+          appendAttachmentCard(expandedMessage, localAttachmentCard),
           options.imageUrls
         ),
-        persistedInputReference: buildUserInputContent(
+        persistedInputReference: hasDurableAttachments ? buildUserInputContent(
           options.message,
-          options.imageUrls
-        )
+          options.imageUrls,
+          durableAttachmentParts
+        ) : buildUserInputContent(messageForLocal, options.imageUrls)
       } : {},
       ...options.pastedTextStore ? {
         contextReferenceResolver: (reference) => canResolveCollapsedPasteReference(options.pastedTextStore, reference)
@@ -11237,6 +11824,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"
@@ -11266,9 +11865,10 @@ async function runLocalAgentTurnForCli(options, settings) {
     });
     turnOutput.finish(result.content);
     const turnCredits = sumPlatformCredits(result.usageRecords);
-    return {
+    const turnResult = {
       exitCode: 0,
       dialogId: result.dialogId,
+      ...typeof result.content === "string" && result.content.trim() ? { finalText: result.content } : {},
       title: result.title,
       ...result.titlePatchPromise ? { titlePatchPromise: result.titlePatchPromise } : {},
       ...pickEmptyAssistantFlags(result),
@@ -11280,8 +11880,22 @@ async function runLocalAgentTurnForCli(options, settings) {
       ...turnCredits !== void 0 ? { turnCredits } : {},
       ...result.usageRecords?.length ? { usageRecords: result.usageRecords } : {}
     };
+    const serverMeta = resolveResultServerMeta({
+      env: options.env ?? {},
+      userId: resolveLocalUserId(options.env ?? {}),
+      hasSubjectRefs: (buildSubjectRefs(options)?.length ?? 0) > 0
+    });
+    recordRunResultHeaderMeta(turnResult, {
+      model: result.model,
+      dialogServer: serverMeta.server,
+      serverSync: serverMeta.serverSync
+    });
+    return turnResult;
   } 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,13 +11919,15 @@ 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
+          `[nolo] \u5DF2\u6682\u505C\u8BE5\u51ED\u8BC1\u7684\u6D3E\u53D1\uFF0C\u672C\u5730\u51B7\u5374\u6700\u665A ${cooldownUntil} \u5230\u671F\uFF08\u4E0D\u4EE3\u8868\u4E0A\u6E38\u989D\u5EA6\u5C4A\u65F6\u4E00\u5B9A\u6062\u590D\uFF09\uFF1B\u51B7\u5374\u671F\u95F4\u518D\u6B21\u6D3E\u53D1\u65F6\uFF0C\u7EA6\u6BCF ${Math.round(PROBE_INTERVAL_MS / 6e4)} \u5206\u949F\u653E\u884C\u4E00\u6B21\u8BD5\u63A2\u8BF7\u6C42\uFF0C\u6210\u529F\u5373\u6062\u590D\u3002\u82E5\u5DF2\u5145\u503C\u6216\u91CD\u7F6E\u989D\u5EA6\uFF0C\u53EF\u8FD0\u884C \`nolo auth cooldown\` \u67E5\u770B\u88AB\u6682\u505C\u7684\u51ED\u8BC1\u540D\uFF0C\u518D\u7528 \`nolo auth cooldown --clear <\u51ED\u8BC1\u540D>\` \u7ACB\u5373\u6062\u590D\u3002
 `
         );
       }
@@ -11371,7 +11987,7 @@ Dispatch aborted before reaching the server. Pick another agent via listAgents,
   return { exitCode: 1 };
 }
 function foldLocalResultForTui(localResult) {
-  return {
+  const folded = {
     exitCode: localResult.exitCode,
     ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
     title: localResult.title,
@@ -11388,8 +12004,17 @@ function foldLocalResultForTui(localResult) {
     // 漏过 turnCredits（fix/tui-session-credits），usageRecords 是同坑位新字段。
     ...localResult.usageRecords?.length ? { usageRecords: localResult.usageRecords } : {},
     ...localResult.streamInterrupted ? { streamInterrupted: localResult.streamInterrupted } : {},
-    ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {}
+    ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {},
+    // 结论正文必须随行：auto→local 是本函数的唯一出口（runAgentTurn 的两处
+    // 成功分支都 return foldLocalResultForTui(...)），漏掉它 = 默认派发路径
+    // 上 finalText 永远到不了结算点 → agentRunCommand 的 settleRunTerminal-
+    // Authoritatively 拿不到 lastAssistantText → `.result.md` 不写、status 无
+    // resultFile，编排者只能去啃带 ANSI 的 .log（同坑位历史：turnCredits）。
+    ...localResult.finalText ? { finalText: localResult.finalText } : {}
   };
+  const headerMeta = getRunResultHeaderMeta(localResult);
+  recordRunResultHeaderMeta(folded, headerMeta);
+  return folded;
 }
 async function runAgentTurn(options) {
   const authToken = resolveAuthToken2(options.env);
@@ -11459,23 +12084,204 @@ async function runAgentTurn(options) {
   return httpResult;
 }
 
+// packages/cli/client/terminalProgramStatus.ts
+var TERMINAL_PROGRAM_STATUS_APP = "nolo";
+var KNOWN_STATES = /* @__PURE__ */ new Set([
+  "idle",
+  "working",
+  "blocked",
+  "done",
+  "error"
+]);
+var KNOWN_KINDS = /* @__PURE__ */ new Set([
+  "permission",
+  "question",
+  "auth"
+]);
+function encodeTerminalProgramStatus(report) {
+  const state2 = report?.state;
+  if (typeof state2 !== "string" || !KNOWN_STATES.has(state2)) return null;
+  const pairs = [`state=${state2}`, `app=${TERMINAL_PROGRAM_STATUS_APP}`];
+  if (state2 === "blocked" && typeof report.kind === "string" && KNOWN_KINDS.has(report.kind)) {
+    pairs.push(`kind=${report.kind}`);
+  }
+  return `\x1B]7501;${pairs.join(":")}\x1B\\`;
+}
+function emitTerminalProgramStatus(output, report) {
+  if (!output || typeof output.write !== "function") return false;
+  if (output.isTTY !== true) return false;
+  const sequence2 = encodeTerminalProgramStatus(report);
+  if (sequence2 === null) return false;
+  try {
+    output.write(sequence2);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// packages/cli/client/terminalRunStatus.ts
+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 ?? "");
+function resolveTerminalProgramStatusState(input) {
+  if (input.interrupted) return "idle";
+  if (input.stalledOrTruncated || input.exitCode !== 0) return "error";
+  return "done";
+}
+
+// packages/cli/client/oneShotTerminalStatus.ts
+function resolveOneShotTerminalState(result) {
+  return resolveTerminalProgramStatusState({
+    exitCode: result.exitCode,
+    interrupted: result.streamInterrupted,
+    stalledOrTruncated: result.stalledOrTruncated
+  });
+}
+function createOneShotTerminalStatus(output) {
+  let last;
+  let terminal = false;
+  const report = (state2) => {
+    if (!output || terminal || last === state2) return;
+    last = state2;
+    if (state2 === "done" || state2 === "error") terminal = true;
+    emitTerminalProgramStatus(output, { state: state2 });
+  };
+  return {
+    working: () => report("working"),
+    settle: (result) => report(resolveOneShotTerminalState(result)),
+    fail: () => report("error")
+  };
+}
+
 // packages/cli/agentRunCommand.ts
 import * as nodeFs from "node:fs";
 
 // packages/cli/client/autoModelRouter.ts
 var CLI_AUTO_ROUTE_AGENT_KEY = BUILTIN_NOLO_AGENT_KEY;
 
-// packages/agent-runtime/agentsMd.ts
+// packages/agent-runtime/hostEnvironment.ts
 import { existsSync, readFileSync } from "node:fs";
+import os from "node:os";
+function parseLinuxOsRelease(content) {
+  let prettyName;
+  let name;
+  let version;
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const eqIdx = trimmed.indexOf("=");
+    if (eqIdx === -1) continue;
+    const key = trimmed.slice(0, eqIdx).trim();
+    let val = trimmed.slice(eqIdx + 1).trim();
+    if (val.startsWith('"') && val.endsWith('"') || val.startsWith("'") && val.endsWith("'")) {
+      val = val.slice(1, -1);
+    }
+    if (key === "PRETTY_NAME") {
+      prettyName = val;
+    } else if (key === "NAME") {
+      name = val;
+    } else if (key === "VERSION") {
+      version = val;
+    }
+  }
+  if (prettyName) return prettyName;
+  if (name && version) return `${name} ${version}`;
+  return name;
+}
+function probeHostEnvironment(options) {
+  const platform = options?.platform ?? process.platform;
+  const arch = options?.arch ?? os.arch();
+  const release = options?.release ?? os.release();
+  const env = options?.env ?? process.env;
+  let osName = `${platform} ${release}`;
+  if (platform === "linux") {
+    let osReleaseText = options?.osReleaseContent;
+    if (osReleaseText === void 0) {
+      try {
+        if (existsSync("/etc/os-release")) {
+          osReleaseText = readFileSync("/etc/os-release", "utf8");
+        } else if (existsSync("/usr/lib/os-release")) {
+          osReleaseText = readFileSync("/usr/lib/os-release", "utf8");
+        }
+      } catch {
+      }
+    }
+    if (osReleaseText) {
+      const parsed = parseLinuxOsRelease(osReleaseText);
+      if (parsed) {
+        osName = parsed;
+      } else {
+        osName = `Linux ${release}`;
+      }
+    } else {
+      osName = `Linux ${release}`;
+    }
+  } else if (platform === "darwin") {
+    osName = `macOS (${release})`;
+  } else if (platform === "win32") {
+    osName = `Windows (${release})`;
+  }
+  const desktop = env.XDG_CURRENT_DESKTOP || env.XDG_SESSION_DESKTOP || env.DESKTOP_SESSION || void 0;
+  const sessionType = env.XDG_SESSION_TYPE || void 0;
+  const shell = env.SHELL || (platform === "win32" ? env.COMSPEC || "PowerShell" : void 0);
+  return {
+    platform,
+    osName,
+    arch,
+    desktop,
+    sessionType,
+    shell
+  };
+}
+function formatHostEnvironmentContent(details) {
+  const lines = ["--- \u5BBF\u4E3B\u73AF\u5883\uFF08Host Environment\uFF09---"];
+  lines.push(`\u64CD\u4F5C\u7CFB\u7EDF: ${details.osName} (${details.arch})`);
+  if (details.desktop || details.sessionType) {
+    const desktopParts = [];
+    if (details.desktop) desktopParts.push(details.desktop);
+    if (details.sessionType) desktopParts.push(details.sessionType);
+    lines.push(`\u684C\u9762\u73AF\u5883: ${desktopParts.join(" / ")}`);
+  }
+  if (details.shell) {
+    lines.push(`\u9ED8\u8BA4 Shell: ${details.shell}`);
+  }
+  return lines.join("\n");
+}
+var cachedLayer = null;
+function buildHostEnvironmentLayer(options) {
+  if (!options && cachedLayer) {
+    return cachedLayer;
+  }
+  const details = probeHostEnvironment(options);
+  const content = formatHostEnvironmentContent(details);
+  const layer = {
+    id: "host-environment",
+    owner: "runtime",
+    cacheScope: "session",
+    content
+  };
+  if (!options) {
+    cachedLayer = layer;
+  }
+  return layer;
+}
+
+// packages/agent-runtime/agentsMd.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2 } 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;
+    if (!existsSync2(filePath)) continue;
     try {
-      let content = readFileSync(filePath, "utf8").trim();
+      let content = readFileSync2(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 -->";
@@ -11545,14 +12351,14 @@ function runDoDCommands(commands, cwd, deps = {}) {
 }
 
 // packages/cli/agentRunPrompts.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, readdirSync, statSync } from "node:fs";
+import { existsSync as existsSync3, readFileSync as readFileSync3, readdirSync, statSync as statSync2 } 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 (existsSync2(directPath)) return directPath;
+    if (existsSync3(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
   return resolve(cwd, "docs", "workflows", `${fileName}.md`);
@@ -11565,21 +12371,21 @@ function skillRefToCandidatePath(cwd, ref) {
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
     const directPath = resolve(cwd, normalized);
-    if (existsSync2(directPath)) return directPath;
+    if (existsSync3(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 (existsSync2(skillMdPath)) return skillMdPath;
+    if (existsSync3(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 || !existsSync2(path)) {
+  const path2 = workflowRefToCandidatePath(cwd, ref);
+  if (!path2 || !existsSync3(path2)) {
     throw new Error(`Workflow reference not found: ${ref}`);
   }
-  const markdown = readFileSync2(path, "utf8");
+  const markdown = readFileSync3(path2, "utf8");
   const parsed = parseSkillDocProtocol(markdown);
   return {
     ref,
@@ -11596,8 +12402,8 @@ function inlineRelativeRefs(body, skillDir) {
     const absPath = resolve(skillDir, cleaned);
     const relative = relativePath(normalizedSkillDir, absPath);
     if (relative.startsWith("..") || isAbsolute(relative)) return match;
-    if (!existsSync2(absPath) || !absPath.endsWith(".md")) return match;
-    const refContent = readFileSync2(absPath, "utf8");
+    if (!existsSync3(absPath) || !absPath.endsWith(".md")) return match;
+    const refContent = readFileSync3(absPath, "utf8");
     return `
 
 ### ${label}
@@ -11609,7 +12415,7 @@ ${refContent}
 }
 function listSkillScripts(skillDir) {
   const scriptsDir = join2(skillDir, "scripts");
-  if (!existsSync2(scriptsDir) || !statSync(scriptsDir).isDirectory()) return null;
+  if (!existsSync3(scriptsDir) || !statSync2(scriptsDir).isDirectory()) return null;
   const entries = readdirSync(scriptsDir).filter((e) => !e.startsWith("."));
   if (entries.length === 0) return null;
   return [
@@ -11635,13 +12441,13 @@ async function resolveSkillReference(ref, options = {}) {
     markdown = String(contentText);
   } else {
     const cwd = options.cwd ?? process.cwd();
-    const path = skillRefToCandidatePath(cwd, ref);
-    if (!path || !existsSync2(path)) {
+    const path2 = skillRefToCandidatePath(cwd, ref);
+    if (!path2 || !existsSync3(path2)) {
       throw new Error(`Skill reference not found: ${ref}`);
     }
-    markdown = readFileSync2(path, "utf8");
-    filePath = path;
-    skillDir = dirname(path);
+    markdown = readFileSync3(path2, "utf8");
+    filePath = path2;
+    skillDir = dirname(path2);
   }
   const parsed = parseSkillDocProtocol(markdown);
   const name = parsed.meta?.skillConfig?.name;
@@ -11744,12 +12550,12 @@ function prependSubjectDialogMarker(message, subjectDialogKey) {
 function normalizeCliImageInput(input) {
   if (/^(https?:|data:|file:)/i.test(input)) return input;
   const absolutePath = resolve(input);
-  if (!existsSync2(absolutePath)) return input;
-  const base64 = readFileSync2(absolutePath).toString("base64");
+  if (!existsSync3(absolutePath)) return input;
+  const base64 = readFileSync3(absolutePath).toString("base64");
   return `data:${imageMimeTypeForPath(absolutePath)};base64,${base64}`;
 }
-function imageMimeTypeForPath(path) {
-  switch (extname(path).toLowerCase()) {
+function imageMimeTypeForPath(path2) {
+  switch (extname(path2).toLowerCase()) {
     case ".jpg":
     case ".jpeg":
       return "image/jpeg";
@@ -12171,8 +12977,8 @@ var scoreMemoryItem = (item, query, nowMs = Date.now(), context) => {
   const confidence = item.confidence ?? 0;
   const typeFit = typeFitScore(item);
   const understanding = understandingScore(item);
-  const path = pathScore(item, context);
-  return 0.25 * queryMatch + 0.2 * identifierMatch + 0.2 * path + 0.09 * retrieval + // weak retrieval signal, NOT successful-use reinforcement
+  const path2 = pathScore(item, context);
+  return 0.25 * queryMatch + 0.2 * identifierMatch + 0.2 * path2 + 0.09 * retrieval + // weak retrieval signal, NOT successful-use reinforcement
   0.16 * createdRecency + 0.06 * importance + 0.03 * confidence + 0.02 * typeFit + 0.01 * understanding;
 };
 var rankMemoryCandidates = (items, query, context) => {
@@ -12188,70 +12994,52 @@ 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);
+// packages/ai/memory/vnext/detachedThrottle.ts
+var DEFAULT_DETACHED_MEMORY_COOLDOWN_MS = 10 * 60 * 1e3;
+var MAX_COOLDOWN_KEYS = 512;
+var readMsEnv = (raw, fallback, allowZero) => {
+  if (raw === void 0 || raw.trim() === "") return fallback;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed < 0) return fallback;
+  if (parsed === 0 && !allowZero) return fallback;
+  return parsed;
 };
-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 });
+var createDetachedThrottle = (input) => {
+  let inFlight2 = false;
+  const lastStartedAt = /* @__PURE__ */ new Map();
+  const resolveCooldownMs = (env = typeof process !== "undefined" ? process.env : {}) => readMsEnv(env[input.cooldownEnvKey], input.defaultCooldownMs, true);
+  const rememberStart = (key, clockMs) => {
+    lastStartedAt.delete(key);
+    lastStartedAt.set(key, clockMs);
+    while (lastStartedAt.size > MAX_COOLDOWN_KEYS) {
+      lastStartedAt.delete(lastStartedAt.keys().next().value);
+    }
+  };
+  return {
+    name: input.name,
+    defaultCooldownMs: input.defaultCooldownMs,
+    cooldownEnvKey: input.cooldownEnvKey,
+    resolveCooldownMs,
+    tryAcquire(key, clockMs, cooldownMs) {
+      if (inFlight2) return "busy";
+      const interval = cooldownMs ?? resolveCooldownMs();
+      const lastStarted = lastStartedAt.get(key);
+      if (interval > 0 && lastStarted !== void 0 && clockMs - lastStarted < interval) {
+        return "cooldown";
+      }
+      inFlight2 = true;
+      rememberStart(key, clockMs);
+      return "run";
+    },
+    release() {
+      inFlight2 = false;
+    },
+    isInFlight: () => inFlight2,
+    reset() {
+      inFlight2 = false;
+      lastStartedAt.clear();
+    }
+  };
 };
 
 // packages/ai/memory/vnext/recall.ts
@@ -12283,14 +13071,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 +13096,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,
@@ -12422,6 +13202,20 @@ var buildLegacyMemoryEvidence = (item) => {
 // packages/ai/memory/vnext/shadowRead.ts
 var SHADOW_TIMEOUT_MS = 2e4;
 var ERROR_MESSAGE_MAX = 120;
+var MEMORY_VNEXT_SHADOW_READ_COOLDOWN_ENV = "NOLO_MEMORY_VNEXT_SHADOW_READ_COOLDOWN_MS";
+var DEFAULT_SHADOW_READ_COOLDOWN_MS = DEFAULT_DETACHED_MEMORY_COOLDOWN_MS;
+var shadowReadThrottle = createDetachedThrottle({
+  name: "shadow_read",
+  defaultCooldownMs: DEFAULT_SHADOW_READ_COOLDOWN_MS,
+  cooldownEnvKey: MEMORY_VNEXT_SHADOW_READ_COOLDOWN_ENV
+});
+var resolveShadowReadCooldownMs = (env) => shadowReadThrottle.resolveCooldownMs(env);
+var shadowReadThrottleKey = (owners) => owners.map(
+  (owner) => resolveLegacyMemoryPrincipal({
+    ownerType: owner.ownerType,
+    ownerId: owner.ownerId
+  }).principalId
+).sort().join("
");
 var normalizeTextKey = (text) => text.trim().replace(/\s+/g, " ").toLowerCase();
 var legacyItemKeys = (item) => {
   const keys = [normalizeTextKey(item.content ?? "")];
@@ -12458,14 +13252,35 @@ var withTimeout = async (promise, timeoutMs, label) => {
 };
 var runMemoryVNextShadowRead = async (input) => {
   const now = input.ctx.now ?? (() => performance.now());
-  const defaultEmit = (observation2) => {
+  const defaultEmit = (observation) => {
     const payload = {
       event: "memory_vnext_shadow_read",
-      ...observation2
+      ...observation
     };
     console.info("[memory] vnext shadow read", payload);
   };
   const emit = input.emit ?? defaultEmit;
+  const throttle = shadowReadThrottle.tryAcquire(
+    shadowReadThrottleKey(input.ctx.owners),
+    now(),
+    input.ctx.cooldownMs ?? resolveShadowReadCooldownMs()
+  );
+  if (throttle !== "run") {
+    const skippedObservation = {
+      legacyHitCount: input.legacyItems.length,
+      vnextHitCount: 0,
+      overlapCount: null,
+      legacyOnlyCount: null,
+      vnextOnlyCount: null,
+      legacyLatencyMs: input.legacyLatencyMs,
+      vnextLatencyMs: 0,
+      legacyContextChars: input.legacyContextChars,
+      vnextContextChars: 0,
+      skipped: throttle === "busy" ? "skipped_busy" : "skipped_cooldown"
+    };
+    emit(skippedObservation);
+    return skippedObservation;
+  }
   const legacyKeys = new Set(
     input.legacyItems.flatMap((item) => legacyItemKeys(item))
   );
@@ -12502,31 +13317,35 @@ var runMemoryVNextShadowRead = async (input) => {
   } catch (error) {
     vnextError = shortError(error);
   }
-  const vnextLatencyMs = Math.round((now() - vnextStartedAt) * 10) / 10;
-  let overlapCount = null;
-  let legacyOnlyCount = null;
-  let vnextOnlyCount = null;
-  if (!vnextError) {
-    let overlap = 0;
-    for (const key of vnextKeys) if (legacyKeys.has(key)) overlap += 1;
-    overlapCount = overlap;
-    legacyOnlyCount = Math.max(0, legacyKeys.size - overlap);
-    vnextOnlyCount = Math.max(0, vnextKeys.size - overlap);
-  }
-  const observation = {
-    legacyHitCount: input.legacyItems.length,
-    vnextHitCount,
-    overlapCount,
-    legacyOnlyCount,
-    vnextOnlyCount,
-    legacyLatencyMs: input.legacyLatencyMs,
-    vnextLatencyMs,
-    legacyContextChars: input.legacyContextChars,
-    vnextContextChars: vnextChars,
-    ...vnextError ? { vnextError } : {}
-  };
-  emit(observation);
-  return observation;
+  try {
+    const vnextLatencyMs = Math.round((now() - vnextStartedAt) * 10) / 10;
+    let overlapCount = null;
+    let legacyOnlyCount = null;
+    let vnextOnlyCount = null;
+    if (!vnextError) {
+      let overlap = 0;
+      for (const key of vnextKeys) if (legacyKeys.has(key)) overlap += 1;
+      overlapCount = overlap;
+      legacyOnlyCount = Math.max(0, legacyKeys.size - overlap);
+      vnextOnlyCount = Math.max(0, vnextKeys.size - overlap);
+    }
+    const observation = {
+      legacyHitCount: input.legacyItems.length,
+      vnextHitCount,
+      overlapCount,
+      legacyOnlyCount,
+      vnextOnlyCount,
+      legacyLatencyMs: input.legacyLatencyMs,
+      vnextLatencyMs,
+      legacyContextChars: input.legacyContextChars,
+      vnextContextChars: vnextChars,
+      ...vnextError ? { vnextError } : {}
+    };
+    emit(observation);
+    return observation;
+  } finally {
+    shadowReadThrottle.release();
+  }
 };
 var isMemoryVNextShadowReadEnabled = (env = typeof process !== "undefined" ? process.env : {}) => env.NOLO_MEMORY_VNEXT_SHADOW_READ === "1" || env.NOLO_MEMORY_VNEXT_SHADOW_READ === "true";
 
@@ -13186,15 +14005,100 @@ var shortError2 = (error) => {
   const message = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
   return message.length > ERROR_MESSAGE_MAX2 ? `${message.slice(0, ERROR_MESSAGE_MAX2)}\u2026` : message;
 };
+var DEFAULT_LAZY_PROMOTION_COOLDOWN_MS = DEFAULT_DETACHED_MEMORY_COOLDOWN_MS;
+var DEFAULT_LAZY_PROMOTION_TIMEOUT_MS = 2e4;
+var MEMORY_VNEXT_LAZY_PROMOTION_COOLDOWN_ENV = "NOLO_MEMORY_VNEXT_LAZY_PROMOTION_COOLDOWN_MS";
+var MEMORY_VNEXT_LAZY_PROMOTION_TIMEOUT_ENV = "NOLO_MEMORY_VNEXT_LAZY_PROMOTION_TIMEOUT_MS";
+var promotionThrottle = createDetachedThrottle({
+  name: "lazy_promotion",
+  defaultCooldownMs: DEFAULT_LAZY_PROMOTION_COOLDOWN_MS,
+  cooldownEnvKey: MEMORY_VNEXT_LAZY_PROMOTION_COOLDOWN_ENV
+});
+var resolveLazyPromotionTimeoutMs = (env = typeof process !== "undefined" ? process.env : {}) => readMsEnv(
+  env[MEMORY_VNEXT_LAZY_PROMOTION_TIMEOUT_ENV],
+  DEFAULT_LAZY_PROMOTION_TIMEOUT_MS,
+  false
+);
+var withTimeout2 = async (promise, timeoutMs, label) => {
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new Error(label)), timeoutMs);
+  });
+  try {
+    return await Promise.race([promise, timeout]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+};
 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 +14114,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
     };
@@ -13224,6 +14133,17 @@ var runMemoryVNextLazyPromotion = async (input) => {
   if (inFlight.has(flightKey)) {
     return finish({ status: "in_flight" });
   }
+  const throttle = promotionThrottle.tryAcquire(
+    deterministicEvidence.ownerId,
+    clock(),
+    input.cooldownMs
+  );
+  if (throttle === "busy") {
+    return finish({ status: "skipped_busy" });
+  }
+  if (throttle === "cooldown") {
+    return finish({ status: "skipped_cooldown" });
+  }
   inFlight.add(flightKey);
   try {
     const evidenceResult = await applyLegacyMemoryEvidence(input.db, input.item);
@@ -13232,22 +14152,33 @@ 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" });
     }
-    const interpreted = await runLegacyMemoryMigrationShadow({
-      item: input.item,
-      provider: input.provider,
-      existing,
-      ...input.timeoutMs === void 0 ? {} : { timeoutMs: input.timeoutMs },
-      ...input.now === void 0 ? {} : { now: input.now },
-      ...input.nextId ? { nextId: input.nextId } : {}
-    });
+    const timeoutMs = input.timeoutMs ?? resolveLazyPromotionTimeoutMs();
+    const interpreted = await withTimeout2(
+      runLegacyMemoryMigrationShadow({
+        item: input.item,
+        provider: input.provider,
+        existing,
+        timeoutMs,
+        ...input.now === void 0 ? {} : { now: input.now },
+        ...input.nextId ? { nextId: input.nextId } : {}
+      }),
+      timeoutMs,
+      `memory vnext lazy promotion interpreter timed out after ${timeoutMs}ms`
+    );
     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);
@@ -13256,10 +14187,184 @@ var runMemoryVNextLazyPromotion = async (input) => {
     return finish({ status: "error", error: shortError2(error) });
   } finally {
     inFlight.delete(flightKey);
+    promotionThrottle.release();
   }
 };
 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 +14487,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 +14528,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 +14593,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 +14628,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 +14690,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 +14701,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 +14742,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;
   }
 };
@@ -13535,13 +14771,6 @@ function resolveRunOutcome(input) {
     }
   }
 }
-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 {};
@@ -13566,7 +14795,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;
@@ -13608,7 +14840,19 @@ async function runAgentRunCommand(args, deps) {
   const watchdogFailure = armStallWatchdog || armTimeoutWatchdog ? new Promise((_, reject) => {
     rejectOnWatchdogFailure = reject;
   }) : void 0;
-  const raceWithWatchdog = (work) => watchdogFailure ? Promise.race([work, watchdogFailure]) : work;
+  const terminalStatus = createOneShotTerminalStatus(
+    parsed.eventsMode || parsed.background || hasRegistry ? null : deps.output ? deps.output : {
+      write: (chunk) => process.stdout.write(chunk),
+      isTTY: process.stdout.isTTY === true
+    }
+  );
+  const raceWithWatchdog = (work) => {
+    const raced = watchdogFailure ? Promise.race([work, watchdogFailure]) : work;
+    return raced.catch((error) => {
+      terminalStatus.fail();
+      throw error;
+    });
+  };
   const exitFromWatchdog = (code) => {
     try {
       processExit(code);
@@ -13653,6 +14897,7 @@ async function runAgentRunCommand(args, deps) {
         const note = `stalled: no progress for ${stallTimeoutMs}ms`;
         output.write(`[nolo] local run ${note}
 `);
+        terminalStatus.fail();
         const outcome = resolveRunOutcome({ kind: "stall" });
         const currentActivity = activityTracker?.getActivity();
         await finalizeWatchdogOutcome(outcome, note, {
@@ -13671,6 +14916,7 @@ async function runAgentRunCommand(args, deps) {
       const note = `timed out after ${parsed.timeoutMs}ms`;
       output.write(`[nolo] local run ${note}
 `);
+      terminalStatus.fail();
       const outcome = resolveRunOutcome({ kind: "timeout" });
       await finalizeWatchdogOutcome(outcome, note);
       rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
@@ -13716,13 +14962,12 @@ async function runAgentRunCommand(args, deps) {
     }
     if (hasExplicitAgent && !modelOverride) {
       output.write(
-        "[nolo] auto-route: \u8986\u76D6\u6E90 agent \u8BFB\u53D6\u5931\u8D25\uFF0C\u6309\u539F\u6837\u76F4\u8DD1\u6240\u9009 agent\u3002\n"
+        t("agentRun.autoRouteOverrideFailed")
       );
     } else {
       effectiveAgentKey = CLI_AUTO_ROUTE_AGENT_KEY;
       if (modelOverride) {
-        output.write(`[nolo] auto-route: model \u5C42\u8986\u76D6\u4E3A ${agentKey}
-`);
+        output.write(t("agentRun.autoRouteModelOverride", agentKey));
       }
     }
   }
@@ -13834,6 +15079,7 @@ async function runAgentRunCommand(args, deps) {
     if (agentsMdLayer) scopedLayers.push(agentsMdLayer);
     skillContentBlocks.push(...buildSkillContextBlocks(skillReferences));
     scopedLayers.push(buildSkillDiscoveryContextLayer(cliCwd));
+    scopedLayers.push(buildHostEnvironmentLayer());
     if (!deps.memoryRecallDisabled) {
       try {
         memoryPromptBlock = await resolveCliMemory({
@@ -13862,6 +15108,14 @@ async function runAgentRunCommand(args, deps) {
     );
     extraContextBlocks.push(...contextBlockScopes.map((block) => block.content));
   }
+  const runRecordParentDialogId = !parsed.parentDialogId && typeof childRunId === "string" && childRunId.length > 0 ? asOptionalTrimmedString(
+    (deps.readRunRecord ?? readRunRecord)(childRunId, {
+      env,
+      homedir: deps.homedir,
+      fs: deps.fs
+    })?.parentDialogId
+  ) : void 0;
+  const effectiveParentDialogId = parsed.parentDialogId ?? runRecordParentDialogId;
   const formatTurnMessage = (msg) => prependWorkflowReferencePrompt(
     prependSubjectDialogMarker(
       prependFeatureWorktreeInstruction(
@@ -13888,7 +15142,7 @@ async function runAgentRunCommand(args, deps) {
     ...parsed.spaceId ? { spaceId: parsed.spaceId } : {},
     ...parsed.category ? { category: parsed.category } : {},
     ...parsed.inheritedFromDialogKey ? { inheritedFromDialogKey: parsed.inheritedFromDialogKey } : {},
-    ...parsed.parentDialogId ? { parentDialogId: parsed.parentDialogId } : {},
+    ...effectiveParentDialogId ? { parentDialogId: effectiveParentDialogId } : {},
     ...parsed.parentWakeOnTerminal ? { parentWakeOnTerminal: true } : {},
     ...parsed.subjectDialogKey ? { subjectDialogKey: parsed.subjectDialogKey } : {},
     ...parsed.subjectRefs?.length ? { subjectRefs: parsed.subjectRefs } : {},
@@ -13904,6 +15158,7 @@ async function runAgentRunCommand(args, deps) {
     ...parsed.taskEvidence ? { taskEvidence: parsed.taskEvidence } : {},
     ...contextBlockScopes.length > 0 ? { contextBlockScopes } : extraContextBlocks.length > 0 ? { extraContextBlocks } : {}
   });
+  terminalStatus.working();
   let result = await raceWithWatchdog(
     runner({
       ...buildRunOptions(effectiveAgentKey),
@@ -13997,6 +15252,11 @@ async function runAgentRunCommand(args, deps) {
       );
     }
   }
+  terminalStatus.settle({
+    exitCode: result.exitCode,
+    streamInterrupted: result.streamInterrupted,
+    stalledOrTruncated: isRunResultStalledOrTruncated(result)
+  });
   if (result.dialogId) {
     if (parsed.background) {
       output.write(`
@@ -14081,6 +15341,9 @@ async function runAgentRunCommand(args, deps) {
         ...runCreditsTotal !== void 0 ? { credits: runCreditsTotal } : {},
         ...failureReason ? { failureReason } : {},
         ...toolCallCount !== void 0 ? { toolCallCount } : {},
+        ...result.finalText ? { lastAssistantText: result.finalText } : {},
+        // 仅用于 .result.md 头（front matter）：旁路读取，不改 result 形状。
+        ...getRunResultHeaderMeta(result),
         ...truncationNote
       },
       {
@@ -14108,12 +15371,6 @@ function isBalanceExhaustedError(error) {
 }
 
 export {
-  resolveAgentModelIdentity,
-  resolveAgentContextWindow,
-  platformCreditsFromUsage,
-  formatCreditsChip,
-  formatTokenCount,
-  renderTokenStatus,
   resolveCliColorEnabled,
   dimCliText,
   ANSI_ESCAPE_REGEX,
@@ -14153,7 +15410,14 @@ export {
   polishBreathInsertsBlankBetween,
   formatAssistantDisplay,
   redactSecrets,
+  safeAskText,
   TUI_TREE_MARKER,
+  resolveAgentModelIdentity,
+  resolveAgentContextWindow,
+  platformCreditsFromUsage,
+  formatCreditsChip,
+  formatTokenCount,
+  renderTokenStatus,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,
   createCollapsedPasteStore,
@@ -14164,17 +15428,21 @@ export {
   releaseCollapsedPasteReferences,
   expandRangeToCollapsedPasteChips,
   findCollapsedPasteSpanAt,
+  emitTerminalProgramStatus,
   runAgentTurn,
-  readAgentsMdLayerFromDisk,
   resolveWorkflowReference,
   resolveSkillReference,
   buildSkillContextBlocks,
   prependSubjectDialogMarker,
   normalizeCliImageInput,
-  inspectLocalRunWorkspace,
+  buildHostEnvironmentLayer,
+  readAgentsMdLayerFromDisk,
   resolveCliMemory,
-  resolveRunOutcome,
+  FAILED_EMPTY_ASSISTANT_REASONS,
   isRunResultStalledOrTruncated,
+  resolveTerminalProgramStatusState,
+  inspectLocalRunWorkspace,
+  resolveRunOutcome,
   resolveRunSettlementNote,
   runAgentRunCommand,
   isBalanceExhaustedError