nolo-cli 0.16.0-alpha.8 → 0.16.0

package/{chunk-B2A62NRJ.js → chunk-AUURUT6L.js}

@@ -18,17 +18,17 @@ import {
   isBuiltinNoloAgentRef,
   t,
   toolLabel
-} from "./chunk-UVLYZNDL.js";
+} from "./chunk-DPAB4FQ7.js";
 import {
   getReadableCliDb
 } from "./chunk-W4NVOSFF.js";
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-FJHD7FHN.js";
+} from "./chunk-PCTUYVUM.js";
 import {
   normalizeAgentHandle
-} from "./chunk-QSWWWYGA.js";
+} from "./chunk-M43KDE25.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
@@ -47,7 +47,7 @@ import {
   isAgentNameFallback,
   isAgentRunTerminalStatus,
   resolveRunLabel
-} from "./chunk-HNLGEZZC.js";
+} from "./chunk-ZQBL7LIC.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-RQSOAMPJ.js";
@@ -56,7 +56,7 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-ND3KEKR5.js";
+} from "./chunk-Z5JQNBNY.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
@@ -65,14 +65,14 @@ import {
   API_REPORTED_COST_MULTIPLIER,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-TPHRIFDJ.js";
+} from "./chunk-NSCHQQPU.js";
 import {
   buildSkillDiscoveryContextBlock
 } from "./chunk-AS3ZQ3O2.js";
 import {
   buildPlatformChatCompletionRequest,
   parsePlatformChatCompletionData
-} from "./chunk-KOW2R4MZ.js";
+} from "./chunk-AVVZUXXC.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
@@ -81,26 +81,21 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-ZTRZ2O5B.js";
-import {
-  createThinkParserState,
-  flushThinkParser,
-  processThinkChunk
-} from "./chunk-LSFAWXKC.js";
+} from "./chunk-GSINCD4P.js";
 import {
   resolvePlatformAuthToken,
   resolvePlatformChatCompletionsEndpoint
-} from "./chunk-LJIJWXIT.js";
+} from "./chunk-6EVITP2G.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-4IF3B7WC.js";
+} from "./chunk-4L2OJPCU.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
 import {
   findModelConfig
-} from "./chunk-5BP2BROQ.js";
+} from "./chunk-66X4VSRC.js";
 import {
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer
@@ -1611,8 +1606,161 @@ function createRenderAwareStreamWriter(args) {
     }
   };
 }
-function formatAssistantTextForCli(text) {
-  return text.replace(/\u003cthink\u003e[\s\S]*?\u003c\/think\u003e\s*/gi, "").replace(/\n{3,}/g, "\n\n").trim();
+
+// packages/cli/client/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 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() {
+      }
+    };
+  }
+  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;
+    }
+  };
 }
 
 // packages/cli/client/formatReadPathTree.ts
