foliko 1.0.28 → 1.0.29

package/.claude/settings.local.json

@@ -68,7 +68,11 @@
       "Bash(node -e \"require\\('dotenv'\\).config\\(\\); console.log\\('PROVIDER:', process.env.FOLIKO_PROVIDER\\); console.log\\('MODEL:', process.env.FOLIKO_MODEL\\); console.log\\('KEY:', process.env.DEEPSEEK_API_KEY ? 'set' : 'not set'\\)\" 2>&1)",
       "Bash(node cli/src/index.js chat 2>&1 | head -30)",
       "Bash(node -e 'const { DEFAULT_PROVIDERS } = require\\(\"./src/core/provider\"\\); console.log\\(DEFAULT_PROVIDERS\\);')",
-      "Bash(node -e \"const dotenv = require\\('dotenv'\\); const result = dotenv.config\\(\\); console.log\\('Result:', result\\); console.log\\('PROVIDER after dotenv:', process.env.FOLIKO_PROVIDER\\);\" 2>&1)"
+      "Bash(node -e \"const dotenv = require\\('dotenv'\\); const result = dotenv.config\\(\\); console.log\\('Result:', result\\); console.log\\('PROVIDER after dotenv:', process.env.FOLIKO_PROVIDER\\);\" 2>&1)",
+      "Bash(node -c plugins/email.js && node -c plugins/default-plugins.js 2>&1)",
+      "Bash(node -c plugins/email.js 2>&1)",
+      "Bash(npm list:*)",
+      "Bash(node -e \"const {EmailPlugin} = require\\('./plugins/email'\\); const p = new EmailPlugin\\(\\); console.log\\('email plugin loaded ok'\\); console.log\\('enabled:', p.enabled\\); console.log\\('version:', p.version\\);\" 2>&1)"
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "bin": {
@@ -30,6 +30,7 @@
     "ai": "^6.0.116",
     "dotenv": "^17.3.1",
     "imap": "^0.8.19",
+    "imap-mkl": "^1.0.2",
     "mailparser": "^3.7.2",
     "marked": "^11.2.0",
     "marked-terminal": "6",

package/plugins/default-plugins.js

@@ -79,7 +79,7 @@ function loadAgentConfig(agentDir = '.agent') {
     }
   }
 
