foliko 2.0.17 → 2.0.19

package/install.sh

@@ -1,121 +1,121 @@
-#!/bin/bash
-# Foliko Installer
-
-set -e
-
-echo -e "\033[36mFoliko Installer\033[0m"
-echo -e "\033[36m=================\033[0m"
-echo ""
-
-# Detect OS
-detect_os() {
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        echo "macOS"
-    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-        echo "Linux"
-    else
-        echo "unknown"
-    fi
-}
-
-OS=$(detect_os)
-
-# ============ Check/Install Node.js ============
-echo -e "\033[36mChecking Node.js...\033[0m"
-if command -v node &> /dev/null; then
-    echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
-else
-    echo -e "\033[33mNode.js not found, installing...\033[0m"
-
-    if [[ "$OS" == "macOS" ]]; then
-        if command -v brew &> /dev/null; then
-            brew install node
-        else
-            echo -e "\033[31mHomebrew not found. Install it first:\033[0m"
-            echo "/bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""
-            exit 1
-        fi
-    elif [[ "$OS" == "Linux" ]]; then
-        if command -v apt-get &> /dev/null; then
-            sudo apt-get update && sudo apt-get install -y nodejs npm
-        elif command -v yum &> /dev/null; then
-            sudo yum install -y nodejs npm
-        elif command -v pacman &> /dev/null; then
-            sudo pacman -S nodejs npm
-        else
-            echo -e "\033[31mNo package manager found. Install Node.js manually: https://nodejs.org/\033[0m"
-            exit 1
-        fi
-    fi
-
-    if command -v node &> /dev/null; then
-        echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
-    else
-        echo -e "\033[31mNode.js installation failed\033[0m"
-        exit 1
-    fi
-fi
-echo ""
-
-# ============ Check/Install Python ============
-echo -e "\033[36mChecking Python...\033[0m"
-if command -v python3 &> /dev/null; then
-    echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
-else
-    echo -e "\033[33mPython not found, installing...\033[0m"
-
-    if [[ "$OS" == "macOS" ]]; then
-        if command -v brew &> /dev/null; then
-            brew install python3
-        fi
-    elif [[ "$OS" == "Linux" ]]; then
-        if command -v apt-get &> /dev/null; then
-            sudo apt-get update && sudo apt-get install -y python3 python3-venv python3-pip
-        elif command -v yum &> /dev/null; then
-            sudo yum install -y python3
-        elif command -v pacman &> /dev/null; then
-            sudo pacman -S python python-pip
-        fi
-    fi
-
-    if command -v python3 &> /dev/null; then
-        echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
-    else
-        echo -e "\033[33mPython installation failed (optional)\033[0m"
-    fi
-fi
-echo ""
-
-# ============ Check/Install uv ============
-echo -e "\033[36mChecking uv...\033[0m"
-if command -v uv &> /dev/null; then
-    echo -e "\033[32muv installed: $(uv --version)\033[0m"
-else
-    echo -e "\033[33muv not found, installing...\033[0m"
-
-    if [[ "$OS" == "macOS" ]] || [[ "$OS" == "Linux" ]]; then
-        curl -LsSf https://astral.sh/uv/install.sh | sh
-        source $HOME/.local/bin/env 2>/dev/null || true
-
-        if command -v uv &> /dev/null; then
-            echo -e "\033[32muv installed: $(uv --version)\033[0m"
-        else
-            echo -e "\033[33muv installation failed (optional)\033[0m"
-        fi
-    fi
-fi
-echo ""
-
-# ============ Install Foliko ============
-echo -e "\033[36mInstalling Foliko...\033[0m"
-npm install -g foliko
-
-if command -v foliko &> /dev/null; then
-    echo ""
-    echo -e "\033[32mInstallation complete!\033[0m"
-    echo "Run: foliko chat"
-else
-    echo ""
-    echo -e "\033[31mInstallation failed. Try manually: npm install -g foliko\033[0m"
-    exit 1
-fi
+#!/bin/bash
+# Foliko Installer
+
+set -e
+
+echo -e "\033[36mFoliko Installer\033[0m"
+echo -e "\033[36m=================\033[0m"
+echo ""
+
+# Detect OS
+detect_os() {
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        echo "macOS"
+    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        echo "Linux"
+    else
+        echo "unknown"
+    fi
+}
+
+OS=$(detect_os)
+
+# ============ Check/Install Node.js ============
+echo -e "\033[36mChecking Node.js...\033[0m"
+if command -v node &> /dev/null; then
+    echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
+else
+    echo -e "\033[33mNode.js not found, installing...\033[0m"
+
+    if [[ "$OS" == "macOS" ]]; then
+        if command -v brew &> /dev/null; then
+            brew install node
+        else
+            echo -e "\033[31mHomebrew not found. Install it first:\033[0m"
+            echo "/bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""
+            exit 1
+        fi
+    elif [[ "$OS" == "Linux" ]]; then
+        if command -v apt-get &> /dev/null; then
+            sudo apt-get update && sudo apt-get install -y nodejs npm
+        elif command -v yum &> /dev/null; then
+            sudo yum install -y nodejs npm
+        elif command -v pacman &> /dev/null; then
+            sudo pacman -S nodejs npm
+        else
+            echo -e "\033[31mNo package manager found. Install Node.js manually: https://nodejs.org/\033[0m"
+            exit 1
+        fi
+    fi
+
+    if command -v node &> /dev/null; then
+        echo -e "\033[32mNode.js installed: $(node --version)\033[0m"
+    else
+        echo -e "\033[31mNode.js installation failed\033[0m"
+        exit 1
+    fi
+fi
+echo ""
+
+# ============ Check/Install Python ============
+echo -e "\033[36mChecking Python...\033[0m"
+if command -v python3 &> /dev/null; then
+    echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
+else
+    echo -e "\033[33mPython not found, installing...\033[0m"
+
+    if [[ "$OS" == "macOS" ]]; then
+        if command -v brew &> /dev/null; then
+            brew install python3
+        fi
+    elif [[ "$OS" == "Linux" ]]; then
+        if command -v apt-get &> /dev/null; then
+            sudo apt-get update && sudo apt-get install -y python3 python3-venv python3-pip
+        elif command -v yum &> /dev/null; then
+            sudo yum install -y python3
+        elif command -v pacman &> /dev/null; then
+            sudo pacman -S python python-pip
+        fi
+    fi
+
+    if command -v python3 &> /dev/null; then
+        echo -e "\033[32mPython installed: $(python3 --version)\033[0m"
+    else
+        echo -e "\033[33mPython installation failed (optional)\033[0m"
+    fi
+fi
+echo ""
+
+# ============ Check/Install uv ============
+echo -e "\033[36mChecking uv...\033[0m"
+if command -v uv &> /dev/null; then
+    echo -e "\033[32muv installed: $(uv --version)\033[0m"
+else
+    echo -e "\033[33muv not found, installing...\033[0m"
+
+    if [[ "$OS" == "macOS" ]] || [[ "$OS" == "Linux" ]]; then
+        curl -LsSf https://astral.sh/uv/install.sh | sh
+        source $HOME/.local/bin/env 2>/dev/null || true
+
+        if command -v uv &> /dev/null; then
+            echo -e "\033[32muv installed: $(uv --version)\033[0m"
+        else
+            echo -e "\033[33muv installation failed (optional)\033[0m"
+        fi
+    fi
+fi
+echo ""
+
+# ============ Install Foliko ============
+echo -e "\033[36mInstalling Foliko...\033[0m"
+npm install -g foliko
+
+if command -v foliko &> /dev/null; then
+    echo ""
+    echo -e "\033[32mInstallation complete!\033[0m"
+    echo "Run: foliko chat"
+else
+    echo ""
+    echo -e "\033[31mInstallation failed. Try manually: npm install -g foliko\033[0m"
+    exit 1
+fi

