mocode-ai 1.1.7 → 1.1.9

package/dist/context/budget.js

@@ -1,12 +1,8 @@
-// 五区 Context Budget Scheduler。
+// 五区 Context Budget accounting and the shared pressure threshold.
 //
-// 目的:把当前请求拆成 System / History / Tool-Recent / Tool-Old / Summary + Reserve，
-//      统一报告各区占用，并只调度执行层能够真正落地的 warn / compact_history。
-//
-// push-time cap、pipeline、relevance、lifecycle 与 age-aware sweep 负责工具结果优化；
-// scheduler 在这些处理完成后评估，不重复生成 Cold/Hot tool 压缩动作。
-// 本文件保持叶子级，只依赖 ChatMessage / token estimate，具体执行由 session/scheduler.ts 完成。
-// contextBudget 开关关闭时，agent/core.ts 退化为直接调用 maybeCompact。
+// This module only estimates and reports. session/scheduler.ts owns the sole
+// automatic rewrite sequence and starts all pressure cleanup plus compact_history
+// when corrected or raw request occupancy reaches 80%.
 import { chatTools, estimateMessagesTokens, estimateToolSchemaTokens, messageTokens, } from '../llm/index.js';
 import { toText } from './utils.js';
 /** 五区分账(占比对齐 CONTEXT_WINDOW)。顺序固定,便于遍历。 */
@@ -28,9 +24,8 @@ export const DEFAULT_BUDGET_POLICY = {
         reserve: 0.05,
     },
     hotTurnWindow: 4,
-    toolOldAge: 2,
     compactKeepRatio: 0.40,
-    totalTriggerRatio: 0.82,
+    pressureTriggerRatio: 0.80,
     schedulerTargetRatio: 0.80,
     estimateSafetyFactor: 1.05,
     compactHeadroomTokens: 1500,
