fr-cli 2.2.8__tar.gz → 2.3.0__tar.gz

{fr_cli-2.2.8/fr_cli.egg-info → fr_cli-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.8
+Version: 2.3.0
 Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark/Doubao/MiMo)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT
@@ -27,6 +27,7 @@ Requires-Dist: zhipuai>=2.0.0
 Requires-Dist: openai>=1.0.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: mcp>=1.6.0
+Requires-Dist: pyyaml>=6.0.0
 Provides-Extra: data
 Requires-Dist: pandas>=1.5.0; extra == "data"
 Requires-Dist: openpyxl>=3.0.0; extra == "data"
@@ -73,6 +74,8 @@ Dynamic: license-file
 
 **支持 27+ 种 AI 模型（智谱/智谱Coding/DeepSeek/Kimi/Kimi K2/Kimi Code/StepFun/Step-3/MiniMax/M2.7/讯飞星火/豆包/MiMo/LongCat）的终极全能终端工具。**
 
+**集成 Hermes Agent 核心功能：自我进化的 AI 助手。**
+
 ## ✨ 功能特性
 
 ### 🤖 多模型支持
@@ -234,7 +237,72 @@ python3 main.py
 /security        查看安全设置
 ```
 
-## 📦 支持的模型提供商（25+）
+## � Hermes 核心功能
+
+### 📋 任务管理
+```
+from fr_cli.agent.hermes import get_task_manager, get_analytics
+
+# 创建任务
+tm = get_task_manager()
+task = tm.create_task("完成代码审查")
+
+# 记录分析
+an = get_analytics()
+an.record_request("glm-4-flash", 1000, 0.01)
+```
+
+### 🎯 目标追踪
+```
+from fr_cli.agent.hermes import GoalTracker
+
+gt = GoalTracker()
+gt.set_goal("完成项目", ["阶段1", "阶段2", "阶段3"])
+gt.update_progress("已完成阶段1", 0.33)
+```
+
+### ⏰ 定时任务
+```
+from fr_cli.agent.hermes import get_cron_scheduler
+
+cron = get_cron_scheduler()
+cron.add_job("daily-report", "0 9 * * *", "生成日报")
+```
+
+### 🔌 插件系统
+```
+from fr_cli.agent.plugin_system import get_plugin_registry
+
+registry = get_plugin_registry()
+plugins = registry.list_all()
+```
+
+### 🐚 Shell 模式 (Ctrl-X 切换)
+```
+Agent 模式: 输入消息与 AI 对话
+Shell 模式: 直接执行 shell 命令
+
+按 Ctrl-X 切换模式
+```
+
+### 🔗 ACP (Agent Client Protocol)
+```bash
+# 启动 ACP 服务
+fr acp
+
+# 配置到 Zed
+# ~/.config/zed/settings.json
+{
+  "agent_servers": {
+    "fr-cli": {
+      "command": "fr",
+      "args": ["acp"]
+    }
+  }
+}
+```
+
+## �📦 支持的模型提供商（25+）
 
 | 道统 | 默认模型 | API 地址 |
 |------|---------|----------|

{fr_cli-2.2.8 → fr_cli-2.3.0}/README.md

@@ -2,6 +2,8 @@
 
 **支持 27+ 种 AI 模型（智谱/智谱Coding/DeepSeek/Kimi/Kimi K2/Kimi Code/StepFun/Step-3/MiniMax/M2.7/讯飞星火/豆包/MiMo/LongCat）的终极全能终端工具。**
 
+**集成 Hermes Agent 核心功能：自我进化的 AI 助手。**
+
 ## ✨ 功能特性
 
 ### 🤖 多模型支持
@@ -163,7 +165,72 @@ python3 main.py
 /security        查看安全设置
 ```
 
