mocode-ai 1.7.2 → 1.7.4

package/dist/tools/builtins/index.js

@@ -25,6 +25,7 @@ import { subAgentTool } from './task.js';
 import { arenaTool } from './arena.js';
 import { messageBusTool } from './message-bus.js';
 import { computerTool } from './computer.js';
+import { runFlowTool } from './run-flow.js';
 import { sessionSearchTool } from './session-search.js';
 /**
  * 所有内置工具,按注册顺序排列。
@@ -86,6 +87,8 @@ export const CAPABILITIES = {
     // computer 桌面操控:桌面状态全局唯一,任何两个 computer 调用都不允许并发;
     // effect=process(不写工作区文件,不触发 rollback/diff 追踪),supportsAbort 中断长 wait/拖拽。
     computer: { effect: 'process', concurrency: 'serial', resources: () => ['desktop'], supportsAbort: true },
+    // run_flow 回放录制的桌面流程:内部直接驱动 computer,同样独占 desktop 资源,可中断。
+    run_flow: { effect: 'process', concurrency: 'serial', resources: () => ['desktop'], supportsAbort: true },
     // sub-agent 与主 agent 同权,直接写工作区(无 overlay)。编排器本身不持锁——锁由嵌套工具
     // 各自获取,否则子 agent 内的 run_command 会等父持有的 workspace 锁而自锁。
     // parallelOrchestration:同一轮派发的多个子 agent 按 subAgentConcurrency 上限成批并行
@@ -133,6 +136,7 @@ const rawBuiltinTools = [
     arenaTool,
     messageBusTool,
     computerTool,
+    runFlowTool,
     sessionSearchTool,
 ];
 /** 所有内置工具均携带显式能力；新增工具遗漏声明时 registry 会保守串行。 */

package/dist/tools/builtins/run-flow.js

