nolo-cli 0.29.2 → 0.30.0-alpha.10

package/{readlineWorkspace-HUPHMLDG.js → readlineWorkspace-5AQHHIBK.js}

@@ -3,11 +3,9 @@ import {
   normalizeDialogRecord,
   readDialogSnapshot,
   sortDialogs
-} from "./chunk-4BDPDTJU.js";
+} from "./chunk-TXVSNFHC.js";
 import {
   ANSI_ESCAPE_REGEX,
-  CLI_AUTO_TIER_AGENT_KEY_TABLE,
-  CLI_IMAGE_AGENT_KEY,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   THEME_PALETTES,
   allocateCollapsedPaste,
@@ -59,8 +57,8 @@ import {
   visibleWidth,
   wrapTextToLines,
   wrapTranscriptLine
-} from "./chunk-Q5RXHXKU.js";
-import "./chunk-DZ3XJVET.js";
+} from "./chunk-W3UDJJMA.js";
+import "./chunk-AOS5IN2I.js";
 import "./chunk-6HYVJV7B.js";
 import {
   listFavoriteAgentIdsAcrossServers,
@@ -68,12 +66,12 @@ import {
   listRemoteAgents,
   listRemoteAgentsAcrossServers,
   normalizeListedAgent
-} from "./chunk-NXMJ55RU.js";
+} from "./chunk-S2BMRBR2.js";
 import "./chunk-ID4G2MAR.js";
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-DF7SMWEV.js";
+} from "./chunk-RWJPDKPB.js";
 import {
   createCliLocalRuntimeAdapter,
   initCliLocale,
@@ -81,8 +79,17 @@ import {
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-H5S4XUGI.js";
-import "./chunk-WX3ZOSTL.js";
+} from "./chunk-Q243PXRU.js";
+import "./chunk-EBNSAABL.js";
+import {
+  checkStaleRun,
+  isRunRecordClaimed,
+  readRunRecord
+} from "./chunk-4SAV7BD7.js";
+import "./chunk-JDSUTNYY.js";
+import "./chunk-WJRJDX2W.js";
+import "./chunk-LM6IYQ3F.js";
+import "./chunk-JBTJAPUF.js";
 import {
   getReadableCliDb
 } from "./chunk-WFHXMLHZ.js";
@@ -90,114 +97,55 @@ import {
   deleteDbRecord,
   queryUserRecords,
   readDbRecord
-} from "./chunk-QC6ZWDSV.js";
-import "./chunk-R3JSTDQO.js";
+} from "./chunk-PIC6Z7VI.js";
+import "./chunk-GVPMJPCT.js";
 import {
   NOLO_DEFAULT_AGENT_KEY,
   resolveCliAgentKeyInput
-} from "./chunk-VHBWHNVT.js";
-import "./chunk-LTRXGFMS.js";
-import "./chunk-W2LZV5GE.js";
-import "./chunk-JEXVIMYZ.js";
-import {
-  prepareTools
-} from "./chunk-32ZM6HVI.js";
-import "./chunk-2FX23RGA.js";
-import "./chunk-WMB7GVPN.js";
-import "./chunk-RQSOAMPJ.js";
-import "./chunk-GC34RRTQ.js";
-import "./chunk-HRJEPMZY.js";
-import "./chunk-KQHGZWSV.js";
-import "./chunk-3LY4F7SV.js";
-import "./chunk-VF4K2QE6.js";
-import "./chunk-VKBTAQWT.js";
-import "./chunk-6HTWA77J.js";
-import "./chunk-VP4WJWKW.js";
-import "./chunk-63W5N6P3.js";
-import "./chunk-WJRJDX2W.js";
-import "./chunk-GMJS5AYP.js";
-import {
-  extractReferenceKeysFromMessage
-} from "./chunk-UFL6WHHJ.js";
-import {
-  buildBuiltinSummaryContent
-} from "./chunk-XOIF2TNF.js";
-import "./chunk-MRC4Q34M.js";
-import "./chunk-SIZQB7BD.js";
-import "./chunk-RJBTU7AS.js";
-import "./chunk-YYLHWIW6.js";
-import "./chunk-CWMSB67P.js";
-import "./chunk-IC7W63RM.js";
-import "./chunk-5RGU3J7P.js";
-import "./chunk-M76ECQRD.js";
-import "./chunk-L65QKSVJ.js";
+} from "./chunk-K6QEHQZ3.js";
 import {
   buildSkillDiscoveryContextBlock,
   buildSkillDiscoveryContextLayer
-} from "./chunk-ZVZMT3EA.js";
-import "./chunk-7H3UTGPM.js";
-import {
-  expandEnabledPacks
-} from "./chunk-CF7S2RYZ.js";
-import "./chunk-ZWJOGMKH.js";
-import "./chunk-WZSRQNQG.js";
+} from "./chunk-KWCLUYGQ.js";
 import {
   buildLocalWorkspaceOpenAiTools,
   buildLocalWorkspaceToolset,
   getProcessRegistry
-} from "./chunk-KEF5OBOZ.js";
+} from "./chunk-GKXS4F2I.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-HALKDXKP.js";
+import "./chunk-XORE26Z4.js";
+import "./chunk-LTRXGFMS.js";
+import "./chunk-ATNTHIZI.js";
 import "./chunk-OIQPORYI.js";
