mocode-ai 1.3.9 → 1.4.0

package/dist/tools/builtins/index.js

@@ -1,3 +1,4 @@
+import { installBuiltinTools } from '../registry.js';
 import { readFileTool } from './read-file.js';
 import { viewImageTool } from './view-image.js';
 import { screenshotTool } from './screenshot.js';
@@ -22,30 +23,15 @@ import { memoryUpdateTool } from './memory-update.js';
 import { memoryForgetTool } from './memory-forget.js';
 import { memoryGraphTool } from './memory-graph.js';
 import { subAgentTool } from './task.js';
+import { computerTool } from './computer.js';
 /**
  * 所有内置工具,按注册顺序排列。
  * 加新工具:在本目录新建 `xxx.ts` 导出一个 Tool,再在下面数组里加一行。无需改 agent / llm。
  *
- * 记忆子系统总开关(MEMORY_ENABLED !== 'true'):6 个 memory_* 工具整体不进 builtinTools,
- * 进而不进 LLM 的工具表(模型根本看不到、也不会想着去调)。运行时通过 /memory_switch 切;
- * 切换对当前会话的 tool list 不重算(取的是模块初始化时的快照),所以需要重启 REPL 才生效
- * —— 这是有意为之,避免切开关瞬间把已发出请求的工具列表打乱。
- *
- * 注:这里直接读 env(MEMORY_ENABLED)而不是调 config.isMemoryEnabled(),因为本模块可能在
- * config 单例尚未初始化时被其它模块拉起(import 链路:tools/registry → builtinTools,
- * config 单例字段 getter 在 getPlanDisabledTools 等调用链路上 lazy 求值)。
+ * memory_* 始终注册进 registry（JSONL store 仍为懒加载）；主 Agent 是否看见它们由每 turn
+ * ToolPolicy 的 memory-read / memory-write 簇决定，MEMORY_ENABLED=false 可作 capability veto。
+ * 未传 ToolPolicy 的旧嵌入调用仍走 legacy profile 过滤。
  */
-const _memoryEnabledAtBoot = process.env.MEMORY_ENABLED === 'true';
-const _memoryTools = _memoryEnabledAtBoot
-    ? [
-        memorySaveTool,
-        memorySearchTool,
-        memoryListTool,
-        memoryUpdateTool,
-        memoryForgetTool,
-        memoryGraphTool,
-    ]
-    : [];
 const pathResource = (args) => typeof args.path === 'string' && args.path ? [`file:${args.path}`] : ['workspace'];
 const workspaceResource = () => ['workspace'];
 const memoryResource = () => ['memory-store'];
