mocode-ai 0.6.10 → 0.7.0

package/dist/config/index.js

@@ -262,11 +262,20 @@ This is your private working surface — write intermediate findings, decisions,
 and anything you might need to recall later. The file survives context compaction.
 
 ### WHEN TO WRITE
+The notepad is opt-in for complex work, not a routine task log. Use it only when the task has at least 3 meaningful steps, spans multiple investigation/implementation phases, or contains details that are genuinely at risk of being lost to context compaction.
+
+Do NOT create, read, or update the notepad for simple tasks, including:
+- Questions that can be answered directly
+- One-step commands or lookups
+- Small, localized edits that can be completed without intermediate notes
+- Work that only needs a few tool calls and fits comfortably in the current context
+
+For qualifying complex work:
 - After exploring code and discovering key constraints → add a section
-- Before making a design decision → record reasoning and alternatives considered
-- When accumulating data across tool calls → store intermediates
-- When you realize something you might forget after compaction → write it down
-- After completing a phase → summarize what you learned
+- Before making a consequential design decision → record reasoning and alternatives considered
+- When accumulating data across many tool calls → store concise intermediates
+- When you realize important information may be lost after compaction → write it down
+- After completing a substantial phase → summarize what you learned
 
 ### FORMAT (markdown, section-based)
 Use \`## <topic>\` headers to organize. Each section is self-contained.
@@ -313,7 +322,8 @@ Write the plan as a top-level \`## Plan:\` section. The system extracts this for
 Rules:
 - Only ONE active \`## Plan:\` section at a time.
 - Mark steps \`[x]\` as you complete them; append a line to \`### Progress\` after each phase.
-- When the plan is done, either delete the section or rename it to \`## Done: <title>\` so the status bar chip clears automatically.
+- Before your final response, reconcile every step with the work actually completed, then delete the plan section or rename it to \`## Done: <title>\`.
+- The host hides an unchanged active plan when an agent turn ends as a safety fallback; this does not edit the notepad. Keep updating the plan during execution so live progress remains accurate.
 
 ## Termination & Reporting
 - Stop immediately when no more tools are needed; give conclusions directly.

package/dist/index.js

@@ -81,7 +81,7 @@ async function main() {
         }
         const updateNotice = checkAndMaybeUpdate();
         const { startRepl } = await import('./repl/index.js');
-        await startRepl(loaded.history, loaded.id, updateNotice, sandboxRootOverride);
+        await startRepl(loaded.history, loaded.id, updateNotice, sandboxRootOverride, loaded.queryHistory);
     }
     else {
         const updateNotice = checkAndMaybeUpdate();

package/dist/repl/index.js

@@ -237,28 +237,51 @@ function renderContextBarInline(history) {
     const pctCol = pct >= config.compactThreshold ? ui.yellow : ui.accent;
     return `${ui.gray}[${pctCol}${bar}${ui.reset}] ${pctCol}${Math.round(pct * 100)}%${ui.reset} ${ui.dim}${k(est)}/${k(win)}${ui.reset}`;
 }
-/** 从 .mocode/sessions/<sessionId>/notes.md 读取活跃 plan 摘要(## Plan: 段)。每次状态栏刷新时同步读,文件小开销可忽略。 */
-function readPlanFromNotes() {
+// 宿主侧记录已结束轮次最后看到的 plan。notes.md 仍完整保留，只抑制未变化的旧 plan 状态栏，
+// 避免 agent 忘记把 `## Plan:` 改成 `## Done:` 时输入框上方永久悬挂。
+let settledPlanFingerprint;
+/** 读取 notes.md 中唯一活跃的 `## Plan:` 段。进度只统计该段，避免其他笔记 checkbox 污染计数。 */
+function readPlanStatusFromNotes() {
     const sessionId = getCurrentSessionId();
     if (!sessionId)
-        return '';
+        return null;
     const root = getSandboxRoot() ?? process.cwd();
     const p = path.join(root, '.mocode', 'sessions', sessionId, 'notes.md');
     try {
-        const c = fs.readFileSync(p, 'utf8');
-        const title = c.match(/^## Plan:\s*(.+)$/m)?.[1].trim();
+        const normalized = fs.readFileSync(p, 'utf8').replace(/\r\n?/g, '\n');
+        const lines = normalized.split('\n');
+        const start = lines.findIndex((line) => /^## Plan:\s*.+$/.test(line));
+        if (start < 0)
+            return null;
+        const endOffset = lines.slice(start + 1).findIndex((line) => /^##\s/.test(line));
+        const end = endOffset < 0 ? lines.length : start + 1 + endOffset;
+        const section = lines.slice(start, end).join('\n').trimEnd();
+        const title = lines[start].match(/^## Plan:\s*(.+)$/)?.[1].trim();
         if (!title)
-            return '';
-        const total = (c.match(/^\s*-\s*\[[ xX]\]\s*\d+\./gm) || []).length;
-        const done = (c.match(/^\s*-\s*\[[xX]\]\s*\d+\./gm) || []).length;
-        const current = c.match(/^\s*-\s*\[ \]\s*\d+\.\s*(.+)$/m)?.[1].trim();
+            return null;
+        const total = (section.match(/^\s*-\s*\[[ xX]\]\s*\d+\./gm) || []).length;
+        const done = (section.match(/^\s*-\s*\[[xX]\]\s*\d+\./gm) || []).length;
+        const current = section.match(/^\s*-\s*\[ \]\s*\d+\.\s*(.+)$/m)?.[1].trim();
         const summary = `plan: ${title} (${done}/${total})`;
-        return current ? `${summary} ▸ ${current}` : summary;
+        // mtime 让“相同内容被重写为一项新计划”也能重新出现，而不被旧轮次误抑制。
+        const fingerprint = `${sessionId}\0${fs.statSync(p).mtimeMs}\0${section}`;
+        return { fingerprint, summary: current ? `${summary} ▸ ${current}` : summary };
     }
     catch {
-        return '';
+        return null;
     }
 }
+/** 将当前 plan 标记为已结算。只影响状态栏，不修改 agent 的工作笔记。 */
+function settlePlanStatus() {
+    settledPlanFingerprint = readPlanStatusFromNotes()?.fingerprint;
+}
+/** 从 notes.md 读取活跃 plan 摘要；已结算且未变化的旧 plan 不再显示。 */
+function readPlanFromNotes() {
+    const plan = readPlanStatusFromNotes();
+    if (!plan || plan.fingerprint === settledPlanFingerprint)
+        return '';
+    return plan.summary;
+}
 /** 状态行基线:模型 / context / cwd / 模式标识 / 活跃 plan chip / 本轮 token。repl 在轮次边界、切模式、plan 变更时调。 */
 function refreshStatusBase(history, lastTurnUsage) {
     layout.setStatusBase({
@@ -536,6 +559,13 @@ function textOf(c) {
     }
     return String(c);
 }
+/** 从旧 session 的消息历史回填输入历史；新 session 使用独立 queryHistory，避免混入合成 user 消息。 */
+function queryHistoryFromMessages(messages) {
+    return messages
+        .filter((message) => message.role === 'user')
+        .map((message) => textOf(message.content))
+        .filter((query) => query.trim().length > 0);
+}
 /**
  * 把会话历史渲染成静态文本进内容区(回滚 / 续接 / --resume 后复显上下文):
  * user→❯ 回显、assistant→正文(+ tool_calls 折叠成 ● 摘要行)、tool→↳ 结果预览;system 跳过。
@@ -649,7 +679,7 @@ export function renderHistory(history) {
  * contentWrite 落入内容区(滚动区域内自动滚动,底栏不动)。history 由本模块持有,在轮次间持久;
  * agent 只读取并追加(+ 经 session/ 压缩)。每轮成功结束后自动落盘,退出后可用 --resume / /resume 续接。
  */
-export async function startRepl(initialHistory, sessionId, updateNotice = null, sandboxRootOverride) {
+export async function startRepl(initialHistory, sessionId, updateNotice = null, sandboxRootOverride, initialQueryHistory) {
     // 模式重置:agentMode 不落盘,每个 REPL 会话从 auto 开始(/resume / --resume 亦重置)。
     setAgentMode('auto');
     // 沙箱根:文件操作边界。优先级 --sandbox-root > SANDBOX_ROOT env > process.cwd()。
@@ -686,6 +716,10 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
     const history = initialHistory && initialHistory.length
         ? initialHistory
         : [{ role: 'system', content: buildSystemMessage(false) }];
+    // 新 session 使用独立输入历史；旧 session 没有该字段时从 user 消息兼容回填一次。
+    let queryHistory = initialQueryHistory
+        ? [...initialQueryHistory]
+        : queryHistoryFromMessages(history);
     if (initialHistory &&
         initialHistory.length &&
         history[0]?.role === 'system') {
@@ -839,7 +873,7 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             currentSessionId = newSessionId();
         setCurrentSessionId(currentSessionId, process.cwd()); // 同步到 session/state,确保 notes.md 存在
         try {
-            saveSession(history, currentSessionId);
+            saveSession(history, currentSessionId, queryHistory);
         }
         catch {
             // 落盘失败不阻断
@@ -896,16 +930,15 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
                 layout.drawStatusBar();
             });
             // 本轮 token 累计(底栏模式 chip 右边显示)。undefined = 后端不开 include_usage。
+            // 状态栏统一在 finally 刷新，确保正常、中断、异常都经过同一 plan 收尾路径。
             lastTurnUsage = result.usage;
-            refreshStatusBase(history, lastTurnUsage); // 即时刷状态行显示本轮 token chip
-            layout.drawStatusBar();
             ok = !signal.aborted; // 中断(Ctrl+C)→ runAgent 已还原 history,ok=false 不弹审批
             // 成功轮次自动落盘(崩溃也保住上一轮);新会话首轮分配 id
             if (!currentSessionId)
                 currentSessionId = newSessionId();
             setCurrentSessionId(currentSessionId, process.cwd()); // 同步到 session/state,确保 notes.md 存在
             try {
-                saveSession(history, currentSessionId);
+                saveSession(history, currentSessionId, queryHistory);
             }
             catch {
                 // 落盘失败不阻断 REPL
@@ -920,6 +953,16 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
         }
         catch (e) {
             ok = false;
+            // 请求失败也保存已确认提交的 query，确保立即退出后仍可通过 ↑ 或 resume 找回。
+            if (!currentSessionId)
+                currentSessionId = newSessionId();
+            setCurrentSessionId(currentSessionId, process.cwd());
+            try {
+                saveSession(history, currentSessionId, queryHistory);
+            }
+            catch {
+                // 落盘失败不覆盖原始请求错误
+            }
             // 多模态相关错误友好提示:OpenAI/Anthropic 等会报 "does not support image" / "vision" / "multimodal" 等关键词,
             // 直接给原文对中文用户不友好。这里翻译成中文 + 提示 /model 换视觉模型。
             const msg = e instanceof Error ? e.message : String(e);
@@ -937,6 +980,13 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
         }
         finally {
             stopRunningListener();
+            // 纯 plan 轮正常结束后仍需等待审批/细化，继续展示；其余终态统一结算。
+            // 结算只隐藏当前 fingerprint，不修改 notes；后续内容或 mtime 变化会自动重新显示。
+            const waitingForPlanApproval = ok && planMode && getAgentMode() === 'plan';
+            if (!waitingForPlanApproval)
+                settlePlanStatus();
+            refreshStatusBase(history, lastTurnUsage);
+            layout.drawStatusBar();
         }
         layout.contentWrite('\n'); // 轮次之间空行
         return ok;
@@ -955,6 +1005,9 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
         }
         history.length = 0;
         history.push(...loaded.history);
+        queryHistory = loaded.queryHistory
+            ? [...loaded.queryHistory]
+            : queryHistoryFromMessages(loaded.history);
         setAgentMode('auto'); // 续接重置为 auto(mode 不落盘;listener 重写 history[0] 回 auto,与 loaded 幂等)
         currentSessionId = loaded.id;
         setCurrentSessionId(loaded.id, process.cwd()); // 切换会话:确保该会话的 notes.md 存在
@@ -985,6 +1038,7 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             input = await promptWithSlashMenu({
                 prompt: PROMPT,
                 commands: buildSlashCommands(),
+                queryHistory,
                 onCycleMode: cycleMode,
                 // /rollback 预填优先;否则上一轮运行中 typeahead 打的字 → 预填进输入框,用户可改可发
                 ...(pendingPrefill
@@ -2085,6 +2139,8 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             layout.enterInputMode(t('repl.idle'));
             continue;
         }
+        // 只记录已过撤回窗口的真实用户 query；slash 命令和合成执行轮不会走到这里。
+        queryHistory.push(joined);
         const initialPlan = getAgentMode() === 'plan'; // 轮首模式(在 runTurn 之前读)
         const ok = await runTurn(joined, initialPlan, placeholder);
         // plan 轮正常结束(未中断 / 未抛错)→ 看轮末模式决定:

package/dist/session/persist.js

@@ -44,22 +44,27 @@ function firstUserOf(history) {
 function sessionPath(id) {
     return path.join(config.sessionDir, id, 'session.json');
 }
-/** 保存会话到磁盘。全新且只有 system 的会话不创建文件；已有会话即使回滚为空也必须覆盖旧记录。 */
-export function saveSession(history, id) {
+/** 保存会话到磁盘。全新且没有 query 的会话不创建文件；已有会话即使回滚为空也必须覆盖旧记录。 */
+export function saveSession(history, id, queryHistory = []) {
     const meta = {
         id,
         createdAt: idToIso(id),
         model: config.model,
-        firstUser: history.length > 1 ? firstUserOf(history) : '',
+        firstUser: history.length > 1
+            ? firstUserOf(history)
+            : truncateDisplay((queryHistory[0] ?? '').replace(/\n/g, ' ').trim(), 40),
     };
     const currentPath = sessionPath(id);
     const legacyPath = path.join(config.sessionDir, `${id}.json`);
-    if (history.length <= 1 && !existsSync(currentPath) && !existsSync(legacyPath)) {
+    if (history.length <= 1 &&
+        queryHistory.length === 0 &&
+        !existsSync(currentPath) &&
+        !existsSync(legacyPath)) {
         return meta;
     }
     const dir = path.join(config.sessionDir, id);
     mkdirSync(dir, { recursive: true });
-    const record = { ...meta, history };
+    const record = { ...meta, history, queryHistory: [...queryHistory] };
     writeFileSync(currentPath, JSON.stringify(record), 'utf8');
     // 一旦写入新式目录，删除旧式扁平副本，避免已回滚消息仍残留在磁盘。
     if (existsSync(legacyPath))
@@ -86,6 +91,9 @@ export function loadSession(id) {
             model: rec.model ?? '',
             firstUser: rec.firstUser ?? '',
             history: rec.history,
+            queryHistory: Array.isArray(rec.queryHistory)
+                ? rec.queryHistory.filter((query) => typeof query === 'string')
+                : undefined,
         };
     }
     catch {

package/dist/ui/prompt.js

@@ -90,6 +90,59 @@ export async function promptWithSlashMenu(opts) {
     let resolved = false;
     let resolve;
     let reject;
+    const queryHistory = opts.queryHistory ?? [];
+    let historyIndex = queryHistory.length; // length = 草稿哨兵；0..length-1 = 历史项
+    let historyDraft = null;
+    /** 用历史 query 替换编辑缓冲；历史内容恢复为普通可编辑文本。 */
+    function loadHistoryEntry(value) {
+        lines = value.split('\n');
+        cl = lines.length - 1;
+        cc = lines[cl].length;
+        chip = null;
+        chipPre = '';
+        selected = 0;
+        menuTop = 0;
+        justSawCR = false;
+        computeFiltered();
+        redraw();
+    }
+    /** 在首次离开最新位置时保存完整草稿，然后向更旧的 query 移动。 */
+    function recallPrevious() {
+        if (queryHistory.length === 0 || historyIndex <= 0)
+            return;
+        if (historyIndex === queryHistory.length) {
+            historyDraft = {
+                lines: [...lines],
+                cl,
+                cc,
+                chip,
+                chipPre,
+            };
+        }
+        historyIndex--;
+        loadHistoryEntry(queryHistory[historyIndex]);
+    }
+    /** 向更新的 query 移动；越过最新历史时恢复进入历史前的草稿。 */
+    function recallNext() {
+        if (historyIndex >= queryHistory.length)
+            return;
+        historyIndex++;
+        if (historyIndex < queryHistory.length) {
+            loadHistoryEntry(queryHistory[historyIndex]);
+            return;
+        }
+        const draft = historyDraft;
+        lines = draft ? [...draft.lines] : [''];
+        cl = draft?.cl ?? 0;
+        cc = draft?.cc ?? 0;
+        chip = draft?.chip ?? null;
+        chipPre = draft?.chipPre ?? '';
+        selected = 0;
+        menuTop = 0;
+        justSawCR = false;
+        computeFiltered();
+        redraw();
+    }
     /** 菜单行(预渲染,带色)——向上展开进内容区底,由 layout 贴入。最多显示 MENU_MAX_VISIBLE 条,支持上下滚动。 */
     function menuLines() {
         if (!menuOpen || filtered.length === 0)
@@ -456,6 +509,8 @@ export async function promptWithSlashMenu(opts) {
         filtered = [];
         selected = 0;
         menuTop = 0;
+        historyIndex = queryHistory.length;
+        historyDraft = null;
         if (pasteTimer) {
             clearTimeout(pasteTimer);
             pasteTimer = null;
@@ -518,19 +573,11 @@ export async function promptWithSlashMenu(opts) {
                 pasteParts.push(s);
             return;
         }
-        // 滚动回看键(优先;不触发回尾):PgUp/PgDn 翻页,Ctrl+↑↓ 与 plain ↑/↓ 每次 5 行。
-        // plain ↑/↓ 仅在单行输入且菜单关闭时作滚动(多行编辑留给光标移动,菜单打开留给选项);
-        // 兼鼠标滚轮——alt 屏内(经 \x1B[?1007h)滚轮转发 ↑/↓,1 行/格太慢故放大到 5。
-        const plainArrowScroll = (key.name === 'up' || key.name === 'down') &&
-            !key.ctrl &&
-            !key.meta &&
-            !key.shift &&
-            lines.length <= 1 &&
-            !(menuOpen && filtered.length > 0);
+        // 滚动回看键(优先;不触发回尾):PgUp/PgDn 翻页，Ctrl+↑/↓ 每次 5 行。
+        // 裸 ↑/↓ 留给斜杠菜单、多行光标和 query 历史导航；鼠标滚轮由 SGR mouse 事件处理。
         if (key.name === 'pageup' ||
             key.name === 'pagedown' ||
-            (key.ctrl && (key.name === 'up' || key.name === 'down')) ||
-            plainArrowScroll) {
+            (key.ctrl && (key.name === 'up' || key.name === 'down'))) {
             const pageH = layout.getGeo().contentBottom;
             if (key.name === 'pageup')
                 layout.scrollBy(pageH);
@@ -622,6 +669,9 @@ export async function promptWithSlashMenu(opts) {
                     cc = Math.min(cc, lines[cl].length);
                     redraw();
                 }
+                else {
+                    recallPrevious();
+                }
                 return;
             case 'down':
                 if (menuOpen && filtered.length) {
@@ -633,6 +683,9 @@ export async function promptWithSlashMenu(opts) {
                     cc = Math.min(cc, lines[cl].length);
                     redraw();
                 }
+                else {
+                    recallNext();
+                }
                 return;
             case 'tab':
                 if (menuOpen && filtered[selected])

package/package.json

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