mocode-ai 0.6.10 → 0.7.1

package/dist/repl/index.js

@@ -1,7 +1,7 @@
 import readline from 'node:readline/promises';
 import { emitKeypressEvents } from 'node:readline';
 import { stdin, stdout } from 'node:process';
-import { config, updateModelConfig, isModelConfigured, updateMemoryConfig, isMemoryEnabled, isProjectSkillEnabled, isProjectSnapshotEnabled, updateProjectSkillConfig, updateSnapshotConfig, updateLanguageConfig, languageFromShell, buildBasePrompt, getPlanModeSuffix, } from '../config/index.js';
+import { config, updateModelConfig, isModelConfigured, updateMemoryConfig, isMemoryEnabled, isSubAgentEnabled, updateSubAgentConfig, isProjectSkillEnabled, isProjectSnapshotEnabled, updateProjectSkillConfig, updateSnapshotConfig, updateLanguageConfig, languageFromShell, buildBasePrompt, getPlanModeSuffix, } from '../config/index.js';
 import { getLanguage, normalizeLanguage, t, } from '../i18n/index.js';
 import { updateConfigKey, writeConfigKeys, CONFIG_PATH } from '../config/file.js';
 import { deletePreset, getPreset, isValidPresetName, listPresets, migrateCurrentToPreset, savePreset, } from '../config/presets.js';
@@ -16,9 +16,9 @@ import * as mouse from '../ui/mouse.js';
 import * as batch from '../ui/batch.js';
 import { promptWithSlashMenu, promptTurnPicker, promptSessionPicker, promptThemePicker, promptRevertChoice, } from '../ui/prompt.js';
 import { promptIntervention } from '../ui/intervention.js';
-import { tools, registerToolsExtension } from '../tools/registry.js';
+import { registerToolsExtension } from '../tools/registry.js';
 import { initializeAllMcp, getMcpTools, closeAllMcp } from '../mcp/index.js';
-import { estimateMessagesTokens, reconfigureClient, refreshChatTools, } from '../llm/index.js';
+import { estimateMessagesTokens, reconfigureClient, refreshChatTools, chatTools, } from '../llm/index.js';
 import { loadImageAttachment, renderChip, MAX_INLINE_BYTES_DEFAULT, } from '../attachments/image.js';
 import { modelSupportsVision } from '../llm/capabilities.js';
 import { computePruneStats } from '../context/relevance.js';
@@ -63,6 +63,13 @@ function buildSlashCommands() {
                 { name: 'init', value: '/init', desc: d('commands.memoryInit') },
             ],
         },
