nolo-cli 0.49.0-alpha.1 → 0.51.0-alpha.1

package/{agentEmailCommands-C33KPOFP.js → agentEmailCommands-FHBQ5QPA.js}

@@ -8,8 +8,8 @@ import {
 } from "./chunk-LYGNQHUW.js";
 import {
   runAgentCreateCommand
-} from "./chunk-QAG4ZQZ7.js";
-import "./chunk-33BBDA67.js";
+} from "./chunk-IPIJNOJJ.js";
+import "./chunk-BYFBW5FZ.js";
 import "./chunk-3YVCM5PE.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";

package/{agentMachineCommands-ICOLSVID.js → agentMachineCommands-LJ36TKS6.js}

@@ -84,7 +84,7 @@ async function defaultExecuteCli(provider, prompt, options) {
   return executeCli(provider, prompt, options);
 }
 async function forwardConnectorRunMessage(machine, message, pushMessage, executeCli, env, fetchImpl) {
-  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-KWWJ4HTI.js");
+  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-UB2KMAXY.js");
   return handleConnectorRunMessage(message, pushMessage, executeCli, env, fetchImpl);
 }
 async function detectLaunchableMachineInfo() {

package/{agentRecordCommands-OWKWVY3Y.js → agentRecordCommands-J4ENRTN4.js}

@@ -2,8 +2,8 @@ import {
   runAgentCreateCommand,
   runAgentReadCommand,
   runAgentUpdateCommand
-} from "./chunk-QAG4ZQZ7.js";
-import "./chunk-33BBDA67.js";
+} from "./chunk-IPIJNOJJ.js";
+import "./chunk-BYFBW5FZ.js";
 import "./chunk-3YVCM5PE.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";

package/{agentRunCommand-FINKBYUN.js → agentRunCommand-LK7BER3O.js}

@@ -5,12 +5,12 @@ import {
   prependSubjectDialogMarker,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-VZGLZTG7.js";
+} from "./chunk-RENO4QJU.js";
 import "./chunk-J3UALFHL.js";
 import {
   parseAgentRunArgs
 } from "./chunk-LYGNQHUW.js";
-import "./chunk-33BBDA67.js";
+import "./chunk-BYFBW5FZ.js";
 import "./chunk-3YVCM5PE.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";

package/{chunk-33BBDA67.js → chunk-BYFBW5FZ.js}

