@ai-zen/cli 1.0.0-alpha.2 → 1.0.0-alpha.20

package/dist/tui/screens/chat.js

@@ -1,30 +1,36 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-// 由 src/tui/screens.tsx 拆分而来 —— 对话屏幕 Chat
-import { useEffect, useReducer, useRef, useState } from "react";
+// 对话屏幕 —— 以 SDK 的 `agent.messages` 为唯一数据源渲染（无自定义中间模型）
+import { useEffect, useRef, useState } from "react";
 import { Box, Text, useApp, useCursor, useInput, useWindowSize } from "ink";
+import { keyDebug } from "../key-debug.js";
+import { parseWheel, WHEEL_STEP } from "../mouse.js";
+import { AgentNS } from "@ai-zen/agents-core";
 import { theme } from "../theme.js";
 import { Spinner, StatusBar, SlashMenu } from "../components.js";
 import { layoutInput, usableFrameRows, isTerminalReply } from "../text.js";
 import { ChatSession } from "../chat-session.js";
 import { matchCommandHints } from "../../conversation-commands/registry.js";
-import { readConfig, readMcpConfig, saveConfig, writeMcpConfig } from "../../config.js";
+import { readConfig, readMcpConfig, readReasoningPresets, saveConfig, writeMcpConfig } from "../../config.js";
 import { readAgentStore } from "../../agents-store.js";
 import { resolveCredential } from "../../config-editor.js";
 import { ConfigWizard } from "../config-wizard/index.js";
-import { computeInputCursorPosition, wordLeft, wordRight } from "./input.js";
-import { computeChatLayout } from "./layout.js";
-import { chatReducer } from "./state.js";
-import { LineView, messagesToBlocks } from "./render.js";
+import { computeInputCursorPosition, deleteToLineEnd, deleteToLineStart, deleteWordLeft, deleteWordRight, wordLeft, wordRight } from "./input.js";
+import { deleteToPrevWhitespace, killedText, killAt, popUndo, pushKill, pushUndo, } from "../input-editing.js";
+import { clampViewTop, computeChatLayout } from "./layout.js";
+import { FrameBuffer } from "./frame-buffer.js";
+import { LineView } from "./render.js";
+import { messageToLines, transcriptLines } from "./messages-view.js";
 import { PickerOverlay, Confirm } from "./overlays.js";
+import { chooseHandoffMode } from "./handoff-choice.js";
 import { runCommand } from "./chat-commands.js";