@@ -53,7 +39,12 @@ const CAPABILITIES = {
     read_file: { effect: 'read', concurrency: 'parallel', resources: pathResource },
     view_image: { effect: 'read', concurrency: 'parallel', resources: pathResource },
     screenshot: { effect: 'process', concurrency: 'serial', resources: workspaceResource, supportsAbort: true },
-    write_file: { effect: 'write', concurrency: 'resource-locked', resources: pathResource, delegatesResourceLocks: true },
+    write_file: {
+        effect: 'write',
+        concurrency: 'resource-locked',
+        resources: pathResource,
+        delegatesResourceLocks: true,
+    },
     edit_file: { effect: 'write', concurrency: 'resource-locked', resources: pathResource, delegatesResourceLocks: true },
     run_command: { effect: 'process', concurrency: 'serial', resources: workspaceResource, supportsAbort: true },
     // 后台进程与浏览器会话跨调用存活；串行执行避免同一页面/服务被并发操作。
@@ -78,13 +69,15 @@ const CAPABILITIES = {
     memory_forget: { effect: 'write', concurrency: 'serial', resources: memoryResource },
     // memory_graph:search/neighbors/stats 只读、add 写,统一按写处理走串行(调用不频繁,简化)。
     memory_graph: { effect: 'write', concurrency: 'serial', resources: memoryResource },
-    // sub-agent 动态协调：只读任务无锁并行；写任务在 overlay 中执行，merge 时由 ChangeSet 持 canonical lock。
+    // computer 桌面操控:桌面状态全局唯一,任何两个 computer 调用都不允许并发;
+    // effect=process(不写工作区文件,不触发 rollback/diff 追踪),supportsAbort 中断长 wait/拖拽。
+    computer: { effect: 'process', concurrency: 'serial', resources: () => ['desktop'], supportsAbort: true },
+    // sub-agent 与主 agent 同权,直接写工作区(无 overlay)。编排器本身不持锁——锁由嵌套工具
+    // 各自获取,否则子 agent 内的 run_command 会等父持有的 workspace 锁而自锁。
+    // 并发批排除见 tool-helpers.isResourceLockedCall:多个子 agent 逐个串行,不同时改工作区。
     'sub-agent': {
         effect: 'write',
         concurrency: 'resource-locked',
-        resources: (args) => args.mode === 'write' && Array.isArray(args.writeSet) && args.writeSet.length
-            ? args.writeSet.map((item) => `file:${String(item)}`)
-            : args.mode === 'write' ? ['workspace'] : [],
         delegatesResourceLocks: true,
         supportsAbort: true,
     },
@@ -107,11 +100,21 @@ const rawBuiltinTools = [
     askHumanTool,
     planUpdateTool,
     noteAppendTool,
-    ..._memoryTools,
+    memorySaveTool,
+    memorySearchTool,
+    memoryListTool,
+    memoryUpdateTool,
+    memoryForgetTool,
+    memoryGraphTool,
     subAgentTool,
+    computerTool,
 ];
 /** 所有内置工具均携带显式能力；新增工具遗漏声明时 registry 会保守串行。 */
 export const builtinTools = rawBuiltinTools.map((tool) => ({
     ...tool,
     capabilities: CAPABILITIES[tool.name],
 }));
+// 自注册:registry 不再顶层 import builtins(破模块循环,见 registry.ts 顶部注释),改为本模块
+// 初始化时把官方默认工具包注入注册表。registry→builtins 边已断,此处调 installBuiltinTools 时
+// registry 模块必已完成求值,无 TDZ 风险。装配方(CLI/stdio host/eval/测试)import 本模块即完成装配。
+installBuiltinTools(builtinTools);

package/dist/tools/builtins/memory-forget.js

@@ -3,7 +3,7 @@ import { forgetEntry } from '../../memory/store.js';
 // 遗忘:默认归档(archived,从索引/默认搜索隐藏,可复活);mode=delete 硬删。pinned 拒删。
 export const memoryForgetTool = {
     name: 'memory_forget',
-    description: 'Forget a memory entry: default archive (hidden, revivable via memory_update); mode=delete hard-deletes. Pinned entries can\'t be deleted (unpin first).',
+    description: "Forget a memory entry: default archive (hidden, revivable via memory_update); mode=delete hard-deletes. Pinned entries can't be deleted (unpin first).",
     risk: 'confirm',
     parameters: {
         type: 'object',

package/dist/tools/builtins/memory-graph.js

@@ -1,4 +1,4 @@
-import { addTriple, graphStats, neighborsOf, pathBetween, } from '../../memory/graph.js';
+import { addTriple, graphStats, neighborsOf, pathBetween } from '../../memory/graph.js';
 // ---------- memory_graph ----------
 // 知识图谱维护工具:邻居遍历(1-3 跳,可 relation 过滤)、两点最短路径、手工加三元组、看图统计。
 // 关键词搜索已并入 memory_search(条目 + 图谱事实一次返回),本工具不再提供 search。
@@ -7,19 +7,16 @@ import { addTriple, graphStats, neighborsOf, pathBetween, } from '../../memory/g
 function fmtEdges(edges) {
     if (edges.length === 0)
         return '(无边)';
-    return edges
-        .map((e) => `${e.src} --[${e.relation}]--> ${e.dst}${e.fact ? ` (${e.fact})` : ''}`)
-        .join('\n');
+    return edges.map((e) => `${e.src} --[${e.relation}]--> ${e.dst}${e.fact ? ` (${e.fact})` : ''}`).join('\n');
 }
 function fmtEntities(entities) {
     if (entities.length === 0)
         return '(无实体)';
-    return entities
-        .map((e) => `- ${e.id}: ${e.name}${e.summary ? ` — ${e.summary}` : ''} [${e.scope}]`)
-        .join('\n');
+    return entities.map((e) => `- ${e.id}: ${e.name}${e.summary ? ` — ${e.summary}` : ''} [${e.scope}]`).join('\n');
 }
 export const memoryGraphTool = {
     name: 'memory_graph',
+    risk: 'confirm',
     description: 'Maintain/explore the knowledge-graph memory layer (entities + temporal triples). Keyword search lives in memory_search. ' +
         'action=neighbors: BFS 1-3 hops around an entity (optional relation filter to follow one edge type); ' +
         'action=path: shortest path between two entities (bidirectional BFS, max 6 hops); ' +

package/dist/tools/builtins/memory-list.js

@@ -21,14 +21,10 @@ export const memoryListTool = {
     async execute(args) {
         const items = listEntries({
             type: typeof args.type === 'string' ? args.type : undefined,
-            status: typeof args.status === 'string'
-                ? args.status
-                : undefined,
+            status: typeof args.status === 'string' ? args.status : undefined,
         });
         if (items.length === 0)
             return '(无记忆条目)';
-        return items
-            .map((i) => `- ${i.id}: ${i.name} — ${i.summary} (${i.type}, ${i.status})`)
-            .join('\n');
+        return items.map((i) => `- ${i.id}: ${i.name} — ${i.summary} (${i.type}, ${i.status})`).join('\n');
     },
 };

package/dist/tools/builtins/memory-save.js

@@ -11,7 +11,10 @@ export const memorySaveTool = {
     parameters: {
         type: 'object',
         properties: {
-            name: { type: 'string', description: 'Short unique title (converted to id; rejected if it collides with an existing one)' },
+            name: {
+                type: 'string',
+                description: 'Short unique title (converted to id; rejected if it collides with an existing one)',
+            },
             summary: { type: 'string', description: 'One-line summary (goes into the index; keep it short)' },
             body: { type: 'string', description: 'Full content (details/context/evidence)' },
             type: {
@@ -32,7 +35,10 @@ export const memorySaveTool = {
                     type: 'object',
                     properties: {
                         src: { type: 'string', description: 'Source entity name (defaults to the memory name)' },
-                        relation: { type: 'string', description: 'Relation, snake_case, e.g. depends_on / decided_by / conflicts_with' },
+                        relation: {
+                            type: 'string',
+                            description: 'Relation, snake_case, e.g. depends_on / decided_by / conflicts_with',
+                        },
                         dst: { type: 'string', description: 'Target entity name' },
                         fact: { type: 'string', description: 'Optional one-line statement for the edge' },
                     },

package/dist/tools/builtins/memory-search.js

@@ -31,9 +31,7 @@ export const memorySearchTool = {
             return '错误:缺少 query。';
         const r = searchEntries(query, {
             type: typeof args.type === 'string' ? args.type : undefined,
-            status: typeof args.status === 'string'
-                ? args.status
-                : undefined,
+            status: typeof args.status === 'string' ? args.status : undefined,
             limit: typeof args.limit === 'number' ? args.limit : undefined,
         });
         const entryText = r
@@ -47,7 +45,9 @@ export const memorySearchTool = {
                 const lines = g.edges
                     .slice(0, GRAPH_FACTS_LIMIT)
                     .map((e) => `${e.src} --[${e.relation}]--> ${e.dst}${e.fact ? ` (${e.fact})` : ''}`);
-                const more = g.edges.length > GRAPH_FACTS_LIMIT ? `\n…(共 ${g.edges.length} 条,其余用 memory_graph action=neighbors 展开)` : '';
+                const more = g.edges.length > GRAPH_FACTS_LIMIT
+                    ? `\n…(共 ${g.edges.length} 条,其余用 memory_graph action=neighbors 展开)`
+                    : '';
                 graphText = `\n\n## 知识图谱事实\n${lines.join('\n')}${more}`;
             }
         }

package/dist/tools/builtins/note-append.js

@@ -17,7 +17,10 @@ function err(message) {
 }
 /** 归一化 section:兼容单复数、下划线/空格/连字符、大小写偏差。 */
 function normalizeSection(raw) {
-    const s = String(raw ?? '').trim().toLowerCase().replace(/[-\s]+/g, '_');
+    const s = String(raw ?? '')
+        .trim()
+        .toLowerCase()
+        .replace(/[-\s]+/g, '_');
     if (NOTE_SECTION_KEYS.includes(s))
         return s;
     // 单数/别名归一
@@ -86,11 +89,19 @@ export const noteAppendTool = {
         const tag = typeof args.tag === 'string' && args.tag.trim() ? args.tag.trim() : undefined;
         const result = appendNoteToSection(section, entry, tag);
         if ('error' in result) {
-            return { status: 'error', code: 'EXECUTION_ERROR', retryable: false, output: `错误:写入 notes.md 失败: ${result.error}` };
+            return {
+                status: 'error',
+                code: 'EXECUTION_ERROR',
+                retryable: false,
+                output: `错误:写入 notes.md 失败: ${result.error}`,
+            };
         }
         // note_append 写内部 notes.md,不作为用户代码 mutation 上报 changedFiles(与 plan_update 一致)。
         const titleMap = {
-            findings: 'Findings', decisions: 'Decisions', open_questions: 'Open Questions', risks: 'Risks',
+            findings: 'Findings',
+            decisions: 'Decisions',
+            open_questions: 'Open Questions',
+            risks: 'Risks',
         };
         const rendered = tag ? `- **[${tag}]** ${entry}` : `- ${entry}`;
         return {

package/dist/tools/builtins/plan-update.js

@@ -5,7 +5,9 @@ function err(message) {
 }
 /** 归一化模型常见的 status 变体,降低调用摩擦(无损兼容,不补造业务值)。 */
 function normalizeStatus(raw) {
-    const s = String(raw ?? 'pending').trim().toLowerCase();
+    const s = String(raw ?? 'pending')
+        .trim()
+        .toLowerCase();
     if (['in_progress', 'in-progress', 'inprogress', 'doing', 'current', 'active', 'wip'].includes(s))
         return 'in_progress';
     if (['completed', 'complete', 'done', 'finished', 'checked'].includes(s))
@@ -19,7 +21,8 @@ export const planUpdateTool = {
     description: 'Record and update the session execution plan (the `## Plan:` block in `.mocode/sessions/<id>/notes.md`). ' +
         'Use for any task with 3+ steps or context-loss risk. This REPLACES the whole plan each call, so always pass the full steps array. ' +
         'Rules: at most one step may be in_progress; mark a step completed as soon as its work is done — do not batch updates to end of turn. ' +
-        'Write each step self-contained enough to survive context compaction: name the target file/symbol, the change, and how to verify. ' +
+        'Give every step a short `title` (≤20 chars, e.g. "编写测试" / "修 status bar") that shows in the status bar, ' +
+        'plus a `content` that is self-contained enough to survive context compaction: name the target file/symbol, the change, and how to verify. ' +
         'When every step is completed the plan auto-settles to `## Done:`. Creates notes.md if missing. Safe to call in PLAN mode (writes only the session notepad, never project files).',
     risk: 'safe',
     parameters: {
@@ -35,10 +38,15 @@ export const planUpdateTool = {
             },
             steps: {
                 type: 'array',
-                description: `Full replacement step list (1-${PLAN_MAX_STEPS}). At most one step may be in_progress.`,
+                description: `Full replacement step list (1-${PLAN_MAX_STEPS}). At most one step may be in_progress. ` +
+                    'Each step should carry both a short `title` and a detailed `content`.',
                 items: {
                     type: 'object',
                     properties: {
+                        title: {
+                            type: 'string',
+                            description: 'Short scannable label (≤20 chars) shown in the status bar, e.g. "编写测试" / "修 status bar". Keep details in `content`.',
+                        },
                         content: {
                             type: 'string',
                             description: 'Self-contained step: target file/symbol, the change, and how to verify it.',
@@ -61,7 +69,9 @@ export const planUpdateTool = {
         required: ['steps'],
         additionalProperties: false,
     },
-    // 兼容模型的字段命名偏差:activeForm→active_form;step 用 text/task/description 代替 content。
+    // 兼容模型的字段命名偏差:activeForm→active_form;step 用 text/task/description 代替 content;
+    // step 短标签用 label/heading/step_title/short_title 代替 title(必须 delete 原字段,
+    // 否则 items.additionalProperties=false 会在随后的 schema 校验里拒收)。
     normalizeArguments(args) {
         if (args.activeForm !== undefined && args.active_form === undefined) {
             args.active_form = args.activeForm;
@@ -72,10 +82,22 @@ export const planUpdateTool = {
                 if (!s || typeof s !== 'object')
                     continue;
                 const step = s;
+                if (step.title === undefined) {
+                    for (const alt of ['label', 'heading', 'step_title', 'short_title']) {
+                        if (typeof step[alt] === 'string') {
+                            step.title = step[alt];
+                            delete step[alt];
+                            break;
+                        }
+                    }
+                }
                 if (step.content === undefined) {
                     for (const alt of ['text', 'task', 'description', 'title']) {
                         if (typeof step[alt] === 'string') {
                             step.content = step[alt];
+                            // content 由 title 兜底填补时,不再把它当短标签——否则会渲染成 `**A** — A`。
+                            if (alt === 'title')
+                                step.title = undefined;
                             break;
                         }
                     }
@@ -108,10 +130,14 @@ export const planUpdateTool = {
             }
             if (status === 'in_progress')
                 inProgressCount++;
-            const activeForm = typeof raw?.active_form === 'string' && raw.active_form.trim()
-                ? raw.active_form.trim()
-                : undefined;
-            steps.push({ content, status, ...(activeForm ? { activeForm } : {}) });
+            const activeForm = typeof raw?.active_form === 'string' && raw.active_form.trim() ? raw.active_form.trim() : undefined;
+            const title = typeof raw?.title === 'string' && raw.title.trim() ? raw.title.trim() : undefined;
+            steps.push({
+                ...(title ? { title } : {}),
+                content,
+                status,
+                ...(activeForm ? { activeForm } : {}),
+            });
         }
         if (inProgressCount > 1) {
             return err(`同一时刻只能有一个 in_progress 步骤,当前 ${inProgressCount} 个——请把其余改回 pending。`);
@@ -128,7 +154,12 @@ export const planUpdateTool = {
         const plan = { title, ...(goal ? { goal } : {}), steps };
         const result = writePlanToNotes(plan);
         if ('error' in result) {
-            return { status: 'error', code: 'EXECUTION_ERROR', retryable: false, output: `错误:写入 notes.md 失败: ${result.error}` };
+            return {
+                status: 'error',
+                code: 'EXECUTION_ERROR',
+                retryable: false,
+                output: `错误:写入 notes.md 失败: ${result.error}`,
+            };
         }
         const done = steps.filter((s) => s.status === 'completed').length;
         const rendered = renderPlanSection(plan);

package/dist/tools/builtins/run-command.js

@@ -53,7 +53,6 @@ export async function runCommandRaw(command, timeout = 120000, signal, cwd) {
         });
         const output = new BoundedCommandOutput();
         let finished = false;
-        let timer;
         const killTree = () => {
             try {
                 if (isWin) {
@@ -73,8 +72,7 @@ export async function runCommandRaw(command, timeout = 120000, signal, cwd) {
             if (finished)
                 return;
             finished = true;
-            if (timer)
-                clearTimeout(timer);
+            clearTimeout(timer);
             signal?.removeEventListener('abort', onAbort);
             done({ ...result, durationMs: Date.now() - startedAt });
         };
@@ -83,6 +81,12 @@ export async function runCommandRaw(command, timeout = 120000, signal, cwd) {
             finish({ status: 'aborted', exitCode: null, output: output.render().trim() });
         };
         const onChunk = (chunk) => output.append(chunk.toString('utf8'));
+        // 先起 timer 再挂事件:finish/onAbort 是闭包,里面要 clearTimeout(timer)。
+        // 把 timer 的初始化提到所有引用它的注册点之前,避免依赖"事件回调必然异步"这一前提。
+        const timer = setTimeout(() => {
+            killTree();
+            finish({ status: 'timed_out', exitCode: null, output: output.render().trim() });
+        }, timeout);
         child.stdout.on('data', onChunk);
         child.stderr.on('data', onChunk);
         child.on('error', (error) => {
@@ -95,10 +99,6 @@ export async function runCommandRaw(command, timeout = 120000, signal, cwd) {
                 output: output.render().trim(),
             });
         });
-        timer = setTimeout(() => {
-            killTree();
-            finish({ status: 'timed_out', exitCode: null, output: output.render().trim() });
-        }, timeout);
         if (signal) {
             if (signal.aborted)
                 onAbort();
@@ -142,7 +142,7 @@ function commandOutcome(result) {
 export const runCommandTool = {
     name: 'run_command',
     description: 'Run a shell command, merging stdout+stderr. Default timeout 120s. For tests, builds, git, etc.\n' +
-        'Multiple independent run_command calls may be issued in one response to save model round-trips; they execute serially, so do not depend one on another\'s output within the same message.',
+        "Multiple independent run_command calls may be issued in one response to save model round-trips; they execute serially, so do not depend one on another's output within the same message.",
     risk: 'dangerous',
     parameters: {
         type: 'object',

package/dist/tools/builtins/screenshot.js

@@ -1,89 +1,9 @@
-import { spawn } from 'node:child_process';
 import { mkdir } from 'node:fs/promises';
 import { dirname, extname } from 'node:path';
-import { loadImageAttachment, MAX_INLINE_BYTES_DEFAULT, } from '../../attachments/image.js';
-import { filterEnv, jailResolve } from '../../sandbox/index.js';
-function runCaptureProcess(program, args, env, signal) {
-    return new Promise((resolve) => {
-        const child = spawn(program, args, {
-            env,
-            windowsHide: true,
-            stdio: ['ignore', 'ignore', 'pipe'],
-        });
-        let stderr = '';
-        let finished = false;
-        const finish = (result) => {
-            if (finished)
-                return;
-            finished = true;
-            signal?.removeEventListener('abort', onAbort);
-            resolve(result);
-        };
-        const onAbort = () => {
-            child.kill();
-            finish({ status: 'aborted', detail: 'Screenshot capture was aborted.' });
-        };
-        child.stderr.on('data', (chunk) => {
-            stderr = (stderr + chunk.toString('utf8')).slice(-4000);
-        });
-        child.on('error', (error) => finish({ status: 'spawn_error', detail: error.message }));
-        child.on('close', (code) => finish({
-            status: code === 0 ? 'passed' : 'failed',
-            detail: stderr.trim() || `Capture process exited with code ${code ?? 'null'}.`,
-        }));
-        if (signal) {
-            if (signal.aborted)
-                onAbort();
-            else
-                signal.addEventListener('abort', onAbort, { once: true });
-        }
-    });
-}
-const WINDOWS_CAPTURE_SCRIPT = [
-    'Add-Type -AssemblyName System.Windows.Forms',
-    'Add-Type -AssemblyName System.Drawing',
-    "$bounds = if ($env:MOCODE_SCREENSHOT_TARGET -eq 'all') { [System.Windows.Forms.SystemInformation]::VirtualScreen } else { [System.Windows.Forms.Screen]::PrimaryScreen.Bounds }",
-    '$bitmap = [System.Drawing.Bitmap]::new($bounds.Width, $bounds.Height)',
-    '$graphics = [System.Drawing.Graphics]::FromImage($bitmap)',
-    'try {',
-    '  $graphics.CopyFromScreen($bounds.X, $bounds.Y, 0, 0, $bounds.Size)',
-    '  $bitmap.Save($env:MOCODE_SCREENSHOT_PATH, [System.Drawing.Imaging.ImageFormat]::Png)',
-    '} finally {',
-    '  $graphics.Dispose()',
-    '  $bitmap.Dispose()',
-    '}',
-].join('\n');
-async function captureDesktop(outputPath, target, signal) {
-    const env = {
-        ...filterEnv(process.env),
-        MOCODE_SCREENSHOT_PATH: outputPath,
-        MOCODE_SCREENSHOT_TARGET: target,
-    };
-    if (process.platform === 'win32') {
-        return runCaptureProcess('powershell.exe', ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', WINDOWS_CAPTURE_SCRIPT], env, signal);
-    }
-    if (process.platform === 'darwin') {
-        const args = ['-x', ...(target === 'primary' ? ['-m'] : []), outputPath];
-        return runCaptureProcess('/usr/sbin/screencapture', args, env, signal);
-    }
-    const candidates = [
-        ['gnome-screenshot', ['-f', outputPath]],
-        ['grim', [outputPath]],
-        ['scrot', [outputPath]],
-        ['import', ['-window', 'root', outputPath]],
-    ];
-    const failures = [];
-    for (const [program, args] of candidates) {
-        const result = await runCaptureProcess(program, args, env, signal);
-        if (result.status === 'passed' || result.status === 'aborted')
-            return result;
-        failures.push(`${program}: ${result.detail}`);
-    }
-    return {
-        status: 'failed',
-        detail: `No supported Linux screenshot command succeeded. ${failures.join(' | ')}`,
-    };
-}
+import { loadImageAttachment, MAX_INLINE_BYTES_DEFAULT } from '../../attachments/image.js';
+import { jailResolve } from '../../sandbox/index.js';
+// 平台捕获逻辑已抽到 runtime/screen-capture.ts(computer 工具闭环共用),本文件只做薄封装。
+import { captureDesktop } from '../../runtime/screen-capture.js';
 export const screenshotTool = {
     name: 'screenshot',
     description: 'Capture the desktop and inspect it as visual model input. Use this to diagnose visible UI state, dialogs, rendering problems, or applications that cannot be understood from source files alone. The user must approve each capture because screenshots may contain sensitive information.',
@@ -117,7 +37,9 @@ export const screenshotTool = {
             requestedPath += '.png';
         if (extname(requestedPath).toLowerCase() !== '.png') {
             return {
-                status: 'error', code: 'INVALID_ARGUMENTS', retryable: false,
+                status: 'error',
+                code: 'INVALID_ARGUMENTS',
+                retryable: false,
                 output: 'Screenshot output path must use the .png extension.',
             };
         }
@@ -161,13 +83,15 @@ export const screenshotTool = {
             code: 'OK',
             retryable: false,
             output: `Captured ${target} display to ${requestedPath} (${att.bytes} bytes). Visual content is attached to the next model request.`,
-            modelAttachments: [{
+            modelAttachments: [
+                {
                     type: 'image',
                     name: att.name,
                     mime: att.mime,
                     dataUrl: att.dataUrl,
                     detail,
-                }],
+                },
+            ],
         };
     },
 };

package/dist/tools/builtins/task.js

@@ -1,20 +1,20 @@
 import { spawnAgent } from '../../agent/spawn.js';
 import { MAX_OUTPUT } from '../constants.js';
 import { t } from '../../i18n/index.js';
-import { isSubAgentEnabled } from '../../config/index.js';
+import { isSubAgentHardDisabled } from '../../config/index.js';
 // ---------- task ----------
-// 派生子 agent 执行独立子任务。子 agent 有独立 history(不污染主对话),
-// 可受限工具子集 + 低步数上限,最终摘要回灌主 history 供主 agent 继续。
+// 派生子 agent 执行独立子任务。子 agent 与主 agent 完全同源:同一份系统提示、同一份工具
+// schema、同一份对话前缀(命中前缀缓存),写操作直接落在工作区并进入主 agent 当前轮次的
+// 同一回滚事务。它有自己的 history 分支(子任务的工具噪声不回灌主对话),最终摘要回灌主
+// history 供主 agent 继续。
 //
 // 适用:分而治之的复杂任务 / 隔离上下文避免子任务工具噪声撑爆主窗口。
-// 多个 task 在共享工作区期间由 capability scheduler 串行执行；隔离 workspace 落地后再开放并行写。
 export const subAgentTool = {
     name: 'sub-agent',
     risk: 'dangerous',
     description: [
-        'Spawn a capable worker for an isolated sub-task; only its structured result returns.',
-        'Pass context with facts the main agent already knows to prevent duplicate exploration and token waste.',
-        'Cannot recursively spawn sub-agents.',
+        'Spawn a worker with your own full capability set and conversation context for an isolated sub-task; only its structured result returns.',
+        'The worker sees everything you have already read and concluded, so it does not repeat exploration.',
     ].join(''),
     parameters: {
         type: 'object',
@@ -23,23 +23,10 @@ export const subAgentTool = {
                 type: 'string',
                 description: 'The sub-task instruction for the sub-agent. Be specific about what to investigate/implement and what to report back.',
             },
-            tools: {
-                type: 'array',
-                items: { type: 'string' },
-                description: 'Optional whitelist for deliberate specialization. Omit it to preserve the worker full capability for its mode.',
-            },
             maxSteps: {
                 type: 'number',
                 description: 'Optional loop-safety override. By default the worker uses the same step ceiling as the main agent; this is not a token budget.',
             },
-            mode: {
-                type: 'string', enum: ['read', 'write'],
-                description: 'read tasks may run in parallel; write tasks use an isolated overlay and are merged by the coordinator.',
-            },
-            writeSet: {
-                type: 'array', items: { type: 'string' },
-                description: 'Known workspace-relative paths this task may write. Unknown write sets conservatively use the workspace lock.',
-            },
             context: {
                 type: 'string',
                 description: 'Concise facts already learned by the main agent. Passing this avoids duplicate repository exploration.',
@@ -48,26 +35,28 @@ export const subAgentTool = {
         required: ['prompt'],
     },
     async execute(args, ctx) {
-        if (!isSubAgentEnabled())
+        if (isSubAgentHardDisabled())
             return t('task.disabled');
         const prompt = String(args.prompt ?? '');
         if (!prompt)
             return t('task.missingPrompt');
-        const tools = Array.isArray(args.tools)
-            ? args.tools.map((t) => String(t))
-            : undefined;
-        const maxSteps = typeof args.maxSteps === 'number' && args.maxSteps > 0
-            ? Math.floor(args.maxSteps)
-            : undefined;
-        const mode = args.mode === 'write' ? 'write' : 'read';
-        const writeSet = Array.isArray(args.writeSet) ? args.writeSet.map(String) : undefined;
+        const maxSteps = typeof args.maxSteps === 'number' && args.maxSteps > 0 ? Math.floor(args.maxSteps) : undefined;
         const context = typeof args.context === 'string' ? args.context.slice(0, 4000) : undefined;
         // 透传主 agent 的 abort signal:主 Ctrl+C 树杀子 agent(chat abort + 工具 abort)。
         // callId 透传:子 agent 实时渲染据此挂靠主侧对应批次(并行派发时各行归位)。
-        const result = await spawnAgent({ prompt, tools, maxSteps, signal: ctx?.signal, mode, writeSet, context, callId: ctx?.callId });
+        // delegation 透传:子 agent 复用父 step 的系统提示/工具 schema/对话前缀,命中前缀缓存。
+        const result = await spawnAgent({
+            prompt,
+            maxSteps,
+            signal: ctx?.signal,
+            context,
+            callId: ctx?.callId,
+            parentAllowedToolNames: ctx?.allowedToolNames,
+            delegation: ctx?.delegation,
+        });
         let output;
         if (!result.completed) {
-            output = `[SubAgentResult status=${result.status} tokens=${result.usage.totalTokens} readSet=${JSON.stringify(result.readSet)} changeSet=${result.changeSet?.id ?? 'none'} verification=not-run]\n${result.summary ?? t('task.interrupted')}`;
+            output = `[SubAgentResult status=${result.status} tokens=${result.usage.totalTokens}]\n${result.summary ?? t('task.interrupted')}`;
         }
         else if (!result.summary) {
             output = t('task.noSummary');
@@ -76,16 +65,16 @@ export const subAgentTool = {
             // 摘要可能很长,截到 MAX_OUTPUT 保主 history 不爆。
             const summary = [
                 result.summary,
-                `\n[SubAgentResult status=${result.status} tokens=${result.usage.totalTokens} prompt=${result.usage.promptTokens} completion=${result.usage.completionTokens} cached=${result.usage.cachedTokens} readSet=${JSON.stringify(result.readSet)} changeSet=${result.changeSet?.id ?? 'none'} verification=deferred-to-coordinator]`,
-            ].filter(Boolean).join('\n');
-            output = summary.length > MAX_OUTPUT ? (summary.slice(0, MAX_OUTPUT) +
-                `\n\n${t('task.summaryTruncated', { count: summary.length - MAX_OUTPUT })}`) : summary;
+                `\n[SubAgentResult status=${result.status} tokens=${result.usage.totalTokens} prompt=${result.usage.promptTokens} completion=${result.usage.completionTokens} cached=${result.usage.cachedTokens}]`,
+            ]
+                .filter(Boolean)
+                .join('\n');
+            output =
+                summary.length > MAX_OUTPUT
+                    ? summary.slice(0, MAX_OUTPUT) + `\n\n${t('task.summaryTruncated', { count: summary.length - MAX_OUTPUT })}`
+                    : summary;
         }
-        const code = result.status === 'aborted'
-            ? 'ABORTED'
-            : result.status === 'conflict'
-                ? 'CHANGE_CONFLICT'
-                : result.completed ? 'OK' : 'EXECUTION_ERROR';
+        const code = result.status === 'aborted' ? 'ABORTED' : result.completed ? 'OK' : 'EXECUTION_ERROR';
         const outcome = {
             status: result.status === 'aborted' ? 'aborted' : result.completed ? 'success' : 'error',
             code,

package/dist/tools/builtins/use-skill.js

@@ -55,7 +55,7 @@ export const useSkillTool = {
                 return `错误:无法读取 skill "${name}" 的文件 "${args.file}"(不存在 / 越界 / 过大)。`;
             return `# Skill: ${name} · ${args.file}\n\n${content}`;
         }
-        const body = await renderSkillBody(skill, args.args, ctx?.signal);
+        const body = await renderSkillBody(skill, args.args, ctx?.signal, ctx?.allowedToolNames);
         if (body === null)
             return `错误:未找到 skill "${name}" 的正文。用 /skills 查看可用 skill 列表。`;
         // 激活 inline skill 的工具面约束(allowed/disallowed),本轮内生效。