nolo-cli 0.16.0 → 0.18.0

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

@@ -8,27 +8,24 @@ import {
   writeUsage
 } from "./chunk-DZ3XJVET.js";
 import {
-  resolveMachineId
-} from "./chunk-6HYVJV7B.js";
+  getReadableCliDb
+} from "./chunk-WFHXMLHZ.js";
+import {
+  normalizeAgentHandle,
+  readDbRecord,
+  resolveAgentRecordFromHybridStore
+} from "./chunk-DFCFMCY6.js";
 import {
   agentRunCardLabels,
   createCliCallAgentToolExecutor,
   createCliLocalRuntimeAdapter,
   getCliLocale,
   isBuiltinNoloAgentRef,
+  isQuotaExhaustedError,
+  parseAgentRunEvent,
   t,
   toolLabel
-} from "./chunk-DPAB4FQ7.js";
-import {
-  getReadableCliDb
-} from "./chunk-W4NVOSFF.js";
-import {
-  readDbRecord,
-  resolveAgentRecordFromHybridStore
-} from "./chunk-PCTUYVUM.js";
-import {
-  normalizeAgentHandle
-} from "./chunk-M43KDE25.js";
+} from "./chunk-23FZYPLC.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
@@ -38,41 +35,39 @@ import {
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
 import {
-  formatAgentListCard,
-  formatListRunsCard,
-  formatNotFoundRunCard,
-  formatStartRunCard,
-  formatStatusRunCard,
-  formatStopRunCard,
-  isAgentNameFallback,
-  isAgentRunTerminalStatus,
-  resolveRunLabel
-} from "./chunk-ZQBL7LIC.js";
+  resolveMachineId
+} from "./chunk-6HYVJV7B.js";
+import {
+  formatAgentListCard
+} from "./chunk-EDV7EBOI.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-RQSOAMPJ.js";
+import {
+  getDefaultCliLocalRuntimeDb
+} from "./chunk-WJRJDX2W.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-Z5JQNBNY.js";
-import {
-  parseExternalSkillMarkdown,
-  parseSkillDocProtocol
-} from "./chunk-VC6OZXO5.js";
+} from "./chunk-IYEXFJPC.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-NSCHQQPU.js";
+} from "./chunk-SCTYAHYK.js";
 import {
   buildSkillDiscoveryContextBlock
-} from "./chunk-AS3ZQ3O2.js";
+} from "./chunk-7OBMZCRD.js";
+import {
+  parseExternalSkillMarkdown,
+  parseSkillDocProtocol
+} from "./chunk-VC6OZXO5.js";
 import {
   buildPlatformChatCompletionRequest,
   parsePlatformChatCompletionData
-} from "./chunk-AVVZUXXC.js";
+} from "./chunk-N54HIJVJ.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
@@ -81,25 +76,33 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-GSINCD4P.js";
+} from "./chunk-YGW4G5W5.js";
+import {
+  createThinkParserState,
+  flushThinkParser,
+  processThinkChunk
+} from "./chunk-LSFAWXKC.js";
 import {
   resolvePlatformAuthToken,
   resolvePlatformChatCompletionsEndpoint
-} from "./chunk-6EVITP2G.js";
+} from "./chunk-MHSGJW4Z.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-4L2OJPCU.js";
+} from "./chunk-I2ZJKTG5.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
 import {
   findModelConfig
-} from "./chunk-66X4VSRC.js";
+} from "./chunk-UAIVG4J6.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer
-} from "./chunk-QLUFR47U.js";
+} from "./chunk-AL2V7U3E.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -107,16 +110,20 @@ import {
   createRunActivityTracker,
   finalizeRunRecord,
   spawnLocalBackgroundRun
