nolo-cli 0.37.0-alpha.2 → 0.37.0-alpha.4

package/index.js

@@ -824,7 +824,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-NFM3Z5UX.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-PLJJPDP2.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-SHRB4RWM.js");
   return startTuiWorkspace({
     ...args2,

package/package.json

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

package/{readlineWorkspace-NFM3Z5UX.js → readlineWorkspace-PLJJPDP2.js}

@@ -4394,6 +4394,24 @@ async function readImagePaths(paths, options = {}) {
   }
   return { images, failures };
 }
+async function resolveAttachmentImageUrls({
+  actionImagePaths,
+  attachedImages,
+  onFailure
+}) {
+  const pathsToRead = [
+    ...actionImagePaths ?? [],
+    ...attachedImages.map((img) => img.sourcePath)
+  ];
+  let imageUrls = [];
+  if (pathsToRead.length > 0) {
+    const readResult = await readImagePaths(pathsToRead, {
+      onFailure
+    });
+    imageUrls = readResult.images.map((img) => img.dataUrl);
+  }
+  return { imageUrls };
+}
 
 // packages/cli/tui/clipboardImage.ts
 import { createHash } from "node:crypto";
@@ -7076,6 +7094,219 @@ function waitForRawActionGate(input, output, gate, spawnRunner, hooks) {
     }
   });
 }
