mocode-ai 1.6.4 → 1.6.5

package/dist/ui/hierarchical-picker.js

@@ -0,0 +1,302 @@
+/**
+ * 层级模糊选择器（#模型命令交互·两级浏览）。
+ *
+ * 一个按层级浏览的选择器（厂商 → 模型），搜索栏是**作用域内过滤**，不跨层：
+ *  - 顶层（厂商列表）：打字只匹配**厂商名**，Enter 钻入选中厂商。
+ *  - 进入厂商后：打字只匹配**该厂商下的模型名**，Enter 确认模型；Backspace 回厂商。
+ * 不会把模型和厂商混在一个搜索结果里。
+ *
+ * 交互契约：
+ *  - 可打印字符      追加到过滤词，实时过滤当前层级
+ *  - ↑/↓            移动高亮（循环；跳过禁用项）
+ *  - Enter          分支钻入 / 叶子确认
+ *  - Backspace       编辑过滤词；词为空时退回上一层
+ *  - Esc             先清过滤词 → 再退回上一层 → 顶层则取消
+ *  - Ctrl+C          取消，返回 null
+ *  - Ctrl+U          清空过滤词
+ */
+import { stdin } from 'node:process';
+import { ui } from './theme.js';
+import { displayWidth, truncateDisplay } from './render.js';
+import * as layout from './layout.js';
+import { fuzzyMatch } from './fuzzy.js';
+/** 深度优先拍平整棵树（含分支与叶子）。纯函数，导出供单测/外部复用。 */
+export function flattenTree(roots) {
+    const out = [];
+    const walk = (nodes, path, ancestorLabels) => {
+        nodes.forEach((node, i) => {
+            const here = [...path, i];
+            out.push({ node, path: here, crumb: ancestorLabels.join(' › ') });
+            if (node.children && node.children.length) {
+                walk(node.children, here, [...ancestorLabels, node.label]);
+            }
+        });
+    };
+    walk(roots, [], []);
+    return out;
+}
+export async function promptHierarchicalPicker(opts) {
+    if (!layout.isActive())
+        return null;
+    const maxVisible = opts.maxVisible ?? 12;
+    const emitter = stdin;
+    let query = '';
+    let cursor = 0;
+    let path = [];
+    let cands = [];
+    let selected = 0;
+    let resolved = false;
+    let resolve;
+    /** 沿 path 取当前层级节点列表。 */
+    function currentNodes() {
+        let nodes = opts.roots;
+        for (const idx of path) {
+            const next = nodes[idx]?.children;
+            if (!next)
+                return [];
+            nodes = next;
+        }
+        return nodes;
+    }
+    function enabledIndices() {
+        const out = [];
+        cands.forEach((c, i) => {
+            if (!c.node.disabled)
+                out.push(i);
+        });
+        return out;
+    }
+    function clampSelected() {
+        const en = enabledIndices();
+        if (en.length === 0) {
+            selected = 0;
+            return;
+        }
+        if (!en.includes(selected))
+            selected = en[0];
+    }
+    /** 只过滤当前层级：空 query 全显示；有 query 在本层节点 searchText 上模糊匹配。 */
+    function recompute() {
+        const q = query.trim();
+        const enabled = [];
+        const disabled = [];
+        currentNodes().forEach((node, i) => {
+            let m = { score: 0 };
+            if (q) {
+                m = fuzzyMatch(q, node.searchText);
+                if (!m)
+                    return;
+            }
+            const c = { node, score: m.score };
+            if (node.children && node.children.length)
+                c.enterPath = [...path, i];
+            else
+                c.value = node.value;
+            (node.disabled ? disabled : enabled).push(c);
+        });
+        if (q)
+            enabled.sort((a, b) => b.score - a.score);
+        cands = [...enabled, ...disabled];
+        clampSelected();
+    }
+    function titleLine() {
+        const parts = [opts.title];
+        let nodes = opts.roots;
+        for (const idx of path) {
+            parts.push(nodes[idx]?.label ?? '');
+            nodes = nodes[idx]?.children ?? [];
+        }
+        return parts.join('  ›  ');
+    }
+    /** 随层级变化的操作提示。 */
+    function hintLine() {
+        return path.length === 0
+            ? '打字搜索厂商 · ↑↓ 选择 · Enter 进入厂商 · Esc 退出'
+            : '打字搜索模型 · ↑↓ 选择 · Enter 确认 · Backspace 返回厂商列表';
+    }
+    function menuLines() {
+        const cols = layout.getGeo().cols;
+        const lines = [`${ui.bold}${truncateDisplay(titleLine(), cols)}${ui.reset}`];
+        lines.push(`${ui.dim}${truncateDisplay(hintLine(), cols)}${ui.reset}`);
+        const en = enabledIndices();
+        if (en.length === 0) {
+            lines.push(`${ui.dim}${query.trim() ? '无匹配，按 Esc 返回' : '（空列表）'}${ui.reset}`);
+            return lines;
+        }
+        const visibleCount = Math.min(maxVisible, en.length);
+        const selPos = en.indexOf(selected);
+        const page = Math.floor(selPos / visibleCount);
+        const winEn = en.slice(page * visibleCount, page * visibleCount + visibleCount);
+        const hasMore = page * visibleCount + visibleCount < en.length;
+        const hasAbove = page > 0;
+        winEn.forEach((idx, i) => {
+            const c = cands[idx];
+            const isSel = idx === selected;
+            const isBranch = !!c.enterPath;
+            const color = isSel ? `${ui.accent}${ui.bold}` : '';
+            const marker = isSel ? `${ui.accent}${ui.bold}▸${ui.reset}` : ' ';
+            let scrollHint = '';
+            if (i === 0 && hasAbove)
+                scrollHint = ' ▲';
+            if (i === winEn.length - 1 && hasMore)
+                scrollHint = ' ▼';
+            // 分支尾部提示「进入」；叶子 detail 原样。
+            const detail = [c.node.detail, isBranch ? '进入 →' : ''].filter(Boolean).join(' · ');
+            const detailStr = detail ? `  ${ui.dim}${detail}${ui.reset}` : '';
+            const budget = cols - 4 - scrollHint.length - (detail ? displayWidth(detail) + 2 : 0);
+            const body = truncateDisplay(c.node.label, Math.max(1, budget));
+            lines.push(`${marker} ${color}${body}${ui.reset}${detailStr}${ui.dim}${scrollHint}${ui.reset}`);
+        });
+        return lines;
+    }
+    function redraw() {
+        layout.paintInput({
+            prompt: '❯ ',
+            lines: [query],
+            cursorLine: 0,
+            cursorCol: displayWidth(query.slice(0, cursor)),
+            menu: { lines: menuLines() },
+        });
+    }
+    function drill(to) {
+        path = to;
+        query = '';
+        cursor = 0;
+        recompute();
+        redraw();
+    }
+    function goUp() {
+        if (path.length === 0)
+            return false;
+        path = path.slice(0, -1);
+        recompute();
+        redraw();
+        return true;
+    }
+    function finish(v) {
+        if (resolved)
+            return;
+        resolved = true;
+        layout.setMouseEnabled(true);
+        try {
+            stdin.setRawMode(false);
+        }
+        catch {
+            /* 忽略 */
+        }
+        emitter.removeListener('keypress', onKey);
+        stdin.pause();
+        layout.paintInput({ prompt: '❯ ', lines: [''], cursorLine: 0, cursorCol: 0, menu: null });
+        resolve(v);
+    }
+    function move(delta) {
+        const en = enabledIndices();
+        if (en.length === 0)
+            return;
+        const pos = en.indexOf(selected);
+        const nextPos = (pos + delta + en.length) % en.length;
+        selected = en[nextPos];
+        redraw();
+    }
+    function onKey(_str, key) {
+        if (key.name === 'escape') {
+            if (query) {
+                query = '';
+                cursor = 0;
+                recompute();
+                redraw();
+                return;
+            }
+            if (goUp())
+                return;
+            return finish(null);
+        }
+        if (key.ctrl && key.name === 'c')
+            return finish(null);
+        if (key.name === 'return' || key.name === 'enter') {
+            const c = cands[selected];
+            if (!c || c.node.disabled)
+                return;
+            if (c.enterPath)
+                return drill(c.enterPath);
+            if (c.value !== undefined)
+                return finish(c.value);
+            return;
+        }
+        switch (key.name) {
+            case 'up':
+                move(-1);
+                return;
+            case 'down':
+                move(1);
+                return;
+            case 'left':
+                if (cursor > 0) {
+                    cursor--;
+                    redraw();
+                }
+                return;
+            case 'right':
+                if (cursor < query.length) {
+                    cursor++;
+                    redraw();
+                }
+                return;
+            case 'home':
+                cursor = 0;
+                redraw();
+                return;
+            case 'end':
+                cursor = query.length;
+                redraw();
+                return;
+            case 'backspace':
+                if (cursor > 0) {
+                    query = query.slice(0, cursor - 1) + query.slice(cursor);
+                    cursor--;
+                    recompute();
+                    redraw();
+                }
+                else if (!query) {
+                    goUp();
+                }
+                return;
+            case 'delete':
+                if (cursor < query.length) {
+                    query = query.slice(0, cursor) + query.slice(cursor + 1);
+                    recompute();
+                    redraw();
+                }
+                return;
+        }
+        if (key.ctrl && key.name === 'u') {
+            query = '';
+            cursor = 0;
+            recompute();
+            redraw();
+            return;
+        }
+        const s = key.sequence ?? '';
+        if (s && s >= ' ' && !key.ctrl && !key.meta) {
+            query = query.slice(0, cursor) + s + query.slice(cursor);
+            cursor += s.length;
+            recompute();
+            redraw();
+        }
+    }
+    recompute();
+    return new Promise((res) => {
+        resolve = res;
+        layout.setMouseEnabled(false);
+        try {
+            stdin.setRawMode(true);
+        }
+        catch {
+            res(null);
+            return;
+        }
+        stdin.resume();
+        emitter.on('keypress', onKey);
+        redraw();
+    });
+}