+        {
+            name: '/subagent', desc: d('commands.subagent'), children: [
+                { name: 'on', value: '/subagent on', desc: d('commands.subagentOn') },
+                { name: 'off', value: '/subagent off', desc: d('commands.subagentOff') },
+                { name: 'status', value: '/subagent status', desc: d('commands.subagentStatus') },
+            ],
+        },
         {
             name: '/project_skill', desc: d('commands.skill'), children: [
                 { name: 'toggle', value: '/project_skill', desc: d('commands.toggle') },
@@ -237,28 +244,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({
@@ -299,6 +329,8 @@ function runningStateFor(cmd) {
             return { status: t('running.memory'), placeholder: t('running.switching') };
         case '/memory_status':
             return { status: t('running.memoryStatus'), placeholder: '…' };
+        case '/subagent':
+            return { status: t('running.subagent'), placeholder: t('running.switching') };
         case '/project_skill':
             return { status: t('running.skill'), placeholder: t('running.processing') };
         case '/snapshot':
@@ -536,6 +568,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 +688,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 +725,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') {
@@ -700,12 +743,11 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
     // 本轮 token 累计:runAgent 返回后写入,供底栏模式 chip 右边显示。undefined=无实测
     // (后端不开 include_usage / 后端失败时)。
     let lastTurnUsage;
-    const toolsLine = tools.map((t) => t.name).join(' · ');
     const banner = () => ({
         model: config.model,
         baseURL: config.baseURL,
         cwd: process.cwd(),
-        tools: toolsLine,
+        tools: chatTools.map((tool) => tool.function.name).join(' · '),
         memoryEnabled: isMemoryEnabled(),
     });
     // 开场:按 config.theme 切主题(横幅 / 状态行 / 后续渲染皆用新色),再进 alt screen + 状态基线 + 清内容区。
@@ -839,7 +881,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 +938,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 +961,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 +988,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 +1013,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 +1046,7 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             input = await promptWithSlashMenu({
                 prompt: PROMPT,
                 commands: buildSlashCommands(),
+                queryHistory,
                 onCycleMode: cycleMode,
                 // /rollback 预填优先;否则上一轮运行中 typeahead 打的字 → 预填进输入框,用户可改可发
                 ...(pendingPrefill
@@ -1804,6 +1866,32 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             await rollbackFlow();
             continue;
         }
+        if (line === '/subagent' || line.startsWith('/subagent ')) {
+            const arg = line.startsWith('/subagent ')
+                ? line.slice('/subagent '.length).trim().toLowerCase()
+                : 'status';
+            if (arg === '' || arg === 'status') {
+                const enabled = isSubAgentEnabled();
+                const state = t(enabled ? 'subagent.stateOn' : 'subagent.stateOff');
+                layout.contentWrite(`${ui.accent}${t('subagent.status', { state })}${ui.reset}\n` +
+                    `${ui.dim}MOCODE_SUBAGENT_ENABLED=${enabled ? 'true' : 'false'} · ${CONFIG_PATH}${ui.reset}\n`);
+                continue;
+            }
+            if (arg !== 'on' && arg !== 'off') {
+                layout.contentWrite(`${ui.yellow}${t('subagent.usage')}${ui.reset}\n`);
+                continue;
+            }
+            const enabled = arg === 'on';
+            if (enabled !== isSubAgentEnabled()) {
+                updateSubAgentConfig(enabled);
+                updateConfigKey('MOCODE_SUBAGENT_ENABLED', enabled ? 'true' : 'false');
+                refreshChatTools();
+                history[0] = { role: 'system', content: buildSystemMessage(getAgentMode() === 'plan') };
+                layout.rewriteBanner(bannerLines(banner()));
+            }
+            layout.contentWrite(`${enabled ? ui.green : ui.yellow}${t(enabled ? 'subagent.changedOn' : 'subagent.changedOff')}${ui.reset}\n`);
+            continue;
+        }
         if (line === '/memory_switch' ||
             line.startsWith('/memory_switch ') ||
             line === '/memory_status' ||
@@ -2085,6 +2173,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/rollback/index.js

@@ -6,6 +6,8 @@ import { toText } from '../context/utils.js';
 let turnIdCounter = 0;
 let currentTurnId = 0;
 let sequenceCounter = 0;
+/** Monotonic process-local generation; repeated writes to one path still invalidate validation. */
+let mutationVersion = 0;
 let turns = [];
 let snapshots = [];
 const rootDir = () => path.resolve(process.cwd());
@@ -128,17 +130,22 @@ export function endPathMutation(capture, op) {
     const full = safeFullPath(capture.path);
     if (!full)
         return;
+    let changed = false;
     const after = readState(full);
     if (!sameState(capture.before, after)) {
+        changed = true;
         addSnapshot(snapshotFromState(capture.path, capture.before, capture.sequence, op, capture.createdParents));
     }
     // write_file 会递归创建父目录；即使最终写文件失败，这些目录也是本轮真实副作用。
     for (const parentRel of capture.createdParents) {
         const parent = safeFullPath(parentRel);
         if (parent && readState(parent).kind !== 'missing') {
+            changed = true;
             addSnapshot(snapshotFromState(parentRel, { kind: 'missing' }, capture.sequence, op));
         }
     }
+    if (changed)
+        mutationVersion += 1;
 }
 function isWorkspaceExcluded(full) {
     const base = path.basename(full).toLowerCase();
@@ -183,13 +190,37 @@ export function beginWorkspaceMutation() {
 export function endWorkspaceMutation(capture, op) {
     const after = scanWorkspace();
     const paths = new Set([...capture.entries.keys(), ...after.keys()]);
+    let changed = false;
     for (const rel of paths) {
         const beforeState = capture.entries.get(rel) ?? { kind: 'missing' };
         const afterState = after.get(rel) ?? { kind: 'missing' };
         if (sameState(beforeState, afterState))
             continue;
+        changed = true;
         addSnapshot(snapshotFromState(rel, beforeState, capture.sequence, op));
     }
+    if (changed)
+        mutationVersion += 1;
+}
+/** Current main turn changes, deduplicated by path, plus a generation for validation invalidation. */
+export function getCurrentTurnMutationState() {
+    const order = [];
+    const byPath = new Map();
+    for (const snapshot of snapshots) {
+        if (snapshot.turnId !== currentTurnId)
+            continue;
+        let change = byPath.get(snapshot.path);
+        if (!change) {
+            change = { path: snapshot.path, ops: [], snapshotAvailable: true };
+            byPath.set(snapshot.path, change);
+            order.push(snapshot.path);
+        }
+        for (const op of snapshot.ops ?? ['file_change']) {
+            if (!change.ops.includes(op))
+                change.ops.push(op);
+        }
+    }
+    return { version: mutationVersion, changedFiles: order.map((item) => byPath.get(item)) };
 }
 export function listTurns() {
     return turns.slice();

package/dist/session/index.js

@@ -12,3 +12,4 @@ export { compactHistory, maybeCompact, capToolResultForHistory, truncateMid, con
 export { runScheduler, manualCompact, createBudgetScheduler, } from './scheduler.js';
 export { dropContextFromHistory, formatDropResult, } from './drop.js';
 export { newSessionId, saveSession, loadSession, listSessions, sessionDir, } from './persist.js';
+export { appendCurrentSessionTrace } from './trace.js';

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/session/trace.js

@@ -0,0 +1,26 @@
+import { appendFileSync, mkdirSync } from 'node:fs';
+import path from 'node:path';
+import { config } from '../config/index.js';
+import { getCurrentSessionId } from './state.js';
+function boundedValidation(result) {
+    if (!result)
+        return undefined;
+    const max = 4000;
+    return result.output.length <= max
+        ? result
+        : { ...result, output: `${result.output.slice(0, 2000)}\n…[trace output truncated]…\n${result.output.slice(-1900)}` };
+}
+/** Best-effort JSONL trace. Failure must never affect the agent turn. */
+export function appendCurrentSessionTrace(trace) {
+    const sessionId = getCurrentSessionId();
+    if (!sessionId)
+        return;
+    try {
+        const dir = path.join(config.sessionDir, sessionId);
+        mkdirSync(dir, { recursive: true });
+        appendFileSync(path.join(dir, 'trace.jsonl'), `${JSON.stringify({ ...trace, validation: boundedValidation(trace.validation) })}\n`, 'utf8');
+    }
+    catch {
+        // Observability is best-effort and cannot block coding work.
+    }
+}

package/dist/tools/builtins/index.js

@@ -46,7 +46,33 @@ const _projectSkillEnabledAtBoot = process.env.MOCODE_PROJECT_SKILL === 'true';
 const _projectSkillTools = _projectSkillEnabledAtBoot
     ? [projectSkillUpdateTool]
     : [];
-export const builtinTools = [
+const pathResource = (args) => typeof args.path === 'string' && args.path ? [`file:${args.path}`] : ['workspace'];
+const workspaceResource = () => ['workspace'];
+const memoryResource = () => ['memory-store'];
+const CAPABILITIES = {
+    read_file: { effect: 'read', concurrency: 'parallel', retry: 'safe', resources: pathResource },
+    write_file: { effect: 'write', concurrency: 'resource-locked', retry: 'never', resources: pathResource },
+    edit_file: { effect: 'write', concurrency: 'resource-locked', retry: 'never', resources: pathResource },
+    run_command: { effect: 'process', concurrency: 'serial', retry: 'never', resources: workspaceResource, supportsAbort: true },
+    glob: { effect: 'read', concurrency: 'parallel', retry: 'safe', resources: workspaceResource },
+    grep: { effect: 'read', concurrency: 'parallel', retry: 'safe', resources: workspaceResource },
+    codegraph: { effect: 'read', concurrency: 'parallel', retry: 'safe', resources: workspaceResource, supportsAbort: true },
+    web_search: { effect: 'network', concurrency: 'parallel', retry: 'safe', supportsAbort: true },
+    web_fetch: { effect: 'network', concurrency: 'parallel', retry: 'safe', supportsAbort: true },
+    use_skill: { effect: 'read', concurrency: 'serial', retry: 'safe' },
+    ask_human: { effect: 'read', concurrency: 'serial', retry: 'never' },
+    switch_mode: { effect: 'write', concurrency: 'serial', retry: 'never', resources: () => ['agent-mode'] },
+    drop_context: { effect: 'write', concurrency: 'serial', retry: 'never', resources: () => ['conversation-context'] },
+    memory_save: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
+    memory_search: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
+    memory_list: { effect: 'read', concurrency: 'serial', retry: 'safe', resources: memoryResource },
+    memory_update: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
+    memory_forget: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
+    project_skill_update: { effect: 'write', concurrency: 'serial', retry: 'never', resources: workspaceResource },
+    // 子 Agent 共享主工作区；在隔离 workspace / write-set 锁实现前必须串行。
+    task: { effect: 'write', concurrency: 'serial', retry: 'never', resources: workspaceResource, supportsAbort: true },
+};
+const rawBuiltinTools = [
     readFileTool,
     writeFileTool,
     editFileTool,
@@ -58,9 +84,14 @@ export const builtinTools = [
     webFetchTool,
     useSkillTool,
     askHumanTool,
-    switchModeTool, // plan↔auto 自切(两模式都可见,不进 PLAN_DISABLED_TOOLS;副作用控制工具→串行分支)
-    dropContextTool, // 运行中剔除无关 tool 结果(上下文管理,无副作用;两模式都可见,串行分支)
+    switchModeTool,
+    dropContextTool,
     ..._memoryTools,
     ..._projectSkillTools,
-    taskTool, // 派生子 agent(独立 history + 可受限工具集);plan 模式禁用(见 PLAN_DISABLED_TOOLS)
+    taskTool,
 ];
+/** 所有内置工具均携带显式能力；新增工具遗漏声明时 registry 会保守串行。 */
+export const builtinTools = rawBuiltinTools.map((tool) => ({
+    ...tool,
+    capabilities: CAPABILITIES[tool.name],
+}));