+import { describeEffort } from "../../reasoning-effort.js";
+import { NoticeChannel, noticeLines } from "./notice.js";
 /**
  * 计算回车时应提交的文本。
  *
  * 斜杠候选菜单可见时（输入以 `/` 开头且尚未输入参数），回车应**直接执行高亮命令**，
  * 而不是提交半截输入 —— 否则用户只输入 `/` 或未补全的命令名时，回车会落到
  * 「未知命令」报错（体验很差）。非命令输入原样返回。
- *
- * `menuIndex` 越界时回落到最后一项，避免菜单看似有选中却回车落空。
  */
 export function resolveSubmitText(input, hints, menuIndex) {
     const slash = input.startsWith("/") && !input.includes("\n") && !input.includes(" ");
@@ -38,15 +44,10 @@ export function Chat(props) {
     const { exit, suspendTerminal } = useApp();
     const { setCursorPosition } = useCursor();
     const { columns, rows } = useWindowSize();
-    const [state, dispatch] = useReducer(chatReducer, {
-        blocks: props.clearTranscript ? [] : messagesToBlocks(props.messages ?? []),
-        live: null,
-    });
     const [input, setInput] = useState(props.initialInput ?? "");
     /** 光标位置：以 code point 计的字符索引（0..len） */
     const [cursor, setCursor] = useState(Array.from(props.initialInput ?? "").length);
     const [menuIndex, setMenuIndex] = useState(0);
-    // 输入变化后候选集随之改变：高亮重置回首项，避免索引越界（看似选中实为无高亮 / 回车落空）
     useEffect(() => {
         setMenuIndex(0);
     }, [input]);
@@ -55,13 +56,10 @@ export function Chat(props) {
     /** 配置向导：非 null 时整屏接管（凭据设置 / 配置中心） */
     const [wizardStep, setWizardStep] = useState(null);
     const [wizardConfig, setWizardConfig] = useState(null);
-    /** 可用 Agent 列表（供配置中心「默认 Agent」选择） */
+    const [wizardPresets, setWizardPresets] = useState({});
     const [wizardAgents, setWizardAgents] = useState([]);
-    /** MCP 配置快照（全局 + 项目），打开向导时刷新 */
     const [wizardMcp, setWizardMcp] = useState(null);
-    /** Agent / Sub-agent 定义仓储（快照 + 读写），打开向导时刷新 */
     const [wizardAgentStore, setWizardAgentStore] = useState(null);
-    /** 当前会话所用端点 id（打开向导时刷新，用于判断改动是否影响本会话） */
     const currentEndpointRef = useRef(null);
     const [history, setHistory] = useState([]);
     const historyIndex = useRef(-1);
@@ -72,36 +70,128 @@ export function Chat(props) {
     const [viewTop, setViewTop] = useState(null);
     /** 最近一次布局，供键盘回调读取总行数 / 视口高度（应用内翻页） */
     const layoutRef = useRef(null);
-    const busy = state.live != null;
+    /** 本轮是否在生成中（spinner / 输入禁用） */
+    const [busy, setBusy] = useState(false);
+    /**
+     * 当前模型 id —— **从会话（即 Agent 定义）读**，不作为 prop 传入。
+     *
+     * 模型的唯一真相源是 `AgentDefinition.modelId`：所以状态栏、凭据检查、思考状态
+     * 与 SDK 实发请求用的永远是同一个值，不会出现「显示 A、实发 B」。
+     */
+    const [modelId, setModelId] = useState("");
+    /**
+     * 思考强度展示文案（关 / 低 / 中 / 高 / 最高 / 开 / —）。
+     *
+     * 真相在配置里（模型的 `defaultParams`），这里只镜像一份供状态栏用：
+     * `/think` 写入后由命令层回调刷新，切模型（会话重建）时靠 `modelId` 变化重读。
+     */
+    const [effortText, setEffortText] = useState(null);
+    /** 乐观回显：提交后、真实 user 消息落进 messages 之前，先显示用户提问 */
+    const [pendingUser, setPendingUser] = useState(null);
+    /** 转录显示起点（/clear 清屏用：隐藏此索引之前的消息，但不改上下文） */
+    const [transcriptFrom, setTranscriptFrom] = useState(0);
+    // ---- Claude Code 同款编辑状态 ----
+    /** kill ring：Ctrl+W/U/K 删掉的文本，Ctrl+Y 取回、Alt+Y 循环 */
+    const killRingRef = useRef([]);
+    const yankIndexRef = useRef(-1);
+    /** 编辑撤销栈（Ctrl+_） */
+    const undoStackRef = useRef([]);
+    /** 暂存区（Ctrl+S） */
+    const stashRef = useRef(null);
+    /** Ctrl+D 双击退出计时 */
+    const ctrlDAtRef = useRef(0);
+    /**
+     * 通知通道：notice / error 走独立栏位，绝不进对话转录（messages）。
+     */
+    const noticeChannelRef = useRef(null);
+    if (noticeChannelRef.current == null)
+        noticeChannelRef.current = new NoticeChannel();
+    const noticeChannel = noticeChannelRef.current;
+    const [notice, setNotice] = useState(null);
+    useEffect(() => noticeChannel.subscribe(setNotice), [noticeChannel]);
+    /**
+     * 重挂载附带的系统提示（如 `/model` 的切换结果）。
+     *
+     * 用 ref 而非 props 直读：本值只在首次挂载消费一次，若写进 create 的依赖数组，
+     * 会把「展示一条提示」误变成「重建会话」。
+     */
+    const initialNoticeRef = useRef(props.initialNotice);
+    /**
+     * 渲染信号 + 合帧：SDK 内容变更 → FrameBuffer 合帧 → setTick 触发重渲染。
+     * 转录内容始终从 `agent.messages` 现取，tick 只负责「告诉 React 该重画了」。
+     */
+    const [, setTick] = useState(0);
+    const frameBufferRef = useRef(null);
+    if (frameBufferRef.current == null) {
+        frameBufferRef.current = new FrameBuffer(() => setTick((t) => t + 1));
+    }
+    // 思考强度展示：从当前模型的 defaultParams 派生；`/think` 写入后由命令层回调刷新，
+    // 切模型（会话重建）时靠 modelId 变化重读。
+    useEffect(() => {
+        if (!modelId)
+            return;
+        let alive = true;
+        // 档位存在 Agent 定义上（`modelParams`），可选档位在策略表里（`reasoningPreset` 指向），两者都要读
+        Promise.all([readConfig(), readAgentStore(), readReasoningPresets()])
+            .then(([config, store, presets]) => {
+            const model = config.models?.find((item) => item.id === modelId);
+            const agentId = props.agentId ?? "default";
+            const definition = store.agents.find((item) => item.id === agentId) ?? null;
+            if (alive)
+                setEffortText(describeEffort(model, presets, definition));
+        })
+            .catch(() => {
+            if (alive)
+                setEffortText(null);
+        });
+        return () => {
+            alive = false;
+        };
+    }, [modelId, props.agentId]);
     // 创建会话
     useEffect(() => {
         let disposed = false;
+        const notifier = {
+            onChange: (immediate) => {
+                if (disposed)
+                    return;
+                frameBufferRef.current?.push(null, immediate);
+            },
+            onNotice: (text, tone) => {
+                if (!disposed)
+                    noticeChannel.push(text, tone);
+            },
+        };
         ChatSession.create({
-            modelId: props.modelId,
             agentId: props.agentId,
             messages: props.messages,
             conversationId: props.conversationId,
             conversationName: props.conversationName,
-            requestConfirm: (question) => new Promise((resolve) => setConfirmState({ question, resolve })),
-        }, (event) => {
-            if (!disposed)
-                dispatch(event);
-        })
+            // 自动迁移：与手动 /migrate、/handoff 共用同一套「交接方式三选一」选择器
+            requestMode: (info) => chooseHandoffMode(setPickerState, `上下文即将超限（${info.promptTokens}/${info.handoffTokens} tokens）· 选择交接方式`),
+        }, notifier)
             .then((session) => {
             if (disposed) {
                 session.dispose();
                 return;
             }
             sessionRef.current = session;
+            setModelId(session.modelId);
             setReady(true);
+            // 重挂载附带的提示只需展示一次（消费后置空，避免再次触发）
+            if (initialNoticeRef.current) {
+                noticeChannel.push(initialNoticeRef.current);
+                initialNoticeRef.current = undefined;
+            }
+            setTick((t) => t + 1);
         })
             .catch((error) => setBootError(error?.message ?? String(error)));
         return () => {
             disposed = true;
+            frameBufferRef.current?.dispose();
             sessionRef.current?.dispose();
         };
     }, [
-        props.modelId,
         props.agentId,
         props.messages,
         props.conversationId,
@@ -120,32 +210,29 @@ export function Chat(props) {
         });
     };
     // ---- 配置向导（凭据 / 配置中心）----
-    /** 打开配置向导：先取配置 / MCP / Agent 快照，再切入指定步骤 */
     const openWizard = async (step) => {
         try {
             const config = await readConfig();
-            currentEndpointRef.current = resolveCredential(config, props.modelId)?.endpointId ?? null;
+            currentEndpointRef.current = resolveCredential(config, modelId)?.endpointId ?? null;
             const agentStore = await readAgentStore();
             setWizardConfig(config);
+            setWizardPresets(await readReasoningPresets());
             setWizardAgents(agentStore.agents.map((agent) => ({ id: agent.id, name: agent.name || agent.id })));
             setWizardAgentStore(agentStore);
             setWizardMcp({ global: await readMcpConfig("global"), project: await readMcpConfig("project") });
             setWizardStep(step);
         }
         catch (error) {
-            dispatch({ type: "error", text: `读取配置失败：${error?.message ?? error}` });
+            noticeChannel.push(`读取配置失败：${error?.message ?? error}`, "error");
         }
     };
     /** `/key`：直达「当前模型所用端点」的 API Key 编辑步骤 */
     const openKeyEditor = async () => {
         try {
             const config = await readConfig();
-            const credential = resolveCredential(config, props.modelId);
+            const credential = resolveCredential(config, modelId);
             if (!credential) {
-                dispatch({
-                    type: "error",
-                    text: `模型 ${props.modelId} 未绑定可用端点，请用 /config 检查配置`,
-                });
+                noticeChannel.push(`模型 ${modelId} 未绑定可用端点，请用 /config 检查配置`, "error");
                 return;
             }
             currentEndpointRef.current = credential.endpointId;
@@ -153,7 +240,7 @@ export function Chat(props) {
             setWizardStep({ kind: "edit", field: "apiKey", endpointId: credential.endpointId });
         }
         catch (error) {
-            dispatch({ type: "error", text: `读取配置失败：${error?.message ?? error}` });
+            noticeChannel.push(`读取配置失败：${error?.message ?? error}`, "error");
         }
     };
     /** 向导关闭：渲染变更摘要；若改到当前端点则重建会话（消息保留） */
@@ -163,10 +250,9 @@ export function Chat(props) {
         setWizardMcp(null);
         setWizardAgentStore(null);
         for (const line of result.summary)
-            dispatch({ type: "notice", text: `配置已更新：${line}` });
+            noticeChannel.push(`配置已更新：${line}`);
         if (!result.dirty)
             return;
-        // 会话尚未建立（启动失败进入向导）：重挂载对话屏重试
         if (!sessionRef.current) {
             exit({ restart: true, messages: props.messages });
             return;
@@ -175,50 +261,53 @@ export function Chat(props) {
         if (endpointChanged || result.mcpChanged || result.agentsChanged) {
             sessionRef.current
                 .reload()
-                .then(() => dispatch({ type: "notice", text: "已按新配置重建会话（消息与上下文保留）" }))
-                .catch((error) => dispatch({ type: "error", text: `重建会话失败：${error?.message ?? error}` }));
+                .then(() => noticeChannel.push("已按新配置重建会话（消息与上下文保留）"))
+                .catch((error) => noticeChannel.push(`重建会话失败：${error?.message ?? error}`, "error"));
         }
     };
     // ---- 滚动视口控制（应用内翻页，回看历史）----
-    /** 跳到指定顶部行；越界钳制；一旦贴到底部则恢复「自动跟随」 */
     const scrollTo = (nextTop) => {
         const L = layoutRef.current;
         if (!L)
             return;
-        const maxTop = Math.max(0, L.totalLines - L.budget);
-        const clamped = Math.max(0, Math.min(maxTop, nextTop));
-        setViewTop(clamped >= maxTop ? null : clamped);
+        setViewTop(clampViewTop(L.totalLines, L.budget, nextTop));
     };
-    /** 翻页滚动（dir：-1 上翻 / +1 下翻） */
     const scrollByPage = (dir) => {
         const L = layoutRef.current;
         if (!L)
             return;
         scrollTo(L.viewTop + dir * Math.max(1, L.budget - 1));
     };
-    /** 单行滚动（dir：-1 上 / +1 下） */
     const scrollByLine = (dir) => {
         const L = layoutRef.current;
         if (!L)
             return;
         scrollTo(L.viewTop + dir);
     };
-    /** 回到最新（贴底，恢复自动跟随） */
+    /** 鼠标滚轮：一格滚 `WHEEL_STEP` 行（与按行滚动共用一个钳制入口） */
+    const scrollByWheel = (dir) => {
+        const L = layoutRef.current;
+        if (!L)
+            return;
+        scrollTo(L.viewTop + dir * WHEEL_STEP);
+    };
     const scrollToBottom = () => setViewTop(null);
+    /** 清屏但保留上下文：把显示起点推到当前消息末尾 */
+    const clearTranscript = () => {
+        setTranscriptFrom(sessionRef.current?.messages.length ?? 0);
+        setNotice(null);
+    };
     // ---- 输入编辑（光标感知）----
-    /** 替换整个输入并把光标移到末尾 */
     const setInputText = (text) => {
         setInput(text);
         setCursor(Array.from(text).length);
     };
-    /** 在光标处插入文本 */
     const insertAtCursor = (text) => {
         const chars = Array.from(input);
         const cp = Math.max(0, Math.min(cursor, chars.length));
         setInput(chars.slice(0, cp).join("") + text + chars.slice(cp).join(""));
         setCursor(cp + Array.from(text).length);
     };
-    /** 删除光标前一个字符（Backspace） */
     const deleteBeforeCursor = () => {
         const chars = Array.from(input);
         const cp = Math.max(0, Math.min(cursor, chars.length));
@@ -227,7 +316,6 @@ export function Chat(props) {
         setInput(chars.slice(0, cp - 1).join("") + chars.slice(cp).join(""));
         setCursor(cp - 1);
     };
-    /** 删除光标后一个字符（Delete） */
     const deleteAfterCursor = () => {
         const chars = Array.from(input);
         const cp = Math.max(0, Math.min(cursor, chars.length));
@@ -235,12 +323,73 @@ export function Chat(props) {
             return;
         setInput(chars.slice(0, cp).join("") + chars.slice(cp + 1).join(""));
     };
-    /** 以字符为单位移动光标 */
+    /** 套用纯函数算好的「文本 + 光标」结果（无变化则不触发重渲染） */
+    const applyEdit = (r) => {
+        if (r.text === input && r.cursor === cursor)
+            return;
+        undoStackRef.current = pushUndo(undoStackRef.current, { text: input, cursor });
+        setInput(r.text);
+        setCursor(r.cursor);
+    };
+    /** 删除类编辑：额外把删掉的文本放进 kill ring（Ctrl+Y 可取回） */
+    const applyKill = (r) => {
+        if (r.text === input && r.cursor === cursor)
+            return;
+        killRingRef.current = pushKill(killRingRef.current, killedText(input, r.text));
+        yankIndexRef.current = -1;
+        applyEdit(r);
+    };
+    const deleteWordBeforeCursor = () => applyKill(deleteWordLeft(input, cursor));
+    const deleteWordAfterCursor = () => applyKill(deleteWordRight(input, cursor));
+    const deleteToEndOfLine = () => applyKill(deleteToLineEnd(input, cursor));
+    const deleteToStartOfLine = () => applyKill(deleteToLineStart(input, cursor));
+    /** Ctrl+W：删到前一空白（标点不切分，整条路径一次删掉） */
+    const deletePrevWhitespace = () => applyKill(deleteToPrevWhitespace(input, cursor));
+    /** Ctrl+Y / Alt+Y：插入 kill ring 中的一段（index 循环） */
+    const yank = (advance) => {
+        const ring = killRingRef.current;
+        if (ring.length === 0)
+            return;
+        const next = advance ? yankIndexRef.current + 1 : 0;
+        if (next >= ring.length)
+            return;
+        yankIndexRef.current = next;
+        const text = killAt(ring, next) ?? "";
+        insertAtCursor(text);
+    };
+    /** Ctrl+_：撤销上一次编辑 */
+    const undoEdit = () => {
+        const popped = popUndo(undoStackRef.current);
+        if (!popped)
+            return;
+        undoStackRef.current = popped.rest;
+        setInput(popped.state.text);
+        setCursor(popped.state.cursor);
+    };
+    /** Ctrl+S：暂存 / 恢复输入 */
+    const toggleStash = () => {
+        if (input.length > 0) {
+            stashRef.current = { text: input, cursor };
+            setInputText("");
+            noticeChannel.push("已暂存输入（Ctrl+S 恢复）");
+            return;
+        }
+        const stashed = stashRef.current;
+        if (!stashed)
+            return;
+        stashRef.current = null;
+        setInput(stashed.text);
+        setCursor(stashed.cursor);
+        noticeChannel.push("已恢复暂存的输入");
+    };
+    /** Ctrl+V：粘粘图片 —— 暂未支持（需先做「文件 → 内容块」能力探测，见 SKILL/后续迭代） */
+    const pasteImageUnsupported = () => {
+        noticeChannel.push("暂不支持粘贴图片（Ctrl+V 预留给图片粘贴，当前未实现）", "error");
+    };
     const moveCursor = (delta) => {
         const len = Array.from(input).length;
         setCursor((c) => Math.max(0, Math.min(len, c + delta)));
     };
-    /** 光标移到当前逻辑行行首（Home） */
     const moveCursorToLineStart = () => {
         const chars = Array.from(input);
         const cp = Math.max(0, Math.min(cursor, chars.length));
@@ -249,7 +398,6 @@ export function Chat(props) {
             i -= 1;
         setCursor(i);
     };
-    /** 光标移到当前逻辑行行尾（End） */
     const moveCursorToLineEnd = () => {
         const chars = Array.from(input);
         const cp = Math.max(0, Math.min(cursor, chars.length));
@@ -268,33 +416,56 @@ export function Chat(props) {
         setInputText("");
         historyIndex.current = -1;
         scrollToBottom();
+        setNotice(null);
         if (trimmed.startsWith("/")) {
-            const name = trimmed.slice(1).toLowerCase();
-            await runCommand(name, trimmed, {
-                session: sessionRef.current,
-                dispatch,
-                rows: rows ?? 24,
-                exit,
-                suspendTerminal,
-                openWizard,
-                openKeyEditor,
-                doExit,
-                setPickerState,
-                setConfirmState,
-                setInputText,
-            });
+            // 命令名取首个 token：支持 `/migrate summary`、`/handoff self` 这类带参数的写法
+            const name = trimmed.slice(1).split(/\s+/)[0].toLowerCase();
+            // 交接/迁移会调用模型写文档（较慢）：期间应像自动迁移一样拦住输入框。
+            const blocksInput = name === "migrate" || name === "migration" || name === "handoff";
+            if (blocksInput)
+                setBusy(true);
+            try {
+                await runCommand(name, trimmed, {
+                    session: sessionRef.current,
+                    notice: (text, tone) => noticeChannel.push(text, tone),
+                    clearTranscript,
+                    rows: rows ?? 24,
+                    exit,
+                    suspendTerminal,
+                    openWizard,
+                    openKeyEditor,
+                    doExit,
+                    setPickerState,
+                    setConfirmState,
+                    setInputText,
+                    setEffortText,
+                });
+            }
+            finally {
+                if (blocksInput)
+                    setBusy(false);
+            }
             return;
         }
         setHistory((h) => [...h, trimmed]);
-        await sessionRef.current.send(trimmed);
+        const base = sessionRef.current.messages.filter((m) => m.role === AgentNS.Role.User).length;
+        setPendingUser({ text: trimmed, base });
+        setBusy(true);
+        try {
+            await sessionRef.current.send(trimmed);
+        }
+        finally {
+            setBusy(false);
+            setPendingUser(null);
+        }
     };
     const doExit = () => {
-        // 会话已由 ConversationPersistPlugin 实时落盘，退出无需再询问是否保存
         exit("done");
     };
     // 输入处理
     useInput((char, key) => {
-        // 启动失败：给出「按 k 打开配置中心」的出路，而不是只能退出
+        // 按键诊断（AIZ_DEBUG_KEYS=1）：必须在任何 return 之前记录，否则被吞掉的键不会留痕
+        keyDebug(char, key);
         if (bootError) {
             if (char === "k" || char === "K") {
                 void openWizard({ kind: "menu" });
@@ -304,10 +475,16 @@ export function Chat(props) {
                 exit("done");
             return;
         }
-        // 终端应答序列（如 Kitty 查询应答 `[?0u`）不是用户输入，丢弃
+        // 鼠标滚轮：滚视口。**必须**排在下面 `isTerminalReply` 之前——那里会把整条鼠标序列
+        // 当「终端上报」吃掉，放后面就永远收不到滚轮。其余鼠标事件（点击 / 拖拽 / 横向滚轮）
+        // 交给 `isTerminalReply` 丢弃，绝不落下到输入框。
+        const wheel = parseWheel(char);
+        if (wheel) {
+            scrollByWheel(wheel.direction);
+            return;
+        }
         if (isTerminalReply(char))
             return;
-        // 翻页滚动（回看历史）
         if (key.pageUp) {
             scrollByPage(-1);
             return;
@@ -316,43 +493,147 @@ export function Chat(props) {
             scrollByPage(1);
             return;
         }
-        // 换行：Ctrl+Enter / Alt+Enter / Shift+Enter
-        // （仅当终端**原生**以 Kitty CSI-u 序列上报这些组合键时才生效 —— 本 CLI 不再
-        //   主动查询/开启该协议，见 tui/index.tsx 的 RENDER_OPTIONS；换行主推 Ctrl+N）
+        // 翻页的「兜底键」：部分终端把 PgUp/PgDn 留给自己滚 scrollback（应用收不到）。
+        // 注意 `Ctrl+V` 预留给图片粘贴（当前未实现），不再兼任 page-down。
+        if (char === "v" && key.meta) {
+            scrollByPage(-1);
+            return;
+        }
+        // macOS 习惯键：⌘[ / ⌘] 翻页、⌘; / ⌘' 按行滚动。
+        // Cmd 只在 kitty 键盘协议下才会带 super 位（或终端把 ⌘ 组合映射成带 8 号
+        // 修饰位的转义序列，那种会落到上面的 meta 分支里，同样生效）。
+        if (key.super && (char === "[" || char === "]")) {
+            scrollByPage(char === "[" ? -1 : 1);
+            return;
+        }
+        if (key.super && (char === ";" || char === "'")) {
+            scrollByLine(char === ";" ? -1 : 1);
+            return;
+        }
         if (key.return && (key.ctrl || key.meta || key.shift)) {
             insertAtCursor("\n");
             return;
         }
         if (char === "c" && key.ctrl) {
+            // Claude Code：生成中中断；空闲时有草稿就先清空，已空则退出
             if (busy)
                 sessionRef.current?.abort();
+            else if (input.length > 0) {
+                setInputText("");
+                noticeChannel.push("已清空输入 · 再按一次 Ctrl+C 退出");
+            }
             else
                 void doExit();
             return;
         }
         if (char === "d" && key.ctrl) {
-            void doExit();
+            // Claude Code：有草稿时删光标后一个字符；空输入需双击确认退出
+            if (input.length > 0) {
+                deleteAfterCursor();
+                return;
+            }
+            const now = Date.now();
+            if (now - ctrlDAtRef.current < 800) {
+                void doExit();
+                return;
+            }
+            ctrlDAtRef.current = now;
+            noticeChannel.push("再按一次 Ctrl+D 退出");
             return;
         }
         if (char === "l" && key.ctrl) {
-            exit({ restart: true, messages: sessionRef.current?.messages, clearTranscript: true });
+            clearTranscript();
             return;
         }
+        // ---- kill / yank / undo / stash（照抄 Claude Code / readline）----
         if (char === "u" && key.ctrl) {
-            setInputText("");
+            // 删到行首。macOS 上 ⌘⌫ 会被终端映射成 Ctrl+U，故不能做成「清空全部」
+            deleteToStartOfLine();
+            return;
+        }
+        if (char === "k" && key.ctrl) {
+            deleteToEndOfLine();
+            return;
+        }
+        if (char === "w" && key.ctrl) {
+            // 删到前一空白（标点不切分：`src/utils/foo.ts` 一次删完）
+            deletePrevWhitespace();
+            return;
+        }
+        if (char === "y" && key.ctrl) {
+            yank(false);
+            return;
+        }
+        if (char === "y" && key.meta) {
+            yank(true);
+            return;
+        }
+        // Ctrl+_ / Ctrl+Shift+-：撤销上一次输入编辑
+        if ((char === "_" && key.ctrl) || (char === "-" && key.ctrl && key.shift)) {
+            undoEdit();
+            return;
+        }
+        if (char === "s" && key.ctrl) {
+            toggleStash();
+            return;
+        }
+        if ((char === "v" && key.ctrl) || (key.super && (char === "v" || char === "V"))) {
+            pasteImageUnsupported();
+            return;
+        }
+        // readline 的行首 / 行尾（macOS 上部分终端把 ⌘← / ⌘→ 发成 ^A / ^E）
+        if (char === "a" && key.ctrl) {
+            moveCursorToLineStart();
+            return;
+        }
+        if (char === "e" && key.ctrl) {
+            moveCursorToLineEnd();
             return;
         }
         if (char === "j" && key.ctrl) {
             insertAtCursor("\n");
             return;
         }
-        // 换行：Ctrl+N（不依赖终端协议，兼容性最好）
-        if (char === "n" && key.ctrl) {
-            insertAtCursor("\n");
+        // Ctrl+P / Ctrl+N：历史上下（Claude Code 语义；换行改用 Ctrl+J / Alt+Enter）
+        if ((char === "p" && key.ctrl) || (char === "n" && key.ctrl)) {
+            const up = char === "p";
+            if (hints.length > 0) {
+                setMenuIndex((i) => (up ? (i - 1 + hints.length) % hints.length : (i + 1) % hints.length));
+                return;
+            }
+            if (up && history.length > 0) {
+                const idx = historyIndex.current < 0 ? history.length - 1 : Math.max(0, historyIndex.current - 1);
+                historyIndex.current = idx;
+                setInputText(history[idx]);
+            }
+            else if (!up && historyIndex.current >= 0) {
+                const idx = historyIndex.current + 1;
+                if (idx >= history.length) {
+                    historyIndex.current = -1;
+                    setInputText("");
+                }
+                else {
+                    historyIndex.current = idx;
+                    setInputText(history[idx]);
+                }
+            }
+            return;
+        }
+        // 按词删除：Alt+Backspace / Ctrl+Backspace 删前一个词；Alt+D / Ctrl+Delete 删后一个词。
+        // 必须在下面「单字符 Backspace/Delete」之前判定，否则带修饰键的删除只掉一个字符。
+        if (key.backspace && (key.ctrl || key.meta || key.super)) {
+            deleteWordBeforeCursor();
+            return;
+        }
+        if (key.delete && (key.ctrl || key.meta || key.super)) {
+            deleteWordAfterCursor();
+            return;
+        }
+        if (char === "d" && key.meta) {
+            deleteWordAfterCursor();
             return;
         }
         if (key.return) {
-            // 斜杠候选菜单可见时回车直接执行高亮命令，避免把半截输入（如仅 `/`）当命令提交
             void runSubmit(resolveSubmitText(input, hints, menuIndex));
             return;
         }
@@ -361,7 +642,6 @@ export function Chat(props) {
             return;
         }
         if (key.upArrow || key.downArrow) {
-            // Shift / Alt + ↑↓：单行滚动（优先于历史召回）
             if (key.shift || key.meta) {
                 scrollByLine(key.upArrow ? -1 : 1);
                 return;
@@ -370,7 +650,6 @@ export function Chat(props) {
                 setMenuIndex((i) => key.upArrow ? (i - 1 + hints.length) % hints.length : (i + 1) % hints.length);
                 return;
             }
-            // 历史召回
             if (key.upArrow && history.length > 0) {
                 const idx = historyIndex.current < 0 ? history.length - 1 : Math.max(0, historyIndex.current - 1);
                 historyIndex.current = idx;
@@ -389,21 +668,31 @@ export function Chat(props) {
             }
             return;
         }
-        // 光标移动：← → 单字符，Ctrl/Alt+← → 跨词，Home / End 到行首 / 行尾
         if (key.leftArrow) {
-            if (key.ctrl || key.meta)
+            if (key.ctrl || key.meta || key.super)
                 setCursor(wordLeft(input, cursor));
             else
                 moveCursor(-1);
             return;
         }
         if (key.rightArrow) {
-            if (key.ctrl || key.meta)
+            if (key.ctrl || key.meta || key.super)
                 setCursor(wordRight(input, cursor));
             else
                 moveCursor(1);
             return;
         }
+        // 跨词移动的「兜底键」：macOS 上 Option+←/→ 往往发的是 ESC b / ESC f
+        // （readline 的 backward-word / forward-word），并不带 leftArrow 标记；
+        // 而 Ctrl+←/→ 常被系统「Mission Control → 左右切换空间」截走，应用根本收不到。
+        if (char === "b" && key.meta) {
+            setCursor(wordLeft(input, cursor));
+            return;
+        }
+        if (char === "f" && key.meta) {
+            setCursor(wordRight(input, cursor));
+            return;
+        }
         if (key.home) {
             moveCursorToLineStart();
             return;
@@ -413,8 +702,13 @@ export function Chat(props) {
             return;
         }
         if (key.escape) {
-            setInputText("");
-            scrollToBottom();
+            // Claude Code：生成中 Esc = 中断本轮；否则清空草稿并回到底部
+            if (busy)
+                sessionRef.current?.abort();
+            else {
+                setInputText("");
+                scrollToBottom();
+            }
             return;
         }
         if (key.backspace) {
@@ -425,13 +719,72 @@ export function Chat(props) {
             deleteAfterCursor();
             return;
         }
-        if (char && !key.ctrl && !key.meta) {
+        if (char && !key.ctrl && !key.meta && !key.super) {
             insertAtCursor(char);
         }
-    }, { isActive: !confirmState && !pickerState && !wizardStep });
+    }, 
+    // 生成 / 自动迁移期间主输入框整体失活：此时输入框已被 Spinner 顶替，若仍激活，
+    // 按键会被静默吞进隐藏的输入缓冲、待本轮结束后才冒出来（即「迁移过程中输入框
+    // 没被拦住」）。失活后改由下方「忙碌期」处理器只放行中止 / 退出 / 回看滚动。
+    { isActive: !busy && !confirmState && !pickerState && !wizardStep });
+    // 忙碌期（生成 / 迁移中）专用：输入框不可编辑，仅保留「中止(Ctrl+C) / 退出(Ctrl+D) / 回看滚动」。
+    useInput((char, key) => {
+        keyDebug(char, key);
+        // 忙碌期只剩「中止 / 退出 / 回看」，滚轮同样生效（生成时正是最想往回看的时机）
+        const wheel = parseWheel(char);
+        if (wheel) {
+            scrollByWheel(wheel.direction);
+            return;
+        }
+        if (isTerminalReply(char))
+            return;
+        if (char === "c" && key.ctrl) {
+            sessionRef.current?.abort();
+            return;
+        }
+        if (key.escape) {
+            // 忙碌期 Esc 也充当「中断」（与 Claude Code 一致）
+            sessionRef.current?.abort();
+            return;
+        }
+        if (char === "d" && key.ctrl) {
+            const now = Date.now();
+            if (now - ctrlDAtRef.current < 800) {
+                void doExit();
+                return;
+            }
+            ctrlDAtRef.current = now;
+            noticeChannel.push("再按一次 Ctrl+D 退出");
+            return;
+        }
+        if (key.pageUp) {
+            scrollByPage(-1);
+            return;
+        }
+        if (key.pageDown) {
+            scrollByPage(1);
+            return;
+        }
+        if ((key.upArrow || key.downArrow) && (key.shift || key.meta || key.super)) {
+            scrollByLine(key.upArrow ? -1 : 1);
+            return;
+        }
+        if (char === "v" && (key.meta || key.super)) {
+            scrollByPage(-1);
+            return;
+        }
+        if (key.super && (char === "[" || char === "]")) {
+            scrollByPage(char === "[" ? -1 : 1);
+            return;
+        }
+        if (key.super && (char === ";" || char === "'")) {
+            scrollByLine(char === ";" ? -1 : 1);
+            return;
+        }
+    }, { isActive: busy && !confirmState && !pickerState && !wizardStep });
     // 配置向导：整屏接管（凭据设置 / 配置中心），关闭后回到对话屏
     if (wizardStep && wizardConfig) {
-        return (_jsx(ConfigWizard, { config: wizardConfig, initialStep: wizardStep, closeOnSave: wizardStep.kind !== "menu", agents: wizardAgents, mcp: wizardMcp ?? undefined, agentStore: wizardAgentStore ?? undefined, onSave: saveConfig, onSaveMcp: async (scope, cfg) => {
+        return (_jsx(ConfigWizard, { config: wizardConfig, reasoningPresets: wizardPresets, initialStep: wizardStep, closeOnSave: wizardStep.kind !== "menu", agents: wizardAgents, mcp: wizardMcp ?? undefined, agentStore: wizardAgentStore ?? undefined, onSave: saveConfig, onSaveMcp: async (scope, cfg) => {
                 await writeMcpConfig(cfg, scope);
             }, onClose: closeWizard }));
     }
@@ -440,16 +793,25 @@ export function Chat(props) {
         return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { color: theme.error, wrap: "truncate", children: ["\u2716 \u65E0\u6CD5\u542F\u52A8\u5BF9\u8BDD\uFF1A", bootError] }), _jsx(Text, { color: theme.dim, wrap: "truncate", children: "\u6309 k \u6253\u5F00\u914D\u7F6E\u4E2D\u5FC3\uFF08\u53EF\u8BBE\u7F6E API Key / \u7AEF\u70B9\u5730\u5740\uFF09\u00B7 Enter \u8FD4\u56DE" })] }));
     }
     const session = sessionRef.current;
-    const tokens = session?.lastUsage?.total_tokens;
+    const lastTokens = session?.lastUsage?.total_tokens;
+    const totalTokens = session?.totalUsage.total_tokens;
     const cols = columns ?? 80;
+    const messages = session?.messages ?? [];
+    const userCount = messages.filter((m) => m.role === AgentNS.Role.User).length;
+    const showPending = pendingUser != null && userCount <= pendingUser.base;
+    const transcript = transcriptLines(messages.slice(transcriptFrom), cols);
+    if (showPending) {
+        transcript.push(...messageToLines({ id: "__pending_user", role: AgentNS.Role.User, content: pendingUser.text }, cols));
+    }
+    const noticeTextLines = notice ? noticeLines(notice, cols) : [];
     const layout = computeChatLayout({
         columns: cols,
         rows: usableFrameRows(rows ?? 24),
-        blocks: state.blocks,
-        live: state.live,
+        transcript,
         input,
         busy,
         hintCount: hints.length,
+        noticeCount: noticeTextLines.length,
         overlay: confirmState ? "confirm" : pickerState ? "picker" : "none",
         pickerItems: pickerState?.items.length ?? 0,
         viewTop,
@@ -472,7 +834,7 @@ export function Chat(props) {
     else {
         setCursorPosition(undefined);
     }
-    return (_jsxs(Box, { flexDirection: "column", width: cols, children: [layout.lines.map((line) => (_jsx(LineView, { line: line }, line.key))), confirmState ? (_jsx(Confirm, { question: confirmState.question, onAnswer: resolveConfirm })) : pickerState ? (_jsx(PickerOverlay, { title: pickerState.title, items: pickerState.items, columns: cols, onPick: resolvePicker })) : (_jsxs(Box, { flexDirection: "column", children: [hints.length > 0 ? _jsx(SlashMenu, { hints: hints, selected: menuIndex }) : null, _jsx(Box, { paddingX: 1, children: _jsx(Text, { color: theme.border, wrap: "truncate", children: "─".repeat(Math.max(1, cols - 2)) }) }), _jsx(Box, { flexDirection: "column", paddingX: 1, children: busy ? (_jsx(Spinner, { label: "\u601D\u8003\u4E2D\u2026" })) : (bodyLines.map((line, i) => {
+    return (_jsxs(Box, { flexDirection: "column", width: cols, children: [layout.lines.map((line) => (_jsx(LineView, { line: line }, line.key))), confirmState ? (_jsx(Confirm, { question: confirmState.question, onAnswer: resolveConfirm })) : pickerState ? (_jsx(PickerOverlay, { title: pickerState.title, items: pickerState.items, columns: cols, onPick: resolvePicker })) : (_jsxs(Box, { flexDirection: "column", children: [noticeTextLines.length > 0 ? (_jsx(Box, { flexDirection: "column", paddingX: 1, children: noticeTextLines.map((line, i) => (_jsx(Text, { color: notice?.tone === "error" ? theme.error : theme.dim, wrap: "truncate", children: line }, i))) })) : null, hints.length > 0 ? _jsx(SlashMenu, { hints: hints, selected: menuIndex }) : null, _jsx(Box, { paddingX: 1, children: _jsx(Text, { color: theme.border, wrap: "truncate", children: "─".repeat(Math.max(1, cols - 2)) }) }), _jsx(Box, { flexDirection: "column", paddingX: 1, children: busy ? (_jsx(Spinner, { label: "\u601D\u8003\u4E2D\u2026" })) : (bodyLines.map((line, i) => {
                             const prompt = i === 0 ? (_jsx(Text, { color: theme.brand[0], bold: true, children: "❯ " })) : (_jsx(Text, { children: "  " }));
                             if (isPlaceholder) {
                                 return (_jsxs(Text, { wrap: "truncate", children: [prompt, _jsx(Text, { color: theme.faint, children: line }), i === bodyLines.length - 1 ? (_jsx(Text, { color: theme.brand[1], children: "\u258F" })) : null] }, i));
@@ -485,10 +847,10 @@ export function Chat(props) {
                                 return (_jsxs(Text, { wrap: "truncate", children: [prompt, _jsx(Text, { children: before }), _jsx(Text, { inverse: true, color: theme.brand[0], children: at ?? " " }), _jsx(Text, { children: after })] }, i));
                             }
                             return (_jsxs(Text, { wrap: "truncate", children: [prompt, _jsx(Text, { children: line })] }, i));
-                        })) })] })), _jsx(StatusBar, { model: props.modelId, agent: props.agentId ?? "default", tokens: tokens, busy: busy, hint: !ready
+                        })) })] })), _jsx(StatusBar, { model: modelId, agent: props.agentId ?? "default", effort: effortText, lastTokens: lastTokens, totalTokens: totalTokens, busy: busy, hint: !ready
                     ? "初始化中…"
                     : layout.scrolled
                         ? "↕ 滚动中 · PgUp/PgDn 翻页 · 发送回到底部"
-                        : "Enter 发送 · Ctrl+N 换行 · / 命令 · PgUp 看历史" })] }));
+                        : "Enter 发送 · Ctrl+J 换行 · / 命令 · PgUp 看历史" })] }));
 }
 //# sourceMappingURL=chat.js.map