-## 📦 支持的模型提供商（25+）
+## � Hermes 核心功能
+
+### 📋 任务管理
+```
+from fr_cli.agent.hermes import get_task_manager, get_analytics
+
+# 创建任务
+tm = get_task_manager()
+task = tm.create_task("完成代码审查")
+
+# 记录分析
+an = get_analytics()
+an.record_request("glm-4-flash", 1000, 0.01)
+```
+
+### 🎯 目标追踪
+```
+from fr_cli.agent.hermes import GoalTracker
+
+gt = GoalTracker()
+gt.set_goal("完成项目", ["阶段1", "阶段2", "阶段3"])
+gt.update_progress("已完成阶段1", 0.33)
+```
+
+### ⏰ 定时任务
+```
+from fr_cli.agent.hermes import get_cron_scheduler
+
+cron = get_cron_scheduler()
+cron.add_job("daily-report", "0 9 * * *", "生成日报")
+```
+
+### 🔌 插件系统
+```
+from fr_cli.agent.plugin_system import get_plugin_registry
+
+registry = get_plugin_registry()
+plugins = registry.list_all()
+```
+
+### 🐚 Shell 模式 (Ctrl-X 切换)
+```
+Agent 模式: 输入消息与 AI 对话
+Shell 模式: 直接执行 shell 命令
+
+按 Ctrl-X 切换模式
+```
+
+### 🔗 ACP (Agent Client Protocol)
+```bash
+# 启动 ACP 服务
+fr acp
+
+# 配置到 Zed
+# ~/.config/zed/settings.json
+{
+  "agent_servers": {
+    "fr-cli": {
+      "command": "fr",
+      "args": ["acp"]
+    }
+  }
+}
+```
+
+## �📦 支持的模型提供商（25+）
 
 | 道统 | 默认模型 | API 地址 |
 |------|---------|----------|

fr_cli-2.3.0/fr_cli/agent/acp.py

