mocode-ai 0.3.0 → 0.4.0

package/dist/llm/index.js

@@ -17,6 +17,14 @@ const RETRY_MAX_ATTEMPTS = 4;
 const RETRY_BASE_MS = 1000;
 const RETRY_MAX_MS = 30000;
 const RETRY_JITTER = 0.2;
+/**
+ * 流式响应里出现的推理模型自创 `think` 标签(DeepSeek R1 / Qwen3 / 部分自训模型):
+ * 与 OpenAI 兼容协议的独立 `reasoning_content` 字段不同,这些模型把 thinking 直接嵌进 content
+ * 字符串,期间不调 onText(spinner 持续转 ⠹ 思考中…),也不写入可见 content(history 不被思考段污染)。
+ */
+// 用 \u003c 表示 <,绕开本工具对 < 的处理(直接写 '<\u003cthink\u003e' 里 < 会被吃掉)。
+const THINK_OPEN = '<think>';
+const THINK_CLOSE = '</think>';
 let client = new OpenAI({
     baseURL: config.baseURL,
     apiKey: config.apiKey,
@@ -199,8 +207,13 @@ async function chatOnce(messages, handlers, signal, toolsOverride) {
         ...(config.maxTokens ? { max_tokens: config.maxTokens } : {}),
         ...(config.includeUsage ? { stream_options: { include_usage: true } } : {}),
     }, signal ? { signal } : undefined);
-    let content = '';
-    let hasContent = false;
+    // 流式  start end 标签过滤(见模块顶部 THINK_OPEN/CLOSE)。
+    // 跨 chunk 切分防御:buf 累积跨 chunk 边界,indexOf 扫描;为避免把跨 chunk 标签误判为
+    // 普通字符,buf 末尾为当前态保留 (label.length - 1) 个字符给下一 chunk 看。
+    let visibleContent = '';
+    let consumedAny = false;
+    let inThink = false;
+    let buf = '';
     let usage;
     const toolAcc = new Map();
     for await (const chunk of stream) {
@@ -216,9 +229,57 @@ async function chatOnce(messages, handlers, signal, toolsOverride) {
         if (!delta)
             continue; // 末尾 usage-only chunk 等无 delta
         if (delta.content) {
-            content += delta.content;
-            hasContent = true;
-            handlers.onText?.(delta.content);
+            // 状态机切分 delta.content:inThink 外输出到 visibleContent + onText;
+            // inThink 内丢弃;标签起始/闭合用 indexOf 在 buf 里扫描。
+            // 末尾预留 (label.length - 1) 字符给下一 chunk 防切分误判。
+            buf += delta.content;
+            let i = 0;
+            while (true) {
+                if (inThink) {
+                    // 思考段内,扫描 THINK_CLOSE;末尾预留 THINK_CLOSE.length - 1 防跨 chunk 切分
+                    const endIdx = buf.indexOf(THINK_CLOSE, i);
+                    if (endIdx === -1) {
+                        // 思考段内未找到闭合;buf 短到不可能包含 </think> 时全丢(都是思考段内容),
+                        // 否则留 (THINK_CLOSE.length - 1) 给下一 chunk 防跨边界切分。
+                        const safeLen = buf.length >= THINK_CLOSE.length
+                            ? buf.length - (THINK_CLOSE.length - 1)
+                            : buf.length;
+                        i = safeLen;
+                        break;
+                    }
+                    inThink = false;
+                    i = endIdx + THINK_CLOSE.length;
+                }
+                else {
+                    // 普通段,扫描 THINK_OPEN;末尾预留 THINK_OPEN.length - 1 防跨 chunk 切分
+                    const startIdx = buf.indexOf(THINK_OPEN, i);
+                    if (startIdx === -1) {
+                        // buf 短到不可能包含 <think> 时全输出(无 think 标签的普通模型不受影响);
+                        // 否则留 (THINK_OPEN.length - 1) 给下一 chunk 防跨边界切分误判。
+                        const safeLen = buf.length >= THINK_OPEN.length
+                            ? buf.length - (THINK_OPEN.length - 1)
+                            : buf.length;
+                        const seg = buf.slice(i, safeLen);
+                        if (seg) {
+                            visibleContent += seg;
+                            handlers.onText?.(seg);
+                            consumedAny = true;
+                        }
+                        i = safeLen;
+                        break;
+                    }
+                    // THINK_OPEN 之前的普通段:输出
+                    if (startIdx > i) {
+                        const seg = buf.slice(i, startIdx);
+                        visibleContent += seg;
+                        handlers.onText?.(seg);
+                        consumedAny = true;
+                    }
+                    inThink = true;
+                    i = startIdx + THINK_OPEN.length;
+                }
+            }
+            buf = buf.slice(i);
         }
         if (delta.tool_calls) {
             for (const tc of delta.tool_calls) {
@@ -241,6 +302,16 @@ async function chatOnce(messages, handlers, signal, toolsOverride) {
             }
         }
     }
+    // 防御:循环内 buf.slice 已把可确认部分消费;此处覆盖流末尾的"安全尾":
+    //  - 普通段(stream 已结束,标签不会再出现):作为可见内容追加到 visibleContent(不再调 onText)
+    //  - 思考段未闭合:丢弃,防 thinking 文本泄漏到 history
+    if (buf) {
+        if (!inThink) {
+            visibleContent += buf;
+            consumedAny = true;
+        }
+        buf = '';
+    }
     const toolCalls = [...toolAcc.entries()]
         .sort((a, b) => a[0] - b[0])
         .map(([, e]) => ({
@@ -249,7 +320,7 @@ async function chatOnce(messages, handlers, signal, toolsOverride) {
         arguments: e.arguments,
     }));
     return {
-        content: hasContent ? content : null,
+        content: consumedAny ? visibleContent : null,
         toolCalls,
         usage,
     };

package/dist/ui/prompt.js

@@ -84,24 +84,44 @@ export async function promptWithSlashMenu(opts) {
     let menuOpen = false;
     let selected = 0;
     let filtered = [];
+    const MENU_MAX_VISIBLE = 5;
+    let menuTop = 0; // 窗口首项在 filtered 中的索引,菜单最多显示 MENU_MAX_VISIBLE 条
     let resolved = false;
     let resolve;
     let reject;
-    /** 菜单行(预渲染,带色)——向上展开进内容区底,由 layout 贴入。 */
+    /** 菜单行(预渲染,带色)——向上展开进内容区底,由 layout 贴入。最多显示 MENU_MAX_VISIBLE 条,支持上下滚动。 */
     function menuLines() {
         if (!menuOpen || filtered.length === 0)
             return [];
         const cols = layout.getGeo().cols;
-        const maxName = Math.max(...filtered.map((c) => displayWidth(c.name)));
-        return filtered.map((c, i) => {
+        const visibleCount = Math.min(MENU_MAX_VISIBLE, filtered.length);
+        // 保 selected 在窗口内:selected 顶到上/下边界时才挪 menuTop
+        if (selected < menuTop)
+            menuTop = selected;
+        else if (selected >= menuTop + visibleCount)
+            menuTop = selected - visibleCount + 1;
+        const windowItems = filtered.slice(menuTop, menuTop + visibleCount);
+        const maxName = Math.max(...windowItems.map((c) => displayWidth(c.name)));
+        const hasMoreAbove = menuTop > 0;
+        const hasMoreBelow = menuTop + visibleCount < filtered.length;
+        return windowItems.map((c, i) => {
+            const globalIdx = menuTop + i;
             // 选中项:▸ 与文字均 cyan+bold(去 dim),未选中项保持 dim——选中行整体高亮。
-            const isSel = i === selected;
+            const isSel = globalIdx === selected;
             const color = isSel ? `${ui.cyan}${ui.bold}` : ui.dim;
             const marker = isSel ? `${ui.cyan}${ui.bold}▸${ui.reset}` : ' ';
             const name = padEndDisplay(c.name, maxName);
-            const descW = cols - maxName - 5; // marker + 空格 + 2 间距
-            const desc = descW > 0 ? truncateDisplay(c.desc, descW) : '';
-            return `${marker} ${color}${name}${ui.reset}  ${color}${desc}${ui.reset}`;
+            // 首/末附加滚动指示(▲/▼)而非替换整行
+            let desc = c.desc;
+            let scrollHint = '';
+            if (i === 0 && hasMoreAbove)
+                scrollHint = ' ▲';
+            if (i === windowItems.length - 1 && hasMoreBelow)
+                scrollHint = ' ▼';
+            const hintW = displayWidth(scrollHint);
+            const descW = cols - maxName - 5 - hintW; // marker + 空格 + 2 间距 + hint
+            const descStr = descW > 0 ? truncateDisplay(desc, descW) : '';
+            return `${marker} ${color}${name}${ui.reset}  ${color}${descStr}${ui.reset}${ui.dim}${scrollHint}${ui.reset}`;
         });
     }
     /** 当前光标在该行的显示列(供 layout 定位光标)。 */
@@ -203,12 +223,15 @@ export async function promptWithSlashMenu(opts) {
         if (cl === 0 && lines[0].startsWith('/')) {
             filtered = opts.commands.filter((c) => c.name.startsWith(lines[0]));
             menuOpen = filtered.length > 0;
-            if (selected >= filtered.length)
+            if (selected >= filtered.length) {
                 selected = 0;
+                menuTop = 0;
+            }
         }
         else {
             filtered = [];
             menuOpen = false;
+            menuTop = 0;
         }
     }
     function redraw() {
@@ -283,6 +306,7 @@ export async function promptWithSlashMenu(opts) {
         menuOpen = false;
         filtered = [];
         selected = 0;
+        menuTop = 0;
         if (pasteTimer) {
             clearTimeout(pasteTimer);
             pasteTimer = null;
@@ -469,6 +493,8 @@ export async function promptWithSlashMenu(opts) {
             case 'escape':
                 menuOpen = false;
                 filtered = [];
+                selected = 0;
+                menuTop = 0;
                 redraw();
                 return;
             case 'left':

package/package.json

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