nolo-cli 0.83.0 → 0.84.0

package/{chunk-SSDAAEC2.js → chunk-FP76KI2Y.js}

@@ -10,6 +10,9 @@ import {
   resolveServerUrl,
   writeUsage
 } from "./chunk-V7E4PXQD.js";
+import {
+  resolveMachineId
+} from "./chunk-ESHYE7WU.js";
 import {
   agentRunCardLabels,
   createCliLocalRuntimeAdapter,
@@ -26,8 +29,9 @@ import {
   resolveFileWriteGateEnabled,
   resolveLocalUserId,
   t,
-  toolLabel
-} from "./chunk-YFE4A4O7.js";
+  toolLabel,
+  toolLabelVariants
+} from "./chunk-LMREEBWT.js";
 import {
   createRunActivityTracker,
   popSingleQueueMessage,
@@ -48,23 +52,20 @@ import {
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-AEOE4Z6Q.js";
+} from "./chunk-QSHEEA5N.js";
 import {
   isLocalCliAgentKey
 } from "./chunk-SV5IJK6K.js";
 import {
   CliProviderQuotaError
 } from "./chunk-MP64VFGD.js";
-import {
-  resolveMachineId
-} from "./chunk-ESHYE7WU.js";
 import {
   applyModelLayerOverride,
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
 import {
   formatAgentListCard
-} from "./chunk-5FBTLSFG.js";
+} from "./chunk-3BGIKIPF.js";
 import {
   isTransientFetchError
 } from "./chunk-5UTFL4QJ.js";
@@ -80,16 +81,19 @@ import {
   formatStopRunCard,
   isAgentRunTerminalStatus
 } from "./chunk-3VNWWVKB.js";
+import {
+  extractGoogleValidationLink
+} from "./chunk-BMQ2MJUK.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-RFCKMYDK.js";
+} from "./chunk-MZYBSTMH.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   parseUiAskChoiceContent
-} from "./chunk-QVKRR2SS.js";
+} from "./chunk-XP3VVAPG.js";
 import {
   isOAuthApiKeyRef
 } from "./chunk-YYLHWIW6.js";
@@ -112,10 +116,10 @@ import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-6VFARHZW.js";
+} from "./chunk-52Q2IW2X.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-5H7KJX7J.js";
+} from "./chunk-4MK3I7Y4.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -130,7 +134,7 @@ import {
 } from "./chunk-FDTR4QJ6.js";
 import {
   isAntigravityOAuthAgent
-} from "./chunk-UZGQNTVW.js";
+} from "./chunk-GNCCNNZD.js";
 import {
   resolveClientVersion
 } from "./chunk-6OZ36FXI.js";
@@ -138,10 +142,10 @@ import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow,
   normalizeUsage
-} from "./chunk-4OEFYTWL.js";
+} from "./chunk-HKNXJGEC.js";
 import {
   clipCompactText
-} from "./chunk-DNCEALKX.js";
+} from "./chunk-P5EVSOPA.js";
 import {
   findModelConfig
 } from "./chunk-OIVSQH2O.js";