-} from "./chunk-MYMMNKYL.js";
+} from "./chunk-VNAEBGDK.js";
 import {
-  CliProviderQuotaError
-} from "./chunk-CMKUBIGW.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+  formatFinishedRunCard,
+  formatListRunsCard,
+  formatNotFoundRunCard,
+  formatStartRunCard,
+  formatStatusRunCard,
+  formatStopRunCard,
+  isAgentRunTerminalStatus,
+  runShowsLogTail
+} from "./chunk-FQZZLA3C.js";
 import {
-  getDefaultCliLocalRuntimeDb
-} from "./chunk-H33743XH.js";
+  CliProviderQuotaError
+} from "./chunk-X7W4TNB4.js";
 import {
   readPipeText,
   spawnProcess
@@ -129,7 +136,7 @@ import {
 } from "./chunk-Y5GCAMGP.js";
 import {
   createMemoryKey
-} from "./chunk-O4BU24WZ.js";
+} from "./chunk-6Y7A3OQQ.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
@@ -137,7 +144,7 @@ import {
   BUILTIN_NOLO_AGENT_KEY,
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
   PUBLIC_KIMI_K26_IMAGE_AGENT_KEY
-} from "./chunk-XPC5C7BK.js";
+} from "./chunk-3ND52WIL.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
@@ -191,23 +198,18 @@ function buildQuickChatIntentSystemPrompt(tierAgents) {
 \u53EF\u9009 agent \u5217\u8868\uFF08agentKey \u4E0E\u63CF\u8FF0\uFF09\uFF1A
 ${agentList}
 
-\u5224\u65AD\u539F\u5219\uFF08\u9ED8\u8BA4\u504F\u5411\u901A\u7528\u6863\u4F4D\uFF1B\u4E13\u804C agent \u5728\u660E\u786E\u5339\u914D\u65F6\u4F7F\u7528\uFF1B**\u7F16\u7801/\u672C\u5730\u4ED3\u5E93\u4EFB\u52A1\u8D70\u901A\u7528\u6863 + needsWorkspace=true**\uFF09\uFF1A
+\u5224\u65AD\u539F\u5219\uFF08\u9ED8\u8BA4\u504F\u5411\u901A\u7528\u6863\u4F4D\uFF1B\u4E13\u804C agent \u5728\u660E\u786E\u5339\u914D\u65F6\u4F7F\u7528\uFF1B**\u7F16\u7801/\u672C\u5730\u4ED3\u5E93\u4EFB\u52A1\u8D70\u901A\u7528\u6863 balanced/quality**\uFF09\uFF1A
 - \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C**\u9664\u975E\u7528\u6237\u660E\u786E\u8868\u8FBE\u8981\u5EFA\u5E94\u7528/\u5EFA Agent/\u63D0\u4EA4\u53CD\u9988/\u591A Agent \u7F16\u6392**\uFF0C\u5426\u5219\u9009\u901A\u7528\u6863\u4F4D\uFF08flash/balanced/quality\uFF09\uFF1A
   - \u7B80\u5355\u95EE\u5019\u3001\u95F2\u804A\u3001\u5FEB\u901F\u95EE\u7B54\u3001\u7FFB\u8BD1\u3001\u77ED\u6587 \u2192 \u9009 flash \u6863
   - \u9700\u8981\u63A8\u7406\u3001\u5206\u6790\u3001\u4E2D\u7B49\u957F\u5EA6\u5199\u4F5C\u3001\u666E\u901A\u4EE3\u7801\u89E3\u91CA/\u67B6\u6784\u95EE\u7B54 \u2192 \u9009 balanced \u6863
   - \u590D\u6742\u63A8\u7406\u3001\u957F\u6587\u3001\u67B6\u6784\u8BBE\u8BA1\u3001\u6DF1\u5EA6\u5206\u6790 \u2192 \u9009 quality \u6863
-  - **\u660E\u786E\u7F16\u7801\u4EFB\u52A1\uFF08\u5B9E\u73B0\u529F\u80FD\u3001\u4FEE bug\u3001refactor\u3001\u5199/\u8865\u6D4B\u8BD5\u3001\u8DD1 build/tests/ci\uFF09\u6216\u67E5\u770B\u672C\u673A\u4ED3\u5E93/\u4EE3\u7801\u72B6\u6001\uFF08git/\u5206\u652F/commit/\u672C\u5730\u4E0E\u8FDC\u7A0B\u5DEE\u8DDD/\u672A\u63D0\u4EA4\u6539\u52A8\u7B49\uFF09** \u2192 \u9009 balanced \u6216 quality \u6863\uFF08\u6309\u590D\u6742\u5EA6\uFF1B**\u4E0D\u8981\u9009 flash**\uFF09\uFF0C\u4E14 needsWorkspace=true
+  - **\u660E\u786E\u7F16\u7801\u4EFB\u52A1\uFF08\u5B9E\u73B0\u529F\u80FD\u3001\u4FEE bug\u3001refactor\u3001\u5199/\u8865\u6D4B\u8BD5\u3001\u8DD1 build/tests/ci\uFF09\u6216\u67E5\u770B\u672C\u673A\u4ED3\u5E93/\u4EE3\u7801\u72B6\u6001\uFF08git/\u5206\u652F/commit/\u672C\u5730\u4E0E\u8FDC\u7A0B\u5DEE\u8DDD/\u672A\u63D0\u4EA4\u6539\u52A8\u7B49\uFF09** \u2192 \u9009 balanced \u6216 quality \u6863\uFF08\u6309\u590D\u6742\u5EA6\uFF1B**\u4E0D\u8981\u9009 flash**\uFF09
 - \u4E13\u804C agent \u8DEF\u7531\u89C4\u5219\uFF08\u6709\u660E\u786E\u5339\u914D\u65F6\u4F7F\u7528\uFF09\uFF1A
   - \u8981\u63D0\u4EA4/\u8BB0\u5F55 bug\u3001\u4F53\u9A8C\u95EE\u9898\u3001\u6570\u636E\u5F02\u5E38\u3001\u4EA7\u54C1\u5EFA\u8BAE\uFF0C\u6216\u53E3\u8BED\u5982\u300C\u60F3\u53CD\u9988\u4E00\u4E9B\u95EE\u9898\u300D\u300C\u53CD\u9988\u4E00\u4E0B\u300D\u2192 \u9009\u610F\u89C1\u53CD\u9988\u4E13\u804C agent
   - \u8981\u65B0\u5EFA\u6216\u5B9A\u5236 AI/Agent/\u667A\u80FD\u4F53\u52A9\u624B\uFF08\u542B\u914D\u7F6E\u5DE5\u5177\u3001\u77E5\u8BC6\u3001\u786E\u8BA4\u521B\u5EFA\uFF09\u2192 \u9009\u521B\u5EFA Agent \u4E13\u804C agent
   - \u8981\u505A/\u6539/\u53D1\u5E03\u7F51\u7AD9\u3001\u7F51\u9875\u3001\u5C0F\u5E94\u7528\u3001\u9884\u7EA6\u9875\u3001\u535A\u5BA2\u3001\u770B\u677F \u2192 \u9009\u5E94\u7528\u6784\u5EFA\u4E13\u804C agent
   - \u8981\u6D3E\u591A\u4E2A agent\u3001\u591A agent \u5E76\u884C\u3001\u62C6\u6210\u4EFB\u52A1\u540E\u53F0\u6267\u884C\u3001\u591A\u4E2A agent review\u3001\u8BA9\u4E0D\u540C agent \u8BA8\u8BBA/\u4F1A\u5546 \u2192 \u9009\u591A Agent \u7F16\u6392\u4E13\u804C agent\uFF08\u663E\u5F0F multi-agent \u4F18\u5148\uFF09
-- **\u62FF\u4E0D\u51C6\u65F6**\uFF1A\u7EAF\u95F2\u804A\u9009 flash\uFF1B**\u82E5\u6CBE\u8FB9\u672C\u5730\u4ED3\u5E93/\u5F53\u524D\u4EE3\u7801\u72B6\u6001\uFF0C\u9009 balanced/quality + needsWorkspace=true**\u3002
-
-\u540C\u65F6\u5224\u65AD\u672C\u8F6E\u662F\u5426\u9700\u8981\u6CE8\u5165\u300C\u5DE5\u4F5C\u533A\u53EA\u8BFB\u5DE5\u5177\u300D\uFF08listFiles/globFiles/searchFiles/readFile/execShell \u7B49\uFF09\uFF1A
-- needsWorkspace=true \u7684\u573A\u666F\uFF1A\u7528\u6237\u8981\u8BFB/\u6539/\u5206\u6790\u6587\u4EF6\u6216\u4EE3\u7801\u3001\u63D0\u5230\u4E86\u6587\u4EF6\u8DEF\u5F84/\u6269\u5C55\u540D\uFF08.md/.csv/.ts \u7B49\uFF09\u3001\u63D0\u5230\u5DE5\u4F5C\u533A/\u4EE3\u7801\u5E93/\u4ED3\u5E93/\u76EE\u5F55/git/\u5206\u652F\u3001\u8981\u770B\u5F53\u524D\u4EE3\u7801\u6216\u4ED3\u5E93\u72B6\u6001\u3001\u672C\u5730\u641C\u7D22/\u67E5\u770B\u4EE3\u7801\u3002
-- needsWorkspace=false \u7684\u573A\u666F\uFF1A\u901A\u7528\u77E5\u8BC6\u95EE\u7B54\uFF08\u5982\u300C\u5E7F\u4E1C\u7ECF\u6D4E\u6570\u636E\u300D\u300C\u5199\u4E00\u9996\u8BD7\u300D\uFF09\u3001\u7EAF\u95F2\u804A\u95EE\u5019\u3001\u7FFB\u8BD1\u3001\u4E0D\u6D89\u53CA\u672C\u5730\u6587\u4EF6/\u4ED3\u5E93\u3002
-- \u6F0F\u5224\uFF08\u7528\u6237\u8981\u6587\u4EF6\u800C\u6CA1\u5E26\u5DE5\u5177\uFF09\u6BD4\u8BEF\u5224\uFF08\u767D\u641C\u51E0\u8F6E\uFF09\u4EE3\u4EF7\u66F4\u9AD8\uFF0C\u5B81\u53EF\u504F\u5BBD\u5224 true\u3002
+- **\u62FF\u4E0D\u51C6\u65F6**\uFF1A\u7EAF\u95F2\u804A\u9009 flash\uFF1B**\u82E5\u6CBE\u8FB9\u672C\u5730\u4ED3\u5E93/\u5F53\u524D\u4EE3\u7801\u72B6\u6001\uFF0C\u9009 balanced/quality**\u3002
 
 \u5728\u7ED9\u51FA agentKey \u4E4B\u524D\uFF0C\u5148\u5728\u5FC3\u91CC\u533A\u5206\u5019\u9009\u6863\u4F4D\u7684\u8FB9\u754C\u518D\u7ED9\u7F6E\u4FE1\u5EA6\uFF1Abalanced \u4E0E quality \u7684\u8FB9\u754C\u5728\u4E8E\u590D\u6742\u5EA6/\u7BC7\u5E45/\u662F\u5426\u9700\u8981\u6DF1\u5EA6\u5206\u6790\uFF0C\u62FF\u4E0D\u51C6\u5C31\u7ED9\u4F4E confidence\u3002
 
@@ -219,7 +221,7 @@ ${agentList}
 - \u666E\u901A\u95EE\u7B54/\u7EAF\u95F2\u804A/\u5EFA\u5E94\u7528 \u2192 skills \u4E3A []
 
 \u53EA\u8F93\u51FA JSON\uFF0C\u4E0D\u8981\u8F93\u51FA\u5176\u4ED6\u5185\u5BB9\uFF1A
-{"confidence": <0\u52301\u4E4B\u95F4\u7684\u5C0F\u6570\uFF0C\u8868\u793A\u4F60\u5BF9\u8FD9\u4E2A\u5206\u7C7B\u5224\u65AD\u7684\u628A\u63E1\u7A0B\u5EA6>, "agentKey": "<\u4ECE\u5217\u8868\u4E2D\u9009\u62E9\u7684 agentKey>", "needsWorkspace": <true \u6216 false>, "skills": <\u5B57\u7B26\u4E32\u6570\u7EC4\uFF0C\u5143\u7D20\u53EA\u80FD\u662F ${[...VALID_QUICK_CHAT_SKILLS].map((s) => `"${s}"`).join(" | ")}\uFF0C\u672A\u547D\u4E2D\u7ED9 []>}`;
+{"confidence": <0\u52301\u4E4B\u95F4\u7684\u5C0F\u6570\uFF0C\u8868\u793A\u4F60\u5BF9\u8FD9\u4E2A\u5206\u7C7B\u5224\u65AD\u7684\u628A\u63E1\u7A0B\u5EA6>, "agentKey": "<\u4ECE\u5217\u8868\u4E2D\u9009\u62E9\u7684 agentKey>", "skills": <\u5B57\u7B26\u4E32\u6570\u7EC4\uFF0C\u5143\u7D20\u53EA\u80FD\u662F ${[...VALID_QUICK_CHAT_SKILLS].map((s) => `"${s}"`).join(" | ")}\uFF0C\u672A\u547D\u4E2D\u7ED9 []>}`;
 }
 function parseQuickChatIntentResult(content, tierAgents) {
   try {
@@ -228,8 +230,6 @@ function parseQuickChatIntentResult(content, tierAgents) {
     const key = parsed.agentKey;
     if (typeof key !== "string") return null;
     if (!tierAgents.some((t2) => t2.agentKey === key)) return null;
-    const rawNeedsWorkspace = parsed.needsWorkspace;
-    const needsWorkspace = rawNeedsWorkspace === true;
     const rawConfidence = parsed.confidence;
     const confidence = typeof rawConfidence === "number" && Number.isFinite(rawConfidence) && rawConfidence >= 0 && rawConfidence <= 1 ? rawConfidence : void 0;
     const rawSkills = parsed.skills;
@@ -240,7 +240,7 @@ function parseQuickChatIntentResult(content, tierAgents) {
       );
       if (filtered.length > 0) skills = filtered;
     }
-    return { agentKey: key, needsWorkspace, confidence, skills };
+    return { agentKey: key, confidence, skills };
   } catch {
     return null;
   }
@@ -352,7 +352,6 @@ async function classifyCliAutoRoute(text, options) {
       tier,
       classified: true,
       confidence: parsed.confidence,
-      needsWorkspace: parsed.needsWorkspace,
       skills: parsed.skills
     };
   } catch {
@@ -759,6 +758,19 @@ function wrapTranscriptLine(line, columns, hangingIndent = "") {
   }
   return result.length > 0 ? result : [""];
 }