@@ -38,7 +33,6 @@ export const DEFAULT_BUDGET_POLICY = {
 /** 兼容既有调用方的只读别名；配置只在 DEFAULT_BUDGET_POLICY 中维护。 */
 export const BUDGET_RATIO = DEFAULT_BUDGET_POLICY.ratios;
 export const HOT_TURN_WINDOW = DEFAULT_BUDGET_POLICY.hotTurnWindow;
-export const TOOL_OLD_AGE = DEFAULT_BUDGET_POLICY.toolOldAge;
 function msgTokens(m) {
     // 与请求预估复用同一实现，避免角色结构开销、多模态和 tool_calls 在两个预算路径中漂移。
     return messageTokens(m);
@@ -69,13 +63,17 @@ export function evaluateBudget(history, window, step = 0, correction = 1, active
     }
     // 校正后的 token 数:raw * correction,最小 1(raw > 0 时)。
     const adj = (raw) => (raw > 0 ? Math.max(1, Math.round(raw * correction)) : 0);
+    // 裸总量(不乘 correction):硬闸用它判断,防止 correction 折扣否决真实溢出。
+    let rawTotal = 0;
     const sysMsg = history[0];
     const systemCosts = {
         prompt: sysMsg ? msgTokens(sysMsg) : 0,
         toolSchemas: estimateToolSchemaTokens(activeTools),
     };
     // 工具 schema 与 system prompt 同属请求固定开销；必须计入总量才能可靠触发压缩。
-    layers.system.actual = adj(systemCosts.prompt + systemCosts.toolSchemas);
+    const systemRaw = systemCosts.prompt + systemCosts.toolSchemas;
+    layers.system.actual = adj(systemRaw);
+    rawTotal += systemRaw;
     // Summary 检测:role:'system' 且不是 history[0] 的,视为摘要(compact.ts 摘要插 index 1)。
     // 简单启发:若 history[1]?.role === 'system' 且 content 含「# 会话摘要」特征串,计入 summary。
     // 命中时循环跳过 i=1;不命中时当作普通 message(罕见,落到下方 user/assistant 分支)。
@@ -83,7 +81,9 @@ export function evaluateBudget(history, window, step = 0, correction = 1, active
     if (history.length > 1 && history[1].role === 'system') {
         const c1 = toText(history[1].content);
         if (c1.startsWith('# 会话摘要') || c1.includes('会话摘要')) {
-            layers.summary.actual = adj(msgTokens(history[1]));
+            const summaryRaw = msgTokens(history[1]);
+            layers.summary.actual = adj(summaryRaw);
+            rawTotal += summaryRaw;
             summaryHit = true;
         }
     }
@@ -94,16 +94,18 @@ export function evaluateBudget(history, window, step = 0, correction = 1, active
         const m = history[i];
         if (i === 1 && summaryHit)
             continue; // summary 已单独算过
+        const raw = msgTokens(m);
         if (m.role === 'tool') {
-            const t = adj(msgTokens(m));
             if (i >= hotStart)
-                layers.toolRecent.actual += t;
+                layers.toolRecent.actual += adj(raw);
             else
-                layers.toolOld.actual += t;
+                layers.toolOld.actual += adj(raw);
+            rawTotal += raw;
         }
         else if (m.role !== 'system') {
             // user / assistant 全部计入 history(对话轨迹)
-            layers.history.actual += adj(msgTokens(m));
+            layers.history.actual += adj(raw);
+            rawTotal += raw;
         }
         // 其它 system(几乎不存在)跳过
     }
@@ -120,10 +122,11 @@ export function evaluateBudget(history, window, step = 0, correction = 1, active
     // 按 overRatio 降序
     triggers.sort((a, b) => layers[b].overRatio - layers[a].overRatio);
     const total = BUDGET_LAYERS.reduce((s, k) => s + (k === 'reserve' ? 0 : layers[k].actual), 0);
-    const totalOver = total >= DEFAULT_BUDGET_POLICY.totalTriggerRatio * window;
+    const totalOver = total >= DEFAULT_BUDGET_POLICY.pressureTriggerRatio * window;
     return {
         step,
         total,
+        rawTotal,
         window,
         layers,
         systemCosts,
@@ -134,15 +137,11 @@ export function evaluateBudget(history, window, step = 0, correction = 1, active
     };
 }
 /** 根据 BudgetReport 生成可执行动作。
- * push-time cap、relevance、lifecycle 与 age-aware sweep 已在评估前完成，
- * 因此这里不再生成无法执行的 Cold/Hot tool action。
- * History 或总量超预算时才考虑昂贵的 LLM 摘要。 */
+ * History compaction is the final fallback after pressure-only tool stages.
+ * Per-layer overages are diagnostics, never independent rewrite triggers. */
 export function scheduleActions(report) {
     const actions = [];
-    const { layers, totalOver, total } = report;
-    const policy = DEFAULT_BUDGET_POLICY;
-    const headroom = policy.schedulerTargetRatio * report.window
-        - total * policy.estimateSafetyFactor;
+    const { layers } = report;
     if (layers.system.overBudget) {
         const { prompt, toolSchemas } = report.systemCosts;
         const { actual, budget } = layers.system;
@@ -155,8 +154,8 @@ export function scheduleActions(report) {
                 + `提示 ${prompt} + 工具 ${toolSchemas}，×${report.correction.toFixed(2)}。`,
         });
     }
-    if ((layers.history.overBudget || totalOver)
-        && headroom < -policy.compactHeadroomTokens) {
+    const pressureLine = DEFAULT_BUDGET_POLICY.pressureTriggerRatio * report.window;
+    if (Math.max(report.rawTotal, report.total) >= pressureLine) {
         actions.push({ kind: 'compact_history' });
     }
     return actions;
@@ -164,7 +163,7 @@ export function scheduleActions(report) {
 /** 拍平成人类可读(供 /context 命令与 check-budget 脚本用)。 */
 export function formatReport(report) {
     const lines = [];
-    lines.push(`step ${report.step}  total ${report.total}/${report.window}  (${((report.total / report.window) * 100).toFixed(1)}%)`);
+    lines.push(`step ${report.step}  total ${report.total}/${report.window}  (${((report.total / report.window) * 100).toFixed(1)}%)  raw ${report.rawTotal}`);
     for (const k of BUDGET_LAYERS) {
         const lb = report.layers[k];
         const pct = lb.budget > 0 ? ((lb.actual / lb.budget) * 100).toFixed(0) : '-';

package/dist/context/classifier.js

@@ -29,7 +29,6 @@ const BY_NAME = {
     edit_file: 'status',
     write_file: 'status',
     ask_human: 'status',
-    drop_context: 'status',
     memory_save: 'status',
     memory_update: 'status',
     memory_forget: 'status',

package/dist/context/encoders/index.js

@@ -1,14 +1,7 @@
-// 内置 encoder 清单。启动期 pipeline 首次调用时经 registerAll 注册到 registry。
-//
-// Phase 1:passthrough(identity 兜底)→ 全链路零行为变化。
-// Phase 2:tree / search / log / table / memory(高价值低风险)。
-// Phase 2.5:code / graph / doc / summary(覆盖剩余有 encoder 的 kind)。
-//   - code(read_file):仅折叠 ≥3 连续空行,行号保真(edit_file 依赖)。
-//   - graph(保留 kind,暂无 builtin 工具直接命中)/ doc(web_fetch, use_skill)/ summary(task):
-//     去 ANSI + 折叠空行,保守不重构结构。
-//   - status(edit/write/ask_human/mem 增删改)无 encoder:本就是一行,无需编码。
-//
-// 加 encoder:新建 encoders/xxx.ts 导出 ContextEncoder,在此数组加一行。无需动 agent / llm / core。
+// 内置 encoder 清单。仅由 opt-in pressure stage 首次调用时懒注册。
+// Normal tool pushes do not pass through these encoders.
+// Available transforms:tree / search / log / table / memory / code / doc / summary.
+// status 类工具本就是短结果，无专用 encoder。
 import { passthroughEncoder } from './passthrough.js';
 import { treeEncoder } from './tree.js';
 import { searchEncoder } from './search.js';

package/dist/context/index.js

@@ -1,12 +1,9 @@
-// context/ barrel:Context Optimization Pipeline + 五区 Budget Scheduler。
-//
-// 单一入口 optimizeToolResult(agent/core.ts pushToolResult 调)接管"工具结果进 LLM 前"的表示。
-// 单一入口 runScheduler(agent/core.ts 步前调)接管"何时调用哪一闸"的调度。
-// 不调 LLM、不碰 Tool Calling schema / executeTool / tool_call_id 配对 / TUI 渲染
-// (叶子级:仅 stdlib + tools/constants + session/compact 的 capToolResultForHistory 兜底 + config 开关)。
+// context/ barrel: metadata tracking, optional pressure encoders, and budget reporting.
+// Normal tool pushes stay raw apart from the hard per-result cap. The session
+// scheduler is the only automatic rewrite coordinator at real pressure.
 export { optimizeToolResult } from './pipeline.js';
 export { classify, knownToolKinds } from './classifier.js';
 export { recordArtifact, invalidateArtifacts, rehydrateArtifacts, refreshArtifactFreshness, pruneStaleArtifacts, collectArtifactRefs, formatArtifactTokenSources, } from './artifacts.js';
 export { registerEncoder, registerAll, getEncoder, registeredKinds, } from './registry.js';
 // ── Context Budget Scheduler ───────────────────────────────────────────────
-export { evaluateBudget, scheduleActions, formatReport, quickEstimate, userTurnBoundary, BUDGET_LAYERS, DEFAULT_BUDGET_POLICY, BUDGET_RATIO, HOT_TURN_WINDOW, TOOL_OLD_AGE, } from './budget.js';
+export { evaluateBudget, scheduleActions, formatReport, quickEstimate, userTurnBoundary, BUDGET_LAYERS, DEFAULT_BUDGET_POLICY, BUDGET_RATIO, HOT_TURN_WINDOW, } from './budget.js';