@bolloon/bolloon-agent 0.3.31 → 0.3.33

package/dist/cli/ink-app.js

@@ -3,11 +3,15 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * ink-app.tsx — Ink (React for CLI) 渲染入口
  *
  * 用 Yoga flexbox 布局实现: 内容置顶, 输入栏固定底部, 状态栏固定
+ *
+ * 2026-08-05: @ / # 弹出选择窗 — 输入 @ 命中智能体, / 命中命令+技能+插件, # 命中文件
+ *   ↑/↓ 导航, Tab/Enter 选中, Esc 关闭, 弹出窗打开时 TextInput 让出焦点 (focus=false)
  */
-import { useState, useEffect, useCallback, useRef } from 'react';
+import { useState, useEffect, useCallback, useRef, useMemo } from 'react';
 import { render, Box, Text, useInput, useApp } from 'ink';
 import TextInput from 'ink-text-input';
 import { brandArtLines, boxTop, boxRow, boxBottom, dispWidth } from './loading-tui.js';
+import { loadAgents, loadCommands, loadSkills, loadPlugins, loadFiles, getMention, matchFileScore, } from './mention-data.js';
 // ─── 组件: Logo Box ──────────────────────────────────────────────────────────
 const LogoBox = ({ width }) => {
     const art = brandArtLines();
@@ -24,6 +28,17 @@ const Messages = ({ msgs }) => (_jsx(Box, { flexDirection: "column", flexGrow: 1
         const clean = m.replace(/\x1b\[[0-9;]*m/g, '');
         return clean.trim() ? _jsx(Text, { children: clean ? m : '' }, i) : null;
     }) }));