+import "./chunk-T27IEBNQ.js";
+import "./chunk-JEXVIMYZ.js";
 import {
-  readCommandActionGatePayload,
-  resolveAgentImageInputSupport
-} from "./chunk-Z54ZAZZC.js";
+  prepareTools
+} from "./chunk-NZBH7FTB.js";
+import {
+  readCommandActionGatePayload
+} from "./chunk-VQ4QPCKE.js";
 import "./chunk-N7J63Q6C.js";
+import {
+  buildAgentsMdLayer,
+  partitionScopedBlocks,
+  renderTurnContextBlocksWithScope
+} from "./chunk-PJY5AH5A.js";
+import "./chunk-J3LHGBNO.js";
 import {
   buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks,
   resolveToolGuidedSections
-} from "./chunk-PSK2RUHV.js";
+} from "./chunk-OIW2RJ74.js";
 import "./chunk-D34RI6NI.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-XS7UPVR7.js";
-import "./chunk-UEOPA6MV.js";
-import "./chunk-2MBTWINN.js";
-import {
-  DEFAULT_CONTEXT_WINDOW,
-  estimateTokenCount,
-  getModelContextWindow,
-  planCompression,
-  serializeMessageContent
-} from "./chunk-HYSJHRWD.js";
-import {
-  clipCompactText
-} from "./chunk-5MMAK75Q.js";
-import "./chunk-5CS33IBL.js";
-import "./chunk-JZPBVBIY.js";
-import "./chunk-GT3GG2H7.js";
-import "./chunk-ZHXJ6M7T.js";
-import {
-  buildAgentsMdLayer,
-  partitionScopedBlocks,
-  renderTurnContextBlocksWithScope
-} from "./chunk-PJY5AH5A.js";
+} from "./chunk-WTPC3XD4.js";
 import "./chunk-4PWB7JRR.js";