+async function runOneAgentTurn(ctx, inputMsg, imageUrls, actionGateHandler, confirmDestructiveAction) {
+  const scheduleTitlePatchSync = (runResult) => {
+    if (!runResult.titlePatchPromise || !runResult.dialogId) return;
+    const patchDialogId = runResult.dialogId;
+    runResult.titlePatchPromise.then((patchedTitle) => {
+      if (!patchedTitle || ctx.sessionEnded) return;
+      if (ctx.state.dialogId !== patchDialogId) return;
+      if (ctx.state.dialogLabel === patchedTitle) return;
+      ctx.state = {
+        ...ctx.state,
+        dialogLabel: patchedTitle,
+        dialogTitle: patchedTitle
+      };
+      ctx.syncWindowTitle();
+    }).catch(() => {
+    });
+  };
+  let req = createTurnRequest(inputMsg);
+  if (req.event.kind === "child-run-completed") {
+    const nowMs = Date.now();
+    const { remainingRuns, claimedRunIds } = filterUnclaimedChildRuns(
+      req.event.runs,
+      { env: ctx.effectiveEnv, now: () => nowMs }
+    );
+    for (const runId of claimedRunIds) {
+      ctx.runCompletionWatcher.markAcknowledged(runId);
+    }
+    if (remainingRuns.length === 0) {
+      for (const r of req.event.runs) {
+        ctx.runCompletionWatcher.markAcknowledged(r.runId);
+      }
+      return { ok: true, aborted: false };
+    }
+    for (const r of remainingRuns) {
+      ctx.runCompletionWatcher.markAcknowledged(r.runId);
+    }
+    if (remainingRuns.length !== req.event.runs.length) {
+      const text = buildWakeMessage(remainingRuns, nowMs);
+      const displayText = buildWakeDisplayText(remainingRuns, nowMs);
+      const updatedEvent = {
+        kind: "child-run-completed",
+        runs: remainingRuns,
+        text,
+        displayText
+      };
+      req = {
+        text,
+        event: updatedEvent
+      };
+    }
+  }
+  const message = req.text;
+  ctx.forcedStop = false;
+  ctx.turnEpoch += 1;
+  const myEpoch = ctx.turnEpoch;
+  ctx.history.followBottom = true;
+  const isInternalEvent = req.event.kind !== "user";
+  const transcriptText = req.event.kind === "child-run-completed" ? req.event.displayText ?? req.event.text : message;
+  startTurn(ctx.history, isInternalEvent ? "assistant" : "user");
+  appendToCurrentTurn(
+    ctx.history,
+    isInternalEvent ? dimCliText(transcriptText, resolveCliColorEnabled()) : transcriptText
+  );
+  finalizeCurrentTurn(ctx.history);
+  ctx.renderHistoryToOutput();
+  if (ctx.fixedInput.active) ctx.fixedInput.repaint(ctx.buffer, ctx.cursorPos);
+  startTurn(ctx.history, "assistant");
+  const agentOutput = isInteractiveInput(ctx.input) ? createHistoryOutputStream(ctx.history, () => {
+    ctx.scheduleRender();
+  }) : ctx.output;
+  const requestUserChoice = isInteractiveInput(ctx.input) && ctx.dialogHost ? async (choiceReq) => {
+    ctx.modalOwnsKeyboard = true;
+    try {
+      return await ctx.dialogHost.run(
+        (anchor) => runAskChoiceDialog({
+          request: choiceReq,
+          input: ctx.input,
+          output: ctx.output,
+          ...anchor
+        })
+      );
+    } catch {
+      return { kind: "cancelled" };
+    } finally {
+      ctx.composerDecoderDrain?.();
+      ctx.modalOwnsKeyboard = false;
+    }
+  } : void 0;
+  try {
+    ctx.activeTurnAbort = new AbortController();
+    ctx.activeTurnEpoch = myEpoch;
+    const runResult = await runAgentChat(
+      ctx.options.scriptDir,
+      ctx.state,
+      message,
+      ctx.options.env ?? process.env,
+      agentOutput,
+      ctx.options.agentRunner,
+      {
+        ...imageUrls.length > 0 ? { imageUrls } : {},
+        actionGateHandler,
+        ...confirmDestructiveAction ? { confirmDestructiveAction } : {},
+        ...requestUserChoice ? { requestUserChoice } : {},
+        abortSignal: ctx.activeTurnAbort.signal,
+        pastedTextStore: ctx.pasteStore,
+        activityReporter: ctx.activityReporter,
+        onAgentRunStatus: (snapshot) => {
+          if (snapshot) {
+            ctx.activityIndicator.updateAgentRun(snapshot);
+            ctx.runRegistryPoller.ensureRunning();
+          } else {
+            ctx.activityIndicator.clearAgentRun();
+          }
+        }
+      }
+    );
+    const wasForceStopped = ctx.forcedStopEpoch === myEpoch;
+    if (wasForceStopped) {
+      if (runResult.dialogId || runResult.turnTokens) {
+        const nextDialogKey = runResult.dialogId ? runResult.dialogId === ctx.state.dialogId && ctx.state.dialogKey ? ctx.state.dialogKey : ctx.state.dialogOwnerId ? `dialog-${ctx.state.dialogOwnerId}-${runResult.dialogId}` : void 0 : ctx.state.dialogKey;
+        ctx.state = {
+          ...ctx.state,
+          ...runResult.dialogId ? {
+            dialogId: runResult.dialogId,
+            dialogKey: nextDialogKey,
+            dialogLabel: runResult.title || runResult.dialogId,
+            ...runResult.title ? { dialogTitle: runResult.title } : {}
+          } : {},
+          ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {},
+          ...runResult.cachedMemoryOverlay !== void 0 ? { cachedMemoryOverlay: runResult.cachedMemoryOverlay } : {}
+        };
+        if (runResult.dialogId && nextDialogKey) {
+          ctx.refreshDialogTotalCredits(runResult.dialogId, nextDialogKey);
+        }
+      }
+      scheduleTitlePatchSync(runResult);
+      return { ok: false, aborted: true };
+    }
+    const wasAborted = ctx.activeTurnAbort.signal.aborted;
+    ctx.activeTurnAbort = null;
+    if (shouldEmitTerminalBell({
+      wasAborted,
+      streamInterrupted: runResult.streamInterrupted,
+      exitCode: runResult.exitCode,
+      interactive: isInteractiveInput(ctx.input)
+    })) {
+      emitTerminalBell(ctx.output);
+    }
+    if (isInteractiveInput(ctx.input)) {
+      finalizeCurrentTurn(ctx.history);
+      ctx.flushPendingRender();
+      ctx.renderHistoryToOutput();
+      if (ctx.fixedInput.active) ctx.fixedInput.repaint(ctx.buffer, ctx.cursorPos);
+    }
+    if (wasAborted) {
+      if (runResult.pendingToolName) {
+        ctx.emitCommandOutput(t("turnStoppedToolPending", runResult.pendingToolName));
+      } else {
+        ctx.emitCommandOutput(t("turnStopped"));
+      }
+    }
+    if (runResult.dialogId || runResult.turnTokens || runResult.contextWindow) {
+      const nextDialogKey = runResult.dialogId ? runResult.dialogId === ctx.state.dialogId && ctx.state.dialogKey ? ctx.state.dialogKey : ctx.state.dialogOwnerId ? `dialog-${ctx.state.dialogOwnerId}-${runResult.dialogId}` : void 0 : ctx.state.dialogKey;
+      ctx.state = {
+        ...ctx.state,
+        ...runResult.dialogId ? {
+          dialogId: runResult.dialogId,
+          dialogKey: nextDialogKey,
+          dialogLabel: runResult.title || runResult.dialogId,
+          ...runResult.title ? { dialogTitle: runResult.title } : {}
+        } : {},
+        ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {},
+        ...runResult.contextWindow ? { contextWindow: runResult.contextWindow } : {},
+        // input_tokens 是累计上下文输入（含历史消息），把它持久化到
+        // estimatedContextTokens：下一轮若 provider 不返回 usage，context
+        // chip 仍显示真实累计占用而不是回退到启动时的静态估算。
+        ...runResult.turnTokens && runResult.turnTokens.input > 0 ? { estimatedContextTokens: runResult.turnTokens.input } : {},
+        ...runResult.cachedMemoryOverlay !== void 0 ? { cachedMemoryOverlay: runResult.cachedMemoryOverlay } : {}
+      };
+      if (runResult.dialogId && nextDialogKey) {
+        ctx.refreshDialogTotalCredits(runResult.dialogId, nextDialogKey);
+      }
+    }
+    scheduleTitlePatchSync(runResult);
+    if (!wasAborted && runResult.exitCode !== 0) {
+      if (isBalanceExhaustedError(runResult.localError) && runResult.dialogId) {
+        ctx.emitCommandOutput(t("balanceExhaustedHint"));
+      } else if (isQuotaExhaustedError(runResult.localError)) {
+        ctx.emitCommandOutput(t("quotaExhaustedHint"));
+      } else if (runResult.dialogId) {
+        ctx.emitCommandOutput(t("dialogPreservedHint"));
+      } else {
+        ctx.emitCommandOutput(t("dialogNotSavedHint"));
+      }
+    }
+    return { ok: !wasAborted, aborted: wasAborted };
+  } finally {
+    ctx.activityIndicator.stop();
+    ctx.activeTurnAbort = null;
+  }
+}
+function ensureChatQueueBinding(ctx, actionGateHandler, confirmDestructiveAction) {
+  if (ctx.chatQueueBinding) return ctx.chatQueueBinding;
+  ctx.chatQueueBinding = createChatQueueTuiBinding(async (text) => {
+    return runOneAgentTurn(ctx, text, [], actionGateHandler, confirmDestructiveAction);
+  });
+  return ctx.chatQueueBinding;
+}
+function preemptAndAbortForDrain(binding, activeTurnAbort) {
+  if (binding.preemptForDrain() && activeTurnAbort) {
+    activeTurnAbort.abort();
+  }
+}
 var latestWorkspaceThemeOwner = 0;
 async function runTuiWorkspace(options) {
   initCliLocale(options.env ?? process.env);
@@ -7355,220 +7586,6 @@ ${content}`);
     });
   };
   let composerDecoderDrain = null;
-  const runOneAgentTurn = async (inputMsg, imageUrls, actionGateHandler, confirmDestructiveAction) => {
-    const scheduleTitlePatchSync = (runResult) => {
-      if (!runResult.titlePatchPromise || !runResult.dialogId) return;
-      const patchDialogId = runResult.dialogId;
-      runResult.titlePatchPromise.then((patchedTitle) => {
-        if (!patchedTitle || sessionEnded) return;
-        if (state.dialogId !== patchDialogId) return;
-        if (state.dialogLabel === patchedTitle) return;
-        state = {
-          ...state,
-          dialogLabel: patchedTitle,
-          dialogTitle: patchedTitle
-        };
-        syncWindowTitle();
-      }).catch(() => {
-      });
-    };
-    let req = createTurnRequest(inputMsg);
-    if (req.event.kind === "child-run-completed") {
-      const nowMs = Date.now();
-      const { remainingRuns, claimedRunIds } = filterUnclaimedChildRuns(
-        req.event.runs,
-        { env: effectiveEnv, now: () => nowMs }
-      );
-      for (const runId of claimedRunIds) {
-        runCompletionWatcher.markAcknowledged(runId);
-      }
-      if (remainingRuns.length === 0) {
-        for (const r of req.event.runs) {
-          runCompletionWatcher.markAcknowledged(r.runId);
-        }
-        return { ok: true, aborted: false };
-      }
-      for (const r of remainingRuns) {
-        runCompletionWatcher.markAcknowledged(r.runId);
-      }
-      if (remainingRuns.length !== req.event.runs.length) {
-        const text = buildWakeMessage(remainingRuns, nowMs);
-        const displayText = buildWakeDisplayText(remainingRuns, nowMs);
-        const updatedEvent = {
-          kind: "child-run-completed",
-          runs: remainingRuns,
-          text,
-          displayText
-        };
-        req = {
-          text,
-          event: updatedEvent
-        };
-      }
-    }
-    const message = req.text;
-    forcedStop = false;
-    turnEpoch += 1;
-    const myEpoch = turnEpoch;
-    history.followBottom = true;
-    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);
-    startTurn(history, "assistant");
-    const agentOutput = isInteractiveInput(input) ? createHistoryOutputStream(history, () => {
-      scheduleRender();
-    }) : output;
-    const requestUserChoice = isInteractiveInput(input) && dialogHost ? async (req2) => {
-      modalOwnsKeyboard = true;
-      try {
-        return await dialogHost.run(
-          (anchor) => runAskChoiceDialog({
-            request: req2,
-            input,
-            output,
-            ...anchor
-          })
-        );
-      } catch {
-        return { kind: "cancelled" };
-      } finally {
-        composerDecoderDrain?.();
-        modalOwnsKeyboard = false;
-      }
-    } : void 0;
-    try {
-      activeTurnAbort = new AbortController();
-      activeTurnEpoch = myEpoch;
-      const runResult = await runAgentChat(
-        options.scriptDir,
-        state,
-        message,
-        options.env ?? process.env,
-        agentOutput,
-        options.agentRunner,
-        {
-          ...imageUrls.length > 0 ? { imageUrls } : {},
-          actionGateHandler,
-          ...confirmDestructiveAction ? { confirmDestructiveAction } : {},
-          ...requestUserChoice ? { requestUserChoice } : {},
-          abortSignal: activeTurnAbort.signal,
-          pastedTextStore: pasteStore,
-          activityReporter,
-          onAgentRunStatus: (snapshot) => {
-            if (snapshot) {
-              activityIndicator.updateAgentRun(snapshot);
-              runRegistryPoller.ensureRunning();
-            } else {
-              activityIndicator.clearAgentRun();
-            }
-          }
-        }
-      );
-      const wasForceStopped = forcedStopEpoch === myEpoch;
-      if (wasForceStopped) {
-        if (runResult.dialogId || runResult.turnTokens) {
-          const nextDialogKey = runResult.dialogId ? runResult.dialogId === state.dialogId && state.dialogKey ? state.dialogKey : state.dialogOwnerId ? `dialog-${state.dialogOwnerId}-${runResult.dialogId}` : void 0 : state.dialogKey;
-          state = {
-            ...state,
-            ...runResult.dialogId ? {
-              dialogId: runResult.dialogId,
-              dialogKey: nextDialogKey,
-              dialogLabel: runResult.title || runResult.dialogId,
-              ...runResult.title ? { dialogTitle: runResult.title } : {}
-            } : {},
-            ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {},
-            ...runResult.cachedMemoryOverlay !== void 0 ? { cachedMemoryOverlay: runResult.cachedMemoryOverlay } : {}
-          };
-          if (runResult.dialogId && nextDialogKey) {
-            refreshDialogTotalCredits(runResult.dialogId, nextDialogKey);
-          }
-        }
-        scheduleTitlePatchSync(runResult);
-        return { ok: false, aborted: true };
-      }
-      const wasAborted = activeTurnAbort.signal.aborted;
-      activeTurnAbort = null;
-      if (shouldEmitTerminalBell({
-        wasAborted,
-        streamInterrupted: runResult.streamInterrupted,
-        exitCode: runResult.exitCode,
-        interactive: isInteractiveInput(input)
-      })) {
-        emitTerminalBell(output);
-      }
-      if (isInteractiveInput(input)) {
-        finalizeCurrentTurn(history);
-        flushPendingRender();
-        renderHistoryToOutput();
-        if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
-      }
-      if (wasAborted) {
-        if (runResult.pendingToolName) {
-          emitCommandOutput(t("turnStoppedToolPending", runResult.pendingToolName));
-        } else {
-          emitCommandOutput(t("turnStopped"));
-        }
-      }
-      if (runResult.dialogId || runResult.turnTokens || runResult.contextWindow) {
-        const nextDialogKey = runResult.dialogId ? runResult.dialogId === state.dialogId && state.dialogKey ? state.dialogKey : state.dialogOwnerId ? `dialog-${state.dialogOwnerId}-${runResult.dialogId}` : void 0 : state.dialogKey;
-        state = {
-          ...state,
-          ...runResult.dialogId ? {
-            dialogId: runResult.dialogId,
-            dialogKey: nextDialogKey,
-            dialogLabel: runResult.title || runResult.dialogId,
-            ...runResult.title ? { dialogTitle: runResult.title } : {}
-          } : {},
-          ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {},
-          ...runResult.contextWindow ? { contextWindow: runResult.contextWindow } : {},
-          // input_tokens 是累计上下文输入（含历史消息），把它持久化到
-          // estimatedContextTokens：下一轮若 provider 不返回 usage，context
-          // chip 仍显示真实累计占用而不是回退到启动时的静态估算。
-          ...runResult.turnTokens && runResult.turnTokens.input > 0 ? { estimatedContextTokens: runResult.turnTokens.input } : {},
-          ...runResult.cachedMemoryOverlay !== void 0 ? { cachedMemoryOverlay: runResult.cachedMemoryOverlay } : {}
-        };
-        if (runResult.dialogId && nextDialogKey) {
-          refreshDialogTotalCredits(runResult.dialogId, nextDialogKey);
-        }
-      }
-      scheduleTitlePatchSync(runResult);
-      if (!wasAborted && runResult.exitCode !== 0) {
-        if (isBalanceExhaustedError(runResult.localError) && runResult.dialogId) {
-          emitCommandOutput(t("balanceExhaustedHint"));
-        } else if (isQuotaExhaustedError(runResult.localError)) {
-          emitCommandOutput(t("quotaExhaustedHint"));
-        } else if (runResult.dialogId) {
-          emitCommandOutput(t("dialogPreservedHint"));
-        } else {
-          emitCommandOutput(t("dialogNotSavedHint"));
-        }
-      }
-      return { ok: !wasAborted, aborted: wasAborted };
-    } finally {
-      activityIndicator.stop();
-      activeTurnAbort = null;
-    }
-  };
-  let chatQueueBinding = null;
-  const ensureChatQueueBinding = (actionGateHandler, confirmDestructiveAction) => {
-    if (chatQueueBinding) return chatQueueBinding;
-    chatQueueBinding = createChatQueueTuiBinding(async (text) => {
-      return runOneAgentTurn(text, [], actionGateHandler, confirmDestructiveAction);
-    });
-    return chatQueueBinding;
-  };
-  const preemptAndAbortForDrain = (binding) => {
-    if (binding.preemptForDrain() && activeTurnAbort) {
-      activeTurnAbort.abort();
-    }
-  };
   const emitCommandOutput = (text, command = "") => {
     if (!text) return;
     if (!isInteractiveInput(input)) {
@@ -7581,6 +7598,92 @@ ${content}`);
     renderHistoryToOutput();
     if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
   };