@@ -0,0 +1,195 @@
+"""
+ACP (Agent Client Protocol) 支持
+参考 kimi-cli 实现的 ACP 集成
+"""
+
+import os
+import json
+import asyncio
+import subprocess
+from typing import Dict, Optional, Any
+from dataclasses import dataclass
+from enum import Enum
+
+
+class ACPMessageType(Enum):
+    """ACP 消息类型"""
+    REQUEST = "request"
+    RESPONSE = "response"
+    ERROR = "error"
+    STREAM = "stream"
+
+
+@dataclass
+class ACPMessage:
+    """ACP 消息"""
+    id: str
+    type: ACPMessageType
+    method: str
+    params: Dict = None
+    result: Any = None
+    error: str = None
+
+
+class ACPServer:
+    """ACP 服务器 - 作为 Agent 服务端"""
+
+    def __init__(self, name: str = "fr-cli"):
+        self.name = name
+        self.running = False
+        self.port = 8765
+
+    async def start(self, port: int = 8765):
+        """启动 ACP 服务器"""
+        self.port = port
+        self.running = True
+        
+        try:
+            import uvicorn
+            from fastapi import FastAPI
+            from fastapi.websockets import WebSocket
+            
+            app = FastAPI()
+
+            @app.websocket("/acp")
+            async def acp_endpoint(websocket: WebSocket):
+                await websocket.accept()
+                try:
+                    while self.running:
+                        data = await websocket.receive_text()
+                        message = json.loads(data)
+                        
+                        # 处理 ACP 消息
+                        response = await self.handle_message(message)
+                        
+                        if response:
+                            await websocket.send_text(json.dumps(response))
+                except Exception as e:
+                    print(f"ACP 连接错误: {e}")
+
+            config = uvicorn.Config(app, host="127.0.0.1", port=port, log_level="error")
+            server = uvicorn.Server(config)
+            await server.serve()
+
+        except ImportError:
+            print("警告: 需要安装 uvicorn 和 fastapi 来启用 ACP 服务")
+        except Exception as e:
+            print(f"ACP 服务器错误: {e}")
+
+    async def handle_message(self, message: Dict) -> Optional[Dict]:
+        """处理 ACP 消息"""
+        msg_type = message.get("type")
+        
+        if msg_type == "request":
+            method = message.get("method")
+            params = message.get("params", {})
+            
+            if method == "chat":
+                result = await self.chat(params)
+                return {"id": message.get("id"), "type": "response", "result": result}
+            elif method == "tools":
+                return {"id": message.get("id"), "type": "response", "result": self.get_tools()}
+            
+        return None
+
+    async def chat(self, params: Dict) -> str:
+        """处理聊天请求"""
+        from fr_cli.core.core import ask
+        message = params.get("message", "")
+        try:
+            result, _ = await asyncio.to_thread(ask, message)
+            return result
+        except:
+            return "Error processing request"
+
+    def get_tools(self) -> list:
+        """获取可用工具列表"""
+        return [
+            {"name": "bash", "description": "Execute shell commands"},
+            {"name": "read", "description": "Read file contents"},
+            {"name": "write", "description": "Write file contents"},
+            {"name": "search", "description": "Search files"}
+        ]
+
+    def stop(self):
+        """停止 ACP 服务器"""
+        self.running = False
+
+
+class ACPClient:
+    """ACP 客户端 - 连接其他 Agent"""
+
+    def __init__(self, server_url: str):
+        self.server_url = server_url
+        self.ws = None
+
+    async def connect(self):
+        """连接到 ACP 服务器"""
+        try:
+            import websockets
+            self.ws = await websockets.connect(f"{self.server_url}/acp")
+            return True
+        except Exception as e:
+            print(f"ACP 连接失败: {e}")
+            return False
+
+    async def send_message(self, method: str, params: Dict = None) -> Optional[Dict]:
+        """发送消息"""
+        if not self.ws:
+            return None
+
+        message = {
+            "id": str(asyncio.get_event_loop().time()),
+            "type": "request",
+            "method": method,
+            "params": params or {}
+        }
+
+        await self.ws.send(json.dumps(message))
+        response = await self.ws.recv()
+        return json.loads(response)
+
+    async def close(self):
+        """关闭连接"""
+        if self.ws:
+            await self.ws.close()
+
+
+def run_acp_mode():
+    """运行 ACP 模式"""
+    print("""
+╔════════════════════════════════════════════════════╗
+║         ACP (Agent Client Protocol) 模式           ║
+╚════════════════════════════════════════════════════╝
+
+fr-cli 将作为 ACP Agent 服务端运行，
+可与 Zed, VS Code 等 ACP 兼容编辑器集成。
+
+启动命令示例配置:
+
+Zed: ~/.config/zed/settings.json
+{
+  "agent_servers": {
+    "fr-cli": {
+      "command": "fr",
+      "args": ["acp"],
+      "env": {}
+    }
+  }
+}
+""")
+    server = ACPServer(name="fr-cli")
+    asyncio.run(server.start())
+
+
+# CLI 命令
+def main():
+    import sys
+    if len(sys.argv) > 1 and sys.argv[1] == "acp":
+        run_acp_mode()
+    else:
+        print("使用: fr acp 启动 ACP 服务")
+
+
+if __name__ == "__main__":
+    main()

fr_cli-2.3.0/fr_cli/agent/context_files.py

