mocode-ai 1.1.3 → 1.1.5

package/dist/config/index.js

@@ -178,8 +178,12 @@ export function buildBasePrompt(sessionId = getCurrentSessionId()) {
     const memorySection = buildMemoryPromptSection();
     const notepadSection = buildNotepadSection(sessionId);
     // 静态主体:稳定段落集中在前,让支持 prompt caching 的后端能命中前缀缓存(#12)。
+    // 约束:staticBody 的前缀段(尤其 ## Core behavior 第一行)必须是纯静态文本,
+    // 不得嵌入会话级可变函数调用(如 t()/config.model)。否则 /language、/model
+    // 切换会让最敏感的前缀变化,破坏自动前缀缓存命中。可变值统一放到
+    // ## Termination & Reporting 段末尾(仍在切片边界之前,子 agent 仍能拿到)。
     const staticBody = `## Core behavior
-You are mocode, a terminal coding agent. Complete programming tasks through a "think → call tool → observe result → think again" loop until solved. ${t('assistant.languageInstruction')}
+You are mocode, a terminal coding agent. Complete programming tasks through a "think → call tool → observe result → think again" loop until solved.
 
 ## Modes
 - AUTO is the default: investigate and complete the task with the tools currently exposed.
@@ -213,26 +217,33 @@ ${buildCodegraphSection()}
 - Stop immediately when no more tools are needed; give conclusions directly.
 - **Do not stop prematurely during exploration**: if you started investigating but haven't gathered enough information to answer the user's question, keep calling tools. Only stop when you have sufficient evidence or hit a dead end.
 - **No flattery / no preamble in conclusions**: skip "Sure", "好的", "我已经完成了" and similar no-information prefixes — jump straight to substance.
-- Report honestly: say success when successful, say where you're stuck when failing, and mention anything skipped. Reference code in "path:line" format (e.g., src/index.ts:42). Keep it concise.`;
-    // 动态段(置于末尾):memory 索引 + notepad 目录。仅当有内容才拼
-    // "## Project context" 标题,避免空标题噪声(#13)。notepad 使用说明始终保留。
+- Report honestly: say success when successful, say where you're stuck when failing, and mention anything skipped. Reference code in "path:line" format (e.g., src/index.ts:42). Keep it concise.
+${t('assistant.languageInstruction')}`;
+    // 动态段(置于末尾):memory 索引 + notepad 目录与使用说明。
+    // 按需注入(#13):仅当有内容才拼对应标题/说明,避免空标题与无文件时的模板噪声。
+    //   - "## Project context" 仅当 memorySection/notepadSection 非空;
+    //   - notepad 使用说明仅当 notes.md 文件存在(notepadSection 非空)—
+    //     无文件时连 marker 都不拼,既省 token 也让前缀缓存更稳。core 切片
+    //     回退到 MARKER_DYNAMIC_SECTION 或整段(见 buildMocodeCorePrompt)。
     const dynamicParts = [];
     const ctxContent = `${memorySection}${notepadSection}`.trimEnd();
     if (ctxContent) {
         dynamicParts.push(`## Project context (dynamic reference)\n${ctxContent}`);
     }
-    dynamicParts.push(`## Session Notepad (\`.mocode/sessions/${sessionId ?? '<id>'}/notes.md\`)\n` +
-        'Use this compact, persistent working surface for tasks with at least three steps or context-loss risk; skip it for simple work.\n\n' +
-        'Keep at most one active plan:\n' +
-        '```\n' +
-        '## Plan: <title>\n' +
-        'Goal: <outcome>\n' +
-        '### Steps\n' +
-        '- [ ] 1. <verifiable step>\n' +
-        '### Progress\n' +
-        '- <completed phase and evidence>\n' +
-        '```\n' +
-        'Update checkboxes and Progress after each completed phase. Before the final reply, reconcile the plan with actual work, then rename it to `## Done:` or remove it. Keep other notes concise and session-specific; use memory for stable cross-session facts.');
+    if (notepadSection) {
+        dynamicParts.push(`## Session Notepad (\`.mocode/sessions/${sessionId ?? '<id>'}/notes.md\`)\n` +
+            'Use this compact, persistent working surface for tasks with at least three steps or context-loss risk; skip it for simple work.\n\n' +
+            'Keep at most one active plan:\n' +
+            '```\n' +
+            '## Plan: <title>\n' +
+            'Goal: <outcome>\n' +
+            '### Steps\n' +
+            '- [ ] 1. <verifiable step>\n' +
+            '### Progress\n' +
+            '- <completed phase and evidence>\n' +
+            '```\n' +
+            'Update checkboxes and Progress after each completed phase. Before the final reply, reconcile the plan with actual work, then rename it to `## Done:` or remove it. Keep other notes concise and session-specific; use memory for stable cross-session facts.');
+    }
     return `${staticBody}\n\n${dynamicParts.join('\n\n')}`;
 }
 /** 静态主体结束 + 会话私有段起点标记,供 buildMocodeCorePrompt 稳健切片(#17)。 */

