foliko 1.0.67 → 1.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.0.67",
+  "version": "1.0.68",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "bin": {

package/plugins/feishu-plugin.js

@@ -288,8 +288,18 @@ class FeishuPlugin extends Plugin {
 
     // 确定 openId
     let openId = null
-    if (sessionId && sessionId.startsWith('feishu_')) {
-      openId = sessionId.replace('feishu_', '')
+    let effectiveSessionId = sessionId
+
+    // 如果没有 sessionId，尝试从执行上下文获取
+    if (!effectiveSessionId) {
+      const ctx = this._framework.getExecutionContext()
+      if (ctx?.sessionId) {
+        effectiveSessionId = ctx.sessionId
+      }
+    }
+
+    if (effectiveSessionId && effectiveSessionId.startsWith('feishu_')) {
+      openId = effectiveSessionId.replace('feishu_', '')
     } else if (this._sessionPlugin) {
       // 获取最近的 feishu 会话
       const sessions = this._sessionPlugin.listSessions()

package/plugins/scheduler-plugin.js

@@ -188,8 +188,15 @@ class SchedulerPlugin extends Plugin {
             return { success: false, error: 'Agent not available' }
           }
 
-          // 如果没有指定 sessionId，自动获取当前活跃会话
+          // 如果没有指定 sessionId，优先从执行上下文获取（来自 WeChat 等消息源）
           let targetSessionId = sessionId
+          if (!targetSessionId) {
+            const ctx = this._framework.getExecutionContext()
+            if (ctx?.sessionId) {
+              targetSessionId = ctx.sessionId
+            }
+          }
+          // 如果执行上下文也没有，从 sessionPlugin 获取最近活跃会话
           if (!targetSessionId) {
             const sessionPlugin = this._framework.pluginManager.get('session')
             if (sessionPlugin) {

package/plugins/telegram-plugin.js

@@ -99,8 +99,10 @@ class TelegramPlugin extends Plugin {
         this._framework.on('agent:created', (agent) => {
           console.log('[Telegram] New agent created:', agent.name)
         })
-        this._framework.on('scheduler:reminder', async (data) => {
-          await this._handleScheduledReminder(data)
+
+        // 监听统一通知事件
+        this._framework.on('notification', async (data) => {
+          await this._handleNotification(data)
         })
 
         // 监听 webhook 事件
@@ -113,36 +115,62 @@ class TelegramPlugin extends Plugin {
     }
   }
 
-  async _handleScheduledReminder(data) {
-    const { taskName, message, sessionId } = data
-    const reminderText = `🔔 [${taskName}]\n\n${message}`
-
-    if (sessionId && sessionId.startsWith('telegram_')) {
-      const chatId = sessionId.replace('telegram_', '')
-      try {
-        await this._bot.sendMessage(chatId, reminderText)
-        console.log(`[Telegram] Reminder sent to chat ${chatId}`)
-      } catch (err) {
-        console.error(`[Telegram] Failed to send reminder:`, err.message)
-      }
+  /**
+   * 处理统一通知
+   */
+  async _handleNotification(data) {
+    const { title, message, source, level } = data
+
+    if (!this._bot) {
+      console.warn('[Telegram] Bot not ready, cannot send notification')
       return
     }
 
-    if (this._sessionPlugin) {
+    // 确定 chatId
+    let chatId = null
+    let effectiveSessionId = data.sessionId
+
+    // 如果没有 sessionId，尝试从执行上下文获取
+    if (!effectiveSessionId) {
+      const ctx = this._framework.getExecutionContext()
+      if (ctx?.sessionId) {
+        effectiveSessionId = ctx.sessionId
+      }
+    }
+
+    if (effectiveSessionId && effectiveSessionId.startsWith('telegram_')) {
+      chatId = effectiveSessionId.replace('telegram_', '')
+    } else if (this._sessionPlugin) {
+      // 获取最近的 telegram 会话
       const sessions = this._sessionPlugin.listSessions()
         .filter(s => s.id.startsWith('telegram_'))
         .sort((a, b) => new Date(b.lastActive).getTime() - new Date(a.lastActive).getTime())
-
       if (sessions.length > 0) {
-        const chatId = sessions[0].id.replace('telegram_', '')
-        try {
-          await this._bot.sendMessage(chatId, reminderText)
-          console.log(`[Telegram] Reminder sent to recent chat ${chatId}`)
-        } catch (err) {
-          console.error(`[Telegram] Failed to send reminder:`, err.message)
-        }
+        chatId = sessions[0].id.replace('telegram_', '')
       }
     }
+
+    if (!chatId) {
+      console.warn('[Telegram] No telegram session found for notification')
+      return
+    }
+
+    // 格式化通知消息
+    const levelEmoji = {
+      info: 'ℹ️',
+      warning: '⚠️',
+      success: '✅',
+      error: '❌'
+    }
+    const emoji = levelEmoji[level] || 'ℹ️'
+    const notificationText = `${emoji} [${source}] ${title}\n\n${message}`
+
+    try {
+      await this._bot.sendMessage(chatId, notificationText)
+      console.log(`[Telegram] Notification sent to chat ${chatId}`)
+    } catch (err) {
+      console.error(`[Telegram] Failed to send notification:`, err.message)
+    }
   }
 
   /**

package/plugins/weixin-plugin.js

@@ -424,8 +424,18 @@ class WeixinPlugin extends Plugin {
 
     // 确定用户ID
     let userId = null
-    if (sessionId && sessionId.startsWith('weixin_')) {
-      userId = sessionId.replace('weixin_', '')
+    let effectiveSessionId = sessionId
+
+    // 如果没有 sessionId，尝试从执行上下文获取
+    if (!effectiveSessionId) {
+      const ctx = this._framework.getExecutionContext()
+      if (ctx?.sessionId) {
+        effectiveSessionId = ctx.sessionId
+      }
+    }
+
+    if (effectiveSessionId && effectiveSessionId.startsWith('weixin_')) {
+      userId = effectiveSessionId.replace('weixin_', '')
     } else if (this._sessionPlugin) {
       // 获取最近的 weixin 会话
       const sessions = this._sessionPlugin.listSessions()