mocode-ai 0.5.4 → 0.5.6

package/dist/session/compact.js

@@ -5,10 +5,13 @@ import { ui } from '../ui/theme.js';
 import { Spinner } from '../ui/spinner.js';
 import * as layout from '../ui/layout.js';
 import { pruneAfterCompaction } from '../rollback/index.js';
-/** 跨模块共享的上下文状态:agent 写 lastUsage,compact 写 lastEstimate,repl 的 /context 读。
- *  scheduler.ts 写最近一次调度日志(可选,repl 可读不到时 no-op)。 */
+import { toText } from '../context/utils.js';
+export function createContextState() {
+    return { lastEstimate: 0, correction: 1 };
+}
 export const contextState = {
     lastEstimate: 0,
+    correction: 1,
 };
 /** 中截:text 太长时保 head + 标记 + tail,总长 ≤ max。 */
 export function truncateMid(text, max) {
@@ -97,19 +100,7 @@ export function capToolResultForHistory(name, output) {
         return output;
     return truncateMid(output, MAX_HISTORY_RESULT);
 }
-// ── 内部:消息内容拍平 / group 划分 ──────────────────────────────────────
-function toText(content) {
-    if (content == null)
-        return '';
-    if (typeof content === 'string')
-        return content;
-    try {
-        return JSON.stringify(content);
-    }
-    catch {
-        return String(content);
-    }
-}
+// ── 内部:group 划分(toText 已移至 context/utils.ts 统一维护) ────────────
 /**
  * 把多模态 content 拍平成纯文本(供摘要 transcript 用):text parts 拼接;image_url parts
  * 替换为 `[图片已剥离: <mime>]` stub,避免 base64 进摘要 prompt(LLM 看到也无意义,反而撑爆 token)。
@@ -248,9 +239,10 @@ async function defaultSummarize(older, focus) {
  * 不检查阈值——调用方(maybeCompact)决定是否调;/compact 直接调以强制压缩。
  */
 export async function compactHistory(history, opts) {
+    const state = opts.contextState ?? contextState;
     const schemaTokens = estimateToolSchemaTokens();
     const estimateBefore = estimateMessagesTokens(history) + schemaTokens;
-    contextState.lastEstimate = estimateBefore;
+    state.lastEstimate = estimateBefore;
     const groups = groupFromEnd(history);
     // 保近期:从尾向前累积直到预算花完(至少保 1 组),永不劈开 group。
     const keepBudget = Math.floor(opts.window * 0.4);
@@ -321,8 +313,9 @@ export async function compactHistory(history, opts) {
             history.push(...rebuilt);
             pruneAfterCompaction(history);
             const estimateAfter = estimateMessagesTokens(history) + schemaTokens;
-            contextState.lastEstimate = estimateAfter;
-            contextState.lastUsage = undefined;
+            state.lastEstimate = estimateAfter;
+            state.lastUsage = undefined;
+            state.correction = 1;
             layout.contentWrite(`  ${ui.bold}${ui.accent}●${ui.reset} ${ui.accent}强制压缩(focus on early history)${ui.reset}  ${ui.dim}${estimateBefore} → ${estimateAfter} tokens${ui.reset}\n`);
             return {
                 compacted: true,
@@ -407,8 +400,9 @@ export async function compactHistory(history, opts) {
         history.push(...rebuilt);
         pruneAfterCompaction(history); // 摘要删了旧轮次 → 按存活轮次裁剪回滚日志
         const estimateAfter = estimateMessagesTokens(history) + schemaTokens;
-        contextState.lastEstimate = estimateAfter;
-        contextState.lastUsage = undefined; // 压缩后旧 usage 失效,/context 改用估算
+        state.lastEstimate = estimateAfter;
+        state.lastUsage = undefined; // 压缩后旧 usage 失效,/context 改用估算
+        state.correction = 1;
         layout.contentWrite(`  ${ui.bold}${ui.accent}●${ui.reset} ${ui.accent}压缩上下文${ui.reset}  ${ui.dim}${estimateBefore} → ${estimateAfter} tokens${ui.reset}\n`);
         // 抖动保护:压缩后仍超阈 → 提示 /clear,不死循环
         if (estimateAfter >= opts.threshold * opts.window) {
@@ -424,8 +418,9 @@ export async function compactHistory(history, opts) {
     }
     // 摘要失败:回退仅微压缩(tool content 已原地改),结构不动
     const estimateAfter = estimateMessagesTokens(history) + schemaTokens;
-    contextState.lastEstimate = estimateAfter;
-    contextState.lastUsage = undefined; // 结构虽未变,但 token 数已变,旧 usage 失效
+    state.lastEstimate = estimateAfter;
+    state.lastUsage = undefined; // 结构虽未变,但 token 数已变,旧 usage 失效
+    state.correction = 1;
     if (microcompactDone) {
         layout.contentWrite(`  ${ui.bold}${ui.accent}●${ui.reset} ${ui.accent}微压缩旧工具结果${ui.reset}  ${ui.dim}${estimateBefore} → ${estimateAfter} tokens${ui.reset}\n`);
         return {
@@ -463,10 +458,10 @@ export async function compactHistory(history, opts) {
  * 强制走 compactHistory(manual/force 参数透传)。返 CompactResult 给 caller 文案展示。
  * 默认 manual=false 自动路径完全不变。
  */
-export async function maybeCompact(history, report, manualOpts) {
+export async function maybeCompact(history, report, manualOpts, state = contextState) {
     const schemaTokens = estimateToolSchemaTokens();
     const est = estimateMessagesTokens(history) + schemaTokens;
-    contextState.lastEstimate = est;
+    state.lastEstimate = est;
     const isManual = manualOpts?.manual === true;
     // 手动路径:旁路 autoCompact / report / 总阈三重门
     if (!isManual) {
@@ -490,6 +485,7 @@ export async function maybeCompact(history, report, manualOpts) {
         focus: manualOpts?.focus,
         manual: isManual,
         force: manualOpts?.force,
+        contextState: state,
     });
     if (isManual)
         return r;

package/dist/session/drop.js

@@ -11,49 +11,7 @@
 //  - 原地修改 history(同 compact:length=0;push 重建,repl 持有同一引用)。
 //  - 永不抛错(对齐「调度器永不抛错」契约);无匹配 / 无可剔除 → 返 dropped=0。
 import { messageTokens, estimateTokens, } from '../llm/index.js';
-/** 把消息 content 拍平成字符串(OpenAI 可能 string / null / 多模态数组)。 */
-function toText(content) {
-    if (content == null)
-        return '';
-    if (typeof content === 'string')
-        return content;
-    try {
-        return JSON.stringify(content);
-    }
-    catch {
-        return String(content);
-    }
-}
-/**
- * 从 history 末尾向前找最后一个 user 消息的索引;无 user 返 -1。
- * 用于划定"当前轮保护区"——该 user 及其之后的消息一律不剔除。
- */
-function lastUserIndex(history) {
-    for (let i = history.length - 1; i >= 1; i--) {
-        if (history[i].role === 'user')
-            return i;
-    }
-    return -1;
-}
-/** 取 tool 消息对应的工具名(从紧邻的前导 assistant.tool_calls 按 tool_call_id 配对找)。 */
-function toolNameOf(history, idx) {
-    const tcId = history[idx].tool_call_id;
-    if (!tcId)
-        return null;
-    for (let j = idx - 1; j >= 1; j--) {
-        const m = history[j];
-        if (m.role !== 'assistant')
-            continue;
-        const tcs = m
-            .tool_calls;
-        if (!tcs)
-            continue;
-        const hit = tcs.find((tc) => tc?.id === tcId);
-        if (hit)
-            return hit.function?.name ?? null;
-    }
-    return null;
-}
+import { lastUserIndex, toText, toolNameOf } from '../context/utils.js';
 /**
  * 剔除历史里命中的旧 tool 结果(原地修改 history)。
  *

package/dist/session/index.js

@@ -4,7 +4,7 @@
  *  - persist.ts:history 序列化到磁盘 + --resume / /resume
  * 依赖方向:session → {llm(摘要复用 chat), config, ui};llm 不反向依赖 session。
  */
-export { compactHistory, maybeCompact, capToolResultForHistory, truncateMid, contextState, } from './compact.js';
+export { compactHistory, maybeCompact, capToolResultForHistory, truncateMid, contextState, createContextState, } from './compact.js';
 // ── Context Budget Scheduler 接缝 ────────────────────────────────────────
 // agent/core.ts 步前调 runScheduler(history, step):评估五区预算 → 按 ROI 调度
 // shrink_cold_tools / cap_hot_tools / compact_history。开关关闭时退化为 maybeCompact。

package/dist/session/scheduler.js

@@ -38,14 +38,14 @@ import { ui } from '../ui/theme.js';
 /** 创建 runAgentCore 闭包持有的 scheduler(每次 agent 启动一个新实例)。
  *  observePush 当前只是占位:真正 L1/L2/L3 已由 cap / pruner / lifecycle 在 push 时跑;
  *  保留接口为后续「调度器注入 hotBoundary 给 lifecycle」演进留接缝。 */
-export function createBudgetScheduler() {
+export function createBudgetScheduler(state = contextState) {
     const obs = {
         lastRunLog: null,
         observePush(_history, _idx) {
             // 占位:push-time 三闸(cap / pruner / lifecycle)已自动跑;此接缝供将来演进。
         },
         async runStep(history, step) {
-            const report = evaluateBudget(history, config.contextWindowTokens, step);
+            const report = evaluateBudget(history, config.contextWindowTokens, step, state.correction);
             const actions = scheduleActions(report);
             let compactHistoryCalled = false;
             for (const a of actions) {
@@ -55,7 +55,7 @@ export function createBudgetScheduler() {
                 }
                 else if (a.kind === 'compact_history') {
                     // 路由到 maybeCompact(history, report)——按 ROI 调度(只有 history 超 / totalOver 才真压)
-                    await maybeCompact(history, report);
+                    await maybeCompact(history, report, undefined, state);
                     compactHistoryCalled = true;
                 }
                 // shrink_cold_tools L1/L2/L3 与 cap_hot_tools:已由 push-time 闸在每次 push 自动跑
@@ -71,14 +71,14 @@ export function createBudgetScheduler() {
             };
             obs.lastRunLog = log;
             // 暴露给 /context 共享读(repl / context 命令)
-            contextState.schedulerLog = log;
+            state.schedulerLog = log;
         },
     };
     return obs;
 }
 /** 便捷:agent/core.ts 不需要每次 createBudgetScheduler,直接 runScheduler(history, step)。 */
-export async function runScheduler(history, step) {
-    const s = createBudgetScheduler();
+export async function runScheduler(history, step, state = contextState) {
+    const s = createBudgetScheduler(state);
     await s.runStep(history, step);
 }
 /** 手动 /compact 入口(repl):与自动路径完全一致——五区 ROI 调度,但 history 摘要强制执行。
@@ -104,7 +104,7 @@ export async function manualCompact(history, focus, opts) {
         }));
         return {
             step: -1,
-            report: evaluateBudget(history, config.contextWindowTokens, -1),
+            report: evaluateBudget(history, config.contextWindowTokens, -1, contextState.correction),
             actions: [{ kind: 'compact_history', focus }],
             compactHistoryCalled: true,
             ts: Date.now(),
@@ -118,7 +118,7 @@ export async function manualCompact(history, focus, opts) {
             },
         };
     }
-    const report = evaluateBudget(history, config.contextWindowTokens, -1);
+    const report = evaluateBudget(history, config.contextWindowTokens, -1, contextState.correction);
     let actions = scheduleActions(report);
     // 用户显式说「要压」:即使 report 不含 history 触发,仍追加 compact_history
     const hasCompact = actions.some(a => a.kind === 'compact_history');

package/dist/tools/builtins/todolist.js

@@ -36,10 +36,8 @@ export const todolistTool = {
         'BAD: "打开文件A → 修改函数X → 保存文件A → 运行测试" (too fine-grained, just do it)',
         '',
         '## UPDATE WORKFLOW',
-        'Update the plan AFTER completing each step — not before, not in bulk at the end.',
-        '- Mark the current step `done` + set the next step `in_progress` in the same `todolist` call.',
-        '- Use `update` for single steps; `batch_update` ONLY when 2-3 steps finish simultaneously.',
-        '- ⛔ NEVER defer all updates to the end — this defeats the purpose of the progress chip.',
+        'Update in real-time after completing each step (one step = one update, or batch_update for 2-3 at once).',
+        'Do NOT batch all updates at the end — update as you go so the chip reflects real progress.',
         'All steps done/skipped → plan auto-finishes, archives, and chip disappears.',
         '',
         '## LIFECYCLE',