+  let chatQueueBinding = null;
+  const turnCtx = {
+    get state() {
+      return state;
+    },
+    set state(v) {
+      state = v;
+    },
+    get forcedStop() {
+      return forcedStop;
+    },
+    set forcedStop(v) {
+      forcedStop = v;
+    },
+    get forcedStopEpoch() {
+      return forcedStopEpoch;
+    },
+    set forcedStopEpoch(v) {
+      forcedStopEpoch = v;
+    },
+    get turnEpoch() {
+      return turnEpoch;
+    },
+    set turnEpoch(v) {
+      turnEpoch = v;
+    },
+    get activeTurnAbort() {
+      return activeTurnAbort;
+    },
+    set activeTurnAbort(v) {
+      activeTurnAbort = v;
+    },
+    get activeTurnEpoch() {
+      return activeTurnEpoch;
+    },
+    set activeTurnEpoch(v) {
+      activeTurnEpoch = v;
+    },
+    get modalOwnsKeyboard() {
+      return modalOwnsKeyboard;
+    },
+    set modalOwnsKeyboard(v) {
+      modalOwnsKeyboard = v;
+    },
+    get composerDecoderDrain() {
+      return composerDecoderDrain;
+    },
+    set composerDecoderDrain(v) {
+      composerDecoderDrain = v;
+    },
+    get chatQueueBinding() {
+      return chatQueueBinding;
+    },
+    set chatQueueBinding(v) {
+      chatQueueBinding = v;
+    },
+    get sessionEnded() {
+      return sessionEnded;
+    },
+    get buffer() {
+      return buffer;
+    },
+    get cursorPos() {
+      return cursorPos;
+    },
+    get fixedInput() {
+      return fixedInput;
+    },
+    options,
+    effectiveEnv,
+    history,
+    activityIndicator,
+    activityReporter,
+    runRegistryPoller,
+    runCompletionWatcher,
+    pasteStore,
+    dialogHost,
+    input,
+    output,
+    syncWindowTitle,
+    renderHistoryToOutput,
+    scheduleRender,
+    flushPendingRender,
+    refreshDialogTotalCredits,
+    emitCommandOutput
+  };
   const persistExplicitAgentSwitch = (previousAgentKey) => {
     if (state.agentKey === previousAgentKey) return false;
     persistAgentSelection(
@@ -7596,8 +7699,9 @@ ${content}`);
     const previousAgentKey = state.agentKey;
     state = result.nextState;
     const interactive = isInteractiveInput(input);
-    if (result.action?.type !== "chat" && result.action?.type !== "exit" && result.output) {
-      emitCommandOutput(result.output, interactive ? line.trim() : "");
+    if (result.action?.type !== "exit" && result.output) {
+      const shouldEmit = result.action?.type !== "chat" || !interactive;
+      if (shouldEmit) emitCommandOutput(result.output, interactive ? line.trim() : "");
     }
     if (state.agentKey !== previousAgentKey) {
       persistExplicitAgentSwitch(previousAgentKey);
@@ -7990,27 +8094,22 @@ ${stderrText.trim()}
       }
     }
     if (result.action?.type === "chat") {
-      const pathsToRead = [
-        ...result.action.imagePaths ?? [],
-        ...state.attachedImages.map((img) => img.sourcePath)
-      ];
-      let imageUrls = [];
-      if (pathsToRead.length > 0) {
-        const readResult = await readImagePaths(pathsToRead, {
-          onFailure: (_path, err) => output.write(`[nolo] image skipped: ${err.message}
+      const { imageUrls } = await resolveAttachmentImageUrls({
+        actionImagePaths: result.action.imagePaths,
+        attachedImages: state.attachedImages,
+        onFailure: (_path, err) => output.write(`[nolo] image skipped: ${err.message}
 `)
-        });
-        imageUrls = readResult.images.map((img) => img.dataUrl);
-      }
+      });
       state = {
         ...state,
         attachedImages: []
       };
       history.followBottom = true;
