nolo-cli 0.151.0-alpha.3 → 0.151.0-alpha.4

package/{agentRunCommand-JASIG3FZ.js → agentRunCommand-LTVIZBDD.js}

@@ -9,7 +9,7 @@ import {
   resolveRunSettlementNote,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-TTH4HOJD.js";
+} from "./chunk-OXCHKYMU.js";
 import "./chunk-6QDYSCPW.js";
 import {
   parseAgentRunArgs

package/{chunk-TTH4HOJD.js → chunk-OXCHKYMU.js}

@@ -16065,8 +16065,10 @@ export {
   resolveAgentContextWindow,
   platformCreditsFromUsage,
   formatCreditsChip,
+  formatTokenCount,
   resolveAuthorityTurnCount,
   computeBaselineContextTokens,
+  resolveContextUsage,
   renderTokenStatus,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,

package/{commandRegistry-NBLZEMCW.js → commandRegistry-WIUTNXKC.js}

@@ -110,7 +110,7 @@ function createDaemonShortcutCommand(path, description, command) {
 // packages/cli/agentInternalCommandEntries.ts
 function getAgentInternalCommandEntries() {
   const createAgentRunCommand = (path, description) => createContextCommand(path, description, async (args, ctx) => {
-    const { runAgentRunCommand } = await import("./agentRunCommand-JASIG3FZ.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-LTVIZBDD.js");
     return runAgentRunCommand(args, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,

package/index.js

@@ -71,7 +71,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-UIQN7JUR.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-XL65W6GB.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-BM3VSTBU.js");
   const { setCliAutoCompactionSummaryFallback } = await import("./localRuntimeAdapter-B4TAYYA7.js");
   setCliAutoCompactionSummaryFallback(
@@ -85,7 +85,7 @@ async function launchTuiWorkspace(args2) {
   });
 }
 async function main() {
-  const { createCliRuntimeContext, looksLikeDaemonShortcut, renderHelpText, resolveCommand, runResolvedCommand } = await import("./commandRegistry-NBLZEMCW.js");
+  const { createCliRuntimeContext, looksLikeDaemonShortcut, renderHelpText, resolveCommand, runResolvedCommand } = await import("./commandRegistry-WIUTNXKC.js");
   const { buildCliRuntimeEnv, loadProfileConfig } = await import("./profileConfig-ZGOFORWV.js");
   const { resolveTuiLaunchMode } = await import("./runtimeModeArgs-2Y7BALTO.js");
   const runtimeEnv = {

package/package.json

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

package/{readlineWorkspace-UIQN7JUR.js → readlineWorkspace-XL65W6GB.js}

@@ -44,6 +44,7 @@ import {
   fitAnsiLine,
   formatAssistantDisplay,
   formatCreditsChip,
+  formatTokenCount,
   getActiveThemeMode,
   getActiveThemeName,
   historyTokensBeforeLatestAssistant,
@@ -65,6 +66,7 @@ import {
   resolveAuthorityTurnCount,
   resolveCliColorEnabled,
   resolveCliMemory,
+  resolveContextUsage,
   resolveSkillReference,
   resolveTerminalProgramStatusState,
   resolveTuiBrightnessSignal,
@@ -89,7 +91,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-TTH4HOJD.js";
+} from "./chunk-OXCHKYMU.js";
 import "./chunk-6QDYSCPW.js";
 import "./chunk-IK2TSJQA.js";
 import {
@@ -7833,6 +7835,16 @@ function formatCwd(cwd) {
   const parts = cwd.split(/[/\\]/);
   return parts.pop() || cwd;
 }
+function truncateToWidth(text, maxWidth) {
+  if (displayWidth(text) <= maxWidth) return text;
+  if (maxWidth < 2) return "";
+  let out = "";
+  for (const ch of text) {
+    if (displayWidth(`${out}${ch}\u2026`) > maxWidth) break;
+    out += ch;
+  }
+  return out ? `${out}\u2026` : "";
+}
 function formatElapsedSeconds(totalSeconds) {
   if (totalSeconds < 60) return `${totalSeconds}s`;
   const minutes = Math.floor(totalSeconds / 60);
@@ -7842,6 +7854,21 @@ function formatElapsedSeconds(totalSeconds) {
   const mins = minutes % 60;
   return `${hours}h ${mins}m`;
 }
+function renderStatusContextSegment(state, compact) {
+  const usage = resolveContextUsage({
+    tokens: state.turnTokens,
+    fallbackContextWindow: state.contextWindow,
+    estimatedContextTokens: state.estimatedContextTokens,
+    turnEstimatedTokens: state.liveTurnEstimatedTokens
+  });
+  if (usage.used === void 0 || usage.contextWindow === void 0) {
+    return "ctx \u2014";
+  }
+  const pct = Math.min(100, usage.pct ?? 0);
+  const pctText = pct > 0 && pct < 10 ? pct.toFixed(1) : Math.round(pct).toString();
+  if (compact) return `ctx ${pctText}%`;
+  return `ctx ${pctText}% \xB7 ${formatTokenCount(usage.used)}/${formatTokenCount(usage.contextWindow)}`;
+}
 function resolveStatusLineCredits(state) {
   const base = state.dialogCreditsBase;
   const session = state.sessionCredits;
@@ -7867,57 +7894,141 @@ function renderStatusLine(state, maxWidth) {
     const untrackedText = untracked > 0 ? ` ${themeText(`?${untracked}`, "muted", colorEnabled)}` : "";
     parts.push(`${branchText}${modifiedText}${untrackedText}`);
   }
+  const contextFull = renderStatusContextSegment(state, false);
+  const contextCompact = renderStatusContextSegment(state, true);
+  let contextPart = themeText(contextFull, "muted", colorEnabled);
+  parts.push(contextPart);
   const credits = resolveStatusLineCredits(state);
   const creditsSegment = credits !== void 0 && credits > 0 ? themeText(formatCreditsChip(credits), "muted", colorEnabled) : "";
   if (creditsSegment) parts.push(creditsSegment);
   const pendingProcessCount = state.pendingProcessNotices?.length ?? 0;
   if (pendingProcessCount > 0) {
-    parts.push(themeText(`\u2699 ${pendingProcessCount} finished`, "info", colorEnabled));
+    parts.push(themeText(`\u21AA ${pendingProcessCount} pending`, "info", colorEnabled));
   }
   if (state.autoConfirm === true) {
     parts.push(themeText("\u23F5 auto", "warning", colorEnabled));
   }
+  let surface = colorEnabled ? surfaceBackgroundSequence() : "";
+  let padWidth = surface ? 2 : 0;
+  if (maxWidth && maxWidth > 0 && maxWidth <= padWidth) {
+    surface = "";
+    padWidth = 0;
+  }
+  let agentPart = agentSegment;
+  let creditsPart = creditsSegment;
   let visibleParts = parts;
   if (maxWidth && maxWidth > 0) {
-    const widthOf = (segments) => displayWidth(stripAnsi(segments.join(" \xB7 "))) + 2;
-    for (const optional of [cwdSegment, agentSegment, creditsSegment]) {
-      if (!optional) continue;
-      if (widthOf(visibleParts) <= maxWidth) break;
-      visibleParts = visibleParts.filter((part) => part !== optional);
+    const widthOf = (segments) => displayWidth(stripAnsi(segments.join(" \xB7 "))) + padWidth;
+    if (contextFull !== contextCompact && widthOf(visibleParts) > maxWidth) {
+      const contextIndex = visibleParts.indexOf(contextPart);
+      if (contextIndex >= 0) {
+        contextPart = themeText(contextCompact, "muted", colorEnabled);
+        visibleParts = visibleParts.with(contextIndex, contextPart);
+      }
+    }
+    if (widthOf(visibleParts) > maxWidth) {
+      visibleParts = visibleParts.filter((part) => part !== cwdSegment);
+    }
+    if (widthOf(visibleParts) > maxWidth) {
+      const agentIndex = visibleParts.indexOf(agentPart);
+      if (agentIndex >= 0) {
+        const othersWidth = widthOf(visibleParts.filter((part) => part !== agentPart));
+        const nameBudget = maxWidth - othersWidth - 3 - displayWidth("\u2726 ") - displayWidth(modeSuffix);
+        const shortName = truncateToWidth(state.agentName, nameBudget);
+        if (shortName) {
+          agentPart = themeText(`\u2726 ${shortName}${modeSuffix}`, "accent", colorEnabled);
+          visibleParts = visibleParts.with(agentIndex, agentPart);
+        }
+      }
+    }
+    if (widthOf(visibleParts) > maxWidth) {
+      visibleParts = visibleParts.filter((part) => part !== agentPart);
+    }
+    if (widthOf(visibleParts) > maxWidth) {
+      visibleParts = visibleParts.filter((part) => part !== contextPart);
+    }
+    if (widthOf(visibleParts) > maxWidth && creditsPart) {
+      const creditsIndex = visibleParts.indexOf(creditsPart);
+      if (creditsIndex >= 0) {
+        creditsPart = themeText(
+          formatCreditsChip(credits ?? 0, { compact: true }),
+          "muted",
+          colorEnabled
+        );
+        visibleParts = visibleParts.with(creditsIndex, creditsPart);
+      }
     }
     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
+        const { branch, modified, untracked } = state.gitStatus;
+        const dirtyText = `${modified > 0 ? ` *${modified}` : ""}${untracked > 0 ? ` ?${untracked}` : ""}`;
+        const othersWidth = widthOf(
+          visibleParts.filter((part) => part !== visibleParts[gitIndex])
         );
-        visibleParts = visibleParts.with(gitIndex, compactDirty);
+        const branchBudget = maxWidth - othersWidth - 3 - displayWidth("\u2442 ") - displayWidth(dirtyText);
+        const shortBranch = truncateToWidth(branch, branchBudget);
+        if (shortBranch) {
+          const branchText = themeText(`\u2442 ${shortBranch}`, "warning", colorEnabled);
+          const modifiedText = modified > 0 ? ` ${themeText(`*${modified}`, "danger", colorEnabled)}` : "";
+          const untrackedText = untracked > 0 ? ` ${themeText(`?${untracked}`, "muted", colorEnabled)}` : "";
+          visibleParts = visibleParts.with(
+            gitIndex,
+            `${branchText}${modifiedText}${untrackedText}`
+          );
+        } else {
+          const compactDirty = themeText(`\u2442${dirtyText}`, "warning", colorEnabled);
+          visibleParts = visibleParts.with(gitIndex, compactDirty);
+        }
       }
     }
     if (widthOf(visibleParts) > maxWidth) {
-      const emergency = [];
-      if (state.autoConfirm === true) {
-        emergency.push(themeText("\u23F5", "warning", colorEnabled));
-      }
-      if (state.gitStatus) {
-        const { modified, untracked } = state.gitStatus;
-        emergency.push(themeText(
-          `\u2442${modified > 0 ? `*${modified}` : ""}${untracked > 0 ? `?${untracked}` : ""}`,
-          "warning",
-          colorEnabled
-        ));
-      }
-      if (creditsSegment) {
-        emergency.push(themeText(formatCreditsChip(credits ?? 0, { compact: true }), "muted", colorEnabled));
-      }
-      visibleParts = [emergency.join(" ")];
+      const budget = maxWidth - padWidth;
+      const autoMark = state.autoConfirm === true ? themeText("\u23F5", "warning", colorEnabled) : "";
+      const gitCounts = state.gitStatus ? themeText(
+        `\u2442${state.gitStatus.modified > 0 ? `*${state.gitStatus.modified}` : ""}${state.gitStatus.untracked > 0 ? `?${state.gitStatus.untracked}` : ""}`,
+        "warning",
+        colorEnabled
+      ) : "";
+      const gitMark = state.gitStatus ? themeText(
+        `\u2442${state.gitStatus.modified > 0 ? "*" : ""}${state.gitStatus.untracked > 0 ? "?" : ""}`,
+        "warning",
+        colorEnabled
+      ) : "";
+      const noticeFull = pendingProcessCount > 0 ? themeText(`\u21AA${pendingProcessCount}`, "info", colorEnabled) : "";
+      const noticeMark = pendingProcessCount > 0 ? themeText("\u21AA", "info", colorEnabled) : "";
+      const creditsFull = creditsSegment ? themeText(
+        formatCreditsChip(credits ?? 0, { compact: true }),
+        "muted",
+        colorEnabled
+      ) : "";
+      const creditsMark = creditsSegment ? themeText("\u26A1\u2026", "muted", colorEnabled) : "";
+      const stages = [
+        [autoMark, gitCounts, noticeFull, creditsFull],
+        [autoMark, gitMark, noticeFull, creditsFull],
+        [autoMark, gitMark, noticeMark, creditsFull],
+        [autoMark, noticeMark, creditsFull],
+        [autoMark, creditsFull],
+        [autoMark, creditsMark],
+        // `autoMark` alone is only an honest projection when nothing was omitted.
+        // With a fee on the line, dropping it silently would claim "no cost".
+        ...creditsSegment ? [] : [[autoMark]]
+      ].map((stage) => stage.filter(Boolean)).filter((stage) => stage.length > 0);
+      const fitted = stages.find(
+        (stage) => displayWidth(stripAnsi(stage.join(" "))) <= budget
+      );
+      const autoWidth = displayWidth(stripAnsi(autoMark));
+      const overflowMark = autoMark && autoWidth + displayWidth("\u2026") <= budget ? `${autoMark}\u2026` : budget >= 1 ? "\u2026" : "";
+      visibleParts = fitted ? [fitted.join(" ")] : [overflowMark];
+    }
+  }
+  let body = visibleParts.join(sep);
+  if (maxWidth && maxWidth > 0) {
+    const budget = Math.max(0, maxWidth - padWidth);
+    if (displayWidth(stripAnsi(body)) > budget) {
+      body = budget >= 2 ? truncateToWidth(stripAnsi(body), budget) : budget >= 1 ? "\u2026" : "";
     }
   }
-  const body = visibleParts.join(sep);
-  const surface = colorEnabled ? surfaceBackgroundSequence() : "";
   if (!surface) return body;
   return `${surface} ${body} \x1B[49m`;
 }
@@ -9316,15 +9427,21 @@ function buildProcessTaskCompletedTurnEvent(notice) {
   };
 }
 var PENDING_NOTICE_PREFIX = "process-notice-v1:";
-function serializePendingProcessNotice(notice) {
-  return notice.resultCapsule ? `${PENDING_NOTICE_PREFIX}${JSON.stringify(notice)}` : formatProcessTerminalWakeLine(notice);
+function serializePendingProcessNotice(notice, ownerDialogId) {
+  const withOwner = { ...notice, ownerDialogId: ownerDialogId ?? null };
+  return `${PENDING_NOTICE_PREFIX}${JSON.stringify(withOwner)}`;
 }
 function parsePendingProcessNoticeLine(line) {
   if (line.startsWith(PENDING_NOTICE_PREFIX)) {
     try {
       const parsed = JSON.parse(line.slice(PENDING_NOTICE_PREFIX.length));
-      if (parsed && typeof parsed.taskId === "string" && parsed.resultCapsule) {
-        return parsed;
+      if (parsed && typeof parsed.taskId === "string") {
+        const { ownerDialogId, ...rest } = parsed;
+        return {
+          ...rest,
+          // 类型校验：只有非空字符串才是可信归属，其他形状一律降级为未知。
+          ownerDialogId: typeof ownerDialogId === "string" && ownerDialogId.length > 0 ? ownerDialogId : null
+        };
       }
     } catch {
     }
@@ -9338,7 +9455,8 @@ function parsePendingProcessNoticeLine(line) {
       pid: 0,
       label: "",
       command: line,
-      status: "failed"
+      status: "failed",
+      ownerDialogId: null
     };
   }
   const [, taskId, rawLabel, status, rawExit] = taskMatch;
@@ -9349,9 +9467,19 @@ function parsePendingProcessNoticeLine(line) {
     label,
     command: "",
     status: normalizeStatus(status),
+    ownerDialogId: null,
     ...rawExit !== void 0 ? { exitCode: Number(rawExit) } : {}
   };
 }
+function annotatePendingProcessNoticeOrigin(notice, currentDialogId) {
+  const withOrigin = (origin) => ({
+    ...notice,
+    label: notice.label.trim() ? `${origin} ${notice.label}` : origin
+  });
+  if (notice.ownerDialogId == null) return withOrigin("[\u5F52\u5C5E\u672A\u77E5]");
+  if (notice.ownerDialogId === currentDialogId) return notice;
+  return withOrigin(`[\u6765\u81EA\u53E6\u4E00\u5BF9\u8BDD ${notice.ownerDialogId}\uFF0C\u4E0D\u4EE3\u8868\u5F53\u524D\u4EFB\u52A1]`);
+}
 function unescapeLabel(raw) {
   return raw.replace(/\\(["\\])/g, "$1");
 }
@@ -11629,7 +11757,14 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
   const injectedProcessNoticeLines = state.pendingProcessNotices ? [...state.pendingProcessNotices] : [];
   const processNoticeBlocks = injectedProcessNoticeLines.length > 0 ? [{
     content: buildProcessTerminalTurnMessage(
-      injectedProcessNoticeLines.map(parsePendingProcessNoticeLine)
+      injectedProcessNoticeLines.map(
+        (line) => annotatePendingProcessNoticeOrigin(
+          parsePendingProcessNoticeLine(line),
+          // 本函数的 state 即当前 session 状态；首轮尚未回填 dialogId
+          // 时为 undefined（标注侧按「不冒充当前任务」处理）。
+          state.dialogId
+        )
+      )
     ),
     cacheScope: "turn"
   }] : [];
@@ -14873,7 +15008,8 @@ async function runTuiWorkspace(options) {
     const deployWakeLifecycle = { dispose: null };
     const pushPendingProcessNotice = (notice) => {
       if (sessionEnded) return;
-      const line = serializePendingProcessNotice(notice);
+      const ownerDialogId = getProcessRegistry().getByTaskId(notice.taskId)?.owner?.dialogId ?? null;
+      const line = serializePendingProcessNotice(notice, ownerDialogId);
       state = {
         ...state,
         pendingProcessNotices: [...state.pendingProcessNotices ?? [], line]