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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.4
+Version: 2.2.5
 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.4; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.5; 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.4; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.5; extra == "all"
 Requires-Dist: paramiko>=3.0.0; extra == "all"
 Requires-Dist: selenium>=4.10.0; extra == "all"
 Requires-Dist: bypy; extra == "all"

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

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

{fr_cli-2.2.4 → fr_cli-2.2.5}/fr_cli/agent/master.py

@@ -20,6 +20,7 @@ from fr_cli.memory.context import extract_recent_turns, build_context_summary, s
 from fr_cli.memory.session import create_session, update_session
 from fr_cli.addon.plugin import extract_code, PLUGIN_DIR
 from fr_cli.ui.ui import RED, YELLOW, GREEN, DIM, RESET
+from fr_cli.lang.i18n import T
 
 MASTER_DIR = Path.home() / ".fr_cli_master"
 PERSONA_FILE = MASTER_DIR / "persona.md"

{fr_cli-2.2.4 → fr_cli-2.2.5}/fr_cli/core/chat.py

@@ -20,6 +20,28 @@ from fr_cli.memory.session import create_session, update_session
 from fr_cli.core.intent import should_force_tool, classify_intent, has_info_fetch_intent, has_save_intent
 
 
+def _fetch_mcp_tools(mcp_manager):
+    """安全获取 MCP 工具列表"""
+    if mcp_manager and hasattr(mcp_manager, "list_all_tools"):
+        try:
+            tools = mcp_manager.list_all_tools()
+            return tools if isinstance(tools, list) else []
+        except Exception:
+            pass
+    return []
+
+
+def _fetch_mcp_desc(mcp_manager):
+    """安全获取 MCP 工具描述文本"""
+    if mcp_manager and hasattr(mcp_manager, "get_server_tools_desc"):
+        try:
+            desc = mcp_manager.get_server_tools_desc()
+            return desc if isinstance(desc, str) and desc else ""
+        except Exception:
+            pass
+    return ""
+
+
 def handle_ai_chat(state, u):
     """处理 AI 正常对话流程"""
     lang = state.lang
@@ -31,14 +53,7 @@ def handle_ai_chat(state, u):
     tools = get_available_tools(state.weapon_tools, state.plugins)
     # 将 MCP 外部神通纳入意图判定视野
     mcp_manager = getattr(state, "mcp", None)