@@ -0,0 +1,159 @@
+"""
+Context Files 系统 - 参考 Hermes Agent 实现
+项目上下文文件，塑造每次对话
+"""
+
+import os
+import glob
+from typing import List, Dict, Optional
+from dataclasses import dataclass
+
+
+@dataclass
+class ContextFile:
+    """上下文文件"""
+    path: str
+    content: str = ""
+    size: int = 0
+    loaded: bool = False
+
+    def load_content(self):
+        """加载文件内容"""
+        if not self.loaded and os.path.exists(self.path):
+            try:
+                with open(self.path, 'r', encoding='utf-8') as f:
+                    self.content = f.read(100000)  # 限制 100KB
+                    self.size = len(self.content)
+                    self.loaded = True
+            except Exception:
+                pass
+
+
+class ContextFilesManager:
+    """上下文文件管理器"""
+
+    def __init__(self, config_dir: str = None):
+        if config_dir is None:
+            config_dir = os.path.expanduser("~/.fr_cli")
+        self.config_dir = config_dir
+        self.context_file = os.path.join(config_dir, "context_files.json")
+        self.patterns: List[str] = []
+        self.exclude_patterns: List[str] = [".git/*", "node_modules/*", "__pycache__/*"]
+        self._load_config()
+
+    def _load_config(self):
+        """加载配置"""
+        if os.path.exists(self.context_file):
+            try:
+                import json
+                with open(self.context_file, 'r', encoding='utf-8') as f:
+                    data = json.load(f)
+                    self.patterns = data.get("patterns", [])
+                    self.exclude_patterns = data.get("exclude", self.exclude_patterns)
+            except Exception:
+                pass
+
+    def _save_config(self):
+        """保存配置"""
+        import json
+        os.makedirs(os.path.dirname(self.context_file), exist_ok=True)
+        with open(self.context_file, 'w', encoding='utf-8') as f:
+            json.dump({
+                "patterns": self.patterns,
+                "exclude": self.exclude_patterns
+            }, f, indent=2)
+
+    def add_pattern(self, pattern: str):
+        """添加匹配模式"""
+        if pattern not in self.patterns:
+            self.patterns.append(pattern)
+            self._save_config()
+
+    def remove_pattern(self, pattern: str):
+        """移除匹配模式"""
+        if pattern in self.patterns:
+            self.patterns.remove(pattern)
+            self._save_config()
+
+    def add_exclude(self, pattern: str):
+        """添加排除模式"""
+        if pattern not in self.exclude_patterns:
+            self.exclude_patterns.append(pattern)
+            self._save_config()
+
+    def get_matching_files(self, root_dir: str = ".") -> List[str]:
+        """获取匹配的文件列表"""
+        files = set()
+
+        for pattern in self.patterns:
+            full_pattern = os.path.join(root_dir, pattern)
+            matched = glob.glob(full_pattern, recursive=True)
+            files.update(matched)
+
+        # 应用排除
+        excluded = set()
+        for exclude in self.exclude_patterns:
+            full_exclude = os.path.join(root_dir, exclude)
+            matched = glob.glob(full_exclude, recursive=True)
+            excluded.update(matched)
+
+        return [f for f in files if f not in excluded]
+
+    def load_context_files(self, root_dir: str = ".") -> List[ContextFile]:
+        """加载所有上下文文件"""
+        files = self.get_matching_files(root_dir)
+        context_files = []
+
+        for filepath in files:
+            cf = ContextFile(path=filepath)
+            cf.load_content()
+            if cf.loaded:
+                context_files.append(cf)
+
+        return context_files
+
+    def build_context_prompt(self, root_dir: str = ".") -> str:
+        """构建上下文提示"""
+        context_files = self.load_context_files(root_dir)
+        if not context_files:
+            return ""
+
+        parts = ["\n\n# 项目上下文\n"]
+
+        for cf in context_files:
+            parts.append(f"\n## {os.path.relpath(cf.path, root_dir)}")
+            parts.append(f"```\n{cf.content}\n```")
+
+        return "\n".join(parts)
+
+    def list_patterns(self) -> Dict:
+        """列出所有模式"""
+        return {
+            "include": self.patterns,
+            "exclude": self.exclude_patterns
+        }
+
+    def set_patterns(self, patterns: List[str]):
+        """设置包含模式"""
+        self.patterns = patterns
+        self._save_config()
+
+    def set_exclude_patterns(self, patterns: List[str]):
+        """设置排除模式"""
+        self.exclude_patterns = patterns
+        self._save_config()
+
+
+# 全局实例
+_context_manager = None
+
+def get_context_manager() -> ContextFilesManager:
+    global _context_manager
+    if _context_manager is None:
+        _context_manager = ContextFilesManager()
+    return _context_manager
+
+
+def build_project_context(root_dir: str = ".") -> str:
+    """构建项目上下文"""
+    return get_context_manager().build_context_prompt(root_dir)