@@ -0,0 +1,123 @@
+/**
+ * run_flow 工具:回放 `.mocode/flows/<name>.json` 里录制好的桌面流程(design-notes/computer-use-rpa.md §5.3)。
+ *
+ * 与逐步调用 computer 的区别:整条流程不经过模型,按录制的 selector 现场定位元素,失败按步骤的
+ * onError 策略重试 / 跳过 / 中止 / 交还模型。权限在整条 flow 层面一次做完(permissions/flow-review.ts):
+ * 指纹绑定 flow 文件 hash,敏感 flow 强制逐次确认——回放内部的单步不再弹窗。
+ */
+import { runFlow, formatFlowRunResult, } from '../../flows/runner.js';
+import { loadFlow } from '../../flows/flow.js';
+import { withTraceSuspended } from '../../flows/trace.js';
+import { computerTool, resolveSelectorToRef, resolveWindowForReplay } from './computer.js';
+function abortableSleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(new Error('aborted'));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(new Error('aborted'));
+        };
+        const timer = setTimeout(() => {
+            signal?.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        signal?.addEventListener('abort', onAbort, { once: true });
+    });
+}
+/** 生产环境的 RunnerDeps:把 runner 接到 computer 工具与 UIA 定位上。 */
+export function createComputerRunnerDeps(signal) {
+    return {
+        async execute(args, sig) {
+            const r = await computerTool.execute(args, { signal: sig });
+            if (typeof r === 'string')
+                return { status: 'success', output: r };
+            return { status: r.status, code: r.code, output: r.output, modelAttachments: r.modelAttachments };
+        },
+        resolveRef: resolveSelectorToRef,
+        resolveWindow: resolveWindowForReplay,
+        sleep: abortableSleep,
+        signal,
+    };
+}
+/** run_flow 工具与 `/flow run` 共用的回放入口;回放期间暂停 trace 录制。 */
+export function runFlowWithComputer(flow, params, signal, options) {
+    return withTraceSuspended(() => runFlow(flow, params, createComputerRunnerDeps(signal), options));
+}
+export const runFlowTool = {
+    name: 'run_flow',
+    description: 'Replay a recorded desktop flow (.mocode/flows/<name>.json) without step-by-step model calls. ' +
+        'Elements are re-located by their recorded UI Automation selector, so the flow survives moved windows; ' +
+        'steps without a selector use recorded coordinates and are only as reliable as the window layout. ' +
+        'A failing step is retried, then skipped, aborted, or handed back to you (default: retry once, then hand back with the current screenshot). ' +
+        'Pass values for the flow\'s declared parameters in "params". Browse available flows with glob/read_file on .mocode/flows/. ' +
+        'The user is asked to approve each run; flows that type sensitive text always need per-run approval.',
+    risk: 'dangerous',
+    parameters: {
+        type: 'object',
+        properties: {
+            name: { type: 'string', description: 'Flow name (file name without .json).' },
+            params: {
+                type: 'object',
+                description: 'Values for the flow parameters, e.g. {"text_3": "hello"}. Unknown or missing required parameters are rejected.',
+                additionalProperties: { type: ['string', 'number', 'boolean'] },
+            },
+            window_title_regex: {
+                type: 'string',
+                description: 'Optional case-insensitive regex that overrides the recorded window title match for every window/element step. ' +
+                    'Use it when several windows of the same app are open (e.g. two Notepad windows) so the target is unambiguous.',
+            },
+        },
+        required: ['name'],
+        additionalProperties: false,
+    },
+    async execute(args, ctx) {
+        const name = typeof args.name === 'string' ? args.name.trim() : '';
+        const loaded = loadFlow(name);
+        if (!loaded.ok) {
+            return { status: 'error', code: 'INVALID_ARGUMENTS', retryable: false, output: loaded.error };
+        }
+        const params = args.params && typeof args.params === 'object' && !Array.isArray(args.params)
+            ? args.params
+            : undefined;
+        let windowTitleRegex;
+        if (args.window_title_regex !== undefined) {
+            const raw = args.window_title_regex;
+            if (typeof raw !== 'string' || raw.trim() === '') {
+                return {
+                    status: 'error',
+                    code: 'INVALID_ARGUMENTS',
+                    retryable: false,
+                    output: 'window_title_regex must be a non-empty regex string',
+                };
+            }
+            try {
+                new RegExp(raw, 'i');
+            }
+            catch {
+                return {
+                    status: 'error',
+                    code: 'INVALID_ARGUMENTS',
+                    retryable: false,
+                    output: `window_title_regex is not a valid regular expression: ${raw}`,
+                };
+            }
+            windowTitleRegex = raw;
+        }
+        const result = await runFlowWithComputer(loaded.flow, params, ctx?.signal, { windowTitleRegex });
+        const output = formatFlowRunResult(loaded.flow, result);
+        const modelAttachments = result.attachments;
+        switch (result.status) {
+            case 'completed':
+                return { status: 'success', code: 'OK', retryable: false, output, modelAttachments };
+            case 'aborted':
+                return { status: 'aborted', code: 'ABORTED', retryable: false, output };
+            case 'rejected':
+                return { status: 'error', code: 'INVALID_ARGUMENTS', retryable: false, output };
+            default:
+                // handoff / failed:不自动重试(步骤级重试已在 runner 内做过),由模型接手或报告。
+                return { status: 'error', code: 'POSTCONDITION_FAILED', retryable: false, output, modelAttachments };
+        }
+    },
+};

package/dist/tools/constants.js

