fr-cli 2.2.5__tar.gz → 2.2.6__tar.gz

{fr_cli-2.2.5/fr_cli.egg-info → fr_cli-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.5
+Version: 2.2.6
 Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT
@@ -37,7 +37,7 @@ Requires-Dist: pyodbc>=4.0.0; extra == "db"
 Requires-Dist: oracledb>=1.3.0; extra == "db"
 Provides-Extra: rag
 Requires-Dist: chromadb>=0.4.0; extra == "rag"
-Requires-Dist: sentence-transformers>=2.2.5; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.0; extra == "rag"
 Provides-Extra: remote
 Requires-Dist: paramiko>=3.0.0; extra == "remote"
 Provides-Extra: spider
@@ -56,7 +56,7 @@ Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"
 Requires-Dist: pyodbc>=4.0.0; extra == "all"
 Requires-Dist: oracledb>=1.3.0; extra == "all"
 Requires-Dist: chromadb>=0.4.0; extra == "all"
-Requires-Dist: sentence-transformers>=2.2.5; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.0; extra == "all"
 Requires-Dist: paramiko>=3.0.0; extra == "all"
 Requires-Dist: selenium>=4.10.0; extra == "all"
 Requires-Dist: bypy; extra == "all"
@@ -71,11 +71,11 @@ Dynamic: license-file
 
 # 凡人打字机 (fr-cli)
 
-基于智谱 AI (ZhipuAI/GLM) 的终极全能终端工具。
+支持多模型（智谱/DeepSeek/Kimi/Qwen/StepFun/MiniMax/讯飞星火）的终极全能终端工具。
 
 ## ✨ 功能特性
 
-- 🤖 **AI 对话**：基于 GLM-4 系列模型的智能对话
+- 🤖 **AI 对话**：支持多模型（智谱 GLM / DeepSeek / Kimi / 通义千问 / StepFun / MiniMax / 讯飞星火）
 - 🧠 **MasterAgent 主控**：自我进化的 ReAct 主控 Agent，自动规划、调用工具、反思进化
 - 🧩 **思维模式**：direct / CoT / ToT / ReAct 四种推理模式切换
 - 📁 **文件沙盒**：安全的虚拟文件系统，支持读写/目录操作
@@ -105,7 +105,7 @@ pip install fr-cli
 fr-cli
 ```
 
-首次运行会引导输入智谱 API Key。
+首次运行会引导输入当前道统的 API Key。
 
 ## 📝 使用示例
 

{fr_cli-2.2.5 → fr_cli-2.2.6}/README.md

@@ -1,10 +1,10 @@
 # 凡人打字机 (fr-cli)
 
-基于智谱 AI (ZhipuAI/GLM) 的终极全能终端工具。
+支持多模型（智谱/DeepSeek/Kimi/Qwen/StepFun/MiniMax/讯飞星火）的终极全能终端工具。
 
 ## ✨ 功能特性
 
-- 🤖 **AI 对话**：基于 GLM-4 系列模型的智能对话
+- 🤖 **AI 对话**：支持多模型（智谱 GLM / DeepSeek / Kimi / 通义千问 / StepFun / MiniMax / 讯飞星火）
 - 🧠 **MasterAgent 主控**：自我进化的 ReAct 主控 Agent，自动规划、调用工具、反思进化
 - 🧩 **思维模式**：direct / CoT / ToT / ReAct 四种推理模式切换
 - 📁 **文件沙盒**：安全的虚拟文件系统，支持读写/目录操作
@@ -34,7 +34,7 @@ pip install fr-cli
 fr-cli
 ```
 
-首次运行会引导输入智谱 API Key。
+首次运行会引导输入当前道统的 API Key。
 
 ## 📝 使用示例
 

{fr_cli-2.2.5 → fr_cli-2.2.6}/fr_cli/README.md

@@ -1,14 +1,14 @@
 # 凡人打字机 (fr-cli)
 
-基于智谱 AI (ZhipuAI / GLM) 的终极全能终端工具。
+支持多模型（智谱/DeepSeek/Kimi/Qwen/StepFun/MiniMax/讯飞星火）的终极全能终端工具。
 
 **🇨🇳 中文简介**
 
-支持：AI 智能对话、MasterAgent 自我进化主控、思维模式切换（direct/CoT/ToT/ReAct）、文件沙盒操作、联网搜索（SSRF 防护）、图片生成与识别、邮件收发、定时任务（shlex 安全解析）、云盘集成、会话记忆、按日期自动存档、插件进化（子进程隔离）、四阶安全拦截、Shell 管道直通 AI。
+支持：多模型 AI 对话（智谱/DeepSeek/Kimi/Qwen/StepFun/MiniMax/讯飞星火）、MasterAgent 自我进化主控、思维模式切换（direct/CoT/ToT/ReAct）、文件沙盒操作、联网搜索（SSRF 防护）、图片生成与识别、邮件收发、定时任务（shlex 安全解析）、云盘集成、会话记忆、按日期自动存档、插件进化（子进程隔离）、四阶安全拦截、Shell 管道直通 AI。
 
 **🇺🇸 English Intro**
 
-The ultimate all-knowing terminal tool based on Zhipu AI. Supports AI chat, MasterAgent self-evolving controller, thinking modes (direct/CoT/ToT/ReAct), virtual filesystem, web search (SSRF-protected), image generation & vision, email, cron jobs (shlex-safe), cloud drive, session memory, auto date-based archiving, self-evolving plugins (subprocess-isolated), and powerful Shell piping.
+The ultimate all-knowing terminal tool supporting multiple LLM providers (Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark). Supports AI chat, MasterAgent self-evolving controller, thinking modes (direct/CoT/ToT/ReAct), virtual filesystem, web search (SSRF-protected), image generation & vision, email, cron jobs (shlex-safe), cloud drive, session memory, auto date-based archiving, self-evolving plugins (subprocess-isolated), and powerful Shell piping.
 
 ---
 
@@ -19,7 +19,7 @@ pip install fr-cli
 fr-cli
 ```
 
-首次运行会引导输入智谱 API Key。
+首次运行会引导输入当前道统的 API Key。
 
 ## 🎮 使用方式
 
@@ -41,6 +41,13 @@ fr-cli
 /session_load <idx>  加载存档会话
 /mode direct|cot|tot|react  切换思维模式
 /master on|off|status        MasterAgent 主控
+/model <模型名>              切换当前道统模型
+/model <道统>:<模型名>       同时切换道统和模型
+/key <key>                   修改当前道统 API Key
+/key <道统> <key>            为指定道统设置 Key
+/providers                   查看所有道统配置
+/providers add <p> <k> [m]   添加/更新道统配置
+/providers use <p>           切换到指定道统
 /mcp_list          列出 MCP 服务器及工具
 /mcp_add <名> <命令> [参数]  添加 MCP 服务器
 /mcp_del <名>      删除 MCP 服务器

{fr_cli-2.2.5 → fr_cli-2.2.6}/fr_cli/__init__.py

@@ -1,4 +1,4 @@
 """
 凡人打字机 - 基于智谱AI的终极全能终端工具
 """
-__version__ = "2.2.5"
+__version__ = "2.2.6"

{fr_cli-2.2.5 → fr_cli-2.2.6/fr_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.5
+Version: 2.2.6
 Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT
@@ -37,7 +37,7 @@ Requires-Dist: pyodbc>=4.0.0; extra == "db"
 Requires-Dist: oracledb>=1.3.0; extra == "db"
 Provides-Extra: rag
 Requires-Dist: chromadb>=0.4.0; extra == "rag"
-Requires-Dist: sentence-transformers>=2.2.5; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.0; extra == "rag"
 Provides-Extra: remote
 Requires-Dist: paramiko>=3.0.0; extra == "remote"
 Provides-Extra: spider
@@ -56,7 +56,7 @@ Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"
 Requires-Dist: pyodbc>=4.0.0; extra == "all"
 Requires-Dist: oracledb>=1.3.0; extra == "all"
 Requires-Dist: chromadb>=0.4.0; extra == "all"
-Requires-Dist: sentence-transformers>=2.2.5; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.0; extra == "all"
 Requires-Dist: paramiko>=3.0.0; extra == "all"
 Requires-Dist: selenium>=4.10.0; extra == "all"
 Requires-Dist: bypy; extra == "all"
@@ -71,11 +71,11 @@ Dynamic: license-file
 
 # 凡人打字机 (fr-cli)
 
-基于智谱 AI (ZhipuAI/GLM) 的终极全能终端工具。
+支持多模型（智谱/DeepSeek/Kimi/Qwen/StepFun/MiniMax/讯飞星火）的终极全能终端工具。
 
 ## ✨ 功能特性
 
-- 🤖 **AI 对话**：基于 GLM-4 系列模型的智能对话
+- 🤖 **AI 对话**：支持多模型（智谱 GLM / DeepSeek / Kimi / 通义千问 / StepFun / MiniMax / 讯飞星火）
 - 🧠 **MasterAgent 主控**：自我进化的 ReAct 主控 Agent，自动规划、调用工具、反思进化
 - 🧩 **思维模式**：direct / CoT / ToT / ReAct 四种推理模式切换
 - 📁 **文件沙盒**：安全的虚拟文件系统，支持读写/目录操作
@@ -105,7 +105,7 @@ pip install fr-cli
 fr-cli
 ```
 
-首次运行会引导输入智谱 API Key。
+首次运行会引导输入当前道统的 API Key。
 
 ## 📝 使用示例
 

{fr_cli-2.2.5 → fr_cli-2.2.6}/fr_cli.egg-info/SOURCES.txt

@@ -66,17 +66,4 @@ fr_cli/weapon/loader.py
 fr_cli/weapon/mail.py
 fr_cli/weapon/mcp.py
 fr_cli/weapon/vision.py
-fr_cli/weapon/web.py
-tests/test_agent_client.py
-tests/test_agent_server.py
-tests/test_ai_save_file_with_verify.py
-tests/test_all.py
-tests/test_auto_session.py
-tests/test_builtins.py
-tests/test_dataframe.py
-tests/test_gatekeeper.py
-tests/test_integration.py
-tests/test_intent_classification.py
-tests/test_launcher.py
-tests/test_master_agent.py
-tests/test_structured_tools.py
+fr_cli/weapon/web.py

{fr_cli-2.2.5 → fr_cli-2.2.6}/fr_cli.egg-info/requires.txt

@@ -11,7 +11,7 @@ psycopg2-binary>=2.9.0
 pyodbc>=4.0.0
 oracledb>=1.3.0
 chromadb>=0.4.0
-sentence-transformers>=2.2.5
+sentence-transformers>=2.2.0
 paramiko>=3.0.0
 selenium>=4.10.0
 bypy
@@ -44,7 +44,7 @@ watchdog>=3.0.0
 
 [rag]
 chromadb>=0.4.0
-sentence-transformers>=2.2.5
+sentence-transformers>=2.2.0
 
 [remote]
 paramiko>=3.0.0

{fr_cli-2.2.5 → fr_cli-2.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fr-cli"
-version = "2.2.5"
+version = "2.2.6"
 description = "凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -38,7 +38,7 @@ dependencies = [
 [project.optional-dependencies]
 data = ["pandas>=1.5.0", "openpyxl>=3.0.0"]
 db = ["pymysql>=1.0.0", "psycopg2-binary>=2.9.0", "pyodbc>=4.0.0", "oracledb>=1.3.0"]
-rag = ["chromadb>=0.4.0", "sentence-transformers>=2.2.5"]
+rag = ["chromadb>=0.4.0", "sentence-transformers>=2.2.0"]
 remote = ["paramiko>=3.0.0"]
 spider = ["selenium>=4.10.0"]
 cloud = ["bypy", "aligo", "msal"]
@@ -46,7 +46,7 @@ monitor = ["watchdog>=3.0.0"]
 all = [
     "pandas>=1.5.0", "openpyxl>=3.0.0",
     "pymysql>=1.0.0", "psycopg2-binary>=2.9.0", "pyodbc>=4.0.0", "oracledb>=1.3.0",
-    "chromadb>=0.4.0", "sentence-transformers>=2.2.5",
+    "chromadb>=0.4.0", "sentence-transformers>=2.2.0",
     "paramiko>=3.0.0",
     "selenium>=4.10.0",
     "bypy", "aligo", "msal",

fr_cli-2.2.5/tests/test_agent_client.py

@@ -1,199 +0,0 @@
-"""
-Agent 客户端测试 —— 本地/远程 Agent 调用与发现
-"""
-import json
-import tempfile
-import unittest
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-
-class MockState:
-    def __init__(self):
-        self.client = MagicMock()
-        self.model_name = "glm-4-flash"
-        self.lang = "zh"
-        self.executor = MagicMock()
-
-
-class TestAgentRemote(unittest.TestCase):
-    """测试远程 Agent 配置管理"""
-
-    def setUp(self):
-        self.tmpdir = tempfile.TemporaryDirectory()
-        from fr_cli.agent import remote as remote_mod
-        self._orig_file = remote_mod.REMOTE_AGENTS_FILE
-        remote_mod.REMOTE_AGENTS_FILE = Path(self.tmpdir.name) / "remote_agents.json"
-
-    def tearDown(self):
-        self.tmpdir.cleanup()
-        from fr_cli.agent import remote as remote_mod
-        remote_mod.REMOTE_AGENTS_FILE = self._orig_file
-
-    def test_add_and_list_remote_agent(self):
-        from fr_cli.agent.remote import add_remote_agent, list_remote_agents
-        add_remote_agent("data_analyst", "192.168.1.100", 8080, "tok123", "数据分析助手")
-        agents = list_remote_agents()
-        self.assertIn("data_analyst", agents)
-        self.assertEqual(agents["data_analyst"]["host"], "192.168.1.100")
-        self.assertEqual(agents["data_analyst"]["port"], 8080)
-        self.assertEqual(agents["data_analyst"]["token"], "tok123")
-
-    def test_remove_remote_agent(self):
-        from fr_cli.agent.remote import add_remote_agent, remove_remote_agent, list_remote_agents
-        add_remote_agent("test_agent", "127.0.0.1", 9090, "abc")
-        self.assertTrue(remove_remote_agent("test_agent"))
-        self.assertEqual(list_remote_agents(), {})
-        self.assertFalse(remove_remote_agent("not_exist"))
-
-    def test_get_remote_agent(self):
-        from fr_cli.agent.remote import add_remote_agent, get_remote_agent
-        add_remote_agent("web_crawler", "10.0.0.5", 17890, "secret", "爬虫助手")
-        cfg = get_remote_agent("web_crawler")
-        self.assertIsNotNone(cfg)
-        self.assertEqual(cfg["port"], 17890)
-        self.assertIsNone(get_remote_agent("not_exist"))
-
-
-class TestAgentClient(unittest.TestCase):
-    """测试 Agent API 客户端"""
-
-    def test_discover_all_agents(self):
-        from fr_cli.agent.client import discover_all_agents
-        agents = discover_all_agents()
-        # 返回列表格式检查
-        self.assertIsInstance(agents, list)
-        for a in agents:
-            self.assertIn("name", a)
-            self.assertIn("type", a)
-            self.assertIn(a["type"], ("local", "remote"))
-
-    def test_call_local_agent_not_found(self):
-        from fr_cli.agent.client import call_agent
-        state = MockState()
-        result, err = call_agent("nonexistent_agent_xyz", state, user_input="hello")
-        self.assertIsNone(result)
-        self.assertIn("未找到", err)
-
-    @patch("fr_cli.agent.client.urllib.request.urlopen")
-    def test_call_remote_agent_success(self, mock_urlopen):
-        from fr_cli.agent.client import call_remote_agent
-        mock_resp = MagicMock()
-        mock_resp.read.return_value = json.dumps({"result": "远程分析完成", "error": None}).encode()
-        mock_urlopen.return_value.__enter__.return_value = mock_resp
-
-        cfg = {"host": "192.168.1.50", "port": 8080, "token": "tok456"}
-        result, err = call_remote_agent("data_bot", "分析销售数据", cfg)
-        self.assertEqual(result, "远程分析完成")
-        self.assertIsNone(err)
-
-        # 验证请求构造
-        req = mock_urlopen.call_args[0][0]
-        self.assertEqual(req.full_url, "http://192.168.1.50:8080/agents/data_bot/run")
-        self.assertEqual(req.headers.get("Authorization"), "Bearer tok456")
-
-    @patch("fr_cli.agent.client.urllib.request.urlopen")
-    def test_call_remote_agent_http_error(self, mock_urlopen):
-        from fr_cli.agent.client import call_remote_agent
-        from urllib.error import HTTPError
-        mock_urlopen.side_effect = HTTPError(
-            "http://test/agents/x/run", 401, "Unauthorized", {}, None
-        )
-        cfg = {"host": "test", "port": 80, "token": "bad"}
-        result, err = call_remote_agent("x", "hi", cfg)
-        self.assertIsNone(result)
-        self.assertIn("401", err)
-
-    @patch("fr_cli.agent.client.urllib.request.urlopen")
-    def test_scan_remote_host(self, mock_urlopen):
-        from fr_cli.agent.client import scan_remote_host
-
-        def _make_resp(data_dict):
-            m = MagicMock()
-            m.read.return_value = json.dumps(data_dict).encode("utf-8")
-            m.__enter__ = MagicMock(return_value=m)
-            m.__exit__ = MagicMock(return_value=False)
-            return m
-
-        def mock_response(req, timeout=None):
-            url = req.full_url
-            if "capabilities" in url:
-                return _make_resp({
-                    "service": "fr-cli-agent-api",
-                    "version": "2.2.0",
-                    "agents": [],
-                    "endpoints": {},
-                })
-            elif "agents" in url:
-                return _make_resp({
-                    "agents": [{"name": "coder", "has_persona": True, "has_skills": True}],
-                })
-            return _make_resp({})
-
-        mock_urlopen.side_effect = mock_response
-        info, err = scan_remote_host("192.168.1.10", 8080, "tok")
-        self.assertIsNone(err)
-        self.assertEqual(info["service"], "fr-cli-agent-api")
-        self.assertEqual(len(info["agents"]), 1)
-        self.assertEqual(info["agents"][0]["name"], "coder")
-
-    @patch("fr_cli.agent.client.urllib.request.urlopen")
-    def test_scan_remote_host_failure(self, mock_urlopen):
-        from fr_cli.agent.client import scan_remote_host
-        from urllib.error import URLError
-        mock_urlopen.side_effect = URLError("Connection refused")
-        info, err = scan_remote_host("bad_host", 9999, "tok")
-        self.assertIsNone(info)
-        self.assertIn("Connection refused", err)
-
-    @patch("fr_cli.agent.client.urllib.request.urlopen")
-    def test_import_remote_agents(self, mock_urlopen):
-        from fr_cli.agent.client import import_remote_agents
-        import tempfile
-        from fr_cli.agent import remote as remote_mod
-
-        tmpdir = tempfile.TemporaryDirectory()
-        orig_file = remote_mod.REMOTE_AGENTS_FILE
-        remote_mod.REMOTE_AGENTS_FILE = Path(tmpdir.name) / "remote.json"
-
-        def _make_resp(data_dict):
-            m = MagicMock()
-            m.read.return_value = json.dumps(data_dict).encode("utf-8")
-            m.__enter__ = MagicMock(return_value=m)
-            m.__exit__ = MagicMock(return_value=False)
-            return m
-
-        def mock_response(req, timeout=None):
-            url = req.full_url
-            if "capabilities" in url:
-                return _make_resp({
-                    "service": "fr-cli-agent-api",
-                    "version": "2.2.0",
-                    "agents": [],
-                })
-            elif "agents" in url:
-                return _make_resp({
-                    "agents": [
-                        {"name": "writer", "has_persona": True},
-                        {"name": "coder", "has_persona": True},
-                    ],
-                })
-            return _make_resp({})
-
-        mock_urlopen.side_effect = mock_response
-        imported, errors = import_remote_agents("10.0.0.1", 9090, "abc", prefix="team")
-        self.assertEqual(imported, 2)
-        self.assertEqual(len(errors), 0)
-
-        # 验证已写入配置
-        agents = remote_mod.list_remote_agents()
-        self.assertIn("team_writer", agents)
-        self.assertIn("team_coder", agents)
-        self.assertEqual(agents["team_writer"]["host"], "10.0.0.1")
-
-        remote_mod.REMOTE_AGENTS_FILE = orig_file
-        tmpdir.cleanup()
-
-
-if __name__ == "__main__":
-    unittest.main()

fr_cli-2.2.5/tests/test_agent_server.py

@@ -1,199 +0,0 @@
-"""
-测试 Agent HTTP 服务功能
-"""
-import json
-import threading
-import time
-import unittest
-from types import SimpleNamespace
-from unittest.mock import MagicMock, patch
-
-from fr_cli.agent.server import AgentHTTPServer, _AgentHTTPHandler
-from fr_cli.agent.manager import create_agent_dir, delete_agent, _agent_dir
-
-
-class MockState:
-    """轻量 mock AppState"""
-    def __init__(self):
-        self.client = MagicMock()
-        self.model_name = "glm-4-flash"
-        self.lang = "zh"
-        self.executor = MagicMock()
-
-
-def _wait_for_server(server, timeout=2):
-    for _ in range(int(timeout * 10)):
-        if server.is_running():
-            return True
-        time.sleep(0.1)
-    return False
-
-
-class TestAgentHTTPServer(unittest.TestCase):
-
-    def setUp(self):
-        self.state = MockState()
-        self.server = AgentHTTPServer(self.state, host="127.0.0.1", port=0)
-
-    def tearDown(self):
-        if self.server.is_running():
-            self.server.stop()
-
-    def test_start_stop(self):
-        ok, msg = self.server.start()
-        self.assertTrue(ok, msg)
-        self.assertTrue(self.server.is_running())
-        ok2, msg2 = self.server.stop()
-        self.assertTrue(ok2, msg2)
-        self.assertFalse(self.server.is_running())
-
-    def test_double_start(self):
-        self.server.start()
-        ok, msg = self.server.start()
-        self.assertFalse(ok)
-        self.assertIn("已在运行", msg)
-        self.server.stop()
-
-    def test_status(self):
-        self.assertIn("未运行", self.server.status())
-        self.server.start()
-        self.assertIn("运行中", self.server.status())
-        self.server.stop()
-
-
-class TestAgentHTTPHandler(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.state = MockState()
-        cls.server = AgentHTTPServer(cls.state, host="127.0.0.1", port=0)
-        cls.server.start()
-        _wait_for_server(cls.server)
-        cls.port = cls.server._server.server_address[1]
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.server.stop()
-
-    def _request(self, method, path, data=None):
-        import http.client
-        conn = http.client.HTTPConnection("127.0.0.1", self.port)
-        body = json.dumps(data) if data else None
-        headers = {"Content-Type": "application/json"} if body else {}
-        headers["Authorization"] = f"Bearer {self.server._token}"
-        conn.request(method, path, body=body, headers=headers)
-        resp = conn.getresponse()
-        status = resp.status
-        resp_body = resp.read().decode("utf-8")
-        conn.close()
-        return status, json.loads(resp_body) if resp_body else {}
-
-    def test_health(self):
-        status, data = self._request("GET", "/health")
-        self.assertEqual(status, 200)
-        self.assertEqual(data["status"], "ok")
-
-    def test_agents_list(self):
-        status, data = self._request("GET", "/agents")
-        self.assertEqual(status, 200)
-        self.assertIn("agents", data)
-
-    def test_agent_not_found(self):
-        status, data = self._request("GET", "/agents/nonexistent_agent_12345")
-        self.assertEqual(status, 404)
-        self.assertIn("error", data)
-
-    def test_unauthorized_without_token(self):
-        import http.client
-        conn = http.client.HTTPConnection("127.0.0.1", self.port)
-        conn.request("GET", "/agents")
-        resp = conn.getresponse()
-        self.assertEqual(resp.status, 401)
-        conn.close()
-
-    def test_capabilities_endpoint(self):
-        status, data = self._request("GET", "/capabilities")
-        self.assertEqual(status, 200)
-        self.assertEqual(data["service"], "fr-cli-agent-api")
-        self.assertIn("agents", data)
-        self.assertIn("endpoints", data)
-
-    def test_cors_preflight(self):
-        import http.client
-        conn = http.client.HTTPConnection("127.0.0.1", self.port)
-        conn.request("OPTIONS", "/agents", headers={
-            "Authorization": f"Bearer {self.server._token}",
-            "Origin": "http://example.com",
-        })
-        resp = conn.getresponse()
-        self.assertEqual(resp.status, 204)
-        conn.close()
-
-    def test_ip_whitelist_block(self):
-        # 设置一个不可能匹配的 IP 白名单
-        self.server.set_ip_whitelist(["1.2.3.4"])
-        import http.client
-        conn = http.client.HTTPConnection("127.0.0.1", self.port)
-        conn.request("GET", "/health", headers={
-            "Authorization": f"Bearer {self.server._token}",
-        })
-        resp = conn.getresponse()
-        self.assertEqual(resp.status, 403)
-        conn.close()
-        # 恢复
-        self.server.set_ip_whitelist([])
-
-    def test_publish_info(self):
-        info = self.server.get_publish_info()
-        self.assertIsNotNone(info)
-        self.assertIn("url", info)
-        self.assertIn("token", info)
-        self.assertEqual(info["token"], self.server._token)
-
-
-class TestAgentHTTPRun(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.agent_name = "__test_http_agent__"
-        d = create_agent_dir(cls.agent_name)
-        (d / "agent.py").write_text("def run(ctx, **kwargs): return 'hello from ' + ctx['agent_name']", encoding="utf-8")
-        cls.state = MockState()
-        cls.server = AgentHTTPServer(cls.state, host="127.0.0.1", port=0)
-        cls.server.start()
-        _wait_for_server(cls.server)
-        cls.port = cls.server._server.server_address[1]
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.server.stop()
-        delete_agent(cls.agent_name)
-
-    def _request(self, method, path, data=None):
-        import http.client
-        conn = http.client.HTTPConnection("127.0.0.1", self.port)
-        body = json.dumps(data) if data else None
-        headers = {"Content-Type": "application/json"} if body else {}
-        headers["Authorization"] = f"Bearer {self.server._token}"
-        conn.request(method, path, body=body, headers=headers)
-        resp = conn.getresponse()
-        status = resp.status
-        resp_body = resp.read().decode("utf-8")
-        conn.close()
-        return status, json.loads(resp_body) if resp_body else {}
-
-    def test_run_agent(self):
-        status, data = self._request("POST", f"/agents/{self.agent_name}/run", {"input": "hi"})
-        self.assertEqual(status, 200)
-        self.assertIn("hello from", data["result"])
-        self.assertIsNone(data["error"])
-
-    def test_get_agent_info(self):
-        status, data = self._request("GET", f"/agents/{self.agent_name}")
-        self.assertEqual(status, 200)
-        self.assertEqual(data["name"], self.agent_name)
-        self.assertFalse(data["has_workflow"])
-
-
-if __name__ == "__main__":
-    unittest.main()