nolo-cli 0.12.0-alpha.1 → 0.12.0-alpha.11

package/{readlineWorkspace-SWQKC7ZS.js → readlineWorkspace-AQCPSGS7.js}

@@ -3,7 +3,7 @@ import {
   normalizeDialogRecord,
   readDialogSnapshot,
   sortDialogs
-} from "./chunk-4EH7AR52.js";
+} from "./chunk-OPM2DE2J.js";
 import {
   ANSI_ESCAPE_REGEX,
   CLI_AUTO_TIER_AGENT_KEYS,
@@ -57,7 +57,7 @@ import {
   visibleWidth,
   wrapTextToLines,
   wrapTranscriptLine
-} from "./chunk-ZPFRLGIZ.js";
+} from "./chunk-JHYLX2QV.js";
 import "./chunk-3QAF2LTL.js";
 import "./chunk-6HYVJV7B.js";
 import {
@@ -65,18 +65,18 @@ import {
   listLocalCachedAgents,
   listRemoteAgents,
   listRemoteAgentsAcrossServers
-} from "./chunk-DE5BA4O6.js";
+} from "./chunk-QUHUVG6Y.js";
 import "./chunk-ID4G2MAR.js";
 import {
   listUserRecordsFromServers
-} from "./chunk-OPKKB25T.js";
+} from "./chunk-O4FOPRCP.js";
 import {
   createCliLocalRuntimeAdapter,
   initCliLocale,
   parseCliLocale,
   setCliLocale,
   t
-} from "./chunk-5ITRDSHY.js";
+} from "./chunk-7HVCFCZK.js";
 import "./chunk-TOILAPLH.js";
 import "./chunk-CMKUBIGW.js";
 import "./chunk-JBTJAPUF.js";
@@ -86,23 +86,23 @@ import {
 import {
   queryUserRecords,
   readDbRecord
-} from "./chunk-QCA3EPYK.js";
-import "./chunk-RNQ5BLR2.js";
+} from "./chunk-CGDQDXKZ.js";
+import "./chunk-VBSWHE5W.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";
 import "./chunk-LTRXGFMS.js";
-import "./chunk-UG3WOFU6.js";
+import "./chunk-QJSTNKJY.js";
 import "./chunk-ATNTHIZI.js";
 import "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-YTQLJYLB.js";
-import "./chunk-4GBNEA5B.js";
+} from "./chunk-C3BFP57W.js";
+import "./chunk-H5Y2H2N6.js";
 import {
   expandEnabledPacks
-} from "./chunk-RZ735TLX.js";
-import "./chunk-YDCZVUFP.js";
+} from "./chunk-MZHSAPZP.js";
+import "./chunk-RQSOAMPJ.js";
 import "./chunk-OOIN7HSO.js";
 import "./chunk-KQHGZWSV.js";
 import "./chunk-IVAOVLM7.js";
@@ -110,58 +110,60 @@ import "./chunk-3LY4F7SV.js";
 import "./chunk-VP4WJWKW.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-MEVCDATU.js";
-import "./chunk-G3B356GF.js";
+import "./chunk-TQYYGE6G.js";
+import "./chunk-2BVGERJ2.js";
 import "./chunk-VC6OZXO5.js";
 import "./chunk-OWOHNGCN.js";
 import {
   extractReferenceKeysFromMessage
-} from "./chunk-AM53Q2SD.js";
+} from "./chunk-FSUZIGIG.js";
 import {
   buildBuiltinSummaryContent
 } from "./chunk-V2J635L5.js";
 import "./chunk-MRC4Q34M.js";
 import "./chunk-MTU75CZ2.js";
 import "./chunk-CWMSB67P.js";
