refactor: reorganize tool resolution order in resolveTools (#708)

Author: xierenyuan

src/tool.ts

@@ -98,29 +98,28 @@ export async function resolveTools(opts: ResolveToolsOpts) {
     ...mcpTools,
   ];
 
-  const toolsConfig = opts.context.config.tools;
-  let availableTools = (() => {
-    if (!toolsConfig || Object.keys(toolsConfig).length === 0) {
-      return allTools;
-    }
-    return allTools.filter((tool) => {
-      // Check if the tool is disabled (only explicitly set to false will disable)
-      const isDisabled = toolsConfig[tool.name] === false;
-      return !isDisabled;
-    });
-  })();
-
+  // 1. First, execute plugin hook to allow plugins to add/modify tools
+  let availableTools = allTools;
   try {
     availableTools = await opts.context.apply({
       hook: 'tool',
       args: [{ isPlan: opts.isPlan, sessionId: opts.sessionId }],
-      memo: availableTools,
+      memo: allTools,
       type: PluginHookType.SeriesMerge,
     });
   } catch (error) {
     console.warn('[resolveTools] Plugin tool hook failed:', error);
   }
 
+  // 2. Then, filter all tools (including plugin-injected ones) by config
+  const toolsConfig = opts.context.config.tools;
+  if (toolsConfig && Object.keys(toolsConfig).length > 0) {
+    availableTools = availableTools.filter((tool) => {
+      // Only explicitly set to false will disable the tool
+      return toolsConfig[tool.name] !== false;
+    });
+  }
+
   const taskTools = (() => {
     // Task tool is only available in quiet mode
     if (!opts.task) return [];