foliko 2.0.2 → 2.0.4

package/src/agent/base.js

@@ -2,11 +2,11 @@
 
 /**
  * BaseAgent - 所有 Agent 类型的公共基类
- * 提供事件、状态、prompt 部分注册等公共功能
+ * 提供事件、状态、prompt 等公共功能
  */
 
 const { EventEmitter } = require('../common/events');
-const { SystemPromptBuilder } = require('./prompt');
+const { PromptRegistry } = require('./prompt-registry');
 
 class BaseAgent extends EventEmitter {
   constructor(framework, config = {}) {
@@ -15,7 +15,9 @@ class BaseAgent extends EventEmitter {
     this.config = config;
     this.name = config.name || 'Agent';
     this._status = 'idle';
-    this._promptBuilder = new SystemPromptBuilder();
+    // Agent 私有的 prompt 注册表（新 API）
+    this._promptRegistry = new PromptRegistry();
+    this.promptRegistry = this._promptRegistry;
   }
 
   // === Status ===
@@ -28,23 +30,6 @@ class BaseAgent extends EventEmitter {
     return this;
   }
 
-  // === Prompt Parts ===
-
-  registerPromptPart(name, priority, provider) {
-    this._promptBuilder.register(name, priority, provider);
-    return this;
-  }
-
-  unregisterPromptPart(name) {
-    this._promptBuilder.unregister(name);
-    return this;
-  }
-
-  invalidatePromptPart(name) {
-    this._promptBuilder.invalidate(name);
-    return this;
-  }
-
   // === Destroy ===
 
   destroy() {

package/src/agent/chat.js

@@ -473,7 +473,7 @@ class AgentChatHandler extends EventEmitter {
       const { messageStore, messages } = await this._prepareSession(message, sessionId);
 
       if (!this._aiClient) {
-        throw new Error('AI client not configured.');
+        throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
       const systemPrompt = framework.getSystemPrompt();
@@ -497,7 +497,12 @@ class AgentChatHandler extends EventEmitter {
       let reasoningContent = '';
 
       const result = await framework.runInSession(sessionId, {}, async () => {
-        return agent.stream({ messages, ...this.providerOptions, onError: handleSDKError });
+        return agent.stream({
+          messages,
+          ...this.providerOptions,
+          onError: handleSDKError,
+          abortSignal: framework.getAbortSignal?.(),
+        });
       });
 
       const stream = result.fullStream;
@@ -595,7 +600,10 @@ class AgentChatHandler extends EventEmitter {
       // 统一错误处理：提取简洁消息并通过 yield 传递
       const friendlyMessage = err?.message?.split('\n')[0] || '未知错误';
 
-      this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
+      // 用户主动中断（framework.stop()）不上报 message:error，避免与上游重复
+      if (err.name !== 'AbortError') {
+        this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
+      }
       yield { type: 'error', error: friendlyMessage };
     } finally {
       const messageStore = this._getSessionMessageStore(sessionId);
@@ -648,7 +656,7 @@ class AgentChatHandler extends EventEmitter {
       const { messageStore, messages } = await this._prepareSession(message, sessionId);
 
       if (!this._aiClient) {
-        throw new Error('AI client not configured.');
+        throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
       const systemPrompt = framework.getSystemPrompt();
@@ -669,7 +677,7 @@ class AgentChatHandler extends EventEmitter {
       });
 
       const result = await framework.runInSession(sessionId, {}, async () => {
-        return agent.generate({ messages, ...apiOptions });
+        return agent.generate({ messages, ...apiOptions, abortSignal: framework.getAbortSignal?.() });
       });
 
       if (result.usage && (result.usage.promptTokens > 0 || result.usage.completionTokens > 0)) {
@@ -780,6 +788,9 @@ class AgentChatHandler extends EventEmitter {
     messages.push(userMessage);
     this._validateToolCalls(messages);
 
+    // 最终兜底：暴力清理所有 orphaned tool 消息，确保 AI SDK 不报错
+    this._stripOrphanedToolMessages(messages);
+
     return { messageStore, messages };
   }
 
@@ -832,6 +843,57 @@ class AgentChatHandler extends EventEmitter {
     messageStore._cacheMessageCount = messageStore.messages.length;
   }
 
+  /**
+   * 最终兜底：暴力清理所有 orphaned tool 消息
+   * 遍历所有 tool 角色消息，删除没有对应 tool-call 的
+   * 处理数组格式（AI SDK）、字符串格式（OpenAI 兼容）、tool_call_id 格式
+   */
+  _stripOrphanedToolMessages(messages) {
+    const validIds = new Set();
+    for (const msg of messages) {
+      if (msg.role !== 'assistant') continue;
+      if (Array.isArray(msg.content)) {
+        for (const item of msg.content) {
+          if ((item.type === 'tool-call' || item.type === 'tool-use') && item.toolCallId) validIds.add(item.toolCallId);
+        }
+      }
+      if (Array.isArray(msg.tool_calls)) {
+        for (const tc of msg.tool_calls) { if (tc.id) validIds.add(tc.id); }
+      }
+    }
+
+    let removed = 0;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const msg = messages[i];
+      if (msg.role !== 'tool') continue;
+
+      let isOrphaned = false;
+      if (Array.isArray(msg.content)) {
+        msg.content = msg.content.filter(item => {
+          if (item && (item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId && !validIds.has(item.toolCallId)) {
+            return false;
+          }
+          return true;
+        });
+        if (msg.content.length === 0) isOrphaned = true;
+      } else if (msg.tool_call_id && !validIds.has(msg.tool_call_id)) {
+        isOrphaned = true;
+      } else if (!msg.tool_call_id && validIds.size === 0) {
+        // 没有任何 tool-call，所有 tool 消息都是 orphaned
+        isOrphaned = true;
+      }
+
+      if (isOrphaned) {
+        messages.splice(i, 1);
+        removed++;
+      }
+    }
+
+    if (removed > 0) {
+      logger.debug(`[_stripOrphanedToolMessages] removed ${removed} orphaned tool message(s)`);
+    }
+  }
+
   /**
    * 计算工具列表缓存 key
    * @private

package/src/agent/index.js

@@ -5,6 +5,7 @@ const { MainAgent } = require('./main');
 const { SubAgent } = require('./sub');
 const { WorkerAgent } = require('./worker');
 const { SystemPromptBuilder } = require('./prompt');
+const { PromptRegistry } = require('./prompt-registry');
 
 /**
  * Create a MainAgent instance
@@ -51,6 +52,7 @@ function createSubAgent(framework, config = {}) {
     framework,
     maxRetries: config.maxRetries,
     disableTools: config.disableTools,
+    hidden: config.hidden,
   });
   _syncPromptParts(framework, subagent);
   framework._agents.push(subagent);
@@ -84,16 +86,25 @@ function _mergeAIConfig(framework, target) {
 
 /**
  * Sync main agent prompt parts to subagent
+ * 从 framework.promptRegistry 同步到 subagent.promptRegistry
  */
 function _syncPromptParts(framework, subagent) {
-  if (!framework._mainAgent?._systemPromptBuilder?._parts) return;
-  const mainParts = framework._mainAgent._systemPromptBuilder._parts;
-  const registeredNames = new Set(subagent._promptParts?.map(p => p.name) || []);
-  for (const [name, part] of mainParts) {
-    if (['original-prompt', 'shared-prompt', 'datetime', 'metadata', 'capabilities'].includes(name)) continue;
-    if (!registeredNames.has(name)) {
-      subagent.registerPromptPart(name, part.priority, part.provider);
-      registeredNames.add(name);
+  const reg = framework?.promptRegistry;
+  if (!reg || reg.count() === 0) return;
+  const subReg = subagent?.promptRegistry || subagent?._promptRegistry;
+  for (const part of reg.list()) {
+    // 跳过主 Agent 私有的 5 个内置 part
+    if (part.owner === '_main' && ['original-prompt', 'shared-prompt', 'datetime', 'metadata', 'capabilities'].includes(part.name)) {
+      continue;
+    }
+    // 已同步过则跳过
+    if (subReg && subReg.has(part.owner, part.name)) continue;
+    if (subReg) {
+      subReg.register(part.owner, part.name, part.provider, {
+        slot: part.slot,
+        order: part.order,
+        description: part.description,
+      });
     }
   }
 }
@@ -104,6 +115,7 @@ module.exports = {
   SubAgent,
   WorkerAgent,
   SystemPromptBuilder,
+  PromptRegistry,
   createAgent,
   createSubAgent,
   createSessionAgent,

package/src/agent/main.js

@@ -7,7 +7,7 @@
 
 const { BaseAgent } = require('./base');
 const { Logger, LOG_LEVELS } = require('../common/logger');
-const { PROMPT_PRIORITY, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_TEMPERATURE } = require('../common/constants');
+const { PROMPT_PRIORITY, PROMPT_PRIORITY_TO_SLOT, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_TEMPERATURE } = require('../common/constants');
 const { SystemPromptBuilder } = require('./prompt');
 const os = require('os');
 
@@ -44,6 +44,10 @@ class MainAgent extends BaseAgent {
     this._skipSyncTools = config.skipSyncTools || false;
     this._subAgents = new Map();
     this._systemPromptBuilder = new SystemPromptBuilder();
+    this._systemPromptCache = null; // 确保首次调用 _buildSystemPrompt 不走早期返回
+    this._systemPromptDirty = true;
+    // 新注册表：默认 part 注册到 framework.promptRegistry（带 slot）
+    // _systemPromptBuilder 保留为降级兜底
     this._registerDefaultPromptParts();
     this.systemPrompt = this._buildSystemPrompt();
 
@@ -54,25 +58,48 @@ class MainAgent extends BaseAgent {
   }
 
   _registerDefaultPromptParts() {
-    this._systemPromptBuilder.register('original-prompt', PROMPT_PRIORITY.ORIGINAL_PROMPT, () => this._originalPrompt);
-    this._systemPromptBuilder.register('shared-prompt', PROMPT_PRIORITY.SHARED_PROMPT, () => {
+    // 优先注册到 framework.promptRegistry（带 slot 的新路径）
+    // 同时保留 _systemPromptBuilder 的旧路径以兼容老 Plugin.registerPromptPart
+    const reg = this.framework?.promptRegistry;
+    const MAIN = '_main';
+
+    const registerBoth = (name, priority, provider, slot) => {
+      // 旧路径（降级兜底）
+      this._systemPromptBuilder.register(name, priority, provider);
+      // 新路径（slot 排序）
+      // original-prompt 是 per-Agent 的，不走全局注册表（由 _buildSystemPrompt 直接注入）
+      if (name === 'original-prompt') return;
+      if (reg && !reg.has(MAIN, name)) {
+        reg.register(MAIN, name, provider, {
+          slot: slot || PROMPT_PRIORITY_TO_SLOT[name] || 'CUSTOM',
+          order: priority,
+          description: `内置 part: ${name}`,
+        });
+      }
+    };
+
+    registerBoth('original-prompt', PROMPT_PRIORITY.ORIGINAL_PROMPT, () => this._originalPrompt, 'IDENTITY');
+    registerBoth('shared-prompt', PROMPT_PRIORITY.SHARED_PROMPT, () => {
       return this._sharedPrompt ? this._replacePlaceholders(this._sharedPrompt) : null;
-    });
-    this._systemPromptBuilder.register('datetime', PROMPT_PRIORITY.DATETIME, () => {
+    }, 'USER');
+    registerBoth('metadata', PROMPT_PRIORITY.METADATA, () => {
       const now = new Date();
       const timeStr = now.toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' });
       const dateStr = now.toLocaleDateString('zh-CN', { timeZone: 'Asia/Shanghai', weekday: 'long' });
-      return `【当前时间】${timeStr}（${dateStr}）`;
-    });
-    this._systemPromptBuilder.register('metadata', PROMPT_PRIORITY.METADATA, () => {
-      if (this._metadata.size === 0) return null;
-      const metaParts = ['【元数据】'];
-      for (const [key, value] of this._metadata) {
-        metaParts.push(`- ${key}: ${typeof value === 'object' ? JSON.stringify(value) : value}`);
+      const metaParts = ['【运行环境】'];
+      metaParts.push(`- 当前时间: ${timeStr}（${dateStr}）`);
+      metaParts.push(`- 工作目录: ${this.framework?.getCwd?.() ?? process.cwd()}`);
+      metaParts.push(`- 平台: ${os.platform()} ${os.release()}`);
+      metaParts.push(`- 主机: ${os.hostname()}`);
+      // 插件显式设置的元数据
+      if (this._metadata.size > 0) {
+        for (const [key, value] of this._metadata) {
+          metaParts.push(`- ${key}: ${typeof value === 'object' ? JSON.stringify(value) : value}`);
+        }
       }
       return metaParts.join('\n');
-    });
-    this._systemPromptBuilder.register('capabilities', PROMPT_PRIORITY.CAPABILITIES, () => this._buildCapabilitiesDescription());
+    }, 'USER');
+    registerBoth('capabilities', PROMPT_PRIORITY.CAPABILITIES, () => this._buildCapabilitiesDescription(), 'CAPABILITY');
   }
 
   _getMetadataValue(key) {
@@ -97,18 +124,59 @@ class MainAgent extends BaseAgent {
     if (!plugins || plugins.length === 0) return '';
     const keyPlugins = plugins.filter(p => p.name !== 'defaults' && p.name !== 'agent');
     if (keyPlugins.length === 0) return '';
-    const lines = ['## 系统能力', ''];
-    keyPlugins.forEach((plugin, index) => {
-      const name = plugin.instance?.name || plugin.name || 'unknown';
-      const description = plugin.instance?.description || '无描述';
-      lines.push(`${index + 1}. **${name}**：${description}`);
-    });
+
+    // 按类别分组，输出紧凑列表（工具列表已在 API 层描述，这里仅给出概览）
+    // const categories = {
+    //   core: [], executor: [], io: [], messaging: [], other: [],
+    // };
+    // const catMap = {
+    //   ai: 'core', storage: 'core', 'skill-manager': 'core', 'subagent-manager': 'core',
+    //   session: 'core', scheduler: 'core', workflow: 'core', rules: 'core', audit: 'core',
+    //   tools: 'core', 'plugin-manager': 'core', install: 'core', 'python-loader': 'core',
+    //   'data-splitter': 'core', coordinator: 'core',
+    //   shell: 'executor', python: 'executor', extension: 'executor', mcp: 'executor',
+    //   'file-system': 'io', web: 'io',
+    //   telegram: 'messaging', qq: 'messaging', weixin: 'messaging', feishu: 'messaging', email: 'messaging',
+    // };
+    // for (const p of keyPlugins) {
+    //   const name = p.instance?.name || p.name || 'unknown';
+    //   const cat = catMap[name] || 'other';
+    //   categories[cat].push(name);
+    // }
+    const lines = [];
+    // const lines = ['## 插件概览'];
+    // const catLabels = { core: '核心', executor: '执行器', io: '文件/网络', messaging: '消息', other: '其他' };
+    // for (const [cat, names] of Object.entries(categories)) {
+    //   if (names.length === 0) continue;
+    //   lines.push(`- **${catLabels[cat]}**: ${names.sort().join(', ')}`);
+    // }
     return lines.join('\n');
   }
 
   _buildSystemPrompt() {
     if (!this._systemPromptDirty && this._systemPromptCache !== null) return this._systemPromptCache;
-    this._systemPromptCache = this._systemPromptBuilder.build();
+
+    // 1. Agent 自己的 originalPrompt（per-Agent）
+    const parts = [this._originalPrompt];
+
+    // 2. 全局注册表（skills, tools, extensions 等共享部分，跳过 _main 的 original-prompt）
+    const reg = this.framework?.promptRegistry;
+    if (reg && reg.count() > 0) {
+      try {
+        for (const part of reg.list()) {
+          if (part.owner === '_main' && part.name === 'original-prompt') continue;
+          const content = part.get();
+          if (content && content.trim()) parts.push(content.trim());
+        }
+      } catch (err) {
+        // 注册表 build 失败时降级到旧 builder
+        this._systemPromptCache = this._systemPromptBuilder.build();
+        this._systemPromptDirty = false;
+        return this._systemPromptCache;
+      }
+    }
+
+    this._systemPromptCache = parts.join('\n\n');
     this._systemPromptDirty = false;
     return this._systemPromptCache;
   }
@@ -116,6 +184,7 @@ class MainAgent extends BaseAgent {
   _invalidateSystemPromptCache() {
     this._systemPromptDirty = true;
     this._systemPromptBuilder.invalidateAll();
+    this.framework?.promptRegistry?.invalidateAll();
   }
 
   _refreshContext() {
@@ -158,14 +227,22 @@ class MainAgent extends BaseAgent {
   }
 
   registerPromptPart(name, priority, provider) {
-    this._systemPromptBuilder.register(name, priority, provider);
+    // [DEPRECATED] 推荐使用 framework.prompts.register(this.name, ...)
+    const reg = this.framework?.promptRegistry;
+    if (reg && !reg.has(this.name, name)) {
+      reg.register(this.name, name, provider, {
+        slot: PROMPT_PRIORITY_TO_SLOT[name] || 'CUSTOM',
+        order: priority,
+        description: `Legacy registerPromptPart from ${this.name}`,
+      });
+    }
     this._invalidateSystemPromptCache();
     this._refreshContext();
     return this;
   }
 
   unregisterPromptPart(name) {
-    this._systemPromptBuilder.unregister(name);
+    this.framework?.promptRegistry?.unregister(this.name, name);
     this._invalidateSystemPromptCache();
     this._refreshContext();
     return this;