foliko 1.0.40 → 1.0.41

package/src/core/agent-chat.js

@@ -96,6 +96,9 @@ class AgentChatHandler extends EventEmitter {
    * @param {Object} options - 选项
    */
   async chat(message, options = {}) {
+    const context = { sessionId: options.sessionId || null, isStream: false }
+    const framework = this.agent.framework
+
     // 动态导入 AI SDK
     const { tool, ToolLoopAgent } = await this._importAI()
 
@@ -108,32 +111,27 @@ class AgentChatHandler extends EventEmitter {
     const maxSteps = options.maxSteps || this._maxSteps
     const tools = this._getAITools(tool)
 
-    // 如果没有 AI 客户端，抛出错误
     if (!this._aiClient) {
-      throw new Error('AI client not configured. Please set up AI plugin.')
+      throw new Error('AI client not configured.')
     }
 
-    try {
-      // 使用 ToolLoopAgent 处理工具调用循环
-      const agent = new ToolLoopAgent({
-        model: this._aiClient,
-        instructions: this._systemPrompt,
-        tools: tools,
-        stopWhen: (step) => step.stepCount >= maxSteps
-      })
+    const agent = new ToolLoopAgent({
+      model: this._aiClient,
+      instructions: this._systemPrompt,
+      tools: tools,
+      stopWhen: (step) => step.stepCount >= maxSteps
+    })
 
-      // 构建消息列表
-      const messages = [
-        ...this._cleanMessages(this._messages)
-      ]
+    const messages = [
+      ...this._cleanMessages(this._messages)
+    ]
 
-      // 生成响应
-      const result = await agent.generate({
-        messages: messages,
-        providerOptions: this.providerOptions
+    try {
+      // 使用 runWithContext 让工具执行时能获取 sessionId
+      const result = await framework.runWithContext(context, async () => {
+        return agent.generate({ messages, ...this.providerOptions })
       })
 
-      // 添加助手消息到历史
       if (result.text) {
         this._messages.push({
           role: 'assistant',
@@ -159,6 +157,9 @@ class AgentChatHandler extends EventEmitter {
    * @param {Object} options - 选项
    */
   async *chatStream(message, options = {}) {
+    const context = { sessionId: options.sessionId || null, isStream: true }
+    const framework = this.agent.framework
+
     // 动态导入 AI SDK
     const { tool, ToolLoopAgent } = await this._importAI()
 
@@ -171,12 +172,10 @@ class AgentChatHandler extends EventEmitter {
     const maxSteps = options.maxSteps || this._maxSteps
     const tools = this._getAITools(tool)
 
-    // 如果没有 AI 客户端，抛出错误
     if (!this._aiClient) {
-      throw new Error('AI client not configured. Please set up AI plugin.')
+      throw new Error('AI client not configured.')
     }
 
-    // 使用 ToolLoopAgent 流式接口
     const agent = new ToolLoopAgent({
       model: this._aiClient,
       instructions: this._systemPrompt,
@@ -189,9 +188,9 @@ class AgentChatHandler extends EventEmitter {
     ]
 
     try {
-      const result = await agent.stream({
-        messages: messages,
-        providerOptions: this.providerOptions
+      // 使用 runWithContext 让工具执行时能获取 sessionId（支持并行）
+      const result = await framework.runWithContext(context, async () => {
+        return agent.stream({ messages, ...this.providerOptions })
       })
 
       const stream = result.fullStream
@@ -203,7 +202,6 @@ class AgentChatHandler extends EventEmitter {
           fullText += text
           yield { type: 'text', text }
         } else if (part.type === 'reasoning') {
-          // 通过事件发射推理内容
           this.emit('thinking', { content: part.text })
         } else if (part.type === 'tool-call') {
           yield { type: 'tool-call', toolName: part.toolName, args: part.input }
@@ -214,7 +212,6 @@ class AgentChatHandler extends EventEmitter {
         }
       }
 
-      // 保存消息到历史
       if (fullText) {
         this._messages.push({
           role: 'assistant',

package/src/core/agent.js

@@ -47,6 +47,10 @@ class Agent extends EventEmitter {
     // 子Agent管理
     this._subAgents = new Map()
 
+    // 消息队列（用于 pushMessage）
+    this._messageQueue = []
+    this._isProcessingQueue = false
+
     // 处理后的 system prompt (带上下文)
     this.systemPrompt = this._buildSystemPrompt()
 
@@ -447,14 +451,80 @@ class Agent extends EventEmitter {
       const result = await this._chatHandler.chat(enhancedMessage, options)
       this._status = 'idle'
       this.emit('status', { status: 'idle' })
+
+      // 处理队列中的下一条消息
+      setImmediate(() => this._processQueue())
+
       return result
     } catch (err) {
       this._status = 'error'
       this.emit('status', { status: 'error', error: err.message })
+
+      // 发生错误时也要处理队列
+      setImmediate(() => this._processQueue())
+
       throw err
     }
   }
 
+  /**
+   * 推送消息（自动继承当前 sessionId 上下文，自动排队）
+   * 工具中调用此方法，自动带上当前执行上下文的 sessionId
+   * 如果 agent 忙碌，消息会进入队列等待
+   * @param {string|Object} message - 消息
+   * @param {Object} options - 选项 { maxSteps }
+   * @returns {Promise<{success: boolean, message: string, stepCount: number}>}
+   */
+  async pushMessage(message, options = {}) {
+    // 自动从执行上下文获取 sessionId
+    const ctx = this.framework.getExecutionContext()
+    if (ctx?.sessionId && !options.sessionId) {
+      options.sessionId = ctx.sessionId
+    }
+
+    // 如果忙碌，进入队列等待
+    if (this._status === 'busy') {
+      const queuedItem = { message, options, resolve: null, reject: null }
+      const promise = new Promise((resolve, reject) => {
+        queuedItem.resolve = resolve
+        queuedItem.reject = reject
+      })
+      this._messageQueue.push(queuedItem)
+      console.log('[Agent] busy, message queued')
+      return promise
+    }
+
+    // 空闲则直接处理
+    return this.chat(message, options)
+  }
+
+  /**
+   * 处理消息队列
+   * @private
+   */
+  async _processQueue() {
+    if (this._isProcessingQueue || this._messageQueue.length === 0) {
+      return
+    }
+
+    this._isProcessingQueue = true
+
+    // 强制设置为 idle，确保 this.chat() 能执行
+    this._status = 'idle'
+
+    while (this._messageQueue.length > 0) {
+      const item = this._messageQueue.shift()
+      try {
+        const result = await this.chat(item.message, item.options)
+        item.resolve(result)
+      } catch (err) {
+        item.reject(err)
+      }
+    }
+
+    this._isProcessingQueue = false
+  }
+
   /**
    * 发送消息（流式）
    */
@@ -484,9 +554,16 @@ class Agent extends EventEmitter {
       yield* this._chatHandler.chatStream(enhancedMessage, options)
       this._status = 'idle'
       this.emit('status', { status: 'idle' })
+
+      // 处理队列中的下一条消息
+      setImmediate(() => this._processQueue())
     } catch (err) {
       this._status = 'error'
       this.emit('status', { status: 'error', error: err.message })
+
+      // 发生错误时也要处理队列
+      setImmediate(() => this._processQueue())
+
       throw err
     }
   }

package/src/core/framework.js

@@ -4,6 +4,7 @@
  */
 
 const path = require('path')
+const { AsyncLocalStorage } = require('async_hooks')
 const { EventEmitter } = require('../utils/event-emitter')
 const { PluginManager } = require('./plugin-manager')
 const { ToolRegistry } = require('./tool-registry')
@@ -16,6 +17,9 @@ if (!module.paths.includes(frameworkNodeModules)) {
   module.paths.unshift(frameworkNodeModules)
 }
 
+// AsyncLocalStorage 实现真正的上下文隔离（支持并行处理）
+const asyncLocalStorage = new AsyncLocalStorage()
+
 class Framework extends EventEmitter {
   /**
    * @param {Object} config - 配置
@@ -37,6 +41,9 @@ class Framework extends EventEmitter {
     this._agents = []           // 所有创建的 agent
     this._mainAgent = null      // 主 agent
 
+    // 执行上下文（工具调用时可用）
+    this._executionContext = null
+
     // 事件转发
     this.toolRegistry.on('tool:registered', (tool) => {
       this.emit('tool:registered', tool)
@@ -142,6 +149,34 @@ class Framework extends EventEmitter {
     return this.toolRegistry.execute(name, args, this)
   }
 
+  /**
+   * 在上下文中执行函数（支持并行处理，自动隔离 session）
+   * @param {Object} context - 执行上下文 { sessionId, ... }
+   * @param {Function} fn - 要执行的异步函数
+   * @returns {Promise}
+   */
+  runWithContext(context, fn) {
+    return asyncLocalStorage.run(context, fn)
+  }
+
+  /**
+   * 获取当前执行上下文（在 runWithContext 内部调用）
+   * @returns {Object|null}
+   */
+  getExecutionContext() {
+    return asyncLocalStorage.getStore() || null
+  }
+
+  /**
+   * @deprecated 使用 runWithContext 代替
+   */
+  setExecutionContext() {}
+
+  /**
+   * @deprecated 使用 runWithContext 代替
+   */
+  clearExecutionContext() {}
+
   /**
    * 创建 Agent
    * @param {Object} config - Agent 配置

package/src/executors/executor-base.js

@@ -1,58 +1,58 @@
-/**
- * Executor 基类
- * 执行器的基类，定义执行器接口
- */
-
-const { EventEmitter } = require('../utils/event-emitter')
-
-class ExecutorBase extends EventEmitter {
-  /**
-   * @param {string} name - 执行器名称
-   */
-  constructor(name) {
-    super()
-    this.name = name
-    this._enabled = true
-  }
-
-  /**
-   * 执行
-   * @param {Object} params - 执行参数
-   * @returns {Promise<any>}
-   */
-  async execute(params) {
-    throw new Error('execute() must be implemented')
-  }
-
-  /**
-   * 启用执行器
-   */
-  enable() {
-    this._enabled = true
-    return this
-  }
-
-  /**
-   * 禁用执行器
-   */
-  disable() {
-    this._enabled = false
-    return this
-  }
-
-  /**
-   * 是否启用
-   */
-  isEnabled() {
-    return this._enabled
-  }
-
-  /**
-   * 销毁
-   */
-  destroy() {
-    this.removeAllListeners()
-  }
-}
-
-module.exports = { ExecutorBase }
+/**
+ * Executor 基类
+ * 执行器的基类，定义执行器接口
+ */
+
+const { EventEmitter } = require('../utils/event-emitter')
+
+class ExecutorBase extends EventEmitter {
+  /**
+   * @param {string} name - 执行器名称
+   */
+  constructor(name) {
+    super()
+    this.name = name
+    this._enabled = true
+  }
+
+  /**
+   * 执行
+   * @param {Object} params - 执行参数
+   * @returns {Promise<any>}
+   */
+  async execute(params) {
+    throw new Error('execute() must be implemented')
+  }
+
+  /**
+   * 启用执行器
+   */
+  enable() {
+    this._enabled = true
+    return this
+  }
+
+  /**
+   * 禁用执行器
+   */
+  disable() {
+    this._enabled = false
+    return this
+  }
+
+  /**
+   * 是否启用
+   */
+  isEnabled() {
+    return this._enabled
+  }
+
+  /**
+   * 销毁
+   */
+  destroy() {
+    this.removeAllListeners()
+  }
+}
+
+module.exports = { ExecutorBase }

package/test-server.js

@@ -0,0 +1,25 @@
+const { serve } = require('@hono/node-server');
+const { Hono } = require('hono');
+
+const app = new Hono();
+
+// 简单路由
+app.get('/test', (c) => {
+  console.log('Handler called');
+  return c.json({ message: 'Hello World' });
+});
+
+const server = serve({
+  fetch: app.fetch,
+  port: 3001
+});
+
+server.on('request', (req) => {
+  console.log('Request:', req.method, req.url);
+});
+
+server.on('error', (err) => {
+  console.error('Server error:', err);
+});
+
+console.log('Server started on port 3001');