package/package.json

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

package/plugins/ambient/ExplorerLoop.js

@@ -234,12 +234,12 @@ class ExplorerLoop {
             // 非事件驱动目标可以完成
             this._goalManager.completeGoal(goal.id)
             this._addActivity('goal_completed', { goalId: goal.id, attempts: goal.attempts })
-            this._notifyUser('目标完成', `目标 "${goal.title}" 已完成（尝试次数：${goal.attempts}）`, 'success')
+            await this._notifyUser('目标完成', `目标 "${goal.title}" 已完成（尝试次数：${goal.attempts}）`, 'success')
           } else if (!outcome.shouldContinue && !isEventDriven) {
             // 非事件驱动目标可以失败
             this._goalManager.failGoal(goal.id, '达到最大尝试次数')
             this._addActivity('goal_failed', { goalId: goal.id, reason: '达到最大尝试次数' })
-            this._notifyUser('目标失败', `目标 "${goal.title}" 失败：达到最大尝试次数`, 'error')
+            await this._notifyUser('目标失败', `目标 "${goal.title}" 失败：达到最大尝试次数`, 'error')
           } else {
             // 事件驱动目标：不论结果如何，都重置并继续等待下一事件
             this._addActivity('actions_completed', { goalId: goal.id, actionCount: results.length })
@@ -250,7 +250,7 @@ class ExplorerLoop {
               // 一次性目标：所有 actions 完成后直接完成
               this._goalManager.completeGoal(goal.id)
               this._addActivity('goal_completed', { goalId: goal.id, reason: '一次性任务执行完成' })
-              this._notifyUser('目标完成', `目标 "${goal.title}" 已完成`, 'success')
+              await this._notifyUser('目标完成', `目标 "${goal.title}" 已完成`, 'success')
             } else if (hasNewEvents) {
               // 持久化目标且有新事件，重置 actions
               this._resetGoalForNextEvent(goal)
@@ -269,7 +269,7 @@ class ExplorerLoop {
             // 一次性目标：所有 actions 完成后直接完成
             this._goalManager.completeGoal(goal.id)
             this._addActivity('goal_completed', { goalId: goal.id, reason: '一次性任务执行完成' })
-            this._notifyUser('目标完成', `目标 "${goal.title}" 已完成`, 'success')
+            await this._notifyUser('目标完成', `目标 "${goal.title}" 已完成`, 'success')
           } else {
             // 持久化目标：等待下一事件
             this._resetGoalForNextEvent(goal)
@@ -281,7 +281,7 @@ class ExplorerLoop {
         if (!hasNewEvents && this._reflector.checkLoopDetection(goal, action.id)) {
           this._addActivity('goal_failed', { goalId: goal.id, reason: '检测到循环' })
           // 通知用户目标失败
-          this._notifyUser('目标失败', `目标 "${goal.title}" 失败：检测到循环（同一操作连续重复）`, 'error')
+          await this._notifyUser('目标失败', `目标 "${goal.title}" 失败：检测到循环（同一操作连续重复）`, 'error')
           continue
         }
 
@@ -298,12 +298,12 @@ class ExplorerLoop {
           this._goalManager.completeGoal(goal.id)
           this._addActivity('goal_completed', { goalId: goal.id, attempts: goal.attempts })
           // 通知用户目标完成
-          this._notifyUser('目标完成', `目标 "${goal.title}" 已完成（尝试次数：${goal.attempts}）`, 'success')
+          await this._notifyUser('目标完成', `目标 "${goal.title}" 已完成（尝试次数：${goal.attempts}）`, 'success')
         } else if (!outcome.shouldContinue) {
           this._goalManager.failGoal(goal.id, '达到最大尝试次数')
           this._addActivity('goal_failed', { goalId: goal.id, reason: '达到最大尝试次数' })
           // 通知用户目标失败
-          this._notifyUser('目标失败', `目标 "${goal.title}" 失败：达到最大尝试次数`, 'error')
+          await this._notifyUser('目标失败', `目标 "${goal.title}" 失败：达到最大尝试次数`, 'error')
         } else {
           this._addActivity('action_executed', { goalId: goal.id, action: action.id, hasEvents: hasNewEvents })
 
@@ -313,7 +313,7 @@ class ExplorerLoop {
             // 一次性目标：所有 actions 完成后直接完成
             this._goalManager.completeGoal(goal.id)
             this._addActivity('goal_completed', { goalId: goal.id, reason: '一次性任务执行完成' })
-            this._notifyUser('目标完成', `目标 "${goal.title}" 已完成`, 'success')
+            await this._notifyUser('目标完成', `目标 "${goal.title}" 已完成`, 'success')
           } else if (hasNewEvents) {
             // 持久化目标且有新事件，重置 actions
             this._resetGoalForNextEvent(goal)
@@ -1019,14 +1019,14 @@ ${lastResultStr}
   /**
    * 通知用户（通过事件发送给消息插件）
    */
-  _notifyUser(title, message, level = 'info') {
+  async _notifyUser(title, message, level = 'info') {
     if (!this._framework) return
 
     // 获取目标相关的sessionId（如果有）
     let sessionId = null
     const sessionPlugin = this._framework.pluginManager.get('session')
     if (sessionPlugin) {
-      const sessions = sessionPlugin.listSessions()
+      const sessions = await sessionPlugin.listSessions()
       if (sessions.length > 0) {
         // 取最新的会话
         sessions.sort((a, b) => new Date(b.lastActive).getTime() - new Date(a.lastActive).getTime())

package/plugins/core/scheduler/index.js

@@ -391,7 +391,7 @@ class SchedulerPlugin extends Plugin {
       if (!targetSessionId) {
         const sessionPlugin = this._framework?.pluginManager?.get('session');
         if (sessionPlugin) {
-          const sessions = sessionPlugin.listSessions();
+          const sessions = await sessionPlugin.listSessions();
           if (sessions.length > 0) {
             sessions.sort((a, b) => {
               const aTime = a.lastActive ? new Date(a.lastActive).getTime() : 0;

package/plugins/core/session/index.js

@@ -84,6 +84,7 @@ class SessionPlugin extends Plugin {
         try {
           const manager = SessionManager.open(filePath, sessionDir, cwd);
           sessions.push({
+            id:path.basename(filePath, path.extname(filePath)),
             sessionId: manager.getSessionId(),
             sessionFile: manager.getSessionFile(),
             messageCount: manager.getEntries().length,