foliko 2.0.21 → 2.0.23

package/src/agent/sub.js

@@ -8,7 +8,7 @@
 
 const { BaseAgent } = require('./base');
 const { cleanResponse } = require('../utils');
-const { generateText, tool, stepCountIs, ToolLoopAgent } = require('ai');
+const { ToolLoop } = require('./tool-loop');
 const { z } = require('zod');
 const { logger } = require('../common/logger');
 const { validateAll } = require('../utils/message-validator');
@@ -30,7 +30,7 @@ class SubAgent extends BaseAgent {
     this.defaulTools = ['ext_skill', 'skill_load', 'ext_call', 'subagent_call'];
     this.bindTools = {
       read: 'read_file', write: 'write_file', edit: 'modify_file',
-      glob: 'read_directory', grep: 'search_file', bash: 'shell_exec',
+      glob: 'read_directory', grep: 'search', bash: 'shell_exec',
     };
 
     this._customSystemPrompt = config.systemPrompt || null;
@@ -61,36 +61,40 @@ class SubAgent extends BaseAgent {
   addTool(toolDef) { this.tools[toolDef.name] = toolDef; return this; }
   getTools() { return Object.values(this.tools); }
 
-  _getAIProvider() {
-    const { createAI } = require('../llm/provider');
-    // 优先从 framework 的 ai 插件拿最新配置（避免构造时拿到 stale apiKey）
+  _getOpenAIClient() {
+    const { LLMProvider } = require('../llm/provider');
+    // 优先从 framework 的 ai 插件拿最新配置
     const aiPlugin = this.framework?.pluginManager?.get('ai');
     const aiConfig = aiPlugin ? aiPlugin.getConfig() : {};
-    return createAI({
+    const provider = new LLMProvider({
       provider: aiConfig.provider || this.provider,
       model: aiConfig.model || this.model,
       apiKey: aiConfig.apiKey || this.apiKey,
       baseURL: aiConfig.baseURL || this.baseURL,
     });
+    return provider.createModel();
   }
 
-  _buildAITools() {
-    const tools = {};
-    const all_tools = this.framework?.getTools() || [];
-    let parentTools = [];
+  _buildToolMap() {
+    const map = {};
+    const allTools = this.framework?.getTools() || [];
     if (Array.isArray(this.parentTools)) {
-      parentTools = this.parentTools.map(key => this.bindTools[key.toLocaleLowerCase()] || key);
-      for (const toolName of parentTools) {
-        const toolDef = all_tools.find(t => t.name === toolName);
-        if (toolDef) tools[toolDef.name] = toolDef;
-      }
-      for (const tool of all_tools.filter(a => this.defaulTools.includes(a.name))) {
-        tools[tool.name] = tool;
+      const parentToolNames = this.parentTools.map(key => this.bindTools[key.toLocaleLowerCase()] || key);
+      // 父工具 + 默认工具
+      const names = new Set([...parentToolNames, ...this.defaulTools]);
+      for (const tool of allTools) {
+        if (names.has(tool.name)) {
+          map[tool.name] = tool;
+        }
       }
     } else {
-      all_tools.forEach(item => { tools[item.name] = item; });
+      allTools.forEach(t => { map[t.name] = t; });
+    }
+    // 覆盖 / 合并插件自身的工具
+    for (const [name, toolDef] of Object.entries(this.tools)) {
+      map[name] = toolDef;
     }
-    return { ...tools, ...this.tools };
+    return map;
   }
 
   _buildSystemPrompt() {
@@ -130,26 +134,25 @@ class SubAgent extends BaseAgent {
     const maxSteps = options?.maxSteps || 30;
     const maxRetries = options?.maxRetries ?? this.maxRetries;
     const retryDelay = options?.retryDelay ?? this.retryDelay;
-    const aiProvider = this._getAIProvider();
+    const client = this._getOpenAIClient();
 
     let messages = Array.isArray(taskOrMessages) ? [...taskOrMessages] : [{ role: 'user', content: taskOrMessages }];
 
     let lastError;
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
       try {
-        const tools = this.disableTools ? {} : this._buildAITools();
+        const tools = this.disableTools ? {} : this._buildToolMap();
         const systemPrompt = this.disableTools ? this._customSystemPrompt : this._buildSystemPrompt();
         const validated = this._validateMessagesPairing(messages);
         if (validated.length !== messages.length) { messages.length = 0; messages.push(...validated); }
 
-        const agent = new ToolLoopAgent({
-          model: aiProvider(this.model),
-          instructions: systemPrompt,
+        const loop = new ToolLoop({
           tools,
-          stopWhen: stepCountIs(maxSteps),
+          maxSteps,
+          prepareStep: this._prepareStep ? this._prepareStep.bind(this) : undefined,
         });
 
-        const result = await agent.generate({ messages, ...this.providerOptions, abortSignal: options.signal });
+        const result = await loop.generate({ messages, systemPrompt, model: this.model, client, ...this.providerOptions });
         messages.push(...result.response.messages);
         const full_text = cleanResponse(result.text);
         this.emit('complete', { message: full_text, steps: result.steps?.length || 0 });