+const MentionPopup = ({ title, items, sel, width, loading }) => {
+    const MAX_ROWS = 8;
+    const shown = items.slice(0, MAX_ROWS);
+    const innerW = Math.max(width - 2, 10);
+    return (_jsxs(Box, { flexDirection: "column", width: width, children: [_jsx(Text, { color: "cyan", bold: true, children: `╭─ ${title} ${'─'.repeat(Math.max(2, innerW - dispWidth(title) - 4))}╮` }), loading && items.length === 0 ? (_jsx(Text, { color: "dim", children: "\u2502 \u626B\u63CF\u4E2D..." })) : !loading && items.length === 0 ? (_jsx(Text, { color: "dim", children: "\u2502 \u65E0\u5339\u914D" })) : (shown.map((it, i) => {
+                const active = i === sel;
+                const label = it.kind === 'file' ? it.label : `${it.kind === 'skill' ? '⚡' : it.kind === 'plugin' ? '🔌' : ''}${it.label}`;
+                const hint = it.hint ? `${it.hint}` : it.kind === 'file' ? '文件' : '';
+                return (_jsxs(Box, { width: innerW, children: [_jsx(Text, { color: active ? 'black' : undefined, backgroundColor: active ? 'cyan' : undefined, children: `${active ? '❯ ' : '  '}${label}` }), _jsx(Text, { color: active ? 'black' : 'dim', backgroundColor: active ? 'cyan' : undefined, dimColor: !active, children: `  ${hint}` })] }, `${it.kind}:${it.label}`));
+            })), items.length > MAX_ROWS && (_jsxs(Text, { color: "dim", children: ["\u2502 \u8FD8\u6709 ", items.length - MAX_ROWS, " \u9879..."] })), _jsx(Text, { color: "cyan", children: `╰${'─'.repeat(innerW)}╯` })] }));
+};
 const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH }) => {
     const [input, setInput] = useState('');
     const [msgs, setMsgs] = useState([]);
@@ -34,6 +49,206 @@ const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH
     // 双击 Esc 退出当前进程 (500ms 窗口内第二次按下)
     const lastEscRef = useRef(0);
     const C_WARN_ANSI = '\x1b[38;2;245;158;11m'; // #f59e0b
+    // ── @ / # 弹出窗状态 ──────────────────────────────────────────────────────
+    const mention = useMemo(() => getMention(input), [input]);
+    const mentionKey = mention ? `${mention.kind}:${mention.start}` : null;
+    const [items, setItems] = useState([]);
+    const [sel, setSel] = useState(0);
+    const [dismissed, setDismissed] = useState(null);
+    const [loadingFiles, setLoadingFiles] = useState(false);
+    // Tab 补齐弹窗 (非 @ / # 触发的普通 token 补齐): { start, items }
+    const [tabState, setTabState] = useState(null);
+    const agentCache = useRef(null);
+    const skillCache = useRef(null);
+    const pluginCache = useRef(null);
+    const fileCache = useRef(null);
+    // ── 输入历史 (↑/↓ 切换) ───────────────────────────────────────────────────
+    const historyRef = useRef([]);
+    const historyIdxRef = useRef(-1); // -1 = 正在编辑新草稿
+    const draftRef = useRef('');
+    // 加载当前 mention 的候选 (agent/command 缓存一次; file 每次打开重扫)
+    useEffect(() => {
+        if (tabState) {
+            setItems(tabState.items);
+            setSel(0);
+            return;
+        }
+        if (!mention || !mentionKey) {
+            setItems([]);
+            return;
+        }
+        if (dismissed === mentionKey) {
+            setItems([]);
+            return;
+        }
+        let cancelled = false;
+        if (mention.kind === 'agent') {
+            if (agentCache.current) {
+                setItems(agentCache.current);
+            }
+            else {
+                loadAgents()
+                    .then(list => { agentCache.current = list; if (!cancelled)
+                    setItems(list); })
+                    .catch(() => { if (!cancelled)
+                    setItems([]); });
+            }
+        }
+        else if (mention.kind === 'command') {
+            // 命令立即显示, 技能/插件异步合并
+            const base = loadCommands();
+            setItems(base);
+            const skillsP = skillCache.current
+                ? Promise.resolve(skillCache.current)
+                : loadSkills().then(s => { skillCache.current = s; return s; });
+            const pluginsP = pluginCache.current
+                ? Promise.resolve(pluginCache.current)
+                : loadPlugins().then(p => { pluginCache.current = p; return p; });
+            Promise.all([skillsP, pluginsP])
+                .then(([sk, pl]) => {
+                if (cancelled)
+                    return;
+                const merged = [...base];
+                for (const it of [...sk, ...pl]) {
+                    if (!merged.some(m => m.kind === it.kind && m.label === it.label))
+                        merged.push(it);
+                }
+                setItems(merged);
+            })
+                .catch(() => { });
+        }
+        else {
+            // file: 每次打开重扫 (cwd 可能变化)
+            setLoadingFiles(true);
+            loadFiles(mention.query)
+                .then(list => { if (!cancelled) {
+                fileCache.current = list;
+                setItems(list);
+                setLoadingFiles(false);
+            } })
+                .catch(() => { if (!cancelled) {
+                setItems([]);
+                setLoadingFiles(false);
+            } });
+        }
+        setSel(0);
+        return () => { cancelled = true; };
+    }, [mentionKey, dismissed, tabState]);
+    // 按查询过滤 + 排序
+    const filtered = useMemo(() => {
+        if (tabState)
+            return items; // Tab 补齐: 已按前缀过滤好
+        if (!mention)
+            return [];
+        const q = mention.query.toLowerCase();
+        if (!q)
+            return items;
+        if (mention.kind === 'file') {
+            return items
+                .filter(it => matchFileScore(it.label.toLowerCase(), q) >= 0)
+                .sort((a, b) => matchFileScore(a.label.toLowerCase(), q) - matchFileScore(b.label.toLowerCase(), q));
+        }
+        return items.filter(it => it.label.toLowerCase().includes(q));
+    }, [items, mention, tabState]);
+    const popupOpen = !!(tabState || (mention && dismissed !== mentionKey));
+    const safeSel = Math.min(sel, Math.max(0, filtered.length - 1));
+    const popupTitle = tabState ? 'Tab 补齐'
+        : mention?.kind === 'agent' ? '@ 智能体'
+            : mention?.kind === 'file' ? '# 文件'
+                : '/ 命令 · 技能 · 插件';
+    // 在指定 start 位置插入补齐文本 (函数式更新, 闭包安全)
+    const insertAt = useCallback((start, it) => {
+        setInput(cur => {
+            if (start > cur.length)
+                return cur;
+            let insertText;
+            if (it.kind === 'agent')
+                insertText = '@' + it.insert + ' ';
+            else if (it.kind === 'file')
+                insertText = '#' + it.insert + ' ';
+            else if (it.kind === 'skill')
+                insertText = 'use_skill ' + it.insert + ' ';
+            else
+                insertText = '/' + it.insert + ' ';
+            return cur.slice(0, start) + insertText;
+        });
+        // TextInput 内部 cursorOffset 在值被重写后不重置 (2026-08-05 实测),
+        // 插入后强制重挂载让光标回到末尾; 仅此一处重挂载, 避免输入丢失窗口
+        setTiKey(k => k + 1);
+    }, []);
+    // 接受当前选中项 → 替换 token 插入输入
+    // 函数式更新 + 从最新 state 重新推导 mention (useInput 闭包可能陈旧, 2026-08-05)
+    const acceptMention = useCallback((it) => {
+        if (tabState) {
+            insertAt(tabState.start, it);
+            setTabState(null);
+            setDismissed(null);
+            return;
+        }
+        setInput(cur => {
+            const m = getMention(cur);
+            if (!m)
+                return cur;
+            let insertText;
+            if (it.kind === 'agent')
+                insertText = '@' + it.insert + ' ';
+            else if (it.kind === 'file')
+                insertText = '#' + it.insert + ' ';
+            else if (it.kind === 'skill')
+                insertText = 'use_skill ' + it.insert + ' ';
+            else
+                insertText = '/' + it.insert + ' ';
+            return cur.slice(0, m.start) + insertText;
+        });
+        setTiKey(k => k + 1);
+        setDismissed(null);
+    }, [tabState, insertAt]);
+    // Tab 命令补齐: 无触发符的普通 token 也补 (命令/技能/插件/智能体/文件)
+    const doTabCompletion = useCallback(() => {
+        const m = input.match(/(^|\s)([^\s]*)$/);
+        if (!m)
+            return;
+        const [, pre, token] = m;
+        const start = (m.index || 0) + pre.length;
+        const q = token.toLowerCase();
+        const items = [];
+        const add = (list) => {
+            for (const it of list) {
+                if (items.some(x => x.kind === it.kind && x.label === it.label))
+                    continue;
+                if (it.label.toLowerCase().startsWith(q))
+                    items.push(it);
+            }
+        };
+        if (q) {
+            add(loadCommands());
+            if (skillCache.current)
+                add(skillCache.current);
+            if (pluginCache.current)
+                add(pluginCache.current);
+            if (agentCache.current)
+                add(agentCache.current);
+            if (fileCache.current)
+                add(fileCache.current);
+        }
+        else {
+            // 空 token: 命令 + 技能 + 插件
+            add(loadCommands());
+            if (skillCache.current)
+                add(skillCache.current);
+            if (pluginCache.current)
+                add(pluginCache.current);
+        }
+        if (items.length === 1) {
+            insertAt(start, items[0]);
+            setTabState(null);
+        }
+        else if (items.length > 1) {
+            setTabState({ start, items });
+            setSel(0);
+        }
+    }, [input, insertAt]);
+    const [tiKey, setTiKey] = useState(0);
     // 全局: 思考动画控制
     useEffect(() => {
         globalThis.__inkSetThinking = (v) => setThinking(v);
@@ -53,6 +268,14 @@ const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH
         const trimmed = value.trim();
         if (!trimmed)
             return;
+        // 入历史 (去重最近一条, 上限 100)
+        const hist = historyRef.current;
+        if (hist[hist.length - 1] !== trimmed)
+            hist.push(trimmed);
+        if (hist.length > 100)
+            hist.shift();
+        historyIdxRef.current = -1;
+        draftRef.current = '';
         setInput('');
         // 用户消息由 processInput 统一通过 appendLine(renderUserMessage) 显示
         onPrompt(trimmed);
@@ -69,6 +292,97 @@ const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH
             requestExit();
             return;
         }
+        // ── 弹出窗打开: 全键接管 (TextInput focus=false 不处理) ──
+        if (popupOpen) {
+            if (key.upArrow) {
+                setSel(s => Math.max(0, s - 1));
+                return;
+            }
+            if (key.downArrow) {
+                setSel(s => Math.min(filtered.length - 1, s + 1));
+                return;
+            }
+            if ((key.tab || key.return) && filtered.length > 0) {
+                const it = filtered[safeSel];
+                if (it)
+                    acceptMention(it);
+                return;
+            }
+            if (key.escape) {
+                if (tabState)
+                    setTabState(null);
+                else
+                    setDismissed(mentionKey);
+                return;
+            }
+            if (key.backspace || key.delete) {
+                setInput(cur => cur.slice(0, -1));
+                return;
+            }
+            // 粘贴/连发 chunk: Ink 把一次 stdin read 当单个 keypress (2026-08-05 实测)
+            //   ① 连续退格 (\x7f×N) → 删 N 个字符
+            //   ② 混合 chunk (退格+控制符, 含 ESC 序列) → 退格部分生效, ESC 序列忽略
+            //   ③ 可打印 chunk (CJK/粘贴) → 整串追加
+            // 全部用函数式更新 — useInput 闭包可能陈旧 (实测), 函数式取最新 state
+            if (/^\x7f+$/.test(_input)) {
+                setInput(cur => cur.slice(0, Math.max(0, cur.length - _input.length)));
+                return;
+            }
+            if (/[\x00-\x1f\x7f]/.test(_input)) {
+                // 混合 chunk (退格+可打印): 逐字符处理; 含 ESC 序列 → 忽略整块 (箭头等由 TextInput 处理)
+                if (_input.includes('\u001b'))
+                    return;
+                setInput(cur => {
+                    let out = cur;
+                    for (const ch of _input) {
+                        if (ch === '\x7f')
+                            out = out.slice(0, -1);
+                        else if (/[\x00-\x1f]/.test(ch))
+                            continue;
+                        else
+                            out += ch;
+                    }
+                    return out;
+                });
+                return;
+            }
+            if (_input && !key.ctrl && !key.meta) {
+                setInput(cur => cur + _input);
+                return;
+            }
+            return; // 其余键忽略
+        }
+        // ── 正常模式 ──
+        // Tab 命令补齐 (无触发符的普通 token 也补)
+        if (key.tab) {
+            doTabCompletion();
+            return;
+        }
+        // ↑/↓ 切换输入历史 (TextInput 本身忽略 up/down, 无冲突)
+        if (key.upArrow) {
+            const hist = historyRef.current;
+            if (hist.length === 0)
+                return;
+            if (historyIdxRef.current === -1)
+                draftRef.current = input;
+            if (historyIdxRef.current < hist.length - 1) {
+                historyIdxRef.current += 1;
+                setInput(hist[hist.length - 1 - historyIdxRef.current]);
+                setTiKey(k => k + 1);
+            }
+            return;
+        }
+        if (key.downArrow) {
+            if (historyIdxRef.current === -1)
+                return;
+            historyIdxRef.current -= 1;
+            if (historyIdxRef.current === -1)
+                setInput(draftRef.current);
+            else
+                setInput(historyRef.current[historyRef.current.length - 1 - historyIdxRef.current]);
+            setTiKey(k => k + 1);
+            return;
+        }
         // 双击 Esc 退出当前进程: 第一击提示, 500ms 内第二击退出
         if (key.escape) {
             const now = Date.now();
@@ -80,6 +394,21 @@ const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH
                 inkAppendLine(`${C_WARN_ANSI}⚠ 再按一次 Esc 退出当前进程\x1b[0m`);
             }
         }
+        // 防御: 控制字符 chunk (TextInput 会把整 chunk 当字符追加, 2026-08-05 实测)
+        //   setTimeout(0) 保证我们的纠正落在 TextInput 的 onChange 之后 (无论监听器顺序)
+        //   \x7f×N → 先剥掉 TextInput 追加的垃圾, 再删 N 个真实字符
+        if (/^\x7f+$/.test(_input)) {
+            const n = _input.length;
+            setTimeout(() => setInput(cur => {
+                const cleaned = cur.replace(/[\x00-\x1f\x7f]+$/, '');
+                return cleaned.slice(0, Math.max(0, cleaned.length - n));
+            }), 0);
+            return;
+        }
+        if (/[\x00-\x1f\x7f]/.test(_input)) {
+            setTimeout(() => setInput(cur => cur.replace(/[\x00-\x1f\x7f]+$/, '')), 0);
+            return;
+        }
         // TextInput handles actual input; useInput only for Ctrl+C / Esc
     });
     // 自动更新状态栏 (每秒)