-import "./chunk-GPZM7QH6.js";
-import "./chunk-6LMFFG3K.js";
+import "./chunk-Y5P3ZRGC.js";
+import "./chunk-RWO5DGXI.js";
 import "./chunk-Z4NR32XR.js";
 import "./chunk-M76ECQRD.js";
 import {
   buildSkillDiscoveryContextBlock
-} from "./chunk-3QKO4EHV.js";
+} from "./chunk-AS3ZQ3O2.js";
 import "./chunk-WZSRQNQG.js";
 import {
   buildLocalWorkspaceOpenAiTools,
   buildLocalWorkspaceToolset,
   getProcessRegistry
-} from "./chunk-DRMGJFGQ.js";
+} from "./chunk-MG6BVV3T.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-ZR4VHQ5D.js";
+import "./chunk-5S4SWV5G.js";
 import "./chunk-NCGFB7NN.js";
 import {
   readCommandActionGatePayload,
   resolveAgentImageInputSupport
-} from "./chunk-4BTHUYMY.js";
-import "./chunk-OPZYGHUC.js";
+} from "./chunk-TA7VKOHU.js";
+import "./chunk-3WGLLTK4.js";
 import {
   buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks
-} from "./chunk-6OVCRC72.js";
-import "./chunk-TSKWE74T.js";
+} from "./chunk-LUKQQJFL.js";
+import "./chunk-TYPHUVK5.js";
 import {
   canonicalizeToolNames
-} from "./chunk-43UD5ZP7.js";
+} from "./chunk-B4KT7RN2.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
-  clipCompactText,
   estimateTokenCount,
   getModelContextWindow,
   planCompression,
   serializeMessageContent
-} from "./chunk-S73OEOHH.js";
-import "./chunk-S3UTETIC.js";
+} from "./chunk-JFANOO7I.js";
+import {
+  clipCompactText
+} from "./chunk-5MMAK75Q.js";
+import "./chunk-OGGHETUE.js";
 import "./chunk-PDL2AV3E.js";
 import "./chunk-JZPBVBIY.js";
 import "./chunk-BYXBJQAS.js";
@@ -197,12 +199,12 @@ import {
 } from "./chunk-IDZTNRP2.js";
 import "./chunk-IKXL2HZ3.js";
 import "./chunk-524BDL33.js";
-import "./chunk-7MYHLZ3F.js";
-import "./chunk-WTYKCU4W.js";
+import "./chunk-DPFWKRHG.js";
+import "./chunk-JU7J7EAV.js";
 import "./chunk-Y5GCAMGP.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-3HHTVM6G.js";
-import "./chunk-NITP2JDG.js";
+import "./chunk-WVTBAALN.js";
+import "./chunk-VKG4HXYV.js";
 import "./chunk-WPHL6ALY.js";
 import "./chunk-O4BU24WZ.js";
 import "./chunk-I42VC5KR.js";
