nolo-cli 0.49.0-alpha.1 → 0.49.0

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

@@ -64,14 +64,14 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-VZGLZTG7.js";
+} from "./chunk-IRJVFYOH.js";
 import {
   listFavoriteAgentIdsAcrossServers,
   listLocalCachedAgents,
   listRemoteAgents,
   listRemoteAgentsAcrossServers,
   normalizeListedAgent
-} from "./chunk-C2WF2OY7.js";
+} from "./chunk-5WADL4O7.js";
 import "./chunk-ID4G2MAR.js";
 import {
   listUserRecordsFromServers,
@@ -86,8 +86,8 @@ import {
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-33BBDA67.js";
-import "./chunk-3YVCM5PE.js";
+} from "./chunk-QUCSAM43.js";
+import "./chunk-U5Z7LFZF.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-NI2BS6UD.js";
 import {
@@ -118,14 +118,14 @@ import "./chunk-ATNTHIZI.js";
 import "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-RPO6WAZV.js";
+} from "./chunk-HCMFFI2G.js";
 import "./chunk-HS7MLR74.js";
-import "./chunk-4ZL2KBI7.js";
-import "./chunk-72COHDZR.js";
+import "./chunk-757BGY6Y.js";
+import "./chunk-WKOEOQCI.js";
 import "./chunk-5XTOKQLW.js";
 import "./chunk-NF64D32W.js";
 import "./chunk-3L2WKC3W.js";
-import "./chunk-Z7A54NFZ.js";
+import "./chunk-RU5D3B22.js";
 import "./chunk-KQHGZWSV.js";
 import "./chunk-5XCW6RQG.js";
 import {
@@ -140,7 +140,7 @@ import {
   shortRunId
 } from "./chunk-KXKQO4Q6.js";
 import "./chunk-INZZJSQF.js";
-import "./chunk-QDNFRWAX.js";
+import "./chunk-GFD7TIZU.js";
 import "./chunk-BANYWEYY.js";
 import "./chunk-HCBQVVFZ.js";
 import "./chunk-MEYIRKDN.js";
@@ -151,15 +151,15 @@ import {
   createTurnRequest,
   normalizeRunCompletionShape
 } from "./chunk-YPREESF4.js";
-import "./chunk-IERBSHMR.js";
-import "./chunk-7M72YPM2.js";
+import "./chunk-AVKUDHJO.js";
+import "./chunk-6SMMK7MD.js";
 import {
   extractReferenceKeysFromMessage
-} from "./chunk-MCX2LX27.js";
+} from "./chunk-EURF2SV6.js";
 import "./chunk-EVBFYPDC.js";
 import "./chunk-H2G6JXTR.js";
 import "./chunk-YYLHWIW6.js";
-import "./chunk-5JXRVJAC.js";
+import "./chunk-WX5E6HZS.js";
 import "./chunk-AGGIDPCZ.js";
 import "./chunk-SG65C33A.js";
 import "./chunk-5RGU3J7P.js";
@@ -183,10 +183,10 @@ import {
   buildLocalWorkspaceToolset,
   getProcessRegistry,
   readCommandActionGatePayload
-} from "./chunk-S3HB4CQY.js";
-import "./chunk-XB7ACJFH.js";
+} from "./chunk-IKSFDJXB.js";
+import "./chunk-GDGIEGHV.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-VKSBVRGP.js";
+import "./chunk-CVT7L2WZ.js";
 import "./chunk-T27IEBNQ.js";
 import "./chunk-N7J63Q6C.js";
 import {
@@ -194,11 +194,11 @@ import {
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks,
   resolveToolGuidedSections
-} from "./chunk-HMMOAG2I.js";
+} from "./chunk-NN3AMBY3.js";
 import "./chunk-6BYAXNH5.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-JBL24PK6.js";