@@ -2913,11 +3061,6 @@ 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;
@@ -2931,7 +3074,6 @@ var Spinner = class {
   frameIndex = 0;
   frames = ["\xB7", "~", "\u2248", "\u223F", "\u2248", "~"];
   isTTY;
-  thinkingHint = "";
   start() {
     if (this.silent) {
       this.startTime = Date.now();
@@ -2967,11 +3109,9 @@ ${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();
@@ -2987,30 +3127,20 @@ ${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)
     );
-    const thinkingPart = this.thinkingHint ? `: ${truncateThinkingHint(this.thinkingHint, 60)}` : "";
-    return `${themeColorSequence("accent")}${frame}\x1B[39m ${this.text}${thinkingPart} (${formatElapsed(elapsedSeconds)})`;
+    return `${themeColorSequence("accent")}${frame}\x1B[39m ${this.text} (${formatElapsed(elapsedSeconds)})`;
   }
 };
 
 // packages/cli/client/agentRunOutput.ts
-function formatAssistantResponseForCli(text) {
+function formatAssistantResponseForCli(text, options) {
+  const thinkingMode = resolveThinkingDisplayMode(options.env);
   return formatAssistantDisplay(
-    formatAssistantTextForCli(text)
+    formatAssistantTextForCli(text, thinkingMode)
   );
 }
 function resolveAgentEventMode(options) {
@@ -3043,19 +3173,12 @@ function createCliTurnOutput(params) {
   let streamedAssistantText = false;
   let everStreamedAnyText = false;
   let printedAssistantLabel = false;
-  let thinkState = createThinkParserState();
+  const thinkingMode = resolveThinkingDisplayMode(options.env);
   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) {
@@ -3065,8 +3188,17 @@ ${options.agentName} > `);
     }
     streamedAssistantText = true;
     everStreamedAnyText = true;
-    renderWriter.push(parsed.content);
+    renderWriter.push(chunk);
   };
+  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);
@@ -3075,6 +3207,7 @@ ${options.agentName} > `);
       return;
     }
     if (event.type === "tool-call") {
+      thinkingFilter.flush();
       renderWriter.flush();
     }
     spinner.stop();
@@ -3100,14 +3233,21 @@ ${options.agentName} > `);
   };
   return {
     spinner,
+    thinkingMode,
     toolDisplayMode,
     traceLocalTools,
     eventMode,
     pushText(chunk) {
-      writeVisibleAssistantChunk(chunk);
+      if (eventMode !== "jsonl" && formatToolEvent.flush) {
+        const pendingToolOutput = formatToolEvent.flush();
+        if (pendingToolOutput) {
+          options.output.write(pendingToolOutput);
+        }
+      }
+      thinkingFilter.push(chunk);
     },
     pushThinking(chunk) {
-      spinner.setThinkingHint(chunk);
+      thinkingSink.push(chunk);
     },
     handleToolEvent,
     showWorking(label) {
@@ -3118,22 +3258,19 @@ ${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()) : "";
+        const content = fallbackContent ? formatAssistantResponseForCli(fallbackContent.trim(), options) : "";
         if (content) {
           options.output.write(`
 ${options.agentName} > ${content}
@@ -3558,7 +3695,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-N56G2ZJK.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QNPNJRVH.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -3835,6 +3972,7 @@ async function runHttpAgentTurn(options, authToken) {
     ...options.inheritedFromDialogKey ? { inheritedFromDialogKey: options.inheritedFromDialogKey } : {},
     ...options.parentDialogId ? { parentDialogId: options.parentDialogId } : {},
     ...options.background ? { background: true } : {},
+    ...options.ephemeral ? { ephemeral: true } : {},
     ...typeof options.timeoutMs === "number" ? { timeoutMs: options.timeoutMs } : {},
     ...options.modelOverride ? { runtimeOptions: { quickChatModelOverride: options.modelOverride } } : {},
     ...serverContextBlockScopes ? { contextBlockScopes: serverContextBlockScopes } : {},
@@ -3925,7 +4063,8 @@ async function runHttpAgentTurn(options, authToken) {
     return dialogIdText ? { exitCode: 1, dialogId: dialogIdText } : { exitCode: 1 };
   }
   const content = formatAssistantResponseForCli(
-    String(data?.content ?? data?.message ?? "")
+    String(data?.content ?? data?.message ?? ""),
+    options
   );
   if (content) {
     options.output.write(`
@@ -3994,7 +4133,7 @@ async function runLocalAgentTurnForCli(options, settings) {
   } : void 0;
   const currentDialogId = options.continueDialogId ?? ulid();
   const runChildTurn = async (input) => {
-    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-N56G2ZJK.js");
+    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QNPNJRVH.js");
     return runLocalAgentTurn(input);
   };
   const createFreshChildBaseAdapter = () => {
@@ -4196,11 +4335,6 @@ async function runAgentTurn(options) {
     );
     return { exitCode: 1 };
   }
-  if (options.ephemeral) {
-    options.output.write(
-      "[nolo] --ephemeral/--memory-only is only effective with the local runtime (--local); the server stores dialogs on its own and cannot run memory-only.\n"
-    );
-  }
   return runHttpAgentTurn(options, authToken);
 }
 
@@ -5349,6 +5483,7 @@ export {
   themeColorSequence,
   themeText,
   formatAssistantDisplay,
+  normalizeThinkingDisplayMode,
   normalizeToolDisplayMode,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,

package/{chunk-KOW2R4MZ.js → chunk-AVVZUXXC.js}

@@ -2,28 +2,24 @@ import {
   accumulateToolCallDelta,
   extractThinkContent,
   flushThinkParser,
-  flushToolCallTextParserIntoCallback,
-  processContentChunkWithToolCallStripping,
   processThinkChunk
-} from "./chunk-LSFAWXKC.js";
+} from "./chunk-3WGLLTK4.js";
 import {
+  buildProviderExecutionPlan,
+  canUsePlatformChatProvider,
   convertMessagesToResponsesInput,
   extractTextFromResponseOutput,
   extractToolCallsFromResponseOutput,
-  hasImageParts,
-  shouldStripReasoningContentForOutbound,
-  toOpenAiCompatibleMessages,
-  toResponsesTools
-} from "./chunk-KFEVY3ST.js";
-import {
-  buildProviderExecutionPlan,
-  canUsePlatformChatProvider,
   hasDirectOpenAiCompatibleProvider,
+  hasImageParts,
   resolveAgentRuntimeLocation,
   resolvePlatformAuthToken,
   resolvePlatformServerUrl,
-  resolveProviderTransportDecision
-} from "./chunk-LJIJWXIT.js";
+  resolveProviderTransportDecision,
+  shouldStripReasoningContentForOutbound,
+  toOpenAiCompatibleMessages,
+  toResponsesTools
+} from "./chunk-6EVITP2G.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -108,16 +104,7 @@ function applyChatCompletionDelta(parsed, state) {
   }
   const textChunk = typeof delta.content === "string" ? delta.content : "";
   if (textChunk) {
-    const { cleanedContent, state: newState } = processContentChunkWithToolCallStripping(
-      textChunk,
-      state.toolCallTextState,
-      (name, arguments_) => accumulateToolCallDelta(state.accumulatedToolCalls, [
-        { index: state.accumulatedToolCalls.slots.length, type: "function", function: { name, arguments: arguments_ } }
-      ])
-    );
-    state.toolCallTextState = newState;
-    if (!cleanedContent) return true;
-    const parsedChunk = processThinkChunk(cleanedContent, state.thinkState);
+    const parsedChunk = processThinkChunk(textChunk, state.thinkState);
     state.thinkState = parsedChunk.state;
     if (parsedChunk.content) {
       state.content += parsedChunk.content;
@@ -131,19 +118,11 @@ function applyChatCompletionDelta(parsed, state) {
   return true;
 }
 function flushChatCompletionStream(state) {
-  const { residualContent, state: tcState } = flushToolCallTextParserIntoCallback(
-    state.toolCallTextState,
-    (name, arguments_) => accumulateToolCallDelta(state.accumulatedToolCalls, [
-      { index: state.accumulatedToolCalls.slots.length, type: "function", function: { name, arguments: arguments_ } }
-    ])
-  );
-  state.toolCallTextState = tcState;
   const flushed = flushThinkParser(state.thinkState);
   state.thinkState = flushed.state;
-  const combinedContent = residualContent + (flushed.content ?? "");
-  if (combinedContent) {
-    state.content += combinedContent;
-    state.onTextDelta?.(combinedContent);
+  if (flushed.content) {
+    state.content += flushed.content;
+    state.onTextDelta?.(flushed.content);
   }
   if (flushed.reasoning) {
     state.reasoning += flushed.reasoning;
@@ -301,9 +280,6 @@ function buildPlatformChatCompletionRequest(args) {
     }
   };
 }
-function resolveLegacyDeepSeekProxyChatFallback(args) {
-  return void 0;
-}
 function tryParseJson(raw) {
   try {
     return JSON.parse(raw);
@@ -416,7 +392,6 @@ export {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   buildPlatformChatCompletionRequest,
-  resolveLegacyDeepSeekProxyChatFallback,
   parsePlatformChatCompletionData,
   parsePlatformChatCompletionResponse,
   canUsePlatformChatProvider2 as canUsePlatformChatProvider,

package/{chunk-BS5STUTA.js → chunk-BEBNFWDU.js}

@@ -1,13 +1,13 @@
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-AKYTMRBP.js";
+} from "./chunk-NVEWUJVX.js";
 import {
   agentRecordHasConfiguredCredential
-} from "./chunk-FJHD7FHN.js";
+} from "./chunk-PCTUYVUM.js";
 import {
   toSafeAgentSummary
-} from "./chunk-OIX36K6R.js";
+} from "./chunk-3OIRVWXA.js";
 
 // packages/cli/agentListHelpers.ts
 function parseAgentRecordId(privateKey, explicitId) {

package/{chunk-YMMMHRM6.js → chunk-DGEYDWEZ.js}

@@ -1,13 +1,13 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-UVLYZNDL.js";
+} from "./chunk-DPAB4FQ7.js";
 import {
   clipMultilineText
-} from "./chunk-HNLGEZZC.js";
+} from "./chunk-ZQBL7LIC.js";
 import {
   runLocalAgentTurn
-} from "./chunk-ZTRZ2O5B.js";
+} from "./chunk-GSINCD4P.js";
 import {
   resolveLocalRuntimeEnvFromPolicy
 } from "./chunk-5CS33IBL.js";