@@ -1070,6 +1072,27 @@ function createInitialAskChoiceState(questions) {
   };
 }
 function askChoiceReducer(state, action) {
+  if (action.type === "HYDRATE_QUESTIONS") {
+    if (state.phase !== "active") return state;
+    const newQuestions = action.questions;
+    if (newQuestions.length <= state.questionStates.length) {
+      if (newQuestions.length === state.questions.length) return state;
+      return { ...state, questions: newQuestions };
+    }
+    const appended = newQuestions.slice(state.questionStates.length).map(() => ({
+      cursorIndex: 0,
+      selectedIds: [],
+      pickedId: null,
+      otherText: "",
+      otherFocused: false
+    }));
+    return {
+      ...state,
+      questions: newQuestions,
+      questionStates: [...state.questionStates, ...appended],
+      activeIndex: Math.min(state.activeIndex, newQuestions.length - 1)
+    };
+  }
   if (state.phase !== "active") return state;
   switch (action.type) {
     case "CANCEL":
@@ -1343,6 +1366,7 @@ async function runAskChoiceDialog(args) {
     typeof args.bottomRow === "function" ? args.bottomRow() : args.bottomRow ?? 0
   );
   let lastBottomRow = 0;
+  let scrolledHeadroom = false;
   let unanchoredCursorLift = 0;
   const restoreUnanchoredCursor = () => {
     if (unanchoredCursorLift <= 0) return;
@@ -1356,6 +1380,14 @@ async function runAskChoiceDialog(args) {
     const canPosition = outputIsTty(output) && typeof output.write === "function";
     if (bottomAnchored && canPosition) {
       const anchorRow = resolveBottomRow();
+      if (!scrolledHeadroom) {
+        const ttyRows = typeof output === "object" && output !== null && "rows" in output && typeof output.rows === "number" ? output.rows : 24;
+        const scrollN = Math.min(lineCount, Math.max(0, ttyRows - 1));
+        if (scrollN > 0) {
+          output.write(`\x1B[${scrollN}S`);
+        }
+        scrolledHeadroom = true;
+      }
       clearAnchoredLines(
         output,
         lastBottomRow > 0 ? lastBottomRow : anchorRow,
@@ -1651,6 +1683,36 @@ function createActivityIndicator(deps) {
     }
     return null;
   };
+  let agentRunSnapshot = null;
+  const updateAgentRun = (snapshot) => {
+    agentRunSnapshot = snapshot;
+    deps.onRepaint();
+  };
+  const clearAgentRun = () => {
+    agentRunSnapshot = null;
+    deps.onRepaint();
+  };
+  const getAgentRun = () => agentRunSnapshot;
+  const getActivityLines = (colorEnabled = resolveCliColorEnabled()) => {
+    const lines = [];
+    const baseView = getView();
+    if (baseView) {
+      const elapsed = Math.max(0, baseView.elapsedSec);
+      const elapsedStr = `${elapsed}s`;
+      const stopHint = t("stopHint");
+      if (!colorEnabled) {
+        lines.push(`${baseView.frame} ${baseView.label} (${elapsedStr}) \xB7 ${stopHint}`);
+      } else {
+        lines.push(
+          themeText(baseView.frame, "accent") + " " + themeText(baseView.label, "muted") + themeText(` (${elapsedStr})`, "chrome") + themeText(` \xB7 ${stopHint}`, "chrome")
+        );
+      }
+    }
+    if (agentRunSnapshot) {
+      lines.push(...formatAgentRunPanelLines(agentRunSnapshot, colorEnabled));
+    }
+    return lines.length > 0 ? lines : null;
+  };
   const stop = () => {
     if (timer !== null) {
       clearIntervalFn(timer);
@@ -1662,8 +1724,69 @@ function createActivityIndicator(deps) {
     fallbackStartedAt = 0;
     lastActivityAt = 0;
     stopping = false;
+    agentRunSnapshot = null;
+  };
+  return {
+    report,
+    updateAgentRun,
+    clearAgentRun,
+    getAgentRun,
+    getView,
+    getActivityLines,
+    markStopping,
+    isStopping,
+    stop
   };
-  return { report, getView, markStopping, isStopping, stop };
+}
+function formatAgentRunPanelLines(snapshot, colorEnabled) {
+  const lines = [];
+  const name = snapshot.agentName || "sub-agent";
+  const runId = snapshot.runId ? ` (${snapshot.runId.slice(0, 8)})` : "";
+  const status = snapshot.status || "running";
+  let statusSymbol = "\u231B";
+  let statusColor = "warning";
+  if (status === "completed" || status === "finished" || status === "success") {
+    statusSymbol = "\u2713";
+    statusColor = "success";
+  } else if (status === "killed" || status === "cancelled" || status === "failed" || status === "stopped") {
+    statusSymbol = "\u{1F534}";
+    statusColor = "danger";
+  }
+  const pollPart = snapshot.polls !== void 0 ? ` (polls: ${snapshot.polls})` : "";
+  const errPart = snapshot.errorMessage ? ` \xB7 ${snapshot.errorMessage}` : "";
+  if (!colorEnabled) {
+    lines.push(`\u{1F916} Sub-Agent: ${name}${runId} \xB7 ${statusSymbol} ${status}${pollPart}${errPart}`);
+  } else {
+    const botIcon = themeText("\u{1F916}", "accent", true);
+    const labelText = themeText(" Sub-Agent: ", "muted", true);
+    const nameText = themeText(`${name}${runId}`, "chrome", true);
+    const statusText = themeText(` \xB7 ${statusSymbol} ${status}`, statusColor, true);
+    const pollsText = pollPart ? themeText(pollPart, "chrome") : "";
+    const errorText = errPart ? themeText(errPart, "danger") : "";
+    lines.push(`${botIcon}${labelText}${nameText}${statusText}${pollsText}${errorText}`);
+  }
+  let logLine;
+  if (snapshot.logTail) {
+    const trimmed = snapshot.logTail.trim();
+    if (trimmed) {
+      const parts = trimmed.split(/\r?\n/);
+      logLine = parts[parts.length - 1];
+    }
+  } else if (snapshot.logLines && snapshot.logLines.length > 0) {
+    logLine = snapshot.logLines[snapshot.logLines.length - 1];
+  }
+  if (logLine && logLine.trim()) {
+    const cleanLog = logLine.trim();
+    if (!colorEnabled) {
+      lines.push(`   \u2514 Log: ${cleanLog}`);
+    } else {
+      const branchChar = themeText("   \u2514 ", "muted");
+      const logTag = themeText("Log: ", "muted");
+      const logContent = themeText(cleanLog, "chrome");
+      lines.push(`${branchChar}${logTag}${logContent}`);
+    }
+  }
+  return lines;
 }
 
 // packages/ai/agent/utils/sortUtils.ts
@@ -3725,11 +3848,18 @@ function createChatQueueTuiBinding(runTurn) {
     runtime.send({ type: "turn-start" });
   };
   const notifyTurnEnd = async (outcome) => {
-    const preempt = preemptArmed;
-    preemptArmed = null;
-    const effectiveOutcome = preempt !== null && outcome.aborted ? preempt === "drain" ? { ok: true, aborted: false } : { ok: false, aborted: false } : outcome;
+    const consumePreempt = (raw) => {
+      const mode = preemptArmed;
+      preemptArmed = null;
+      if (mode === null || !raw.aborted) return { outcome: raw, mode: null };
+      return {
+        outcome: mode === "drain" ? { ok: true, aborted: false } : { ok: false, aborted: false },
+        mode
+      };
+    };
+    const { outcome: effectiveOutcome, mode: consumedMode } = consumePreempt(outcome);
     runtime.send({ type: "turn-end", ...effectiveOutcome });
-    if (preempt === "stop" && outcome.aborted) {
+    if (consumedMode === "stop") {
       runtime.send({ type: "drain-error", message: "" });
     }
     let lastOk = effectiveOutcome.ok && !effectiveOutcome.aborted;
@@ -3745,9 +3875,13 @@ function createChatQueueTuiBinding(runTurn) {
         } catch {
           turnOutcome = { ok: false, aborted: false };
         }
-        runtime.send({ type: "turn-end", ...turnOutcome });
-        lastOk = turnOutcome.ok && !turnOutcome.aborted;
-        if (turnOutcome.aborted) break;
+        const { outcome: cascadeOutcome, mode: cascadeMode } = consumePreempt(turnOutcome);
+        runtime.send({ type: "turn-end", ...cascadeOutcome });
+        if (cascadeMode === "stop") {
+          runtime.send({ type: "drain-error", message: "" });
+        }
+        lastOk = cascadeOutcome.ok && !cascadeOutcome.aborted;
+        if (cascadeOutcome.aborted) break;
         if (!lastOk) break;
       } else {
         break;
@@ -3774,6 +3908,13 @@ function createChatQueueTuiBinding(runTurn) {
     preemptArmed = "stop";
     return true;
   };
+  const snapshotAndClearQueue = () => {
+    const status = runtime.getState();
+    if (status.queue.length === 0) return null;
+    const merged = status.queue.join("\n");
+    runtime.send({ type: "clear" });
+    return merged;
+  };
   const clear = () => {
     runtime.send({ type: "clear" });
   };
@@ -3790,6 +3931,7 @@ function createChatQueueTuiBinding(runTurn) {
     drainHeadForManualTurn,
     preemptForDrain,
     preemptForStop,
+    snapshotAndClearQueue,
     clear,
     getStatus,
     queueLength,
@@ -4100,9 +4242,10 @@ function createFixedInput(output, config) {
     if (completions.length > 0) {
       sections.push(fitAnsiLine(dimCliText(completions.join("  "), colorEnabled), cols));
     }
-    const activityLine = config.getActivityLine?.() ?? null;
-    if (activityLine) {
-      sections.push(fitAnsiLine(activityLine.replace(/\r?\n/g, " "), cols));
+    const rawActivity = config.getActivityLines ? config.getActivityLines() : config.getActivityLine ? config.getActivityLine() : null;
+    const activityLines = Array.isArray(rawActivity) ? rawActivity.filter((line) => line !== null && line !== void 0) : typeof rawActivity === "string" && rawActivity.length > 0 ? [rawActivity] : [];
+    for (const actLine of activityLines) {
+      sections.push(fitAnsiLine(actLine.replace(/\r?\n/g, " "), cols));
     }
     const rule = colorEnabled ? `\x1B[2m${themeColorSequence("chrome")}${"\u2500".repeat(cols)}\x1B[0m` : "\u2500".repeat(cols);
     sections.push(rule);
@@ -4160,7 +4303,7 @@ function createFixedInput(output, config) {
     }
     const text = sections.join("\n");
     const lines = sections.length;
-    const headerRows = (completions.length > 0 ? 1 : 0) + 2 + (activityLine ? 1 : 0) + queueLines.length;
+    const headerRows = (completions.length > 0 ? 1 : 0) + 2 + activityLines.length + queueLines.length;
     return { text, lines, cursorCol, cursorRow: headerRows + cursorRow };
   };
   const repaintAt = (buffer, cursorPos) => {
@@ -4474,6 +4617,7 @@ function createRawInputDecoder(onToken, options) {
 }
 
 // packages/cli/tui/readlineWorkspace.ts
+var CTRL_S = "";
 var AGENTS_MD_MAX_BYTES = 8192;
 var altScreenRestoreOutput = null;
 var altScreenHandlersInstalled = false;
@@ -4958,7 +5102,7 @@ async function startTuiWorkspace(options) {
       if (fixedInput.active && !fixedInput.isPaused()) {
         output.write("\x1B[?2026h\x1B[?25l");
         try {
-          fixedInput.repaint(buffer);
+          fixedInput.repaint(buffer, cursorPos);
         } finally {
           output.write("\x1B[?25h\x1B[?2026l");
         }
@@ -4976,7 +5120,7 @@ async function startTuiWorkspace(options) {
         fixedInput.resumeFromDialog();
         flushPendingRender();
         renderHistoryToOutput();
-        fixedInput.repaint(buffer);
+        fixedInput.repaint(buffer, cursorPos);
       },
       getInputLines: () => fixedInput.getInputLines(),
       isPaused: () => fixedInput.isPaused()
@@ -5001,7 +5145,7 @@ async function startTuiWorkspace(options) {
     output.write("\x1B[?2026h\x1B[?25l");
     try {
       renderHistory(output, history, fixedInput.getInputLines());
-      if (fixedInput.active) fixedInput.repaint(buffer);
+      if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
     } finally {
       output.write("\x1B[?25h\x1B[?2026l");
     }
@@ -5065,7 +5209,7 @@ ${t("copyViewHint")}
       fixedInput.resumeFromDialog();
       flushPendingRender();
       renderHistoryToOutput();
-      fixedInput.repaint(buffer);
+      fixedInput.repaint(buffer, cursorPos);
     }
     return true;
   };
@@ -5080,7 +5224,7 @@ ${t("copyViewHint")}
     appendToCurrentTurn(history, message);
     finalizeCurrentTurn(history);
     renderHistoryToOutput();
-    if (fixedInput.active) fixedInput.repaint(buffer);
+    if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
     startTurn(history, "assistant");
     const agentOutput = isInteractiveInput(input) ? createHistoryOutputStream(history, () => {
       scheduleRender();
@@ -5120,7 +5264,14 @@ ${t("copyViewHint")}
           abortSignal: activeTurnAbort.signal,
           pastedTextStore: pasteStore,
           explicitAgentSwitch,
-          activityReporter
+          activityReporter,
+          onAgentRunStatus: (snapshot) => {
+            if (snapshot) {
+              activityIndicator.updateAgentRun(snapshot);
+            } else {
+              activityIndicator.clearAgentRun();
+            }
+          }
         }
       );
       const wasForceStopped = forcedStopEpoch === myEpoch;
@@ -5146,7 +5297,7 @@ ${t("copyViewHint")}
         finalizeCurrentTurn(history);
         flushPendingRender();
         renderHistoryToOutput();
-        if (fixedInput.active) fixedInput.repaint(buffer);
+        if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
       }
       if (wasAborted) {
         if (runResult.pendingToolName) {
@@ -5194,6 +5345,11 @@ ${t("copyViewHint")}
     });
     return chatQueueBinding;
   };
+  const preemptAndAbortForDrain = (binding) => {
+    if (binding.preemptForDrain() && activeTurnAbort) {
+      activeTurnAbort.abort();
+    }
+  };
   const emitCommandOutput = (text) => {
     if (!text) return;
     if (!isInteractiveInput(input)) {
@@ -5206,7 +5362,7 @@ ${t("copyViewHint")}
     appendToCurrentTurn(history, text);
     finalizeCurrentTurn(history);
     renderHistoryToOutput();
-    if (fixedInput.active) fixedInput.repaint(buffer);
+    if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
   };
   const runSubmittedLine = async (line, actionGateHandler, confirmDestructiveAction) => {
     if (!line.trim()) return false;
@@ -5220,7 +5376,7 @@ ${t("copyViewHint")}
       appendToCurrentTurn(history, line.trim());
       finalizeCurrentTurn(history);
       renderHistoryToOutput();
-      if (fixedInput.active) fixedInput.repaint(buffer);
+      if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
     }
     if (result.output) {
       emitCommandOutput(result.output);
@@ -5263,6 +5419,14 @@ ${t("copyViewHint")}
           dialogKey: compactResult.dialogKey,
           dialogLabel: compactResult.dialogId
         };
+        output.write(
+          `${t(
+            compactResult.summaryGenerated ? "compactDone" : "compactDoneNoSummary",
+            result.action.dialogId,
+            compactResult.dialogId
+          )}
+`
+        );
       } catch (error) {
         output.write(
           `[nolo] Compact failed: ${toErrorMessage(error)}
@@ -5355,7 +5519,7 @@ ${t("copyViewHint")}
         leaveAltScreen(output);
       }
       renderHistoryToOutput();
-      fixedInput.repaint(buffer);
+      fixedInput.repaint(buffer, cursorPos);
     }
     if (result.action?.type === "copy-view") {
       const opened = await openCopyView();
@@ -5529,7 +5693,7 @@ ${stderrText.trim()}
 ${err.message}` : ""}`
         );
       }
-      if (fixedInput.active) fixedInput.repaint(buffer);
+      if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
     }
     return false;
   };
@@ -5539,7 +5703,6 @@ ${err.message}` : ""}`
     let busy = false;
     let done = false;
     let resolveDone = null;
-    let cursorPos2 = 0;
     fixedInput = createFixedInput(output, {
       getStatusLine: () => {
         let base = renderStatusLine(state);
@@ -5557,17 +5720,7 @@ ${err.message}` : ""}`
         }
         return base;
       },
-      getActivityLine: () => {
-        const view = activityIndicator.getView();
-        if (view === null) return null;
-        const colorEnabled = resolveCliColorEnabled();
-        const elapsed = formatElapsedSeconds(view.elapsedSec);
-        const stopHint = t("stopHint");
-        if (!colorEnabled) {
-          return `${view.frame} ${view.label} (${elapsed}) \xB7 ${stopHint}`;
-        }
-        return themeText(view.frame, "accent") + " " + themeText(view.label, "muted") + themeText(` (${elapsed})`, "chrome") + themeText(` \xB7 ${stopHint}`, "chrome");
-      },
+      getActivityLines: () => activityIndicator.getActivityLines(resolveCliColorEnabled()),
       getQueueLines: () => {
         if (!chatQueueBinding || chatQueueBinding.queueLength() === 0) return [];
         const colorEnabled = resolveCliColorEnabled();
@@ -5583,13 +5736,13 @@ ${err.message}` : ""}`
     fixedInput.init();
     const paintFrame = (draft) => {
       renderHistoryToOutput();
-      fixedInput.repaint(draft, cursorPos2);
+      fixedInput.repaint(draft, cursorPos);
     };
     const onResize = () => {
       if (done || copyViewExitResolver) return;
       if (fixedInput.isPaused()) {
         renderHistory(output, history, fixedInput.getInputLines());
-        fixedInput.repaint(buffer, cursorPos2);
+        fixedInput.repaint(buffer, cursorPos);
         return;
       }
       flushPendingRender();
@@ -5624,6 +5777,30 @@ ${err.message}` : ""}`
         rawActionGateTokenHandler?.(sequence);
         return;
       }
+      if (sequence === CTRL_S) {
+        if (!chatQueueBinding || chatQueueBinding.queueLength() === 0) {
+          return;
+        }
+        const flushCount = chatQueueBinding.queueLength();
+        const merged = chatQueueBinding.snapshotAndClearQueue();
+        if (!merged) return;
+        const draftIncluded = !busy && buffer.trim() !== "";
+        const fullText = draftIncluded ? `${buffer}
+${merged}` : merged;
+        chatQueueBinding.enqueue(fullText);
+        const totalCount = flushCount + (draftIncluded ? 1 : 0);
+        emitCommandOutput(
+          t(busy ? "flushQueuedBusyHint" : "flushQueuedIdleHint", String(totalCount))
+        );
+        if (busy) {
+          preemptAndAbortForDrain(chatQueueBinding);
+          return;
+        }
+        buffer = "";
+        cursorPos = 0;
+        if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
+        return handleInputToken("\r");
+      }
       const busyLock = busy;
       const scrollAction = parseScrollAction(sequence);
       if (scrollAction) {
@@ -5644,7 +5821,7 @@ ${err.message}` : ""}`
           emitCommandOutput(t("forceStopped"));
           flushPendingRender();
           renderHistoryToOutput();
-          if (fixedInput.active) fixedInput.repaint(buffer);
+          if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
           return;
         }
         const stopBinding = chatQueueBinding;
@@ -5655,7 +5832,7 @@ ${err.message}` : ""}`
         activeTurnAbort.abort();
         return;
       }
-      const result = applyTuiInputKey(buffer, sequence, {}, cursorPos2, {
+      const result = applyTuiInputKey(buffer, sequence, {}, cursorPos, {
         pasteStore
       });
       if (result.copyView) {
@@ -5707,8 +5884,8 @@ ${hint}` : hint;
             }
             releaseCollapsedPasteReferences(submittedText, pasteStore);
             buffer = "";
-            cursorPos2 = 0;
-            if (fixedInput.active) fixedInput.repaint(buffer, cursorPos2);
+            cursorPos = 0;
+            if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
             return;
           }
           const binding = ensureChatQueueBinding(
@@ -5749,15 +5926,11 @@ ${hint}` : hint;
           if (decision.kind === "queue-text") {
             binding.enqueue(decision.text);
             buffer = "";
-            cursorPos2 = 0;
-            fixedInput.repaint(buffer, cursorPos2);
+            cursorPos = 0;
+            fixedInput.repaint(buffer, cursorPos);
           } else if (decision.kind === "queue-blocked") {
           } else if (decision.kind === "noop" && !submittedText.trim() && binding.queueLength() > 0) {
-            if (binding.preemptForDrain()) {
-              if (activeTurnAbort) {
-                activeTurnAbort.abort();
-              }
-            }
+            preemptAndAbortForDrain(binding);
           }
           return;
         }
@@ -5796,7 +5969,7 @@ ${hint}` : hint;
           if (drainedText !== null) {
             busy = true;
             buffer = "";
-            cursorPos2 = 0;
+            cursorPos = 0;
             fixedInput.enterOutputMode(drainedText);
             try {
               const outcome = await runOneAgentTurn(
@@ -5817,13 +5990,13 @@ ${err.message}` : ""}`
             }
             refreshGitStatus();
             flushPendingRender();
-            fixedInput.exitOutputMode(buffer, cursorPos2);
+            fixedInput.exitOutputMode(buffer, cursorPos);
             return;
           }
         }
         busy = startsChatTurn;
         buffer = "";
-        cursorPos2 = 0;
+        cursorPos = 0;
         fixedInput.enterOutputMode(submittedText);
         let shouldExit = false;
         try {
@@ -5869,19 +6042,19 @@ ${err.message}` : ""}`
         }
         refreshGitStatus();
         flushPendingRender();
-        fixedInput.exitOutputMode(buffer, cursorPos2);
+        fixedInput.exitOutputMode(buffer, cursorPos);
         return;
       }
       buffer = result.buffer;
-      cursorPos2 = result.cursorPos ?? buffer.length;
-      fixedInput.repaint(buffer, cursorPos2);
+      cursorPos = result.cursorPos ?? buffer.length;
+      fixedInput.repaint(buffer, cursorPos);
     };
     const onData = createRawInputDecoder((token) => {
       void handleInputToken(token);
     });
     try {
       input.on("data", onData);
-      fixedInput.repaint(buffer, cursorPos2);
+      fixedInput.repaint(buffer, cursorPos);
       refreshGitStatus();
       await new Promise((resolve2) => {
         resolveDone = resolve2;