mocode-ai 0.5.10 → 0.6.1

package/dist/agent/core.js

@@ -140,9 +140,6 @@ export async function runAgentCore(opts) {
     const { history, userInput, signal, onContextUpdate, hooks, skipRollback } = opts;
     const runtimeContextState = opts.contextState ?? contextState;
     const maxSteps = opts.maxSteps ?? config.maxSteps;
-    // 中断回滚快照:入口(本 turn push 任何消息前)整段浅拷贝。abort 时 length=0;push(...saved) 还原。
-    // 用 slice() 而非 length:maybeCompact 会原地重建(length=0;push(...rebuilt)),savedLen 会失效。
-    const savedHistory = history.slice();
     // 中断还原:LLM 中途可能调 switch_mode 切了模式,abort 时连同模式一起还原回轮首。
     const savedMode = getAgentMode();
     // 本轮计时:从入口到完毕(正常 return / 达上限),供 finally 打 ✻ Worked for 摘要行。
@@ -174,6 +171,11 @@ export async function runAgentCore(opts) {
         return thrashHint(name, args, c);
     };
     history.push({ role: 'user', content: userInput });
+    // 中断回滚快照:push 用户消息后整段浅拷贝。abort 时 length=0;push(...saved) 还原。
+    // 这样中断时至少保留用户消息(及之前的历史);每步工具全部执行完毕后刷新快照,
+    // 保留已完成的 assistant+tool_calls+tool 结果,只丢弃当前未完成步骤的消息。
+    // 用 slice() 而非 length:maybeCompact 会原地重建(length=0;push(...rebuilt)),savedLen 会失效。
+    let savedHistory = history.slice();
     // drop_context 工具的上下文剔除回调:闭包捕获 history,原地剔除无关旧 tool 结果。
     // 保护由 dropContextFromHistory 内部保证:history[0](system)+ 当前轮(最后 user 及其后)永不剔除。
     // 子 agent 也在自己的 history 上操作(子 agent 独立 history);skipRollback 不影响此行为。
@@ -454,6 +456,9 @@ export async function runAgentCore(opts) {
                 // 工具步末尾补一空行:与下一轮的思考 / 正文分隔(否则 ↳ 后紧接 ▎ 思考,无空行不好看;
                 // 与正文→● 的 1 空行对称)。工具结果已以 \n 收尾,此处再补 \n 恰好 1 空行。
                 hooks.onToolBatchEnd?.();
+                // 刷新中断快照:工具全部执行完毕后,history 处于一致状态(assistant+tool_calls+tool 结果完整),
+                // 此时中断可安全保留这些已完成的消息,只丢弃下一轮未完成的 chat() 响应。
+                savedHistory = history.slice();
                 continue; // 带着工具结果再调一次 LLM
             }
             if (mode !== 'idle' && lastChar !== '\n')

package/dist/config/index.js

@@ -216,7 +216,7 @@ ${PLATFORM_NOTE}
 - Batch only independent read-only calls. After their results arrive, make the dependent edit in the next turn; then batch independent edits and one final verification when their exact inputs are already known.
 - Read only what supports the next decision; verify once after a related edit set, not after every edit.
 - Do not repeat an unchanged failing call; after three unproductive attempts, change tools or ask for the missing decision.
-- **Don't re-read a file you already have, unless it may have changed**: if you (or an earlier step in this session) already read a file's relevant content and nothing has touched it since, edit directly from that content instead of calling read_file again "to be safe". This does NOT apply when the file was edited (by you or externally) since your last read, when a prior edit may have shifted line numbers you're about to target, or right after a compact where you're unsure the surviving context is accurate — in those cases re-reading is expected and correct, not wasteful.
+- For \`edit_file\`, derive \`old_string\` by copying the exact relevant lines from the latest successful \`read_file\` of that same path; never reconstruct it from memory, a summary, grep output, or a previous diff. That read becomes stale after any edit/write to the path, compaction/resume, or a possible external change. On an \`old_string\` mismatch, re-read the exact region and retry once with the newly returned text; never retry identical arguments.
 
 ## Workflow
 - Understand requirements and current code before acting; do not guess.
@@ -226,7 +226,7 @@ ${PLATFORM_NOTE}
 
 ## Tool rules
 - Precise path/symbol → go directly to \`read_file\` or \`codegraph node\`; use \`glob\`/\`grep\` only for discovery.
-- Before editing, confirm the relevant content unless it is already current in this conversation. Use \`edit_file\` for unique local replacements and \`write_file\` for new/full files.
+- Before editing, read the exact target region and use its verbatim text as \`old_string\`. Use \`edit_file\` for unique local replacements and \`write_file\` for new/full files.
 - Local edits require an exact unique match; use \`write_file\` for new/full files.
 - Use \`glob\`/\`grep\` for discovery and \`run_command\` for execution or verification, not file existence checks. State intent before side effects.
 - Call \`ask_human\` only when a real user decision is required; otherwise decide and proceed.

package/dist/repl/index.js

@@ -8,7 +8,7 @@ import { runAgent } from '../agent/index.js';
 import { getAgentMode, setAgentMode, onModeChange } from '../agent/mode.js';
 import { togglePet, killPetProcess, listSkins, setSkin, sendState } from '../pet/bridge.js';
 import { setSandboxRoot } from '../sandbox/root.js';
-import { ui, setTheme, getTheme, listThemes, themeExists } from '../ui/theme.js';
+import { ui, setTheme, getTheme, listThemes, themeExists, applyTerminalBackground } from '../ui/theme.js';
 import { bannerLines, displayWidth, padEndDisplay, summarizeToolCall, summarizeToolResult } from '../ui/render.js';
 import * as layout from '../ui/layout.js';
 import * as mouse from '../ui/mouse.js';
@@ -1310,6 +1310,7 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             // 切:setTheme → 重算状态行(新色)→ 清内容重绘(历史 / 横幅,镜像启动 + /resume)→ 确认 → 持久化。
             // markdown MEMO 按 themeVersion 自动失效,故 renderHistory 取新色;状态栏 / 输入框由 continue 回 INPUT 态时读 getter 刷。
             setTheme(name);
+            applyTerminalBackground();
             refreshStatusBase(history);
             layout.clearContent();
             if (history.some((m) => m.role === 'user')) {

package/dist/session/persist.js

@@ -88,8 +88,9 @@ export function loadSession(id) {
 }
 /** 列出最近会话,按 createdAt 降序。损坏文件跳过。
  *  - limit?: 仅返回前 N 条。会话目录名是 YYYYMMDD-HHmmss,字典序=时间序;
- *    先按目录名降序取前 N,再解析 session.json,避免
- *    /resume 在 sessions 目录堆了几百个子目录时 readdirSync + 全量 JSON.parse 慢。
+ *    按目录名降序逐个解析，收集到 N 个有效会话就停止，避免 /resume 在
+ *    sessions 目录堆了几百个子目录时全量 JSON.parse；同时不让只有笔记或
+ *    快照、没有 session.json 的目录占掉最近 N 条的名额。
  *  - 不传 limit 时读全部(向后兼容,供裸 --resume 列全表用)。
  *  - 向后兼容:同时扫描旧式 <id>.json 文件(扁平结构),优先读新式目录。
  */
@@ -108,9 +109,11 @@ export function listSessions(limit) {
         }
     }
     const all = ids.sort().reverse(); // 降序:最新在前
-    const toRead = typeof limit === 'number' ? all.slice(0, Math.max(0, limit)) : all;
+    const maxResults = typeof limit === 'number' ? Math.max(0, limit) : Infinity;
     const out = [];
-    for (const id of toRead) {
+    for (const id of all) {
+        if (out.length >= maxResults)
+            break;
         try {
             // 优先新式目录,回退旧式文件
             const newPath = path.join(config.sessionDir, id, 'session.json');

package/dist/tools/builtins/edit-file.js

@@ -3,7 +3,7 @@ import { resolve } from 'node:path';
 // ---------- edit_file ----------
 export const editFileTool = {
     name: 'edit_file',
-    description: 'Replace a string in a file. old_string must occur exactly once and match exactly (including indentation/newlines). Use write_file for new files.',
+    description: 'Replace a string in a file. old_string must occur exactly once and match exactly (including indentation/newlines). Copy old_string verbatim from a fresh read_file result for this path; do not reconstruct it from memory or summaries. Use write_file for new files.',
     risk: 'confirm',
     parameters: {
         type: 'object',
@@ -29,7 +29,7 @@ export const editFileTool = {
         const normNew = newStr.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
         const count = norm.split(normOld).length - 1;
         if (count === 0) {
-            return `错误:在 ${path} 中未找到 old_string。请先 read_file 确认实际内容。`;
+            return `错误:在 ${path} 中未找到 old_string。不要重试相同参数；请先 read_file 读取目标区域，再从返回内容逐字复制新的 old_string 后重试。`;
         }
         if (count > 1) {
             return `错误:old_string 在 ${path} 中出现 ${count} 次,不唯一。请加入更多上下文使其唯一。`;

package/dist/ui/layout.js

@@ -1,6 +1,6 @@
 import { stdin, stdout } from 'node:process';
 import { charWidth, displayWidth, truncateDisplay, truncateDisplayHead, truncateAnsi, ansiDisplayWidth, wrapByDisplayWidth, fmtElapsed, stripAnsi, sliceByDisplayCol, } from './render.js';
-import { ui } from './theme.js';
+import { ui, applyTerminalBackground, resetTerminalBackground } from './theme.js';
 import * as content from './content.js';
 import * as mouse from './mouse.js';
 import { shiftBatchesAfter } from './batch.js';
@@ -1886,6 +1886,7 @@ export function enterAltScreen() {
         return;
     active = true;
     stdout.write(esc.altOn);
+    applyTerminalBackground();
     stdout.write(esc.mouseOn); // 完整鼠标追踪(按下/拖动/释放/滚轮)→ mouse.swallow 重组 → handleMouseEvent
     mouse.setHandler(handleMouseEvent);
     setRegion(6); // 1 虚拟空 + 1 spinner行 + 1 上线 + 1 输入 + 1 下线 + 1 model行(两行式底栏)
@@ -1943,6 +1944,7 @@ export function exitAltScreen() {
     if (!active)
         return;
     active = false;
+    resetTerminalBackground();
     stopTurnTimer(); // 兜底清走时计时器(防异常退出泄漏)
     turnStart = null;
     scrollLockUntil = 0; // 清轮首滚动锁(防状态泄漏到下次进 alt 屏)

package/dist/ui/theme.js

@@ -33,6 +33,7 @@ const DEFAULT = {
     // diff 行底色:One Dark bg #282c34 上加 ~14% 亮度的对应色,够辨识但不刺眼
     addBg: '\x1B[48;2;44;62;42m', // 偏暗绿(One Dark green(152,195,121)暗化)
     delBg: '\x1B[48;2;62;38;42m', // 偏暗红(One Dark red(224,108,117)暗化)
+    terminalBg: 'rgb:28/2c/34', // One Dark 经典深底,偏蓝灰的黑
 };
 /**
  * 内建主题表。default=One Dark、light=Solarized Light、solarized=Solarized Dark、
@@ -58,6 +59,7 @@ const THEMES = {
         // 比直接用 base1 更柔,跟深 fg(red/green)对比充足
         addBg: '\x1B[48;2;220;235;205m',
         delBg: '\x1B[48;2;245;218;215m',
+        terminalBg: 'rgb:1a/1e/24', // 深黑底带微蓝,与 light 主题文字反差大
     },
     solarized: {
         red: '\x1B[38;2;220;50;47m',
@@ -74,6 +76,7 @@ const THEMES = {
         // diff 行底色:Solarized Dark base03(0,43,54)上加对应色族暗 tint
         addBg: '\x1B[48;2;20;50;38m',
         delBg: '\x1B[48;2;55;30;30m',
+        terminalBg: 'rgb:00/2b/36', // Solarized Dark base03,深青黑
     },
     gruvbox: {
         red: '\x1B[38;2;251;73;52m',
@@ -90,6 +93,7 @@ const THEMES = {
         // diff 行底色:Gruvbox dark bg(40,40,40)上贴暗 bg0_a 风格
         addBg: '\x1B[48;2;40;55;30m',
         delBg: '\x1B[48;2;70;35;30m',
+        terminalBg: 'rgb:28/28/28', // Gruvbox 深黑底,带微暖色调
     },
     nord: {
         red: '\x1B[38;2;191;97;106m',
@@ -106,6 +110,7 @@ const THEMES = {
         // diff 行底色:Nord polar night(46,52,64)上贴对应色族暗 tint
         addBg: '\x1B[48;2;46;66;52m',
         delBg: '\x1B[48;2;72;46;52m',
+        terminalBg: 'rgb:2e/34/40', // Nord Polar Night 深灰蓝
     },
     orange: {
         // 秋季/南瓜橙:深暖底(#231c16 系)+ accent 主强调走橙色;yellow 槽也偏橙
@@ -125,6 +130,7 @@ const THEMES = {
         // diff 行底色:暖深棕底上贴对应色族暗 tint,跟 fg 配对柔和可辨
         addBg: '\x1B[48;2;55;70;35m',
         delBg: '\x1B[48;2;78;42;32m',
+        terminalBg: 'rgb:23/1c/16', // 深暖棕黑,带橙色调
     },
     rose: {
         // 玫红:深紫底 + accent 玫粉作主强调;magenta 槽与 accent 同源(主题色),
@@ -143,6 +149,7 @@ const THEMES = {
         // diff 行底色:深紫底贴对应色族暗 tint,绿暗化偏橄榄、红暗化偏紫红
         addBg: '\x1B[48;2;50;60;42m',
         delBg: '\x1B[48;2;75;40;52m',
+        terminalBg: 'rgb:1e/14/1c', // 深紫黑底,带玫红暖调
     },
     emerald: {
         // 翡翠绿:深绿底 + accent 翡翠绿作主强调;green 槽与 accent 同源(主题色),
@@ -161,6 +168,7 @@ const THEMES = {
         // diff 行底色:深绿底贴对应色族暗 tint,绿暗化偏深绿、红暗化偏暗红
         addBg: '\x1B[48;2;30;55;40m',
         delBg: '\x1B[48;2;60;40;40m',
+        terminalBg: 'rgb:10/1e/18', // 深绿黑底,翡翠色调
     },
     amber: {
         // 琥珀金黄:深棕底 + accent 琥珀金黄作主强调;yellow 槽与 accent 同源(主题色),
@@ -179,6 +187,7 @@ const THEMES = {
         // diff 行底色:深棕底贴对应色族暗 tint,绿暗化偏橄榄、红暗化偏暗棕红
         addBg: '\x1B[48;2;50;55;25m',
         delBg: '\x1B[48;2;70;40;28m',
+        terminalBg: 'rgb:1e/18/0e', // 深棕黑底,琥珀金黄调
     },
     lavender: {
         // 薰衣草淡紫:深紫底 + accent 淡紫作主强调;magenta 槽与 accent 同源(主题色),
@@ -197,6 +206,7 @@ const THEMES = {
         // diff 行底色:深紫底贴对应色族暗 tint,绿暗化偏冷绿、红暗化偏冷紫红
         addBg: '\x1B[48;2;38;46;42m',
         delBg: '\x1B[48;2;60;40;55m',
+        terminalBg: 'rgb:18/14/24', // 深紫黑底,薰衣草冷调
     },
     sunset: {
         // 日落珊瑚:深棕红底 + accent 珊瑚红作主强调;red 槽与 accent 同源(主题色);
@@ -215,6 +225,7 @@ const THEMES = {
         // diff 行底色:深棕红底贴对应色族暗 tint,绿暗化偏橄榄、红暗化偏暗棕红
         addBg: '\x1B[48;2;50;55;30m',
         delBg: '\x1B[48;2;75;32;30m',
+        terminalBg: 'rgb:20/12/10', // 深棕红黑底,珊瑚暖调
     },
 };
 let currentName = 'default';
@@ -222,6 +233,18 @@ let version = 0;
 function currentPalette() {
     return THEMES[currentName] ?? DEFAULT;
 }
+/** Apply the active theme's dark background to the terminal window (OSC 11). */
+export function applyTerminalBackground() {
+    if (!isTTY)
+        return;
+    stdout.write(`\x1B]11;${currentPalette().terminalBg}\x07`);
+}
+/** Ask the terminal to restore its default background color. */
+export function resetTerminalBackground() {
+    if (!isTTY)
+        return;
+    stdout.write('\x1B]111\x07');
+}
 /** 取某颜色字段的当前 ANSI 码(经 isTTY 门控)。 */
 function color(key) {
     return wrap(currentPalette()[key] ?? DEFAULT[key]);

package/dist/ui/thinking.js

@@ -0,0 +1,80 @@
+import { renderMarkdown } from './markdown.js';
+import { ui } from './theme.js';
+const records = new Map();
+const absLineToId = new Map();
+let liveRaw = '';
+let nextId = 0;
+/** 流式写入推理；首次写入会结束此前的正文 Markdown 段，确保两者能独立折叠。 */
+export function writeThinking(delta, layout) {
+    if (!delta)
+        return;
+    if (!liveRaw)
+        layout.beginMarkdownSegment();
+    liveRaw += delta;
+    layout.contentWriteMd(delta);
+}
+/** 推理流结束：将实时 Markdown 段替换为可点击的一行摘要。 */
+export function finishThinking(layout) {
+    if (!liveRaw)
+        return;
+    const raw = liveRaw;
+    liveRaw = '';
+    const lineCount = raw.split('\n').length;
+    const summary = `  ${ui.bold}${ui.accent}▸${ui.reset} ${ui.dim}Thought · ${lineCount} lines (click to expand)${ui.reset}`;
+    const summaryAbsIdx = layout.collapseMarkdownSegment(summary);
+    if (summaryAbsIdx == null)
+        return;
+    const id = `t${++nextId}`;
+    records.set(id, { id, summaryAbsIdx, raw, expanded: false, expandedLineCount: 0 });
+    absLineToId.set(summaryAbsIdx, id);
+}
+/** 返回指定缓冲绝对行命中的推理记录；非摘要行返回 null。 */
+export function findThinkingByAbsLine(absLine) {
+    return absLineToId.get(absLine) ?? null;
+}
+/** 切换摘要行下的完整推理内容。 */
+export function toggleThinking(id, layout) {
+    const record = records.get(id);
+    if (!record)
+        return;
+    if (record.expanded) {
+        layout.contentDeleteFrom(record.summaryAbsIdx + 1, record.expandedLineCount);
+        record.expanded = false;
+        record.expandedLineCount = 0;
+        return;
+    }
+    const rendered = renderMarkdown(record.raw, layout.contentCols());
+    const maxLines = 200;
+    const lines = rendered.slice(0, maxLines);
+    if (rendered.length > maxLines) {
+        lines.push(`${ui.dim}  … (${rendered.length - maxLines} more lines)${ui.reset}`);
+    }
+    if (lines.length === 0)
+        return;
+    layout.contentInsertAfter(record.summaryAbsIdx, lines);
+    record.expanded = true;
+    record.expandedLineCount = lines.length;
+}
+/** 缓冲中段插删后同步摘要绝对行索引。 */
+export function shiftThinkingsAfter(absIdx, delta) {
+    if (delta === 0)
+        return;
+    const next = new Map();
+    for (const [idx, id] of absLineToId) {
+        const shifted = idx > absIdx ? idx + delta : idx;
+        if (shifted >= 0)
+            next.set(shifted, id);
+        const record = records.get(id);
+        if (record && idx > absIdx)
+            record.summaryAbsIdx = shifted;
+    }
+    absLineToId.clear();
+    for (const [idx, id] of next)
+        absLineToId.set(idx, id);
+}
+/** 内容区整体清空时清掉折叠状态与尚未结束的流。 */
+export function resetThinkings() {
+    records.clear();
+    absLineToId.clear();
+    liveRaw = '';
+}

package/package.json

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