package/dist/ui/intervention.js

@@ -10,7 +10,17 @@ const emitter = stdin;
 /** choice 末尾的本地化“自定义输入”项标签。 */
 const customLabel = () => t('intervention.custom');
 /** 弹出介入面板,阻塞直到用户完成选择。 */
-export async function promptIntervention(req) {
+export function promptIntervention(req) {
+    // P4 闸1:并发子 agent 可能同时弹面板。面板进出场全是进程级单例(stdin 监听集/
+    // 鼠标开关/走时计时器/光标处理器),两个面板交错会导致监听恢复错乱与永久泄漏。
+    // 用承诺队列串行化:同一时刻只有一个面板,其余排队;非 TTY 分支不碰单例,排队也无害。
+    const run = () => promptInterventionInner(req);
+    const result = panelQueue.then(run, run);
+    panelQueue = result.then(() => undefined, () => undefined);
+    return result;
+}
+let panelQueue = Promise.resolve();
+async function promptInterventionInner(req) {
     // 非 TTY 降级:不阻塞,自动选默认。日志走 stderr(不污染 stdout 内容流)。
     if (!layout.isActive()) {
         const kind = req.type === 'choice' ? t('intervention.defaultChoice') : t('intervention.emptyInput');

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

@@ -89,15 +89,26 @@ export function composeModelLine(status, cols) {
     const HINT = t('status.modeSwitch');
     const hintW = modeTag ? displayWidth(HINT) : 0;
     const hintPart = modeTag ? `${ui.dim}${HINT}${ui.reset}` : '';
+    // P3 effort chip:非 auto 时显示,与 modeTag 同级色(运行时状态),优先级在 hint 之上。
+    const effortTag = status.effort ?? '';
+    // 闪电标识按强度递增:low=1 / medium=2 / high=3,off=0;⚡ 宽度在 charWidth 按 2 格算,
+    // 与终端一致,不会再与右侧内容重叠产生残影。标签(low/medium/high)紧随其后明示档位。
+    const boltCount = effortTag === 'low' ? 1 : effortTag === 'medium' ? 2 : effortTag === 'high' ? 3 : 0;
+    const bolts = '⚡'.repeat(boltCount);
+    const effortPart = effortTag ? `${modeColor}${bolts}${effortTag}${ui.reset}` : '';
+    const effortW = effortTag ? displayWidth(bolts) + displayWidth(effortTag) : 0;
+    const sepME = modePart && effortPart ? STATUS_SEP : '';
     const tokChip = formatTurnTokenChip(status.lastTurnUsage);
     const tokW = displayWidth(stripAnsi(tokChip));
     // 合并左段:段间留 2 空格分隔。极窄时 hint 与 chip 都可能藏掉。
     // 优先级:modeTag(必) > chip(提示累计 token,有信息量)> hint(纯说明性,窄时最先省)。
-    const sepMH = modePart && (hintPart || tokChip) ? '  ' : '';
+    const sepMH = (modePart || effortPart) && (hintPart || tokChip) ? '  ' : '';
     const sepHT = hintPart && tokChip ? '  ' : '';
-    const leftStr = `${modePart}${sepMH}${hintPart}${sepHT}${tokChip}`;
+    const leftStr = `${modePart}${sepME}${effortPart}${sepMH}${hintPart}${sepHT}${tokChip}`;
     const leftW = modeW +
-        (modePart && (hintPart || tokChip) ? sepMH.length : 0) +
+        (sepME ? sepME.length : 0) +
+        effortW +
+        ((modePart || effortPart) && (hintPart || tokChip) ? sepMH.length : 0) +
         hintW +
         (hintPart && tokChip ? sepHT.length : 0) +
         tokW;
@@ -118,15 +129,15 @@ export function composeModelLine(status, cols) {
     if (leftW + minGap + rightW > cols) {
         // 优先藏 hint(纯说明,信息密度最低):仅留 modePart + sep + tokChip
         if (modePart && tokChip && hintPart) {
-            const leftStr2 = `${modePart}${sepMH}${tokChip}`;
-            const leftW2 = modeW + sepMH.length + tokW;
+            const leftStr2 = `${modePart}${sepME}${effortPart}${effortPart ? STATUS_SEP : ''}${tokChip}`;
+            const leftW2 = modeW + (sepME ? sepME.length : 0) + effortW + (effortPart ? STATUS_SEP_W : 0) + tokW;
             if (leftW2 + minGap + rightW <= cols) {
                 return twoColumn(leftStr2, leftW2, rightStr, rightW, cols);
             }
         }
         // 再藏 token chip:仅留 modePart
-        if (modePart && tokChip) {
-            return twoColumn(modePart, modeW, rightStr, rightW, cols);
+        if ((modePart || effortPart) && tokChip) {
+            return twoColumn(`${modePart}${sepME}${effortPart}`, modeW + (sepME ? sepME.length : 0) + effortW, rightStr, rightW, cols);
         }
     }
     return twoColumn(leftStr, leftW, rightStr, rightW, cols);

package/dist/ui/render.js

@@ -60,6 +60,8 @@ export function charWidth(cp) {
         return 2; // 表情
     if (cp >= 0x20000 && cp <= 0x2fffd)
         return 2; // CJK 扩展 B-F
+    if (cp === 0x26a1)
+        return 2; // ⚡ 闪电:终端按 emoji 2 格渲染,算 1 会与 chip 重叠产生残影
     return 1;
 }
 export function displayWidth(str) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocode-ai",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "终端编码 agent:LLM + tool-call 循环 + 流式输出(含思考)+ 25 个工具,接任意 OpenAI 兼容后端。",
   "type": "module",
   "bin": {