nolo-cli 0.109.0-alpha.2 → 0.110.0-alpha.1

package/{agentRunCommand-GMSUBYF6.js → agentRunCommand-WE72RU4J.js}

@@ -8,7 +8,7 @@ import {
   resolveRunSettlementNote,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-DNAF7JC6.js";
+} from "./chunk-2KNZCY53.js";
 import "./chunk-S7Z2HMCN.js";
 import {
   parseAgentRunArgs

package/{chunk-DNAF7JC6.js → chunk-2KNZCY53.js}

@@ -9834,6 +9834,7 @@ ${this.text}
 // packages/cli/client/agentRunOutput.ts
 var IDENTITY_LABEL_SEPARATOR = " > ";
 var THINKING_PREVIEW_BUFFER_LIMIT = 512;
+var TUI_PROGRESS_BUFFER_LIMIT = 320;
 function appendThinkingPreview(current, chunk, limit = THINKING_PREVIEW_BUFFER_LIMIT) {
   if (limit <= 0) return "";
   const combined = current + chunk;
@@ -9895,6 +9896,15 @@ function formatToolJsonEvent(event) {
   })}
 `;
 }
+function shouldPromoteTuiNarration(text) {
+  if (text.length >= TUI_PROGRESS_BUFFER_LIMIT) return true;
+  if (/\n\s*\n/.test(text)) return true;
+  return /(^|\n)\s*(?:#{1,3}\s|```|[-*+]\s|\d+[.)]\s)/.test(text);
+}
+function narrationActivityLabel(text) {
+  const oneLine = stripAnsi2(text).replace(/[`*_#>]/g, "").replace(/\s+/g, " ").trim();
+  return truncateThinkingHint(oneLine, 60);
+}
 function createCliTurnOutput(params) {
   const { options } = params;
   const workingLabel = params.workingLabel ?? `${options.agentName} -> working`;
@@ -9903,7 +9913,8 @@ function createCliTurnOutput(params) {
     tuiTrees: options.output.tuiTrees === true
   });
   const eventMode = resolveAgentEventMode(options);
-  const showThinking = options.showThinking !== false;
+  const assistantLabelManaged = options.output.assistantLabelManaged === true;
+  const showThinking = !assistantLabelManaged && options.showThinking !== false;
   let streamedAssistantText = false;
   let everStreamedAnyText = false;
   let printedAssistantLabel = false;
@@ -9940,7 +9951,6 @@ function createCliTurnOutput(params) {
     }
   };
   let compactionEvent = null;
-  const assistantLabelManaged = options.output.assistantLabelManaged === true;
   const writeToolOutput = (chunk) => {
     if (!chunk) return;
     if (typeof options.output.writeToolBlock === "function") {
@@ -9952,9 +9962,25 @@ function createCliTurnOutput(params) {
   const renderWriter = createRenderAwareStreamWriter({
     write: (chunk) => options.output.write(chunk)
   });
+  let pendingTuiNarration = "";
+  let tuiNarrationPromoted = false;
+  const flushPendingTuiNarration = () => {
+    if (!pendingTuiNarration) return;
+    formatToolEvent.reset?.();
+    renderWriter.push(pendingTuiNarration);
+    pendingTuiNarration = "";
+    tuiNarrationPromoted = true;
+    streamedAssistantText = true;
+    options.activityReporter?.(null);
+  };
+  const dropPendingTuiProgress = () => {
+    pendingTuiNarration = "";
+    tuiNarrationPromoted = false;
+    options.activityReporter?.(null);
+  };
   const writeVisibleAssistantChunk = (chunk) => {
     if (!chunk) return;
-    formatToolEvent.reset?.();
+    if (!assistantLabelManaged) formatToolEvent.reset?.();
     const parsed = processThinkChunk(chunk, thinkState);
     thinkState = parsed.state;
     if (!parsed.content && !parsed.reasoning) return;
@@ -9970,8 +9996,23 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       }
       printedAssistantLabel = true;
     }
-    streamedAssistantText = true;
     everStreamedAnyText = true;
+    if (assistantLabelManaged) {
+      if (tuiNarrationPromoted) {
+        renderWriter.push(parsed.content);
+        streamedAssistantText = true;
+        return;
+      }
+      pendingTuiNarration += parsed.content;
+      if (shouldPromoteTuiNarration(pendingTuiNarration)) {
+        flushPendingTuiNarration();
+      } else {
+        const label = narrationActivityLabel(pendingTuiNarration);
+        if (label) options.activityReporter?.(label);
+      }
+      return;
+    }
+    streamedAssistantText = true;
     renderWriter.push(parsed.content);
   };
   const handleToolEvent = (event) => {
@@ -9987,6 +10028,9 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       return;
     }
     if (event.type === "tool-call") {
+      if (assistantLabelManaged && pendingTuiNarration) {
+        dropPendingTuiProgress();
+      }
       renderWriter.flush();
       formatToolEvent(event);
       endThinkingPhase();
@@ -9994,6 +10038,7 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
         options.output.write("\n");
         streamedAssistantText = false;
       }
+      if (assistantLabelManaged) tuiNarrationPromoted = false;
       const activeLabel = formatConservativeActiveToolLabel(event);
       spinner.show(activeLabel);
       options.activityReporter?.(activeLabel);
@@ -10017,6 +10062,26 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
   return {
     spinner,
     eventMode,
+    /**
+     * Terminal cleanup for abort/error paths that never reach `finish()`.
+     *
+     * A user abort discards the transient TUI progress buffer: the user stopped
+     * on purpose and the dock already showed that text as activity. A genuine
+     * failure must not swallow prose that never got the chance to be *proven*
+     * durable (only a following tool call proves "progress"), so it promotes the
+     * pending buffer and flushes what was already promoted — otherwise a short
+     * final answer followed by a transport error disappears from the transcript.
+     */
+    cancel(cleanup) {
+      if (assistantLabelManaged && cleanup?.preservePendingNarration) {
+        flushPendingTuiNarration();
+        if (streamedAssistantText) {
+          renderWriter.flush();
+          options.output.write("\n");
+        }
+      }
+      dropPendingTuiProgress();
+    },
     pushText(chunk) {
       writeVisibleAssistantChunk(chunk);
     },
@@ -10024,10 +10089,6 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       markThinkingDelta(chunk);
     },
     handleToolEvent,
-    /** 记录一条 compaction 观测事件（TUI 在 turn 结束时渲染一行 dim 摘要）。
-     *  一轮内可能来多条（轮开始 + 每个 round），按显著性保留最高者：
-     *  失败 > 新生成摘要 > 投影复用 > 跳过，避免末尾的例行跳过事件
-     *  覆盖掉中途真正发生的压缩。 */
     recordCompaction(event) {
       const significance = (e) => e.failed ? 4 : e.summaryGenerated ? 3 : e.compressed ? 2 : 1;
       if (!compactionEvent || significance(event) >= significance(compactionEvent)) {
@@ -10045,6 +10106,7 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       if (flushedThink.content) {
         writeVisibleAssistantChunk(flushedThink.content);
       }
+      if (assistantLabelManaged) flushPendingTuiNarration();
       endThinkingPhase();
       spinner.stop();
       options.activityReporter?.(null);
@@ -10149,6 +10211,7 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
   let content = "";
   let dialogId;
   let usage;
+  let sawDone = false;
   const handlePayload = (payload) => {
     if (typeof payload?.dialogId === "string" && payload.dialogId.trim()) {
       dialogId = payload.dialogId;
@@ -10161,6 +10224,7 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
     }
     if (payload?.type === "done") {
       usage = payload.usage;
+      sawDone = true;
       return;
     }
     if (payload?.type === "dialog" || payload?.type === "status") {
@@ -10214,6 +10278,9 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
     }
   } catch (error) {
     turnOutput.spinner.stop();
+    turnOutput.cancel({
+      preservePendingNarration: !options.abortSignal?.aborted
+    });
     if (options.abortSignal?.aborted) {
       return {
         exitCode: 0,
@@ -10243,6 +10310,15 @@ ${describeClientVersionTooOldFailure(message, error)}`);
 `);
     return { exitCode: 1 };
   }
+  if (options.abortSignal?.aborted && !sawDone) {
+    turnOutput.spinner.stop();
+    turnOutput.cancel();
+    return {
+      exitCode: 0,
+      ...dialogId ? { dialogId } : {},
+      streamInterrupted: true
+    };
+  }
   turnOutput.finish(content);
   const usageText = formatUsage(usage, dialogId);
   if (usageText && shouldShowUsage(options.env))
@@ -11286,6 +11362,9 @@ async function runLocalAgentTurnForCli(options, settings) {
     };
   } catch (error) {
     turnOutput.spinner.stop();
+    turnOutput.cancel({
+      preservePendingNarration: error?.code !== LOCAL_TURN_ABORTED_CODE && !options.abortSignal?.aborted
+    });
     const savedDialogId = error?.dialogId;
     const abortedUsageRecords = error?.usageRecords;
     const abortedTurnCredits = sumPlatformCredits(abortedUsageRecords);

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-GMSUBYF6.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-WE72RU4J.js");
     return runAgentRunCommand(args2, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,
@@ -892,7 +892,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-2G3MDALM.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-5GEDEDMU.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-UFGFOIIW.js");
   return startTuiWorkspace({
     ...args2,

package/package.json

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

package/{readlineWorkspace-2G3MDALM.js → readlineWorkspace-5GEDEDMU.js}

@@ -72,7 +72,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-DNAF7JC6.js";
+} from "./chunk-2KNZCY53.js";
 import "./chunk-S7Z2HMCN.js";
 import "./chunk-V7E4PXQD.js";
 import "./chunk-ESHYE7WU.js";
@@ -3028,11 +3028,23 @@ function formatPanelDetail(snapshot) {
   if (!lines || lines.length === 0) return "";
   return lines[lines.length - 1]?.trim() ?? "";
 }
+var AUTO_IDENTITY_PATTERNS = [
+  /^agent-[0-9a-f]{8,}-[a-z0-9]/i,
+  /^agent-pub-[a-z0-9]{10,}$/i,
+  /^run-\d{4}-\d{2}-\d{2}T[\d-]+Z-[a-z0-9]+$/i
+];
+function isAutoGeneratedIdentity(raw) {
+  return AUTO_IDENTITY_PATTERNS.some((pattern) => pattern.test(raw));
+}
+function displayAgentName(snapshot) {
+  const raw = snapshot.agentName?.trim();
+  if (!raw) return "Sub-agent";
+  if (isAutoGeneratedIdentity(raw)) return "Sub-agent";
+  return raw;
+}
 function formatAgentRunPanelLines(snapshot, colorEnabled, now = Date.now()) {
   const lines = [];
-  const name = snapshot.agentName || "sub-agent";
-  const short = shortRunId(snapshot.runId);
-  const runId = short ? ` (${short})` : "";
+  const name = displayAgentName(snapshot);
   const status = snapshot.status || "running";
   const statusSymbol = getAgentRunStatusIcon(status);
   const statusColor = runStatusTone(status);
@@ -3045,19 +3057,18 @@ function formatAgentRunPanelLines(snapshot, colorEnabled, now = Date.now()) {
   const creditsPart = typeof snapshot.credits === "number" && Number.isFinite(snapshot.credits) ? ` \xB7 ${formatCreditsChip(snapshot.credits)}` : "";
   if (!colorEnabled) {
     lines.push(
-      `\u{1F916} Sub-Agent: ${name}${runId} \xB7 ${statusSymbol} ${status}${unassignedPart}${agePart}${progressPart}${creditsPart}${errPart}`
+      `\u{1F916} ${name} \xB7 ${statusSymbol} ${status}${unassignedPart}${agePart}${progressPart}${creditsPart}${errPart}`
     );
   } else {
     const botIcon = themeText("\u{1F916}", "accent", true);
-    const labelText = themeText(" Sub-Agent: ", "muted", true);
-    const nameText = themeText(`${name}${runId}`, "chrome", true);
+    const nameText = themeText(` ${name}`, "chrome", true);
     const statusText = themeText(` \xB7 ${statusSymbol} ${status}`, statusColor, true);
     const unassignedText = unassignedPart ? themeText(unassignedPart, "muted") : "";
     const ageText = agePart ? themeText(agePart, "chrome") : "";
     const progressText = progressPart ? themeText(progressPart, "chrome") : "";
     const creditsText = creditsPart ? themeText(creditsPart, "muted") : "";
     const errorText = errPart ? themeText(errPart, "danger") : "";
-    lines.push(`${botIcon}${labelText}${nameText}${statusText}${unassignedText}${ageText}${progressText}${creditsText}${errorText}`);
+    lines.push(`${botIcon}${nameText}${statusText}${unassignedText}${ageText}${progressText}${creditsText}${errorText}`);
   }
   const detail = formatPanelDetail(snapshot);
   if (detail) {
@@ -3239,7 +3250,7 @@ function formatRunDockLines(snapshots, colorEnabled, now = Date.now(), maxRows =
   return lines;
 }
 function formatRunDockRow(snapshot, colorEnabled, now) {
-  const name = snapshot.agentName || "sub-agent";
+  const name = displayAgentName(snapshot);
   const short = shortRunId(snapshot.runId);
   const icon = getAgentRunStatusIcon(snapshot.status);
   const terminal = isAgentRunTerminalStatus(snapshot.status);
@@ -6861,7 +6872,7 @@ function formatProcessTerminalWakeMessage(notices) {
   return [
     `<background_task_completion count="${notices.length}">`,
     ...notices.flatMap((notice) => [
-      formatProcessTerminalNoticeLine(notice),
+      formatProcessTerminalWakeLine(notice),
       ...notice.resultCapsule ? formatProcessResultCapsuleLines(notice.resultCapsule) : []
     ]),
     `</background_task_completion>`
@@ -6895,12 +6906,21 @@ function formatProcessResultCapsuleLines(capsule) {
     ] : []
   ];
 }
-function formatProcessTerminalNoticeLine(notice) {
+function formatProcessTerminalWakeLine(notice) {
   const informative = notice.label && notice.label.trim() !== "" && notice.label !== notice.command;
   const label = informative ? ` (label: "${notice.label.replace(/(["\\])/g, "\\$1")}")` : "";
   const exit = notice.exitCode !== void 0 ? ` exitCode=${notice.exitCode}` : "";
   return `[Background task ${notice.taskId}${label} finished: status=${notice.status}${exit}]`;
 }
