minimal-agent 0.11.0 → 0.13.0

package/src/tools/glob/glob.ts

@@ -3,13 +3,14 @@
  *  src/tools/glob.ts —— Glob 工具（按文件名模式匹配）
  * ------------------------------------------------------------
  *  对应 kakadeai 主仓库的 GlobTool。
- *  实现用 fast-glob（npm 包），默认按 mtime 倒序排列（新文件在前）。
+ *  实现用 fast-glob（npm 包），默认按发现顺序流式返回。
  *  支持限制候选数量，并通过结构化元数据返回大小和修改时间。
  * ============================================================
  */
 
 import { isAbsolute, relative, resolve, sep } from 'node:path';
 import fg from 'fast-glob';
+import { stat } from 'node:fs/promises';
 import { z } from 'zod';
 
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
@@ -26,11 +27,37 @@ const inputSchema = z.object({
   path: z
     .string()
     .optional()
-    .describe('搜索的根目录（默认当前工作目录）；省略时不要传 "undefined" 字符串'),
-  sort_by: z.enum(['modified', 'path']).default('modified').optional().describe('排序字段，默认 modified'),
-  order: z.enum(['asc', 'desc']).default('desc').optional().describe('排序方向，默认 desc（最新在前）'),
-  offset: z.number().int().min(0).optional().describe('跳过前 N 个结果，默认 0'),
-  limit: z.number().int().min(0).max(10_000).optional().describe('最多返回多少个候选文件；默认 200，0 表示不限制'),
+    .describe(
+      '搜索的根目录（默认当前工作目录）；省略时不要传 "undefined" 字符串',
+    ),
+  strategy: z
+    .enum(['fast', 'complete'])
+    .default('fast')
+    .optional()
+    .describe('fast 在收集够分页候选后提前停止；完整排序请用 complete'),
+  sort_by: z
+    .enum(['discovery', 'modified', 'path'])
+    .default('discovery')
+    .optional()
+    .describe('排序字段，默认 discovery'),
+  order: z
+    .enum(['asc', 'desc'])
+    .default('desc')
+    .optional()
+    .describe('排序方向，默认 desc（最新在前）'),
+  offset: z
+    .number()
+    .int()
+    .min(0)
+    .optional()
+    .describe('跳过前 N 个结果，默认 0'),
+  limit: z
+    .number()
+    .int()
+    .min(0)
+    .max(10_000)
+    .optional()
+    .describe('最多返回多少个候选文件；默认 200，0 表示不限制'),
 });
 type GlobInput = z.infer<typeof inputSchema>;
 
@@ -41,13 +68,17 @@ const parameters = toToolParameters(inputSchema);
 const description = `- Fast file pattern matching tool that works with any codebase size
 - Supports glob patterns like "**/*.js" or "src/**/*.ts"
 - Returns structured file candidates with path, size, and modification time
-- Defaults to modification time descending, which is useful for requests like "find the latest contract"
+- Defaults to streaming discovery order; request sort_by=modified with strategy=complete for newest-file queries
 - Discovery does not present files to the user; use Read for selected source files and PresentResult for delivered files
 - Use this tool when you need to find files by name patterns
 - When you need to do an open ended search that may require multiple rounds, prefer the Grep tool for content search`;
 
 // ---------------- 4. call() ----------------
