foliko 2.0.22 → 2.0.24

package/src/llm/provider.js

@@ -7,7 +7,7 @@
  * 目标 ~300 行
  */
 
-const { createOpenAICompatible } = require('@ai-sdk/openai-compatible');
+const { OpenAI } = require('openai');
 
 // ==================== Provider 默认配置 ====================
 
@@ -71,9 +71,9 @@ class LLMProvider {
     this.options = { ...config.options };
   }
 
-  /** 创建 AI SDK model 实例 */
+  /** 创建 OpenAI 客户端实例 */
   createModel() {
-    return _createAIClient(this.provider, this.model, this.apiKey, this.baseURL)(this.model);
+    return _createOpenAIClient(this.provider, this.apiKey, this.baseURL);
   }
 
   /** 当前模型是否 thinking mode */
@@ -120,15 +120,14 @@ class ProviderRegistry {
   getProviderNames() { return Array.from(this._providers.keys()); }
   hasProvider(name) { return this._providers.has(name); }
 
-  /** 创建 AI SDK model 实例（自动 fallback 到注册的默认值） */
+  /** 创建 OpenAI 客户端（自动 fallback 到注册的默认值） */
   createClient(providerName, model, apiKey, baseURL) {
     const provider = this._providers.get(providerName);
     if (!provider) throw new Error(`Provider '${providerName}' not registered.`);
     const finalApiKey = apiKey || provider.apiKey;
     const finalBaseURL = baseURL || provider.baseURL;
-    const finalModel = model || provider.defaultModel;
     if (!finalApiKey) throw new Error(`No API key for provider '${providerName}'`);
-    return _createAIClient(providerName, finalModel, finalApiKey, finalBaseURL)(finalModel);
+    return _createOpenAIClient(providerName, finalApiKey, finalBaseURL);
   }
 
   unregisterProvider(name) {
@@ -155,39 +154,24 @@ function _registerDefaultProviders() {
 }
 _registerDefaultProviders();
 
-// ==================== 内部 AI SDK 客户端工厂 ====================
+// ==================== OpenAI 客户端工厂 ====================
 
-function _createAIClient(provider, model, apiKey, baseURL) {
-  const providerName = (provider || 'deepseek').toLowerCase();
+function _createOpenAIClient(providerName, apiKey, baseURL) {
   const pcfg = DEFAULT_PROVIDERS[providerName];
-
-  if (pcfg) {
-    const streamOptions = { includeUsage: true };
-    if (providerName === 'deepseek') streamOptions.includeReasoningContent = true;
-    return createOpenAICompatible({
-      name: pcfg.name,
-      baseURL: baseURL || pcfg.baseURL,
-      apiKey: apiKey || 'dummy-key',
-      headers: provider === 'anthropic' ? { 'x-api-key': apiKey, 'anthropic-version': '2023-06-01' } : undefined,
-      models: { default: { id: model || 'deepseek-chat', streamOptions } },
-    });
-  }
-
-  return createOpenAICompatible({
-    name: providerName || 'Custom',
-    baseURL,
+  return new OpenAI({
+    baseURL: baseURL || (pcfg ? pcfg.baseURL : undefined),
     apiKey: apiKey || 'dummy-key',
-    models: { default: { id: model || 'gpt-4' } },
+    // Anthropic 等需要额外 header 的 provider 在请求时加头
   });
 }
 
 // ==================== 向后兼容 API ====================
 
 function createAI(config) {
-  return _createAIClient(config.provider, config.model, config.apiKey, config.baseURL);
+  return _createOpenAIClient((config.provider || 'deepseek').toLowerCase(), config.apiKey, config.baseURL);
 }
 
-function createModel(model, client) { return client(model); }
+function createModel(model, client) { return client; }
 
 function getAvailableProviders() {
   return Object.entries(DEFAULT_PROVIDERS).map(([k, v]) => ({ id: k, name: v.name, baseURL: v.baseURL }));

package/src/plugin/base.js

@@ -854,22 +854,26 @@ class Plugin {
     // 解析文件路径：相对路径基于插件文件目录，绝对路径直接用
     let fullPath = filePath;
     if (!path.isAbsolute(filePath)) {
-      // 使用栈追踪获取插件文件路径
-      // 栈结构: Error, _createFilePromptProvider, _autoRegisterPrompts, 子类start, plugin-manager调用start, ...
-      const stack = new Error().stack.split('\n');
-      let pluginFile;
-      for (let i = 3; i < stack.length; i++) { // 从索引3开始跳过 base.js 的方法
-        const line = stack[i];
-        // 排除 base.js 自身和 node: 内置模块
-        if (line.includes('plugin/base.js') || line.includes('node:')) continue;
-        // 提取文件路径 (filename:line:col) 或 (filename)
-        const match = line.match(/\((.*?):\d+:\d+\)/) || line.match(/at\s+(.*?):\d+:\d+/);
-        if (match && match[1] !== '[eval]') {
-          pluginFile = match[1];
-          break;
+      // 优先使用 pluginManager 中存储的 sourcePath（最可靠）
+      let pluginDir = null;
+      const pmEntry = this._framework?.pluginManager?.get?.(this.name);
+      if (pmEntry?.sourcePath) {
+        pluginDir = path.dirname(path.resolve(pmEntry.sourcePath));
+      }
+      // 备用：使用栈追踪获取插件文件路径
+      if (!pluginDir) {
+        const stack = new Error().stack.split('\n');
+        for (let i = 3; i < stack.length; i++) {
+          const line = stack[i];
+          if (line.includes('plugin/base.js') || line.includes('node:')) continue;
+          const match = line.match(/\((.*?):\d+:\d+\)/) || line.match(/at\s+(.*?):\d+:\d+/);
+          if (match && match[1] !== '[eval]') {
+            pluginDir = path.dirname(path.resolve(match[1]));
+            break;
+          }
         }
       }
-      const pluginDir = pluginFile ? path.dirname(path.resolve(pluginFile)) : process.cwd();
+      pluginDir = pluginDir || process.cwd();
       fullPath = path.resolve(pluginDir, filePath);
     }
 

package/src/plugin/manager.js

@@ -376,6 +376,25 @@ class PluginManager {
     this._log.info(`Plugin reloaded: ${name}`);
   }
 
+  /**
+   * 重载所有已加载的插件
+   */
+  async reloadAll() {
+    const entries = Array.from(this._plugins.values()).filter(e => e.status === 'loaded');
+    const results = [];
+    for (const entry of entries) {
+      const name = entry.instance.name;
+      try {
+        await this.reload(name);
+        results.push({ name, success: true });
+      } catch (err) {
+        this._log.warn(`reloadAll: '${name}' failed: ${err.message}`);
+        results.push({ name, success: false, error: err.message });
+      }
+    }
+    return results;
+  }
+
   /**
    * 启动所有已加载、已启用、未启动的插件（按优先级排序）
    */

package/tests/core/chat-tool.test.js

@@ -1,187 +1,187 @@
-import { describe, it, expect } from 'vitest';
-
-// 测试 file-system 插件的 chat 工具修复
-// 通过读源码 + 模拟 execute 来验证行为
-
-const fs = require('fs');
-const path = require('path');
-
-const FileSystemPlugin = require('../../plugins/io/file-system/index.js');
-
-function makeFakeFw(opts = {}) {
-  const llmConfig = opts.llmConfig || { model: 'test-model', provider: 'test-provider' };
-  const captured = { agentConfig: null, chatArgs: null, registeredTools: [] };
-  const fw = {
-    getCwd: () => process.cwd(),
-    pluginManager: {
-      get: (name) => {
-        if (name === 'ai') return { getConfig: () => llmConfig };
-        return null;
-      },
-    },
-    // ★ Plugin base class 的 tool.register 会先 push 到 _registeredTools，
-    //   然后查 registry.has()，has() 返回 false 才调 registry.register()。
-    //   所以 mock 必须实现 has() 否则注册流程被中断。
-    registerTool: (toolDef) => {
-      captured.registeredTools.push(toolDef);
-    },
-    toolRegistry: {
-      has: () => false,
-      register: (toolDef) => {
-        captured.registeredTools.push(toolDef);
-      },
-    },
-    createSubAgent: (config) => {
-      captured.agentConfig = config;
-      return {
-        chat: async (msg, opts) => {
-          captured.chatArgs = { msg, opts };
-          return { success: true, message: 'mock reply', steps: 1 };
-        },
-      };
-    },
-  };
-  return { fw, captured };
-}
-
-function getChatTool(captured) {
-  return captured.registeredTools.find(t => t.name === 'chat');
-}
-
-describe('file-system 插件的 chat 工具', () => {
-  it('★ 关键：name 唯一（用 Date.now + random 避免冲突）', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    // 直接调工具的 execute
-    // find chat tool in _registeredTools
-    const chatTool = getChatTool(captured);
-    expect(chatTool).toBeTruthy();
-    if (!chatTool) return;
-
-    const r1 = await chatTool.execute({ message: 'hi' }, fw);
-    const r2 = await chatTool.execute({ message: 'hi2' }, fw);
-
-    expect(captured.agentConfig.name).toMatch(/^file-system-chat-\d+/);
-    // 两次调用应产生不同名字
-    const name1 = r1.metadata?.agent;
-    const name2 = r2.metadata?.agent;
-    expect(name1).not.toBe(name2);
-  });
-
-  it('★ 关键：sessionId 隔离（避免污染主对话）', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    // 1. 不传 sessionId → 自动生成
-    await chatTool.execute({ message: 'm1' }, fw);
-    expect(captured.chatArgs.opts.sessionId).toMatch(/^chat-\d+$/);
-
-    // 2. 传 sessionId → 使用传入的
-    await chatTool.execute({ message: 'm2', sessionId: 'my-session' }, fw);
-    expect(captured.chatArgs.opts.sessionId).toBe('my-session');
-  });
-
-  it('★ 关键：跟随主 agent 的 LLM 配置', async () => {
-    const llmConfig = {
-      model: 'deepseek-chat',
-      provider: 'deepseek',
-      apiKey: 'sk-test',
-      baseURL: 'https://api.deepseek.com/v1',
-    };
-    const { fw, captured } = makeFakeFw({ llmConfig });
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    await chatTool.execute({ message: 'hi' }, fw);
-    expect(captured.agentConfig.model).toBe('deepseek-chat');
-    expect(captured.agentConfig.provider).toBe('deepseek');
-    expect(captured.agentConfig.apiKey).toBe('sk-test');
-    expect(captured.agentConfig.baseURL).toBe('https://api.deepseek.com/v1');
-    expect(captured.agentConfig.hidden).toBe(true);
-  });
-
-  it('★ 关键：data 只返回 message 文本（不返回整个对象）', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    const r = await chatTool.execute({ message: 'hi' }, fw);
-    expect(r.success).toBe(true);
-    expect(r.data).toBe('mock reply');  // 只是字符串，不是整个对象
-    expect(typeof r.data).toBe('string');
-    // metadata 含元信息
-    expect(r.metadata).toBeTruthy();
-    expect(r.metadata.steps).toBe(1);
-  });
-
-  it('★ 关键：systemPrompt 默认值合理', async () => {
-    const { fw, captured } = makeFakeFw();
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = getChatTool(captured);
-    if (!chatTool) throw new Error('no chat tool');
-
-    // 不传 systemPrompt → 用默认
-    await chatTool.execute({ message: 'hi' }, fw);
-    expect(captured.agentConfig.systemPrompt).toContain('文件系统');
-
-    // 传 systemPrompt → 覆盖
-    await chatTool.execute({
-      message: 'hi',
-      systemPrompt: '你是一个翻译助手',
-    }, fw);
-    expect(captured.agentConfig.systemPrompt).toBe('你是一个翻译助手');
-  });
-
-  it('★ 关键：错误捕获（AI 抛错时不崩溃）', async () => {
-    const registeredTools = [];
-    const fw = {
-      getCwd: () => process.cwd(),
-      pluginManager: { get: () => null },
-      registerTool: (t) => registeredTools.push(t),
-      toolRegistry: { has: () => false, register: (t) => registeredTools.push(t) },
-      createSubAgent: () => ({
-        chat: async () => { throw new Error('AI 服务不可用'); },
-      }),
-    };
-    const p = new FileSystemPlugin();
-    p.install(fw);
-    p.start(fw);
-    const chatTool = registeredTools.find(t => t.name === 'chat');
-    if (!chatTool) throw new Error('no chat tool');
-
-    const r = await chatTool.execute({ message: 'hi' }, fw);
-    expect(r.success).toBe(false);
-    expect(r.error).toBe('AI 服务不可用');
-  });
-
-  it('★ inputSchema 含 sessionId 字段', () => {
-    // 直接读源码验证
-    const src = fs.readFileSync(
-      path.join(__dirname, '../../plugins/io/file-system/index.js'),
-      'utf-8'
-    );
-    expect(src).toMatch(/sessionId:\s*z\.string\(\)\.optional\(\)/);
-  });
-
-  it('★ 删除死代码：const ai = framework.getAI()', () => {
-    const src = fs.readFileSync(
-      path.join(__dirname, '../../plugins/io/file-system/index.js'),
-      'utf-8'
-    );
-    expect(src).not.toMatch(/const\s+ai\s*=\s*framework\.getAI/);
-  });
-});
+import { describe, it, expect } from 'vitest';
+
+// 测试 file-system 插件的 chat 工具修复
+// 通过读源码 + 模拟 execute 来验证行为
+
+const fs = require('fs');
+const path = require('path');
+
+const FileSystemPlugin = require('../../plugins/io/file-system/index.js');
+
+function makeFakeFw(opts = {}) {
+  const llmConfig = opts.llmConfig || { model: 'test-model', provider: 'test-provider' };
+  const captured = { agentConfig: null, chatArgs: null, registeredTools: [] };
+  const fw = {
+    getCwd: () => process.cwd(),
+    pluginManager: {
+      get: (name) => {
+        if (name === 'ai') return { getConfig: () => llmConfig };
+        return null;
+      },
+    },
+    // ★ Plugin base class 的 tool.register 会先 push 到 _registeredTools，
+    //   然后查 registry.has()，has() 返回 false 才调 registry.register()。
+    //   所以 mock 必须实现 has() 否则注册流程被中断。
+    registerTool: (toolDef) => {
+      captured.registeredTools.push(toolDef);
+    },
+    toolRegistry: {
+      has: () => false,
+      register: (toolDef) => {
+        captured.registeredTools.push(toolDef);
+      },
+    },
+    createSubAgent: (config) => {
+      captured.agentConfig = config;
+      return {
+        chat: async (msg, opts) => {
+          captured.chatArgs = { msg, opts };
+          return { success: true, message: 'mock reply', steps: 1 };
+        },
+      };
+    },
+  };
+  return { fw, captured };
+}
+
+function getChatTool(captured) {
+  return captured.registeredTools.find(t => t.name === 'chat');
+}
+
+describe('file-system 插件的 chat 工具', () => {
+  it('★ 关键：name 唯一（用 Date.now + random 避免冲突）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    // 直接调工具的 execute
+    // find chat tool in _registeredTools
+    const chatTool = getChatTool(captured);
+    expect(chatTool).toBeTruthy();
+    if (!chatTool) return;
+
+    const r1 = await chatTool.execute({ message: 'hi' }, fw);
+    const r2 = await chatTool.execute({ message: 'hi2' }, fw);
+
+    expect(captured.agentConfig.name).toMatch(/^file-system-chat-\d+/);
+    // 两次调用应产生不同名字
+    const name1 = r1.metadata?.agent;
+    const name2 = r2.metadata?.agent;
+    expect(name1).not.toBe(name2);
+  });
+
+  it('★ 关键：sessionId 隔离（避免污染主对话）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    // 1. 不传 sessionId → 自动生成
+    await chatTool.execute({ message: 'm1' }, fw);
+    expect(captured.chatArgs.opts.sessionId).toMatch(/^chat-\d+$/);
+
+    // 2. 传 sessionId → 使用传入的
+    await chatTool.execute({ message: 'm2', sessionId: 'my-session' }, fw);
+    expect(captured.chatArgs.opts.sessionId).toBe('my-session');
+  });
+
+  it('★ 关键：跟随主 agent 的 LLM 配置', async () => {
+    const llmConfig = {
+      model: 'deepseek-chat',
+      provider: 'deepseek',
+      apiKey: 'sk-test',
+      baseURL: 'https://api.deepseek.com/v1',
+    };
+    const { fw, captured } = makeFakeFw({ llmConfig });
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    await chatTool.execute({ message: 'hi' }, fw);
+    expect(captured.agentConfig.model).toBe('deepseek-chat');
+    expect(captured.agentConfig.provider).toBe('deepseek');
+    expect(captured.agentConfig.apiKey).toBe('sk-test');
+    expect(captured.agentConfig.baseURL).toBe('https://api.deepseek.com/v1');
+    expect(captured.agentConfig.hidden).toBe(true);
+  });
+
+  it('★ 关键：data 只返回 message 文本（不返回整个对象）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    const r = await chatTool.execute({ message: 'hi' }, fw);
+    expect(r.success).toBe(true);
+    expect(r.data).toBe('mock reply');  // 只是字符串，不是整个对象
+    expect(typeof r.data).toBe('string');
+    // metadata 含元信息
+    expect(r.metadata).toBeTruthy();
+    expect(r.metadata.steps).toBe(1);
+  });
+
+  it('★ 关键：systemPrompt 默认值合理', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    // 不传 systemPrompt → 用默认
+    await chatTool.execute({ message: 'hi' }, fw);
+    expect(captured.agentConfig.systemPrompt).toContain('文件系统');
+
+    // 传 systemPrompt → 覆盖
+    await chatTool.execute({
+      message: 'hi',
+      systemPrompt: '你是一个翻译助手',
+    }, fw);
+    expect(captured.agentConfig.systemPrompt).toBe('你是一个翻译助手');
+  });
+
+  it('★ 关键：错误捕获（AI 抛错时不崩溃）', async () => {
+    const registeredTools = [];
+    const fw = {
+      getCwd: () => process.cwd(),
+      pluginManager: { get: () => null },
+      registerTool: (t) => registeredTools.push(t),
+      toolRegistry: { has: () => false, register: (t) => registeredTools.push(t) },
+      createSubAgent: () => ({
+        chat: async () => { throw new Error('AI 服务不可用'); },
+      }),
+    };
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = registeredTools.find(t => t.name === 'chat');
+    if (!chatTool) throw new Error('no chat tool');
+
+    const r = await chatTool.execute({ message: 'hi' }, fw);
+    expect(r.success).toBe(false);
+    expect(r.error).toBe('AI 服务不可用');
+  });
+
+  it('★ inputSchema 含 sessionId 字段', () => {
+    // 直接读源码验证
+    const src = fs.readFileSync(
+      path.join(__dirname, '../../plugins/io/file-system/index.js'),
+      'utf-8'
+    );
+    expect(src).toMatch(/sessionId:\s*z\.string\(\)\.optional\(\)/);
+  });
+
+  it('★ 删除死代码：const ai = framework.getAI()', () => {
+    const src = fs.readFileSync(
+      path.join(__dirname, '../../plugins/io/file-system/index.js'),
+      'utf-8'
+    );
+    expect(src).not.toMatch(/const\s+ai\s*=\s*framework\.getAI/);
+  });
+});

package/tests/core/disable-thinking.test.js

@@ -0,0 +1,64 @@
+import { describe, it, expect } from 'vitest';
+
+// 测试 FOLIKO_DISABLE_THINKING 环境变量
+
+describe('★ FOLIKO_DISABLE_THINKING 环境变量', () => {
+  it('★ 关键：环境变量被识别（forceDisabled 逻辑）', () => {
+    const src = require('fs').readFileSync(
+      require('path').join(__dirname, '../../src/agent/chat.js'),
+      'utf-8'
+    );
+    expect(src).toMatch(/FOLIKO_DISABLE_THINKING/);
+    expect(src).toMatch(/forceDisabled\s*=\s*process\.env\.FOLIKO_DISABLE_THINKING/);
+    expect(src).toMatch(/!forceDisabled/);
+  });
+
+  it('★ 逻辑：3 个条件同时满足才启用 thinking，缺一不可', () => {
+    const src = require('fs').readFileSync(
+      require('path').join(__dirname, '../../src/agent/chat.js'),
+      'utf-8'
+    );
+    // enableThinking 表达式必须包含 forceDisabled 否定
+    const match = src.match(/const enableThinking\s*=\s*([^;]+);/);
+    expect(match).toBeTruthy();
+    const expr = match[1];
+    // 期望：!forceDisabled && config.thinkingMode === true && isThinkingModel(this.model)
+    expect(expr).toMatch(/!forceDisabled/);
+    expect(expr).toMatch(/config\.thinkingMode\s*===\s*true/);
+    expect(expr).toMatch(/isThinkingModel/);
+  });
+
+  it('★ 行为：F=1 时即使 thinkingMode=true 也强制关闭', () => {
+    const THINKING_MODELS = ['deepseek-v4-pro', 'deepseek-v4-flash', 'deepseek-reasoner'];
+    function isThinkingModel(model) {
+      if (!model) return false;
+      const lower = model.toLowerCase();
+      return THINKING_MODELS.some(tm => lower.includes(tm) || lower === tm);
+    }
+    // 模拟 4 种组合
+    const testCases = [
+      // [model, thinkingMode, forceDisabled, expected]
+      ['deepseek-v4-pro', true, '1', false],     // 强制关闭
+      ['deepseek-v4-pro', true, null, true],     // 正常启用
+      ['deepseek-v4-pro', false, '1', false],
+      ['deepseek-v4-pro', false, null, false],
+      ['deepseek-chat', true, '1', false],        // 强制关闭
+      ['deepseek-chat', true, null, false],       // 模型不是 thinking
+      ['deepseek-reasoner', true, '1', false],    // 强制关闭
+      ['deepseek-reasoner', true, null, true],    // 启用
+    ];
+    for (const [model, thinkingMode, forceDisabled, expected] of testCases) {
+      const enableThinking = !forceDisabled && thinkingMode === true && isThinkingModel(model);
+      expect(enableThinking).toBe(expected);
+    }
+  });
+
+  it('★ 文档：使用示例（注释或代码说明）', () => {
+    const src = require('fs').readFileSync(
+      require('path').join(__dirname, '../../src/agent/chat.js'),
+      'utf-8'
+    );
+    // 应该有 "FOLIKO_DISABLE_THINKING=1" 的使用说明
+    expect(src).toMatch(/FOLIKO_DISABLE_THINKING=1/);
+  });
+});