foliko 1.0.86 → 1.1.0

package/plugins/session-plugin.js

@@ -39,7 +39,11 @@ class SessionPlugin extends Plugin {
       maxHistoryLength: config.maxHistoryLength || 150,  // 放宽到 150，Agent 已有智能压缩
       autoCleanup: config.autoCleanup||false,  // 默认不开启自动清理，避免误删会话
       cleanupInterval: config.cleanupInterval || 5 * 60 * 1000,  // 5分钟
-      persistToStorage: config.persistToStorage !== false  // 默认持久化到 storage
+      persistToStorage: config.persistToStorage !== false,  // 默认持久化到 storage
+      // Session 钩子配置
+      onSessionStart: config.onSessionStart || null,
+      onSessionEnd: config.onSessionEnd || null,
+      onSessionCreated: config.onSessionCreated || null
     }
     // console.log('SessionPlugin config:', this.config)
     this._framework = null
@@ -287,6 +291,15 @@ class SessionPlugin extends Plugin {
 
     this._sessions.set(id, session)
     this._saveToStorage(session)
+
+    // 触发 session:created 事件
+    this._events.emit('session:created', session)
+
+    // 调用 onSessionCreated 钩子
+    if (this.config.onSessionCreated) {
+      this._callHook(this.config.onSessionCreated, session)
+    }
+
     return session
   }
 
@@ -335,6 +348,20 @@ class SessionPlugin extends Plugin {
   addMessage(sessionId, message) {
     const session = this.getSession(sessionId)
     if (session) {
+      // 基础消息验证
+      if (!message || !message.role || !message.content) {
+        log.warn('Invalid message format, skipping:', { sessionId, message });
+        return session;
+      }
+
+      // 触发 session:started 事件（首次添加消息时）
+      if (session.messages.length === 0) {
+        this._events.emit('session:started', session)
+        if (this.config.onSessionStart) {
+          this._callHook(this.config.onSessionStart, session)
+        }
+      }
+
       session.messages.push(message)
       session.lastActive = new Date()
 
@@ -349,6 +376,22 @@ class SessionPlugin extends Plugin {
     return session
   }
 
+  /**
+   * 整体替换会话消息（用于压缩后同步）
+   * @param {string} sessionId - 会话 ID
+   * @param {Array} messages - 新的消息数组
+   */
+  replaceMessages(sessionId, messages) {
+    const session = this.getSession(sessionId)
+    if (session) {
+      session.messages = messages || []
+      session.lastActive = new Date()
+      // 持久化到 storage
+      this._saveToStorage(session)
+    }
+    return session
+  }
+
   /**
    * 获取会话历史
    */
@@ -462,6 +505,40 @@ class SessionPlugin extends Plugin {
     this._events.off(event, listener)
   }
 
+  /**
+   * 调用会话钩子
+   * @param {Function} hook - 钩子函数
+   * @param {Object} session - 会话对象
+   * @private
+   */
+  _callHook(hook, session) {
+    if (typeof hook === 'function') {
+      try {
+        const result = hook(session)
+        if (result && typeof result.catch === 'function') {
+          result.catch(err => log.warn('Session hook error:', err.message))
+        }
+      } catch (err) {
+        log.warn('Session hook error:', err.message)
+      }
+    }
+  }
+
+  /**
+   * 结束会话（触发 session:ended 事件）
+   * 当会话完成处理时调用
+   * @param {string} sessionId - 会话 ID
+   */
+  endSession(sessionId) {
+    const session = this.getSession(sessionId)
+    if (session) {
+      this._events.emit('session:ended', session)
+      if (this.config.onSessionEnd) {
+        this._callHook(this.config.onSessionEnd, session)
+      }
+    }
+  }
+
   /**
    * 启动自动清理定时器
    */

package/plugins/weixin-plugin.js

@@ -372,8 +372,9 @@ class WeixinPlugin extends Plugin {
       return { agent, sessionId: `weixin_${userId}` }
     }
 
-    // 创建新 agent
-    const agent = this._framework.createSessionAgent(`weixin_${userId}`, {
+    // 创建新 agent - 和 CLI 一样使用 createAgent
+    const agent = this._framework.createAgent({
+      name: `weixin_${userId}`,
       systemPrompt: this.systemPrompt,
       sharedPrompt: `工作目录: {{WORK_DIR}}`,
       metadata: { WORK_DIR: process.cwd() }
@@ -466,14 +467,18 @@ class WeixinPlugin extends Plugin {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
     try {
-      const result = await agent.chat(text, {
-        sessionId: sessionId
-      })
-      const fullResponse = cleanResponse(result.message || '')
+      // 使用 chatStream 保持和 CLI 一致的行为
+      
+      let fullResponse = '';
+      for await (const chunk of agent.chatStream(text, { sessionId })) {
+        if (chunk.type === 'text') {
+          fullResponse += chunk.text;
+        }
+      }
+      const response = cleanResponse(fullResponse);
 
-      if (fullResponse) {
-        await this._sendMessageBatch(originalMsg, userId, fullResponse, true)
-        // log.info(` 回复成功 (${fullResponse.length} 字符)`)
+      if (response) {
+        await this._sendMessageBatch(originalMsg, userId, response, true)
       }
     } catch (err) {
       log.error(' Media chat error:', err)
@@ -506,21 +511,18 @@ class WeixinPlugin extends Plugin {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
     try {
-      // 使用非流式响应
-      const result = await agent.chat(text, {
-        sessionId: sessionId
-      })
-      const fullResponse = cleanResponse(result.message || '')
-
-      // 保存助手回复到历史（使用 SessionPlugin）
-      // if (this._sessionPlugin) {
-      //   this._sessionPlugin.addMessage(sessionId, { role: 'assistant', content: fullResponse })
-      // }
+      // 使用 chatStream 保持和 CLI 一致的行为
+      let fullResponse = '';
+      for await (const chunk of agent.chatStream(text, { sessionId })) {
+        if (chunk.type === 'text') {
+          fullResponse += chunk.text;
+        }
+      }
+      const response = cleanResponse(fullResponse);
 
       // 发送回复（超过500字自动分批）
-      if (fullResponse) {
-        await this._sendMessageBatch(originalMsg, userId, fullResponse, true)
-        // log.info(` 回复成功 (${fullResponse.length} 字符)`)
+      if (response) {
+        await this._sendMessageBatch(originalMsg, userId, response, true)
       } else {
         await this._sendMessageBatch(originalMsg, userId, '抱歉，我没有收到有效的回复。', true)
       }