+} from "./chunk-SP3DPVBH.js";
 import "./chunk-TNPCQNGQ.js";
 import {
   isQuotaExhaustedError
@@ -207,7 +207,7 @@ import "./chunk-2MBTWINN.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-F22JQTSX.js";
+} from "./chunk-SW7RCUGA.js";
 import {
   buildCompactionMetricsFromPlan,
   buildCompactionUserContent,
@@ -219,10 +219,10 @@ import {
   planCompression,
   serializeMessageContent
 } from "./chunk-HR5XDXYM.js";
-import "./chunk-AV4Z57LV.js";
+import "./chunk-VRJUIUIY.js";
 import "./chunk-NQ4N4IGO.js";
 import "./chunk-FD36SCCD.js";
-import "./chunk-BO3YFOZR.js";
+import "./chunk-QDHZCAH3.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -268,8 +268,8 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import "./chunk-Y7TGWSUN.js";
-import "./chunk-VFN256RI.js";
+import "./chunk-56W233KG.js";
+import "./chunk-WL3UOGYO.js";
 import "./chunk-SQTVMYMU.js";
 import "./chunk-X7S7OFUX.js";
 import "./chunk-Y5GCAMGP.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,9 +1856,25 @@ 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;
 }
+function sanitizeRunSnapshotForNormal(snapshot) {
+  const clean = (value) => stripAnsi(value).replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
+  return {
+    ...snapshot,
+    agentName: snapshot.agentName ? clean(snapshot.agentName) : snapshot.agentName,
+    taskPreview: snapshot.taskPreview ? clean(snapshot.taskPreview) : snapshot.taskPreview,
+    lastAssistantText: snapshot.lastAssistantText ? clean(snapshot.lastAssistantText) : snapshot.lastAssistantText,
+    lastToolNames: snapshot.lastToolNames?.map(clean).filter(Boolean),
+    errorMessage: void 0,
+    logLines: void 0
+  };
+}
 
 // packages/cli/tui/agentRunPanelLines.ts
 function formatPanelProgress(snapshot, now) {
@@ -1868,7 +1910,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(
@@ -2007,11 +2049,13 @@ function createRunDock(deps) {
     const ordered = orderedEntries();
     if (ordered.length === 0) return [];
     const at = now();
-    if (ordered.length === 1) {
-      return formatAgentRunPanelLines(ordered[0].snapshot, colorEnabled, at);
+    const mode = typeof deps.displayMode === "function" ? deps.displayMode() : deps.displayMode;
+    const displaySnapshots = mode === "normal" || mode === "hide" ? ordered.map((entry) => sanitizeRunSnapshotForNormal(entry.snapshot)) : ordered.map((entry) => entry.snapshot);
+    if (displaySnapshots.length === 1) {
+      return formatAgentRunPanelLines(displaySnapshots[0], colorEnabled, at);
     }
     return formatRunDockLines(
-      ordered.map((entry) => entry.snapshot),
+      displaySnapshots,
       colorEnabled,
       at,
       maxRows
@@ -2070,7 +2114,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);
@@ -2180,7 +2224,8 @@ function createActivityIndicator(deps) {
     onRepaint: deps.onRepaint,
     now,
     setIntervalFn,
-    clearIntervalFn
+    clearIntervalFn,
+    displayMode: deps.displayMode
   });
   const updateAgentRun = (snapshot) => {
     runDock.update(snapshot);
@@ -2241,25 +2286,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 +2369,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 +2404,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 +3650,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 +3679,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;
+      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 +4395,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 +4565,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")
@@ -5945,8 +6012,13 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
     cachedMemoryOverlay: memoryPromptBlock
   };
 }
+function isApprovedConfirmationInput(answer) {
+  const normalized = answer.trim().toLowerCase();
+  return normalized === "" || normalized === "y" || normalized === "yes" || normalized === "\u786E\u8BA4";
+}
 function waitForActionGate(rl, input, output, gate, spawnRunner) {
   const commandPayload = gate.kind === "handoff" ? readCommandActionGatePayload(gate.payload) : null;
+  const isConfirmation = gate.kind === "confirm";
   const displayCommand = commandPayload?.displayCommand ?? commandPayload?.command.join(" ") ?? gate.title;
   const isInteractiveHandoff = gate.kind === "handoff" && gate.title === "This command requires an interactive terminal.";
   const title = isInteractiveHandoff ? t("actionGateInteractiveTitle") : gate.title;
@@ -5960,7 +6032,7 @@ function waitForActionGate(rl, input, output, gate, spawnRunner) {
 `);
   output.write(`  ${displayCommand}
 `);
-  output.write(`[nolo] ${t("actionGateEnterHint")}
+  output.write(`[nolo] ${isConfirmation ? t("actionGateConfirmHint") : t("actionGateEnterHint")}
 `);
   return new Promise((resolve2) => {
     let settled = false;
@@ -5989,8 +6061,12 @@ function waitForActionGate(rl, input, output, gate, spawnRunner) {
     const onSigint = () => finish(cancelResult("interrupted"));
     rl.once("close", onClose);
     rl.once("SIGINT", onSigint);
-    rl.question("", async () => {
+    rl.question("", async (answer) => {
       if (settled) return;
+      if (isConfirmation) {
+        finish(isApprovedConfirmationInput(answer) ? { content: `action gate completed: ${gate.title}`, metadata: { actionGateResult: { gateId: gate.id, status: "completed", output: "confirmed" } } } : cancelResult("confirmation declined"));
+        return;
+      }
       if (!commandPayload) {
         finish(failResult("unsupported gate payload"));
         return;
@@ -6037,6 +6113,7 @@ function isInteractiveInput(input) {
 }
 function waitForRawActionGate(input, output, gate, spawnRunner, hooks) {
   const commandPayload = gate.kind === "handoff" ? readCommandActionGatePayload(gate.payload) : null;
+  const isConfirmation = gate.kind === "confirm";
   const displayCommand = commandPayload?.displayCommand ?? commandPayload?.command.join(" ") ?? gate.title;
   const isInteractiveHandoff = gate.kind === "handoff" && gate.title === "This command requires an interactive terminal.";
   const title = isInteractiveHandoff ? t("actionGateInteractiveTitle") : gate.title;
@@ -6050,12 +6127,13 @@ function waitForRawActionGate(input, output, gate, spawnRunner, hooks) {
 `);
   output.write(`  ${displayCommand}
 `);
-  output.write(`[nolo] ${t("actionGateEnterHint")}
+  output.write(`[nolo] ${isConfirmation ? t("actionGateConfirmHint") : t("actionGateEnterHint")}
 `);
   return new Promise((resolve2) => {
     const rawInput = input;
     let settled = false;
     let commandRunning = false;
+    let confirmationLine = "";
     const finish = (result) => {
       if (settled) return;
       settled = true;
@@ -6119,12 +6197,38 @@ function waitForRawActionGate(input, output, gate, spawnRunner, hooks) {
     };
     const handleToken = (text) => {
       if (settled || commandRunning) return;
-      if (text.includes("")) {
+      if (text.includes("") || isConfirmation && text.includes("\x1B")) {
         cancel("interrupted");
         return;
       }
+      if (isConfirmation) {
+        const newline = text.search(/[\r\n]/);
+        confirmationLine += newline >= 0 ? text.slice(0, newline) : text;
+        if (newline >= 0) {
+          const normalized = confirmationLine.trim().toLowerCase();
+          confirmationLine = "";
+          if (!isApprovedConfirmationInput(confirmationLine)) {
+            cancel("confirmation declined");
+            return;
+          }
+          finish({
+            content: `action gate completed: ${gate.title}`,
+            metadata: { actionGateResult: { gateId: gate.id, status: "completed", output: "confirmed" } }
+          });
+        }
+        return;
+      }
       if (text.includes("\r") || text.includes("\n")) {
-        void runCommand();
+        if (isConfirmation) {
+          finish({
+            content: `action gate completed: ${gate.title}`,
+            metadata: {
+              actionGateResult: { gateId: gate.id, status: "completed", output: "confirmed" }
+            }
+          });
+        } else {
+          void runCommand();
+        }
       }
     };
     const onData = (chunk) => {
@@ -6942,7 +7046,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));
@@ -8010,6 +8114,7 @@ async function runTuiWorkspace(options) {
     isTurnActive: () => activeTurnAbort !== null,
     fallbackLabel: () => `${state.agentName} -> working`,
     stoppingLabel: () => t("turnStopping"),
+    displayMode: () => state.toolDisplay,
     onRepaint: () => {
       if (fixedInput.active && !fixedInput.isPaused()) {
         output.write("\x1B[?2026h\x1B[?25l");
@@ -8036,7 +8141,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 +8408,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: () => {