+function formatProcessTerminalNoticeLine(notice) {
+  const informative = notice.label && notice.label.trim() !== "" && notice.label !== notice.command;
+  const label = informative ? notice.label.trim() : "background task";
+  const ok = notice.status === "exited" && (notice.exitCode === void 0 || notice.exitCode === 0);
+  if (ok) return `\u2713 ${label}`;
+  if (notice.status === "stopped") return `\u25A0 ${label} \xB7 stopped`;
+  const exit = notice.exitCode !== void 0 ? ` \xB7 exit ${notice.exitCode}` : "";
+  return `\u2717 ${label}${exit}`;
+}
 function buildProcessTerminalTurnMessage(notices) {
   if (notices.length === 0) return "";
   return formatProcessTerminalWakeMessage(notices);
@@ -6917,7 +6937,7 @@ function buildProcessTaskCompletedTurnEvent(notice) {
 }
 var PENDING_NOTICE_PREFIX = "process-notice-v1:";
 function serializePendingProcessNotice(notice) {
-  return notice.resultCapsule ? `${PENDING_NOTICE_PREFIX}${JSON.stringify(notice)}` : formatProcessTerminalNoticeLine(notice);
+  return notice.resultCapsule ? `${PENDING_NOTICE_PREFIX}${JSON.stringify(notice)}` : formatProcessTerminalWakeLine(notice);
 }
 function parsePendingProcessNoticeLine(line) {
   if (line.startsWith(PENDING_NOTICE_PREFIX)) {