fr-cli 2.3.1__tar.gz → 2.3.3__tar.gz

{fr_cli-2.3.1/fr_cli.egg-info → fr_cli-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.3.1
+Version: 2.3.3
 Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark/Doubao/MiMo)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT

fr_cli-2.3.3/fr_cli/agent/hermes_daemon.py

@@ -0,0 +1,199 @@
+#!/usr/bin/env python3
+"""
+Hermes 守护进程 - 后台服务接收终端命令
+用法: /hermes start
+"""
+
+import os
+import sys
+import json
+import time
+import subprocess
+import threading
+from http.server import HTTPServer, BaseHTTPRequestHandler
+
+class HermesDaemon:
+    """Hermes 守护进程 - 后台服务"""
+
+    def __init__(self, port=8765, host="127.0.0.1"):
+        self.port = port
+        self.host = host
+        self.tasks = []
+        self.skills = []
+        self.goals = []
+        self.analytics = {"requests": 0, "tokens": 0, "cost": 0.0}
+        self.running = True
+
+    def start(self):
+        """启动守护进程"""
+        server = HTTPServer((self.host, self.port), HermesHandler)
+        server.daemon = self
+        print(f"🧚 Hermes 守护进程已启动: http://{self.host}:{self.port}")
+        print("📡 监听命令中...")
+
+        while self.running:
+            try:
+                server.handle_request()
+            except Exception:
+                pass
+
+
+class HermesHandler(BaseHTTPRequestHandler):
+    """HTTP 请求处理器"""
+
+    def log_message(self, format, *args):
+        pass
+
+    def send_json(self, status, data):
+        self.send_response(status)
+        self.send_header("Content-Type", "application/json")
+        self.end_headers()
+        self.wfile.write(json.dumps(data, ensure_ascii=False).encode())
+
+    def do_GET(self):
+        daemon = self.server.daemon
+
+        if self.path == "/health":
+            self.send_json(200, {"status": "ok", "daemon": "hermes", "version": "2.3.2"})
+        elif self.path == "/info":
+            self.send_json(200, {
+                "daemon": "hermes",
+                "version": "2.3.2",
+                "tasks": len(daemon.tasks),
+                "skills": len(daemon.skills),
+                "goals": len(daemon.goals),
+                "analytics": daemon.analytics
+            })
+        elif self.path == "/tasks":
+            self.send_json(200, {"tasks": daemon.tasks})
+        elif self.path == "/skills":
+            self.send_json(200, {"skills": daemon.skills})
+        elif self.path == "/goals":
+            self.send_json(200, {"goals": daemon.goals})
+        elif self.path == "/analytics":
+            self.send_json(200, daemon.analytics)
+        elif self.path == "/capabilities":
+            self.send_json(200, {
+                "endpoints": [
+                    {"method": "GET", "path": "/health", "desc": "健康检查"},
+                    {"method": "GET", "path": "/info", "desc": "守护进程信息"},
+                    {"method": "GET", "path": "/tasks", "desc": "任务列表"},
+                    {"method": "POST", "path": "/task", "desc": "添加任务", "body": {"task": "任务描述"}},
+                    {"method": "GET", "path": "/skills", "desc": "技能列表"},
+                    {"method": "POST", "path": "/skill", "desc": "添加技能", "body": {"name": "名称", "content": "内容"}},
+                    {"method": "GET", "path": "/goals", "desc": "目标列表"},
+                    {"method": "POST", "path": "/goal", "desc": "设置目标", "body": {"description": "目标", "milestones": ["阶段1", "阶段2"]}},
+                    {"method": "PUT", "path": "/goal/progress", "desc": "更新进度", "body": {"id": "目标ID", "progress": 0.5}},
+                    {"method": "GET", "path": "/analytics", "desc": "使用统计"},
+                    {"method": "POST", "path": "/execute", "desc": "执行命令", "body": {"command": "ls -la"}},
+                    {"method": "POST", "path": "/chat", "desc": "AI 对话", "body": {"message": "你好"}},
+                ]
+            })
+        else:
+            self.send_json(404, {"error": "Not Found", "hint": "访问 /capabilities 查看所有端点"})
+
+    def do_POST(self):
+        daemon = self.server.daemon
+        length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(length).decode() if length > 0 else "{}"
+        data = json.loads(body) if body else {}
+
+        if self.path == "/task":
+            task_id = f"task-{int(time.time())}"
+            daemon.tasks.append({
+                "id": task_id,
+                "task": data.get("task", ""),
+                "status": "pending",
+                "created_at": time.strftime("%Y-%m-%d %H:%M")
+            })
+            self.send_json(200, {"id": task_id, "status": "queued"})
+
+        elif self.path == "/skill":
+            skill_id = f"skill-{int(time.time())}"
+            daemon.skills.append({
+                "id": skill_id,
+                "name": data.get("name", ""),
+                "content": data.get("content", ""),
+                "tags": data.get("tags", []),
+                "created_at": time.strftime("%Y-%m-%d %H:%M")
+            })
+            self.send_json(200, {"id": skill_id, "status": "added"})
+
+        elif self.path == "/goal":
+            goal_id = f"goal-{int(time.time())}"
+            daemon.goals.append({
+                "id": goal_id,
+                "description": data.get("description", ""),
+                "milestones": data.get("milestones", []),
+                "progress": 0,
+                "status": "active",
+                "created_at": time.strftime("%Y-%m-%d %H:%M")
+            })
+            self.send_json(200, {"id": goal_id, "status": "created"})
+
+        elif self.path == "/execute":
+            cmd = data.get("command", "")
+            try:
+                result = subprocess.run(cmd, shell=True, capture_output=True, text=True, timeout=30)
+                self.send_json(200, {
+                    "output": result.stdout,
+                    "error": result.stderr,
+                    "returncode": result.returncode,
+                    "duration": f"{result.returncode}s"
+                })
+            except Exception as e:
+                self.send_json(500, {"error": str(e)})
+
+        elif self.path == "/chat":
+            message = data.get("message", "")
+            daemon.analytics["requests"] += 1
+            self.send_json(200, {
+                "reply": f"[Hermes] 收到消息: {message[:50]}...",
+                "task_id": f"task-{int(time.time())}",
+                "model": "hermes-ai"
+            })
+
+        elif self.path == "/analytics":
+            daemon.analytics["requests"] += data.get("requests", 0)
+            daemon.analytics["tokens"] += data.get("tokens", 0)
+            daemon.analytics["cost"] += data.get("cost", 0.0)
+            self.send_json(200, {"status": "recorded", "analytics": daemon.analytics})
+
+        else:
+            self.send_json(404, {"error": "Not Found"})
+
+    def do_PUT(self):
+        daemon = self.server.daemon
+        length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(length).decode() if length > 0 else "{}"
+        data = json.loads(body) if body else {}
+
+        if self.path == "/goal/progress":
+            goal_id = data.get("id")
+            for goal in daemon.goals:
+                if goal.get("id") == goal_id:
+                    goal["progress"] = data.get("progress", 0)
+                    goal["updated_at"] = time.strftime("%Y-%m-%d %H:%M")
+                    self.send_json(200, {"status": "updated", "goal": goal})
+                    return
+            self.send_json(404, {"error": "Goal not found"})
+        else:
+            self.send_json(404, {"error": "Not Found"})
+
+
+def main():
+    import argparse
+    parser = argparse.ArgumentParser(description="Hermes 守护进程")
+    parser.add_argument("--port", type=int, default=8765)
+    parser.add_argument("--host", default="127.0.0.1")
+    args = parser.parse_args()
+
+    daemon = HermesDaemon(port=args.port, host=args.host)
+    try:
+        daemon.start()
+    except KeyboardInterrupt:
+        daemon.stop()
+
+
+if __name__ == "__main__":
+    main()