+function buildWindowTitle(title) {
+  const plain = stripAnsi(title).replace(/[\x00-\x1f\x7f]+/g, " ");
+  let truncated = "";
+  let width = 0;
+  const maxCols = 80;
+  for (const char of plain) {
+    const charWidth = displayWidth(char);
+    if (width + charWidth > maxCols) break;
+    truncated += char;
+    width += charWidth;
+  }
+  return `\x1B]0;${truncated}\x07\x1B]2;${truncated}\x07`;
+}
 function wrapTextToLines(text, columns) {
   const result = [];
   for (const logicalLine of text.split("\n")) {
@@ -955,6 +967,17 @@ function supportsTruecolor(env = process.env) {
   const program = (env.TERM_PROGRAM ?? "").toLowerCase();
   return TRUECOLOR_TERM_PROGRAMS.has(program);
 }
+function detectSystemBrightnessFromEnv(env = process.env) {
+  const appleStyle = (env.AppleInterfaceStyle ?? "").trim().toLowerCase();
+  if (appleStyle === "dark") return "dark";
+  const colorScheme = (env.COLOR_SCHEME ?? env.COLORSCHEME ?? env.SYSTEM_COLOR_SCHEME ?? "").trim().toLowerCase();
+  if (/(?:^|[\s\-_:])dark(?:$|[\s\-_:])/i.test(colorScheme)) return "dark";
+  if (/(?:^|[\s\-_:])light(?:$|[\s\-_:])/i.test(colorScheme)) return "light";
+  const gtkTheme = (env.GTK_THEME ?? env.QT_STYLE_OVERRIDE ?? "").trim().toLowerCase();
+  if (/(?:^|[\s\-_:])dark(?:$|[\s\-_:])/i.test(gtkTheme)) return "dark";
+  if (/(?:^|[\s\-_:])light(?:$|[\s\-_:])/i.test(gtkTheme)) return "light";
+  return null;
+}
 function resolveTuiBrightness(env = process.env) {
   const explicit = (env.NOLO_TUI_THEME ?? "").trim().toLowerCase();
   if (explicit === "light") return "light";
@@ -967,6 +990,8 @@ function resolveTuiBrightness(env = process.env) {
     if (!Number.isNaN(bg) && bg >= 0 && bg <= 6) return "dark";
     if (!Number.isNaN(bg) && bg >= 7 && bg <= 15) return "light";
   }
+  const sys = detectSystemBrightnessFromEnv(env);
+  if (sys) return sys;
   return "dark";
 }
 function hexToSgr(hex) {
@@ -997,7 +1022,8 @@ function setActiveTerminalBaseHex(hex) {
 }
 function applyDetectedBackground(detected) {
   const normalizedHex = detected.hex.replace(/^#/, "").toUpperCase();
-  const changed = detected.brightness !== activeBrightness || normalizedHex !== activeTerminalBaseHex;
+  const hexChanged = normalizedHex !== "" && normalizedHex !== activeTerminalBaseHex;
+  const changed = detected.brightness !== activeBrightness || hexChanged;
   setActiveBrightness(detected.brightness);
   setActiveTerminalBaseHex(detected.hex);
   return changed;
@@ -1606,161 +1632,8 @@ 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 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;
-    }
-  };
+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/formatReadPathTree.ts
@@ -2278,18 +2151,8 @@ function isFailedToolResult(event) {
 function isNeedsActionToolResult(event) {
   return Boolean(event.metadata?.actionGate);
 }
-function readRunLogLines(parsed) {
-  if (Array.isArray(parsed.logLines)) return parsed.logLines;
-  if (typeof parsed.logTail === "string" && parsed.logTail.trim()) {
-    return parsed.logTail.split("\n");
-  }
-  return void 0;
-}
-function readRunErrorMessage(parsed) {
-  return typeof parsed.errorMessage === "string" ? parsed.errorMessage : void 0;
-}
 function parseUiAskChoiceForCli(event) {
-  if (event.toolName !== "ui_ask_choice" && !event.metadata?.uiAskChoice) {
+  if (event.toolName !== "ask_user" && !event.metadata?.uiAskChoice) {
     return null;
   }
   const parsed = parseUiAskChoiceContent(event.content);
@@ -2390,70 +2253,84 @@ function formatToolTraceLine(text, colorEnabled, accent = "none") {
   return `${dimCliText(text, true)}
 `;
 }
-function recoverOrchestrationDisplayFromContent(toolName, content) {
+function renderRunCard(snapshot, opts) {
+  const labels = agentRunCardLabels();
+  const timing = { startedAt: snapshot.startedAt, finishedAt: snapshot.finishedAt };
+  const name = snapshot.agentName ?? "agent";
+  if (isAgentRunTerminalStatus(snapshot.status)) {
+    return formatFinishedRunCard(name, snapshot.status, {
+      runId: snapshot.runId,
+      toolCallCount: snapshot.toolCallCount,
+      lastToolNames: snapshot.lastToolNames,
+      lastAssistantText: snapshot.lastAssistantText,
+      errorMessage: snapshot.errorMessage,
+      logLines: snapshot.logLines,
+      timing,
+      ...opts?.includeLogTail !== void 0 ? { includeLogTail: opts.includeLogTail } : {},
+      labels
+    });
+  }
+  return formatStatusRunCard(name, snapshot.status, {
+    runId: snapshot.runId,
+    toolCallCount: snapshot.toolCallCount,
+    lastToolNames: snapshot.lastToolNames,
+    lastAssistantText: snapshot.lastAssistantText,
+    errorMessage: snapshot.errorMessage,
+    logLines: snapshot.logLines,
+    timing,
+    ...opts?.includeLogTail !== void 0 ? { includeLogTail: opts.includeLogTail } : {},
+    labels
+  });
+}
+function recoverOrchestrationCard(event, toolName) {
+  const content = typeof event.content === "string" ? event.content : "";
   const trimmed = content.trim();
-  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return content;
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return null;
   const labels = agentRunCardLabels();
-  try {
-    const parsed = JSON.parse(trimmed);
-    if (toolName === "listAgents") {
+  if (toolName === "listAgents") {
+    try {
+      const parsed = JSON.parse(trimmed);
       const agents = Array.isArray(parsed.agents) ? parsed.agents : [];
       return formatAgentListCard(agents);
+    } catch {
+      return null;
     }
-    if (toolName === "startAgentRun") {
-      const name = resolveRunLabel(parsed);
-      const status = typeof parsed.status === "string" ? parsed.status : "running";
-      return formatStartRunCard(name, status, labels);
-    }
-    if (toolName === "controlAgentRun") {
+  }
+  if (toolName === "controlAgentRun") {
+    try {
+      const parsed = JSON.parse(trimmed);
       if (Array.isArray(parsed.runs)) {
-        const runs = parsed.runs;
-        return formatListRunsCard(runs, labels);
-      }
-      const status = typeof parsed.status === "string" ? parsed.status : void 0;
-      if (parsed.found === false || status === "not_found") {
-        return formatNotFoundRunCard(labels);
-      }
-      if (status === "killed" || status === "cancelled" || status === "cancelling") {
-        return formatStopRunCard(status, labels);
+        return formatListRunsCard(
+          parsed.runs,
+          labels
+        );
       }
-      return formatStatusRunCard(resolveRunLabel(parsed), status ?? "\u2014", {
-        errorMessage: readRunErrorMessage(parsed),
-        logLines: readRunLogLines(parsed),
-        labels
-      });
+    } catch {
+      return null;
     }
-  } catch {
   }
-  return content;
+  const parsedEvent = parseAgentRunEvent(event);
+  if (!parsedEvent) return null;
+  const { kind, snapshot } = parsedEvent;
+  if (kind === "start") {
+    return formatStartRunCard(snapshot.agentName ?? "agent", snapshot.status, {
+      task: snapshot.taskPreview,
+      runId: snapshot.runId,
+      labels
+    });
+  }
+  if (kind === "gone") return formatNotFoundRunCard(labels);
+  if (kind === "stop") return formatStopRunCard(snapshot.status, labels);
+  return renderRunCard(snapshot);
 }
 function parseControlAgentRunStatusEvent(event) {
-  const raw = typeof event.content === "string" && event.content.trim() ? event.content.trim() : "";
-  if (!raw.startsWith("{")) return null;
-  try {
-    const parsed = JSON.parse(raw);
-    if (Array.isArray(parsed.runs)) return null;
-    const status = typeof parsed.status === "string" ? parsed.status : void 0;
-    if (parsed.found === false || status === "not_found") return null;
-    if (status === "killed" || status === "cancelled" || status === "cancelling") return null;
-    if (!status) return null;
-    const runId = typeof parsed.runId === "string" && parsed.runId.trim() ? parsed.runId.trim() : typeof event.metadata?.runId === "string" ? event.metadata.runId : "";
-    if (!runId) return null;
-    const agentName = resolveRunLabel(parsed);
-    const errorMessage = readRunErrorMessage(parsed);
-    const logLines = readRunLogLines(parsed);
-    const logKey = logLines && logLines.length > 0 ? logLines.join("\n") : "";
-    return { runId, status, agentName, errorMessage, logLines, logKey };
-  } catch {
-    return null;
-  }
+  const parsed = parseAgentRunEvent(event);
+  return parsed?.kind === "status" ? parsed.snapshot : null;
 }
 function formatOrchestrationCardBlock(event, toolName, colorEnabled) {
   const rawLabel = toolLabel(toolName);
-  let rawDataStr = typeof event.metadata?.displayData === "string" && event.metadata.displayData.trim() ? event.metadata.displayData : typeof event.content === "string" ? event.content : "";
-  if (typeof event.metadata?.displayData !== "string" && typeof event.content === "string" && event.content.trim()) {
-    rawDataStr = recoverOrchestrationDisplayFromContent(toolName, event.content);
-  }
+  const bakedCard = typeof event.metadata?.displayData === "string" && event.metadata.displayData.trim() ? event.metadata.displayData : "";
+  const rawDataStr = recoverOrchestrationCard(event, toolName) || bakedCard || (typeof event.content === "string" ? event.content : "");
   const failed = event.type === "tool-error" || isFailedToolResult(event) || Boolean(event.metadata?.failed) || /^Error:/i.test(rawDataStr.trim());
   if (failed) {
     const firstLine = rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed");
@@ -2489,16 +2366,22 @@ function formatOrchestrationCardBlock(event, toolName, colorEnabled) {
   }
   return out;
 }
+function mergeRunSnapshot(previous, next) {
+  return {
+    ...previous,
+    ...next,
+    errorMessage: next.errorMessage ?? previous.errorMessage,
+    logLines: next.logLines ?? previous.logLines,
+    logKey: next.logKey || previous.logKey,
+    toolCallCount: next.toolCallCount ?? previous.toolCallCount,
+    lastToolNames: next.lastToolNames ?? previous.lastToolNames,
+    lastAssistantText: next.lastAssistantText ?? previous.lastAssistantText,
+    startedAt: next.startedAt ?? previous.startedAt,
+    finishedAt: next.finishedAt ?? previous.finishedAt
+  };
+}
 function formatFoldedControlStatusCard(snapshot, colorEnabled) {
-  const labels = agentRunCardLabels();
-  const body = formatStatusRunCard(snapshot.agentName, snapshot.status, {
-    errorMessage: snapshot.errorMessage,
-    logLines: snapshot.logLines,
-    pollCount: snapshot.pollCount,
-    elapsedMs: snapshot.elapsedMs,
-    includeLogTail: snapshot.includeLogTail,
-    labels
-  });
+  const body = renderRunCard(snapshot, { includeLogTail: snapshot.includeLogTail });
   return formatOrchestrationCardBlock(
     {
       type: "tool-result",
@@ -2506,8 +2389,7 @@ function formatFoldedControlStatusCard(snapshot, colorEnabled) {
       toolCallId: `fold-${snapshot.runId}`,
       toolName: "controlAgentRun",
       content: "",
-      metadata: { displayData: body },
-      elapsedMs: snapshot.elapsedMs
+      metadata: { displayData: body }
     },
     "controlAgentRun",
     colorEnabled
@@ -2528,7 +2410,7 @@ function formatVerboseToolEvent(event, colorEnabled) {
     );
   }
   const elapsed = typeof event.elapsedMs === "number" ? ` ${event.elapsedMs}ms` : "";
-  if (event.type === "tool-result" && (event.toolName === "ui_ask_choice" || event.metadata?.uiAskChoice)) {
+  if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
     const block = formatUiAskChoiceBlock(event, colorEnabled);
     if (block) return `${formatToolTraceLine(`[nolo:tool] #${round} <- ${event.toolName}${elapsed}`, colorEnabled)}${block}`;
   }
@@ -2741,7 +2623,7 @@ function formatCompactToolLine(event, pending, colorEnabled) {
   if (event.type === "tool-result" && (toolName === "listAgents" || toolName === "startAgentRun" || toolName === "controlAgentRun")) {
     return formatOrchestrationCardBlock(event, toolName, colorEnabled);
   }
-  if (event.type === "tool-result" && (event.toolName === "ui_ask_choice" || event.metadata?.uiAskChoice)) {
+  if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
     const block = formatUiAskChoiceBlock(event, colorEnabled);
     if (block) return block;
   }
@@ -2783,31 +2665,31 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
   let webSearchBuffer = [];
   let statusFold = null;
   const lastEmittedLogByRunId = /* @__PURE__ */ new Map();
+  const lastPrintedCardByRunId = /* @__PURE__ */ new Map();
+  const cardSubstance = (snapshot) => JSON.stringify([
+    snapshot.status,
+    snapshot.toolCallCount ?? -1,
+    snapshot.lastToolNames ?? [],
+    snapshot.lastAssistantText ?? "",
+    snapshot.errorMessage ?? "",
+    snapshot.logKey
+  ]);
   const flushStatusFold = () => {
     if (!statusFold) return "";
     const fold = statusFold;
     statusFold = null;
+    const substance = cardSubstance(fold);
+    if (lastPrintedCardByRunId.get(fold.runId) === substance) return "";
+    lastPrintedCardByRunId.set(fold.runId, substance);
     const prevLog = lastEmittedLogByRunId.get(fold.runId);
-    const includeLogTail = Boolean(fold.logKey) && fold.logKey !== prevLog;
-    if (fold.logKey) {
+    const changed = Boolean(fold.logKey) && fold.logKey !== prevLog;
+    if (changed && runShowsLogTail(fold.status)) {
       lastEmittedLogByRunId.set(fold.runId, fold.logKey);
     }
-    return formatFoldedControlStatusCard(
-      {
-        runId: fold.runId,
-        status: fold.status,
-        agentName: fold.agentName,
-        errorMessage: fold.errorMessage,
-        logLines: fold.logLines,
-        pollCount: fold.pollCount,
-        elapsedMs: fold.elapsedMs,
-        includeLogTail
-      },
-      colorEnabled
-    );
+    return formatFoldedControlStatusCard({ ...fold, includeLogTail: changed }, colorEnabled);
   };
-  const flushBuffers = () => {
-    let out = flushStatusFold();
+  const flushToolBuffers = () => {
+    let out = "";
     if (readBuffer.length > 0) {
       const items = readBuffer.map((evt) => {
         const call = pending.get(evt.toolCallId);
@@ -2863,6 +2745,12 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
     }
     return out;
   };
+  const flushBuffers = () => `${flushStatusFold()}${flushToolBuffers()}`;
+  const bufferToolResult = (buffer, event) => {
+    const flushed = flushStatusFold();
+    buffer.push(event);
+    return flushed;
+  };
   const formatter = (event) => {
     if (mode === "hide") return "";
     if (mode === "verbose") return formatVerboseToolEvent(event, colorEnabled);
@@ -2877,28 +2765,13 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
       if (event.type === "tool-result") {
         const snapshot = parseControlAgentRunStatusEvent(event);
         if (snapshot) {
-          let out = "";
-          if (statusFold && statusFold.runId !== snapshot.runId) {
+          let out = flushToolBuffers();
+          const open = statusFold;
+          const sameRun = open?.runId === snapshot.runId;
+          if (open && (!sameRun || open.status !== snapshot.status)) {
             out += flushStatusFold();
           }
-          if (!statusFold) {
-            statusFold = {
-              ...snapshot,
-              pollCount: 1,
-              elapsedMs: event.elapsedMs
-            };
-          } else {
-            statusFold = {
-              runId: snapshot.runId,
-              status: snapshot.status,
-              agentName: snapshot.agentName,
-              errorMessage: snapshot.errorMessage ?? statusFold.errorMessage,
-              logLines: snapshot.logLines ?? statusFold.logLines,
-              logKey: snapshot.logKey || statusFold.logKey,
-              pollCount: statusFold.pollCount + 1,
-              elapsedMs: event.elapsedMs
-            };
-          }
+          statusFold = open && sameRun ? mergeRunSnapshot(open, snapshot) : snapshot;
           pending.delete(event.toolCallId);
           if (isAgentRunTerminalStatus(snapshot.status)) {
             out += flushBuffers();
@@ -2920,8 +2793,7 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
         return "";
       }
       if (event.type === "tool-result") {
-        readBuffer.push(event);
-        return "";
+        return bufferToolResult(readBuffer, event);
       }
     }
     if (isSearchToolName(event.toolName)) {
@@ -2933,8 +2805,7 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
         return "";
       }
       if (event.type === "tool-result") {
-        searchBuffer.push(event);
-        return "";
+        return bufferToolResult(searchBuffer, event);
       }
     }
     if (isRunToolName(event.toolName)) {
@@ -2952,8 +2823,7 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
         return "";
       }
       if (event.type === "tool-result") {
-        runBuffer.push(event);
-        return "";
+        return bufferToolResult(runBuffer, event);
       }
     }
     if (isFetchToolName(event.toolName)) {
@@ -2965,8 +2835,7 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
         return "";
       }
       if (event.type === "tool-result") {
-        fetchBuffer.push(event);
-        return "";
+        return bufferToolResult(fetchBuffer, event);
       }
     }
     if (isWebSearchToolName(event.toolName)) {
@@ -2978,8 +2847,7 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
         return "";
       }
       if (event.type === "tool-result") {
-        webSearchBuffer.push(event);
-        return "";
+        return bufferToolResult(webSearchBuffer, event);
       }
     }
     const flushed = flushBuffers();
@@ -3038,6 +2906,12 @@ function createSseToolEventAdapter(onEvent) {
         type: "tool-result",
         toolCallId,
         toolName,
+        // The full payload, not just the clipped summary. Consumers that parse
+        // structured results — the agent-run snapshot parser feeding the dock
+        // panel, the orchestration card renderer, ask_user — all read
+        // `content`; dropping it here made every one of them silently inert on
+        // the HTTP/SSE path while working on the local path.
+        ...rawContent ? { content: rawContent } : {},
         summary,
         metadata: payload.metadata,
         round
@@ -3061,6 +2935,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;
@@ -3074,6 +2953,7 @@ var Spinner = class {
   frameIndex = 0;
   frames = ["\xB7", "~", "\u2248", "\u223F", "\u2248", "~"];
   isTTY;
+  thinkingHint = "";
   start() {
     if (this.silent) {
       this.startTime = Date.now();
@@ -3109,9 +2989,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();
@@ -3127,20 +3009,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) {
@@ -3173,12 +3065,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) {
@@ -3188,17 +3087,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);
@@ -3207,7 +3097,6 @@ ${options.agentName} > `);
       return;
     }
     if (event.type === "tool-call") {
-      thinkingFilter.flush();
       renderWriter.flush();
     }
     spinner.stop();
@@ -3224,16 +3113,15 @@ ${options.agentName} > `);
       spinner.show(activeLabel);
       options.activityReporter?.(activeLabel);
     }
-    if (event.type === "tool-result" && options.onAgentRunStatus && event.toolName === "startAgentRun") {
-      const snapshot = extractAgentRunStatusSnapshot(event);
-      if (snapshot) {
-        options.onAgentRunStatus(snapshot);
+    if (options.onAgentRunStatus) {
+      const parsed = parseAgentRunEvent(event);
+      if (parsed) {
+        options.onAgentRunStatus(parsed.snapshot);
       }
     }
   };
   return {
     spinner,
-    thinkingMode,
     toolDisplayMode,
     traceLocalTools,
     eventMode,
@@ -3244,10 +3132,10 @@ ${options.agentName} > `);
           options.output.write(pendingToolOutput);
         }
       }
-      thinkingFilter.push(chunk);
+      writeVisibleAssistantChunk(chunk);
     },
     pushThinking(chunk) {
-      thinkingSink.push(chunk);
+      spinner.setThinkingHint(chunk);
     },
     handleToolEvent,
     showWorking(label) {
@@ -3258,19 +3146,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}
@@ -3284,35 +3175,6 @@ ${options.agentName} > (no text response)
     }
   };
 }
-function extractAgentRunStatusSnapshot(event) {
-  if (event.type !== "tool-result") return null;
-  const content = typeof event.content === "string" ? event.content.trim() : "";
-  if (!content.startsWith("{")) return null;
-  try {
-    const parsed = JSON.parse(content);
-    const runId = typeof parsed.runId === "string" ? parsed.runId : "";
-    const status = typeof parsed.status === "string" ? parsed.status : "running";
-    const label = resolveRunLabel({
-      agentName: parsed.agentName,
-      name: parsed.name,
-      agentKey: parsed.agentKey
-    });
-    const agentName = isAgentNameFallback(label) ? void 0 : label;
-    const logTail = typeof parsed.logTail === "string" ? parsed.logTail : void 0;
-    const logLines = Array.isArray(parsed.logLines) ? parsed.logLines : void 0;
-    const errorMessage = typeof parsed.errorMessage === "string" ? parsed.errorMessage : void 0;
-    return {
-      runId,
-      agentName,
-      status,
-      logTail,
-      logLines,
-      errorMessage
-    };
-  } catch {
-    return null;
-  }
-}
 
 // packages/cli/client/agentRunStream.ts
 async function readStreamingAgentRun(options, res, existingSpinner) {
@@ -3695,7 +3557,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QNPNJRVH.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-7WYWCGL4.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -3722,7 +3584,8 @@ function buildDefaultLocalRuntimeAdapter(options) {
     output: options.output,
     ...options.confirmDestructiveAction ? { confirmDestructiveAction: options.confirmDestructiveAction } : {},
     ...options.requestUserChoice ? { requestUserChoice: options.requestUserChoice } : {},
-    ...options.pastedTextStore?.items.size ? { pastedTextStore: options.pastedTextStore } : {}
+    ...options.pastedTextStore?.items.size ? { pastedTextStore: options.pastedTextStore } : {},
+    ...options.activityReporter ? { activityReporter: options.activityReporter } : {}
   });
 }
 function resolveLocalRuntimeAdapter(options) {
@@ -3961,6 +3824,7 @@ async function runHttpAgentTurn(options, authToken) {
       runtime: "bun",
       entrypoint: "nolo-cli",
       capabilities: ["text-io", "streaming", "slash-commands"],
+      ...options.dialogAgentMode ? { dialogAgentMode: options.dialogAgentMode } : {},
       ...subjectRefs ? { subjectRefs } : {},
       ...allowedChildAgentKeys?.length ? { allowedChildAgentKeys } : {},
       ...blockedToolNames?.length ? { blockedToolNames } : {},
@@ -4063,8 +3927,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(`
@@ -4123,8 +3986,9 @@ async function runLocalAgentTurnForCli(options, settings) {
   const blockedToolNames = options.blockedToolNames?.filter(
     (name) => name.trim()
   );
-  const runtimeContext = subjectRefs || allowedChildAgentKeys?.length || allowedToolNames?.length || blockedToolNames?.length || options.parentWakeOnTerminal ? {
+  const runtimeContext = subjectRefs || allowedChildAgentKeys?.length || allowedToolNames?.length || blockedToolNames?.length || options.parentWakeOnTerminal || options.dialogAgentMode ? {
     ...subjectRefs ? { subjectRefs } : {},
+    ...options.dialogAgentMode ? { dialogAgentMode: options.dialogAgentMode } : {},
     ...allowedChildAgentKeys?.length ? { allowedChildAgentKeys } : {},
     ...allowedToolNames?.length ? { allowedToolNames } : {},
     ...blockedToolNames?.length ? { blockedToolNames } : {},
@@ -4133,7 +3997,7 @@ async function runLocalAgentTurnForCli(options, settings) {
   } : void 0;
   const currentDialogId = options.continueDialogId ?? ulid();
   const runChildTurn = async (input) => {
-    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QNPNJRVH.js");
+    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-7WYWCGL4.js");
     return runLocalAgentTurn(input);
   };
   const createFreshChildBaseAdapter = () => {
@@ -4905,6 +4769,7 @@ var resolveMemoryRuntime = async (input) => {
       userId: input.userId,
       spaceId: input.spaceId,
       agentKey: input.agentKey,
+      memorySubjectId: input.memorySubjectId,
       policy
     }),
     kinds: ["episodic", "semantic", "procedural"],
@@ -5409,31 +5274,6 @@ ${mdContent}`);
   }
   return result.exitCode;
 }
-var QUOTA_ERROR_PATTERNS = [
-  /429/,
-  /quota/i,
-  /rate\s*limit/i,
-  /too\s*many\s*requests/i,
-  /额度/,
-  /上限/,
-  /用尽/,
-  /CliProviderQuotaError/i
-];
-function isQuotaExhaustedError(error) {
-  if (!error) return false;
-  if (error instanceof CliProviderQuotaError) return true;
-  if (error instanceof Error) {
-    return QUOTA_ERROR_PATTERNS.some((pattern) => pattern.test(error.message));
-  }
-  if (typeof error === "string") {
-    return QUOTA_ERROR_PATTERNS.some((pattern) => pattern.test(error));
-  }
-  const maybeStatus = error.status;
-  if (typeof maybeStatus === "number" && maybeStatus === 429) return true;
-  const maybeStatusCode = error.statusCode;
-  if (typeof maybeStatusCode === "number" && maybeStatusCode === 429) return true;
-  return false;
-}
 var BALANCE_ERROR_PATTERNS = [
   /UPSTREAM_402/i,
   /Insufficient Balance/i,
@@ -5468,6 +5308,7 @@ export {
   takeDisplayWidth,
   padOrTruncateToWidth,
   wrapTranscriptLine,
+  buildWindowTitle,
   wrapTextToLines,
   THEME_PALETTES,
   getActiveThemeName,
@@ -5476,6 +5317,7 @@ export {
   setActiveBrightness,
   getActiveDensity,
   setActiveDensity,
+  detectSystemBrightnessFromEnv,
   resolveTuiBrightness,
   setActiveTerminalBaseHex,
   applyDetectedBackground,
@@ -5483,7 +5325,6 @@ export {
   themeColorSequence,
   themeText,
   formatAssistantDisplay,
-  normalizeThinkingDisplayMode,
   normalizeToolDisplayMode,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,
@@ -5503,6 +5344,5 @@ export {
   normalizeCliImageInput,
   inspectLocalRunWorkspace,
   runAgentRunCommand,
-  isQuotaExhaustedError,
   isBalanceExhaustedError
 };