-import {
-  canonicalizeToolNames
-} from "./chunk-ZZ2MH7LE.js";
-import "./chunk-OMP5L5NF.js";
-import "./chunk-3ASDTTEI.js";
-import {
-  compactWhitespace
-} from "./chunk-DWLEOOGR.js";
-import {
-  checkStaleRun,
-  readRunRecord
-} from "./chunk-RZNYL4LW.js";
+import "./chunk-2MBTWINN.js";
+import "./chunk-IPSPETAL.js";
+import "./chunk-Z5MXSEOJ.js";
 import {
   clipText,
   formatDuration,
@@ -209,13 +157,51 @@ import {
   runShowsLogTail,
   shortRunId
 } from "./chunk-KXKQO4Q6.js";
-import "./chunk-JDSUTNYY.js";
-import "./chunk-JBTJAPUF.js";
-import "./chunk-ATNTHIZI.js";
-import "./chunk-LM6IYQ3F.js";
+import "./chunk-2HQ4OG6N.js";
+import "./chunk-KQHGZWSV.js";
+import "./chunk-CYRMUTGB.js";
+import "./chunk-6JH2DF7J.js";
+import "./chunk-43EPBPZ2.js";
+import "./chunk-F3MP7CP6.js";
+import "./chunk-SWYMCHM7.js";
+import "./chunk-44HACRCK.js";
+import "./chunk-T4X4GCYT.js";
+import "./chunk-DCDL3GC4.js";
+import "./chunk-PACNSC37.js";
+import "./chunk-3LY4F7SV.js";
+import "./chunk-YLC42PIE.js";
+import {
+  DEFAULT_CONTEXT_WINDOW,
+  estimateTokenCount,
+  extractReferenceKeysFromMessage,
+  getModelContextWindow,
+  planCompression,
+  serializeMessageContent
+} from "./chunk-LEVCXTDN.js";
+import {
+  buildBuiltinSummaryContent,
+  clipCompactText
+} from "./chunk-OB6FBSH3.js";
+import "./chunk-ATK5WJOA.js";
+import "./chunk-4F77PJBR.js";
+import "./chunk-JZPBVBIY.js";
+import "./chunk-5RGU3J7P.js";
+import "./chunk-M76ECQRD.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
+import {
+  compactWhitespace
+} from "./chunk-DWLEOOGR.js";
+import "./chunk-3ASDTTEI.js";
+import "./chunk-V54H24CQ.js";
+import "./chunk-WTGCTVJG.js";
+import "./chunk-CWMSB67P.js";
+import "./chunk-EIQDGAAE.js";
+import "./chunk-ZHXJ6M7T.js";
+import "./chunk-CAENRKNJ.js";
+import "./chunk-63W5N6P3.js";
+import "./chunk-VF4K2QE6.js";
 import {
   checkForCliUpdate,
   runSelfUpdate
@@ -237,35 +223,41 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import "./chunk-L3QFIBZG.js";
-import "./chunk-YTA2QOEE.js";
-import "./chunk-HRPWRVBI.js";
-import "./chunk-R7LOFGRE.js";
-import "./chunk-Y5GCAMGP.js";
-import "./chunk-UZ6XXCVR.js";
+import "./chunk-KGEVMUMI.js";
+import "./chunk-G5GVZAXF.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-JSB4N6NU.js";
-import "./chunk-G2BZ43DV.js";
-import "./chunk-NRY4GCKJ.js";
-import "./chunk-WWC7I6TA.js";
-import "./chunk-SKDNBYZK.js";
-import "./chunk-I42VC5KR.js";
+import "./chunk-LAXMH7JY.js";
+import "./chunk-ZJ2WITOO.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
-import "./chunk-L6RBX4L4.js";
-import "./chunk-XMLRJUU5.js";
-import "./chunk-R5V5G73M.js";
-import "./chunk-GBRG75BQ.js";
-import "./chunk-3EUW3WEO.js";
-import "./chunk-U6VC4MU4.js";
+import "./chunk-ZJH3LKEW.js";
 import {
   extractCustomId
 } from "./chunk-TOW4E763.js";
-import "./chunk-KUG52IAP.js";
+import "./chunk-2IJAKBK2.js";
+import "./chunk-5RDLGLAP.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
+import "./chunk-VP4WJWKW.js";
+import "./chunk-L3GCUVOH.js";
+import "./chunk-WHLVPK32.js";
+import "./chunk-WWC7I6TA.js";
+import "./chunk-GBRG75BQ.js";
+import "./chunk-3EUW3WEO.js";
+import "./chunk-U6VC4MU4.js";
+import "./chunk-KUG52IAP.js";
+import {
+  canonicalizeToolNames
+} from "./chunk-3AUWC6EM.js";
+import {
+  expandEnabledPacks
+} from "./chunk-CF7S2RYZ.js";
+import "./chunk-ZWJOGMKH.js";
+import "./chunk-WZSRQNQG.js";
+import "./chunk-UZ6XXCVR.js";
+import "./chunk-I42VC5KR.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -2271,13 +2263,22 @@ function createRunCompletionWatcher(deps) {
   const createdAt = now();
   const lastStatusByRunId = /* @__PURE__ */ new Map();
   const notifiedRunIds = /* @__PURE__ */ new Set();
+  const runDuration = (record) => formatRunAge(
+    {
+      startedAt: readTimestamp(record.startedAt),
+      finishedAt: readTimestamp(record.endedAt ?? record.finishedAt)
+    },
+    now()
+  ) ?? "";
+  const isFailureStatus = (status) => typeof status === "string" && status !== "done";
   const describeRun = (record) => {
     const lines = [
       `runId: ${record.runId}`,
       `agent: ${resolveRunLabel(record)}`,
       `status: ${record.status}`
     ];
-    if (typeof record.exitCode === "number") {
+    const verbose = isFailureStatus(record.status);
+    if (verbose && typeof record.exitCode === "number") {
       lines.push(`exitCode: ${record.exitCode}`);
     }
     if (record.dialogId) {
@@ -2287,18 +2288,12 @@ function createRunCompletionWatcher(deps) {
     } else {
       lines.push(`childDialogId: missing (result unpersisted or ephemeral)`);
     }
-    const duration = formatRunAge(
-      {
-        startedAt: readTimestamp(record.startedAt),
-        finishedAt: readTimestamp(record.endedAt ?? record.finishedAt)
-      },
-      now()
-    );
+    const duration = runDuration(record);
     if (duration) lines.push(`duration: ${duration}`);
     const recordError = "error" in record && typeof record.error === "string" ? record.error : void 0;
     const note = typeof record.note === "string" ? clipText(record.note, WAKE_NOTE_MAX_CHARS) : typeof recordError === "string" ? clipText(recordError, WAKE_NOTE_MAX_CHARS) : "";
     if (note) lines.push(`note: ${note}`);
-    const counters = record.activity?.counters;
+    const counters = verbose ? record.activity?.counters : void 0;
     if (counters && typeof counters.toolCalls === "number" && typeof counters.llmCalls === "number" && typeof counters.fileEdits === "number") {
       lines.push(
         `activity: ${counters.toolCalls} tool calls \xB7 ${counters.llmCalls} llm calls \xB7 ${counters.fileEdits} edits`
@@ -2319,6 +2314,16 @@ function createRunCompletionWatcher(deps) {
     );
     return lines.join("\n");
   };
+  const buildWakeDisplayText = (finished) => {
+    const parts = finished.map((record) => {
+      const mark = isFailureStatus(record.status) ? "\u2717" : "\u2713";
+      const duration = runDuration(record);
+      const label = resolveRunLabel(record);
+      const status = isFailureStatus(record.status) ? ` ${record.status}` : "";
+      return `${mark} ${label}${status}${duration ? ` \xB7 ${duration}` : ""}`;
+    });
+    return `${finished.length} \u6761\u540E\u53F0 run \u5DF2\u5B8C\u6210 \xB7 ${parts.join(" \xB7 ")}`;
+  };
   return {
     observe(records) {
       const finished = [];
@@ -2328,13 +2333,15 @@ function createRunCompletionWatcher(deps) {
           if (!rawRecord || typeof rawRecord.runId !== "string" || !rawRecord.runId) continue;
           const record = rawRecord;
           if (notifiedRunIds.has(record.runId)) continue;
-          if (record.ack === true) {
-            notifiedRunIds.add(record.runId);
-            continue;
-          }
           const status = record.status;
           if (typeof status !== "string") continue;
           if (record.parentDialogId !== currentDialogId) continue;
+          if (isRunRecordClaimed(record, now())) {
+            if (!isAgentRunTerminalStatus(status)) {
+              lastStatusByRunId.set(record.runId, status);
+            }
+            continue;
+          }
           const previous = lastStatusByRunId.get(record.runId);
           lastStatusByRunId.set(record.runId, status);
           if (!isAgentRunTerminalStatus(status)) continue;
@@ -2356,7 +2363,8 @@ function createRunCompletionWatcher(deps) {
       const event = {
         kind: "child-run-completed",
         runs: shapes,
-        text: summaryText
+        text: summaryText,
+        displayText: buildWakeDisplayText(finished)
       };
       deps.onWake(event);
     },
@@ -3630,7 +3638,6 @@ var SLASH_COMMANDS = [
   "/ctx",
   "/runtime",
   "/tools",
-  "/thinking",
   "/switch",
   "/agent",
   "/agents",
@@ -4507,6 +4514,10 @@ function resolveChatSendDecision(input) {
 }
 
 // packages/core/chat/chatQueueStatus.ts
+function resolveQueuePreviewText(item) {
+  if (typeof item === "string") return item;
+  return item?.event?.displayText ?? item?.text ?? "";
+}
 function projectChatQueueStatus({
   state,
   maxPreview = 3,
@@ -4515,7 +4526,7 @@ function projectChatQueueStatus({
   const preview = [];
   for (let i = 0; i < Math.min(maxPreview, state.queue.length); i++) {
     const item = state.queue[i];
-    const text = typeof item === "string" ? item : item?.text ?? "";
+    const text = resolveQueuePreviewText(item);
     preview.push(text.length > previewCharLimit ? text.slice(0, previewCharLimit) + "\u2026" : text);
   }
   let composerPlaceholderKey = "default";
@@ -4715,6 +4726,18 @@ function finalizeCurrentTurn(history) {
     }
   }
 }
+function appendLocalTurn(history, command, output) {
+  finalizeCurrentTurn(history);
+  history.turns.push({
+    role: "local",
+    command,
+    content: output
+  });
+  if (history.turns.length > MAX_TUI_HISTORY_TURNS) {
+    history.turns = history.turns.slice(history.turns.length - MAX_TUI_HISTORY_TURNS);
+  }
+  resetStreamingTurnCache();
+}
 function applyOutputChunkToCurrentTurn(history, chunk) {
   const next = applyTerminalOutputToText(history.currentContent, chunk);
   if (next === history.currentContent) return false;
@@ -4742,7 +4765,7 @@ function fillUserBubbleRow(row, surfaceSeq, contentWidth) {
   }
   return renderSurfaceLine({ text: row, surface: surfaceSeq, padTo: contentWidth });
 }
-function renderTurnBlock(role, content, contentWidth, colorEnabled) {
+function renderTurnBlock(role, content, contentWidth, colorEnabled, command) {
   content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
   const lines = [];
   if (role === "user") {
@@ -4761,6 +4784,21 @@ function renderTurnBlock(role, content, contentWidth, colorEnabled) {
         ...surfaceSeq ? rows.map((row) => fillUserBubbleRow(row, surfaceSeq, contentWidth)) : rows
       );
     }
+  } else if (role === "local") {
+    const dimSeq = colorEnabled ? "\x1B[2m" : "";
+    const resetSeq = colorEnabled ? "\x1B[0m" : "";
+    if (command) {
+      lines.push(
+        ...wrapTranscriptLine(`${dimSeq}\u203A ${command}${resetSeq}`, contentWidth)
+      );
+    }
+    if (content) {
+      for (const line of content.split("\n")) {
+        lines.push(
+          ...wrapTranscriptLine(`${dimSeq}  ${line}${resetSeq}`, contentWidth)
+        );
+      }
+    }
   } else {
     const styledEntry = styleAssistantTurn(content, colorEnabled);
     for (const logicalLine of styledEntry.split("\n")) {
@@ -4894,13 +4932,22 @@ function getAssistantPlainLines(content) {
   assistantPlainLinesCache.set(content, plainLines);
   return plainLines;
 }
-function countTurnLines(role, content, contentWidth) {
+function countTurnLines(role, content, contentWidth, command) {
   content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
   let count = 0;
   if (role === "user") {
     for (const line of content.split("\n")) {
       count += wrapTranscriptLine(`\u2503  ${line}`, contentWidth, "\u2503  ").length;
     }
+  } else if (role === "local") {
+    if (command) {
+      count += wrapTranscriptLine(`\u203A ${command}`, contentWidth).length;
+    }
+    if (content) {
+      for (const line of content.split("\n")) {
+        count += wrapTranscriptLine(`  ${line}`, contentWidth).length;
+      }
+    }
   } else {
     const plainLines = getAssistantPlainLines(content);
     for (let i = 0; i < plainLines.length; i++) {
@@ -4924,7 +4971,7 @@ function buildTurnOffsets(history, contentWidth) {
     if (cached && cached.width === contentWidth) {
       lineCount = cached.count;
     } else {
-      lineCount = countTurnLines(turn.role, turn.content, contentWidth);
+      lineCount = countTurnLines(turn.role, turn.content, contentWidth, turn.command);
       turnLineCountCache.set(turn, { width: contentWidth, count: lineCount });
     }
     entries.push({ startRow: offset, lineCount, separatorAbove });
@@ -4944,7 +4991,14 @@ function buildCopyViewLines(history) {
   for (const [index, turn] of turns.entries()) {
     if (index > 0) lines.push("");
     const normalized = stripAnsi(turn.content).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-    lines.push(...normalized.split("\n"));
+    if (turn.role === "local") {
+      if (turn.command) {
+        lines.push(`\u203A ${stripAnsi(turn.command)}`);
+      }
+      lines.push(...normalized.split("\n"));
+    } else {
+      lines.push(...normalized.split("\n"));
+    }
   }
   return lines;
 }
@@ -5008,7 +5062,7 @@ function renderHistory(output, history, inputLines) {
       lines = cached.lines;
     } else {
       renderCacheMissCount += 1;
-      lines = renderTurnBlock(turn.role, turn.content, contentWidth, colorEnabled);
+      lines = renderTurnBlock(turn.role, turn.content, contentWidth, colorEnabled, turn.command);
       turnLineCache.set(turn, {
         width: contentWidth,
         color: colorEnabled,
@@ -5714,34 +5768,6 @@ async function runAgentChat(scriptDir, state, message, env, output, agentRunner
       );
     }
   }
-  const userSelectedAgent = state.agentKey !== DEFAULT_TUI_AGENT_KEY;
-  const visionProbeKey = hasImages && userSelectedAgent ? state.agentKey : effectiveAgentKey;
-  if (hasImages && effectiveAgentKey !== CLI_IMAGE_AGENT_KEY) {
-    let needsVisionSwitch = false;
-    if (CLI_AUTO_TIER_AGENT_KEY_TABLE[visionProbeKey]) {
-      needsVisionSwitch = true;
-    } else {
-      const authToken = resolvePlatformAuthToken(env);
-      const record = await readDbRecord({
-        dbKey: visionProbeKey,
-        authToken,
-        serverUrl: state.serverUrl,
-        fetchImpl: fetch
-      }).catch(() => null);
-      if (record && !resolveAgentImageInputSupport(record)) {
-        needsVisionSwitch = true;
-      }
-    }
-    if (needsVisionSwitch) {
-      output.write(
-        `
-[nolo] \u5F53\u524D agent \u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF0C\u5DF2\u81EA\u52A8\u5207\u6362\u5230 Kimi K2.6
-`
-      );
-      effectiveAgentKey = CLI_IMAGE_AGENT_KEY;
-      effectiveAgentName = "Kimi K2.6";
-    }
-  }
   let effectiveMessage = message;
   let skillAllowedTools;
   let skillContextBlocks;
@@ -6352,8 +6378,13 @@ async function startTuiWorkspace(options) {
     turnEpoch += 1;
     const myEpoch = turnEpoch;
     history.followBottom = true;
-    startTurn(history, "user");
-    appendToCurrentTurn(history, message);
+    const isInternalEvent = req.event.kind !== "user";
+    const transcriptText = req.event.kind === "child-run-completed" ? req.event.displayText ?? req.event.text : message;
+    startTurn(history, isInternalEvent ? "assistant" : "user");
+    appendToCurrentTurn(
+      history,
+      isInternalEvent ? dimCliText(transcriptText, resolveCliColorEnabled()) : transcriptText
+    );
     finalizeCurrentTurn(history);
     renderHistoryToOutput();
     if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
@@ -6497,7 +6528,7 @@ async function startTuiWorkspace(options) {
       activeTurnAbort.abort();
     }
   };
-  const emitCommandOutput = (text) => {
+  const emitCommandOutput = (text, command = "") => {
     if (!text) return;
     if (!isInteractiveInput(input)) {
       output.write(`${text}
@@ -6505,9 +6536,7 @@ async function startTuiWorkspace(options) {
       return;
     }
     history.followBottom = true;
-    startTurn(history, "assistant");
-    appendToCurrentTurn(history, text);
-    finalizeCurrentTurn(history);
+    appendLocalTurn(history, command, text);
     renderHistoryToOutput();
     if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
   };
@@ -6528,21 +6557,17 @@ async function startTuiWorkspace(options) {
     const previousAgentKey = state.agentKey;
     state = result.nextState;
     const interactive = isInteractiveInput(input);
-    if (interactive && result.action?.type !== "chat") {
-      history.followBottom = true;
-      startTurn(history, "user");
-      appendToCurrentTurn(history, line.trim());
-      finalizeCurrentTurn(history);
-      renderHistoryToOutput();
-      if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
-    }
-    if (result.output) {
-      emitCommandOutput(result.output);
+    if (result.action?.type !== "chat" && result.action?.type !== "exit" && result.output) {
+      emitCommandOutput(result.output, interactive ? line.trim() : "");
     }
     if (state.agentKey !== previousAgentKey) {
       persistExplicitAgentSwitch(previousAgentKey);
     }
-    if (result.action?.type === "exit") return true;
+    if (result.action?.type === "exit") {
+      if (result.output) output.write(`${result.output}
+`);
+      return true;
+    }
     if (result.action?.type === "clear") {
       if (result.action.dialogId) {
         const authToken = resolvePlatformAuthToken(options.env ?? {});
@@ -7375,6 +7400,7 @@ ${renderStatusLine(state)}
 }
 export {
   ANSI_ESCAPE_REGEX,
+  appendLocalTurn,
   appendToCurrentTurn,
   applyOutputChunkToCurrentTurn,
   applyScrollAction,