@@ -386,6 +390,24 @@ function styleCliText(text, style, enabled = resolveCliColorEnabled()) {
 function dimCliText(text, enabled = resolveCliColorEnabled()) {
   return styleCliText(text, "dim", enabled);
 }
+var OSC8_OPEN = "\x1B]8;;";
+var OSC8_CLOSE = "\x1B\\";
+function sanitizeHyperlinkLabel(label) {
+  return label.replace(/[\u0000-\u001f\u007f]/g, "");
+}
+function resolveCliHyperlinkEnabled(env = process.env, isTTY = Boolean(process.stdout.isTTY)) {
+  const setting = asTrimmedLowercaseString(env.NOLO_CLI_HYPERLINKS);
+  if (setting === "0" || setting === "false" || setting === "off") return false;
+  if (setting === "1" || setting === "true" || setting === "on") return true;
+  return isTTY;
+}
+function formatCliHyperlink(url, label, enabled = resolveCliHyperlinkEnabled()) {
+  if (!url) return label;
+  const safeLabel = sanitizeHyperlinkLabel(label);
+  if (!enabled) return `${safeLabel} (${url})`;
+  if (!safeLabel) return url;
+  return `${OSC8_OPEN}${url}${OSC8_CLOSE}${safeLabel}${OSC8_OPEN}${OSC8_CLOSE}`;
+}
 
 // node_modules/ansi-regex/index.js
 function ansiRegex({ onlyFirst = false } = {}) {
@@ -620,8 +642,12 @@ function stringWidth(input, options = {}) {
 
 // packages/cli/tui/tuiAnsi.ts
 var ANSI_ESCAPE_REGEX = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g;
+var OSC8_HYPERLINK_REGEX = /\x1b\]8;;[^\x1b]*\x1b\\/g;
 var ALL_ANSI_ESCAPE_REGEX = ansiRegex();
 var FIRST_ANSI_ESCAPE_REGEX = ansiRegex({ onlyFirst: true });
+function stripOsc8Hyperlinks(text) {
+  return text.replace(OSC8_HYPERLINK_REGEX, "");
+}
 function stripAnsi2(text) {
   return text.replace(ANSI_ESCAPE_REGEX, "").replace(ALL_ANSI_ESCAPE_REGEX, "");
 }
@@ -783,6 +809,7 @@ function visibleWidth(str) {
 }
 function truncateAnsi(text, maxWidth) {
   if (maxWidth <= 0) return "";
+  text = stripOsc8Hyperlinks(text);
   if (visibleWidth(text) <= maxWidth) return text;
   let width = 0;
   let out = "";
@@ -823,7 +850,7 @@ function countPhysicalLines(text, columns) {
   const lines = text.split("\n");
   let total = 0;
   for (const line of lines) {
-    const width = displayWidth(line);
+    const width = visibleWidth(stripOsc8Hyperlinks(line));
     total += Math.max(1, Math.ceil(width / columns));
   }
   return Math.max(total, 1);
@@ -8196,12 +8223,79 @@ 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/;
+var LIST_LIKE_RE_FOR_GUARD = /^\s*(?:•|☐|☑|\d+\.)\s|^\s*[\u2460-\u2473]|^\s*[├└]──\s|^\s*▸\s/;
 function polishBreathInsertsBlankBetween(cur, next) {
   if (cur === "" || next === "") return false;
+  if (isToolGroupBoundary(cur, next)) return true;
   return isPolishListLikeLine(cur) !== isPolishListLikeLine(next);
 }
 function convertMarkdownTablesForTerminal(text) {
@@ -8271,16 +8365,14 @@ 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 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(
@@ -8290,6 +8382,8 @@ function polishAssistantStructure(text, options = {}) {
   return options.trimEdges === false ? polished : polished.trim();
 }
 function styleRichMarkdownLine(line, brightness) {
+  const toolLine = styleTuiToolLine(line, brightness);
+  if (toolLine !== null) return toolLine;
   const heading = line.match(/^(#{1,3})\s+(.+)$/);
   if (heading) {
     const level = heading[1].length;
@@ -8441,16 +8535,23 @@ 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";
   return "prose";
 }
+function isStreamListLike(kind) {
+  return kind === "list" || kind === "tool-header" || kind === "tool-leaf" || kind === "tool";
+}
 function needsListProseBreath(prev, next) {
   if (prev === null || prev === "blank" || next === "blank") return false;
-  const prevList = prev === "list";
-  const nextList = next === "list";
-  return prevList !== nextList;
+  if (prev === "tool-leaf" && next === "tool-header") return true;
+  return isStreamListLike(prev) !== isStreamListLike(next);
 }
 function createRenderAwareStreamWriter(args) {
   const brightness = resolveTuiBrightness();
@@ -9808,6 +9909,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;
@@ -9869,6 +9971,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`;
@@ -9877,7 +9987,8 @@ 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;
   let streamedAssistantText = false;
   let everStreamedAnyText = false;
   let printedAssistantLabel = false;
@@ -9914,7 +10025,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") {
@@ -9926,9 +10036,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;
@@ -9944,8 +10070,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) => {
@@ -9961,6 +10102,9 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       return;
     }
     if (event.type === "tool-call") {
+      if (assistantLabelManaged && pendingTuiNarration) {
+        dropPendingTuiProgress();
+      }
       renderWriter.flush();
       formatToolEvent(event);
       endThinkingPhase();
@@ -9968,6 +10112,7 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
         options.output.write("\n");
         streamedAssistantText = false;
       }
+      if (assistantLabelManaged) tuiNarrationPromoted = false;
       const activeLabel = formatConservativeActiveToolLabel(event);
       spinner.show(activeLabel);
       options.activityReporter?.(activeLabel);
@@ -9991,6 +10136,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);
     },
@@ -9998,10 +10163,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)) {
@@ -10013,12 +10174,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);
@@ -10123,6 +10300,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;
@@ -10135,6 +10313,7 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
     }
     if (payload?.type === "done") {
       usage = payload.usage;
+      sawDone = true;
       return;
     }
     if (payload?.type === "dialog" || payload?.type === "status") {
@@ -10188,6 +10367,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,
@@ -10217,6 +10399,15 @@ ${describeClientVersionTooOldFailure(message, error)}`);
 `);
     return { exitCode: 1 };
   }
+  if (options.abortSignal?.aborted && !sawDone) {
+    turnOutput.spinner.stop();
+    turnOutput.cancel();
+    return {
+      exitCode: 0,
+      ...dialogId ? { dialogId } : {},
+      streamInterrupted: true
+    };
+  }
   turnOutput.finish(content);
   const usageText = formatUsage(usage, dialogId);
   if (usageText && shouldShowUsage(options.env))
@@ -10433,7 +10624,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-VXZSDIGT.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-3WTYYIT2.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();
@@ -10760,6 +10951,22 @@ 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`;
+  const { url: validationUrl, text: validationText } = extractGoogleValidationLink(ctx.message);
+  const validationLabel = validationText || "Verify your account";
+  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}.
 `;
 }
@@ -10795,6 +11002,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,
@@ -10803,6 +11021,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";
   }
@@ -10880,7 +11099,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);
 }
@@ -11197,6 +11417,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"
@@ -11242,6 +11474,9 @@ async function runLocalAgentTurnForCli(options, settings) {
     };
   } catch (error) {
     turnOutput.spinner.stop();
+    turnOutput.cancel({
+      preservePendingNarration: error?.code !== LOCAL_TURN_ABORTED_CODE && !options.abortSignal?.aborted
+    });
     const savedDialogId = error?.dialogId;
     const abortedUsageRecords = error?.usageRecords;
     const abortedTurnCredits = sumPlatformCredits(abortedUsageRecords);
@@ -11265,10 +11500,12 @@ async function runLocalAgentTurnForCli(options, settings) {
       error.cooldownUntil = cooldownUntil;
     }
     if (settings.reportFailure) {
-      options.output.write(
-        `[nolo] Local agent run failed: ${toErrorMessage(error)}
-`
-      );
+      const failureLine = formatLocalTurnFailureLine(error);
+      if (typeof options.output.writeErr === "function") {
+        options.output.writeErr(failureLine);
+      } else {
+        options.output.write(failureLine);
+      }
       if (cooldownUntil) {
         options.output.write(
           `[nolo] \u5DF2\u6807\u8BB0\u51B7\u5374\u81F3 ${cooldownUntil}\uFF0C\u5230\u671F\u524D\u6D3E\u53D1\u8BE5 agent \u4F1A\u88AB\u51B7\u5374\u95E8\u63A7\u62E6\u622A\u3002
@@ -13526,7 +13763,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;