@armadra/agent 0.6.3 → 0.6.5

package/dist/config/json-schema.js

@@ -280,6 +280,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: str(),

package/dist/config/key-docs.js

@@ -23,7 +23,14 @@ const IMPLICIT_DEFAULTS = {
     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,

package/dist/config/schema.js

@@ -260,6 +260,7 @@ export function validateConfig(value) {
         "logo",
         "animation",
         "restoreOnCancel",
+        "enterWhileRunning",
         ...W5_UI_KEYS,
         ...W6_UI_KEYS,
     ], (s, p) => {
@@ -273,6 +274,7 @@ export function validateConfig(value) {
         c.oneOf(s, "logo", p, ["auto", "off"]);
         c.boolean(s, "animation", p);
         c.boolean(s, "restoreOnCancel", p);
+        c.oneOf(s, "enterWhileRunning", p, ["queue", "interrupt"]);
         checkUiW5(c, s, p);
         checkUiW6(c, s, p);
     });

package/dist/config/settings-registry.js

@@ -34,6 +34,7 @@ const ROWS = [
     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" }),

package/dist/config/types.d.ts

@@ -151,6 +151,8 @@ export interface UiConfig extends UiConfigW6 {
     animation?: boolean;
     /** 运行中 Esc 中断、本回合还没有任何输出时撤回该回合并回填原消息，缺省 true。 */
     restoreOnCancel?: boolean;
+    /** 运行中按 Enter：queue（缺省）排队插话，interrupt 打断并立即发送（与 `app.message.interrupt` 互换）。 */
+    enterWhileRunning?: "queue" | "interrupt";
     /** [W5-C0] 底部信息行（W5-A）：缺省独立终端 full、嵌入宿主（有 profile）compact。 */
     statusLine?: StatusLineMode;
 }

package/dist/drivers/acp/client.d.ts

@@ -8,8 +8,10 @@
  *   没有处理器时按无人值守回首个 `reject_once`（没有则 cancelled）。
  * - `cancel(sessionId)` 发 `session/cancel` 通知，并让该会话所有挂起的权限请求回 `cancelled`
  *   （规范要求：客户端取消回合后必须以 cancelled 回答挂起的请求）。
+ * - 开会话（new / resume / load）的 `mcpServers` 缺省为空数组；宿主可经 {@link AcpSessionOptions}
+ *   传入，原样转发。
  */
-import { type AcpAgentCapabilities, type AcpContentBlock, type AcpImplementationInfo, type AcpInitializeResult, type AcpListSessionsResult, type AcpLoadSessionResult, type AcpNewSessionResult, type AcpPromptResult, type AcpRequestPermissionParams, type AcpRequestPermissionResult, type AcpSessionNotification } from "./types.js";
+import { type AcpAgentCapabilities, type AcpContentBlock, type AcpImplementationInfo, type AcpInitializeResult, type AcpListSessionsResult, type AcpLoadSessionResult, type AcpNewSessionResult, type AcpPromptResult, type AcpRequestPermissionParams, type AcpRequestPermissionResult, type AcpSessionNotification, type AcpSessionOptions } from "./types.js";
 export interface AcpClientHandlers {
     onUpdate?(notification: AcpSessionNotification): void;
     /** `signal`：该会话被 cancel、连接关闭时 abort（此时应尽快回 cancelled）。 */
@@ -26,6 +28,13 @@ export interface AcpClientOptions extends AcpClientHandlers {
 export declare function unattendedOutcome(params: AcpRequestPermissionParams): AcpRequestPermissionResult;
 export declare class AcpClient {
     private readonly options;
+    /**
+     * 本版客户端支持的可选能力，供宿主做特性检测（旧版没有这个字段）：
+     * - `mcpServers`：开会话时可经 {@link AcpSessionOptions} 传 MCP 服务器。
+     */
+    static readonly features: {
+        readonly mcpServers: true;
+    };
     private readonly peer;
     /** sessionId → 挂起权限请求的取消器。 */
     private readonly pendingPermissions;
@@ -41,11 +50,11 @@ export declare class AcpClient {
     supportsList(): boolean;
     supportsClose(): boolean;
     supportsImages(): boolean;
-    newSession(cwd: string, signal?: AbortSignal): Promise<AcpNewSessionResult>;
+    newSession(cwd: string, signal?: AbortSignal, options?: AcpSessionOptions): Promise<AcpNewSessionResult>;
     /** 不回放历史（优先，R13：v2 计划取消 load）。 */
-    resumeSession(sessionId: string, cwd: string, signal?: AbortSignal): Promise<AcpLoadSessionResult>;
+    resumeSession(sessionId: string, cwd: string, signal?: AbortSignal, options?: AcpSessionOptions): Promise<AcpLoadSessionResult>;
     /** 回放历史（以 session/update 通知）。 */
-    loadSession(sessionId: string, cwd: string, signal?: AbortSignal): Promise<AcpLoadSessionResult>;
+    loadSession(sessionId: string, cwd: string, signal?: AbortSignal, options?: AcpSessionOptions): Promise<AcpLoadSessionResult>;
     listSessions(cwd?: string, cursor?: string): Promise<AcpListSessionsResult>;
     closeSession(sessionId: string): Promise<unknown>;
     prompt(sessionId: string, prompt: AcpContentBlock[], signal?: AbortSignal): Promise<AcpPromptResult>;

package/dist/drivers/acp/client.js

@@ -8,9 +8,15 @@
  *   没有处理器时按无人值守回首个 `reject_once`（没有则 cancelled）。
  * - `cancel(sessionId)` 发 `session/cancel` 通知，并让该会话所有挂起的权限请求回 `cancelled`
  *   （规范要求：客户端取消回合后必须以 cancelled 回答挂起的请求）。
+ * - 开会话（new / resume / load）的 `mcpServers` 缺省为空数组；宿主可经 {@link AcpSessionOptions}
+ *   传入，原样转发。
  */
 import { JsonRpcPeer, RpcError } from "../jsonrpc.js";
 import { ACP_METHODS, ACP_PROTOCOL_VERSION, RPC_ERRORS, } from "./types.js";
+/** 开会话参数里的 `mcpServers`：拷一份，缺省空数组。 */
+function mcpServersOf(options) {
+    return [...(options?.mcpServers ?? [])];
+}
 /** 无人值守的回答：首个 reject_once，没有就 cancelled。 */
 export function unattendedOutcome(params) {
     const reject = params.options.find((o) => o.kind === "reject_once");
@@ -22,6 +28,11 @@ export function unattendedOutcome(params) {
 }
 export class AcpClient {
     options;
+    /**
+     * 本版客户端支持的可选能力，供宿主做特性检测（旧版没有这个字段）：
+     * - `mcpServers`：开会话时可经 {@link AcpSessionOptions} 传 MCP 服务器。
+     */
+    static features = { mcpServers: true };
     peer;
     /** sessionId → 挂起权限请求的取消器。 */
     pendingPermissions = new Map();
@@ -85,16 +96,16 @@ export class AcpClient {
     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, {

package/dist/drivers/acp/types.d.ts

@@ -111,8 +111,28 @@ export interface AcpInitializeResult {
     authMethods?: AcpAuthMethod[];
     agentInfo?: AcpImplementationInfo;
 }
-/** ama 不向外部 Agent 传 MCP 服务器（Skills 不做 MCP），总是空数组。 */
-export type AcpMcpServer = Record<string, unknown>;
+/** `session/new.mcpServers[].env` 的一项。 */
+export type AcpEnvVariable = {
+    name: string;
+    value: string;
+};
+/** stdio 传输的 MCP 服务器：ACP v1 要求每个 Agent 都支持这一种。 */
+export type AcpStdioMcpServer = {
+    name: string;
+    command: string;
+    args: string[];
+    env: AcpEnvVariable[];
+};
+/**
+ * 交给外部 Agent 的 MCP 服务器。ama 自己不加（Skills 不做 MCP），缺省是空数组；宿主（如 Armadra）
+ * 经 {@link AcpSessionOptions} 传入的原样转发，http / sse 变体不在这里解释。
+ */
+export type AcpMcpServer = AcpStdioMcpServer | Record<string, unknown>;
+/** `AcpClient.newSession` / `resumeSession` / `loadSession` 的可选项。 */
+export interface AcpSessionOptions {
+    /** 随 `session/new|resume|load` 发给 Agent；缺省空数组。 */
+    mcpServers?: readonly AcpMcpServer[];
+}
 export interface AcpSessionMode {
     id: string;
     name: string;

package/dist/drivers/runner.js

@@ -135,6 +135,16 @@ export class ProcessRunner {
         return this.deps;
     }
 }
+/**
+ * 能中断单个回合、进程留着接着用的驱动（ACP `session/cancel`、Claude stream-json interrupt、Codex
+ * `turn/interrupt`）；oneshot 每回合一个进程（中断 = 杀进程），宿主驱动不归 ama 管——这两种「打断并发送」退回排队。
+ */
+const TURN_INTERRUPT = new Set([
+    "acp",
+    "acp-adapter",
+    "claude-stream",
+    "codex-app-server",
+]);
 class ProcessHandle {
     runner;
     chosen;
@@ -209,8 +219,25 @@ class ProcessHandle {
         }
         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 === undefined)
+            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)

package/dist/i18n/catalog.d.ts

@@ -497,6 +497,8 @@ declare const en: {
             clearedCtrlC: string;
             ctrlCAgain: string;
             interrupted: string;
+            interruptSent: string;
+            nothingToSend: string;
             toolsExpanded: string;
             toolsCollapsed: string;
         };
@@ -585,6 +587,7 @@ declare const en: {
                     host: string;
                     task: string;
                     plan: string;
+                    interrupt: string;
                 };
                 planHandoff: string;
                 thinkingStreaming: (glyph: string, ellipsis: string) => string;
@@ -613,6 +616,8 @@ declare const en: {
                 thinking: string;
                 queueMore: (ellipsis: string, n: number) => string;
                 queueHint: (arrow: string) => string;
+                queueHintNow: (arrow: string, key: string) => string;
+                sendHint: (mode: "queue" | "interrupt", key: string) => string;
             };
             tool: {
                 interrupted: string;
@@ -1084,6 +1089,8 @@ declare const en: {
             tasks: string;
             agents: string;
             paste: string;
+            interruptArgs: string;
+            interrupt: string;
             exit: string;
             config: string;
             traceArgs: string;
@@ -1101,6 +1108,8 @@ declare const en: {
             cacheUsage: string;
             taskStopped: (id: string) => string;
             tasksUsage: string;
+            interruptUsage: string;
+            interruptSent: (text: string) => string;
             newSession: (id: string) => string;
             resumed: (id: string, messages: number) => string;
             forked: (id: string) => string;
@@ -1335,6 +1344,7 @@ declare const en: {
             "ui.logo": string;
             "ui.animation": string;
             "ui.restoreOnCancel": string;
+            "ui.enterWhileRunning": string;
             "ui.statusLine": string;
             "ui.language": string;
             "ui.replyLanguage": string;
@@ -1781,6 +1791,8 @@ declare const en: {
             steered: (taskId: string) => string;
             queued: (taskId: string) => string;
             resumed: (taskId: string) => string;
+            interrupted: (taskId: string) => string;
+            queuedNoInterrupt: (taskId: string) => string;
             sendFailed: (message: string) => string;
             stopped: (taskId: string) => string;
             commandsHere: string;
@@ -2087,6 +2099,7 @@ declare const en: {
             "ui.logo": string;
             "ui.statusLine": string;
             "ui.restoreOnCancel": string;
+            "ui.enterWhileRunning": string;
             "ui.quietStartup": string;
             "ui.ascii": string;
             "ui.language": string;

package/dist/i18n/messages/agents.d.ts

@@ -63,6 +63,8 @@ export declare const en: {
         steered: (taskId: string) => string;
         queued: (taskId: string) => string;
         resumed: (taskId: string) => string;
+        interrupted: (taskId: string) => string;
+        queuedNoInterrupt: (taskId: string) => string;
         sendFailed: (message: string) => string;
         stopped: (taskId: string) => string;
         commandsHere: string;
@@ -125,6 +127,8 @@ export declare const zh: {
         steered: (taskId: string) => string;
         queued: (taskId: string) => string;
         resumed: (taskId: string) => string;
+        interrupted: (taskId: string) => string;
+        queuedNoInterrupt: (taskId: string) => string;
         sendFailed: (message: string) => string;
         stopped: (taskId: string) => string;
         commandsHere: string;

package/dist/i18n/messages/agents.js

@@ -64,6 +64,8 @@ export const en = {
         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",
@@ -126,6 +128,8 @@ export const zh = {
         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 返回后输入",

package/dist/i18n/messages/config-keys.d.ts

@@ -55,6 +55,7 @@ export declare const en: {
         "ui.logo": string;
         "ui.animation": string;
         "ui.restoreOnCancel": string;
+        "ui.enterWhileRunning": string;
         "ui.statusLine": string;
         "ui.language": string;
         "ui.replyLanguage": string;
@@ -202,6 +203,7 @@ export declare const zh: {
         "ui.logo": string;
         "ui.animation": string;
         "ui.restoreOnCancel": string;
+        "ui.enterWhileRunning": string;
         "ui.statusLine": string;
         "ui.language": string;
         "ui.replyLanguage": string;

package/dist/i18n/messages/config-keys.js

@@ -102,6 +102,7 @@ const keysEn = {
     "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)",
@@ -224,6 +225,7 @@ const keysZh = {
     "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 节末尾追加一句英文规则；不设时零字节变化；只认用户级（第六波起生效）",

package/dist/i18n/messages/config.d.ts

@@ -55,6 +55,7 @@ export declare const en: {
         "ui.logo": string;
         "ui.animation": string;
         "ui.restoreOnCancel": string;
+        "ui.enterWhileRunning": string;
         "ui.statusLine": string;
         "ui.language": string;
         "ui.replyLanguage": string;
@@ -314,6 +315,7 @@ export declare const zh: {
         "ui.logo": string;
         "ui.animation": string;
         "ui.restoreOnCancel": string;
+        "ui.enterWhileRunning": string;
         "ui.statusLine": string;
         "ui.language": string;
         "ui.replyLanguage": string;

package/dist/i18n/messages/interactive-view.d.ts

@@ -19,6 +19,7 @@ export declare const en: {
             host: string;
             task: string;
             plan: string;
+            interrupt: string;
         };
         planHandoff: string;
         thinkingStreaming: (glyph: string, ellipsis: string) => string;
@@ -47,6 +48,10 @@ export declare const en: {
         thinking: string;
         queueMore: (ellipsis: string, n: number) => string;
         queueHint: (arrow: string) => string;
+        /** 有排队的插话时（`key` = 立即送出它们的键：专用键，或 interrupt 模式下的 Enter）。 */
+        queueHintNow: (arrow: string, key: string) => string;
+        /** 输入框有字时：Enter 与专用键各做什么（`ui.enterWhileRunning`）。 */
+        sendHint: (mode: "queue" | "interrupt", key: string) => string;
     };
     tool: {
         interrupted: string;
@@ -85,6 +90,7 @@ export declare const zh: {
             host: string;
             task: string;
             plan: string;
+            interrupt: string;
         };
         planHandoff: string;
         thinkingStreaming: (glyph: string, ellipsis: string) => string;
@@ -113,6 +119,8 @@ export declare const zh: {
         thinking: string;
         queueMore: (ellipsis: string, n: number) => string;
         queueHint: (arrow: string) => string;
+        queueHintNow: (arrow: string, key: string) => string;
+        sendHint: (mode: "interrupt" | "queue", key: string) => string;
     };
     tool: {
         interrupted: string;

package/dist/i18n/messages/interactive-view.js

@@ -20,6 +20,7 @@ export const en = {
             host: "host",
             task: "subagent notice",
             plan: "plan",
+            interrupt: "interrupt",
         },
         planHandoff: "Start executing the approved plan",
         thinkingStreaming: (glyph, ellipsis) => `${glyph} Thinking${ellipsis}`,
@@ -48,6 +49,12 @@ export const en = {
         thinking: "Thinking",
         queueMore: (ellipsis, n) => `${ellipsis} ${n} more`,
         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",
@@ -86,6 +93,7 @@ export const zh = {
             host: "宿主",
             task: "子 Agent 通知",
             plan: "计划",
+            interrupt: "打断",
         },
         planHandoff: "按批准的计划开始执行",
         thinkingStreaming: (glyph, ellipsis) => `${glyph} 思考中${ellipsis}`,
@@ -114,6 +122,8 @@ export const zh = {
         thinking: "思考中",
         queueMore: (ellipsis, n) => `${ellipsis} 另 ${n} 条`,
         queueHint: (arrow) => `Alt+${arrow} 取回 · Esc 回填并中断`,
+        queueHintNow: (arrow, key) => `Alt+${arrow} 取回 · ${key} 立即发送 · Esc 回填并中断`,
+        sendHint: (mode, key) => mode === "queue" ? `Enter 排队 · ${key} 打断并发送` : `Enter 打断并发送 · ${key} 排队`,
     },
     tool: {
         interrupted: "已中断",

package/dist/i18n/messages/interactive.d.ts

@@ -49,6 +49,8 @@ export declare const en: {
         clearedCtrlC: string;
         ctrlCAgain: string;
         interrupted: string;
+        interruptSent: string;
+        nothingToSend: string;
         toolsExpanded: string;
         toolsCollapsed: string;
     };
@@ -140,6 +142,7 @@ export declare const en: {
                 host: string;
                 task: string;
                 plan: string;
+                interrupt: string;
             };
             planHandoff: string;
             thinkingStreaming: (glyph: string, ellipsis: string) => string;
@@ -168,6 +171,8 @@ export declare const en: {
             thinking: string;
             queueMore: (ellipsis: string, n: number) => string;
             queueHint: (arrow: string) => string;
+            queueHintNow: (arrow: string, key: string) => string;
+            sendHint: (mode: "queue" | "interrupt", key: string) => string;
         };
         tool: {
             interrupted: string;
@@ -292,6 +297,8 @@ export declare const zh: {
         clearedCtrlC: string;
         ctrlCAgain: string;
         interrupted: string;
+        interruptSent: string;
+        nothingToSend: string;
         toolsExpanded: string;
         toolsCollapsed: string;
     };
@@ -380,6 +387,7 @@ export declare const zh: {
                 host: string;
                 task: string;
                 plan: string;
+                interrupt: string;
             };
             planHandoff: string;
             thinkingStreaming: (glyph: string, ellipsis: string) => string;
@@ -408,6 +416,8 @@ export declare const zh: {
             thinking: string;
             queueMore: (ellipsis: string, n: number) => string;
             queueHint: (arrow: string) => string;
+            queueHintNow: (arrow: string, key: string) => string;
+            sendHint: (mode: "interrupt" | "queue", key: string) => string;
         };
         tool: {
             interrupted: string;

package/dist/i18n/messages/interactive.js

@@ -20,6 +20,7 @@ export const en = {
         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",
@@ -62,6 +63,8 @@ export const en = {
         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",
     },
@@ -152,6 +155,7 @@ export const zh = {
         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 完整输入",
@@ -192,6 +196,8 @@ export const zh = {
         clearedCtrlC: "已清空输入 · 再按 Ctrl+C 退出",
         ctrlCAgain: "再按一次 Ctrl+C 退出",
         interrupted: "已中断",
+        interruptSent: "已打断，立即发送",
+        nothingToSend: "没有可发送的内容",
         toolsExpanded: "工具输出：展开",
         toolsCollapsed: "工具输出：折叠",
     },

package/dist/i18n/messages/report.d.ts

@@ -36,6 +36,8 @@ export declare const en: {
         tasks: string;
         agents: string;
         paste: string;
+        interruptArgs: string;
+        interrupt: string;
         exit: string;
         config: string;
         traceArgs: string;
@@ -54,6 +56,8 @@ export declare const en: {
         cacheUsage: string;
         taskStopped: (id: string) => string;
         tasksUsage: string;
+        interruptUsage: string;
+        interruptSent: (text: string) => string;
         newSession: (id: string) => string;
         resumed: (id: string, messages: number) => string;
         forked: (id: string) => string;
@@ -228,6 +232,8 @@ export declare const zh: {
         tasks: string;
         agents: string;
         paste: string;
+        interruptArgs: string;
+        interrupt: string;
         exit: string;
         config: string;
         traceArgs: string;
@@ -245,6 +251,8 @@ export declare const zh: {
         cacheUsage: string;
         taskStopped: (id: string) => string;
         tasksUsage: string;
+        interruptUsage: string;
+        interruptSent: (text: string) => string;
         newSession: (id: string) => string;
         resumed: (id: string, messages: number) => string;
         forked: (id: string) => string;

package/dist/i18n/messages/report.js

@@ -36,6 +36,8 @@ export const en = {
         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]",
@@ -54,6 +56,8 @@ export const en = {
         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}`,
@@ -279,6 +283,8 @@ export const zh = {
         tasks: "子 Agent 任务：状态、输出、停止、转后台",
         agents: "子 Agent 类型与外部 Agent（安装状态、版本）",
         paste: "粘贴剪贴板里的图片（Ctrl+V）",
+        interruptArgs: "<文本>",
+        interrupt: "打断当前回合并立即发送这段文字，排队的插话在前（Ctrl+X）",
         exit: "退出",
         config: "设置面板；key=value 直接设一项（用户级）",
         traceArgs: "[任务 id]",
@@ -296,6 +302,8 @@ export const zh = {
         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}`,

package/dist/i18n/messages/settings.d.ts

@@ -28,6 +28,7 @@ export declare const en: {
         "ui.logo": string;
         "ui.statusLine": string;
         "ui.restoreOnCancel": string;
+        "ui.enterWhileRunning": string;
         "ui.quietStartup": string;
         "ui.ascii": string;
         "ui.language": string;
@@ -205,6 +206,7 @@ export declare const zh: {
         "ui.logo": string;
         "ui.statusLine": string;
         "ui.restoreOnCancel": string;
+        "ui.enterWhileRunning": string;
         "ui.quietStartup": string;
         "ui.ascii": string;
         "ui.language": string;

package/dist/i18n/messages/settings.js

@@ -28,6 +28,7 @@ export const en = {
         "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",
@@ -199,6 +200,7 @@ export const zh = {
         "ui.logo": "启动字符画",
         "ui.statusLine": "底部信息行",
         "ui.restoreOnCancel": "中断后放回原消息",
+        "ui.enterWhileRunning": "运行中按 Enter",
         "ui.quietStartup": "启动画面",
         "ui.ascii": "ASCII 字形",
         "ui.language": "界面语言",