-      const binding = ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction);
+      const binding = ensureChatQueueBinding(turnCtx, actionGateHandler, confirmDestructiveAction);
       binding.notifyTurnStart();
       try {
         const outcome = await runOneAgentTurn(
+          turnCtx,
           result.action.message,
           imageUrls,
           actionGateHandler,
@@ -8169,12 +8268,13 @@ ${err.message}` : ""}`
     const runIdleTextTurn = async (inputMsg) => {
       const req = createTurnRequest(inputMsg);
       const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
-      const binding = ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction);
+      const binding = ensureChatQueueBinding(turnCtx, actionGateHandler, confirmDestructiveAction);
       binding.notifyTurnStart();
       busy = true;
       fixedInput.enterOutputMode(req.text);
       try {
         const outcome = await runOneAgentTurn(
+          turnCtx,
           req,
           [],
           actionGateHandler,
@@ -8198,7 +8298,7 @@ ${err.message}` : ""}`
       if (done) return;
       if (busy || fixedInput.isPaused()) {
         const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
-        ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction).enqueue(event);
+        ensureChatQueueBinding(turnCtx, actionGateHandler, confirmDestructiveAction).enqueue(event);
         if (fixedInput.active && !fixedInput.isPaused()) {
           fixedInput.repaint(buffer, cursorPos);
         }
@@ -8258,6 +8358,109 @@ ${err.message}` : ""}`
         paintFrame(buffer);
       }, 60);
     };
+    const handleCtrlCKey = async (busyLock) => {
+      if (busyLock && activeTurnAbort) {
+        const stopBinding = chatQueueBinding;
+        if (stopBinding && stopBinding.queueLength() > 0) {
+          stopBinding.preemptForStop();
+        }
+        activityIndicator.markStopping();
+        activeTurnAbort.abort();
+        return;
+      }
+      const now = Date.now();
+      const hasSelection = selectionState.anchor !== null && selectionState.head !== null && !areSelectionPointsEqual(selectionState.anchor, selectionState.head);
+      if (hasSelection) {
+        const tty = output;
+        const columns = tty.columns ?? 80;
+        const contentWidth = Math.max(1, columns - 1);
+        const textToCopy = extractSelectedText(
+          history,
+          selectionState.anchor,
+          selectionState.head,
+          contentWidth
+        );
+        clearSelection();
+        if (textToCopy.length > 0) {
+          try {
+            await writeClipboard2(textToCopy);
+            emitCommandOutput(t("copiedSelection"));
+          } catch (error) {
+            emitCommandOutput(
+              `[nolo] ${t("copyFailed")}: ${toErrorMessage(error)}`
+            );
+          }
+        }
+        paintFrame(buffer);
+        return;
+      }
+      if (selectionState.anchor) {
+        clearSelection();
+      }
+      if (buffer.length > 0) {
+        buffer = "";
+        cursorPos = 0;
+        if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
+        emitCommandOutput(t("ctrlCClearedDraft"));
+        return;
+      }
+      if (lastCtrlCDoublePress !== null && now - lastCtrlCDoublePress <= 1e3) {
+        lastCtrlCDoublePress = null;
+        fixedInput.disable();
+        finish();
+        return;
+      }
+      lastCtrlCDoublePress = now;
+      emitCommandOutput(t("ctrlCExitHint"));
+    };
+    const handleBusyLocalSlash = async (submittedText, busySlashCommand) => {
+      releaseCollapsedPasteReferences(submittedText, pasteStore);
+      buffer = "";
+      cursorPos = 0;
+      if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
+      const beforeAgentKey = state.agentKey;
+      const res = handleTuiInput(submittedText, state);
+      if (res.action?.type === "theme-refresh") {
+        state = res.nextState;
+        const detected = await detectTerminalBackground({
+          stdin: input,
+          stdout: output,
+          allowSystemFallback: true
+        });
+        let refreshMsg = "";
+        if (detected && applyDetectedBackground(detected)) {
+          refreshMsg = t("themeRefreshed", detected.brightness);
+        } else if (detected) {
+          refreshMsg = t("themeRefreshed", detected.brightness);
+        } else {
+          refreshMsg = t("themeRefreshFailed");
+        }
+        if (refreshMsg) {
+          output.write(`${refreshMsg}
+`);
+        }
+      } else if (res.action) {
+        output.write(
+          "Model picker isn't available while a reply is running. Use `/switch <name>` to switch now (takes effect on the next turn), or wait for the reply to finish.\n"
+        );
+      } else {
+        state = res.nextState;
+        let msg = res.output;
+        if (busySlashCommand === "/switch" && persistExplicitAgentSwitch(beforeAgentKey)) {
+          const hint = "Note: the new model takes effect on the next turn. Switching models may consume more tokens because the conversation context is re-sent to the new model.";
+          msg = msg ? `${msg}
+${hint}` : hint;
+        }
+        if (msg) {
+          output.write(`${msg}
+`);
+        }
+      }
+      if (busySlashCommand === "/theme") {
+        renderHistoryToOutput();
+        if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
+      }
+    };
     const handleInputToken = async (sequence) => {
       if (done) return;
       if (modalOwnsKeyboard) {
@@ -8280,7 +8483,7 @@ ${merged}` : merged;
           t(busy ? "flushQueuedBusyHint" : "flushQueuedIdleHint", String(totalCount))
         );
         if (busy) {
-          preemptAndAbortForDrain(chatQueueBinding);
+          preemptAndAbortForDrain(chatQueueBinding, activeTurnAbort);
           return;
         }
         buffer = "";
@@ -8387,59 +8590,7 @@ ${merged}` : merged;
         return;
       }
       if (sequence === "") {
-        if (busyLock && activeTurnAbort) {
-          const stopBinding = chatQueueBinding;
-          if (stopBinding && stopBinding.queueLength() > 0) {
-            stopBinding.preemptForStop();
-          }
-          activityIndicator.markStopping();
-          activeTurnAbort.abort();
-          return;
-        }
-        const now = Date.now();
-        const hasSelection = selectionState.anchor !== null && selectionState.head !== null && !areSelectionPointsEqual(selectionState.anchor, selectionState.head);
-        if (hasSelection) {
-          const tty = output;
-          const columns = tty.columns ?? 80;
-          const contentWidth = Math.max(1, columns - 1);
-          const textToCopy = extractSelectedText(
-            history,
-            selectionState.anchor,
-            selectionState.head,
-            contentWidth
-          );
-          clearSelection();
-          if (textToCopy.length > 0) {
-            try {
-              await writeClipboard2(textToCopy);
-              emitCommandOutput(t("copiedSelection"));
-            } catch (error) {
-              emitCommandOutput(
-                `[nolo] ${t("copyFailed")}: ${toErrorMessage(error)}`
-              );
-            }
-          }
-          paintFrame(buffer);
-          return;
-        }
-        if (selectionState.anchor) {
-          clearSelection();
-        }
-        if (buffer.length > 0) {
-          buffer = "";
-          cursorPos = 0;
-          if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
-          emitCommandOutput(t("ctrlCClearedDraft"));
-          return;
-        }
-        if (lastCtrlCDoublePress !== null && now - lastCtrlCDoublePress <= 1e3) {
-          lastCtrlCDoublePress = null;
-          fixedInput.disable();
-          finish();
-          return;
-        }
-        lastCtrlCDoublePress = now;
-        emitCommandOutput(t("ctrlCExitHint"));
+        await handleCtrlCKey(busyLock);
         return;
       }
       if (selectionState.anchor) {
@@ -8522,56 +8673,11 @@ ${merged}` : merged;
           const busySlashCommand = trimmedText.split(/\s+/)[0]?.toLowerCase();
           const isBusyLocalSlash = busySlashCommand === "/context" || busySlashCommand === "/ctx" || busySlashCommand === "/switch" || busySlashCommand === "/theme" || busySlashCommand === "/density" || busySlashCommand === "/runtime" || busySlashCommand === "/tools" || busySlashCommand === "/thinking" || busySlashCommand === "/auto" || busySlashCommand === "/tasks" || busySlashCommand === "/jobs" || busySlashCommand === "/procs" || busySlashCommand === "/agents" || busySlashCommand === "/doc" || busySlashCommand === "/skill" || busySlashCommand === "/customize" || busySlashCommand === "/login" || busySlashCommand === "/profile" || busySlashCommand === "/version";
           if (isBusyLocalSlash) {
-            releaseCollapsedPasteReferences(submittedText, pasteStore);
-            buffer = "";
-            cursorPos = 0;
-            if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
-            const beforeAgentKey = state.agentKey;
-            const res = handleTuiInput(submittedText, state);
-            if (res.action?.type === "theme-refresh") {
-              state = res.nextState;
-              const detected = await detectTerminalBackground({
-                stdin: input,
-                stdout: output,
-                allowSystemFallback: true
-              });
-              let refreshMsg = "";
-              if (detected && applyDetectedBackground(detected)) {
-                refreshMsg = t("themeRefreshed", detected.brightness);
-              } else if (detected) {
-                refreshMsg = t("themeRefreshed", detected.brightness);
-              } else {
-                refreshMsg = t("themeRefreshFailed");
-              }
-              if (refreshMsg) {
-                output.write(`${refreshMsg}
-`);
-              }
-            } else if (res.action) {
-              output.write(
-                "Model picker isn't available while a reply is running. Use `/switch <name>` to switch now (takes effect on the next turn), or wait for the reply to finish.\n"
-              );
-            } else {
-              state = res.nextState;
-              let msg = res.output;
-              if (busySlashCommand === "/switch" && persistExplicitAgentSwitch(beforeAgentKey)) {
-                const hint = "Note: the new model takes effect on the next turn. Switching models may consume more tokens because the conversation context is re-sent to the new model.";
-                msg = msg ? `${msg}
-${hint}` : hint;
-              }
-              if (msg) {
-                output.write(`${msg}
-`);
-              }
-            }
-            if (busySlashCommand === "/theme") {
-              renderHistoryToOutput();
-              if (fixedInput.active) fixedInput.repaint(buffer, cursorPos);
-            }
+            await handleBusyLocalSlash(submittedText, busySlashCommand);
             return;
           }
           const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
-          const binding = ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction);
+          const binding = ensureChatQueueBinding(turnCtx, actionGateHandler, confirmDestructiveAction);
           const decision = binding.resolveSubmit({
             text: submittedText,
             isRunning: true
@@ -8583,13 +8689,13 @@ ${hint}` : hint;
             fixedInput.repaint(buffer, cursorPos);
           } else if (decision.kind === "queue-blocked") {
           } else if (decision.kind === "noop" && !submittedText.trim() && binding.queueLength() > 0) {
-            preemptAndAbortForDrain(binding);
+            preemptAndAbortForDrain(binding, activeTurnAbort);
           }
           return;
         }
         if (!submittedText.trim() && chatQueueBinding && chatQueueBinding.queueLength() > 0) {
           const { actionGateHandler, confirmDestructiveAction } = buildInteractiveTurnHandlers();
-          const manualBinding = ensureChatQueueBinding(actionGateHandler, confirmDestructiveAction);
+          const manualBinding = ensureChatQueueBinding(turnCtx, actionGateHandler, confirmDestructiveAction);
           const drainedText = manualBinding.drainHeadForManualTurn();
           if (drainedText !== null) {
             buffer = "";