package/dist/llm/index.js

@@ -3,6 +3,13 @@ import { config, isSubAgentEnabled } from '../config/index.js';
 import { tools } from '../tools/registry.js';
 import { getPlanDisabledTools } from '../tools/constants.js';
 import { ThinkTagFilter } from './think-filter.js';
+// 强制关闭第三方调试日志泄漏:openai SDK 在 process.env.DEBUG === 'true' 时用裸
+// console.log 把请求/响应直写 stdout,会污染 TUI 输入框(并泄露 headers/URL)。
+// 仅拦截 'true' 这一开关值——保留 namespace 形式的 DEBUG(如 DEBUG=express:*) 调试能力。
+// 必须在 OpenAI 客户端实例化之前执行,确保任何实例都不再触发 debug 输出。
+if (process.env.DEBUG === 'true') {
+    process.env.DEBUG = 'false';
+}
 /**
  * LLM 调用重试策略:
  *   可重试  →  429 (rate limit) / 5xx (server) / APIConnectionError / Node 网络错 (ETIMEDOUT 等)

package/dist/repl/index.js

@@ -760,6 +760,8 @@ export async function startRepl(initialHistory, sessionId, sandboxRootOverride,
     layout.contentMode();
     if (history.some((m) => m.role === 'user')) {
         renderHistory(history);
+        // 强制回尾:同 /resume 命令,renderHistory 展开详情会设 scrollOffset>0,需复位避免闪烁。
+        layout.resetScroll();
     }
     else {
         layout.writeBanner(bannerLines(banner()));
@@ -907,6 +909,11 @@ export async function startRepl(initialHistory, sessionId, sandboxRootOverride,
         // rollbackFlow 原本漏了这一行,renderHistory 末尾的 batch 摘要行 / assistant 文本
         // 收口后,续写位未稳到新空行,下一次 echoInput 的 ❯ 气泡会黏在最后一条输出后面。
         layout.contentWrite('\n');
+        // 回滚后强制回尾:确保 scrollOffset=0，避免后续 showLiveBatch 在冻结视口下
+        // 调用 repaintViewport 导致工具信息闪烁/滚动消失（rollback 后用户继续输入触发新 agent
+        // 运行时，若 scrollOffset 意外 >0，contentWrite 只喂缓冲不物理写，showLiveBatch 的
+        // repaintViewport 画出不含新摘要的冻结窗口 → 工具信息"闪现后消失"）。
+        layout.resetScroll();
         pendingPrefill = prefillText.split('\n');
     };
     /**
@@ -1040,6 +1047,9 @@ export async function startRepl(initialHistory, sessionId, sandboxRootOverride,
         lastTurnUsage = undefined; // 续接:旧会话的 token 累计已无意义,清空等下轮覆写
         layout.clearContent();
         renderHistory(history);
+        // 强制回尾:renderHistory 展开 mutation 工具详情会经 contentInsertAfter 设置 scrollOffset>0;
+        // 若不复位，后续 showLiveBatch 在冻结视口下 repaintViewport 会导致工具信息闪烁/滚动消失。
+        layout.resetScroll();
         // 末尾 \n\n:与后续用户消息(❯ bubble)之间空一行。
         layout.contentWrite(`${ui.dim}${t('repl.resumed', { id: loaded.id })}${ui.reset}\n\n`);
     }

package/dist/ui/batch.js

@@ -194,7 +194,12 @@ export function showLiveBatch(id, layout) {
         // 首条摘要通过增量 contentWrite 落屏时，markdown→普通内容的边界可能只更新了
         // buffer/续写位；直到第二个 header 的 contentReplaceLine 或后续正文重绘才完全可见。
         // 立即按 buffer 原子重画，确保慢工具执行期间摘要前的空行已经显示。
-        layout.repaintViewport?.();
+        // 但滚动回看时(scrollOffset>0) contentWrite 只喂缓冲+冻结视口，此时 repaintViewport
+        // 会画出不含新摘要的冻结窗口（新摘要在窗口之下），造成闪烁；跳过重画，
+        // 等用户回底(scrollOffset=0)时自然可见。修复 rollback 后工具信息滚动消失问题。
+        if (!layout.isScrolled?.()) {
+            layout.repaintViewport?.();
+        }
     }
     else {
         layout.contentReplaceLine(b.summaryAbsIdx, summary);

package/dist/ui/layout.js

@@ -1,4 +1,5 @@
 import { stdin, stdout } from 'node:process';
+import { inspect } from 'node:util';
 import { charWidth, displayWidth, truncateDisplay, truncateDisplayHead, truncateAnsi, ansiDisplayWidth, wrapByDisplayWidth, fmtElapsed, stripAnsi, sliceByDisplayCol, } from './render.js';
 import { ui, applyTerminalBackground, resetTerminalBackground } from './theme.js';
 import * as content from './content.js';
@@ -9,6 +10,58 @@ import { renderMarkdown } from './markdown.js';
 import { t } from '../i18n/index.js';
 // ── 内部状态 ──
 let active = false;
+// ── 裸 console 防御:第三方库(如 openai SDK)可能用 console.log 直写 stdout,
+// 在 RUNNING 态会落到光标所在的底栏输入框,污染输入。进入 TUI 后把 console.*
+// 劫持到 contentWrite,统一进内容区(运行态下 contentWrite 末尾会把真光标归位输入框),
+// 既不再泄漏到输入框,也不会破坏 TUI 布局。TUI 外(active=false)不劫持,
+// 恢复原始 console,保证 host 子进程 JSON 协议 / 退出日志正常。
+let consoleHookInstalled = false;
+const origConsole = {
+    log: console.log,
+    error: console.error,
+    warn: console.warn,
+    info: console.info,
+};
+function routeConsoleToContent(method) {
+    const c = console;
+    c[method] = (...args) => {
+        if (active && ui.isTTY) {
+            let s;
+            try {
+                s = args
+                    .map((a) => (typeof a === 'string' ? a : inspect(a, { depth: 4 })))
+                    .join(' ');
+            }
+            catch {
+                s = String(args[0]);
+            }
+            if (!s.endsWith('\n'))
+                s += '\n';
+            contentWrite(s);
+        }
+        else {
+            origConsole[method](...args);
+        }
+    };
+}
+function installConsoleGuard() {
+    if (consoleHookInstalled)
+        return;
+    routeConsoleToContent('log');
+    routeConsoleToContent('error');
+    routeConsoleToContent('warn');
+    routeConsoleToContent('info');
+    consoleHookInstalled = true;
+}
+function uninstallConsoleGuard() {
+    if (!consoleHookInstalled)
+        return;
+    console.log = origConsole.log;
+    console.error = origConsole.error;
+    console.warn = origConsole.warn;
+    console.info = origConsole.info;
+    consoleHookInstalled = false;
+}
 let mode = 'input';
 let footerH = 6; // 1 虚拟空行 + 1 spinner行 + 1 上线 + 输入行数 + 1 下线 + 1 model行(两行式底栏)
 let contentRow = 1; // 续写位行(1-based,屏坐标,[1,contentBottom])
@@ -1944,12 +1997,14 @@ export function enterAltScreen() {
         resizeTimer?.unref?.();
     };
     process.on('SIGWINCH', sigwinchHandler);
+    installConsoleGuard(); // 进入 TUI 即接管裸 console 输出,防第三方日志污染输入框
 }
 /** 复原:复位 margins + 显光标 + 退 alt + 还原 raw。幂等。 */
 export function exitAltScreen() {
     if (!active)
         return;
     active = false;
+    uninstallConsoleGuard(); // 退出 TUI 恢复原始 console(不影响 host 子进程 / 退出日志)
     resetTerminalBackground();
     stopTurnTimer(); // 兜底清走时计时器(防异常退出泄漏)
     turnStart = null;

package/package.json

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