@armadra/agent 0.4.0 → 0.5.0

package/dist/modes/interactive/interactive-mode.js

@@ -11,30 +11,38 @@
  * - 晚绑定：`runtime.approvals.setUiBroker`（审批对话框）与 `runtime.notifier.set`（宿主通知进消息区），
  *   退出时撤下。
  * - 键位：Enter 发送（运行中 = steer），其余应用级键位见 `key-dispatch.ts`。
+ * - 回滚（RW-C）：`/rewind` 与空闲双击 Esc 走 rewind-flow.ts；回填的原消息图片暂存，随下一条消息发送。
+ * - 底部（W5-A，status-area.ts）：`ui.statusLine` full 时状态栏上方多一行速率行；Ctrl+G / `/statusline`
+ *   切换（只影响本会话）。
+ * - 第五波（W5-U，agent-ui.ts）：计划审批框、子 Agent 折叠视图、`/tasks` `/agents` `/paste` 与 Ctrl+V、审批来源
+ *   标注与外部 Agent 首次运行的合并确认（approval-merge.ts）、harness 提示。
  * - 启动头按 `ui.quietStartup`（startup-header.ts）：normal 框 + 模型 / 目录 / 模式 / 资源清单（窄屏或
  *   `ui.compact` 去框），header 一行，silent 不输出。
  */
 import { promptImages, sessionModel } from "../image-input.js";
 import { join } from "node:path";
 import { AgentSessionImpl } from "../../agent/session.js";
+import { taskRegistryView } from "../../agent/subagent-registry.js";
 import { currentSession, switchSession } from "../../cli/compose-session.js";
-import { startupInfo, startupScreenLevel } from "../../cli/startup-screen.js";
+import { startupInfo, startupScreenLevel, tildePath } from "../../cli/startup-screen.js";
 import { KEYBINDINGS_FILE } from "../../config/paths.js";
 import { AmaError, isAmaError } from "../../errors.js";
-import { detectSandboxCapability } from "../../codemode/capability.js";
-import { effectiveCodemodeMode } from "../../tools/presets.js";
-import { Container, Editor, Keybindings, Loader, ProcessTerminal, Spacer, TUI, Text, createTheme, detectCapabilities, resolveAscii, resolveThemeName, loadKeybindingsFile, truncateToWidth, } from "../../tui.js";
-import { cacheEventNotice, cacheNoticesEnabled } from "../session-report.js";
+import { Container, Editor, Keybindings, Loader, ProcessTerminal, Spacer, TUI, Text, createTheme, detectCapabilities, resolveAscii, resolveThemeName, loadKeybindingsFile, } from "../../tui.js";
 import { onTerminationSignals } from "../shared.js";
+import { AgentUi } from "./agent-ui.js";
 import { ApprovalDialogBroker, approvalOutcomeText } from "./approval-dialog.js";
+import { mergingBroker } from "./approval-merge.js";
 import { ALL_COMMANDS, runInteractiveCommand } from "./commands.js";
 import { InteractiveCompletion } from "./completion.js";
 import { createKeyDispatch } from "./key-dispatch.js";
 import { MessageView, exitSummaryLines } from "./message-view.js";
 import { openPicker } from "./pickers.js";
+import { createRewindFlow } from "./rewind-flow.js";
 import { StartupHeader } from "./startup-header.js";
 import { QueueView, RunIndicator } from "./run-indicator.js";
-import { StatusBar } from "./status-bar.js";
+import { StatusArea, statusLineSlash } from "./status-area.js";
+import { createSessionEventHandler } from "./session-events.js";
+import { SubagentTracker } from "./subagent-view.js";
 import { ToolTracker } from "./tool-view.js";
 const HINT_MS = 2500;
 const EDITOR_PLACEHOLDER = "输入消息，/ 命令，@ 文件，Shift+Enter 换行";
@@ -51,17 +59,6 @@ function loadKeys(runtime, warn) {
         warn(`keybindings.json：${w}`);
     return new Keybindings(parsed.overrides);
 }
-/** 一行提示；空时不占行。 */
-class HintLine {
-    text = "";
-    setText(text) {
-        this.text = text;
-    }
-    render(width) {
-        return this.text === "" ? [] : [truncateToWidth(this.text, width)];
-    }
-    invalidate() { }
-}
 export function runInteractiveMode(runtime, context, options = {}) {
     const terminal = options.terminal ?? processTerminal();
     const ui = runtime.config.ui ?? {};
@@ -83,12 +80,14 @@ export function runInteractiveMode(runtime, context, options = {}) {
         ...(ui.markdown !== undefined ? { markdown: ui.markdown } : {}),
         ...(ui.compact === true ? { compact: true } : {}),
     });