@@ -472,8 +472,8 @@ var STRINGS = {
     zh: "[nolo] \u5F53\u524D agent \u4F3C\u4E4E\u989D\u5EA6/\u901F\u7387\u53D7\u9650\uFF08429\uFF09\u3002\n\u53EF\u4EE5\u7528 /agent \u5207\u6362\u5230\u5176\u4ED6 agent \u540E\u7EE7\u7EED\uFF0C\u540C\u4E00\u5BF9\u8BDD\u4F1A\u4FDD\u7559\u4E0A\u4E0B\u6587\u3002"
   },
   balanceExhaustedHint: {
-    en: '[nolo] Insufficient balance. Your message is saved in this dialog \u2014 top up, then send again or say "continue".',
-    zh: "[nolo] \u4F59\u989D\u4E0D\u8DB3\u3002\u4F60\u521A\u53D1\u7684\u8BDD\u5DF2\u4FDD\u5B58\u5728\u5F53\u524D\u5BF9\u8BDD\u91CC\u2014\u2014\u5145\u503C\u540E\u76F4\u63A5\u518D\u8BF4\u4E00\u53E5\u6216\u8BF4\u300C\u7EE7\u7EED\u300D\u5373\u53EF\uFF0C\u4E0D\u4F1A\u4E22\u4E0A\u4E0B\u6587\u3002"
+    en: '[nolo] Your message is saved in this dialog \u2014 top up, then send again or say "continue" to pick up where you left off.',
+    zh: "[nolo] \u4F60\u521A\u53D1\u7684\u8BDD\u5DF2\u4FDD\u5B58\u5728\u5F53\u524D\u5BF9\u8BDD\u91CC\u2014\u2014\u5145\u503C\u540E\u76F4\u63A5\u518D\u8BF4\u4E00\u53E5\u6216\u8BF4\u300C\u7EE7\u7EED\u300D\u5373\u53EF\u63A5\u7740\u804A\uFF0C\u4E0D\u4F1A\u4E22\u4E0A\u4E0B\u6587\u3002"
   },
   dialogPreservedHint: {
     en: '[nolo] This turn failed, but the dialog is kept. Send another message (or say "continue") to keep going in the same conversation.',
@@ -912,10 +912,10 @@ var STRINGS = {
   runtimeUsage: { en: "Usage: /runtime <auto|local|server>", zh: "\u7528\u6CD5\uFF1A/runtime <auto|local|server>" },
   runtimeSet: { en: "Runtime: {0}", zh: "\u8FD0\u884C\u6A21\u5F0F\uFF1A{0}" },
   toolsCurrent: {
-    en: "Tool display: {0} (hide | compact | verbose)",
-    zh: "\u5DE5\u5177\u663E\u793A\uFF1A{0}\uFF08hide | compact | verbose\uFF09"
+    en: "Tool display: {0} (normal | pro | hide | verbose)",
+    zh: "\u5DE5\u5177\u663E\u793A\uFF1A{0}\uFF08\u666E\u901A normal | \u4E13\u4E1A pro | hide | verbose\uFF09"
   },
-  toolsUsage: { en: "Usage: /tools <hide|compact|verbose>", zh: "\u7528\u6CD5\uFF1A/tools <hide|compact|verbose>" },
+  toolsUsage: { en: "Usage: /tools <normal|pro|hide|verbose>", zh: "\u7528\u6CD5\uFF1A/tools <normal|pro|hide|verbose>" },
   toolsSet: { en: "Tool display: {0}", zh: "\u5DE5\u5177\u663E\u793A\uFF1A{0}" },
   thinkingCurrent: {
     en: "Thinking display: {0} (show | hide)",

package/{chunk-QAG4ZQZ7.js → chunk-IPIJNOJJ.js}

@@ -1,6 +1,6 @@
 import {
   clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-33BBDA67.js";
+} from "./chunk-BYFBW5FZ.js";
 import {
   getReadableCliDb
 } from "./chunk-43CXXVJD.js";

package/{chunk-VZGLZTG7.js → chunk-RENO4QJU.js}

@@ -19,7 +19,7 @@ import {
   parseAgentRunEvent,
   t,
   toolLabel
-} from "./chunk-33BBDA67.js";
+} from "./chunk-BYFBW5FZ.js";
 import {
   getReadableCliDb
 } from "./chunk-43CXXVJD.js";
@@ -3717,7 +3717,7 @@ function tokenize(value, options) {
 }
 
 // packages/cli/client/toolOutput.ts
-function normalizeToolDisplayMode(raw, fallback = "compact") {
+function normalizeToolDisplayMode(raw, fallback = "normal") {
   const normalized = asTrimmedLowercaseString(raw);
   if (normalized === "hide" || normalized === "off" || normalized === "false" || normalized === "0") {
     return "hide";
@@ -3725,8 +3725,11 @@ function normalizeToolDisplayMode(raw, fallback = "compact") {
   if (normalized === "verbose" || normalized === "debug" || normalized === "trace" || normalized === "full") {
     return "verbose";
   }
-  if (normalized === "compact" || normalized === "minimal" || normalized === "short") {
-    return "compact";
+  if (normalized === "normal" || normalized === "summary" || normalized === "on") {
+    return "normal";
+  }
+  if (normalized === "pro" || normalized === "compact" || normalized === "minimal" || normalized === "short") {
+    return "pro";
   }
   return fallback;
 }
@@ -3738,7 +3741,7 @@ function resolveToolDisplayMode(env = process.env) {
   if (legacyTrace === "verbose" || legacyTrace === "full") {
     return "verbose";
   }
-  return normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "compact");
+  return normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "normal");
 }
 function shouldEmitToolEvents(mode) {
   return mode !== "hide";
@@ -3752,6 +3755,9 @@ function formatActiveToolLabel(event) {
   const label = toolLabel(toolName);
   return args ? `${label} ${args}` : label;
 }
+function formatConservativeActiveToolLabel(event) {
+  return toolLabel(event.toolName || "tool");
+}
 function compactResultHint(event) {
   const gate = readActionGate(event.metadata?.actionGate);
   if (gate) {
@@ -4160,6 +4166,36 @@ function formatVerboseToolEvent(event, colorEnabled) {
     colorEnabled
   );
 }
+function formatNormalToolLine(event, pending, colorEnabled) {
+  if (event.type === "tool-call") return "";
+  const toolName = event.toolName || pending?.toolName || "tool";
+  const todoBlock = formatTodoListForCli(event, colorEnabled);
+  if (todoBlock) return todoBlock;
+  if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
+    const block = formatUiAskChoiceBlock(event, colorEnabled);
+    if (block) return block;
+  }
+  if (event.type === "tool-result" && (toolName === "listAgents" || toolName === "startAgentRun" || toolName === "controlAgentRun")) {
+    return formatOrchestrationCardBlock(event, toolName, colorEnabled);
+  }
+  if (event.type === "tool-result" && toolName === "loadSkill") {
+    return formatLoadSkillBlock(event, colorEnabled) ?? "";
+  }
+  const label = toolLabel(toolName);
+  if (readActionGate(event.metadata?.actionGate)) {
+    return formatToolTraceLine(`\u25B8 ${label}  ! ${t("toolNeedsAction")}`, colorEnabled, "error");
+  }
+  if (event.type === "tool-error") {
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${t("toolFailed")}`, colorEnabled, "error");
+  }
+  if (event.metadata?.timedOut) {
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${t("toolTimedOut")}`, colorEnabled, "error");
+  }
+  if (isFailedToolResult(event)) {
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${t("toolFailed")}`, colorEnabled, "error");
+  }
+  return formatToolTraceLine(`\u25B8 ${label}  \u2713`, colorEnabled);
+}
 function isReadToolName(name) {
   if (!name) return false;
   return name === "read" || name === "readFile" || name === "read_file" || name === "readWorkspaceFile";
@@ -4346,6 +4382,26 @@ function formatTodoListForCli(event, colorEnabled) {
   const text = [`\u2611 Todo (${todos.length})`, ...lines].join("\n") + "\n";
   return colorEnabled ? themeText(text, "chrome") : text;
 }
+function formatLoadSkillBlock(event, colorEnabled) {
+  if (event.type !== "tool-result" || event.toolName !== "loadSkill") return null;
+  const skillName = resolveLoadSkillName(event);
+  const content = typeof event.content === "string" ? event.content : "";
+  const failed = /^Skill\s+"[^"]*"\s+not found/.test(content) || isFailedToolResult(event);
+  const labelText = t("usedSkillLabel");
+  if (failed) {
+    const message = clip(content.split("\n")[0] || t("toolFailed"), 96);
+    return formatToolTraceLine(`\u25B8 ${labelText} (${skillName})  \u2717 ${message}`, colorEnabled, "error");
+  }
+  if (!colorEnabled) {
+    return `\u2726 ${labelText}: ${skillName}
+`;
+  }
+  const star = themeText("\u2726", "success", true);
+  const labelPart = themeText(labelText, "muted", true);
+  const namePart = themeText(skillName, "chrome", true);
+  return `${star} ${labelPart}: ${namePart}
+`;
+}
 function formatCompactToolLine(event, pending, colorEnabled) {
   const toolName = event.toolName || pending?.toolName || "tool";
   const todoBlock = formatTodoListForCli(event, colorEnabled);
@@ -4376,25 +4432,8 @@ function formatCompactToolLine(event, pending, colorEnabled) {
     const message = clip(event.message ?? t("toolFailed"), 96);
     return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${message}`, colorEnabled, "error");
   }
-  if (event.type === "tool-result" && toolName === "loadSkill") {
-    const skillName = resolveLoadSkillName(event);
-    const content = typeof event.content === "string" ? event.content : "";
-    const failed2 = /^Skill\s+"[^"]*"\s+not found/.test(content) || isFailedToolResult(event);
-    const labelText = t("usedSkillLabel");
-    if (failed2) {
-      const message = clip(content.split("\n")[0] || t("toolFailed"), 96);
-      return formatToolTraceLine(`\u25B8 ${labelText} (${skillName})  \u2717 ${message}`, colorEnabled, "error");
-    }
-    if (!colorEnabled) {
-      return `\u2726 ${labelText}: ${skillName}
-`;
-    }
-    const star = themeText("\u2726", "success", true);
-    const labelPart = themeText(labelText, "muted", true);
-    const namePart = themeText(skillName, "chrome", true);
-    return `${star} ${labelPart}: ${namePart}
-`;
-  }
+  const loadSkillBlock = formatLoadSkillBlock(event, colorEnabled);
+  if (loadSkillBlock) return loadSkillBlock;
   if (event.type === "tool-result" && (toolName === "listAgents" || toolName === "startAgentRun" || toolName === "controlAgentRun")) {
     return formatOrchestrationCardBlock(event, toolName, colorEnabled);
   }
@@ -4561,6 +4600,18 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled(),
   const formatter = (event) => {
     if (mode === "hide") return "";
     if (mode === "verbose") return formatVerboseToolEvent(event, colorEnabled);
+    if (mode === "normal") {
+      if (event.type === "tool-call") {
+        pending.set(event.toolCallId, {
+          toolName: event.toolName,
+          argumentsPreview: event.argumentsPreview
+        });
+        return "";
+      }
+      const call2 = pending.get(event.toolCallId);
+      pending.delete(event.toolCallId);
+      return formatNormalToolLine(event, call2, colorEnabled);
+    }
     if (event.toolName === "controlAgentRun") {
       if (event.type === "tool-call") {
         pending.set(event.toolCallId, {
@@ -4837,6 +4888,7 @@ ${this.text}
 };
 
 // packages/cli/client/agentRunOutput.ts
+var IDENTITY_LABEL_SEPARATOR = " > ";
 function formatCompactionSummaryLine(event) {
   if (!event) return "";
   const action = event.reason === "tool_stub" ? "stub \u5DE5\u5177\u8F93\u51FA" : "\u751F\u6210\u5386\u53F2\u6458\u8981";
@@ -4899,6 +4951,15 @@ function createCliTurnOutput(params) {
   let printedAssistantLabel = false;
   let thinkState = createThinkParserState();
   let compactionEvent = null;
+  const assistantLabelManaged = options.output.assistantLabelManaged === true;
+  const writeToolOutput = (chunk) => {
+    if (!chunk) return;
+    if (typeof options.output.writeToolBlock === "function") {
+      options.output.writeToolBlock(chunk);
+    } else {
+      options.output.write(chunk);
+    }
+  };
   const renderWriter = createRenderAwareStreamWriter({
     write: (chunk) => options.output.write(chunk)
   });
@@ -4914,8 +4975,10 @@ function createCliTurnOutput(params) {
     spinner.stop();
     options.activityReporter?.(null);
     if (!printedAssistantLabel) {
-      options.output.write(`
-${options.agentName} > `);
+      if (!assistantLabelManaged) {
+        options.output.write(`
+${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
+      }
       printedAssistantLabel = true;
     }
     streamedAssistantText = true;
@@ -4939,10 +5002,10 @@ ${options.agentName} > `);
       streamedAssistantText = false;
     }
     if (chunk) {
-      options.output.write(chunk);
+      writeToolOutput(chunk);
     }
-    if (toolDisplayMode === "compact" && event.type === "tool-call") {
-      const activeLabel = formatActiveToolLabel(event);
+    if ((toolDisplayMode === "compact" || toolDisplayMode === "pro" || toolDisplayMode === "normal") && event.type === "tool-call") {
+      const activeLabel = toolDisplayMode === "normal" ? formatConservativeActiveToolLabel(event) : formatActiveToolLabel(event);
       spinner.show(activeLabel);
       options.activityReporter?.(activeLabel);
     }
@@ -4962,7 +5025,7 @@ ${options.agentName} > `);
       if (eventMode !== "jsonl" && formatToolEvent.flush) {
         const pendingToolOutput = formatToolEvent.flush();
         if (pendingToolOutput) {
-          options.output.write(pendingToolOutput);
+          writeToolOutput(pendingToolOutput);
         }
       }
       writeVisibleAssistantChunk(chunk);
@@ -4990,7 +5053,7 @@ ${options.agentName} > `);
       }
       const pendingToolOutput = formatToolEvent.flush ? formatToolEvent.flush() : "";
       if (pendingToolOutput) {
-        options.output.write(pendingToolOutput);
+        writeToolOutput(pendingToolOutput);
       }
       if (streamedAssistantText) {
         renderWriter.flush();
@@ -5000,13 +5063,18 @@ ${options.agentName} > `);
       } else {
         const content = fallbackContent ? formatAssistantResponseForCli(fallbackContent.trim()) : "";
         if (content) {
-          options.output.write(`
-${options.agentName} > ${content}
-`);
+          options.output.write(
+            assistantLabelManaged ? `${content}
+` : `
+${options.agentName}${IDENTITY_LABEL_SEPARATOR}${content}
+`
+          );
         } else {
-          options.output.write(`
-${options.agentName} > (no text response)
-`);
+          options.output.write(
+            assistantLabelManaged ? "(no text response)\n" : `
+${options.agentName}${IDENTITY_LABEL_SEPARATOR}(no text response)
+`
+          );
         }
       }
       const compactionLine = formatCompactionSummaryLine(compactionEvent);
@@ -5447,6 +5515,19 @@ async function loadRunLocalAgentTurn() {
   const { runLocalAgentTurn } = await import("./agentRuntimeLocal-SIQYQGSK.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();
+function extractEmbeddedErrorMessage(message) {
+  const match = /"message"\s*:\s*"((?:[^"\\]|\\.)*)"/.exec(message);
+  if (!match) return void 0;
+  try {
+    const decoded = JSON.parse(`"${match[1]}"`);
+    if (typeof decoded !== "string" || !decoded.trim()) return void 0;
+    const cleaned = decoded.replace(/[\u0000-\u001f\u007f]/g, "");
+    return cleaned.trim() ? cleaned : void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function resolveCurrentMachineId(options) {
   return options.currentMachineIdResolver ? options.currentMachineIdResolver(options.env) : detectCurrentMachineId(options.env);
 }
@@ -5677,7 +5758,6 @@ function describeLocalRunFailure(message, rawError) {
     busyDetail = rawError.detail.trim();
   }
   if (/PLATFORM_LLM_BUSY|服务器紧张/.test(message)) {
-    const stripDebugNoise = (s) => s.replace(/\s*raw=".*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();
     const shown = stripDebugNoise(
       message.replace(/\s*\(PLATFORM_LLM_BUSY\)\s*$/, "")
     );
@@ -5688,7 +5768,13 @@ function describeLocalRunFailure(message, rawError) {
   if (/UPSTREAM_402|Insufficient Balance|余额不足|insufficient\s+balance/i.test(
     message
   )) {
-    return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} Top up your balance, then send again (or say "\u7EE7\u7EED") \u2014 if a dialog was kept, context is preserved.
+    const cleanedMessage = stripDebugNoise(message);
+    const fallback = cleanedMessage.replace(
+      /^[^:]*provider failed: HTTP \d{3}\s*/,
+      ""
+    );
+    const shownMessage = extractEmbeddedErrorMessage(cleanedMessage) ?? fallback;
+    return `[nolo] ${shownMessage}
 `;
   }
   const cls = classifyLocalRunError(message);

package/{chunk-7GRFFW7R.js → chunk-VVZUMVYH.js}

@@ -1,7 +1,7 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-33BBDA67.js";
+} from "./chunk-BYFBW5FZ.js";
 import {
   clipMultilineText
 } from "./chunk-72COHDZR.js";

package/index.js

@@ -127,7 +127,7 @@ function createDaemonShortcutCommand(path, description, command2) {
 // packages/cli/agentInternalCommandEntries.ts
 function getAgentInternalCommandEntries() {
   const createAgentRunCommand = (path, description) => createContextCommand(path, description, async (args2, ctx) => {
-    const { runAgentRunCommand } = await import("./agentRunCommand-FINKBYUN.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-LK7BER3O.js");
     return runAgentRunCommand(args2, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,
@@ -143,7 +143,7 @@ function getAgentInternalCommandEntries() {
       return runAgentListCommand(args2, deps);
     }),
     createEnvCommand(["agent", "create"], "Create a new agent", async (args2, deps) => {
-      const { runAgentCreateCommand } = await import("./agentRecordCommands-OWKWVY3Y.js");
+      const { runAgentCreateCommand } = await import("./agentRecordCommands-J4ENRTN4.js");
       return runAgentCreateCommand(args2, deps);
     }),
     createEnvCommand(["agent", "models"], "List models available on an OpenAI-compatible provider", async (args2, deps) => {
@@ -155,7 +155,7 @@ function getAgentInternalCommandEntries() {
       return runAgentPullCommand(args2, deps);
     }),
     createEnvCommand(["agent", "read"], "Read a single agent", async (args2, deps) => {
-      const { runAgentReadCommand } = await import("./agentRecordCommands-OWKWVY3Y.js");
+      const { runAgentReadCommand } = await import("./agentRecordCommands-J4ENRTN4.js");
       return runAgentReadCommand(args2, deps);
     }),
     createAgentRunCommand(["agent", "run"], "Run an agent"),
@@ -193,26 +193,26 @@ function getAgentInternalCommandEntries() {
       return runSetupOfflineMarxistsAgentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "update"], "Update agent fields", async (args2, deps) => {
-      const { runAgentUpdateCommand } = await import("./agentRecordCommands-OWKWVY3Y.js");
+      const { runAgentUpdateCommand } = await import("./agentRecordCommands-J4ENRTN4.js");
       return runAgentUpdateCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "provision"], "Provision a controlled inbox for an agent", async (args2, deps) => {
-      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-C33KPOFP.js");
+      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-FHBQ5QPA.js");
       return runAgentEmailProvisionCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "bind"], "Bind an existing email address to an agent", async (args2, deps) => {
-      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-C33KPOFP.js");
+      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-FHBQ5QPA.js");
       return runAgentEmailBindCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "transfer"], "Transfer an email identity from one agent to another (cross-account)", async (args2, deps) => {
-      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-C33KPOFP.js");
+      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-FHBQ5QPA.js");
       return runAgentEmailTransferCommand(args2, deps);
     }),
     createEnvCommand(
       ["agent", "email", "create-and-provision"],
       "Create an agent and provision its controlled inbox",
       async (args2, deps) => {
-        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-C33KPOFP.js");
+        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-FHBQ5QPA.js");
         return runAgentEmailCreateAndProvisionCommand(args2, deps);
       }
     ),
@@ -233,15 +233,15 @@ function getAgentInternalCommandEntries() {
       return runAgentRevokeGrantCommand(args2, deps);
     }),
     createEnvCommand(["agent", "bind-current"], "Bind an agent to this machine", async (args2, deps) => {
-      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-ICOLSVID.js");
+      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-LJ36TKS6.js");
       return runAgentBindCurrentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "smoke-current"], "Smoke test a bound agent through this machine", async (args2, deps) => {
-      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-ICOLSVID.js");
+      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-LJ36TKS6.js");
       return runAgentSmokeCurrentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "runtime-doctor"], "Diagnose current machine runtime compatibility", async (args2, deps) => {
-      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-ICOLSVID.js");
+      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-LJ36TKS6.js");
       return runAgentRuntimeDoctorCommand(args2, deps);
     }),
     createAgentRunCommand(["agent", "chat"], "Chat with an agent")
@@ -426,15 +426,15 @@ function getSystemInternalCommandEntries(renderHelpText2) {
       return runWhoamiCommand({ args: args2, env: ctx.env });
     }),
     createEntrypointEnvCommand(["connect"], "Send machine heartbeats or hold a connector websocket", async (args2, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-X7YMGFMB.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-KYKZPZ4Q.js");
       return runMachineConnectCommand(args2, deps);
     }),
     createDaemonShortcutCommand(["daemon"], "Run the connector daemon shortcut", async (args2, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-X7YMGFMB.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-KYKZPZ4Q.js");
       return runMachineConnectCommand(args2, deps);
     }),
     createEnvCommand(["machine", "status"], "List machines registered to the current profile", async (args2, deps) => {
-      const { runMachineStatusCommand } = await import("./machineCommands-X7YMGFMB.js");
+      const { runMachineStatusCommand } = await import("./machineCommands-KYKZPZ4Q.js");
       return runMachineStatusCommand(args2, deps);
     }),
     createEnvCommand(["doctor", "runtime"], "Diagnose local-first agent runtime selection", async (args2, deps) => {
@@ -824,7 +824,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-GEZVQ7IM.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-D7UQATEL.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-U4EGD2SX.js");
   return startTuiWorkspace({
     ...args2,

package/{machineCommands-X7YMGFMB.js → machineCommands-KYKZPZ4Q.js}

@@ -2,13 +2,13 @@ import {
   buildMachinePermissionPromptBlock,
   handleConnectorRunMessage,
   resolveMachineRunPermissionPolicy
-} from "./chunk-7GRFFW7R.js";
+} from "./chunk-VVZUMVYH.js";
 import {
   isConnectorWebSocketAuthError,
   isConnectorWebSocketRetryableError,
   resolveConnectorWebSocketTarget
 } from "./chunk-ALXHV7NK.js";
-import "./chunk-33BBDA67.js";
+import "./chunk-BYFBW5FZ.js";
 import "./chunk-3YVCM5PE.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";

package/{machineWsRunDispatch-KWWJ4HTI.js → machineWsRunDispatch-UB2KMAXY.js}

@@ -11,8 +11,8 @@ import {
   runtimeWorkspacePermissionPolicy,
   scopePermissionPolicyToRuntimeWorkspace,
   summarizeAgentConfigForLogs
-} from "./chunk-7GRFFW7R.js";
-import "./chunk-33BBDA67.js";
+} from "./chunk-VVZUMVYH.js";
+import "./chunk-BYFBW5FZ.js";
 import "./chunk-3YVCM5PE.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.49.0-alpha.1",
+  "version": "0.51.0-alpha.1",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

package/{readlineWorkspace-GEZVQ7IM.js → readlineWorkspace-D7UQATEL.js}

@@ -64,7 +64,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-VZGLZTG7.js";
+} from "./chunk-RENO4QJU.js";
 import {
   listFavoriteAgentIdsAcrossServers,
   listLocalCachedAgents,
@@ -86,7 +86,7 @@ import {
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-33BBDA67.js";
+} from "./chunk-BYFBW5FZ.js";
 import "./chunk-3YVCM5PE.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";
@@ -1166,6 +1166,7 @@ function createTurnHistory() {
     turns: [],
     currentRole: null,
     currentContent: "",
+    currentBlocks: [],
     scrollTop: 0,
     followBottom: true
   };
@@ -1176,19 +1177,40 @@ function startTurn(history, role) {
   }
   history.currentRole = role;
   history.currentContent = "";
+  history.currentBlocks = [];
   resetStreamingTurnCache();
 }
 function appendToCurrentTurn(history, chunk) {
   history.currentContent += chunk;
+  appendCurrentBlock(history, "assistant", chunk);
+}
+function appendCurrentBlock(history, kind, chunk) {
+  if (!chunk) return;
+  const last = history.currentBlocks.at(-1);
+  if (last?.kind === kind) {
+    last.content = applyTerminalOutputToText(last.content, chunk);
+  } else {
+    history.currentBlocks.push({
+      kind,
+      content: applyTerminalOutputToText("", chunk)
+    });
+  }
 }
 function finalizeCurrentTurn(history) {
   if (history.currentRole !== null) {
     history.turns.push({
       role: history.currentRole,
-      content: compactTurnContent(history.currentContent)
+      content: compactTurnContent(history.currentContent),
+      ...history.currentRole === "assistant" && history.currentBlocks.length > 0 ? {
+        blocks: history.currentBlocks.map((block) => ({
+          ...block,
+          content: compactTurnContent(block.content)
+        })).filter((block) => block.content.length > 0)
+      } : {}
     });
     history.currentRole = null;
     history.currentContent = "";
+    history.currentBlocks = [];
     resetStreamingTurnCache();
     trimHistoryToBudget(history);
   }
@@ -1203,17 +1225,20 @@ function appendLocalTurn(history, command, output) {
   trimHistoryToBudget(history);
   resetStreamingTurnCache();
 }
-function applyOutputChunkToCurrentTurn(history, chunk) {
+function applyOutputChunkToCurrentTurn(history, chunk, kind = "assistant") {
   const next = applyTerminalOutputToText(history.currentContent, chunk);
   if (next === history.currentContent) return false;
   history.currentContent = next;
+  appendCurrentBlock(history, kind, chunk);
   return true;
 }
 function styleAssistantTurn(content, colorEnabled) {
   const highlighted = colorEnabled ? formatAssistantDisplay(content, { trimEdges: false }) : stripAnsi(formatAssistantDisplay(content, { trimEdges: false }));
   const rawLines = highlighted.split("\n");
-  const styledLines = rawLines.map((line, idx) => {
-    if (idx === 0 && !line.startsWith("[nolo]")) {
+  let anchored = false;
+  const styledLines = rawLines.map((line) => {
+    if (!anchored && line.trim().length > 0 && !line.startsWith("[nolo]")) {
+      anchored = true;
       const anchorPrefix = colorEnabled ? `${themeColorSequence("chrome")}\u25C8\x1B[39m ` : "\u25C8 ";
       return `${anchorPrefix}${line}`;
     }
@@ -1324,9 +1349,11 @@ function layoutTurnRows(role, content, contentWidth, colorEnabled, command) {
   let rawIdx = 0;
   let rawOffset = 0;
   const rows = [];
+  let anchored = false;
   for (let i = 0; i < styledLines.length; i++) {
     const styledLine = styledLines[i];
-    const isFirstLine = i === 0 && !styledLine.startsWith("[nolo]");
+    const isFirstLine = !anchored && styledLine.trim().length > 0 && !styledLine.startsWith("[nolo]");
+    if (isFirstLine) anchored = true;
     const anchorPrefix = isFirstLine ? colorEnabled ? `${themeColorSequence("chrome")}\u25C8\x1B[39m ` : "\u25C8 " : "";
     const prefixWidth = isFirstLine ? 2 : 0;
     const prefixCharCount = anchorPrefix.length;
@@ -1387,15 +1414,7 @@ function renderPrefixTurnBlock(role, content, contentWidth, colorEnabled) {
   if (role === "user") {
     return renderTurnBlock(role, content, contentWidth, colorEnabled);
   }
-  const highlighted = colorEnabled ? formatAssistantDisplay(content, { trimEdges: false }) : stripAnsi(formatAssistantDisplay(content, { trimEdges: false }));
-  const rawLines = highlighted.split("\n");
-  const styledLines = rawLines.map((line, idx) => {
-    if (idx === 0 && !line.startsWith("[nolo]")) {
-      const anchorPrefix = colorEnabled ? `${themeColorSequence("chrome")}\u25C8\x1B[39m ` : "\u25C8 ";
-      return `${anchorPrefix}${line}`;
-    }
-    return line.startsWith("[nolo]") && colorEnabled ? themeText(line, "chrome", true) : line;
-  });
+  const styledLines = styleAssistantTurn(content, colorEnabled).split("\n");
   const lines = [];
   for (const logicalLine of styledLines) {
     lines.push(...wrapTranscriptLine(logicalLine, contentWidth));
@@ -1728,16 +1747,23 @@ function renderHistory(output, history, inputLines, selection) {
   }
 }
 function createHistoryOutputStream(history, onUpdate) {
-  return {
+  const stream = {
     isTTY: true,
+    assistantLabelManaged: true,
     write(chunk) {
       const text = typeof chunk === "string" ? chunk : chunk.toString();
       if (applyOutputChunkToCurrentTurn(history, text)) {
         onUpdate();
       }
       return true;
+    },
+    writeToolBlock(chunk) {
+      if (applyOutputChunkToCurrentTurn(history, chunk, "tool")) {
+        onUpdate();
+      }
     }
   };
+  return stream;
 }
 function applyScrollAction(history, action, output, inputLines) {
   const tty = output;
@@ -1830,6 +1856,10 @@ function activeInFlight(snapshot) {
   if (isAgentRunTerminalStatus(snapshot.status)) return null;
   return snapshot.inFlight ?? null;
 }
+function formatTerminalRunAge(snapshot, now) {
+  if (!isAgentRunTerminalStatus(snapshot.status)) return null;
+  return formatRunAge(snapshot, now);
+}
 function formatUnassignedFact(snapshot) {
   return snapshot.unassigned ? "parent: ?" : null;
 }
@@ -1868,7 +1898,7 @@ function formatAgentRunPanelLines(snapshot, colorEnabled, now = Date.now()) {
   const unassignedFact = formatUnassignedFact(snapshot);
   const unassignedPart = unassignedFact ? ` \xB7 ${unassignedFact}` : "";
   const progressPart = formatPanelProgress(snapshot, now);
-  const age = formatRunAge(snapshot, now);
+  const age = formatTerminalRunAge(snapshot, now);
   const agePart = age ? ` \xB7 ${age}` : "";
   if (!colorEnabled) {
     lines.push(
@@ -2070,7 +2100,7 @@ function formatRunDockRow(snapshot, colorEnabled, now) {
   const terminal = isAgentRunTerminalStatus(snapshot.status);
   const statusColor = runStatusTone(snapshot.status);
   const facts = [];
-  const age = formatRunAge(snapshot, now);
+  const age = formatTerminalRunAge(snapshot, now);
   if (terminal) facts.push(age ? `${snapshot.status} ${age}` : snapshot.status);
   else if (age) facts.push(age);
   const unassigned = formatUnassignedFact(snapshot);
@@ -2241,25 +2271,6 @@ var RUN_POLL_INTERVAL_MS = 1e3;
 var DISCOVERY_EVERY_TICKS = 5;
 var DISCOVERY_TERMINAL_LINGER_MS = 6e4;
 var RUN_RECONCILE_SILENCE_MS = 15e3;
-var RUNNING_AGENT_COUNT_CACHE_TTL_MS = 1e3;
-var cachedRunningAgentCount = 0;
-var lastRunningAgentCountScannedAt = 0;
-function getCachedRunningAgentCount(options) {
-  const now = options?.now ?? Date.now();
-  if (!options?.force && lastRunningAgentCountScannedAt > 0 && now - lastRunningAgentCountScannedAt < RUNNING_AGENT_COUNT_CACHE_TTL_MS) {
-    return cachedRunningAgentCount;
-  }
-  const readFn = options?.reader ?? listRunRecords;
-  try {
-    const records = readFn();
-    cachedRunningAgentCount = records.filter(
-      (r) => !isAgentRunTerminalStatus(r.status)
-    ).length;
-    lastRunningAgentCountScannedAt = now;
-  } catch {
-  }
-  return cachedRunningAgentCount;
-}
 function snapshotFromRunRecord(record, now) {
   const label = resolveRunLabel(record);
   const startedAt = readTimestamp(record.startedAt);
@@ -2343,18 +2354,18 @@ function createRunRegistryPoller(deps) {
     }
     const discovered = discoveredRecords;
     const currentDialogId = deps.getCurrentDialogId?.();
+    const belongsToCurrentDialog = (record) => !deps.getCurrentDialogId || currentDialogId !== null && record.parentDialogId === currentDialogId;
     const discoveredActive = discovered.filter(
-      (record) => record.runId && !dockedIds.has(record.runId) && !retiredRunIds.has(record.runId) && !isAgentRunTerminalStatus(record.status) && (!deps.getCurrentDialogId || currentDialogId !== void 0 && (record.parentDialogId === currentDialogId || !record.parentDialogId))
+      (record) => record.runId && !dockedIds.has(record.runId) && !retiredRunIds.has(record.runId) && !isAgentRunTerminalStatus(record.status) && belongsToCurrentDialog(record)
     );
     const discoveredTerminal = discovered.filter((record) => {
       if (!record.runId || dockedIds.has(record.runId) || retiredRunIds.has(record.runId)) return false;
-      if (!isAgentRunTerminalStatus(record.status)) return false;
-      if (deps.getCurrentDialogId && (currentDialogId === void 0 || !(record.parentDialogId === currentDialogId || !record.parentDialogId))) return false;
+      if (!isAgentRunTerminalStatus(record.status) || !belongsToCurrentDialog(record)) return false;
       const endedAt = readTimestamp(record.endedAt);
       return endedAt !== void 0 && at - endedAt <= DISCOVERY_TERMINAL_LINGER_MS;
     });
     for (const record of discovered) {
-      if (record.runId && isAgentRunTerminalStatus(record.status) && !discoveredTerminal.includes(record)) {
+      if (record.runId && isAgentRunTerminalStatus(record.status) && belongsToCurrentDialog(record) && !discoveredTerminal.includes(record)) {
         retiredRunIds.add(record.runId);
       }
     }
@@ -2378,6 +2389,7 @@ function createRunRegistryPoller(deps) {
         continue;
       }
       if (!record) continue;
+      if (deps.getCurrentDialogId && !belongsToCurrentDialog(record)) continue;
       polled.push(record);
       const snapshot = snapshotFromRunRecord(record, at);
       const mark = fingerprint(snapshot);
@@ -3623,7 +3635,7 @@ function renderComposerTokenChip(tokens, fallbackContextWindow, estimatedContext
   const pctText = pct > 0 && pct < 10 ? pct.toFixed(1) : Math.round(pct).toString();
   return `context: ${pctText}% (${formatTokenCount(used)}/${formatTokenCount(cw)})`;
 }
-function renderStatusLine(state) {
+function renderStatusLine(state, maxWidth) {
   const colorEnabled = resolveCliColorEnabled();
   const sep = themeText(" \xB7 ", "chrome", colorEnabled);
   const agentDisplayName = state.agentName;
@@ -3652,25 +3664,65 @@ function renderStatusLine(state) {
   );
   parts.push(tokenSegment);
   const runningTaskCount = getProcessRegistry().listBackground().filter((p) => p.status === "running").length;
-  const runningAgentCount = getCachedRunningAgentCount();
-  const runningParts = [];
   if (runningTaskCount > 0) {
-    runningParts.push(`${runningTaskCount} running`);
-  }
-  if (runningAgentCount > 0) {
-    runningParts.push(`${runningAgentCount} ${runningAgentCount === 1 ? "agent" : "agents"}`);
-  }
-  if (runningParts.length > 0) {
-    parts.push(themeText(`\u2699 ${runningParts.join(" \xB7 ")}`, "info", colorEnabled));
+    parts.push(themeText(`\u2699 ${runningTaskCount} running`, "info", colorEnabled));
   }
   if (state.autoConfirm === true) {
     parts.push(themeText("\u23F5 auto", "warning", colorEnabled));
   }
-  const body = parts.join(sep);
+  let visibleParts = parts;
+  if (maxWidth && maxWidth > 0) {
+    const widthOf = (segments) => displayWidth(stripAnsi(segments.join(" \xB7 "))) + 2;
+    for (const optional of [tokenSegment, cwdSegment, agentSegment]) {
+      if (widthOf(visibleParts) <= maxWidth) break;
+      visibleParts = visibleParts.filter((part) => part !== optional);
+    }
+    if (widthOf(visibleParts) > maxWidth && state.gitStatus) {
+      const gitIndex = visibleParts.findIndex((part) => stripAnsi(part).startsWith("\u2442 "));
+      if (gitIndex >= 0) {
+        const { modified, untracked } = state.gitStatus;
+        const compactDirty = themeText(
+          `\u2442${modified > 0 ? ` *${modified}` : ""}${untracked > 0 ? ` ?${untracked}` : ""}`,
+          "warning",
+          colorEnabled
+        );
+        visibleParts = visibleParts.with(gitIndex, compactDirty);
+      }
+    }
+    if (widthOf(visibleParts) > maxWidth) {
+      const emergency = [];
+      if (state.autoConfirm === true) {
+        emergency.push(themeText("\u23F5", "warning", colorEnabled));
+      }
+      const runningTotal = runningTaskCount + runningAgentCount;
+      if (runningTotal > 0) {
+        emergency.push(themeText(`\u2699${runningTotal}`, "info", colorEnabled));
+      }
+      if (state.gitStatus) {
+        const { modified, untracked } = state.gitStatus;
+        emergency.push(themeText(
+          `\u2442${modified > 0 ? `*${modified}` : ""}${untracked > 0 ? `?${untracked}` : ""}`,
+          "warning",
+          colorEnabled
+        ));
+      }
+      visibleParts = [emergency.join(" ")];
+    }
+  }
+  const body = visibleParts.join(sep);
   const surface = colorEnabled ? surfaceBackgroundSequence() : "";
   if (!surface) return body;
   return `${surface} ${body} \x1B[49m`;
 }
+function composeStatusLineWithQueue(state, queueSuffix, maxWidth) {
+  const hasBudget = typeof maxWidth === "number" && maxWidth > 0;
+  const queueWidth = queueSuffix ? visibleWidth(queueSuffix) : 0;
+  const budget = hasBudget ? Math.max(1, maxWidth - queueWidth) : void 0;
+  const base = renderStatusLine(state, budget);
+  if (!queueSuffix) return base;
+  if (!hasBudget) return base + queueSuffix;
+  return visibleWidth(base) + queueWidth <= maxWidth ? base + queueSuffix : base;
+}
 function buildPlainScene(isDark, frame = 0, maxFrames = 0) {
   let skyLine = `                      ${isDark ? "\u{1F319}" : "\u2600"}`;
   if (isDark) {
@@ -4328,7 +4380,7 @@ function createInitialTuiState(env = process.env) {
     modeLabel: asOptionalTrimmedString(env.NOLO_CLI_STATUS_MODE) ?? runtimeMode,
     userLanguage: asOptionalTrimmedString(env.NOLO_LANG),
     gitStatus: void 0,
-    toolDisplay: normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "compact"),
+    toolDisplay: normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "normal"),
     thinkingDisplay: "show",
     contextWindow: resolveAgentContextWindow({ agentKey, agentName }),
     estimatedContextTokens: estimateDefaultCliContextTokens({
@@ -4498,7 +4550,7 @@ function handleTuiInput(input, state) {
         };
       }
       const normalizedArg = asTrimmedLowercaseString(argText);
-      if (!["hide", "compact", "verbose", "on", "off"].includes(normalizedArg)) {
+      if (!["normal", "pro", "hide", "compact", "verbose", "on", "off"].includes(normalizedArg)) {
         return {
           nextState: state,
           output: t("toolsUsage")
@@ -6942,7 +6994,7 @@ function createFixedInput(output, config) {
     if (titleLine) {
       sections.push(fitAnsiLine(titleLine.replace(/\r?\n/g, " "), cols));
     }
-    sections.push(fitAnsiLine(config.getStatusLine(), cols));
+    sections.push(fitAnsiLine(config.getStatusLine(cols), cols));
     const queueLines = config.getQueueLines?.() ?? [];
     for (const line of queueLines) {
       sections.push(fitAnsiLine(line.replace(/\r?\n/g, " "), cols));
@@ -8036,7 +8088,7 @@ async function runTuiWorkspace(options) {
     // 与 reconcile 的调用点也是同样写法。
     readRecord: (runId) => readRunRecord(runId, { env: effectiveEnv }),
     discoverRuns: () => listRunRecords({ env: effectiveEnv }),
-    getCurrentDialogId: () => state.dialogId,
+    getCurrentDialogId: () => state.dialogId ?? null,
     reconcile: (runId) => checkStaleRun(runId, { env: effectiveEnv }),
     onRecordsPolled: (records) => runCompletionWatcher.observe(records)
   });
@@ -8303,15 +8355,12 @@ async function runTuiWorkspace(options) {
     let done = false;
     let resolveDone = null;
     const baseFixedInput = createFixedInput(output, {
-      getStatusLine: () => {
-        let base = renderStatusLine(state);
-        if (chatQueueBinding && chatQueueBinding.queueLength() > 0) {
-          base += dimCliText(
-            ` \xB7 ${chatQueueBinding.queueLength()} ${t("queuedHint")}`,
-            resolveCliColorEnabled()
-          );
-        }
-        return base;
+      getStatusLine: (maxWidth) => {
+        const queueSuffix = chatQueueBinding && chatQueueBinding.queueLength() > 0 ? dimCliText(
+          ` \xB7 ${chatQueueBinding.queueLength()} ${t("queuedHint")}`,
+          resolveCliColorEnabled()
+        ) : "";
+        return composeStatusLineWithQueue(state, queueSuffix, maxWidth);
       },
       getActivityLines: () => activityIndicator.getActivityLines(resolveCliColorEnabled()),
       getQueueLines: () => {