mocode-ai 1.3.9 → 1.4.0

package/dist/runtime/screen-pipeline.js

@@ -0,0 +1,223 @@
+/**
+ * Computer Use 截图管线:捕获 → 缩放/裁剪(纯 JS PNG) → norm1000 坐标换算。
+ *
+ * 职责边界:
+ * - 抓屏本身在 screen-capture.ts(平台相关),本文件只管图像后处理与坐标数学。
+ * - 坐标对外只暴露归一化 0-1000 整数网格(x 右 / y 下),模型从不感知物理分辨率;
+ *   执行层按最近一次截图的 scale 因子换算回物理像素。
+ * - 零原生图像依赖:PNG 解码/编码用 Node 内置 zlib 手写,最近邻重采样。
+ *   只支持截图工具产出的 8-bit RGB/RGBA PNG(screencapture/PowerShell Bitmap 均为该族)。
+ */
+import { inflateSync, deflateSync } from 'node:zlib';
+const PNG_SIG = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+function paeth(a, b, c) {
+    const p = a + b - c;
+    const pa = Math.abs(p - a);
+    const pb = Math.abs(p - b);
+    const pc = Math.abs(p - c);
+    if (pa <= pb && pa <= pc)
+        return a;
+    if (pb <= pc)
+        return b;
+    return c;
+}
+/** 解码 PNG → RGBA 像素。非 8-bit RGB/RGBA 直接抛错(截图工具不会产出其它形态)。 */
+export function decodePng(buf) {
+    if (buf.length < 8 || !buf.subarray(0, 8).equals(PNG_SIG))
+        throw new Error('not a PNG');
+    let pos = 8;
+    let width = 0;
+    let height = 0;
+    let bitDepth = 0;
+    let colorType = 0;
+    const idat = [];
+    while (pos + 8 <= buf.length) {
+        const len = buf.readUInt32BE(pos);
+        const type = buf.toString('ascii', pos + 4, pos + 8);
+        const data = buf.subarray(pos + 8, pos + 8 + len);
+        if (type === 'IHDR') {
+            width = data.readUInt32BE(0);
+            height = data.readUInt32BE(4);
+            bitDepth = data[8];
+            colorType = data[9];
+        }
+        else if (type === 'IDAT') {
+            idat.push(Buffer.from(data));
+        }
+        else if (type === 'IEND') {
+            break;
+        }
+        pos += 8 + len + 4; // +4 CRC
+    }
+    if (!width || !height || bitDepth !== 8 || (colorType !== 2 && colorType !== 6)) {
+        throw new Error(`unsupported PNG (bitDepth=${bitDepth} colorType=${colorType})`);
+    }
+    const bpp = colorType === 6 ? 4 : 3;
+    const stride = width * bpp;
+    const raw = inflateSync(Buffer.concat(idat));
+    const out = Buffer.alloc(stride * height);
+    // 反滤镜
+    for (let y = 0; y < height; y++) {
+        const f = raw[y * (stride + 1)];
+        const rowIn = y * (stride + 1) + 1;
+        const rowOut = y * stride;
+        for (let x = 0; x < stride; x++) {
+            const cur = raw[rowIn + x];
+            const a = x >= bpp ? out[rowOut + x - bpp] : 0;
+            const b = y > 0 ? out[rowOut + x - stride] : 0;
+            const c = x >= bpp && y > 0 ? out[rowOut + x - stride - bpp] : 0;
+            let v;
+            switch (f) {
+                case 0:
+                    v = cur;
+                    break;
+                case 1:
+                    v = cur + a;
+                    break;
+                case 2:
+                    v = cur + b;
+                    break;
+                case 3:
+                    v = cur + ((a + b) >> 1);
+                    break;
+                case 4:
+                    v = cur + paeth(a, b, c);
+                    break;
+                default: throw new Error(`bad PNG filter ${f}`);
+            }
+            out[rowOut + x] = v & 0xff;
+        }
+    }
+    // RGB → RGBA
+    if (bpp === 4)
+        return { width, height, data: out };
+    const rgba = Buffer.alloc(width * height * 4);
+    for (let i = 0, j = 0; i < out.length; i += 3, j += 4) {
+        rgba[j] = out[i];
+        rgba[j + 1] = out[i + 1];
+        rgba[j + 2] = out[i + 2];
+        rgba[j + 3] = 255;
+    }
+    return { width, height, data: rgba };
+}
+function crc32(buf) {
+    let c;
+    let crc = 0xffffffff;
+    for (let i = 0; i < buf.length; i++) {
+        c = (crc ^ buf[i]) & 0xff;
+        for (let k = 0; k < 8; k++)
+            c = c & 1 ? 0xedb88320 ^ (c >>> 1) : c >>> 1;
+        crc = (crc >>> 8) ^ c;
+    }
+    return (crc ^ 0xffffffff) >>> 0;
+}
+function chunk(type, data) {
+    const len = Buffer.alloc(4);
+    len.writeUInt32BE(data.length, 0);
+    const body = Buffer.concat([Buffer.from(type, 'ascii'), data]);
+    const crc = Buffer.alloc(4);
+    crc.writeUInt32BE(crc32(body), 0);
+    return Buffer.concat([len, body, crc]);
+}
+/** 编码 RGBA → PNG(colorType 6,filter 0)。 */
+export function encodePng(img) {
+    const { width, height, data } = img;
+    const stride = width * 4;
+    const raw = Buffer.alloc((stride + 1) * height);
+    for (let y = 0; y < height; y++) {
+        raw[y * (stride + 1)] = 0; // filter none
+        data.copy(raw, y * (stride + 1) + 1, y * stride, y * stride + stride);
+    }
+    const ihdr = Buffer.alloc(13);
+    ihdr.writeUInt32BE(width, 0);
+    ihdr.writeUInt32BE(height, 4);
+    ihdr[8] = 8; // bitDepth
+    ihdr[9] = 6; // RGBA
+    ihdr[10] = 0; // compression
+    ihdr[11] = 0; // filter
+    ihdr[12] = 0; // interlace
+    return Buffer.concat([
+        PNG_SIG,
+        chunk('IHDR', ihdr),
+        chunk('IDAT', deflateSync(raw)),
+        chunk('IEND', Buffer.alloc(0)),
+    ]);
+}
+// ── 缩放 / 裁剪(最近邻)─────────────────────────────────────────────────
+function resample(img, newW, newH) {
+    const { width, height, data } = img;
+    const out = Buffer.alloc(newW * newH * 4);
+    for (let y = 0; y < newH; y++) {
+        const srcY = Math.min(height - 1, Math.floor((y * height) / newH));
+        for (let x = 0; x < newW; x++) {
+            const srcX = Math.min(width - 1, Math.floor((x * width) / newW));
+            const s = (srcY * width + srcX) * 4;
+            const d = (y * newW + x) * 4;
+            out[d] = data[s];
+            out[d + 1] = data[s + 1];
+            out[d + 2] = data[s + 2];
+            out[d + 3] = data[s + 3];
+        }
+    }
+    return { width: newW, height: newH, data: out };
+}
+/** 长边缩到 ≤ maxEdge,保持纵横比。已 ≤ maxEdge 时原样返回(零成本直通)。 */
+export function downscale(img, maxEdge) {
+    const long = Math.max(img.width, img.height);
+    if (long <= maxEdge)
+        return { img, scale: 1 };
+    const scale = maxEdge / long;
+    const newW = Math.max(1, Math.round(img.width * scale));
+    const newH = Math.max(1, Math.round(img.height * scale));
+    return { img: resample(img, newW, newH), scale };
+}
+/** 长边精确缩放到 edge(放大或缩小,zoom 动作用),保持纵横比。 */
+export function fitToLongEdge(img, edge) {
+    const long = Math.max(img.width, img.height);
+    if (long === edge)
+        return img;
+    const scale = edge / long;
+    const newW = Math.max(1, Math.round(img.width * scale));
+    const newH = Math.max(1, Math.round(img.height * scale));
+    return resample(img, newW, newH);
+}
+/** 裁出 (x,y,w,h) 矩形,越界自动收敛到图像内。 */
+export function crop(img, x, y, w, h) {
+    const cx = Math.max(0, Math.min(img.width - 1, Math.round(x)));
+    const cy = Math.max(0, Math.min(img.height - 1, Math.round(y)));
+    const cw = Math.max(1, Math.min(img.width - cx, Math.round(w)));
+    const ch = Math.max(1, Math.min(img.height - cy, Math.round(h)));
+    const out = Buffer.alloc(cw * ch * 4);
+    for (let row = 0; row < ch; row++) {
+        const s = ((cy + row) * img.width + cx) * 4;
+        img.data.copy(out, row * cw * 4, s, s + cw * 4);
+    }
+    return { width: cw, height: ch, data: out };
+}
+// ── norm1000 坐标换算 ──────────────────────────────────────────────────
+/** 归一化坐标(0-1000)→ 物理像素。scale = 喂模型的图相对物理的缩放比。 */
+export function normToPhysical(nx, ny, physW, physH) {
+    const x = Math.round((clamp1000(nx) / 1000) * physW);
+    const y = Math.round((clamp1000(ny) / 1000) * physH);
+    return [Math.min(physW - 1, x), Math.min(physH - 1, y)];
+}
+/** 物理像素 → 归一化坐标(0-1000)。 */
+export function physicalToNorm(px, py, physW, physH) {
+    return [clamp1000(Math.round((px / physW) * 1000)), clamp1000(Math.round((py / physH) * 1000))];
+}
+/** 归一化矩形 [x,y,w,h](0-1000)→ 物理矩形像素。 */
+export function normRectToPhysical(rect, physW, physH) {
+    const [nx, ny, nw, nh] = rect;
+    const [x0, y0] = normToPhysical(nx, ny, physW, physH);
+    const [x1, y1] = normToPhysical(nx + nw, ny + nh, physW, physH);
+    return { x: x0, y: y0, w: Math.max(1, x1 - x0), h: Math.max(1, y1 - y0) };
+}
+function clamp1000(v) {
+    if (Number.isNaN(v))
+        return 0;
+    return Math.max(0, Math.min(1000, Math.round(v)));
+}
+/** 校验一个值是否为有限数且落在 norm1000 区间。 */
+export function isNormCoord(v) {
+    return typeof v === 'number' && Number.isFinite(v) && v >= 0 && v <= 1000;
+}