-    mcp_tools_summary = []
-    if mcp_manager and hasattr(mcp_manager, "list_all_tools"):
-        try:
-            _mcp_tools = mcp_manager.list_all_tools()
-            if isinstance(_mcp_tools, list):
-                mcp_tools_summary = _mcp_tools
-        except Exception:
-            pass
+    mcp_tools_summary = _fetch_mcp_tools(mcp_manager)
     if mcp_tools_summary:
         tools.append({
             "name": "mcp_tools",
@@ -74,14 +89,10 @@ def handle_ai_chat(state, u):
             tools_info += f"{i}. {tool['name']}: {tool['description']}\n   可用命令: {', '.join(tool['commands'])}\n"
         # 注入 MCP 外部神通
         mcp_manager = getattr(state, "mcp", None)
-        if mcp_manager and hasattr(mcp_manager, "get_server_tools_desc"):
-            try:
-                mcp_desc = mcp_manager.get_server_tools_desc()
-                if isinstance(mcp_desc, str) and mcp_desc:
-                    tools_info += mcp_desc + "\n"
-                    tools_info += "\n调用 MCP 工具时，请使用格式：【调用：mcp_call({\"server\": \"服务器名\", \"tool\": \"工具名\", \"arguments\": {...}})】\n"
-            except Exception:
-                pass
+        mcp_desc = _fetch_mcp_desc(mcp_manager)
+        if mcp_desc:
+            tools_info += mcp_desc + "\n"
+            tools_info += "\n调用 MCP 工具时，请使用格式：【调用：mcp_call({\"server\": \"服务器名\", \"tool\": \"工具名\", \"arguments\": {...}})】\n"
         # 信息获取规范：当用户需要调用外部信息源时，采用双源回答模式
         if has_info_fetch_intent(u):
             tools_info += """\n

{fr_cli-2.2.4 → fr_cli-2.2.5}/fr_cli/core/intent.py

@@ -66,7 +66,7 @@ def should_force_tool(user_input):
     同时检测中英文关键词，不依赖当前界面语言。"""
     u = user_input.lower()
     for kw in _FORCE_TOOL_KEYWORDS:
-        if kw.lower() in u:
+        if kw in u:
             return True
     return False
 

{fr_cli-2.2.4 → fr_cli-2.2.5}/fr_cli/core/llm.py

@@ -22,6 +22,18 @@ class BaseLLMClient(ABC):
         """
         pass
 
+    @staticmethod
+    def _yield_chunks(response) -> Iterator[dict]:
+        """通用 chunk 解析生成器，供各子类复用"""
+        for chunk in response:
+            content = ""
+            usage = None
+            if chunk.choices and chunk.choices[0].delta:
+                content = chunk.choices[0].delta.content or ""
+            if hasattr(chunk, 'usage') and chunk.usage:
+                usage = chunk.usage.model_dump() if hasattr(chunk.usage, 'model_dump') else vars(chunk.usage)
+            yield {"content": content, "usage": usage}
+
 
 class ZhipuLLMClient(BaseLLMClient):
     """智谱 AI 客户端 (zhipuai SDK)"""
@@ -38,14 +50,7 @@ class ZhipuLLMClient(BaseLLMClient):
             stream=True,
             max_tokens=max_tokens,
         )
-        for chunk in response:
-            content = ""
-            usage = None
-            if chunk.choices and chunk.choices[0].delta:
-                content = chunk.choices[0].delta.content or ""
-            if hasattr(chunk, 'usage') and chunk.usage:
-                usage = chunk.usage.model_dump() if hasattr(chunk.usage, 'model_dump') else vars(chunk.usage)
-            yield {"content": content, "usage": usage}
+        yield from self._yield_chunks(response)
 
 
 class OpenAICompatibleClient(BaseLLMClient):
@@ -66,14 +71,7 @@ class OpenAICompatibleClient(BaseLLMClient):
             stream=True,
             max_tokens=max_tokens,
         )
-        for chunk in response:
-            content = ""
-            usage = None
-            if chunk.choices and chunk.choices[0].delta:
-                content = chunk.choices[0].delta.content or ""
-            if hasattr(chunk, 'usage') and chunk.usage:
-                usage = chunk.usage.model_dump() if hasattr(chunk.usage, 'model_dump') else vars(chunk.usage)
-            yield {"content": content, "usage": usage}
+        yield from self._yield_chunks(response)
 
 
 # 提供商配置表
@@ -140,9 +138,10 @@ def create_llm_client(cfg: dict):
     pcfg = providers_cfg.get(provider, {})
 
     # 向后兼容：如果 providers 中没有当前 provider，从顶层读取 key/model
-    api_key = pcfg.get("key", cfg.get("key", ""))
+    # 使用 'or' 确保空字符串也能正确回退到顶层 key
+    api_key = pcfg.get("key") or cfg.get("key", "")
     default_model = _PROVIDERS.get(provider, _PROVIDERS["zhipu"])["default_model"]
-    model = pcfg.get("model", cfg.get("model", default_model))
+    model = pcfg.get("model") or cfg.get("model", default_model)
 
     info = _PROVIDERS.get(provider, _PROVIDERS["zhipu"])
     client_class = info["client_class"]

{fr_cli-2.2.4 → fr_cli-2.2.5}/fr_cli/main.py

@@ -30,7 +30,6 @@ def _sync_manual_to_workspace(vfs):
             return
         manual_dst = Path(vfs.cwd) / "MANUAL.md"
         if not manual_dst.exists():
-            import shutil
             shutil.copy2(manual_src, manual_dst)
     except Exception:
         pass

{fr_cli-2.2.4 → fr_cli-2.2.5}/fr_cli/repl/commands.py

@@ -10,7 +10,7 @@ from fr_cli.ui.ui import (
     print_bye
 )
 from fr_cli.memory.history import save_sess, load_sess, del_sess, get_sessions
-from fr_cli.memory.context import load_context
+from fr_cli.memory.context import load_context, extract_recent_turns, build_context_summary, save_context
 from fr_cli.memory.session import (
     list_sessions as list_auto_sessions,
     load_session as load_auto_session,
@@ -18,6 +18,7 @@ from fr_cli.memory.session import (
 )
 from fr_cli.addon.plugin import extract_code
 from fr_cli.core.stream import stream_cnt
+from fr_cli.core.sysmon import get_sys_stats
 from fr_cli.agent.manager import (
     create_agent_dir, save_agent_code, save_persona, save_skills,
     save_memory, agent_exists, list_agents, delete_agent,
@@ -26,6 +27,16 @@ from fr_cli.agent.manager import (
 from fr_cli.agent.executor import run_agent
 
 
+def _provider_has_key(state, provider_id):
+    """检查指定道统是否已配置 API Key（zhipu 向后兼容顶层 key）"""
+    providers_cfg = state.cfg.get("providers", {})
+    pcfg = providers_cfg.get(provider_id, {})
+    has_key = bool(pcfg.get("key"))
+    if not has_key and provider_id == "zhipu":
+        has_key = bool(state.cfg.get("key", ""))
+    return has_key
+
+
 def _print_help(state, topic):
     """打印修仙指南"""
     topic_map = {
@@ -104,13 +115,7 @@ def _cmd_model(state, parts):
         if ok:
             print(f"{GREEN}✅ 已切换: [{state.provider}] {state.model_name}{RESET}")
             # 检查新道统是否已配置 API Key，若未配置则引导输入
-            providers_cfg = state.cfg.get("providers", {})
-            pcfg = providers_cfg.get(state.provider, {})
-            # 只检查该道统自己专属的 key；zhipu 向后兼容：未单独配置时回退顶层 key
-            has_key = bool(pcfg.get("key"))
-            if not has_key and state.provider == "zhipu":
-                has_key = bool(state.cfg.get("key", ""))
-            if not has_key:
+            if not _provider_has_key(state, state.provider):
                 print(f"{YELLOW}⚠️ [{state.provider}] 尚未配置 API Key{RESET}")
                 k = input(f"👉 请输入 [{state.provider}] 的 API Key: ").strip()
                 if k:
@@ -128,10 +133,7 @@ def _cmd_model(state, parts):
         providers_cfg = state.cfg.get("providers", {})
         for p in list_providers():
             marker = " 👈 当前" if p["id"] == state.provider else ""
-            pcfg = providers_cfg.get(p["id"], {})
-            has_key = bool(pcfg.get("key"))
-            if not has_key and p["id"] == "zhipu":
-                has_key = bool(state.cfg.get("key", ""))
+            has_key = _provider_has_key(state, p["id"])
             key_status = f"{GREEN}✅ 已配置{RESET}" if has_key else f"{RED}❌ 未配置{RESET}"
             print(f"  {CYAN}{p['id']}{RESET} — {p['name']}{DIM} (默认: {p['default_model']}){RESET} {key_status}{marker}")
         print(f"\n{DIM}用法:{RESET}")
@@ -195,10 +197,7 @@ def _cmd_providers(state, parts):
         from fr_cli.core.llm import list_providers, get_provider_info
         print(f"{CYAN}📜 道统配置总览{RESET}")
         for p in list_providers():
-            pcfg = providers_cfg.get(p["id"], {})
-            has_key = bool(pcfg.get("key"))
-            if not has_key and p["id"] == "zhipu":
-                has_key = bool(state.cfg.get("key", ""))
+            has_key = _provider_has_key(state, p["id"])
             key_status = f"{GREEN}✅{RESET}" if has_key else f"{RED}❌{RESET}"
             model = pcfg.get("model", p["default_model"])
             info = get_provider_info(p["id"])
@@ -263,11 +262,7 @@ def _cmd_providers(state, parts):
         if ok:
             print(f"{GREEN}✅ 已切换到: [{state.provider}] {state.model_name}{RESET}")
             # 检查新道统是否已配置 API Key
-            pcfg = providers_cfg.get(state.provider, {})
-            has_key = bool(pcfg.get("key"))
-            if not has_key and state.provider == "zhipu":
-                has_key = bool(state.cfg.get("key", ""))
-            if not has_key:
+            if not _provider_has_key(state, state.provider):
                 print(f"{YELLOW}⚠️ [{state.provider}] 尚未配置 API Key{RESET}")
                 k = input(f"👉 请输入 [{state.provider}] 的 API Key: ").strip()
                 if k:

{fr_cli-2.2.4 → fr_cli-2.2.5}/fr_cli/weapon/mcp.py

@@ -7,8 +7,6 @@ import asyncio
 import json
 from typing import Dict, List, Any, Optional
 
-from fr_cli.ui.ui import CYAN, GREEN, YELLOW, RED, DIM, RESET
-
 try:
     from mcp import ClientSession, StdioServerParameters
     from mcp.client.stdio import stdio_client

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.4
+Version: 2.2.5
 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.4; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.5; 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.4; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.5; extra == "all"
 Requires-Dist: paramiko>=3.0.0; extra == "all"
 Requires-Dist: selenium>=4.10.0; extra == "all"
 Requires-Dist: bypy; extra == "all"

{fr_cli-2.2.4 → fr_cli-2.2.5}/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.4
+sentence-transformers>=2.2.5
 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.4
+sentence-transformers>=2.2.5
 
 [remote]
 paramiko>=3.0.0

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fr-cli"
-version = "2.2.4"
+version = "2.2.5"
 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.4"]
+rag = ["chromadb>=0.4.0", "sentence-transformers>=2.2.5"]
 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.4",
+    "chromadb>=0.4.0", "sentence-transformers>=2.2.5",
     "paramiko>=3.0.0",
     "selenium>=4.10.0",
     "bypy", "aligo", "msal",