-async function call(input: GlobInput, runCwd = getWorkingDir()): Promise<ToolResult> {
+async function call(
+  input: GlobInput,
+  runCwd = getWorkingDir(),
+  signal?: AbortSignal,
+): Promise<ToolResult> {
   // 以 getWorkingDir() 为锚，而非裸 resolve()（同 grep.ts 的坑：后者落回 process.cwd()，
   // 多工作区宿主进程里会与当前工作区脱节）。resolve 对绝对路径行为不变。
   const cwd = input.path ? resolve(runCwd, input.path) : runCwd;
@@ -57,48 +88,147 @@ async function call(input: GlobInput, runCwd = getWorkingDir()): Promise<ToolRes
   // （cwd 用原生路径没问题；fast-glob 内部会处理）
   const pattern = input.pattern.replace(/\\/g, '/');
 
-  // fast-glob 自带 ignore 一部分（node_modules 之类还是要显式排除）
-  let matches: fg.Entry[];
+  const offset = input.offset ?? 0,
+    limit = input.limit ?? 200,
+    strategy = input.strategy ?? 'fast',
+    sortBy = input.sort_by ?? 'discovery';
+  const needed = limit === 0 ? Number.POSITIVE_INFINITY : offset + limit + 1;
+  const ignore = ['node_modules', '.git', '.svn', '.hg', '.jj', '.sl', 'dist']
+    .filter((name) => !pattern.split('/').includes(name))
+    .map((name) => `**/${name}/**`);
+  type Candidate = {
+    path: string;
+    mtime: number;
+    size: number;
+    discovery: number;
+  };
+  const candidates: Candidate[] = [];
+  let scanned = 0;
+  let stoppedEarly = false;
+  const effectiveOrder =
+    input.order ?? (sortBy === 'discovery' ? 'asc' : 'desc');
+  const compare = (a: Candidate, b: Candidate): number => {
+    const value =
+      sortBy === 'path'
+        ? a.path.localeCompare(b.path)
+        : sortBy === 'modified'
+          ? a.mtime - b.mtime
+          : a.discovery - b.discovery;
+    return value * (effectiveOrder === 'desc' ? -1 : 1);
+  };
+  // 最大堆的根始终是当前保留集合里“最差”的候选，完整扫描只占 O(offset+limit) 内存。
+  const bubbleUp = (index: number) => {
+    while (index > 0) {
+      const parent = Math.floor((index - 1) / 2);
+      if (compare(candidates[parent]!, candidates[index]!) >= 0) break;
+      [candidates[parent], candidates[index]] = [
+        candidates[index]!,
+        candidates[parent]!,
+      ];
+      index = parent;
+    }
+  };
+  const bubbleDown = (index: number) => {
+    while (true) {
+      const left = index * 2 + 1,
+        right = left + 1;
+      let worst = index;
+      if (
+        left < candidates.length &&
+        compare(candidates[left]!, candidates[worst]!) > 0
+      )
+        worst = left;
+      if (
+        right < candidates.length &&
+        compare(candidates[right]!, candidates[worst]!) > 0
+      )
+        worst = right;
+      if (worst === index) break;
+      [candidates[index], candidates[worst]] = [
+        candidates[worst]!,
+        candidates[index]!,
+      ];
+      index = worst;
+    }
+  };
+  const retain = (item: Candidate) => {
+    if (limit === 0) {
+      candidates.push(item);
+      return;
+    }
+    if (candidates.length < needed) {
+      candidates.push(item);
+      bubbleUp(candidates.length - 1);
+    } else if (compare(item, candidates[0]!) < 0) {
+      candidates[0] = item;
+      bubbleDown(0);
+    }
+  };
   try {
-    matches = await fg(pattern, {
+    const stream = fg.stream(pattern, {
       cwd,
       dot: true,
       onlyFiles: true,
       followSymbolicLinks: false,
-      // Explicit patterns win over defaults (fast-glob ignore otherwise always wins).
-      ignore: ['node_modules', '.git', '.svn', '.hg', '.jj', '.sl', 'dist']
-        .filter((name) => !pattern.split('/').includes(name))
-        .map((name) => `**/${name}/**`),
+      ignore,
       absolute: false,
-      stats: true,
     });
+    for await (const raw of stream) {
+      if (signal?.aborted) {
+        (stream as unknown as { destroy?: () => void }).destroy?.();
+        throw new Error('aborted');
+      }
+      const path = Buffer.isBuffer(raw) ? raw.toString('utf8') : String(raw);
+      scanned++;
+      if (strategy === 'fast' && sortBy === 'discovery') {
+        candidates.push({ path, mtime: 0, size: 0, discovery: scanned });
+        if (candidates.length >= needed) {
+          stoppedEarly = true;
+          (stream as unknown as { destroy?: () => void }).destroy?.();
+          break;
+        }
+        continue;
+      }
+      const info =
+        sortBy === 'modified'
+          ? await stat(resolve(cwd, path))
+          : { mtimeMs: 0, size: 0 };
+      const item = {
+        path,
+        mtime: info.mtimeMs,
+        size: info.size,
+        discovery: scanned,
+      };
+      retain(item);
+    }
   } catch (e) {
     return { ok: false, error: `glob 失败：${(e as Error).message}` };
   }
 
-  if (matches.length === 0) {
-    return { ok: true, content: `(no files matched pattern "${pattern}" in ${cwd})` };
+  if (candidates.length === 0) {
+    return {
+      ok: true,
+      content: `(no files matched pattern "${pattern}" in ${cwd})`,
+    };
   }
 
   // 候选携带稳定元数据。发现候选本身不代表文件已经成为会话上下文。
-  const withMtime = await Promise.all(
-    matches.map(async (entry) => ({
-      path: entry.path,
-      mtime: entry.stats?.mtimeMs ?? 0,
-      size: entry.stats?.size ?? 0,
-    })),
-  );
-  const direction = (input.order ?? 'desc') === 'desc' ? -1 : 1;
-  withMtime.sort((a, b) => {
-    const compared = (input.sort_by ?? 'modified') === 'path'
-      ? a.path.localeCompare(b.path)
-      : a.mtime - b.mtime;
-    return compared * direction;
-  });
-  const offset = input.offset ?? 0;
-  const limit = input.limit ?? 200;
-  const selected = limit === 0 ? withMtime.slice(offset) : withMtime.slice(offset, offset + limit);
-  const truncated = offset + selected.length < withMtime.length;
+  const withMtime = candidates;
+  withMtime.sort(compare);
+  const selected =
+    limit === 0
+      ? withMtime.slice(offset)
+      : withMtime.slice(offset, offset + limit);
+  const truncated = stoppedEarly || offset + selected.length < withMtime.length;
+  for (const item of selected) {
+    if (item.size === 0 && item.mtime === 0) {
+      const info = await stat(resolve(cwd, item.path)).catch(() => undefined);
+      if (info) {
+        item.size = info.size;
+        item.mtime = info.mtimeMs;
+      }
+    }
+  }
 
   // 输出：每行一个相对路径
   let content = selected.map((m) => m.path).join('\n');
@@ -107,23 +237,31 @@ async function call(input: GlobInput, runCwd = getWorkingDir()): Promise<ToolRes
   if (content.length > DEFAULT_MAX_RESULT_SIZE_CHARS) {
     content =
       content.slice(0, DEFAULT_MAX_RESULT_SIZE_CHARS) +
-      `\n\n... (共 ${withMtime.length} 个文件，输出超过 ${DEFAULT_MAX_RESULT_SIZE_CHARS} 字符，已截断)`;
+      `\n\n... (输出超过 ${DEFAULT_MAX_RESULT_SIZE_CHARS} 字符，已截断)`;
   }
   const workspaceRoot = resolve(runCwd);
   return {
     ok: true,
-    content: `${content}\n\n(匹配 ${withMtime.length} 个，返回 ${selected.length} 个，offset=${offset}${truncated ? '，仍有后续结果' : ''}，按 ${input.sort_by ?? 'modified'} ${input.order ?? 'desc'} 排序)`,
+    content: `${content}\n\n(${stoppedEarly ? `至少扫描 ${scanned} 个` : `匹配 ${scanned} 个`}，返回 ${selected.length} 个，offset=${offset}${truncated ? '，仍有后续结果' : ''}，按 ${sortBy} ${effectiveOrder} 排序)`,
     metadata: {
       kind: 'file_discovery',
       files: selected.flatMap((entry) => {
         const absolute = resolve(cwd, entry.path);
         const rel = relative(workspaceRoot, absolute);
-        if (!rel || rel === '..' || rel.startsWith(`..${sep}`) || isAbsolute(rel)) return [];
-        return [{
-          relativePath: rel.split(sep).join('/'),
-          size: entry.size,
-          modifiedAt: entry.mtime,
-        }];
+        if (
+          !rel ||
+          rel === '..' ||
+          rel.startsWith(`..${sep}`) ||
+          isAbsolute(rel)
+        )
+          return [];
+        return [
+          {
+            relativePath: rel.split(sep).join('/'),
+            size: entry.size,
+            modifiedAt: entry.mtime,
+          },
+        ];
       }),
     },
   };
@@ -139,6 +277,7 @@ export const globTool: Tool<GlobInput> = {
   isConcurrencySafe: true,
   maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
   interruptBehavior: () => 'cancel',
-  call: (input) => call(input),
-  callWithContext: (input, _signal, context: ToolCallContext) => call(input, context.cwd),
+  call: (input, signal) => call(input, undefined, signal),
+  callWithContext: (input, signal, context: ToolCallContext) =>
+    call(input, context.cwd, signal),
 };

package/src/tools/index.js

@@ -19,6 +19,8 @@ import { advisorTool } from './advisor/advisor.js';
 import { agentTool } from './agent/agent.js';
 import { askUserQuestionTool } from './ask/ask.js';
 import { bashTool } from './bash/bash.js';
+import { assertCapabilityRegistry } from './capabilities.js';
+import { computerUseTool } from './computeruse/computeruse.js';
 import { downloadTool } from './download/download.js';
 import { editTool } from './edit/edit.js';
 import { multiEditTool } from './edit/multi-edit.js';
@@ -26,20 +28,24 @@ import { genImageTool } from './genimage/genimage.js';
 import { generateSpeechTool } from './genspeech/genspeech.js';
 import { globTool } from './glob/glob.js';
 import { grepTool } from './grep/grep.js';
-import { readTool } from './read/read.js';
-import { presentResultTool } from './presentresult/presentresult.js';
-import { clearPersonaTool, confirmMemoryTool, forgetMemoryTool, listMemoriesTool, recallMemoryTool, rememberMemoryTool, reviewMemoriesTool, searchConversationsTool, setPersonaTool, updateMemoryTool, } from './memory/memory.js';
-import { webfetchTool } from './webfetch/webfetch.js';
-import { webbrowserTool } from './webbrowser/webbrowser.js';
-import { webSearchTool } from './websearch/websearch.js';
-import { writeTool } from './write/write.js';
-import { computerUseTool } from './computeruse/computeruse.js';
-import { assertCapabilityRegistry } from './capabilities.js';
 import { lspTool } from './lsp/lsp.js';
+import { clearPersonaTool, confirmMemoryTool, forgetMemoryTool, listMemoriesTool, recallMemoryTool, rememberMemoryTool, reviewMemoriesTool, searchConversationsTool, setPersonaTool, updateMemoryTool, } from './memory/memory.js';
 import { notebookEditTool } from './notebook/notebookEdit.js';
 import { powerShellTool } from './powershell/powershell.js';
+import { presentResultTool } from './presentresult/presentresult.js';
+import { readTool } from './read/read.js';
+import { skillTool } from './skill/skill.js';
+import { snipTool } from './snip/snip.js';
+import { taskCreateTool, taskGetTool, taskListTool, taskUpdateTool, } from './tasks/taskManagement.js';
 import { taskOutputTool } from './tasks/taskOutput.js';
 import { taskStopTool } from './tasks/taskStop.js';
+import { terminalCaptureTool } from './terminal/terminalCapture.js';
+import { trashTool } from './trash/trash.js';
+import { webbrowserTool } from './webbrowser/webbrowser.js';
+import { webfetchTool } from './webfetch/webfetch.js';
+import { webSearchTool } from './websearch/websearch.js';
+import { enterWorktreeTool, exitWorktreeTool, } from './worktree/sessionWorktree.js';
+import { writeTool } from './write/write.js';
 /** 所有内置工具（顺序 = 给 LLM 呈现的顺序，不影响代码执行，但会影响模型的优先级直觉） */
 export const ALL_TOOLS = [
     readTool,
@@ -76,6 +82,17 @@ export const ALL_TOOLS = [
     computerUseTool,
     // 追加在末尾：主循环 tools schema 的原有前缀字节不动（提示词缓存友好）
     agentTool,
+    // Product tools append at the end to preserve the existing schema prefix cache.
+    trashTool,
+    taskCreateTool,
+    taskGetTool,
+    taskUpdateTool,
+    taskListTool,
+    skillTool,
+    enterWorktreeTool,
+    exitWorktreeTool,
+    terminalCaptureTool,
+    snipTool,
 ];
 assertCapabilityRegistry(ALL_TOOLS.map((tool) => tool.name));
 /** 按名字查表 */
@@ -157,12 +174,7 @@ export async function executeTool(name, rawArguments, signal, ctx) {
             .join('\n');
         return {
             ok: false,
-            error: `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n`
-                + '通用修法：\n'
-                + '  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n'
-                + '    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n'
-                + '  · 枚举字段只能取列出的值；数值字段注意上下限。\n'
-                + '  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。',
+            error: `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n通用修法：\n  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n  · 枚举字段只能取列出的值；数值字段注意上下限。\n  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。`,
         };
     }
     // 4. 调用 call()，捕获意外异常
@@ -180,16 +192,22 @@ export async function executeTool(name, rawArguments, signal, ctx) {
     }
 }
 // 导出每个工具，方便测试单独 import
-export { readTool, editTool, writeTool, globTool, grepTool, webSearchTool, webfetchTool, webbrowserTool, computerUseTool, downloadTool, presentResultTool, bashTool, askUserQuestionTool };
+export { readTool, editTool, writeTool, globTool, grepTool, webSearchTool, webfetchTool, webbrowserTool, computerUseTool, downloadTool, presentResultTool, bashTool, askUserQuestionTool, };
 export { clearPersonaTool, confirmMemoryTool, forgetMemoryTool, listMemoriesTool, recallMemoryTool, rememberMemoryTool, reviewMemoriesTool, searchConversationsTool, setPersonaTool, updateMemoryTool, } from './memory/memory.js';
 export { multiEditTool } from './edit/multi-edit.js';
 export { genImageTool } from './genimage/genimage.js';
 export { advisorTool } from './advisor/advisor.js';
 export { agentTool } from './agent/agent.js';
-export { createGenerateSpeechTool, generateSpeechTool } from './genspeech/genspeech.js';
+export { createGenerateSpeechTool, generateSpeechTool, } from './genspeech/genspeech.js';
 export { createWebSearchTool } from './websearch/websearch.js';
 export { lspTool } from './lsp/lsp.js';
 export { notebookEditTool } from './notebook/notebookEdit.js';
 export { powerShellTool } from './powershell/powershell.js';
 export { taskOutputTool } from './tasks/taskOutput.js';
 export { taskStopTool } from './tasks/taskStop.js';
+export { taskCreateTool, taskGetTool, taskUpdateTool, taskListTool, } from './tasks/taskManagement.js';
+export { trashTool } from './trash/trash.js';
+export { skillTool } from './skill/skill.js';
+export { snipTool } from './snip/snip.js';
+export { enterWorktreeTool, exitWorktreeTool, } from './worktree/sessionWorktree.js';
+export { terminalCaptureTool, installTerminalCapture, } from './terminal/terminalCapture.js';

package/src/tools/index.ts

@@ -21,6 +21,8 @@ import { advisorTool } from './advisor/advisor.js';
 import { agentTool } from './agent/agent.js';
 import { askUserQuestionTool } from './ask/ask.js';
 import { bashTool } from './bash/bash.js';
+import { assertCapabilityRegistry } from './capabilities.js';
+import { computerUseTool } from './computeruse/computeruse.js';
 import { downloadTool } from './download/download.js';
 import { editTool } from './edit/edit.js';
 import { multiEditTool } from './edit/multi-edit.js';
@@ -28,8 +30,7 @@ import { genImageTool } from './genimage/genimage.js';
 import { generateSpeechTool } from './genspeech/genspeech.js';
 import { globTool } from './glob/glob.js';
 import { grepTool } from './grep/grep.js';
-import { readTool } from './read/read.js';
-import { presentResultTool } from './presentresult/presentresult.js';
+import { lspTool } from './lsp/lsp.js';
 import {
   clearPersonaTool,
   confirmMemoryTool,
@@ -42,17 +43,30 @@ import {
   setPersonaTool,
   updateMemoryTool,
 } from './memory/memory.js';
-import { webfetchTool } from './webfetch/webfetch.js';
-import { webbrowserTool } from './webbrowser/webbrowser.js';
-import { webSearchTool } from './websearch/websearch.js';
-import { writeTool } from './write/write.js';
-import { computerUseTool } from './computeruse/computeruse.js';
-import { assertCapabilityRegistry } from './capabilities.js';
-import { lspTool } from './lsp/lsp.js';
 import { notebookEditTool } from './notebook/notebookEdit.js';
 import { powerShellTool } from './powershell/powershell.js';
+import { presentResultTool } from './presentresult/presentresult.js';
+import { readTool } from './read/read.js';
+import { skillTool } from './skill/skill.js';
+import { snipTool } from './snip/snip.js';
+import {
+  taskCreateTool,
+  taskGetTool,
+  taskListTool,
+  taskUpdateTool,
+} from './tasks/taskManagement.js';
 import { taskOutputTool } from './tasks/taskOutput.js';
 import { taskStopTool } from './tasks/taskStop.js';
+import { terminalCaptureTool } from './terminal/terminalCapture.js';
+import { trashTool } from './trash/trash.js';
+import { webbrowserTool } from './webbrowser/webbrowser.js';
+import { webfetchTool } from './webfetch/webfetch.js';
+import { webSearchTool } from './websearch/websearch.js';
+import {
+  enterWorktreeTool,
+  exitWorktreeTool,
+} from './worktree/sessionWorktree.js';
+import { writeTool } from './write/write.js';
 
 /** 所有内置工具（顺序 = 给 LLM 呈现的顺序，不影响代码执行，但会影响模型的优先级直觉） */
 export const ALL_TOOLS: Tool[] = [
@@ -90,6 +104,17 @@ export const ALL_TOOLS: Tool[] = [
   computerUseTool,
   // 追加在末尾：主循环 tools schema 的原有前缀字节不动（提示词缓存友好）
   agentTool,
+  // Product tools append at the end to preserve the existing schema prefix cache.
+  trashTool,
+  taskCreateTool,
+  taskGetTool,
+  taskUpdateTool,
+  taskListTool,
+  skillTool,
+  enterWorktreeTool,
+  exitWorktreeTool,
+  terminalCaptureTool,
+  snipTool,
 ];
 
 assertCapabilityRegistry(ALL_TOOLS.map((tool) => tool.name));
@@ -103,7 +128,14 @@ export function getToolGateDetails(
   name: string,
   rawArguments: string,
   context: ToolCallContext,
-): Partial<Pick<import('../toolGate.js').ToolGateRequest, 'isReadOnly' | 'runContext' | 'action'>> | undefined {
+):
+  | Partial<
+      Pick<
+        import('../toolGate.js').ToolGateRequest,
+        'isReadOnly' | 'runContext' | 'action'
+      >
+    >
+  | undefined {
   const tool = getToolByName(name);
   if (!tool?.gateRequest) return undefined;
   let parsed: unknown;
@@ -182,20 +214,15 @@ export async function executeTool(
       .join('\n');
     return {
       ok: false,
-      error:
-        `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n`
-        + '通用修法：\n'
-        + '  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n'
-        + '    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n'
-        + '  · 枚举字段只能取列出的值；数值字段注意上下限。\n'
-        + '  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。',
+      error: `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n通用修法：\n  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n  · 枚举字段只能取列出的值；数值字段注意上下限。\n  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。`,
     };
   }
 
   // 4. 调用 call()，捕获意外异常
   //
   try {
-    if (tool.callWithContext) return await tool.callWithContext(checked.data, signal, ctx ?? {});
+    if (tool.callWithContext)
+      return await tool.callWithContext(checked.data, signal, ctx ?? {});
     return await tool.call(checked.data, signal);
   } catch (e) {
     return {
@@ -206,7 +233,21 @@ export async function executeTool(
 }
 
 // 导出每个工具，方便测试单独 import
-export { readTool, editTool, writeTool, globTool, grepTool, webSearchTool, webfetchTool, webbrowserTool, computerUseTool, downloadTool, presentResultTool, bashTool, askUserQuestionTool };
+export {
+  readTool,
+  editTool,
+  writeTool,
+  globTool,
+  grepTool,
+  webSearchTool,
+  webfetchTool,
+  webbrowserTool,
+  computerUseTool,
+  downloadTool,
+  presentResultTool,
+  bashTool,
+  askUserQuestionTool,
+};
 export {
   clearPersonaTool,
   confirmMemoryTool,
@@ -223,10 +264,30 @@ export { multiEditTool } from './edit/multi-edit.js';
 export { genImageTool } from './genimage/genimage.js';
 export { advisorTool } from './advisor/advisor.js';
 export { agentTool } from './agent/agent.js';
-export { createGenerateSpeechTool, generateSpeechTool } from './genspeech/genspeech.js';
+export {
+  createGenerateSpeechTool,
+  generateSpeechTool,
+} from './genspeech/genspeech.js';
 export { createWebSearchTool } from './websearch/websearch.js';
 export { lspTool } from './lsp/lsp.js';
 export { notebookEditTool } from './notebook/notebookEdit.js';
 export { powerShellTool } from './powershell/powershell.js';
 export { taskOutputTool } from './tasks/taskOutput.js';
 export { taskStopTool } from './tasks/taskStop.js';
+export {
+  taskCreateTool,
+  taskGetTool,
+  taskUpdateTool,
+  taskListTool,
+} from './tasks/taskManagement.js';
+export { trashTool } from './trash/trash.js';
+export { skillTool } from './skill/skill.js';
+export { snipTool } from './snip/snip.js';
+export {
+  enterWorktreeTool,
+  exitWorktreeTool,
+} from './worktree/sessionWorktree.js';
+export {
+  terminalCaptureTool,
+  installTerminalCapture,
+} from './terminal/terminalCapture.js';