-  // 加载 plugins.json (支持 telegram, weixin 等插件配置)
+  // 加载 plugins.json (支持 telegram, weixin, email 等插件配置)
   const pluginsFile = path.join(resolvedDir, 'plugins.json')
   if (fs.existsSync(pluginsFile)) {
     try {
@@ -93,6 +93,10 @@ function loadAgentConfig(agentDir = '.agent') {
       if (pluginsConfig.weixin) {
         config.weixin = pluginsConfig.weixin
       }
+      // email 配置
+      if (pluginsConfig.email) {
+        config.email = pluginsConfig.email
+      }
     } catch (err) {
       console.error(`[AgentConfig] Failed to load plugins.json:`, err.message)
     }
@@ -420,7 +424,26 @@ async function bootstrapDefaults(framework, config = {}) {
     }
   }
 
-  // 12.8 SubAgent 管理器
+  // 12.8 Email 插件（默认禁用，需要在 plugins.json 中设置 enabled: true）
+  if (shouldLoad('email')) {
+    try {
+      const { Plugin } = require('../src/core/plugin-base')
+      const { EmailPlugin } = require('./email')
+      // 支持两种格式：email.smtp 或 email.config.smtp
+      const emailData = agentConfig.email || {}
+      const emailCfg = emailData.config || {}
+      const emailConfig = {
+        smtp: emailCfg.smtp || emailData.smtp || {},
+        imap: emailCfg.imap || emailData.imap || {},
+        clientId: emailCfg.clientId || emailData.clientId
+      }
+      await framework.loadPlugin(new EmailPlugin(emailConfig))
+    } catch (err) {
+      console.warn('[Bootstrap] Email Plugin not available:', err.message)
+    }
+  }
+
+  // 12.9 SubAgent 管理器
   if (shouldLoad('subagent-manager')) {
     try {
       const { SubAgentManagerPlugin } = require('./subagent-plugin')

package/plugins/email.js

@@ -13,7 +13,18 @@ class EmailPlugin extends Plugin {
     this.version = '1.0.0'
     this.description = '邮件收发插件 - 支持读取和发送电子邮件'
     this.priority = 10
-    this.config = config
+    // 默认不启用，需要在 plugins.json 中设置 enabled: true
+    this.enabled = false
+    // IMAP ID 信息
+    this.config = {
+      ...config,
+      clientId: config.clientId || {
+        name: 'FolikoAgent',
+        version: '1.0.0',
+        vendor: 'Foliko',
+        supportEmail: config.imap?.user || 'unknown@example.com'
+      }
+    }
   }
 
   install(framework) {
@@ -105,9 +116,26 @@ class EmailPlugin extends Plugin {
         imap_port: z.number().optional().describe('IMAP端口'),
         imap_user: z.string().optional().describe('IMAP用户名'),
         imap_pass: z.string().optional().describe('IMAP密码'),
-        from_email: z.string().optional().describe('默认发件人地址')
+        from_email: z.string().optional().describe('默认发件人地址'),
+        client_id_name: z.string().optional().describe('IMAP客户端名称'),
+        client_id_version: z.string().optional().describe('IMAP客户端版本'),
+        client_id_vendor: z.string().optional().describe('IMAP客户端厂商'),
+        client_id_support_email: z.string().optional().describe('IMAP客户端支持邮箱')
       }),
       execute: async (args) => {
+        // 处理 clientId 字段
+        if (args.client_id_name || args.client_id_version || args.client_id_vendor || args.client_id_support_email) {
+          this.config.clientId = {
+            name: args.client_id_name || this.config.clientId?.name || 'FolikoAgent',
+            version: args.client_id_version || this.config.clientId?.version || '1.0.0',
+            vendor: args.client_id_vendor || this.config.clientId?.vendor || 'Foliko',
+            supportEmail: args.client_id_support_email || this.config.clientId?.supportEmail
+          }
+          delete args.client_id_name
+          delete args.client_id_version
+          delete args.client_id_vendor
+          delete args.client_id_support_email
+        }
         Object.assign(this.config, args)
         return {
           success: true,
@@ -172,7 +200,12 @@ class EmailPlugin extends Plugin {
         host: args.host || this.config.imap_host || process.env.IMAP_HOST,
         port: args.port || this.config.imap_port || 993,
         tls: true,
-        tlsOptions: { rejectUnauthorized: false }
+        tlsOptions: { rejectUnauthorized: false },
+        id: {
+          name: this.config.clientId?.name || 'FolikoAgent',
+          version: this.config.clientId?.version || '1.0.0',
+          vendor: this.config.clientId?.vendor || 'Foliko'
+        }
       }
 
       const box = args.box || 'INBOX'
@@ -205,7 +238,13 @@ class EmailPlugin extends Plugin {
         host: args.host || this.config.imap_host || process.env.IMAP_HOST,
         port: args.port || this.config.imap_port || 993,
         tls: true,
-        tlsOptions: { rejectUnauthorized: false }
+        tlsOptions: { rejectUnauthorized: false },
+        id: {
+          name: this.config.clientId?.name || 'FolikoAgent',
+          version: this.config.clientId?.version || '1.0.0',
+          vendor: this.config.clientId?.vendor || 'Foliko',
+          'support-email': this.config.clientId?.supportEmail || 'unknown@example.com'
+        }
       }
 
       const box = args.box || 'INBOX'
@@ -234,7 +273,13 @@ class EmailPlugin extends Plugin {
         host: args.host || this.config.imap_host || process.env.IMAP_HOST,
         port: args.port || this.config.imap_port || 993,
         tls: true,
-        tlsOptions: { rejectUnauthorized: false }
+        tlsOptions: { rejectUnauthorized: false },
+        id: {
+          name: this.config.clientId?.name || 'FolikoAgent',
+          version: this.config.clientId?.version || '1.0.0',
+          vendor: this.config.clientId?.vendor || 'Foliko',
+          'support-email': this.config.clientId?.supportEmail || 'unknown@example.com'
+        }
       }
 
       await this._markEmailAsRead(imapConfig, args.messageId)
@@ -253,13 +298,19 @@ class EmailPlugin extends Plugin {
 
   _fetchEmails(imapConfig, box, limit, unreadOnly, searchCriteria) {
     return new Promise((resolve, reject) => {
+      const Imap = require('imap-mkl')
+      const { simpleParser } = require('mailparser')
       const imap = new Imap(imapConfig)
       const emails = []
 
-      imap.once('ready', () => {
+      const cleanup = () => {
+        try { imap.end() } catch (e) {}
+      }
+
+      imap.on('ready', () => {
         imap.openBox(box, true, (err) => {
           if (err) {
-            imap.end()
+            cleanup()
             return reject(err)
           }
 
@@ -270,106 +321,125 @@ class EmailPlugin extends Plugin {
 
           imap.search(searchFilter, (err, results) => {
             if (err) {
-              imap.end()
+              cleanup()
               return reject(err)
             }
 
-            if (results.length === 0) {
-              imap.end()
+            if (!results || results.length === 0) {
+              cleanup()
               return resolve([])
             }
 
             const fetchIds = results.slice(-limit)
+            const f = imap.fetch(fetchIds, { bodies: '' })
 
-            const f = imap.fetch(fetchIds, {
-              bodies: 'HEADER.FIELDS (FROM TO SUBJECT DATE)',
-              struct: true
-            })
-
-            f.on('message', (msg, seqno) => {
-              const email = { seqno }
+            f.on('message', (msg) => {
+              const email = {}
 
               msg.on('body', (stream) => {
-                let buffer = ''
-                stream.on('data', chunk => buffer += chunk.toString('utf8'))
-                stream.once('end', () => {
-                  const headers = Imap.parseHeader(buffer)
-                  email.from = headers.from ? headers.from[0] : ''
-                  email.to = headers.to ? headers.to[0] : ''
-                  email.subject = headers.subject ? headers.subject[0] : ''
-                  email.date = headers.date ? headers.date[0] : ''
+                simpleParser(stream, (err, mail) => {
+                  if (err) {
+                    email.error = err.message
+                  } else {
+                    email.subject = mail.subject
+                    email.from = mail.from?.text || ''
+                    email.to = mail.to?.text || ''
+                    email.date = mail.date?.toISOString() || ''
+                    email.text = mail.text
+                    email.html = mail.html
+                    email.attachments = mail.attachments?.map(a => ({
+                      filename: a.filename,
+                      contentType: a.contentType
+                    })) || []
+                  }
                 })
               })
 
-              msg.once('attributes', (attrs) => {
+              msg.on('attributes', (attrs) => {
                 email.uid = attrs.uid
                 email.id = attrs.uid
                 email.flags = attrs.flags
               })
 
-              msg.once('end', () => {
+              msg.on('end', () => {
                 emails.push(email)
               })
             })
 
-            f.once('error', err => {
-              imap.end()
+            f.on('error', (err) => {
+              cleanup()
               reject(err)
             })
 
-            f.once('end', () => {
-              imap.end()
+            f.on('end', () => {
+              cleanup()
               resolve(emails)
             })
           })
         })
       })
 
-      imap.once('error', err => reject(err))
+      imap.on('error', (err) => reject(err))
+      imap.on('end', () => {})
+
       imap.connect()
     })
   }
 
   _fetchUnreadCount(imapConfig, box) {
     return new Promise((resolve, reject) => {
+      const Imap = require('imap-mkl')
       const imap = new Imap(imapConfig)
 
-      imap.once('ready', () => {
+      const cleanup = () => {
+        try { imap.end() } catch (e) {}
+      }
+
+      imap.on('ready', () => {
         imap.openBox(box, true, (err, box) => {
           if (err) {
-            imap.end()
+            cleanup()
             return reject(err)
           }
           const unreadCount = box.messages.unread
-          imap.end()
+          cleanup()
           resolve(unreadCount)
         })
       })
 
-      imap.once('error', err => reject(err))
+      imap.on('error', (err) => reject(err))
+      imap.on('end', () => {})
+
       imap.connect()
     })
   }
 
   _markEmailAsRead(imapConfig, messageId) {
     return new Promise((resolve, reject) => {
+      const Imap = require('imap-mkl')
       const imap = new Imap(imapConfig)
 
-      imap.once('ready', () => {
+      const cleanup = () => {
+        try { imap.end() } catch (e) {}
+      }
+
+      imap.on('ready', () => {
         imap.openBox('INBOX', true, (err) => {
           if (err) {
-            imap.end()
+            cleanup()
             return reject(err)
           }
           imap.addFlags(messageId, '\\Seen', (err) => {
-            imap.end()
+            cleanup()
             if (err) reject(err)
             else resolve()
           })
         })
       })
 
-      imap.once('error', err => reject(err))
+      imap.on('error', (err) => reject(err))
+      imap.on('end', () => {})
+
       imap.connect()
     })
   }