nolo-cli 0.14.0-alpha.9 → 0.15.0

package/{chunk-FVGJNXPJ.js → chunk-XGQZFBO5.js}

@@ -1,6 +1,3 @@
-import {
-  resolveMachineId
-} from "./chunk-6HYVJV7B.js";
 import {
   buildLocalRunEnv,
   isFullstackCodingAgentRef,
@@ -9,7 +6,10 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-3QAF2LTL.js";
+} from "./chunk-DZ3XJVET.js";
+import {
+  resolveMachineId
+} from "./chunk-6HYVJV7B.js";
 import {
   agentRunCardLabels,
   createCliCallAgentToolExecutor,
@@ -18,20 +18,17 @@ import {
   isBuiltinNoloAgentRef,
   t,
   toolLabel
-} from "./chunk-GGHFCK3X.js";
-import {
-  CliProviderQuotaError
-} from "./chunk-CMKUBIGW.js";
+} from "./chunk-AWDOJBHW.js";
 import {
   getReadableCliDb
 } from "./chunk-W4NVOSFF.js";
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-YG3CCS7C.js";
+} from "./chunk-K53477EY.js";
 import {
   normalizeAgentHandle
-} from "./chunk-CDQ2ICPR.js";
+} from "./chunk-IOQ7IBPU.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
@@ -48,7 +45,7 @@ import {
   formatStatusRunCard,
   formatStopRunCard,
   isAgentRunTerminalStatus
-} from "./chunk-KUDUXBNE.js";
+} from "./chunk-VE6XMVKG.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-RQSOAMPJ.js";
@@ -57,7 +54,7 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-7VKJDLPO.js";
+} from "./chunk-Z24FGIU2.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
@@ -66,14 +63,14 @@ import {
   API_REPORTED_COST_MULTIPLIER,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-SW3Q2OV5.js";
+} from "./chunk-YNHQIXX5.js";
 import {
   buildSkillDiscoveryContextBlock
 } from "./chunk-AS3ZQ3O2.js";
 import {
   buildPlatformChatCompletionRequest,
   parsePlatformChatCompletionData
-} from "./chunk-3AE4NQ5O.js";
+} from "./chunk-WA6KZL5V.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
@@ -82,15 +79,20 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-2ROIXEDX.js";
+} from "./chunk-6MHDWKOT.js";
+import {
+  createThinkParserState,
+  flushThinkParser,
+  processThinkChunk
+} from "./chunk-LSFAWXKC.js";
 import {
   resolvePlatformAuthToken,
   resolvePlatformChatCompletionsEndpoint
-} from "./chunk-SRKNB2WB.js";
+} from "./chunk-HRQCKQA5.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-3B2LFO6R.js";
+} from "./chunk-4QQFLN5C.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -109,6 +111,9 @@ import {
   finalizeRunRecord,
   spawnLocalBackgroundRun
 } from "./chunk-MYMMNKYL.js";
+import {
+  CliProviderQuotaError
+} from "./chunk-CMKUBIGW.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -119,6 +124,9 @@ import {
   readPipeText,
   spawnProcess
 } from "./chunk-IDZTNRP2.js";
+import {
+  resolveAuthToken
+} from "./chunk-A7GB5UGH.js";
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
@@ -132,13 +140,10 @@ import {
   BUILTIN_NOLO_AGENT_KEY,
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
   PUBLIC_KIMI_K26_IMAGE_AGENT_KEY
-} from "./chunk-NJVPXLRY.js";
+} from "./chunk-VPTJB4HM.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
-import {
-  resolveAuthToken
-} from "./chunk-A7GB5UGH.js";
 import {
   isLoopbackUrl
 } from "./chunk-4SN6J65J.js";
@@ -1597,165 +1602,25 @@ function createRenderAwareStreamWriter(args) {
     }
   };
 }
