foliko 1.1.7 → 1.1.9

package/src/core/agent.js

@@ -6,7 +6,7 @@
 const { EventEmitter } = require('../utils/event-emitter');
 const { AgentChatHandler } = require('./agent-chat');
 const { SystemPromptBuilder } = require('./system-prompt-builder');
-const { zodSchemaToMarkdown } = require('@chnak/zod-to-markdown');
+const { zodSchemaToMarkdown, zodSchemaToTable } = require('@chnak/zod-to-markdown');
 const { zodSchema } = require('ai');
 const os = require('os');
 
@@ -145,7 +145,18 @@ class Agent extends EventEmitter {
       return null;
     });
 
-    // 3. 元数据
+    // 3. 日期时间（每次构建时都重新获取）
+    this._systemPromptBuilder.register('datetime', 50, () => {
+      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}）`;
+    });
+
+    // 4. 元数据
     this._systemPromptBuilder.register('metadata', PROMPT_PRIORITY.METADATA, () => {
       if (this._metadata.size === 0) {
         return null;
@@ -179,9 +190,9 @@ class Agent extends EventEmitter {
       this._buildCapabilitiesDescription()
     );
     // 8. MCP 工具列表
-    this._systemPromptBuilder.register('mcp-tools', PROMPT_PRIORITY.MCP_TOOLS, () =>
-      this._buildMcpToolsDescription()
-    );
+    // this._systemPromptBuilder.register('mcp-tools', PROMPT_PRIORITY.MCP_TOOLS, () =>
+    //   this._buildMcpToolsDescription()
+    // );
     // 9. 扩展工具列表
     this._systemPromptBuilder.register('extension-tools', PROMPT_PRIORITY.EXTENSION_TOOLS, () =>
       this._buildExtensionToolsDescription()
@@ -338,6 +349,7 @@ class Agent extends EventEmitter {
     if (!extensions || extensions.length === 0) {
       return '';
     }
+    const mcp = this.framework.pluginManager.get('mcp');
 
     const sections = [
       '## Extensions 扩展工具',
@@ -363,26 +375,31 @@ class Agent extends EventEmitter {
       for (const tool of ext.tools) {
         sections.push(`#### \`${tool.name}\``, '');
         sections.push(tool.description || '无描述', '');
-
         // 使用 zodSchemaToMarkdown 解析参数
-        if (tool.inputSchema) {
+        if (ext.name === 'mcp' && mcp) {
+          const mcp_desc = mcp._bindMcpParamsDesc(tool.inputSchema);
+          sections.push(mcp_desc, '');
+        } else if (tool.inputSchema) {
           try {
             const schemaMarkdown = zodSchemaToMarkdown(tool.inputSchema);
-            // 检查是否包含未解析的原始 Zod 类型名（如 ZodMap、ZodSet、ZodAny 等）
-            const hasUnparsedTypes = schemaMarkdown && /\|.*\bZod\w+\b.*\|/.test(schemaMarkdown);
-            if (hasUnparsedTypes) {
-              // 降级处理：zodSchemaToMarkdown 未正确解析，使用 fallback
-              sections.push('**参数：**', ' ');
-              sections.push(this._fallbackSchemaToText(tool.inputSchema), ' ');
-            } else {
+            sections.push('**参数：**', ' ');
+            sections.push(schemaMarkdown || '无', ' ');
+          } catch (e) {
+            // 降级处理：尝试 zodSchemaToTable
+            try {
+              const schemaTable = zodSchemaToTable(tool.inputSchema);
               sections.push('**参数：**', ' ');
-              sections.push(schemaMarkdown || '无', ' ');
+              sections.push(schemaTable || '无', ' ');
+            } catch (e2) {
+              // 最后降级：尝试简单解析
+              try {
+                const simpleParams = this._simpleParamsDesc(tool.inputSchema);
+                sections.push('**参数：**', ' ');
+                sections.push(simpleParams, ' ');
+              } catch (e3) {
+                sections.push('**参数：** 无可用描述', ' ');
+              }
             }
-          } catch (e) {
-            logger.warn('Agent', `转换工具 ${tool.name} 的参数描述失败`, e.message);
-            // 降级处理：手动解析常见 Zod 类型
-            sections.push('**参数：**', ' ');
-            sections.push(this._fallbackSchemaToText(tool.inputSchema), ' ');
           }
         }
 
@@ -421,12 +438,31 @@ class Agent extends EventEmitter {
    * @returns {string} 参数描述文本
    */
   _fallbackSchemaToText(schema) {
-    if (!schema || !schema.shape) {
+    if (!schema) {
+      return '- （参数描述不可用）';
+    }
+
+    // 尝试获取 shape（标准 Zod schema）
+    const shape = typeof schema.shape === 'function' ? schema.shape() : schema.shape;
+    if (!shape || typeof shape !== 'object') {
+      // schema 没有标准 shape，可能是 MCP 的简化 schema
+      // 尝试从 properties 构建描述
+      if (schema.properties) {
+        const lines = [];
+        for (const [name, field] of Object.entries(schema.properties)) {
+          const type = field.type || 'any';
+          const desc = field.description || '';
+          const required = schema.required?.includes(name);
+          const isOptional = required ? '' : '（可选）';
+          lines.push(`- ${name} (${type}) ${isOptional}${desc ? `: ${desc}` : ''}`);
+        }
+        return lines.join('\n') || '- （参数描述不可用）';
+      }
       return '- （参数描述不可用）';
     }
 
     const lines = [];
-    for (const [name, field] of Object.entries(schema.shape)) {
+    for (const [name, field] of Object.entries(shape)) {
       const typeInfo = this._extractFieldType(field);
       const desc = typeInfo.description || '';
       const isOptional = typeInfo.isOptional ? '（可选）' : '（必填）';
@@ -436,6 +472,43 @@ class Agent extends EventEmitter {
     return lines.join('\n') || '- （参数描述不可用）';
   }
 
+  /**
+   * 简单的参数描述（当 zodSchemaToMarkdown 和 zodSchemaToTable 都失败时）
+   * 直接从 schema 的 properties 提取信息
+   */
+  _simpleParamsDesc(schema) {
+    if (!schema) return '无';
+
+    // 尝试 properties 格式
+    if (schema.properties) {
+      const lines = [];
+      const required = schema.required || [];
+      for (const [name, prop] of Object.entries(schema.properties)) {
+        const type = prop.type || 'any';
+        const desc = prop.description || '';
+        const isRequired = required.includes(name);
+        lines.push(`- ${name} (${type})${isRequired ? '' : '（可选）'}${desc ? `: ${desc}` : ''}`);
+      }
+      return lines.join('\n') || '无';
+    }
+
+    // 尝试直接从 schema 提取
+    if (schema.jsonSchema?.properties) {
+      const props = schema.jsonSchema.properties;
+      const required = schema.jsonSchema.required || [];
+      const lines = [];
+      for (const [name, prop] of Object.entries(props)) {
+        const type = prop.type || 'any';
+        const desc = prop.description || '';
+        const isRequired = required.includes(name);
+        lines.push(`- ${name} (${type})${isRequired ? '' : '（可选）'}${desc ? `: ${desc}` : ''}`);
+      }
+      return lines.join('\n') || '无';
+    }
+
+    return '无';
+  }
+
   /**
    * 递归提取字段类型信息
    * 处理 ZodOptional、ZodUnion、ZodArray 等复杂类型
@@ -443,12 +516,17 @@ class Agent extends EventEmitter {
    * @returns {{ type: string, isOptional: boolean, description: string }}
    */
   _extractFieldType(field) {
+    if (!field) {
+      return { type: 'unknown', isOptional: false, description: '' };
+    }
+
     const typeName = field._def?.typeName || field.constructor?.name || '';
     let description = field.description || field._def?.description || '';
 
     switch (typeName) {
       case 'ZodOptional': {
-        const inner = field._def.innerType;
+        const inner = field._def?.innerType;
+        if (!inner) return { type: 'optional', isOptional: true, description };
         const innerInfo = this._extractFieldType(inner);
         return {
           type: innerInfo.type,
@@ -457,14 +535,17 @@ class Agent extends EventEmitter {
         };
       }
       case 'ZodUnion': {
+        if (!field._def?.options) return { type: 'union', isOptional: false, description };
         const types = field._def.options.map((opt) => this._extractFieldType(opt).type);
         return { type: `union(${types.join(' | ')})`, isOptional: false, description };
       }
       case 'ZodArray': {
+        if (!field._def?.type) return { type: 'array', isOptional: false, description };
         const innerInfo = this._extractFieldType(field._def.type);
         return { type: `${innerInfo.type}[]`, isOptional: false, description };
       }
       case 'ZodObject': {
+        if (!field._def?.shape) return { type: 'object', isOptional: false, description };
         const props = Object.keys(field._def.shape()).join(', ');
         return { type: `object{${props}}`, isOptional: false, description };
       }
@@ -474,21 +555,28 @@ class Agent extends EventEmitter {
         return { type: 'number', isOptional: false, description };
       case 'ZodBoolean':
         return { type: 'boolean', isOptional: false, description };
-      case 'ZodEnum':
+      case 'ZodEnum': {
+        const values = field._def?.values;
+        if (!values) return { type: 'enum', isOptional: false, description };
         return {
-          type: field._def.values.map((v) => `"${v}"`).join(' | '),
+          type: values.map((v) => `"${v}"`).join(' | '),
           isOptional: false,
           description,
         };
+      }
       case 'ZodRecord': {
-        const keyType = this._extractFieldType(field._def.keyType).type;
-        const valueType = this._extractFieldType(field._def.valueType).type;
-        return { type: `record<${keyType}, ${valueType}>`, isOptional: false, description };
+        const keyType = this._extractFieldType(field._def?.keyType);
+        const valueType = this._extractFieldType(field._def?.valueType);
+        return {
+          type: `record<${keyType?.type || 'any'}, ${valueType?.type || 'any'}>`,
+          isOptional: false,
+          description,
+        };
       }
       case 'ZodIntersection':
         return { type: 'intersection', isOptional: false, description };
       case 'ZodLiteral':
-        return { type: JSON.stringify(field._def.value), isOptional: false, description };
+        return { type: JSON.stringify(field._def?.value), isOptional: false, description };
       default:
         return {
           type: typeName.replace('Zod', '').toLowerCase() || 'any',
@@ -1058,6 +1146,16 @@ class Agent extends EventEmitter {
     }
   }
 
+  /**
+   * 继续对话（使用队列机制）
+   * @param {string} prompt - 继续提示
+   * @param {string} sessionId - 会话ID
+   * @param {Object} options - 选项 { onChunk, onComplete, onError }
+   */
+  continue(prompt, sessionId, options = {}) {
+    return this._chatHandler.continue(prompt, sessionId, options);
+  }
+
   /**
    * 设置元数据
    */