@armadra/agent 0.6.3 → 0.6.5

package/dist/bundle/ama.cjs

@@ -41,7 +41,7 @@ var AMA_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    AMA_VERSION = true ? "0.6.3" : readPackageVersion();
+    AMA_VERSION = true ? "0.6.5" : readPackageVersion();
   }
 });
 
@@ -1734,7 +1734,8 @@ var init_interactive_view = __esm({
           followUp: "follow-up",
           host: "host",
           task: "subagent notice",
-          plan: "plan"
+          plan: "plan",
+          interrupt: "interrupt"
         },
         planHandoff: "Start executing the approved plan",
         thinkingStreaming: (glyph, ellipsis) => `${glyph} Thinking${ellipsis}`,
@@ -1762,7 +1763,11 @@ var init_interactive_view = __esm({
         replying: "Replying",
         thinking: "Thinking",
         queueMore: (ellipsis, n) => `${ellipsis} ${n} more`,
-        queueHint: (arrow) => `Alt+${arrow} take back · Esc refill and interrupt`
+        queueHint: (arrow) => `Alt+${arrow} take back · Esc refill and interrupt`,
+        /** 有排队的插话时（`key` = 立即送出它们的键：专用键，或 interrupt 模式下的 Enter）。 */
+        queueHintNow: (arrow, key) => `Alt+${arrow} take back · ${key} send now · Esc refill and interrupt`,
+        /** 输入框有字时：Enter 与专用键各做什么（`ui.enterWhileRunning`）。 */
+        sendHint: (mode, key) => mode === "queue" ? `Enter queue · ${key} interrupt & send` : `Enter interrupt & send · ${key} queue`
       },
       tool: {
         interrupted: "interrupted",
@@ -1800,7 +1805,8 @@ var init_interactive_view = __esm({
           followUp: "之后",
           host: "宿主",
           task: "子 Agent 通知",
-          plan: "计划"
+          plan: "计划",
+          interrupt: "打断"
         },
         planHandoff: "按批准的计划开始执行",
         thinkingStreaming: (glyph, ellipsis) => `${glyph} 思考中${ellipsis}`,
@@ -1828,7 +1834,9 @@ var init_interactive_view = __esm({
         replying: "回复中",
         thinking: "思考中",
         queueMore: (ellipsis, n) => `${ellipsis} 另 ${n} 条`,
-        queueHint: (arrow) => `Alt+${arrow} 取回 · Esc 回填并中断`
+        queueHint: (arrow) => `Alt+${arrow} 取回 · Esc 回填并中断`,
+        queueHintNow: (arrow, key) => `Alt+${arrow} 取回 · ${key} 立即发送 · Esc 回填并中断`,
+        sendHint: (mode, key) => mode === "queue" ? `Enter 排队 · ${key} 打断并发送` : `Enter 打断并发送 · ${key} 排队`
       },
       tool: {
         interrupted: "已中断",
@@ -1875,6 +1883,7 @@ var init_interactive = __esm({
         keyHints: [
           "Enter send (while running = steer)  Alt+Enter queue after this turn  Shift+Enter / Ctrl+J newline",
           "Esc interrupt (queued messages go back to the editor)  Alt+↑ take back the last queued message",
+          "Ctrl+X (while running) interrupt the current turn and send the input now, queued steers first; ui.enterWhileRunning: interrupt swaps it with Enter",
           "Idle Esc Esc: empty input = rewind (/rewind), with text = clear (↑ to restore)",
           "Shift+Tab / Tab (empty input) cycle permission mode (confirm before Bypass)  Ctrl+L model  Ctrl+T thinking level  Ctrl+O expand tool output and thinking",
           "Approval: 1–3 or ↑↓ Enter to choose, y allow  a allow for this session  n / Esc deny  v full input",
@@ -1917,6 +1926,8 @@ var init_interactive = __esm({
         clearedCtrlC: "Input cleared · press Ctrl+C again to quit",
         ctrlCAgain: "Press Ctrl+C again to quit",
         interrupted: "Interrupted",
+        interruptSent: "Interrupted · sending now",
+        nothingToSend: "Nothing to send",
         toolsExpanded: "Tool output: expanded",
         toolsCollapsed: "Tool output: collapsed"
       },
@@ -2007,6 +2018,7 @@ var init_interactive = __esm({
         keyHints: [
           "Enter 发送（运行中 = 插话）  Alt+Enter 排到本轮之后  Shift+Enter / Ctrl+J 换行",
           "Esc 中断（排队消息回填编辑器）  Alt+↑ 取回最后一条排队消息",
+          "Ctrl+X（运行中）打断当前回合并立即发送输入（排队的插话在前）；ui.enterWhileRunning: interrupt 时与 Enter 互换",
           "空闲时 Esc Esc：输入框为空 = 回滚（/rewind），有字 = 清空（↑ 取回）",
           "Shift+Tab / Tab（输入为空时）切换权限模式（进入 Bypass 前确认）  Ctrl+L 模型  Ctrl+T 思考级别  Ctrl+O 展开工具输出与思考",
           "审批：1–3 或 ↑↓ Enter 选择，y 允许  a 本会话允许同类  n / Esc 拒绝  v 完整输入",
@@ -2047,6 +2059,8 @@ var init_interactive = __esm({
         clearedCtrlC: "已清空输入 · 再按 Ctrl+C 退出",
         ctrlCAgain: "再按一次 Ctrl+C 退出",
         interrupted: "已中断",
+        interruptSent: "已打断，立即发送",
+        nothingToSend: "没有可发送的内容",
         toolsExpanded: "工具输出：展开",
         toolsCollapsed: "工具输出：折叠"
       },
@@ -2983,6 +2997,8 @@ var init_report = __esm({
         tasks: "Sub-agent tasks: status, output, stop, background",
         agents: "Sub-agent types and external agents (installed, version)",
         paste: "Paste an image from the clipboard (Ctrl+V)",
+        interruptArgs: "<text>",
+        interrupt: "Interrupt the current turn and send this now, queued steers first (Ctrl+X)",
         exit: "Exit",
         config: "Settings panel; key=value sets one item directly (user level)",
         traceArgs: "[task id]",
@@ -3001,6 +3017,8 @@ var init_report = __esm({
         cacheUsage: "usage: /cache [warm off|streaming|idle | fingerprint]",
         taskStopped: (id) => `Stopped ${id}`,
         tasksUsage: "usage: /tasks [id] | /tasks stop <id> | /tasks bg [id]",
+        interruptUsage: "usage: /interrupt <text>",
+        interruptSent: (text) => `Interrupted; sending now: ${text}`,
         newSession: (id) => `New session ${id}`,
         resumed: (id, messages) => `Resumed session ${id} (${plural(messages, "message")})`,
         forked: (id) => `Forked to new session ${id}`,
@@ -3222,6 +3240,8 @@ Available: ${inactive.join(", ")}` : ""}`,
         tasks: "子 Agent 任务：状态、输出、停止、转后台",
         agents: "子 Agent 类型与外部 Agent（安装状态、版本）",
         paste: "粘贴剪贴板里的图片（Ctrl+V）",
+        interruptArgs: "<文本>",
+        interrupt: "打断当前回合并立即发送这段文字，排队的插话在前（Ctrl+X）",
         exit: "退出",
         config: "设置面板；key=value 直接设一项（用户级）",
         traceArgs: "[任务 id]",
@@ -3239,6 +3259,8 @@ Available: ${inactive.join(", ")}` : ""}`,
         cacheUsage: "用法：/cache [warm off|streaming|idle | fingerprint]",
         taskStopped: (id) => `已停止 ${id}`,
         tasksUsage: "用法：/tasks [id] | /tasks stop <id> | /tasks bg [id]",
+        interruptUsage: "用法：/interrupt <文本>",
+        interruptSent: (text) => `已打断，立即发送：${text}`,
         newSession: (id) => `已新建会话 ${id}`,
         resumed: (id, messages) => `已恢复会话 ${id}（${messages} 条消息）`,
         forked: (id) => `已分叉到新会话 ${id}`,
@@ -3628,6 +3650,7 @@ var init_config_keys = __esm({
       "ui.logo": "AMA logo in the startup header: auto draws it when the terminal is at least 48 columns wide, off shows only the info lines",
       "ui.animation": "false: the spinner stays still while running and redraws only when seconds change; the startup logo does not animate",
       "ui.restoreOnCancel": "When Esc interrupts a run before any reply or tool call in this turn, withdraw the turn and put the message back into the input box",
+      "ui.enterWhileRunning": "Enter while a run is in progress: queue (default) queues the message as a steer delivered at the next delivery point; interrupt stops the current turn and sends it at once. The app.message.interrupt key (default Ctrl+X) does the other one",
       "ui.statusLine": "Bottom info line: full shows two lines (rate line + status line), compact one; toggle at runtime with Ctrl+G or /statusline (effective from wave 5 W5-A)",
       "ui.language": "Interface language: auto decides from LC_ALL / LC_MESSAGES / LANG (zh* is Chinese, anything else English), zh, en; AMA_LANG and --lang override; affects the interface only, text sent to the model is always English",
       "ui.replyLanguage": "Reply language for the model (e.g. Chinese): one English rule is appended to the end of the rules section at session start; zero-byte change when unset; user level only (effective from wave 6)",
@@ -3750,6 +3773,7 @@ var init_config_keys = __esm({
       "ui.logo": "启动头的 AMA 字符画：auto 在终端宽 48 列以上时画，off 只显示信息行",
       "ui.animation": "false：运行中 spinner 静止，只在秒数变化时重绘；启动字符画不播放动画",
       "ui.restoreOnCancel": "运行中 Esc 中断、本回合还没有任何回复或工具调用时，撤回该回合并把原消息放回输入框",
+      "ui.enterWhileRunning": "运行中按 Enter：queue（缺省）排队插话，等下一个投递点送达；interrupt 打断当前回合并立即发送。app.message.interrupt 键（缺省 Ctrl+X）做另一种",
       "ui.statusLine": "底部信息行：full 两行（速率行 + 状态行），compact 一行；运行时 Ctrl+G 或 /statusline 切换（第五波 W5-A 起生效）",
       "ui.language": "界面语言：auto 按 LC_ALL / LC_MESSAGES / LANG 判断（zh* 为中文，其余英文），zh，en；AMA_LANG、--lang 覆盖；只影响界面，发给模型的文本固定英文",
       "ui.replyLanguage": "模型回复语言（如 Chinese）：会话开始在 rules 节末尾追加一句英文规则；不设时零字节变化；只认用户级（第六波起生效）",
@@ -4696,6 +4720,8 @@ var init_agents = __esm({
         steered: (taskId) => `Sent to ${taskId}; delivered when its current turn ends`,
         queued: (taskId) => `Queued for ${taskId}; sent when its current run ends`,
         resumed: (taskId) => `Sent to ${taskId}; it continues in the background`,
+        interrupted: (taskId) => `Interrupted ${taskId}; your message starts its next turn now`,
+        queuedNoInterrupt: (taskId) => `${taskId} cannot be interrupted here; queued, sent when its current run ends`,
         sendFailed: (message) => `Could not send: ${message}`,
         stopped: (taskId) => `Stopped ${taskId}`,
         commandsHere: "Only /tasks stop and /tasks bg work here; press Esc to go back for other commands",
@@ -4758,6 +4784,8 @@ var init_agents = __esm({
         steered: (taskId) => `已发给 ${taskId}，本轮结束后送达`,
         queued: (taskId) => `已排队，${taskId} 本次运行结束后发送`,
         resumed: (taskId) => `已发给 ${taskId}，在后台继续`,
+        interrupted: (taskId) => `已打断 ${taskId}，这条消息立即开始新一轮`,
+        queuedNoInterrupt: (taskId) => `${taskId} 不支持打断，已排队，本次运行结束后发送`,
         sendFailed: (message) => `发送失败：${message}`,
         stopped: (taskId) => `已停止 ${taskId}`,
         commandsHere: "这里只能用 /tasks stop 与 /tasks bg；其它命令按 Esc 返回后输入",
@@ -5396,6 +5424,7 @@ var init_settings = __esm({
         "ui.logo": "Startup logo",
         "ui.statusLine": "Status line",
         "ui.restoreOnCancel": "Restore on cancel",
+        "ui.enterWhileRunning": "Enter while running",
         "ui.quietStartup": "Startup screen",
         "ui.ascii": "ASCII glyphs",
         "ui.language": "Interface language",
@@ -5567,6 +5596,7 @@ var init_settings = __esm({
         "ui.logo": "启动字符画",
         "ui.statusLine": "底部信息行",
         "ui.restoreOnCancel": "中断后放回原消息",
+        "ui.enterWhileRunning": "运行中按 Enter",
         "ui.quietStartup": "启动画面",
         "ui.ascii": "ASCII 字形",
         "ui.language": "界面语言",
@@ -7101,6 +7131,7 @@ function validateConfig(value) {
       "logo",
       "animation",
       "restoreOnCancel",
+      "enterWhileRunning",
       ...W5_UI_KEYS,
       ...W6_UI_KEYS
     ],
@@ -7115,6 +7146,7 @@ function validateConfig(value) {
       c.oneOf(s2, "logo", p, ["auto", "off"]);
       c.boolean(s2, "animation", p);
       c.boolean(s2, "restoreOnCancel", p);
+      c.oneOf(s2, "enterWhileRunning", p, ["queue", "interrupt"]);
       checkUiW5(c, s2, p);
       checkUiW6(c, s2, p);
     }
@@ -18176,6 +18208,24 @@ function queuedText(message) {
   if (typeof content === "string") return content;
   return content.map((block) => block.type === "text" ? block.text : "[image]").join("");
 }
+function mergeForInterrupt(queued, text, images = []) {
+  const texts2 = [];
+  const merged = [];
+  for (const message of queued) {
+    if (message.role !== "user") continue;
+    const { content } = message;
+    if (typeof content === "string") texts2.push(content);
+    else {
+      texts2.push(content.map((block) => block.type === "text" ? block.text : "").join(""));
+      for (const block of content) if (block.type === "image") merged.push(block);
+    }
+  }
+  texts2.push(text);
+  merged.push(...images);
+  const parts = texts2.filter((part) => part.trim() !== "");
+  if (parts.length === 0 && merged.length === 0) return void 0;
+  return { text: parts.join("\n\n"), images: merged };
+}
 var PendingMessageQueue;
 var init_queue = __esm({
   "src/agent/queue.ts"() {
@@ -23296,10 +23346,16 @@ function liveOf(record3) {
   if (entries !== void 0) live2.entries = () => entries.call(handle);
   return live2;
 }
-async function directMessage(record3, text, host) {
+async function directMessage(record3, text, host, interrupt = false) {
   if (text.trim() === "") throw new AmaError("invalid_arguments", "empty message");
   if (record3.running !== void 0) {
     const handle = record3.handle;
+    if (interrupt && record3.queued !== true && await interruptRun(record3, text))
+      return "interrupted";
+    if (interrupt) {
+      (record3.direct ??= []).push(text);
+      return "queuedNoInterrupt";
+    }
     if (handle?.message !== void 0 && record3.queued !== true) {
       try {
         await handle.message(text, "followUp");
@@ -23314,6 +23370,24 @@ async function directMessage(record3, text, host) {
   await resumeDirect(record3, text, host);
   return "resumed";
 }
+async function interruptRun(record3, text) {
+  const handle = record3.handle;
+  if (handle?.message !== void 0) {
+    try {
+      await handle.message(text, "interrupt");
+      return true;
+    } catch (error2) {
+      if (error2 instanceof AmaError && error2.code === "task_idle") return false;
+      throw error2;
+    }
+  }
+  if (handle?.interrupt === void 0) return false;
+  const queued = record3.direct ?? [];
+  const merged = [...queued, text].join("\n\n");
+  if (!await handle.interrupt(merged)) return false;
+  queued.splice(0);
+  return true;
+}
 async function resumeDirect(record3, text, host) {
   const spawn9 = host.spawnSubagent;
   if (spawn9 === void 0)
@@ -23656,10 +23730,10 @@ var init_subagent_registry = __esm({
         return record3 === void 0 ? void 0 : liveOf(record3);
       }
       /** [W6-A] 人在子 Agent 视图里发的消息（subagent-direct.ts）。 */
-      async message(taskId, text) {
+      async message(taskId, text, interrupt = false) {
         const record3 = this.tasks.get(taskId);
         if (record3 === void 0) throw new AmaError("task_not_found", `unknown task ${taskId}`);
-        return directMessage(record3, text, this.host);
+        return directMessage(record3, text, this.host, interrupt);
       }
       async stop(taskId) {
         const record3 = this.tasks.get(taskId);
@@ -24109,6 +24183,7 @@ async function startAmaChild(parent, spec2, createChild, run7) {
   run7.signal.addEventListener("abort", onAbort, { once: true });
   let billed = { cacheRead: 0, prompt: 0, reBilled: 0 };
   let active = false;
+  const forced2 = [];
   const runOnce = async (prompt, origin) => {
     const startTurns = turns;
     let error2;
@@ -24117,6 +24192,7 @@ async function startAmaChild(parent, spec2, createChild, run7) {
       if (run7.signal.aborted) throw new AmaError("aborted", "aborted");
       await child.prompt(prompt, origin === void 0 ? {} : { origin });
       for (; ; ) {
+        while (forced2.length > 0) await forced2.shift();
         const left = child.clearQueue?.().followUp ?? [];
         if (left.length === 0 || run7.signal.aborted) break;
         await child.prompt(left.join("\n\n"), { origin: "direct" });
@@ -24161,6 +24237,10 @@ async function startAmaChild(parent, spec2, createChild, run7) {
       }
       if (!active || child.followUp === void 0)
         throw new AmaError("task_idle", "the sub-agent is not running");
+      if (when === "interrupt") {
+        forced2.push(child.prompt(text, { origin: "direct", interrupt: true }));
+        return;
+      }
       await child.followUp(text, { origin: "direct" });
     },
     wait: () => current3,
@@ -26088,6 +26168,8 @@ var init_session2 = __esm({
       // -------------------------------------------------------------------------
       async prompt(text, options = {}) {
         this.assertUsable();
+        if (options.interrupt === true && this.cycle !== void 0)
+          return this.interruptWith(text, options.images, options.origin);
         if (this.cycle !== void 0) {
           const behavior = options.streamingBehavior;
           if (behavior === void 0) {
@@ -26115,7 +26197,9 @@ var init_session2 = __esm({
       }
       async enqueueOrRun(text, queue, options) {
         this.assertUsable();
-        const origin = normalizeOrigin(options.origin ?? queue);
+        if (options.interrupt === true && this.cycle !== void 0)
+          return this.interruptWith(text, void 0, options.origin).then(() => "handled");
+        const origin = normalizeOrigin(options.origin ?? (options.interrupt === true ? "user" : queue));
         if (this.cycle === void 0) {
           await this.startCycle((signal) => runPrompt(this.runDeps(), text, void 0, origin, signal));
           return "handled";
@@ -26129,6 +26213,19 @@ var init_session2 = __esm({
       followUp(text, options = {}) {
         return this.enqueueOrRun(text, "followUp", options);
       }
+      /**
+       * 打断并立即发送：取走排队的 steer、中止当前周期（工具按 abort 收尾），以「steer… + 本条」开新回合；
+       * followUp 留在队列。没有可发的内容 → invalid_arguments（不打断）。
+       */
+      async interruptWith(text, images, origin) {
+        const merged = mergeForInterrupt(this.agent.steeringQueue.snapshot(), text, images);
+        if (merged === void 0) throw new AmaError("invalid_arguments", "nothing to send");
+        this.agent.steeringQueue.clear();
+        this.emitQueue();
+        while (this.cycle !== void 0) await this.abort();
+        const kind = normalizeOrigin(origin ?? "interrupt");
+        return this.startCycle((s2) => runPrompt(this.runDeps(), merged.text, merged.images, kind, s2));
+      }
       async abort() {
         const cycle = this.cycle;
         if (cycle === void 0) return;
@@ -30641,6 +30738,9 @@ var init_jsonrpc = __esm({
 });
 
 // src/drivers/acp/client.ts
+function mcpServersOf(options) {
+  return [...options?.mcpServers ?? []];
+}
 function unattendedOutcome(params) {
   const reject2 = params.options.find((o) => o.kind === "reject_once");
   return {
@@ -30672,6 +30772,11 @@ var init_client = __esm({
         });
       }
       options;
+      /**
+       * 本版客户端支持的可选能力，供宿主做特性检测（旧版没有这个字段）：
+       * - `mcpServers`：开会话时可经 {@link AcpSessionOptions} 传 MCP 服务器。
+       */
+      static features = { mcpServers: true };
       peer;
       /** sessionId → 挂起权限请求的取消器。 */
       pendingPermissions = /* @__PURE__ */ new Map();
@@ -30721,16 +30826,28 @@ var init_client = __esm({
       supportsImages() {
         return this.agentCapabilities.promptCapabilities?.image === true;
       }
-      newSession(cwd, signal) {
-        return this.peer.request(ACP_METHODS.sessionNew, { cwd, mcpServers: [] }, signal);
+      newSession(cwd, signal, options) {
+        return this.peer.request(
+          ACP_METHODS.sessionNew,
+          { cwd, mcpServers: mcpServersOf(options) },
+          signal
+        );
       }
       /** 不回放历史（优先，R13：v2 计划取消 load）。 */
-      resumeSession(sessionId, cwd, signal) {
-        return this.peer.request(ACP_METHODS.sessionResume, { sessionId, cwd, mcpServers: [] }, signal);
+      resumeSession(sessionId, cwd, signal, options) {
+        return this.peer.request(
+          ACP_METHODS.sessionResume,
+          { sessionId, cwd, mcpServers: mcpServersOf(options) },
+          signal
+        );
       }
       /** 回放历史（以 session/update 通知）。 */
-      loadSession(sessionId, cwd, signal) {
-        return this.peer.request(ACP_METHODS.sessionLoad, { sessionId, cwd, mcpServers: [] }, signal);
+      loadSession(sessionId, cwd, signal, options) {
+        return this.peer.request(
+          ACP_METHODS.sessionLoad,
+          { sessionId, cwd, mcpServers: mcpServersOf(options) },
+          signal
+        );
       }
       listSessions(cwd, cursor) {
         return this.peer.request(ACP_METHODS.sessionList, {
@@ -32742,7 +32859,7 @@ function failed3(text, sessionId, runner) {
     ...sessionId !== "" ? { sessionRef: { runner, sessionId } } : {}
   };
 }
-var RUN_TIMEOUT_MS, IDLE_CLOSE_MS, ProcessRunner, ProcessHandle;
+var RUN_TIMEOUT_MS, IDLE_CLOSE_MS, ProcessRunner, TURN_INTERRUPT, ProcessHandle;
 var init_runner = __esm({
   "src/drivers/runner.ts"() {
     "use strict";
@@ -32828,6 +32945,12 @@ var init_runner = __esm({
         return this.deps;
       }
     };
+    TURN_INTERRUPT = /* @__PURE__ */ new Set([
+      "acp",
+      "acp-adapter",
+      "claude-stream",
+      "codex-app-server"
+    ]);
     ProcessHandle = class {
       constructor(runner, chosen, request, deps) {
         this.runner = runner;
@@ -32899,8 +33022,22 @@ var init_runner = __esm({
         }
         this.chain = this.chain.then(() => this.runTurn(text));
       }
-      wait() {
-        return this.chain;
+      /** 跟到链尾：回合进行中被 `interrupt` 接上的下一回合也算在这次运行里。 */
+      async wait() {
+        for (; ; ) {
+          const chain = this.chain;
+          const result = await chain;
+          if (chain === this.chain) return result;
+        }
+      }
+      /** 子 Agent 视图的「打断并发送」：中断当前回合，紧接着以 `text` 开下一回合。 */
+      async interrupt(text) {
+        const session = this.session;
+        if (this.stopped || !this.busy || session === void 0) return false;
+        if (!TURN_INTERRUPT.has(this.chosen.driver.kind)) return false;
+        this.chain = this.chain.then(() => this.runTurn(text));
+        await session.cancel();
+        return true;
       }
       async stop() {
         if (this.stopped) return;
@@ -34957,10 +35094,11 @@ function window(used, minutes, resetSeconds) {
   if (usedPercent === void 0) return void 0;
   const out = { usedPercent: Math.max(0, Math.min(100, usedPercent)) };
   const m = num(minutes);
-  if (m !== void 0) out.windowMinutes = m;
+  if (m !== void 0 && m > 0) out.windowMinutes = m;
   const reset = num(resetSeconds);
   if (reset !== void 0 && reset > 0) out.resetsAt = reset * 1e3;
-  return out;
+  const empty = out.usedPercent === 0 && out.windowMinutes === void 0 && out.resetsAt === void 0;
+  return empty ? void 0 : out;
 }
 function snapshot(primary, secondary, plan2) {
   const out = {};
@@ -35306,7 +35444,14 @@ var init_key_docs = __esm({
       codemode: { inlineBudget: DEFAULT_INLINE_BUDGET, requireStrict: false },
       cache: { ...DEFAULT_CACHE_CONFIG },
       request: { idleTimeoutMs: DEFAULT_IDLE_TIMEOUT_MS },
-      ui: { compact: false, logo: "auto", animation: true, restoreOnCancel: true, language: "auto" },
+      ui: {
+        compact: false,
+        logo: "auto",
+        animation: true,
+        restoreOnCancel: true,
+        enterWhileRunning: "queue",
+        language: "auto"
+      },
       // [W6-C0] 第六波键的缺省（行为由各批次实现）
       memory: {
         enabled: false,
@@ -35709,6 +35854,7 @@ function buildBaseSchema() {
         logo: oneOf(["auto", "off"]),
         animation: bool(),
         restoreOnCancel: bool(),
+        enterWhileRunning: oneOf(["queue", "interrupt"]),
         statusLine: oneOf(STATUS_LINE_MODES),
         language: oneOf(LANGUAGE_SETTINGS),
         replyLanguage: str3(),
@@ -39722,6 +39868,7 @@ var init_settings_registry = __esm({
       row("ui.logo", "ui", "restart", "any"),
       row("ui.statusLine", "ui", "now", "any"),
       row("ui.restoreOnCancel", "ui", "nextSession", "any"),
+      row("ui.enterWhileRunning", "ui", "now", "any"),
       row("ui.quietStartup", "ui", "restart", "any"),
       row("ui.ascii", "ui", "restart", "any", { envOverride: "AMA_ASCII" }),
       row("ui.language", "ui", "restart", "any", { envOverride: "AMA_LANG" }),
@@ -41477,6 +41624,13 @@ var init_keybindings = __esm({
       "app.exit": ["ctrl+d"],
       "app.message.followUp": ["alt+enter"],
       "app.message.dequeue": ["alt+up"],
+      /**
+       * 运行中打断当前回合并立即发送输入框的文字（连同排队的插话）；`ui.enterWhileRunning: "interrupt"` 时与
+       * Enter 互换（它变成排队）。缺省 `Ctrl+X`：各终端（macOS Terminal、iTerm2、tmux、Windows Terminal）都原样
+       * 送达 0x18，且没有别的绑定；`Ctrl+Enter` 不开 kitty 键盘协议时与 Enter 无法区分，`Ctrl+S` 可能被 XOFF
+       * 流控吃掉，`Alt+Enter` 已是 followUp，`Alt+<字母>` 在 macOS 缺省不送 Meta，`Ctrl+]` 在非美式键盘难按。
+       */
+      "app.message.interrupt": ["ctrl+x"],
       "app.permission.cycle": ["shift+tab", "tab"],
       "app.tools.expand": ["ctrl+o"],
       "app.model.select": ["ctrl+l"],
@@ -44928,34 +45082,46 @@ function windowSpan(minutes) {
   if (minutes % 60 === 0) return `${minutes / 60}h`;
   return `${Math.round(minutes)}m`;
 }
-function labels(w, which) {
-  const m = msg().interactive.statusLine.quota;
-  const minutes = w.windowMinutes;
-  const standard = minutes === void 0 || minutes === (which === "primary" ? FIVE_HOURS : WEEK);
-  if (!standard)
-    return { pct: m.window(windowSpan(minutes)), reset: m.windowReset(windowSpan(minutes)) };
-  return which === "primary" ? { pct: m.session, reset: m.reset } : { pct: m.weekly, reset: m.weeklyReset };
+function minutesOf(w) {
+  const m = w.windowMinutes;
+  return m !== void 0 && Number.isFinite(m) && m > 0 ? m : void 0;
+}
+function kindOf(minutes) {
+  if (minutes === FIVE_HOURS) return "session";
+  if (minutes === WEEK) return "weekly";
+  return minutes;
 }
-function shortLabel(w, which) {
+function labels(kind) {
   const m = msg().interactive.statusLine.quota;
-  const minutes = w.windowMinutes;
-  if (minutes === FIVE_HOURS || minutes === void 0 && which === "primary") return m.short5h;
-  if (minutes === WEEK || minutes === void 0 && which === "secondary") return m.shortWeek;
-  return windowSpan(minutes);
+  if (kind === "session") return { pct: m.session, reset: m.reset, short: m.short5h };
+  if (kind === "weekly") return { pct: m.weekly, reset: m.weeklyReset, short: m.shortWeek };
+  const span = windowSpan(kind);
+  return { pct: m.window(span), reset: m.windowReset(span), short: span };
 }
 function percent2(theme, used, decimal) {
   return theme.fg(levelColor(used / 100), decimal ? `${used.toFixed(1)}%` : `${Math.round(used)}%`);
 }
-function windows(quota) {
-  const out = [];
-  if (quota.primary !== void 0) out.push(["primary", quota.primary]);
-  if (quota.secondary !== void 0) out.push(["secondary", quota.secondary]);
-  return out;
+function hasData(w) {
+  return w.usedPercent !== 0 || minutesOf(w) !== void 0 || w.resetsAt !== void 0;
+}
+function shownWindows(quota) {
+  const slots = ["primary", "secondary"].map((which) => ({ which, w: quota[which] })).filter((x) => x.w !== void 0).filter((x) => hasData(x.w));
+  const known = slots.map((x) => kindOf(minutesOf(x.w)));
+  const out = slots.map((x, i) => {
+    const own = known[i];
+    if (own !== void 0) return { kind: own, window: x.w };
+    const guess = x.which === "primary" ? "session" : "weekly";
+    const taken = known.some((k, j) => j !== i && k === guess);
+    const kind = taken ? guess === "session" ? "weekly" : "session" : guess;
+    return { kind, window: x.w };
+  });
+  const span = (k) => typeof k === "number" ? k : SPAN[k];
+  return out.sort((a, b) => span(a.kind) - span(b.kind));
 }
 function compactQuotaItem(quota, theme) {
   const dim = (text) => theme.fg("dim", text);
-  const items = windows(quota).map(
-    ([which, w]) => `${dim(shortLabel(w, which))} ${percent2(theme, w.usedPercent, false)}`
+  const items = shownWindows(quota).map(
+    ({ kind, window: w }) => `${dim(labels(kind).short)} ${percent2(theme, w.usedPercent, false)}`
   );
   return items.length === 0 ? void 0 : items.join(" ");
 }
@@ -44963,30 +45129,31 @@ function quotaParts2(quota, width2, now, theme) {
   const dim = (text) => theme.fg("dim", text);
   const narrow = width2 < QUOTA_NARROW_WIDTH;
   const parts = [];
-  windows(quota).forEach(([which, w], i) => {
+  shownWindows(quota).forEach(({ kind, window: w }, i) => {
     const first = i === 0;
-    const group = narrow ? which : void 0;
-    const name = narrow ? `${shortLabel(w, which)} ` : labels(w, which).pct;
+    const group = narrow ? `w${i}` : void 0;
+    const label2 = labels(kind);
+    const name = narrow ? `${label2.short} ` : label2.pct;
     parts.push({
       text: dim(name) + percent2(theme, w.usedPercent, !narrow),
       priority: first ? void 0 : 2,
-      zone: "left",
+      zone: "right",
       ...group !== void 0 ? { group } : {}
     });
     if (w.resetsAt === void 0) return;
     const left = formatRemaining(w.resetsAt - now, narrow);
     parts.push({
-      text: narrow ? theme.fg("tool", `${theme.glyphs.retry}${left}`) : dim(labels(w, which).reset) + theme.fg("tool", left),
+      text: narrow ? theme.fg("tool", `${theme.glyphs.retry}${left}`) : dim(label2.reset) + theme.fg("tool", left),
       priority: first ? 3 : 1,
-      zone: "left",
+      zone: "right",
       // 宽格式按最宽形状占位（`23h 59m`），数值变化不让某项时有时无
-      reserve: narrow ? 0 : visibleWidth(labels(w, which).reset) + 7,
+      reserve: narrow ? 0 : visibleWidth(label2.reset) + 7,
       ...group !== void 0 ? { group } : {}
     });
   });
   return parts;
 }
-var QUOTA_NARROW_WIDTH, FIVE_HOURS, WEEK, QuotaLine;
+var QUOTA_NARROW_WIDTH, FIVE_HOURS, WEEK, SPAN, QuotaLine;
 var init_status_quota = __esm({
   "src/modes/interactive/status-quota.ts"() {
     "use strict";
@@ -44996,6 +45163,7 @@ var init_status_quota = __esm({
     QUOTA_NARROW_WIDTH = 80;
     FIVE_HOURS = 300;
     WEEK = 10080;
+    SPAN = { session: FIVE_HOURS, weekly: WEEK };
     QuotaLine = class {
       constructor(source, theme) {
         this.source = source;
@@ -45009,7 +45177,8 @@ var init_status_quota = __esm({
         if (view === void 0) return [];
         const theme = this.theme;
         if (view === "pending") {
-          return [truncateToWidth(theme.fg("dim", msg().interactive.statusLine.quota.pending), width2)];
+          const text = theme.fg("dim", msg().interactive.statusLine.quota.pending);
+          return [layoutRow([{ text, priority: void 0, zone: "right" }], width2, theme)];
         }
         const parts = quotaParts2(view.quota, width2, this.source.now(), theme);
         if (parts.length === 0) return [];
@@ -45085,9 +45254,10 @@ function layoutRow(parts, width2, theme, style = {}) {
   let kept = [...parts];
   const zone = (z) => kept.filter((p) => p.zone === z);
   const fits = () => {
-    const l2 = join66(zone("left"))[1];
+    const left = zone("left");
     const right = zone("right");
-    return l2 + (right.length === 0 ? 0 : sep5.length + join66(right)[1]) <= width2;
+    const between = left.length === 0 || right.length === 0 ? 0 : sep5.length;
+    return join66(left)[1] + between + join66(right)[1] <= width2;
   };
   while (!fits()) {
     const droppable = kept.filter((p) => p.priority !== void 0);
@@ -45098,7 +45268,7 @@ function layoutRow(parts, width2, theme, style = {}) {
   const l = join66(zone("left"))[0];
   const r = join66(zone("right"))[0];
   const gap = width2 - visibleWidth(l) - visibleWidth(r);
-  const line2 = r === "" ? l : gap >= MIN_GAP ? l + " ".repeat(gap) + r : l + dim(sep5) + r;
+  const line2 = r === "" ? l : l === "" ? " ".repeat(Math.max(0, gap)) + r : gap >= MIN_GAP ? l + " ".repeat(gap) + r : l + dim(sep5) + r;
   return truncateToWidth(line2, width2);
 }
 function abbreviateModel(ref, width2) {
@@ -45230,7 +45400,7 @@ var init_status_bar = __esm({
         }
         const model = state.model === void 0 ? "?" : abbreviateModel(formatModelRef(state.model), width2);
         const p = full ? FULL : COMPACT;
-        const fallback = this.source.fallback?.();
+        const fallback = full ? void 0 : this.source.fallback?.();
         const modelText = fallback === void 0 ? theme.fg("accent", model) : theme.fg("accent", abbreviateModel(fallback.from, width2)) + dim(g.ascii ? " -> " : " → ") + theme.fg("warning", abbreviateModel(fallback.to, width2));
         right(modelText, p.model, full ? { group: "model" } : {});
         if (state.thinkingLevel !== "off") {
@@ -49024,6 +49194,13 @@ async function runSlashCommand(line2, ctx) {
       return planCommand(session, args, ctx);
     case "tasks":
       return { kind: "handled", message: await tasksCommand(session, args) };
+    case "interrupt": {
+      if (args === "") throw new AmaError("invalid_arguments", msg().report.command.interruptUsage);
+      const { isStreaming, isCompacting } = session.state;
+      if (!isStreaming && !isCompacting) return { kind: "prompt", text: args };
+      void session.prompt(args, { interrupt: true }).catch(() => void 0);
+      return { kind: "handled", message: msg().report.command.interruptSent(args) };
+    }
     case "agents":
       return { kind: "handled", message: describeAgents(session.state.sessionId) };
     case "paste": {
@@ -49079,6 +49256,7 @@ var init_commands_core = __esm({
       command("tasks", "tasks", "[id] | stop <id> | bg [id]"),
       command("agents", "agents"),
       command("paste", "paste"),
+      command("interrupt", "interrupt", { key: "interruptArgs" }),
       command("exit", "exit"),
       // [W6-C0] 第六波（W6-S / W6-T1 / W6-M 实现）
       command("config", "config", "[key=value]"),
@@ -49129,6 +49307,11 @@ function applyPlanAttendance(ctx) {
     ctx.capabilities.has("plans") ? "client" : "unattended"
   );
 }
+function interruptFlag(value) {
+  if (value !== void 0 && typeof value !== "boolean")
+    throw new AmaError("invalid_arguments", "interrupt must be a boolean");
+  return value === true;
+}
 async function startRun(ctx, run7) {
   const session = ctx.session();
   let settled = false;
@@ -49251,10 +49434,17 @@ var init_commands = __esm({
         ctx,
         () => ctx.session().prompt(p.message, {
           ...p.images !== void 0 ? { images: p.images } : {},
-          ...p.streamingBehavior !== void 0 ? { streamingBehavior: p.streamingBehavior } : {}
+          ...p.streamingBehavior !== void 0 ? { streamingBehavior: p.streamingBehavior } : {},
+          ...interruptFlag(p.interrupt) ? { interrupt: true } : {}
         })
       ),
-      steer: (p, ctx) => startRun(ctx, () => ctx.session().steer(p.message)),
+      steer: (p, ctx) => startRun(
+        ctx,
+        () => interruptFlag(p.interrupt) ? ctx.session().prompt(p.message, {
+          interrupt: true,
+          ...p.images !== void 0 ? { images: p.images } : {}
+        }) : ctx.session().steer(p.message)
+      ),
       follow_up: (p, ctx) => startRun(ctx, () => ctx.session().followUp(p.message)),
       abort: async (_p, ctx) => {
         await ctx.session().abort();
@@ -52879,13 +53069,13 @@ ${bypassRiskLines().map((l) => `  ${l}
       void ed.ask(`
 ${preview.join("")}${question}`, "n").then((answer) => {
         resolve39(answer === "y" ? "allow" : answer === "a" ? "allow_session" : "deny");
-        if (!busy) ed.render();
+        if (running === 0) ed.render();
       });
     })
   });
   runtime.notifier.set((message, level) => err(`ama: [${level}] ${message}
 `));
-  let busy = false;
+  let running = 0;
   let lastInterrupt = 0;
   return new Promise((resolve39) => {
     let finished = false;
@@ -52905,11 +53095,23 @@ ${preview.join("")}${question}`, "n").then((answer) => {
       });
     };
     const run7 = (text) => {
-      busy = true;
+      running++;
       void handle(text).then((outcome) => {
-        busy = false;
+        running--;
         if (outcome === "exit") finish2(ExitCode.Ok);
-        else ed.render();
+        else if (running === 0) ed.render();
+      });
+    };
+    const interruptWith = (text) => {
+      if (text === "") return err(`ama: ${msg().report.command.interruptUsage}
+`);
+      out(`${msg().report.command.interruptSent(text)}
+`);
+      running++;
+      void session.prompt(text, { interrupt: true }).catch((error2) => err(`ama: ${errorText3(error2)}
+`)).finally(() => {
+        printer.endLine();
+        if (--running === 0) ed.render();
       });
     };
     let flushTimer;
@@ -52917,7 +53119,7 @@ ${preview.join("")}${question}`, "n").then((answer) => {
       for (const action of actions) {
         if (action.kind === "eof") return finish2(ExitCode.Ok);
         if (action.kind === "interrupt") {
-          if (busy) {
+          if (running > 0) {
             void session.abort();
             err(`${msg().interactive.line.interrupted}
 `);
@@ -52932,7 +53134,12 @@ ${msg().interactive.line.ctrlCAgain}
           }
           continue;
         }
-        if (busy) {
+        if (running > 0) {
+          const forced2 = /^\/interrupt(?:\s+([\s\S]*))?$/.exec(action.text.trim());
+          if (forced2 !== null) {
+            interruptWith((forced2[1] ?? "").trim());
+            continue;
+          }
           if (/^\/tasks\s+bg(\s+\S+)?\s*$/.test(action.text.trim())) {
             void handle(action.text.trim());
             continue;
@@ -53421,7 +53628,7 @@ var init_agent_view = __esm({
           maxVisibleLines: 4,
           placeholder: msg().agents.view.placeholder(taskId),
           requestRender: () => deps.render(),
-          onSubmit: (text) => void this.submit(text)
+          onSubmit: (text) => void this.submit(text, this.enterInterrupts())
         });
         this.attach();
       }
@@ -53519,7 +53726,10 @@ var init_agent_view = __esm({
         this.attach();
         this.deps.onSwitch?.(next);
       }
-      async submit(text) {
+      enterInterrupts() {
+        return this.deps.enterMode?.() === "interrupt";
+      }
+      async submit(text, interrupt = false) {
         const m = msg().agents.view;
         const trimmed = text.trim();
         if (trimmed === "") return;
@@ -53545,7 +53755,7 @@ var init_agent_view = __esm({
         const registry2 = this.deps.registry();
         try {
           if (registry2 === void 0) throw new Error(m.unknown(taskId));
-          const reply = await registry2.message(taskId, text);
+          const reply = await registry2.message(taskId, text, interrupt);
           this.flash = m[reply](taskId);
         } catch (error2) {
           this.flash = m.sendFailed(error2 instanceof Error ? error2.message : String(error2));
@@ -53565,6 +53775,11 @@ var init_agent_view = __esm({
             return;
           }
         }
+        if (keys.matches(data2, "app.message.interrupt") && !this.editor.isCompletionOpen) {
+          const text = this.editor.takeSubmission();
+          if (text !== null) void this.submit(text, !this.enterInterrupts());
+          return;
+        }
         if (keys.matches(data2, "tui.select.cancel") && !this.editor.isCompletionOpen) {
           if (!empty) this.editor.clear();
           else this.deps.close();
@@ -54691,6 +54906,7 @@ var init_agent_ui = __esm({
           close: () => this.closeView(),
           stop: (id) => stopTask(this.deps.session().state.sessionId, id),
           background: (id) => this.deps.session().backgroundTask(id, "user"),
+          enterMode: () => this.deps.area?.ui().enterWhileRunning === "interrupt" ? "interrupt" : "queue",
           messages: {
             ...ui.showThinking !== void 0 ? { showThinking: ui.showThinking } : {},
             ...ui.markdown !== void 0 ? { markdown: ui.markdown } : {},
@@ -55624,16 +55840,18 @@ var init_status_line = __esm({
     init_status_bar();
     RESERVE = { tps: 14, amount: 16, avg: 7, ttft: 9 };
     PRIORITY = {
-      ttft: 1,
-      avg: 2,
-      host: 3,
+      codemode: 1,
+      sandbox: 2,
+      fallback: 3,
       preset: 4,
-      rebill: 5,
-      cache: 6,
-      tokens: 7,
-      queue: 8,
-      codemode: 9,
-      amount: 10
+      queue: 5,
+      host: 6,
+      ttft: 7,
+      avg: 8,
+      rebill: 9,
+      cache: 10,
+      tokens: 11,
+      amount: 12
     };
     COLLAPSE_HINT = "[-]";
     RATE_STYLE = { groups: { stats: { glue: " · ", open: "(", close: ")" } } };
@@ -55646,7 +55864,7 @@ var init_status_line = __esm({
       bar;
       source;
       theme;
-      parts() {
+      parts(width2) {
         const theme = this.theme;
         const dim = (text) => theme.fg("dim", text);
         const stats = this.bar.current();
@@ -55654,9 +55872,9 @@ var init_status_line = __esm({
         const live2 = telemetry?.live;
         const last = telemetry?.last;
         const parts = [];
-        const left = (text, priority, reserve, extra = {}) => void parts.push({ text, priority, zone: "left", reserve, ...extra });
-        const right = (text, priority) => {
-          if (text !== void 0) parts.push({ text, priority, zone: "right" });
+        const metric = (text, priority, reserve, extra = {}) => void parts.push({ text, priority, zone: "right", reserve, ...extra });
+        const add3 = (zone, text, priority) => {
+          if (text !== void 0) parts.push({ text, priority, zone });
         };
         const blue = (text) => theme.fg("accent", text);
         const purple = (text) => theme.fg("tool", text);
@@ -55673,20 +55891,25 @@ var init_status_line = __esm({
           }
         }
         const label2 = live2 !== void 0 ? theme.fg("accent", "tps:") : dim("tps:");
-        left(
+        metric(
           `${label2} ${tps === void 0 ? dim("—") : `${purple(formatRate(tps))}${dim(" tok/s")}`}`,
           void 0,
           RESERVE.tps
         );
         if (amount !== void 0) {
-          left(amount, PRIORITY.amount, RESERVE.amount, { lead: ` ${theme.glyphs.dot} ` });
+          metric(amount, PRIORITY.amount, RESERVE.amount, { lead: ` ${theme.glyphs.dot} ` });
         }
         const stat16 = { group: "stats", lead: " " };
         if (telemetry?.avgTps !== void 0) {
-          left(`${dim("avg ")}${blue(formatRate(telemetry.avgTps))}`, PRIORITY.avg, RESERVE.avg, stat16);
+          metric(
+            `${dim("avg ")}${blue(formatRate(telemetry.avgTps))}`,
+            PRIORITY.avg,
+            RESERVE.avg,
+            stat16
+          );
         }
         if (last?.ttftMs !== void 0) {
-          left(
+          metric(
             `${dim("ttft ")}${purple(formatSeconds2(last.ttftMs))}`,
             PRIORITY.ttft,
             RESERVE.ttft,
@@ -55694,20 +55917,29 @@ var init_status_line = __esm({
           );
         }
         const usage = usageItems(stats, this.bar.queued(), this.source, theme);
-        right(usage.tokens, PRIORITY.tokens);
-        right(usage.cache, PRIORITY.cache);
-        right(usage.rebill, PRIORITY.rebill);
-        right(usage.queue, PRIORITY.queue);
-        right(usage.codemode, PRIORITY.codemode);
-        right(usage.sandbox, PRIORITY.codemode);
-        right(usage.preset, PRIORITY.preset);
-        right(usage.host, PRIORITY.host);
-        right(dim(COLLAPSE_HINT), void 0);
+        add3("right", usage.tokens, PRIORITY.tokens);
+        add3("right", usage.cache, PRIORITY.cache);
+        add3("right", usage.rebill, PRIORITY.rebill);
+        add3("right", dim(COLLAPSE_HINT), void 0);
+        add3("left", usage.codemode, PRIORITY.codemode);
+        add3("left", usage.sandbox, PRIORITY.sandbox);
+        add3("left", usage.preset, PRIORITY.preset);
+        const fallback = this.source.fallback?.();
+        if (fallback !== void 0) {
+          const arrow = theme.glyphs.ascii ? "-> " : "→ ";
+          add3(
+            "left",
+            dim(arrow) + theme.fg("warning", abbreviateModel(fallback.to, width2)),
+            PRIORITY.fallback
+          );
+        }
+        add3("left", usage.queue, PRIORITY.queue);
+        add3("left", usage.host, PRIORITY.host);
         return parts;
       }
       render(width2) {
         if (this.bar.layout() !== "full") return [];
-        return [truncateToWidth(layoutRow(this.parts(), width2, this.theme, RATE_STYLE), width2)];
+        return [truncateToWidth(layoutRow(this.parts(width2), width2, this.theme, RATE_STYLE), width2)];
       }
       invalidate() {
       }
@@ -56008,6 +56240,27 @@ ${current3}`);
     if (typeof answer === "boolean") settle(answer);
     else void answer.then(settle);
   };
+  const sendKeys = (is) => {
+    if (deps.interruptSend === void 0 || editor.isCompletionOpen) return false;
+    const viaKey = is("app.message.interrupt");
+    if (!deps.busy()) {
+      if (!viaKey || editor.isEmpty()) return false;
+      const text = editor.takeSubmission();
+      if (text !== null) deps.submit(text, "enter");
+      return true;
+    }
+    const interruptMode = deps.enterWhileRunning?.() === "interrupt";
+    if (!viaKey && !(interruptMode && is("tui.editor.submit"))) return false;
+    const command3 = editor.getExpandedText().trimStart().startsWith("/");
+    if (command3 || viaKey === interruptMode) {
+      if (!viaKey) return false;
+      const text = editor.takeSubmission();
+      if (text !== null) deps.submit(text, "enter");
+      return true;
+    }
+    deps.interruptSend(editor.takeSubmission() ?? "");
+    return true;
+  };
   const atLastLine = () => editor.cursor.line >= editor.getText().split("\n").length - 1;
   const focusAgents = (agents, data2) => {
     if (editor.isCompletionOpen || editor.isBrowsingHistory) return false;
@@ -56064,6 +56317,7 @@ ${current3}`);
       return true;
     }
     ctrlCArmedAt = Number.NEGATIVE_INFINITY;
+    if (sendKeys(is)) return true;
     if (is("app.interrupt") && !editor.isCompletionOpen && deps.busy()) {
       esc.reset();
       interrupt();
@@ -56138,6 +56392,34 @@ var init_key_dispatch = __esm({
   }
 });
 
+// src/modes/interactive/interrupt-send.ts
+function interruptSender(deps) {
+  return (text) => {
+    const images = deps.takeImages();
+    deps.showHint(msg().interactive.keys.interruptSent);
+    const options = images.length > 0 ? { interrupt: true, images } : { interrupt: true };
+    void deps.session().prompt(text, options).catch((error2) => {
+      if (isAmaError(error2) && error2.code === "invalid_arguments")
+        deps.showHint(msg().interactive.keys.nothingToSend);
+    });
+  };
+}
+function enterModeOf(runtime) {
+  return runtime.config.ui?.enterWhileRunning === "interrupt" ? "interrupt" : "queue";
+}
+function interruptKeys(keys, mode) {
+  const key = keyLabel(keys, "app.message.interrupt");
+  return { key, now: () => mode() === "interrupt" ? "Enter" : key };
+}
+var init_interrupt_send = __esm({
+  "src/modes/interactive/interrupt-send.ts"() {
+    "use strict";
+    init_errors();
+    init_i18n();
+    init_task_background();
+  }
+});
+
 // src/modes/interactive/model-picker.ts
 async function openModelPicker(host, options) {
   const catalog = await loadModelCatalog(options.providers);
@@ -57500,10 +57782,7 @@ var init_run_indicator = __esm({
     RunIndicator = class {
       constructor(deps) {
         this.deps = deps;
-        deps.loader.onFrame(() => {
-          if (this.busy && !this.approval && this.optionalHints().join("\n") !== this.hintKey)
-            this.applyVerb();
-        });
+        deps.loader.onFrame(() => this.refreshHints());
       }
       deps;
       running = false;
@@ -57517,12 +57796,24 @@ var init_run_indicator = __esm({
       background = () => false;
       /** [W7-C] 有停靠在 Agent 栏的审批。 */
       docked = () => false;
+      /** 输入框有字（显示 Enter / 专用键的提示）。 */
+      draft = () => false;
+      /** 运行中 Enter 的语义。 */
+      enterMode = () => "queue";
       hintKey = "";
+      /** 可丢弃提示变了才换动词（每帧、输入框内容变化时调）。 */
+      refreshHints() {
+        if (this.busy && !this.approval && this.optionalHints().join("\n") !== this.hintKey)
+          this.applyVerb();
+      }
       /** 可丢弃的按键提示（按丢弃的逆序排列）。 */
       optionalHints() {
         const down = this.deps.theme.glyphs.arrowDown;
         const key = this.deps.backgroundKey;
         const out = [];
+        const send2 = this.deps.interruptKey;
+        if (send2 !== void 0 && this.draft())
+          out.push(msg().interactive.view.run.sendHint(this.enterMode(), send2));
         if (key !== void 0 && this.background()) out.push(msg().agents.background.runHint(key));
         if (this.docked()) out.push(msg().agents.approval.runHint(down));
         else if (this.agents()) out.push(msg().agents.bar.runHint(down));
@@ -57643,11 +57934,16 @@ var init_run_indicator = __esm({
       }
     };
     QueueView = class extends Text {
-      constructor(theme) {
+      /**
+       * @param nowKey 立即送出排队插话的键（专用键；interrupt 模式下是 Enter）；undefined 不提示。
+       */
+      constructor(theme, nowKey = () => void 0) {
         super("");
         this.theme = theme;
+        this.nowKey = nowKey;
       }
       theme;
+      nowKey;
       setQueue(steering, followUp) {
         const t = this.theme;
         const row3 = (origin, text) => `  ${t.fg("dim", `${t.glyphs.queued} ${originLabel(origin)}`)}  ${t.fg("muted", oneLine8(text))}`;
@@ -57665,7 +57961,10 @@ var init_run_indicator = __esm({
           );
         }
         if (rows.length > 0) {
-          shown2.push("    " + t.fg("dim", msg().interactive.view.run.queueHint(t.glyphs.arrowUp)));
+          const run7 = msg().interactive.view.run;
+          const now = steering.length > 0 ? this.nowKey() : void 0;
+          const hint = now === void 0 ? run7.queueHint(t.glyphs.arrowUp) : run7.queueHintNow(t.glyphs.arrowUp, now);
+          shown2.push("    " + t.fg("dim", hint));
         }
         this.setText(shown2.join("\n"));
       }
@@ -57830,7 +58129,9 @@ function runInteractiveMode(runtime, context, options = {}) {
     spinner: () => loader.frame,
     subagent: (toolCallId2) => subagents.forToolCall(toolCallId2)
   });
-  const queueView = new QueueView(theme);
+  const enterMode = () => enterModeOf(runtime);
+  const sendKeys = interruptKeys(keys, enterMode);
+  const queueView = new QueueView(theme, sendKeys.now);
   const loaderSlot = new Container();
   const loader = new Loader(() => tui.requestRender(), {
     theme,
@@ -57867,7 +58168,8 @@ function runInteractiveMode(runtime, context, options = {}) {
     autocomplete: completion,
     requestRender: () => tui.requestRender(),
     ...historyFile !== void 0 ? { historyFile } : {},
-    onSubmit: (text) => submit(text, "enter")
+    onSubmit: (text) => submit(text, "enter"),
+    onChange: () => indicator.refreshHints()
   });
   tui.addChild(view);
   tui.addChild(new Spacer());
@@ -57902,8 +58204,10 @@ function runInteractiveMode(runtime, context, options = {}) {
   const backgroundKey = keyLabel(keys, "app.tasks.background");
   const indicator = new RunIndicator({
     ...{ theme, loader, slot: loaderSlot, tools, render },
-    ...backgroundKey !== void 0 ? { backgroundKey } : {}
+    ...backgroundKey !== void 0 ? { backgroundKey } : {},
+    ...sendKeys.key !== void 0 ? { interruptKey: sendKeys.key } : {}
   });
+  Object.assign(indicator, { draft: () => !editor.isEmpty(), enterMode });
   const setQueue = (steering, followUp) => {
     status.setQueue(steering.length, followUp.length);
     queueView.setQueue(steering, followUp);
@@ -58095,6 +58399,12 @@ function runInteractiveMode(runtime, context, options = {}) {
       onPasteImage: () => void agentUi.paste(),
       confirmMode,
       submit: (text, via) => submit(text, via),
+      enterWhileRunning: enterMode,
+      interruptSend: interruptSender({
+        session: () => session,
+        takeImages: () => draftImages.splice(0),
+        showHint
+      }),
       runCommand: (line2) => void runCommand2(line2),
       exit: (code) => exit(code),
       onInterrupted: (empty) => void rewind.afterInterrupt(empty),
@@ -58225,6 +58535,7 @@ var init_interactive_mode = __esm({
     init_confirm_dialog();
     init_config_ui();
     init_key_dispatch();
+    init_interrupt_send();
     init_message_view();
     init_pickers();
     init_model_picker();
@@ -65078,19 +65389,19 @@ function redactedLookup(lookup) {
 }
 function axisPoints(trace) {
   const t0 = trace.startedAt;
-  const windows2 = [];
+  const windows = [];
   for (const turn of trace.turns) {
     const span = turnSpan(turn);
-    if (span !== void 0) windows2.push([span.start - t0, span.end - t0]);
+    if (span !== void 0) windows.push([span.start - t0, span.end - t0]);
   }
   for (const aux of trace.aux)
     if (aux.startedAt !== void 0)
-      windows2.push([aux.startedAt - t0, (aux.endedAt ?? aux.startedAt) - t0]);
-  windows2.sort((a, b) => a[0] - b[0] || a[1] - b[1]);
+      windows.push([aux.startedAt - t0, (aux.endedAt ?? aux.startedAt) - t0]);
+  windows.sort((a, b) => a[0] - b[0] || a[1] - b[1]);
   const points = [[0, 0]];
   let raw = 0;
   let mapped = 0;
-  for (const [start, end] of windows2) {
+  for (const [start, end] of windows) {
     if (end <= raw) continue;
     const from = Math.max(start, raw);
     if (from > raw) {