-
-// packages/cli/client/thinkingOutput.ts
-var THINK_OPEN = /<think>/i;
-var THINK_CLOSE = /<\/think>/i;
-var COLLAPSED_MARKER = /^\s*▸ 思考已折叠\s*$/;
-function normalizeThinkingDisplayMode(raw, fallback = "hide") {
-  const normalized = asTrimmedLowercaseString(raw);
-  if (normalized === "hide" || normalized === "off" || normalized === "false" || normalized === "0") {
-    return "hide";
-  }
-  if (normalized === "marker" || normalized === "collapsed" || normalized === "fold") {
-    return "marker";
-  }
-  if (normalized === "show" || normalized === "on" || normalized === "true" || normalized === "1") {
-    return "show";
-  }
-  return fallback;
-}
-function resolveThinkingDisplayMode(env = process.env) {
-  return normalizeThinkingDisplayMode(env.NOLO_CLI_THINKING ?? env.NOLO_THINKING, "hide");
+function formatAssistantTextForCli(text) {
+  return text.replace(/\u003cthink\u003e[\s\S]*?\u003c\/think\u003e\s*/gi, "").replace(/\n{3,}/g, "\n\n").trim();
 }
-function collapseThinkingBlocks(text, mode = "hide") {
-  if (mode === "show") return text;
-  const replacement = mode === "marker" ? "\u25B8 \u601D\u8003\u5DF2\u6298\u53E0\n" : "";
-  return text.replace(/<think>[\s\S]*?<\/think>\s*/gi, replacement).replace(/\n{3,}/g, "\n\n").trim();
-}
-function stripCollapsedThinkingMarkers(text) {
-  return text.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n").replace(/\n{2,}/g, "\n").trim();
-}
-function formatAssistantTextForCli(text, mode = "hide") {
-  const collapsed = collapseThinkingBlocks(text, mode);
-  return mode === "hide" ? stripCollapsedThinkingMarkers(collapsed) : collapsed;
-}
-function createThinkingEventSink(arg1, arg2) {
-  let mode = "hide";
-  let write = () => {
-  };
-  if (typeof arg1 === "function") {
-    write = arg1;
-    if (typeof arg2 === "string") {
-      mode = arg2;
-    }
-  } else {
-    mode = arg1;
-    if (typeof arg2 === "function") {
-      write = arg2;
-    }
-  }
-  if (mode === "hide") {
-    return {
-      push(_chunk) {
-      }
-    };
-  }
-  if (mode === "show") {
-    return {
-      push(chunk) {
-        if (chunk) write(chunk);
-      }
-    };
-  }
-  let markerEmitted = false;
-  return {
-    push(chunk) {
-      if (!chunk || markerEmitted) return;
-      write("\n\u25B8 \u601D\u8003\u5DF2\u6298\u53E0\n");
-      markerEmitted = true;
-    }
-  };
-}
-function createThinkingAwareStreamFilter(write, mode = "hide") {
-  if (mode === "show") {
-    return {
-      push(chunk) {
-        write(chunk);
-      },
-      flush() {
-      }
-    };
+
+// packages/cli/client/formatReadPathTree.ts
+import { homedir as osHomedir } from "node:os";
+
+// packages/core/foldHomePath.ts
+function foldHomePath(path, home) {
+  if (!path) return path;
+  if (home) {
+    const cleanHome = home.endsWith("/") ? home.slice(0, -1) : home;
+    if (path === cleanHome) return "~";
+    if (path.startsWith(cleanHome + "/")) return `~${path.slice(cleanHome.length)}`;
   }
-  let pending = "";
-  let insideThink = false;
-  let markerEmitted = false;
-  const emit = (chunk) => {
-    if (chunk) write(chunk);
-  };
-  const emitMarker = () => {
-    if (mode !== "marker" || markerEmitted) return;
-    emit("\n\u25B8 \u601D\u8003\u5DF2\u6298\u53E0\n");
-    markerEmitted = true;
-  };
-  const consume = (input) => {
-    pending += input;
-    while (pending.length > 0) {
-      if (insideThink) {
-        const closeMatch = pending.match(THINK_CLOSE);
-        if (!closeMatch || closeMatch.index == null) {
-          emitMarker();
-          pending = "";
-          return;
-        }
-        emitMarker();
-        pending = pending.slice(closeMatch.index + closeMatch[0].length);
-        insideThink = false;
-        markerEmitted = false;
-        continue;
-      }
-      const openMatch = pending.match(THINK_OPEN);
-      if (!openMatch || openMatch.index == null) {
-        const nextMarker = pending.indexOf("<");
-        if (nextMarker === -1) {
-          const cleaned = mode === "hide" ? pending.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : pending;
-          emit(cleaned);
-          pending = "";
-          return;
-        }
-        if (nextMarker > 0) {
-          const head = pending.slice(0, nextMarker);
-          const cleaned = mode === "hide" ? head.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : head;
-          emit(cleaned);
-          pending = pending.slice(nextMarker);
-          continue;
-        }
-        if (pending.length < 7) return;
-        emit(pending[0]);
-        pending = pending.slice(1);
-        continue;
-      }
-      if (openMatch.index > 0) {
-        const head = pending.slice(0, openMatch.index);
-        const cleaned = mode === "hide" ? head.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : head;
-        emit(cleaned);
-        pending = pending.slice(openMatch.index);
-        continue;
-      }
-      pending = pending.slice(openMatch[0].length);
-      insideThink = true;
-      markerEmitted = false;
-    }
-  };
-  return {
-    push(chunk) {
-      consume(chunk);
-    },
-    flush() {
-      if (insideThink) emitMarker();
-      if (pending) {
-        const cleaned = mode === "hide" ? pending.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : pending;
-        emit(cleaned);
-      }
-      pending = "";
-      insideThink = false;
-      markerEmitted = false;
-    }
-  };
+  return path.replace(/^(\/Users\/[^/]+|\/home\/[^/]+)(\/|$)/, "~$2");
 }
 
 // packages/cli/client/formatReadPathTree.ts
-import { homedir as osHomedir } from "node:os";
 function clipPathAware(value, max = 72) {
   const compact = compactWhitespace(value);
   if (compact.length <= max) return compact;
@@ -1782,10 +1647,7 @@ function clipPathAware(value, max = 72) {
 function formatHomePath(path, customHomedir) {
   if (!path) return "";
   const home = customHomedir || (typeof process !== "undefined" ? process.env?.HOME : void 0) || (typeof osHomedir === "function" ? osHomedir() : "");
-  if (home && path.startsWith(home)) {
-    return `~${path.slice(home.length)}`;
-  }
-  return path.replace(/^(\/Users\/[^\/]+\/|\/home\/[^\/]+\/)/, "~/");
+  return foldHomePath(path, home);
 }
 function formatReadItemPath(rawPath, metadata, customHomedir) {
   const inputPath = rawPath || (typeof metadata?.path === "string" ? metadata.path : void 0) || (typeof metadata?.filePath === "string" ? metadata.filePath : void 0) || "file";
@@ -3048,6 +2910,11 @@ function formatElapsed(totalSeconds) {
   const mins = minutes % 60;
   return `${hours}h ${mins}m`;
 }
+function truncateThinkingHint(text, maxLen) {
+  const cleaned = text.replace(/\n/g, " ").trim();
+  if (cleaned.length <= maxLen) return cleaned;
+  return "\u2026" + cleaned.slice(cleaned.length - maxLen + 1);
+}
 var Spinner = class {
   constructor(output, text, silent = false) {
     this.output = output;
@@ -3061,6 +2928,7 @@ var Spinner = class {
   frameIndex = 0;
   frames = ["\xB7", "~", "\u2248", "\u223F", "\u2248", "~"];
   isTTY;
+  thinkingHint = "";
   start() {
     if (this.silent) {
       this.startTime = Date.now();
@@ -3096,9 +2964,11 @@ ${this.text}
       this.output.write("\r\x1B[K");
       this.output.write("\x1B[?25h");
     }
+    this.thinkingHint = "";
   }
   show(text) {
     this.text = text;
+    this.thinkingHint = "";
     if (this.silent) {
       if (!this.startTime) {
         this.startTime = Date.now();
@@ -3114,20 +2984,30 @@ ${this.text}
     this.startTime = Date.now();
     this.output.write(`\r${this.renderLine(this.frames[0])}`);
   }
+  /**
+   * Update the thinking hint displayed on the spinner line. The hint is
+   * truncated to a reasonable length and shown as part of the spinner text.
+   * Only meaningful while the spinner is active (TTY mode).
+   */
+  setThinkingHint(text) {
+    this.thinkingHint = text;
+    if (this.silent || !this.isTTY || !this.timer) return;
+    this.output.write(`\r${this.renderLine(this.frames[this.frameIndex])}`);
+  }
   renderLine(frame) {
     const elapsedSeconds = Math.max(
       0,
       Math.floor((Date.now() - this.startTime) / 1e3)
     );
-    return `${themeColorSequence("accent")}${frame}\x1B[39m ${this.text} (${formatElapsed(elapsedSeconds)})`;
+    const thinkingPart = this.thinkingHint ? `: ${truncateThinkingHint(this.thinkingHint, 60)}` : "";
+    return `${themeColorSequence("accent")}${frame}\x1B[39m ${this.text}${thinkingPart} (${formatElapsed(elapsedSeconds)})`;
   }
 };
 
 // packages/cli/client/agentRunOutput.ts
-function formatAssistantResponseForCli(text, options) {
-  const thinkingMode = resolveThinkingDisplayMode(options.env);
+function formatAssistantResponseForCli(text) {
   return formatAssistantDisplay(
-    formatAssistantTextForCli(text, thinkingMode)
+    formatAssistantTextForCli(text)
   );
 }
 function resolveAgentEventMode(options) {
@@ -3160,12 +3040,19 @@ function createCliTurnOutput(params) {
   let streamedAssistantText = false;
   let everStreamedAnyText = false;
   let printedAssistantLabel = false;
-  const thinkingMode = resolveThinkingDisplayMode(options.env);
+  let thinkState = createThinkParserState();
   const renderWriter = createRenderAwareStreamWriter({
     write: (chunk) => options.output.write(chunk)
   });
   const writeVisibleAssistantChunk = (chunk) => {
     if (!chunk) return;
+    const parsed = processThinkChunk(chunk, thinkState);
+    thinkState = parsed.state;
+    if (!parsed.content && !parsed.reasoning) return;
+    if (parsed.reasoning) {
+      spinner.setThinkingHint(parsed.reasoning);
+    }
+    if (!parsed.content) return;
     spinner.stop();
     options.activityReporter?.(null);
     if (!printedAssistantLabel) {
@@ -3175,17 +3062,8 @@ ${options.agentName} > `);
     }
     streamedAssistantText = true;
     everStreamedAnyText = true;
-    renderWriter.push(chunk);
+    renderWriter.push(parsed.content);
   };
-  const thinkingFilter = createThinkingAwareStreamFilter(
-    writeVisibleAssistantChunk,
-    thinkingMode
-  );
-  const thinkingSink = createThinkingEventSink((chunk) => {
-    spinner.stop();
-    options.activityReporter?.(null);
-    options.output.write(chunk);
-  }, thinkingMode);
   const handleToolEvent = (event) => {
     if (!traceLocalTools) return;
     const chunk = eventMode === "jsonl" ? formatToolJsonEvent(event) : formatToolEvent(event);
@@ -3194,7 +3072,6 @@ ${options.agentName} > `);
       return;
     }
     if (event.type === "tool-call") {
-      thinkingFilter.flush();
       renderWriter.flush();
     }
     spinner.stop();
@@ -3220,15 +3097,14 @@ ${options.agentName} > `);
   };
   return {
     spinner,
-    thinkingMode,
     toolDisplayMode,
     traceLocalTools,
     eventMode,
     pushText(chunk) {
-      thinkingFilter.push(chunk);
+      writeVisibleAssistantChunk(chunk);
     },
     pushThinking(chunk) {
-      thinkingSink.push(chunk);
+      spinner.setThinkingHint(chunk);
     },
     handleToolEvent,
     showWorking(label) {
@@ -3239,19 +3115,22 @@ ${options.agentName} > `);
     finish(fallbackContent) {
       spinner.stop();
       options.activityReporter?.(null);
+      const flushedThink = flushThinkParser(thinkState);
+      thinkState = flushedThink.state;
+      if (flushedThink.content) {
+        writeVisibleAssistantChunk(flushedThink.content);
+      }
       const pendingToolOutput = formatToolEvent.flush ? formatToolEvent.flush() : "";
       if (pendingToolOutput) {
         options.output.write(pendingToolOutput);
       }
       if (streamedAssistantText) {
-        thinkingFilter.flush();
         renderWriter.flush();
         options.output.write("\n");
       } else if (everStreamedAnyText) {
-        thinkingFilter.flush();
         options.output.write("\n");
       } else {
-        const content = fallbackContent ? formatAssistantResponseForCli(fallbackContent.trim(), options) : "";
+        const content = fallbackContent ? formatAssistantResponseForCli(fallbackContent.trim()) : "";
         if (content) {
           options.output.write(`
 ${options.agentName} > ${content}
@@ -3671,7 +3550,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-BONMVACL.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-4YCF6IRF.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -4038,8 +3917,7 @@ async function runHttpAgentTurn(options, authToken) {
     return dialogIdText ? { exitCode: 1, dialogId: dialogIdText } : { exitCode: 1 };
   }
   const content = formatAssistantResponseForCli(
-    String(data?.content ?? data?.message ?? ""),
-    options
+    String(data?.content ?? data?.message ?? "")
   );
   if (content) {
     options.output.write(`
@@ -4108,7 +3986,7 @@ async function runLocalAgentTurnForCli(options, settings) {
   } : void 0;
   const currentDialogId = options.continueDialogId ?? ulid();
   const runChildTurn = async (input) => {
-    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-BONMVACL.js");
+    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-4YCF6IRF.js");
     return runLocalAgentTurn(input);
   };
   const createFreshChildBaseAdapter = () => {
@@ -5462,7 +5340,6 @@ export {
   themeColorSequence,
   themeText,
   formatAssistantDisplay,
-  normalizeThinkingDisplayMode,
   normalizeToolDisplayMode,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,

package/{chunk-3FCSMQAC.js → chunk-XVP3C2KY.js}

@@ -1,7 +1,7 @@
 import {
   patch,
   read
-} from "./chunk-A5V7UEZJ.js";
+} from "./chunk-SFXYKGK2.js";
 import {
   DEVICE_LOCAL_OWNER_ID,
   isDeviceLocalSpaceBody,