+    const subagents = new SubagentTracker(now);
     const tools = new ToolTracker({
         theme,
         cwd: session.state.cwd,
         getTool: (name) => session.getTools().find((tool) => tool.name === name),
         now,
         spinner: () => loader.frame,
+        subagent: (toolCallId) => subagents.forToolCall(toolCallId),
     });
     const queueView = new QueueView(theme);
     const loaderSlot = new Container();
@@ -100,19 +99,17 @@ export function runInteractiveMode(runtime, context, options = {}) {
         ...(options.spinnerIntervalMs !== undefined ? { intervalMs: options.spinnerIntervalMs } : {}),
     });
     loader.onFrame(() => tools.tick());
-    const hint = new HintLine();
-    let sandboxStrict;
-    const status = new StatusBar({
+    const area = new StatusArea({
+        runtime,
+        theme,
         session: () => session,
-        preset: () => runtime.config.tools?.preset ?? "default",
-        hostStatus: () => runtime.host?.status(),
-        codemode: () => {
-            const mode = effectiveCodemodeMode(runtime.config);
-            const active = session.getTools().some((tool) => tool.name === "codemode");
-            return mode === "off" || !active ? undefined : mode;
-        },
-        sandboxStrict: () => (sandboxStrict ??= detectSandboxCapability().strict),
-    }, theme);
+        now,
+        render: () => tui.requestRender(),
+        redraw: () => tui.forceFullRedraw(),
+        env,
+        ...(options.statusLine !== undefined ? { layout: options.statusLine } : {}),
+    });
+    const { hint, bar: status } = area;
     const historyFile = options.historyFile === false
         ? undefined
         : (options.historyFile ?? join(runtime.paths.dataDir, "history"));