{fr_cli-2.3.1 → fr_cli-2.3.3}/fr_cli/core/core.py

@@ -38,7 +38,7 @@ class AppState:
         self.security = SecurityManager(self.lang, cfg)
 
         # MCP 法宝管理器
-        self.mcp = MCPManager(cfg)
+        self.mcp = MCPManager()
 
         # 运行时消息与上下文
         self.messages = []

{fr_cli-2.3.1 → fr_cli-2.3.3}/fr_cli/main.py

@@ -42,6 +42,8 @@ def _sync_manual_to_workspace(vfs):
 
 from fr_cli.repl.commands import (
     _cmd_exit,
+    _cmd_shell,
+    _cmd_hermes_daemon,
     _cmd_help,
     _cmd_model,
     _cmd_key,
@@ -101,6 +103,8 @@ from fr_cli.repl.commands import (
 
 _COMMAND_ROUTES = {
     "/exit": _cmd_exit,
+    "/shell": _cmd_shell,
+    "/hermes": _cmd_hermes_daemon,
     "/quit": _cmd_exit,
     "/help": _cmd_help,
     "/model": _cmd_model,

{fr_cli-2.3.1 → fr_cli-2.3.3}/fr_cli/repl/commands.py

@@ -9,6 +9,7 @@ from fr_cli.ui.ui import (
     CYAN, RED, YELLOW, GREEN, DIM, RESET,
     print_bye
 )
+from fr_cli.agent.shell_mode import ShellMode
 from fr_cli.memory.history import save_sess, load_sess, del_sess, get_sessions
 from fr_cli.memory.context import load_context, extract_recent_turns, build_context_summary, save_context
 from fr_cli.memory.session import (
@@ -70,6 +71,8 @@ def _print_help(state, topic):
         print(f"  {T('help_sess', lang)} /save /load /del /undo")
         print(f"  {DIM}  【岁月】 /session_list | /session_load <编号> | /session_del <编号>{RESET}")
         print(f"  {DIM}  【本命元神】 /master on|off|status — 启用自我进化型主控元神{RESET}")
+        print(f"  {DIM}  【蜗壳】 /shell — 进入 Shell 模式，直接执行命令{RESET}")
+        print(f"  {DIM}  【Hermes】 /hermes start|stop|status — 守护进程{RESET}")
         print(f"  {T('help_plugin', lang)} /skills (自动进化)")
         print(f"  {DIM}  【悟道】 /mode <direct|cot|tot|react> — 切换 AI 推演模式{RESET}")
         print(f"  {T('help_extra', lang)} /mail_* /cron_* /web /fetch /disk_* /see")
@@ -104,6 +107,36 @@ def _cmd_exit(state, parts):
     return True
 
 
+def _cmd_shell(state, parts):
+    """进入 Shell 模式"""
+    from fr_cli.agent.shell_mode import get_shell_manager
+
+    shell_mgr = get_shell_manager()
+    shell_mgr.current_mode = ShellMode.SHELL if shell_mgr.current_mode == ShellMode.AGENT else ShellMode.AGENT
+
+    if shell_mgr.current_mode == ShellMode.SHELL:
+        print(f"{GREEN}🆗 进入 Shell 模式 - 直接执行命令，输入 exit 返回{RESET}")
+        while shell_mgr.current_mode == ShellMode.SHELL:
+            try:
+                cmd = input("(shell) $ ").strip()
+                if not cmd:
+                    continue
+                if cmd in ['exit', 'quit', 'q']:
+                    print(f"{YELLOW}退出 Shell 模式{RESET}")
+                    break
+                output, code = shell_mgr.execute_command(cmd)
+                print(output)
+                if code != 0:
+                    print(f"[exit {code}]")
+            except (EOFError, KeyboardInterrupt):
+                print(f"\n{YELLOW}退出 Shell 模式{RESET}")
+                break
+        shell_mgr.current_mode = ShellMode.AGENT
+    else:
+        print(f"{GREEN}切换回 Agent 模式{RESET}")
+    return False
+
+
 def _cmd_help(state, parts):
     arg1 = parts[1] if len(parts) > 1 else ""
     _print_help(state, arg1.lower())
@@ -530,6 +563,43 @@ def _cmd_update(state, parts):
     return False
 
 
+def _cmd_hermes_daemon(state, parts):
+    """Hermes 守护进程命令"""
+    arg1 = parts[1] if len(parts) > 1 else ""
+
+    if arg1 == "start":
+        port = int(parts[2]) if len(parts) > 2 and parts[2].isdigit() else 8765
+        try:
+            from fr_cli.agent.hermes_daemon import HermesDaemon
+            import threading
+            daemon = HermesDaemon(port=port)
+            state.hermes_daemon = daemon
+            t = threading.Thread(target=daemon.start, daemon=True)
+            t.start()
+            print(f"{GREEN}🧚 Hermes 守护进程已启动: http://127.0.0.1:{port}{RESET}")
+        except Exception as e:
+            print(f"{RED}启动失败: {e}{RESET}")
+
+    elif arg1 == "stop":
+        if hasattr(state, "hermes_daemon") and state.hermes_daemon:
+            state.hermes_daemon.running = False
+            print(f"{GREEN}🛑 守护进程已停止{RESET}")
+        else:
+            print(f"{YELLOW}守护进程未运行{RESET}")
+
+    elif arg1 == "status":
+        if hasattr(state, "hermes_daemon") and state.hermes_daemon:
+            print(f"{CYAN}🧚 守护进程运行中{RESET}")
+            print(f"   端口: {state.hermes_daemon.port}")
+        else:
+            print(f"{DIM}守护进程未运行{RESET}")
+
+    else:
+        print(f"{DIM}用法: /hermes start [port] | /hermes stop | /hermes status{RESET}")
+        print(f"{DIM}示例: /hermes start 8765{RESET}")
+    return False
+
+
 def _cmd_agent_server(state, parts):
     from fr_cli.agent.server import AgentHTTPServer
     arg1 = parts[1] if len(parts) > 1 else ""

{fr_cli-2.3.1 → fr_cli-2.3.3}/fr_cli/weapon/mcp.py

@@ -183,4 +183,6 @@ def get_mcp_manager() -> MCPServerManager:
 
 def load_from_config_file(config_file: str) -> MCPServerManager:
     """从配置文件加载 MCP 服务器"""
-    return MCPServerManager.from_config_file(config_file)
+    return MCPServerManager.from_config_file(config_file)
+
+MCPManager = MCPServerManager

{fr_cli-2.3.1 → fr_cli-2.3.3/fr_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.3.1
+Version: 2.3.3
 Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark/Doubao/MiMo)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT

{fr_cli-2.3.1 → fr_cli-2.3.3}/fr_cli.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ fr_cli/agent/executor.py
 fr_cli/agent/gateway.py
 fr_cli/agent/generator.py
 fr_cli/agent/hermes.py
+fr_cli/agent/hermes_daemon.py
 fr_cli/agent/image_and_parallel.py
 fr_cli/agent/manager.py
 fr_cli/agent/master.py

{fr_cli-2.3.1 → fr_cli-2.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fr-cli"
-version = "2.3.1"
+version = "2.3.3"
 description = "凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark/Doubao/MiMo)的终极全能终端工具"
 readme = "README.md"
 requires-python = ">=3.8"