@@ -91,6 +420,19 @@ const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH
         }, 1000);
         return () => clearInterval(timer);
     }, [getStatusUpdate]);
+    // 调试/测试钩子: 输入变化时通知外部 (pty 测试用)
+    useEffect(() => {
+        globalThis.__inkOnInput?.(input);
+    }, [input]);
+    // 调试/测试钩子: 弹出窗状态 (pty 测试用)
+    useEffect(() => {
+        globalThis.__inkOnPopup?.({
+            open: popupOpen,
+            key: mentionKey,
+            count: filtered.length,
+            items: filtered.slice(0, 5).map(i => i.kind + ':' + i.label),
+        });
+    }, [popupOpen, mentionKey, filtered]);
     // 思考动画 — kaomoji 旋转
     const KAOMOJI = ['(｀・ω・´)', '(´･_･`)', '(｡•́︿•̀｡)', 'ᕙ(▀̿̿Ĺ̯̿̿▀̿ ̿)ᕗ', '(◕‿◕)'];
     useEffect(() => {
@@ -101,8 +443,9 @@ const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH
         }, 600);
         return () => clearInterval(timer);
     }, [thinking]);
-    return (_jsxs(Box, { flexDirection: "column", height: "100%", children: [_jsxs(Box, { flexGrow: 1, flexDirection: "column", justifyContent: "flex-start", children: [_jsx(LogoBox, { width: terminalW }), _jsx(Messages, { msgs: msgs }), thinking && (_jsx(Box, { children: _jsxs(Text, { color: "yellow", children: [KAOMOJI[thinkingIdx.current], " \u601D\u8003\u4E2D..."] }) }))] }), _jsx(Box, { children: _jsx(Text, { bold: true, color: "white", children: '─'.repeat(terminalW) }) }), _jsx(Box, { children: _jsx(Text, { children: status }) }), _jsx(Box, { children: _jsx(Text, { bold: true, color: "white", children: '─'.repeat(terminalW) }) }), _jsxs(Box, { children: [_jsx(Text, { bold: true, color: "green", children: "\u276F " }), _jsx(TextInput, { value: input, onChange: setInput, onSubmit: onSubmit, placeholder: "\u8F93\u5165\u6D88\u606F...  Esc \u53CC\u51FB\u9000\u51FA \u00B7 /queue \u6392\u961F \u00B7 !\u7EC8\u7AEF\u547D\u4EE4" })] }), _jsx(Box, { children: _jsx(Text, { bold: true, color: "white", children: '─'.repeat(terminalW) }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", height: "100%", children: [_jsxs(Box, { flexGrow: 1, flexDirection: "column", justifyContent: "flex-start", children: [_jsx(LogoBox, { width: terminalW }), _jsx(Messages, { msgs: msgs }), thinking && (_jsx(Box, { children: _jsxs(Text, { color: "yellow", children: [KAOMOJI[thinkingIdx.current], " \u601D\u8003\u4E2D..."] }) }))] }), _jsx(Box, { children: _jsx(Text, { bold: true, color: "white", children: '─'.repeat(terminalW) }) }), _jsx(Box, { children: _jsx(Text, { children: status }) }), _jsx(Box, { children: _jsx(Text, { bold: true, color: "white", children: '─'.repeat(terminalW) }) }), popupOpen && (tabState || mention) && (_jsx(MentionPopup, { title: popupTitle, items: filtered, sel: safeSel, width: terminalW, loading: loadingFiles })), _jsxs(Box, { children: [_jsx(Text, { bold: true, color: "green", children: "\u276F " }), _jsx(TextInput, { value: input, onChange: setInput, onSubmit: onSubmit, focus: !popupOpen, placeholder: "\u8F93\u5165\u6D88\u606F... @\u667A\u80FD\u4F53 /\u547D\u4EE4 #\u6587\u4EF6 \u00B7 Esc \u53CC\u51FB\u9000\u51FA \u00B7 /queue \u6392\u961F \u00B7 !\u7EC8\u7AEF\u547D\u4EE4" }, tiKey)] }), _jsx(Box, { children: _jsx(Text, { bold: true, color: "white", children: '─'.repeat(terminalW) }) })] }));
 };
+export { InkApp };
 // ─── 启动 ────────────────────────────────────────────────────────────────────
 let _inkInstance = null;
 export function startInk(onPrompt, initialStatus, getStatusUpdate) {

package/dist/cli/mention-data.js

@@ -0,0 +1,241 @@
+/**
+ * mention-data.ts — CLI @ / # 弹出窗数据源 (2026-08-05)
+ *
+ * 弹出窗三路命中:
+ *   @ → 智能体 (本地 channels + 远端 channel 缓存)
+ *   / → 命令 (CLI 内置 + Web 斜杠命令) + 技能 (3 个 skill 目录) + 插件 (MCP servers)
+ *   # → 文件 (cwd 有限深度遍历)
+ *
+ * 全部走本地文件读取, 不依赖 web server 是否在跑 (CLI 模式 server 不启动).
+ */
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+const HOME = () => process.env.HOME || os.homedir() || '/tmp';
+// ─── 命令 (CLI 内置) ─────────────────────────────────────────────────────────
+const CLI_COMMANDS = [
+    { kind: 'command', label: 'queue', hint: '切换队列模式', insert: 'queue' },
+    { kind: 'command', label: 'dequeue', hint: '出队一条', insert: 'dequeue' },
+    { kind: 'command', label: 'help', hint: '显示帮助', insert: 'help' },
+    { kind: 'command', label: 'exit', hint: '退出', insert: 'exit' },
+    { kind: 'command', label: 'peers', hint: '查看 P2P 节点', insert: 'peers' },
+    { kind: 'command', label: 'iroh', hint: '查看 iroh 状态', insert: 'iroh' },
+    { kind: 'command', label: 'add_friend', hint: '添加好友 <64位hex公钥>', insert: 'add_friend' },
+];
+/** Web 端斜杠命令 (server /message 路由 → LLM 工具) */
+const WEB_COMMANDS = [
+    { kind: 'command', label: 'plan', hint: '创建计划', insert: 'plan' },
+    { kind: 'command', label: 'todo', hint: '勾选步骤', insert: 'todo' },
+    { kind: 'command', label: 'review', hint: '审查计划', insert: 'review' },
+    { kind: 'command', label: 'task', hint: '创建任务', insert: 'task' },
+    { kind: 'command', label: 'goal', hint: '暂停目标', insert: 'goal' },
+    { kind: 'command', label: 'skill', hint: '沉淀技能', insert: 'skill' },
+    { kind: 'command', label: 'add-friend', hint: '添加好友 (智能体工具)', insert: 'add-friend' },
+];
+export function loadCommands() {
+    return [...CLI_COMMANDS, ...WEB_COMMANDS];
+}
+// ─── 智能体 (@) ──────────────────────────────────────────────────────────────
+/** 本地 channels.json (server-types.ts CHANNELS_PATH) + 远端 channel 缓存 */
+export async function loadAgents() {
+    const out = [];
+    // 本地 channels: 优先 ~/.bolloon/sessions/channels.json, 兜底 ~/.bolloon/channels.json
+    const channelsPaths = [
+        path.join(HOME(), '.bolloon', 'sessions', 'channels.json'),
+        path.join(HOME(), '.bolloon', 'channels.json'),
+    ];
+    for (const p of channelsPaths) {
+        try {
+            const chs = JSON.parse(await fs.readFile(p, 'utf-8'));
+            if (Array.isArray(chs)) {
+                for (const c of chs) {
+                    const name = c?.name;
+                    if (typeof name === 'string' && name.trim()) {
+                        out.push({ kind: 'agent', label: name.trim(), hint: '本地智能体', insert: name.trim() });
+                    }
+                }
+                break;
+            }
+        }
+        catch { /* 尝试下一个路径 */ }
+    }
+    // 远端 channel 缓存: { peerPublicKey: Channel[] }
+    try {
+        const remote = JSON.parse(await fs.readFile(path.join(HOME(), '.bolloon', 'remote-channels-cache.json'), 'utf-8'));
+        if (remote && typeof remote === 'object') {
+            for (const [peerPk, channels] of Object.entries(remote)) {
+                if (!Array.isArray(channels))
+                    continue;
+                for (const c of channels) {
+                    const name = c?.name;
+                    if (typeof name === 'string' && name.trim()) {
+                        out.push({ kind: 'agent', label: name.trim(), hint: `远端 · ${peerPk.slice(0, 8)}…`, insert: name.trim() });
+                    }
+                }
+            }
+        }
+    }
+    catch { /* 无远端缓存 */ }
+    // 去重 (本地优先)
+    const seen = new Set();
+    return out.filter(i => {
+        if (seen.has(i.label))
+            return false;
+        seen.add(i.label);
+        return true;
+    });
+}
+// ─── 技能 (/ 弹窗的一部分) ───────────────────────────────────────────────────
+/** 3 个 skill 目录 (与 skill-loader.defaultSkillPaths 一致) */
+export async function loadSkills() {
+    const out = [];
+    const dirs = [
+        path.join(HOME(), '.bolloon', 'skills'),
+        path.join(process.cwd(), '.bolloon', 'skills'),
+        path.join(HOME(), '.boll', 'skills'),
+    ];
+    for (const d of dirs) {
+        let entries;
+        try {
+            entries = await fs.readdir(d, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const e of entries) {
+            if (!e.isDirectory() || e.name.startsWith('.'))
+                continue;
+            // 读 frontmatter description 作为提示 (轻量, 不引 skill-loader 依赖)
+            let desc = '';
+            try {
+                const raw = (await fs.readFile(path.join(d, e.name, 'SKILL.md'), 'utf-8')).slice(0, 800);
+                const m = raw.match(/^---\r?\n[\s\S]*?^description:\s*(.+)$/m);
+                if (m)
+                    desc = m[1].trim().replace(/^["']|["']$/g, '').slice(0, 50);
+            }
+            catch { /* 无 SKILL.md → 仅目录名 */ }
+            out.push({ kind: 'skill', label: e.name, hint: desc || '技能', insert: e.name });
+        }
+    }
+    const seen = new Set();
+    return out.filter(i => {
+        if (seen.has(i.label))
+            return false;
+        seen.add(i.label);
+        return true;
+    });
+}
+// ─── 插件 (/ 弹窗的一部分) — MCP servers ─────────────────────────────────────
+/** ~/.mcp.json / cwd/.mcp.json 的 mcpServers 键名 */
+export async function loadPlugins() {
+    const out = [];
+    const paths = [path.join(HOME(), '.mcp.json'), path.join(process.cwd(), '.mcp.json')];
+    for (const p of paths) {
+        try {
+            const data = JSON.parse(await fs.readFile(p, 'utf-8'));
+            const servers = data?.mcpServers;
+            if (servers && typeof servers === 'object') {
+                for (const name of Object.keys(servers)) {
+                    out.push({ kind: 'plugin', label: name, hint: 'MCP 插件', insert: name });
+                }
+                break;
+            }
+        }
+        catch { /* 下一个路径 */ }
+    }
+    return out;
+}
+// ─── 文件 (#) ────────────────────────────────────────────────────────────────
+const SKIP_DIRS = new Set([
+    'node_modules', '.git', 'dist', 'build', 'out', 'target', '.cache', '.hermes',
+    'coverage', '.next', '.nuxt', '.venv', 'venv', '__pycache__', 'tmp', 'release',
+    '.bolloon', '.boll', '.turbo', '.idea', '.vscode', 'bin', 'lib', 'assets',
+]);
+/** cwd 有限深度 BFS, 只收文件, 上限 cap 个, 排序稳定; 超时兜底 (冷缓存 fs.readdir 偶发挂起, 2026-08-05) */
+export async function loadFiles(_query, base = process.cwd(), maxDepth = 3, cap = 400, timeoutMs = 5000) {
+    const out = [];
+    const deadline = Date.now() + timeoutMs;
+    const stack = [{ dir: base, depth: 0 }];
+    while (stack.length > 0 && out.length < cap) {
+        if (Date.now() > deadline)
+            break; // 超时返回已收集部分, 弹窗不卡"扫描中"
+        const { dir, depth } = stack.pop();
+        let entries;
+        try {
+            entries = await fs.readdir(dir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        // 目录优先入栈, 文件直接收集; 同层排序保证稳定
+        const dirs = [];
+        for (const e of entries) {
+            if (out.length >= cap)
+                break;
+            if (e.name.startsWith('.'))
+                continue;
+            const full = path.join(dir, e.name);
+            if (e.isDirectory()) {
+                if (depth < maxDepth && !SKIP_DIRS.has(e.name))
+                    dirs.push({ dir: full, depth: depth + 1 });
+            }
+            else if (e.isFile()) {
+                const rel = path.relative(base, full);
+                out.push({ kind: 'file', label: rel, hint: '', insert: rel });
+            }
+        }
+        dirs.reverse(); // 保证 pop 顺序按字母序
+        for (const d of dirs)
+            stack.push(d);
+    }
+    out.sort((a, b) => a.label.localeCompare(b.label));
+    return out;
+}
+/** 文件匹配评分: basename 前缀 > 全路径前缀 > basename 包含 > 全路径包含 */
+export function matchFileScore(label, q) {
+    const base = label.split('/').pop() || label;
+    if (base.startsWith(q))
+        return 0;
+    if (label.startsWith(q))
+        return 1;
+    if (base.includes(q))
+        return 2;
+    if (label.includes(q))
+        return 3;
+    return -1;
+}
+/**
+ * 从输入里检测当前 mention token (最后一个以 @ / # 开头的 token).
+ * 返回 { kind, query, start, trigger } — start 是触发符在 input 里的下标.
+ *
+ * 规则:
+ *   @ → agent: token 里最后一个 @, 且 @ 前一个字符不是 ascii 字母数字 (防 email a@b.com)
+ *   # → file:  token 里最后一个 #, 允许路径含 / (如 #src/cli/), 前字符非 ascii 字母数字
+ *   / → command: 必须是 token 第一个字符 (防 "看看 src/" 误触发), 如 /queue
+ */
+export function getMention(input) {
+    // 最后一个 token 的起始下标 (最后一个空白之后)
+    let tokenStart = input.length;
+    while (tokenStart > 0 && !/\s/.test(input[tokenStart - 1]))
+        tokenStart--;
+    const token = input.slice(tokenStart);
+    // 从后往前找触发符
+    for (let i = token.length - 1; i >= 0; i--) {
+        const ch = token[i];
+        if (ch !== '@' && ch !== '/' && ch !== '#')
+            continue;
+        if (ch === '/') {
+            // 命令: 只认 token 第一个字符
+            if (i !== 0)
+                continue;
+        }
+        else {
+            // @ / #: 前一个字符是 ascii 字母数字 → email/url 场景, 跳过
+            if (i > 0 && /[A-Za-z0-9]/.test(token[i - 1]))
+                continue;
+        }
+        const kind = ch === '@' ? 'agent' : ch === '#' ? 'file' : 'command';
+        return { kind, query: token.slice(i + 1), start: tokenStart + i, trigger: ch };
+    }
+    return null;
+}

package/dist/index.js

@@ -415,11 +415,10 @@ async function startCLI(comm) {
     // 进入 Ink TUI 输入循环
     const initialStatus = `${C_ACCENT}${cliModelName}\x1b[0m\x1b[90m  │\x1b[0m ${cliAgentName} \x1b[90m│\x1b[0m ⏱ 0s`;
     const getStatus = () => {
-        const dur = Math.floor((Date.now() - cliStartTime) / 1000);
         const barLen = 12;
         const filled = Math.round((cliContextPct / 100) * barLen);
         const bar = '█'.repeat(filled) + '░'.repeat(barLen - filled);
-        return `${C_ACCENT}${cliModelName}\x1b[0m\x1b[90m  │\x1b[0m ${cliAgentName} \x1b[90m│\x1b[0m ⏱ ${dur}s\x1b[90m │\x1b[0m ${bar} ${cliContextPct}%`;
+        return `${C_ACCENT}${cliModelName}\x1b[0m\x1b[90m  │\x1b[0m ${cliAgentName} \x1b[90m│\x1b[0m ⏱ ${fmtDuration(Date.now() - cliStartTime)}\x1b[90m │\x1b[0m ${bar} ${cliContextPct}%`;
     };
     startInk((text) => { processInput(text, comm); }, initialStatus, getStatus);
     // Wait on a promise that resolves on Ctrl+C / 双击 Esc
@@ -494,6 +493,11 @@ async function processInput(input, comm) {
         appendLine(`  ${C_ACCENT}!<cmd>${RESET}  执行终端命令  ${C_DIM}如 !ls -la${RESET}`);
         appendLine(`  ${C_ACCENT}/queue${RESET}  切换队列模式  ${C_DIM}输入排队, 当前结束后自动执行${RESET}`);
         appendLine(`  ${C_ACCENT}/dequeue${RESET} 出队一条`);
+        appendLine(`  ${C_ACCENT}@名字${RESET}     @ 命中智能体  ${C_DIM}弹出窗选择后发送给智能体${RESET}`);
+        appendLine(`  ${C_ACCENT}/名字${RESET}     / 命中命令/技能/插件  ${C_DIM}输入 / 自动弹出${RESET}`);
+        appendLine(`  ${C_ACCENT}#路径${RESET}     # 命中文件  ${C_DIM}输入 # 自动弹出文件列表${RESET}`);
+        appendLine(`  ${C_ACCENT}Tab${RESET}       补齐命令  ${C_DIM}普通输入也能 Tab 补 /命令 use_skill 技能 @智能体 #文件${RESET}`);
+        appendLine(`  ${C_ACCENT}↑/↓${RESET}       切换历史输入  ${C_DIM}↑ 翻上一条, ↓ 回下一条/草稿${RESET}`);
         appendLine(`  ${C_ACCENT}peers${RESET}   查看 P2P 节点`);
         appendLine(`  ${C_ACCENT}iroh${RESET}    查看 iroh 状态`);
         appendLine(`  ${C_ACCENT}add_friend${RESET} 添加好友`);
@@ -617,11 +621,10 @@ async function processInput(input, comm) {
         try {
             const msgLen = JSON.stringify(a.messageHistory ?? []).length;
             cliContextPct = Math.min(100, Math.round((msgLen / 240_000) * 100));
-            const dur = Math.floor((Date.now() - cliStartTime) / 1000);
             const barLen = 12;
             const filled = Math.round((cliContextPct / 100) * barLen);
             const bar = '█'.repeat(filled) + '░'.repeat(barLen - filled);
-            const statusText = `${C_ACCENT}${cliModelName}\x1b[0m\x1b[90m  │\x1b[0m ${cliAgentName} \x1b[90m│\x1b[0m ⏱ ${dur}s \x1b[90m│\x1b[0m ${msgLen.toLocaleString()}B/240K │ ${bar} ${cliContextPct}%`;
+            const statusText = `${C_ACCENT}${cliModelName}\x1b[0m\x1b[90m  │\x1b[0m ${cliAgentName} \x1b[90m│\x1b[0m ⏱ ${fmtDuration(Date.now() - cliStartTime)} \x1b[90m│\x1b[0m ${msgLen.toLocaleString()}B/240K │ ${bar} ${cliContextPct}%`;
             inkSetStatus(statusText);
         }
         catch { /* 降级容忍 */ }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",