@@ -149,6 +149,7 @@ export const PLAN_DISABLED_TOOLS = new Set([
     'sub-agent',
     'run_skill', // fork 子 agent 执行面;plan 模式不应派生子工作流
     'computer', // 桌面操控:plan 只读模式无论开关状态都永远屏蔽
+    'run_flow', // 回放录制的桌面 flow:同 computer,plan 模式永远屏蔽
 ]);
 /**
  * Legacy plan schema 的动态清理：Memory Index 关闭时从旧 profile 屏蔽集删除不存在于该

package/dist/tools/router.js

@@ -210,7 +210,7 @@ Routing rules:
 - background-exec is for any process that must keep running after the tool call returns: dev servers, inference/model services, watchers, log tails, or a command you will poll later. Foreground run_command blocks and is killed at its timeout, so it cannot host them.
 - Web UI DOM/console/network/page sessions need browser-debug; a local web server alone only needs background-exec.
 - Merely observing system dialogs or non-browser windows needs desktop-observe.
-- computer-control requires explicit real GUI clicking, typing, scrolling, or desktop application operation; never infer it from the word "browser" alone.
+- computer-control requires explicit real GUI clicking, typing, scrolling, or desktop application operation, including replaying a recorded desktop flow (run_flow); never infer it from the word "browser" alone.
 - memory-write requires explicit intent to remember, update, forget, or link cross-session knowledge.
 - orchestration is for exploration-heavy or parallelizable work: open-ended codebase investigation, multi-file research or audits, independent sub-tasks that can run in parallel, or a fork skill. Prefer it whenever the task needs substantial exploration whose tool output would flood the main context; a single trivial lookup does not need it.
 - For short continuations such as "continue", "do it", or "fix that", inherit previous groups unless the user clearly starts a new task.

package/dist/tools/validation.js

@@ -72,6 +72,62 @@ function formatErrors(errors, schema) {
     }
     return body + hint;
 }
+/** 弱模型/中转网关对嵌套结构不稳定的序列化产物:array/object 被整体 JSON.stringify
+ * 成字符串塞进外层 JSON(如 plan_update {"steps":"[{...}]"},真实会话 2026-10-09)。
+ * AJV coerceTypes 只覆盖标量(number/integer/boolean),不做 string→array/object 转换,
+ * 模型会反复撞 "/steps must be array" 乒乓失败。
+ *
+ * 按 schema 声明反向还原:仅在字段声明为 array/object 且实际值是形似 JSON 的字符串
+ * ([ 或 { 开头)且能成功 parse 出对应类型时替换;parse 失败/类型不符保持原值,
+ * 照旧由 schema 校验报原始错误——不吞错误、不造数据。递归一层嵌套对象
+ * (如 ask_human options、plan_update steps 的 items),数组元素本身不再深递归
+ * (元素级偏差交给各工具自己的 normalizeArguments 别名归一)。
+ */
+function coerceStringifiedContainers(schema, args) {
+    const properties = schema?.properties;
+    if (!properties)
+        return;
+    for (const [key, declared] of Object.entries(properties)) {
+        const raw = args[key];
+        if (typeof raw !== 'string')
+            continue;
+        const trimmed = raw.trim();
+        const type = declared.type;
+        const looksLike = type === 'array' ? trimmed.startsWith('[') : type === 'object' ? trimmed.startsWith('{') : false;
+        if (!looksLike)
+            continue;
+        let parsed;
+        try {
+            parsed = JSON.parse(trimmed);
+        }
+        catch {
+            continue;
+        }
+        const typeMatches = type === 'array'
+            ? Array.isArray(parsed)
+            : typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed);
+        if (typeMatches)
+            args[key] = parsed;
+    }
+    // 递归一层:已还原/本来就是 object 的字段,其属性级偏差同样还原(如 steps[i] 里的数组字段)。
+    for (const [key, declared] of Object.entries(properties)) {
+        const child = args[key];
+        if (typeof child !== 'object' || child === null)
+            continue;
+        const childSchema = declared.properties;
+        if (childSchema && !Array.isArray(child)) {
+            coerceStringifiedContainers(declared, child);
+        }
+        const itemSchema = declared.items;
+        if (Array.isArray(child) && itemSchema && typeof itemSchema === 'object') {
+            for (const element of child) {
+                if (typeof element === 'object' && element !== null && !Array.isArray(element)) {
+                    coerceStringifiedContainers(itemSchema, element);
+                }
+            }
+        }
+    }
+}
 /** Validate after tool-local normalization; AJV coerces scalar strings to declared types. */
 export function validateToolArguments(tool, args) {
     if (!args || typeof args !== 'object' || Array.isArray(args)) {
@@ -81,6 +137,7 @@ export function validateToolArguments(tool, args) {
             message: '参数根节点必须是 JSON object',
         };
     }
+    coerceStringifiedContainers(tool.parameters, args);
     try {
         tool.normalizeArguments?.(args);
     }

package/dist/ui/composer.js

@@ -433,13 +433,16 @@ export async function promptComposer(opts = {}) {
         // 底边框
         buf += CUP(boxBottom, left);
         buf += `${ui.accent}╰${'─'.repeat(innerW)}╯${ui.reset}`;
-        // 光标(滚轮翻看把光标滚出可视区时不画,防 CUP 落到边框/提示行上)
+        // 光标(滚轮翻看把光标滚出可视区时不画,防 CUP 落到边框/提示行上)。
+        // 同步上报给 layout:运行态底栏照常刷新,每次写完据此把光标还给弹窗(而非底栏输入框)。
+        let caret = null;
         const cr = rows[cIdx];
         if (cr) {
             const rowIdx = cIdx - scrollRow;
             if (rowIdx >= 0 && rowIdx < textRows) {
                 const vis = displayWidth([...cr.text].slice(0, cur.col - cr.start).join(''));
-                buf += CUP(textTop + rowIdx, left + 1 + vis) + SHOW;
+                caret = { row: textTop + rowIdx, col: left + 1 + vis };
+                buf += CUP(caret.row, caret.col) + SHOW;
             }
             else {
                 buf += SHOW;
@@ -448,6 +451,7 @@ export async function promptComposer(opts = {}) {
         else {
             buf += SHOW;
         }
+        layout.setOverlayCaret(caret);
         try {
             layout.writeDirect(buf);
         }

package/dist/ui/layout-internal/content-write.js

@@ -185,7 +185,8 @@ export function contentWrite(s) {
     // 物理写(回尾 offset=0):cup 写起点 + s + (pending 时补 \n 提交换行)+ (运行态 cup 回输入框)。
     // 打字中不再暂停物理写——单次 write 结尾 cup 回 runningCaretPos(输入框),IME 锚定不动(跟踪每次 write
     // 最终位置);旧设计 isStreamingPaused 暂停写致流式卡顿,现单次写归位已无需暂停。
-    if (state.scrollOffset === 0) {
+    // 覆盖层(composer)打开中:只喂缓冲不物理写,关闭后 repaintViewport 整幅还原。
+    if (state.scrollOffset === 0 && !state.overlayActive) {
         let out = cup(startRow, startCol) + s;
         if (pendingWrap)
             out += '\n'; // 滚动区域底行触发 DECSTBM 上滚、中段 LF 下移到 (下一行,1)
@@ -229,7 +230,7 @@ function commitMd() {
 // 应让 buffer 顶部始终是「最新的一份 banner」,而不是堆 5 份。
 // rewriteBanner 在 banner 已建好时原地等长替换顶部 bannerH 行,viewport 自动从 rows[] 头读新版。
 //
-// bannerH = bannerLines(banner()) 的行数(目前 5:4 行 logo+info + 1 空行分隔)。如未来
+// bannerH = bannerLines(banner()) 的行数(目前 7:6 行 logo+info + 1 空行分隔)。如未来
 // bannerString 变化,调用方需重调 writeBanner 重设 bannerH。
 /**
  * 在 content 缓冲顶部建一份 banner;**首次**调用建好(bannerH = lines.length),**重复**调用
@@ -318,7 +319,7 @@ function renderMdSegment() {
         }
     }
     state.mdLastRenderAt = Date.now();
-    if (state.scrollOffset === 0) {
+    if (state.scrollOffset === 0 && !state.overlayActive) {
         repaintViewport(); // 单次 write 结尾 cup 回 runningCaretPos(运行态),IME 锚输入框;打字中不再暂停
         if (state.mode === 'running') {
             const p = runningCaretPos();
@@ -503,15 +504,79 @@ export function renderWelcomeRows(lines, cols) {
         return ' '.repeat(Math.floor((cols - w) / 2)) + line;
     });
 }
-/** 写欢迎引导块(逻辑行经 renderWelcomeRows 居中后写入,contentWrite 兜底折行);已在屏上则跳过。 */
+/** 逻辑行折行后占的物理行数(可见宽度 ≥ cols 的行由 contentWrite 折行;空行占 1 行)。 */
+function welcomePhysicalRows(lines, cols) {
+    let n = 0;
+    for (const line of lines)
+        n += Math.max(1, Math.ceil(ansiDisplayWidth(line) / Math.max(1, cols)));
+    return n;
+}
+/**
+ * 让欢迎块「banner + 块」放得进内容区,否则 viewport 取缓冲尾窗会把顶部 logo 挤出屏外
+ * (矮窗口 / 折行多时 logo 不再置顶)。放不下时按段(空行分隔)舍弃:先从末段往前丢,
+ * 首段(原生终端提示)优先级最低、其后丢,「快速上手」段最后丢;连一段都放不下则返回 [](不写块)。
+ * 预留 1 行余量:块末换行不能把续写位推出内容区底而触发滚动。
+ */
+export function fitWelcomeLines(lines, cols, contentBottom, bannerH) {
+    const budget = contentBottom - bannerH - 1;
+    if (welcomePhysicalRows(lines, cols) <= budget)
+        return [...lines];
+    // 按空行切段(段内不含空行),重组时用 '' 分隔并首尾各补一个 '',与 welcomeLines 的版式一致
+    const groups = [];
+    let cur = [];
+    for (const line of lines) {
+        if (line === '') {
+            if (cur.length > 0)
+                groups.push(cur);
+            cur = [];
+        }
+        else {
+            cur.push(line);
+        }
+    }
+    if (cur.length > 0)
+        groups.push(cur);
+    // 丢弃顺序:末段 → … → 第 3 段,然后首段,最后第 2 段
+    const dropOrder = [];
+    for (let i = groups.length - 1; i >= 2; i--)
+        dropOrder.push(i);
+    if (groups.length >= 1)
+        dropOrder.push(0);
+    if (groups.length >= 2)
+        dropOrder.push(1);
+    const alive = new Set(groups.map((_, i) => i));
+    const build = () => {
+        const out = [''];
+        for (let i = 0; i < groups.length; i++) {
+            if (!alive.has(i))
+                continue;
+            out.push(...groups[i], '');
+        }
+        return out;
+    };
+    for (const idx of dropOrder) {
+        alive.delete(idx);
+        if (alive.size === 0)
+            return [];
+        const built = build();
+        if (welcomePhysicalRows(built, cols) <= budget)
+            return built;
+    }
+    return [];
+}
+/** 写欢迎引导块(逻辑行经 fit 裁剪 + renderWelcomeRows 居中后写入,contentWrite 兜底折行);已在屏上则跳过。 */
 export function writeWelcomeBlock(lines) {
     if (!state.active || !ui.isTTY || lines.length === 0)
         return;
     if (state.welcomeRows > 0)
         return; // 已在屏上,不重复写
+    const g = getGeo();
+    const fitted = fitWelcomeLines(lines, g.cols, g.contentBottom, state.bannerH);
+    if (fitted.length === 0)
+        return; // 窗口太矮:宁可不画,也别把顶部 logo 挤出屏
     state.welcomeSource = [...lines];
     state.welcomeStart = content.committedRows();
-    contentWrite(renderWelcomeRows(lines, getGeo().cols).join('\n') + '\n');
+    contentWrite(renderWelcomeRows(fitted, g.cols).join('\n') + '\n');
     state.welcomeRows = content.committedRows() - state.welcomeStart;
 }
 /**
@@ -547,7 +612,10 @@ function reflowWelcomeBlockForResize(cols) {
     const g = getGeo();
     state.contentRow = Math.min(start + 1, g.contentBottom);
     state.contentCol = 1;
-    contentWrite(renderWelcomeRows(source, cols).join('\n') + '\n');
+    // 与 writeWelcomeBlock 同口径先 fit:窗口变矮后按新高度裁剪,避免把顶部 logo 挤出屏。
+    const fitted = fitWelcomeLines(source, cols, g.contentBottom, state.bannerH);
+    if (fitted.length > 0)
+        contentWrite(renderWelcomeRows(fitted, cols).join('\n') + '\n');
     state.welcomeRows = content.committedRows() - start;
     const newLines = [];
     for (let i = start; i < start + state.welcomeRows; i++)

package/dist/ui/layout-internal/core.js

@@ -103,8 +103,11 @@ export function setUserActive() {
         if (state.active && state.mode === 'running' && state.scrollOffset === 0) {
             repaintViewport(); // 重画内容区(显示活跃期间缓冲的流式内容)
             drawStatusBar(); // 刷状态行(活跃期间冻住,现恢复)
-            const p = runningCaretPos();
-            stdout.write(cup(p.row, p.col));
+            // 覆盖层(composer)打开中:光标归属弹窗(drawStatusBar 已归位到 overlayCaret),不能拽回底栏输入框
+            if (!state.overlayActive) {
+                const p = runningCaretPos();
+                stdout.write(cup(p.row, p.col));
+            }
         }
     }, USER_ACTIVE_PAUSE_MS);
     state.flushTimer.unref();
@@ -141,6 +144,19 @@ export function setCursorChangeHandler(fn) {
 export function setOverlayMouseHandler(fn) {
     state.overlayMouseHandler = fn;
 }
+/**
+ * 标记全屏覆盖层(运行态 composer)开/关。开启期间内容区 / 状态行 / spinner 帧只喂缓冲不物理写,
+ * 防流式输出与 80ms 心跳覆盖弹窗。关闭后由调用方 repaintViewport + drawStatusBar 整幅还原。
+ */
+export function setOverlayActive(v) {
+    state.overlayActive = v;
+    if (!v)
+        state.overlayCaret = null;
+}
+/** 覆盖层(composer)每次 paint 上报自己的光标位;overlay 期间底栏刷新后光标归还此处。null = 不归位。 */
+export function setOverlayCaret(pos) {
+    state.overlayCaret = pos;
+}
 /** picker / 介入面板期间禁用鼠标选区与拖拽(避免 viewport 重画覆盖菜单);滚轮仍可用。面板退出后恢复。 */
 export function setMouseEnabled(v) {
     state.mouseEnabled = v;
@@ -175,10 +191,13 @@ export function setMouseEnabled(v) {
 function setInputCursorFromClick(screenRow, screenCol) {
     if (!state.active || !state.base || !state.lastView)
         return;
-    // running 态:先收归输入态(enterInputMode 会 paintInput 整帧重画;之后我们再按新光标重画一次覆盖即可)
-    if (state.mode !== 'input') {
-        enterInputMode(state.statusText);
-    }
+    // 调用方守卫保证:仅 INPUT 态或介入面板(cursorChangeHandler 已注册)到达此处。
+    // 历史行为是 running 态先 enterInputMode 收归输入态——这会把 RUNNING 击穿成 INPUT:
+    // 走时/实时 token chip 的显示门(state.mode==='running')同时熄灭,而 spinner 自身的
+    // 80ms 心跳不知道 mode 变了,drawStatusBar 走 INPUT 分支把真光标 cup 到内容区续写位,
+    // 产生「点击后 agent 输出区底部闪光标 + 走时消失」的复合 bug。运行态点击输入框已改为
+    // handleMouseEvent 直接 no-op(键盘 ←/→/Home/End 仍可定位 typeahead 光标);
+    // 介入面板期间不切 mode(面板退出后 startTurnTimerIfRunning 才能恢复走时心跳)。
     const pos = inputScreenToInputPos(screenRow, screenCol);
     if (!pos) {
         paintInput(state.lastView);
@@ -219,9 +238,14 @@ function handleMouseEvent(e) {
         scrollWheel(e.dir);
         return;
     }
-    // 输入行左键点击:即使 mouseEnabled=false(如 intervention 面板期间)也允许定位光标,
-    // 提升用户体验(点哪插哪)。拖拽/右键/内容区点击仍受 mouseEnabled 限制。
+    // 输入行左键点击:INPUT 态(含 intervention 面板,其 cursorChangeHandler 已注册)允许定位光标,
+    // 提升用户体验(点哪插哪)。RUNNING 态直接 no-op——光标定位是 INPUT 态交互,运行态
+    // typeahead 由键盘体系管理(←/→/Home/End,running-input.ts),不应触发模式切换(见
+    // setInputCursorFromClick 注释)。mouseEnabled=false 期间(面板)仍走定位分支。
+    // 拖拽/右键/内容区点击仍受 mouseEnabled 限制。
     if (e.button === 0 && e.type === 'press' && isInputRow(e.row)) {
+        if (state.mode === 'running' && !state.cursorChangeHandler)
+            return; // 运行态无文本所有者:点击不改光标
         setInputCursorFromClick(e.row, e.col);
         const pos = inputScreenToInputPos(e.row, e.col);
         if (pos) {

package/dist/ui/layout-internal/screen.js

@@ -126,3 +126,7 @@ export function contentMode() {
 export function isStreamingPaused() {
     return state.mode === 'running' && Date.now() < state.userActiveUntil;
 }
+/** 覆盖层(composer)是否打开:是则各物理写路径跳过写屏(缓冲照常更新),关闭后由调用方整幅重画。 */
+export function isOverlayActive() {
+    return state.overlayActive;
+}

package/dist/ui/layout-internal/scroll.js

@@ -41,8 +41,8 @@ export function screenRowToAbsLine(row) {
  * 直接跳过刷新(冻结视口),而非在这里猜屏幕映射。
  */
 export function repaintContentLine(absIdx, line) {
-    if (!state.active)
-        return;
+    if (!state.active || state.overlayActive)
+        return; // 覆盖层打开中不写屏(缓冲已由调用方更新)
     const g = getGeo();
     const row = absIdx - viewportAbsStart() + 1;
     if (row < 1 || row > g.contentBottom)
@@ -73,7 +73,9 @@ export function repaintContentLine(absIdx, line) {
  * 提示「↑ 这是上方滚走的内容」,不与内容区行内 SGR 冲突。
  */
 export function repaintViewport() {
-    if (!state.active)
+    // 覆盖层(composer)打开中不写屏:setUserActive 的 flush 定时器等路径会调到这里,整幅重画会盖掉弹窗;
+    // 关闭方先 setOverlayActive(false) 再 repaintViewport 还原。
+    if (!state.active || state.overlayActive)
         return;
     const g = getGeo();
     const h = g.contentBottom;

package/dist/ui/layout-internal/state.js

@@ -94,4 +94,10 @@ export const state = {
      *  返回 true = 已消费(不再走 layout 默认处理);弹窗自己消费全部事件,
      *  防止背景选区/翻页触发 repaintViewport 重画覆盖弹窗。传 null 注销。 */
     overlayMouseHandler: null,
+    /** 全屏覆盖层(composer 输入面板)打开中:内容区 / 状态行 / spinner 帧只喂缓冲不物理写,
+     *  防运行态流式输出与心跳覆盖弹窗、抢走弹窗光标。关闭方负责 repaintViewport 整幅还原。 */
+    overlayActive: false,
+    /** 覆盖层自报的真光标位(1-based 屏坐标;null = 未报/光标不在可视区)。overlay 期间 drawStatusBar
+     *  照常刷底栏,但末尾 cup 回这里而非 runningCaretPos,防 80ms 心跳把弹窗光标拽到底栏输入框。 */
+    overlayCaret: null,
 };

package/dist/ui/layout-internal/statusbar.js

@@ -200,6 +200,8 @@ export function composePlanLines(status, cols) {
 export function drawStatusBar(status) {
     if (!state.active || !state.base)
         return;
+    // 覆盖层(composer)打开中照常刷底栏:弹窗只占内容区(2..contentBottom-1),底栏行在其外不冲突;
+    // 仅末尾光标归位改为弹窗自报位(见下),防 80ms 心跳把弹窗光标拽到底栏输入框。
     const s = status ?? { ...state.base, status: state.statusText, spinnerFrame: state.spinnerFrame };
     const g = getGeo();
     const planLines = composePlanLines(s, g.cols);
@@ -228,7 +230,12 @@ export function drawStatusBar(status) {
         cup(modelRow, 1) +
         esc.clearLine +
         composeModelLine(s, g.cols);
-    if (state.mode === 'running') {
+    if (state.overlayActive) {
+        // 覆盖层打开中:光标还给弹窗自报位(未报/光标滚出可视区时不归位,由弹窗下次 paint 自行定位)
+        if (state.overlayCaret)
+            out += cup(state.overlayCaret.row, state.overlayCaret.col);
+    }
+    else if (state.mode === 'running') {
         // 运行态(回尾 / 滚动回看均):cup 回输入框光标位(供 IME 锚定)。
         const p = runningCaretPos();
         out += cup(p.row, p.col);
@@ -283,6 +290,8 @@ export function startTurnTimerIfRunning() {
  * 打字暂停态(isStreamingPaused)spinner 不画帧——恢复 557e678 前的 spinner 隐形行为(只关 spinner,不动 contentWrite)。
  */
 export function paintLiveAtCursor(text) {
+    if (state.overlayActive)
+        return; // 覆盖层(composer)打开中:不画帧(否则 80ms 心跳覆盖弹窗、抢光标)
     if (!state.active || !ui.isTTY || state.scrollOffset !== 0 || isStreamingPaused()) {
         // 滚动态 / 暂停态:不画新帧。但若有旧帧残留(frameRow),必须清掉——
         // 否则旧 spinner 帧停在历史视图某行,用户看到「思考中」卡在消息堆里(根因)。
@@ -339,6 +348,12 @@ export function clearLiveAtCursor() {
         return;
     if (!state.frameRow)
         return; // 没画过就不清(避免误清当前续写位内容)
+    if (state.overlayActive) {
+        // 覆盖层打开中:帧不在缓冲里,关闭后 repaintViewport 整幅重画自然抹掉;此处不写屏,只清记录
+        state.frameRow = 0;
+        state.frameCol = 0;
+        return;
+    }
     // 滚动态也清:旧帧不该残留。清"画过的行"(frameRow),回尾后该行由 repaintViewport 重画历史内容。
     // resize 后 contentBottom 可能缩小:frameRow 钳到可视区,避免 cup 到屏外行清错位置。
     const g = getGeo();

package/dist/ui/render.js

@@ -326,12 +326,17 @@ export function wrapByDisplayWidth(text, width) {
     return out;
 }
 const MARGIN = '  '; // 盒外左缩进
-// ── MoCode 块字符 logo(4 行,neofetch 风)──
-const LOGO_W = 35; // logo 区显示宽度
+// ── MoCode 块字符 logo(6 行,neofetch 风)──
+const LOGO_W = 35; // logo 区显示宽度(字母 30 + 5 格留白)
 const LOGO_GAP = 0; // logo 与信息区之间的间隔
-// 块字符画 4 行:M / o / C / o / d / e,块字符上半/下半合并两个 ASCII 行
+// 块字符画:M / o / C / o / d / e,块字符上半/下半合并两个 ASCII 行(后 4 行);
+// 第一个 o(第 6-9 列)头上坐着早期版本(6be25e8)的作者小人,眼睛 ◑(右半实心)朝右看。
+// 屁股 ╰ 落在 o 顶边上半块 █▀▀█(贴格子顶,无半格空隙);腿 ──── 往右伸,脚 ＯＯ 在第 11-14 列。
+// 腿与 d 的升部 ▄(第 24 列)同一行
 const LOGO_LINES = [
-    '                        ▄     ',
+    '      [◕ᴗ◕]',
+    '     ●|   |●',
+    '       ＯＯ             ▄     ',
     '█▀█▀█ █▀▀█ ▄▄▄▄ ▄▄▄▄ ▄▄▄█ ▄▄▄▄',
     '█ █ █ █  █ █  ▀ █  █ █  █ █▄▄█',
     '▀ ▀ ▀ ▀▀▀▀ █▄▄█ █▄▄█ █▄▄█ █▄▄▄',
@@ -353,17 +358,20 @@ function memoryValue(on) {
     return on ? `${ui.accent}${memoryLabel(on)}${ui.reset}` : `${ui.dim}${memoryLabel(on)}${ui.reset}`;
 }
 /** 横幅纯文本(带 ANSI 颜色,不写出)——供 TUI 经 contentWrite 写入内容区以跟踪续写位。
- *  布局:大字 logo(4 行,块字符)左对齐,右侧并排放标题/信息(neofetch 风)。 */
+ *  布局:大字 logo(6 行:小人 2 行 + 脚/升部 1 行 + 字母 3 行)左对齐,
+ *  标题/信息并排放在后 4 行右侧(neofetch 风),小人头/身两行右侧留空。 */
 export function bannerString(info) {
     const title = `${ui.bold}${ui.accent}●  MoCode${ui.reset}  ${ui.dim}v${VERSION}${ui.reset}`;
     const labels = [t('banner.model'), t('banner.directory'), t('banner.memory')];
     // 标签列按当前语言最长文本动态定宽，并至少留两个空格；中文保持原 6 列，英文扩至 11 列。
     const labelWidth = Math.max(...labels.map(displayWidth)) + 2;
     const rows = [
-        logoLine(0) + title,
-        logoLine(1) + labelContent(labels[0], info.model, labelWidth),
-        logoLine(2) + labelContent(labels[1], truncateDisplay(info.cwd, 48), labelWidth),
-        logoLine(3) + labelContent(labels[2], memoryValue(info.memoryEnabled), labelWidth),
+        logoLine(0),
+        logoLine(1),
+        logoLine(2) + title,
+        logoLine(3) + labelContent(labels[0], info.model, labelWidth),
+        logoLine(4) + labelContent(labels[1], truncateDisplay(info.cwd, 48), labelWidth),
+        logoLine(5) + labelContent(labels[2], memoryValue(info.memoryEnabled), labelWidth),
     ];
     return rows.map((r) => MARGIN + r).join('\n') + '\n\n';
 }
@@ -383,8 +391,8 @@ export function printBanner(info) {
  */
 export function bannerLines(info) {
     const raw = bannerString(info);
-    // bannerString 形如 "行1\n行2\n行3\n行4\n",split('\n') 长度 = 5(末尾 \n 后空串)
-    // 行集合真实包含 4 行(4 行 logo+info);filter(Boolean?) 不可 — 空行也要算
+    // bannerString 形如 "行1\n…\n行6\n\n",末尾 \n 后切出一个尾空串
+    // 行集合 = 6 行 logo+info + 1 空行分隔;filter(Boolean?) 不可 — 空行也要算
     // 仅过滤最后那个 \n 切出的尾空
     const split = raw.split('\n');
     const lines = split.length > 0 && split[split.length - 1] === '' ? split.slice(0, -1) : split;