@@ -139,6 +136,7 @@ export function runInteractiveMode(runtime, context, options = {}) {
     tui.addChild(loaderSlot);
     tui.addChild(editor);
     tui.addChild(hint);
+    tui.addChild(area.rate);
     tui.addChild(status);
     // ---- 小工具 ---------------------------------------------------------------
     let finished = false;
@@ -149,7 +147,7 @@ export function runInteractiveMode(runtime, context, options = {}) {
         view.addNotice(level, text);
         render();
     };
-    const showHint = (text) => {
+    const showHint = (text, ms = HINT_MS) => {
         hint.setText(text === "" ? "" : theme.fg("dim", text));
         if (hintTimer !== undefined)
             clearTimeout(hintTimer);
@@ -158,7 +156,7 @@ export function runInteractiveMode(runtime, context, options = {}) {
             hintTimer = setTimeout(() => {
                 hint.setText("");
                 render();
-            }, HINT_MS);
+            }, ms);
             hintTimer.unref?.();
         }
         render();
@@ -170,88 +168,18 @@ export function runInteractiveMode(runtime, context, options = {}) {
         render();
     };
     // ---- 会话事件 -------------------------------------------------------------
-    const onEvent = (event) => {
-        switch (event.type) {
-            case "agent_settled":
-                if (event.warning !== undefined)
-                    view.addNotice("warn", event.warning);
-                status.refresh();
-                break;
-            case "message_start": {
-                const message = event.message;
-                if (message.role === "user")
-                    view.addUser(message);
-                else if (message.role === "assistant")
-                    view.startAssistant(message);
-                else if (message.role === "custom" && message.display) {
-                    view.addNotice("info", typeof message.content === "string" ? message.content : "");
-                }
-                break;
-            }
-            case "message_update":
-                view.updateAssistant(event.message);
-                break;
-            case "message_end":
-                if (event.message.role === "assistant") {
-                    view.endAssistant(event.message);
-                    status.refresh();
-                }
-                break;
-            case "tool_execution_start": {
-                const started = tools.start(event);
-                if (started.topLevel)
-                    view.addTool(started.view);
-                break;
-            }
-            case "tool_execution_update":
-                tools.update(event.toolCallId, event.partial);
-                render();
-                return;
-            case "tool_execution_end":
-                tools.end(event.toolCallId, event.result, event.isError);
-                break;
-            case "queue_update":
-                setQueue(event.steering, event.followUp);
-                return;
-            case "compaction_end":
-                if (event.result !== undefined)
-                    view.addCompaction(event.result);
-                else if (event.error !== undefined)
-                    view.addNotice("error", `压缩失败：${event.error}`);
-                else if (event.aborted)
-                    view.addNotice("info", "压缩已取消");
-                status.refresh();
-                break;
-            case "auto_retry_start":
-                view.addRetry(event.attempt, event.maxAttempts, event.delayMs, event.errorMessage);
-                break;
-            case "auto_retry_end":
-                if (!event.success)
-                    view.addRetryFailed(event.finalError);
-                break;
-            case "cache_miss":
-            case "context_pressure": {
-                const shown = cacheEventNotice(event, cacheNoticesEnabled(session));
-                if (shown !== undefined)
-                    view.addNotice(shown.level, shown.text);
-                status.refresh();
-                render();
-                return;
-            }
-            case "cache_warm":
-            case "permission_mode_changed":
-            case "model_changed":
-            case "thinking_level_changed":
-            case "session_changed":
-                status.refresh();
-                render();
-                return;
-            default:
-                break;
-        }
-        indicator.onEvent(event);
-        render();
-    };
+    const onEvent = createSessionEventHandler({
+        view,
+        tools,
+        status,
+        area,
+        agentUi: () => agentUi,
+        indicator,
+        session: () => session,
+        setQueue,
+        notice,
+        render,
+    });
     let unsubscribe = session.subscribe(onEvent);
     const startupLevel = startupScreenLevel(runtime);
     const home = env["HOME"] ?? env["USERPROFILE"];
@@ -282,7 +210,8 @@ export function runInteractiveMode(runtime, context, options = {}) {
         tools.clear();
         replay();
         setQueue([], []);
-        status.refresh();
+        area.rebind();
+        agentUi.attach(next);
         indicator.reset();
         if (next instanceof AgentSessionImpl)
             next.announceStart(reason);
@@ -292,12 +221,20 @@ export function runInteractiveMode(runtime, context, options = {}) {
      * 空闲时发提示。agent_settled 之后会话周期还要一个微任务才结束，所以先 waitForIdle；
      * 仍然撞上运行中（极少）就排到本轮之后。
      */
+    let draftImages = [];
+    const resize = runtime.config.images?.resize;
+    const imageResize = resize !== undefined ? { resize } : {};
     const startPrompt = (text) => {
         const target = session;
+        const carried = draftImages;
+        draftImages = [];
         void target
             .waitForIdle()
             .then(async () => {
-            const images = await promptImages(text, [], target.state.cwd, sessionModel(runtime.providers, target));
+            const images = [
+                ...carried,
+                ...(await promptImages(text, [], target.state.cwd, sessionModel(runtime.providers, target), imageResize)),
+            ];
             return target.prompt(text, images.length > 0 ? { images } : {});
         })
             .catch((error) => {
@@ -312,6 +249,38 @@ export function runInteractiveMode(runtime, context, options = {}) {
             render();
         });
     };
+    /** 对话换了路径（/tree、回滚）：重画消息区。内容可能缩到视口顶以上，差分画不对，整屏重画。 */
+    const reloadView = () => {
+        resetView();
+        tools.clear();
+        replay();
+        status.refresh();
+        area.refreshGit();
+        tui.forceFullRedraw();
+    };
+    const setDraft = (draft) => {
+        editor.setText(draft.text);
+        draftImages = [...(draft.images ?? [])];
+        render();
+    };
+    const pickerHost = {
+        theme,
+        keybindings: keys,
+        showOverlay: (c, o) => tui.showOverlay(c, o),
+        columns: () => terminal.columns,
+        rows: () => terminal.rows,
+    };
+    const rewind = createRewindFlow({
+        ...pickerHost,
+        session: () => session,
+        now,
+        render,
+        notice,
+        hint: (text) => showHint(text),
+        reload: reloadView,
+        setDraft,
+        editorEmpty: () => editor.isEmpty(),
+    });
     const commandUi = {
         runtime,
         session: () => session,
@@ -320,12 +289,9 @@ export function runInteractiveMode(runtime, context, options = {}) {
             rebind(next, request.kind === "new" ? "new" : request.kind === "fork" ? "fork" : "resume");
             return next;
         },
-        pick: (spec) => openPicker({
-            theme,
-            keybindings: keys,
-            showOverlay: (c, o) => tui.showOverlay(c, o),
-            columns: () => terminal.columns,
-        }, spec),
+        pick: (spec) => openPicker(pickerHost, spec),
+        rewind: () => rewind.open(),
+        setDraft,
         notice,
         panel: (component) => {
             view.add(component);
@@ -339,17 +305,14 @@ export function runInteractiveMode(runtime, context, options = {}) {
             render();
         },
         prompt: (text) => startPrompt(text),
-        reload: () => {
-            resetView();
-            tools.clear();
-            replay();
-            status.refresh();
-            render();
-        },
+        reload: reloadView,
         exit: (code) => exit(code),
         now,
+        extra: (name, args) => agentUi.command(name, args),
     };
-    const runCommand = (line) => runInteractiveCommand(line, commandUi).finally(() => {
+    const runCommand = (line) => (statusLineSlash(area, line, notice)
+        ? Promise.resolve(true)
+        : runInteractiveCommand(line, commandUi)).finally(() => {
         status.refresh();
         render();
     });
@@ -385,16 +348,15 @@ export function runInteractiveMode(runtime, context, options = {}) {
         now,
         showHint,
         onExpandToggle: (expanded) => view.setThinkingExpanded(expanded),
+        onStatusLineToggle: () => area.toggle(),
+        onPasteImage: () => void agentUi.paste(),
         submit: (text, via) => submit(text, via),
         runCommand: (line) => void runCommand(line),
         exit: (code) => exit(code),
+        onInterrupted: (empty) => void rewind.afterInterrupt(empty),
     }));
     // ---- 晚绑定 ---------------------------------------------------------------
-    const broker = new ApprovalDialogBroker({
-        theme,
-        keybindings: keys,
-        cwd: session.state.cwd,
-        permissionMode: () => session.state.permissionMode,
+    const overlayHooks = {
         showOverlay: (component) => tui.showOverlay(component, { anchor: "bottom" }),
         onOpen: () => {
             editor.disableSubmit = true;
@@ -406,12 +368,44 @@ export function runInteractiveMode(runtime, context, options = {}) {
             tools.setAwaiting(false);
             indicator.setApproval(false);
         },
+    };
+    const agentUi = new AgentUi({
+        theme,
+        tui,
+        editor,
+        tools: () => tools,
+        subagents,
+        session: () => session,
+        dataDir: runtime.paths.dataDir,
+        env,
+        now,
+        notice,
+        panel: (component) => commandUi.panel?.(component),
+        pick: (spec) => openPicker(pickerHost, spec),
+        hint: (text) => showHint(text),
+        render,
+        switchSession: (request) => commandUi.switchSession(request),
+        prompt: (text) => startPrompt(text),
+        dialog: { theme, keybindings: keys, ...overlayHooks },
+        displayPath: (path) => tildePath(path, home),
+        ...(options.clipboard !== undefined ? { clipboard: options.clipboard } : {}),
+    });
+    const taskAgent = (taskId) => taskRegistryView(session.state.sessionId)?.get(taskId)?.agent;
+    const broker = mergingBroker(new ApprovalDialogBroker({
+        theme,
+        keybindings: keys,
+        cwd: session.state.cwd,
+        permissionMode: () => session.state.permissionMode,
+        taskAgent,
+        externalRunner: (agent) => agentUi.merge.externalRunner(agent),
+        ...overlayHooks,
         report: (request, outcome) => {
             if (outcome === "deny" || outcome === "cancelled") {
-                notice(outcome === "deny" ? "info" : "warn", approvalOutcomeText(request, outcome));
+                const text = approvalOutcomeText(request, outcome, taskAgent);
+                notice(outcome === "deny" ? "info" : "warn", text);
             }
         },
-    });
+    }), agentUi.merge, (request) => notice("info", `${approvalOutcomeText(request, "allow", taskAgent)}（随上一次确认）`));
     // ---- 启动与退出 -----------------------------------------------------------
     let offSignals = () => undefined;
     function exit(code) {
@@ -421,11 +415,13 @@ export function runInteractiveMode(runtime, context, options = {}) {
         if (hintTimer !== undefined)
             clearTimeout(hintTimer);
         loader.stop();
+        area.dispose();
         // 退出摘要留在回滚里；输入框、状态栏等底部区域撤掉，屏幕停在摘要下面
         view.addExitSummary(exitSummaryLines(session.getStats(), now() - startedAt, theme));
         tui.clear();
         tui.addChild(view);
         offSignals();
+        agentUi.detach();
         runtime.approvals.setUiBroker(undefined);
         runtime.notifier.set(undefined);
         tui.stop();
@@ -456,6 +452,7 @@ export function runInteractiveMode(runtime, context, options = {}) {
         }
         runtime.approvals.setUiBroker(broker);
         runtime.notifier.set((message, level) => notice(level, message));
+        agentUi.attach(session);
         offSignals = onTerminationSignals((code) => exit(code));
         tui.setFocus(editor);
         options.onReady?.({
@@ -464,6 +461,7 @@ export function runInteractiveMode(runtime, context, options = {}) {
             view,
             tools,
             status,
+            area,
             session: () => session,
             exit,
         });

package/dist/modes/interactive/key-dispatch.d.ts

@@ -3,7 +3,12 @@
  *
  * 编辑器之前的输入监听：Ctrl+C 清空输入 / 再按退出、Esc 中断（clearQueue 回填编辑器后 abort）、
  * Ctrl+D 空输入退出、Alt+Enter followUp、Alt+↑ 取回最后一条排队消息、Shift+Tab 循环权限模式、
- * Ctrl+O 展开工具输出与思考块、Ctrl+L 模型、Ctrl+T 思考级别。键位由 `keybindings.json` 覆盖。
+ * Ctrl+O 展开工具输出与思考块、Ctrl+L 模型、Ctrl+T 思考级别、Ctrl+G 底部信息行 full ↔ compact（W5-A）、
+ * Ctrl+V 粘贴剪贴板图片（`app.paste.image`，W5-U）。
+ * 键位由 `keybindings.json` 覆盖。
+ *
+ * [RW-C] 空闲时双击 Esc（`app.rewind`，double-esc.ts）：输入框为空打开回滚列表，有字则清空并存进
+ * 输入历史；运行中 Esc 仍为中断，中断后交给 `onInterrupted`（中断即撤回）。
  */
 import type { AgentSession } from "../../agent/types.js";
 import type { Editor, Keybindings } from "../../tui.js";
@@ -20,12 +25,21 @@ export interface KeyDispatchDeps {
     /** 运行或压缩中（Esc 才中断）。 */
     busy(): boolean;
     now(): number;
-    showHint(text: string): void;
+    /** 底部提示；`ms` 是停留时间（缺省由调用方决定）。 */
+    showHint(text: string, ms?: number): void;
     /** Ctrl+O 之后（消息区思考块跟着展开 / 折叠）。 */
     onExpandToggle?(expanded: boolean): void;
+    /** Ctrl+G：切换底部信息行，返回切换后的布局。 */
+    onStatusLineToggle?(): "full" | "compact";
+    /** Ctrl+V：粘贴剪贴板图片（W5-U）。 */
+    onPasteImage?(): void;
     submit(text: string, via: "followUp"): void;
     runCommand(line: string): void;
     exit(code: number): void;
+    /** Esc 中断之后（参数：中断后输入框是否为空）。 */
+    onInterrupted?(editorWasEmpty: boolean): void;
+    /** 双击 Esc 的间隔（测试注入）。 */
+    doubleEscMs?: number;
 }
 /** 返回输入监听器：已处理返回 true，交给编辑器返回 false。 */
 export declare function createKeyDispatch(deps: KeyDispatchDeps): (data: string) => boolean;

package/dist/modes/interactive/key-dispatch.js

@@ -3,15 +3,46 @@
  *
  * 编辑器之前的输入监听：Ctrl+C 清空输入 / 再按退出、Esc 中断（clearQueue 回填编辑器后 abort）、
  * Ctrl+D 空输入退出、Alt+Enter followUp、Alt+↑ 取回最后一条排队消息、Shift+Tab 循环权限模式、
- * Ctrl+O 展开工具输出与思考块、Ctrl+L 模型、Ctrl+T 思考级别。键位由 `keybindings.json` 覆盖。
+ * Ctrl+O 展开工具输出与思考块、Ctrl+L 模型、Ctrl+T 思考级别、Ctrl+G 底部信息行 full ↔ compact（W5-A）、
+ * Ctrl+V 粘贴剪贴板图片（`app.paste.image`，W5-U）。
+ * 键位由 `keybindings.json` 覆盖。
+ *
+ * [RW-C] 空闲时双击 Esc（`app.rewind`，double-esc.ts）：输入框为空打开回滚列表，有字则清空并存进
+ * 输入历史；运行中 Esc 仍为中断，中断后交给 `onInterrupted`（中断即撤回）。
  */
 import { ExitCode } from "../../cli/exit-codes.js";
 import { nextCycleMode, permissionModeLabel } from "../../permissions/modes.js";
+import { DOUBLE_ESC_HINT_MS, DoubleEscape } from "./double-esc.js";
+import { statusLineText } from "./status-area.js";
 const DOUBLE_CTRL_C_MS = 1500;
 /** 返回输入监听器：已处理返回 true，交给编辑器返回 false。 */
 export function createKeyDispatch(deps) {
     const { keys, editor, tools, status } = deps;
     let ctrlCArmedAt = Number.NEGATIVE_INFINITY;
+    const esc = new DoubleEscape(deps.doubleEscMs);
+    const doubleEscape = () => {
+        switch (esc.press(deps.now(), editor.isEmpty())) {
+            case "arm-rewind":
+                deps.showHint("再按 Esc 回滚", DOUBLE_ESC_HINT_MS);
+                return;
+            case "arm-clear":
+                deps.showHint("再按 Esc 清空", DOUBLE_ESC_HINT_MS);
+                return;
+            case "rewind":
+                deps.showHint("");
+                deps.runCommand("/rewind");
+                return;
+            case "clear": {
+                // 记进输入历史再清空：↑ 可取回
+                const text = editor.getExpandedText();
+                if (text.trim() !== "")
+                    editor.addToHistory(text);
+                editor.clear();
+                deps.showHint("已清空输入 · ↑ 取回");
+                return;
+            }
+        }
+    };
     const interrupt = () => {
         const session = deps.session();
         const queued = session.clearQueue();
@@ -48,6 +79,8 @@ export function createKeyDispatch(deps) {
         if (deps.inactive())
             return false;
         const is = (action) => keys.matches(data, action);
+        if (!is("app.rewind"))
+            esc.reset();
         if (is("app.clear")) {
             if (!editor.isEmpty()) {
                 editor.clear();
@@ -65,8 +98,14 @@ export function createKeyDispatch(deps) {
         }
         ctrlCArmedAt = Number.NEGATIVE_INFINITY;
         if (is("app.interrupt") && !editor.isCompletionOpen && deps.busy()) {
+            esc.reset();
             interrupt();
             deps.showHint("已中断");
+            deps.onInterrupted?.(editor.isEmpty());
+            return true;
+        }
+        if (is("app.rewind") && !editor.isCompletionOpen && !deps.busy()) {
+            doubleEscape();
             return true;
         }
         if (is("app.exit") && editor.isEmpty()) {
@@ -101,6 +140,15 @@ export function createKeyDispatch(deps) {
             deps.runCommand("/thinking");
             return true;
         }
+        if (is("app.paste.image") && deps.onPasteImage !== undefined) {
+            deps.onPasteImage();
+            return true;
+        }
+        if (is("app.statusLine.toggle") && deps.onStatusLineToggle !== undefined) {
+            const mode = deps.onStatusLineToggle();
+            deps.showHint(statusLineText(mode));
+            return true;
+        }
         return false;
     };
 }

package/dist/modes/interactive/line/line-mode.d.ts

@@ -6,7 +6,8 @@
  *   问句之前逐行打印执行前预览（`request.preview`，W3-B9a-2）。
  * - 否则（管道）：逐行读 stdin，每行依次执行（等上一条运行结束）；没有审批 UI，ask → deny。
  *   模型错误在运行结束时只打印一次（重试中只显示 ↻）；有运行最终失败时退出码 1。
- * - 斜杠命令走 commands-core（与 B7 同一语义），`pick` 退化为列出候选。
+ * - 斜杠命令走 commands-core（与 B7 同一语义），`pick` 退化为列出候选；`/rewind` 列编号、
+ *   `/rewind <n> …` 执行，回到的单行原消息放回编辑行。
  */
 import type { ModeContext } from "../../../cli/deps.js";
 import type { Runtime } from "../../../cli/runtime.js";

package/dist/modes/interactive/line/line-mode.js

@@ -6,9 +6,11 @@
  *   问句之前逐行打印执行前预览（`request.preview`，W3-B9a-2）。
  * - 否则（管道）：逐行读 stdin，每行依次执行（等上一条运行结束）；没有审批 UI，ask → deny。
  *   模型错误在运行结束时只打印一次（重试中只显示 ↻）；有运行最终失败时退出码 1。
- * - 斜杠命令走 commands-core（与 B7 同一语义），`pick` 退化为列出候选。
+ * - 斜杠命令走 commands-core（与 B7 同一语义），`pick` 退化为列出候选；`/rewind` 列编号、
+ *   `/rewind <n> …` 执行，回到的单行原消息放回编辑行。
  */
 import { promptImages, sessionModel } from "../../image-input.js";
+import { taskRegistryView } from "../../../agent/subagent-registry.js";
 import { currentSession, switchSession } from "../../../cli/compose-session.js";
 import { ExitCode } from "../../../cli/exit-codes.js";
 import { previewDisplayLines } from "../../../permissions/preview.js";
@@ -64,8 +66,21 @@ export async function runLineMode(runtime, context, options = {}) {
                 await prompt(session, result.text);
             else if (result.kind === "pick")
                 out(`${await pickHint(result.what, runtime, session)}\n`);
-            else if (result.message !== undefined)
-                out(`${result.message}\n`);
+            else {
+                if (result.message !== undefined)
+                    out(`${result.message}\n`);
+                // /rewind 回到某条消息之前：单行原消息放回编辑行（多行只在输出里给出）
+                const draft = result.draft?.text;
+                if (editor !== undefined && draft !== undefined && !draft.includes("\n")) {
+                    editor.buffer = draft;
+                    editor.cursor = draft.length;
+                }
+                // /plan approve 开了新回合：跑完再收下一行（与直接发提示一致）
+                if (result.wait === true) {
+                    await session.waitForIdle();
+                    printer.endLine();
+                }
+            }
         }
         catch (error) {
             printer.endLine();
@@ -75,7 +90,8 @@ export async function runLineMode(runtime, context, options = {}) {
         return undefined;
     };
     const prompt = async (target, text) => {
-        const images = await promptImages(text, [], target.state.cwd, sessionModel(runtime.providers, target));
+        const resize = runtime.config.images?.resize;
+        const images = await promptImages(text, [], target.state.cwd, sessionModel(runtime.providers, target), resize !== undefined ? { resize } : {});
         await target.prompt(text, images.length > 0 ? { images } : {});
         printer.endLine();
     };
@@ -95,7 +111,8 @@ export async function runLineMode(runtime, context, options = {}) {
                 return resolve(undefined);
             signal.addEventListener("abort", () => resolve(undefined), { once: true });
             const preview = previewDisplayLines(request.preview).map((l) => `  ${l}\n`);
-            void ed.ask(`\n${preview.join("")}${approvalQuestion(request)}`, "n").then((answer) => {
+            const question = approvalQuestion(request, (taskId) => taskRegistryView(session.state.sessionId)?.get(taskId)?.agent);
+            void ed.ask(`\n${preview.join("")}${question}`, "n").then((answer) => {
                 resolve(answer === "y" ? "allow" : answer === "a" ? "allow_session" : "deny");
                 if (!busy)
                     ed.render();

package/dist/modes/interactive/line/line-render.d.ts

@@ -6,9 +6,10 @@ import type { AgentSession, SessionEvent } from "../../../agent/types.js";
 import type { Runtime } from "../../../cli/runtime.js";
 import type { ApprovalRequest } from "../../../permissions/types.js";
 import type { CommandResult } from "../../commands-core.js";
+import { type TaskAgentLookup } from "../approval-dialog.js";
 /** 工具参数的一行摘要（第一个常见字段，折叠换行、截到 80 字符）。 */
 export declare function argsSummary(args: unknown): string;
-export declare function approvalQuestion(request: ApprovalRequest): string;
+export declare function approvalQuestion(request: ApprovalRequest, taskAgent?: TaskAgentLookup): string;
 /** [W3-C2] 缓存提示的开关（line 模式由 runLineMode 传入）。 */
 export interface EventPrinterOptions {
     /** `cache.missNotices`（每次现取，切换会话后跟随新会话）；缺省 true。 */