package/dist/sandbox/index.js

@@ -2,4 +2,4 @@
 export { getSandboxRoot, setSandboxRoot, withSandboxRoot } from './root.js';
 export { jailResolve, jailGlobPattern, isInsideRoot } from './jail.js';
 export { filterEnv, isCommandDenied } from './command.js';
-export { SANDBOX_EXEMPT_TOOLS, SANDBOX_PATH_TOOLS, enforceSandbox, } from './policy.js';
+export { SANDBOX_EXEMPT_TOOLS, SANDBOX_PATH_TOOLS, enforceSandbox } from './policy.js';

package/dist/sandbox/policy.js

@@ -14,9 +14,15 @@ import { jailResolve, jailGlobPattern } from './jail.js';
  * Shift+Tab 等用户面触发,不经工具路径。
  */
 export const SANDBOX_EXEMPT_TOOLS = new Set([
-    'memory_save', 'memory_update', 'memory_forget', 'memory_search', 'memory_list', 'memory_graph',
+    'memory_save',
+    'memory_update',
+    'memory_forget',
+    'memory_search',
+    'memory_list',
+    'memory_graph',
     'use_skill',
-    'web_search', 'web_fetch',
+    'web_search',
+    'web_fetch',
     'ask_human',
     'sub-agent',
 ]);

package/dist/session/compact.js

@@ -19,7 +19,7 @@ export function truncateMid(text, max) {
         return text;
     const removed = text.length - max;
     const marker = `…[已截断 ${removed} 字符]…`;
-    let remain = max - marker.length;
+    const remain = max - marker.length;
     if (remain <= 0)
         return marker.slice(0, Math.max(0, max));
     const head = Math.ceil(remain * 0.6);
@@ -179,7 +179,10 @@ export function splitSummaryText(raw) {
             break;
         }
     }
-    const keyFacts = lines.slice(headIdx + 1, endIdx).join('\n').trim();
+    const keyFacts = lines
+        .slice(headIdx + 1, endIdx)
+        .join('\n')
+        .trim();
     const rest = [...lines.slice(0, headIdx), ...lines.slice(endIdx)].join('\n').trim();
     return { keyFacts, rest };
 }
@@ -219,7 +222,10 @@ export function extractProgressSnapshot(summaryRest) {
     for (const line of lines) {
         const m = line.match(/^ {0,3}##\s+(.+?)\s*$/);
         if (m) {
-            const name = m[1].replace(/\s*[—–-].*$/, '').trim().toLowerCase();
+            const name = m[1]
+                .replace(/\s*[—–-].*$/, '')
+                .trim()
+                .toLowerCase();
             taking = WANT.has(name);
         }
         if (taking)
@@ -275,10 +281,7 @@ function isUserGroup(g) {
 /** 摘要 group 判定:非 history[0] 的 system 消息,以 `# 会话摘要` 开头,且不带 tool_calls。 */
 function isSummaryGroup(g) {
     const a = g.assistant;
-    return (!!a &&
-        a.role === 'system' &&
-        g.tools.length === 0 &&
-        toText(a.content).startsWith(SUMMARY_MARKER));
+    return !!a && a.role === 'system' && g.tools.length === 0 && toText(a.content).startsWith(SUMMARY_MARKER);
 }
 /** 从尾向头划分 group;history[0](system)排除。连续 tool 归到前导 assistant。 */
 function groupFromEnd(history) {
@@ -292,9 +295,7 @@ function groupFromEnd(history) {
                 tools.unshift(history[i]);
                 i--;
             }
-            if (i >= 1 &&
-                history[i].role === 'assistant' &&
-                history[i].tool_calls) {
+            if (i >= 1 && history[i].role === 'assistant' && history[i].tool_calls) {
                 groups.unshift({ assistant: history[i], tools });
                 i--;
             }
@@ -377,7 +378,7 @@ function capMessageText(text, max) {
         return text;
     const removed = text.length - max;
     const marker = `\n…[中间 ${removed} 字符已省略]…\n`;
-    let remain = max - marker.length;
+    const remain = max - marker.length;
     if (remain <= 0)
         return text.slice(0, Math.max(0, max)) + marker;
     const head = Math.ceil(remain * 0.6);
@@ -448,7 +449,7 @@ async function defaultSummarize(older, focus, signal) {
         content: 'You are an aggressive session compressor writing a handoff note for an agent that lost its context. ' +
             'The agent will continue the task with ONLY your summary plus a few most-recent messages, so your summary is the sole memory of everything older.\n' +
             'Output ONLY the summary body in this exact structure (omit empty sections):\n' +
-            '## Objective — the user\'s core request(s); cover EVERY distinct user request in the transcript, in order, noting which are completed vs pending.\n' +
+            "## Objective — the user's core request(s); cover EVERY distinct user request in the transcript, in order, noting which are completed vs pending.\n" +
             '## Completed — what is already done: files created/modified (exact paths), key change per file, commands run and their outcomes (pass/fail, key numbers), decisions made and why.\n' +
             '## In Progress — what is being worked on right now and exactly where it stopped (e.g. "edit applied to foo.ts, test not yet run").\n' +
             '## Next Steps — the concrete next actions in order.\n' +
@@ -503,24 +504,19 @@ export async function compactHistory(history, opts) {
     const pinnedGroups = allGroups.filter(isSummaryGroup);
     const groups = pinnedGroups.length > 0 ? allGroups.filter((g) => !isSummaryGroup(g)) : allGroups;
     const pinned = pinnedGroups.length > 0
-        ? splitSummaryText(pinnedGroups
-            .map((g) => toText(g.assistant?.content))
-            .join('\n\n'))
+        ? splitSummaryText(pinnedGroups.map((g) => toText(g.assistant?.content)).join('\n\n'))
         : null;
     // 保近期:按策略中的 token 比例累积(至少保 1 组),永不劈开 group。
     // force(手动 /compact 默认、硬闸触发)用更激进的保留比例;再加绝对上限,
     // 防大窗口(如 256k)下保留区按比例仍过大——压缩目标 = 摘要 + 最小续工上下文。
-    const keepRatio = opts.force
-        ? DEFAULT_BUDGET_POLICY.compactForceKeepRatio
-        : DEFAULT_BUDGET_POLICY.compactKeepRatio;
+    const keepRatio = opts.force ? DEFAULT_BUDGET_POLICY.compactForceKeepRatio : DEFAULT_BUDGET_POLICY.compactKeepRatio;
     const keepBudget = Math.min(Math.floor(opts.window * keepRatio), DEFAULT_BUDGET_POLICY.compactKeepMaxTokens);
     const kept = [];
     let keptTokens = 0;
     for (let k = groups.length - 1; k >= 0; k--) {
         const g = groups[k];
         const nextTokens = keptTokens + groupTokens(g);
-        if (kept.length >= 1
-            && correctTokenEstimate(nextTokens, state.correction) > keepBudget)
+        if (kept.length >= 1 && correctTokenEstimate(nextTokens, state.correction) > keepBudget)
             break;
         kept.unshift(g);
         keptTokens = nextTokens;
@@ -576,8 +572,7 @@ export async function compactHistory(history, opts) {
             // force 但只剩单组(如首轮的单个 assistant+tools 组):原地微压缩、不动结构。
             // 纯 user 原话组无可压项(不能毁掉用户请求),落到下方 noop 提示。
             const single = groups[0];
-            const userOnly = single.tools.length === 0
-                && single.assistant?.role === 'user';
+            const userOnly = single.tools.length === 0 && single.assistant?.role === 'user';
             if (!userOnly && microcompactGroup(single)) {
                 const estimateAfter = estimatePromptTokens(history, activeTools, state.correction);
                 state.lastEstimate = estimateAfter;
@@ -642,9 +637,7 @@ export async function compactHistory(history, opts) {
     }
     if (summary) {
         const artifactRefs = collectArtifactRefs(older);
-        const provenance = artifactRefs.length > 0
-            ? `\n\n[artifact refs: ${artifactRefs.join(', ')}]`
-            : '';
+        const provenance = artifactRefs.length > 0 ? `\n\n[artifact refs: ${artifactRefs.join(', ')}]` : '';
         // 钉住的 Key Facts 拼在段尾:单条 system 消息里尾部注意力最强,老事实不会被"读漏"。
         // 恒为单条——并排多条 system 摘要会触发近因效应,早期摘要形同虚设。
         const parsed = splitSummaryText(summary);
@@ -658,12 +651,7 @@ export async function compactHistory(history, opts) {
             if (snapshot)
                 writeCompactionSnapshot(snapshot);
         }
-        const body = [
-            parsed.rest,
-            pinnedFacts ? `## Key Facts\n${pinnedFacts}` : '',
-        ]
-            .filter(Boolean)
-            .join('\n\n');
+        const body = [parsed.rest, pinnedFacts ? `## Key Facts\n${pinnedFacts}` : ''].filter(Boolean).join('\n\n');
         const summaryMsg = {
             role: 'system',
             content: `${SUMMARY_MARKER}\n${body}${provenance}`,
@@ -754,9 +742,9 @@ signal) {
     const isManual = manualOpts?.manual === true;
     // Hard guard: the scheduler has already attempted pressure cleanup; if raw
     // content remains near the provider limit, compact even when correction < 1.
-    let hardCap = typeof report?.rawTotal === 'number'
-        && typeof report?.window === 'number'
-        && report.rawTotal >= DEFAULT_BUDGET_POLICY.pressureTriggerRatio * report.window;
+    let hardCap = typeof report?.rawTotal === 'number' &&
+        typeof report?.window === 'number' &&
+        report.rawTotal >= DEFAULT_BUDGET_POLICY.pressureTriggerRatio * report.window;
     // 手动路径:旁路 autoCompact / report / 总阈三重门
     if (!isManual) {
         if (!hardCap && !config.autoCompact)

package/dist/session/index.js

@@ -9,8 +9,8 @@ export { compactHistory, maybeCompact, capToolResultForHistory, truncateMid, con
 // agent/core.ts 在 age-aware sweep 后调用 runScheduler(history, step):评估五区预算，
 // 只执行可落地的 warn / compact_history；开关关闭时退化为 maybeCompact。
 // repl /compact 命令调 manualCompact(history, focus?):与自动路径共享决策，focus 透传摘要 prompt。
-export { runScheduler, manualCompact, createBudgetScheduler, } from './scheduler.js';
-export { newSessionId, saveSession, loadSession, listSessions, sessionDir, } from './persist.js';
+export { runScheduler, manualCompact, createBudgetScheduler } from './scheduler.js';
+export { newSessionId, saveSession, loadSession, listSessions, sessionDir } from './persist.js';
 export { appendCurrentSessionTrace, appendCurrentSessionTraceEvent, appendCurrentSessionRuntimeEvent, createTraceEvent, } from './trace.js';
 export { reduceTraceMetrics, readTraceEvents, readTraceMetrics } from './trace-metrics.js';
 export { summarizeToolArguments, hashTraceValue, safeProviderId } from './trace-sanitize.js';

package/dist/session/notes.js

@@ -27,9 +27,21 @@ export function getNotesMtime(sessionId = getCurrentSessionId()) {
         return null;
     }
 }
+/** 单个步骤短标签的字符上限(软截断,防模型把 content 整段塞进 title)。 */
+export const PLAN_STEP_TITLE_MAX = 60;
+/** 清洗步骤短标签:压平换行、去掉星号(避免破坏 `**title**` 的行首解析)。 */
+function sanitizeStepTitle(raw) {
+    return raw
+        .replace(/[\r\n]+/g, ' ')
+        .replace(/\*/g, '')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .slice(0, PLAN_STEP_TITLE_MAX);
+}
 /**
  * 把 plan 渲染为 canonical markdown 段(不含首尾多余空行)。
  * 复选框格式 `- [ ] N.` / `- [x] N.` 与 repl 状态栏 chip 的计数正则严格对齐;
+ * 步骤正文为 `**短标签** — 详细描述`(有 title 时)或裸 content(老 plan 兼容),
  * in_progress 步骤追加 ` ◀ 当前` 后缀(仍计为未完成),让 compact 重注入后模型能直接续上。
  * 全部完成时标题写为 `## Done:`(自动结算),extractActivePlanSection 随之返回 null。
  */
@@ -42,15 +54,34 @@ export function renderPlanSection(plan) {
     lines.push('', '### Steps');
     plan.steps.forEach((s, i) => {
         const box = s.status === 'completed' ? '[x]' : '[ ]';
-        const suffix = s.status === 'in_progress'
-            ? `  ◀ ${(s.activeForm ?? '').trim() || 'current'}`
-            : '';
-        lines.push(`- ${box} ${i + 1}. ${s.content}${suffix}`);
+        const title = s.title ? sanitizeStepTitle(s.title) : '';
+        const body = title ? `**${title}** — ${s.content}` : s.content;
+        const suffix = s.status === 'in_progress' ? `  ◀ ${(s.activeForm ?? '').trim() || 'current'}` : '';
+        lines.push(`- ${box} ${i + 1}. ${body}${suffix}`);
     });
     const done = plan.steps.filter((s) => s.status === 'completed').length;
     lines.push('', '### Progress', `- ${done}/${plan.steps.length} steps complete`);
     return lines.join('\n');
 }
+/**
+ * 从步骤行正文(去掉 `- [ ] N. ` 前缀后)提取 UI 用的短标签。兼容三种写法:
+ *  - `**短标签** — 详细描述  ◀ 进行中`  (plan_update 写了 title 的新格式)
+ *  - `**短标签** — 详细描述`
+ *  - `详细描述  ◀ 进行中`               (老 plan,无 title)
+ * 优先级 title > activeForm > content:状态栏 chip 只有一行,短的先上,细节交给
+ * composePlanLines 截断保单行(脚栏不撑高)。老 plan 无 title 时行为与加 title 前一致。
+ * 与 renderPlanSection 配对(一个写一个读),格式定义与解析同处,避免散落两处走样。
+ */
+export function planStepLabel(raw) {
+    const body = raw.trim();
+    const afIdx = body.lastIndexOf('◀');
+    const activeForm = afIdx >= 0 ? body.slice(afIdx + 1).trim() : '';
+    const main = (afIdx >= 0 ? body.slice(0, afIdx) : body).trim();
+    const m = main.match(/^\*\*(.+?)\*\*(?:\s*—\s*)?([\s\S]*)$/);
+    const title = m?.[1]?.trim() ?? '';
+    const content = (m ? (m[2] ?? '') : main).trim();
+    return title || activeForm || content || main;
+}
 /** 读取当前活跃 `## Plan:` 段的标题;无活跃 plan 返 null。 */
 export function readActivePlanTitle(sessionId = getCurrentSessionId()) {
     const p = getNotesFilePath(sessionId);
@@ -127,7 +158,10 @@ const SECTION_PRIORITY = {
     // compaction_snapshot 提到最高:它是压缩当次的权威进度快照,比手填 findings 更能
     // 直接告诉模型「做到哪了」,压缩后第一步最该看到的就是它。
     compaction_snapshot: 5,
-    risks: 4, findings: 3, decisions: 2, open_questions: 1,
+    risks: 4,
+    findings: 3,
+    decisions: 2,
+    open_questions: 1,
 };
 /** 常驻笔记正文总预算(token)。5k:占百万级 context 的 0.5%,可常驻相当量笔记。 */
 const NOTES_INJECT_BUDGET_TOKENS = 5000;

package/dist/session/persist.js

@@ -1,6 +1,7 @@
-import { existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync, writeFileSync, } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import { config, getActiveModel } from '../config/index.js';
+import { isToolRouteGroupName } from '../config/profiles.js';
 import { truncateDisplay } from '../ui/render.js';
 /** 会话目录(确保存在)。 */
 export function sessionDir() {
@@ -35,7 +36,9 @@ function toText(content) {
 function firstUserOf(history) {
     for (const m of history) {
         if (m.role === 'user') {
-            const text = toText(m.content).replace(/\n/g, ' ').trim();
+            const text = toText(m.content)
+                .replace(/\n/g, ' ')
+                .trim();
             return truncateDisplay(text, 40);
         }
     }
@@ -45,7 +48,7 @@ function sessionPath(id) {
     return path.join(config.sessionDir, id, 'session.json');
 }
 /** 保存会话到磁盘。全新且没有 query 的会话不创建文件；已有会话即使回滚为空也必须覆盖旧记录。 */
-export function saveSession(history, id, queryHistory = []) {
+export function saveSession(history, id, queryHistory = [], lastToolGroups = []) {
     const meta = {
         id,
         createdAt: idToIso(id),
@@ -56,15 +59,17 @@ export function saveSession(history, id, queryHistory = []) {
     };
     const currentPath = sessionPath(id);
     const legacyPath = path.join(config.sessionDir, `${id}.json`);
-    if (history.length <= 1 &&
-        queryHistory.length === 0 &&
-        !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, queryHistory: [...queryHistory] };
+    const record = {
+        ...meta,
+        history,
+        queryHistory: [...queryHistory],
+        lastToolGroups: [...lastToolGroups],
+    };
     writeFileSync(currentPath, JSON.stringify(record), 'utf8');
     // 一旦写入新式目录，删除旧式扁平副本，避免已回滚消息仍残留在磁盘。
     if (existsSync(legacyPath))
@@ -94,6 +99,7 @@ export function loadSession(id) {
             queryHistory: Array.isArray(rec.queryHistory)
                 ? rec.queryHistory.filter((query) => typeof query === 'string')
                 : undefined,
+            lastToolGroups: Array.isArray(rec.lastToolGroups) ? rec.lastToolGroups.filter(isToolRouteGroupName) : undefined,
         };
     }
     catch {

package/dist/session/scheduler.js

@@ -8,8 +8,7 @@ import { pruneStaleArtifacts, refreshArtifactFreshness } from '../context/artifa
 import { pruneSuperseded } from '../context/relevance.js';
 import { createAgeAwareEncodingState } from '../context/age-aware.js';
 function atPressure(report) {
-    return Math.max(report.rawTotal, report.total)
-        >= report.window * DEFAULT_BUDGET_POLICY.pressureTriggerRatio;
+    return Math.max(report.rawTotal, report.total) >= report.window * DEFAULT_BUDGET_POLICY.pressureTriggerRatio;
 }
 function emptyPressure(report) {
     return {
@@ -51,7 +50,7 @@ export function createBudgetScheduler(state = contextState) {
             const actions = scheduleActions(report);
             let compactHistoryCalled = false;
             let historyRebuilt = false;
-            for (const action of actions) {
+            for (const _action of actions) {
                 const result = await maybeCompact(history, report, undefined, state, activeTools, signal);
                 compactHistoryCalled = true;
                 historyRebuilt ||= result?.historyRebuilt === true;
@@ -112,7 +111,7 @@ export async function manualCompact(history, focus, opts) {
         actions = [...actions, { kind: 'compact_history', focus }];
     }
     else if (focus) {
-        actions = actions.map((action) => action.kind === 'compact_history' ? { ...action, focus } : action);
+        actions = actions.map((action) => (action.kind === 'compact_history' ? { ...action, focus } : action));
     }
     let compactHistoryCalled = false;
     let compactDetail;

package/dist/session/trace-metrics.js

@@ -51,9 +51,12 @@ export function readTraceEvents(file) {
             continue;
         try {
             const value = JSON.parse(line);
-            if (value.schemaVersion === 1 && typeof value.type === 'string' &&
-                typeof value.sessionId === 'string' && typeof value.turnId === 'number' &&
-                value.data && typeof value.data === 'object') {
+            if (value.schemaVersion === 1 &&
+                typeof value.type === 'string' &&
+                typeof value.sessionId === 'string' &&
+                typeof value.turnId === 'number' &&
+                value.data &&
+                typeof value.data === 'object') {
                 events.push(value);
             }
         }

package/dist/skills/activation.js

@@ -1,6 +1,6 @@
-// inline skill 激活态(设计 §3.6):use_skill 成功加载 inline skill 时置位,
+// inline skill 激活态(设计 §3.6):use_skill 成功加载 inline skill 时置位，
 // 该 turn 内模型的 disallowed-tools 约束生效(constants.getRuntimeDisabledTools 消费)。
-// 一 turn 语义:下一次用户轮开始时由 repl 调 clearSkillActivation() 清除。
+// 同一 turn 连续加载多个 inline skill 时 deny 取并集，只能继续收窄；下一次真实用户轮清除。
 //
 // 刻意不设 allowed 授权:inline 加载不过信任门禁,自动放行 confirm 级工具会让
 // 未信任的项目 skill 绕过权限确认。allowed-tools 只在 fork 模式下经 spawnAgent
@@ -9,12 +9,17 @@
 // 叶子模块:仅依赖 toolmap(亦叶子),不引 tools/permissions/agent,避免环。
 import { mapSkillToolName } from './toolmap.js';
 let active = null;
-/** use_skill 成功加载 inline skill 时调用。 */
+/** use_skill 成功加载 inline skill 时调用；同一 turn 的 deny 只累加、不撤销。 */
 export function activateSkill(skill) {
-    const disallowed = skill.disallowedTools?.map(mapSkillToolName).filter((t) => t != null);
+    const disallowed = new Set(active?.disallowed ?? []);
+    for (const token of skill.disallowedTools ?? []) {
+        const mapped = mapSkillToolName(token);
+        if (mapped)
+            disallowed.add(mapped);
+    }
     active = {
         name: skill.name,
-        disallowed: disallowed && disallowed.length ? new Set(disallowed) : null,
+        disallowed: disallowed.size > 0 ? disallowed : null,
     };
 }
 /** 用户新轮开始时清激活态。 */

package/dist/skills/discover.js

@@ -89,23 +89,12 @@ function resolveContext(meta) {
         return 'fork'; // 旧内部别名
     return 'inline';
 }
-/** `agent:` 映射到 mocode 的 read/write 双态;未知值记 warning 并保守按 read。 */
-function resolveAgentMode(meta, warnings) {
-    const a = scalar(meta, 'agent');
-    if (!a)
-        return undefined;
-    const low = a.toLowerCase();
-    if (['explore', 'plan', 'research', 'read'].includes(low))
-        return 'read';
-    if (['general-purpose', 'write'].includes(low))
-        return 'write';
-    warnings.push(`未知 agent 值 "${a}",按 read(只读,保守)处理`);
-    return 'read';
-}
-/** 收集本轮不支持、已忽略的字段,用于 /skills 提示(不阻断加载)。 */
+/** 收集本轮不支持、已忽略的字段,用于 /skills 提示(不阻断加载)。
+ *  `agent:` 曾在旧 read/write 双模式下决定子 agent 工具面;子 agent 现与主 agent 同权,
+ *  该字段不再产生任何效果,按"已忽略"提示作者,避免其误以为仍有限权语义。 */
 function collectWarnings(meta) {
     const warnings = [];
-    for (const k of ['hooks', 'model', 'effort', 'paths']) {
+    for (const k of ['hooks', 'model', 'effort', 'paths', 'agent']) {
         if (k in meta)
             warnings.push(`字段 "${k}" 当前不支持,已忽略`);
     }
@@ -230,7 +219,7 @@ export function discoverSkills() {
                     continue;
                 seenMdPaths.push(skillMdPath);
                 const content = readFileSync(skillMdPath, 'utf8');
-                const { meta, body } = parseFrontmatter(content);
+                const { meta } = parseFrontmatter(content);
                 const skillName = (scalar(meta, 'name') || name).trim();
                 const description = (scalar(meta, 'description') || '').trim();
                 if (!description)
@@ -245,7 +234,6 @@ export function discoverSkills() {
                     skillMdPath,
                     // body 留空:用户/项目 skill 由 getSkillBody 走文件读取(保留热重载语义)。
                     context: resolveContext(meta),
-                    agentMode: resolveAgentMode(meta, warnings),
                     allowedTools: asArray(meta, 'allowed-tools'),
                     disallowedTools: asArray(meta, 'disallowed-tools'),
                     modelInvocable: !truthy(meta, 'disable-model-invocation'),