jarvis-ai-assistant 0.3.26__py3-none-any.whl → 0.3.28__py3-none-any.whl

jarvis/jarvis_tools/retrieve_memory.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import json
-import random
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -170,7 +169,7 @@ class RetrieveMemoryTool:
                 pass
 
             # 格式化为Markdown输出
-            markdown_output = f"# 记忆检索结果\n\n"
+            markdown_output = "# 记忆检索结果\n\n"
             markdown_output += f"**检索到 {len(all_memories)} 条记忆**\n\n"
 
             if tags:
@@ -201,7 +200,7 @@ class RetrieveMemoryTool:
                     if k not in ["id", "type", "tags", "created_at", "content"]
                 }
                 if metadata:
-                    markdown_output += f"**其他信息**:\n"
+                    markdown_output += "**其他信息**:\n"
                     for key, value in metadata.items():
                         markdown_output += f"- {key}: {value}\n"
                     markdown_output += "\n"

jarvis/jarvis_tools/save_memory.py

@@ -3,7 +3,7 @@ import json
 import time
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Dict, List
+from typing import Any, Dict
 
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -157,8 +157,8 @@ class SaveMemoryTool:
                     success_count += 1
 
                     # 打印单条记忆保存信息
-                    memory_type = memory_data["memory_type"]
-                    tags = memory_data.get("tags", [])
+                    memory_data["memory_type"]
+                    memory_data.get("tags", [])
 
                 except Exception as e:
                     failed_count += 1

jarvis/jarvis_tools/search_web.py

@@ -54,7 +54,7 @@ class SearchWebTool:
                     break
 
                 url = r["href"]
-                title = r.get("title", url)
+                r.get("title", url)
 
                 try:
 
@@ -79,7 +79,7 @@ class SearchWebTool:
                     "success": False,
                 }
 
-            url_list_str = "\n".join(f"  - {u}" for u in visited_urls)
+            "\n".join(f"  - {u}" for u in visited_urls)
 
             summary_prompt = f"请为查询“{query}”总结以下内容：\n\n{full_content}"
 

jarvis/jarvis_tools/sub_agent.py

@@ -4,15 +4,17 @@ sub_agent 工具
 将子任务交给通用 Agent 执行，并返回执行结果。
 
 约定：
-- 仅接收一个参数：task
-- 不依赖父 Agent，所有配置使用系统默认与全局变量
+- 必填参数：task, name, background, system_prompt, summary_prompt, use_tools
+- 继承父 Agent 的部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer；其他参数需显式提供
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 import json
 
-from jarvis.jarvis_agent import Agent, origin_agent_system_prompt
+from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.globals import delete_agent
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SubAgentTool:
@@ -25,7 +27,7 @@ class SubAgentTool:
 
     # 必须与文件名一致，供 ToolRegistry 自动注册
     name = "sub_agent"
-    description = "将子任务交给通用 Agent 执行，并返回执行结果（使用系统默认配置，自动完成并生成总结）。"
+    description = "将子任务交给通用 Agent 执行，并返回执行结果（继承父Agent部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer；其他参数需显式提供，自动完成并生成总结）。"
     parameters = {
         "type": "object",
         "properties": {
@@ -33,12 +35,42 @@ class SubAgentTool:
                 "type": "string",
                 "description": "要执行的子任务内容（必填）",
             },
+            "name": {
+                "type": "string",
+                "description": "子Agent名称（必填）",
+            },
             "background": {
                 "type": "string",
-                "description": "任务背景与已知信息（可选，将与任务一并提供给子Agent）",
+                "description": "任务背景与已知信息（必填，将与任务一并提供给子Agent）",
+            },
+            "system_prompt": {
+                "type": "string",
+                "description": "覆盖子Agent的系统提示词（必填）",
+            },
+            "summary_prompt": {
+                "type": "string",
+                "description": "覆盖子Agent的总结提示词（必填）",
+            },
+            "use_tools": {
+                "type": "array",
+                "items": {"type": "string"},
+                "description": "限制子Agent可用的工具名称列表（必填）。兼容以逗号分隔的字符串输入。可用的工具列表："
+                + "\n".join(
+                    [
+                        t["name"] + ": " + t["description"]
+                        for t in ToolRegistry().get_all_tools()
+                    ]
+                ),
             },
         },
-        "required": ["task"],
+        "required": [
+            "task",
+            "name",
+            "background",
+            "system_prompt",
+            "summary_prompt",
+            "use_tools",
+        ],
     }
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
@@ -64,105 +96,102 @@ class SubAgentTool:
                 f"背景信息:\n{background}\n\n任务:\n{task}" if background else task
             )
 
-            # 继承父Agent的运行参数（用于覆盖默认值）；若无父Agent则使用默认/全局配置
-            parent_agent = args.get("agent")
-            # 如未注入父Agent，尝试从全局获取当前或任一已注册Agent
-            if parent_agent is None:
-                try:
-                    from jarvis.jarvis_utils import globals as G  # 延迟导入避免循环
-
-                    curr = getattr(G, "current_agent_name", "")
-                    if curr:
-                        parent_agent = getattr(G, "global_agents", {}).get(curr)
-                    if parent_agent is None and getattr(G, "global_agents", {}):
-                        try:
-                            parent_agent = next(iter(G.global_agents.values()))
-                        except Exception:
-                            parent_agent = None
-                except Exception:
-                    parent_agent = None
-            # 默认/全局
-            system_prompt = origin_agent_system_prompt
+            # 不继承父Agent，所有关键参数必须由调用方显式提供
             need_summary = True
             auto_complete = True
 
-            # 可继承参数
-            model_group = None
-            summary_prompt = None
-            execute_tool_confirm = None
-            use_methodology = None
-            use_analysis = None
-            force_save_memory = None
+            # 读取并校验必填参数
+            system_prompt = str(args.get("system_prompt", "")).strip()
+            summary_prompt = str(args.get("summary_prompt", "")).strip()
+            agent_name = str(args.get("name", "")).strip()
+
+            # 解析可用工具列表（支持数组或以逗号分隔的字符串）
+            _use_tools = args.get("use_tools", None)
             use_tools: list[str] = []
+            if isinstance(_use_tools, list):
+                use_tools = [str(x).strip() for x in _use_tools if str(x).strip()]
+            elif isinstance(_use_tools, str):
+                use_tools = [s.strip() for s in _use_tools.split(",") if s.strip()]
+            else:
+                use_tools = []
+
+            errors = []
+            if not system_prompt:
+                errors.append("system_prompt 不能为空")
+            if not summary_prompt:
+                errors.append("summary_prompt 不能为空")
+            if not agent_name:
+                errors.append("name 不能为空")
+            if not use_tools:
+                errors.append("use_tools 不能为空")
+            if not background:
+                errors.append("background 不能为空")
+
+            if errors:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "; ".join(errors),
+                }
 
+            # 基于父Agent（如有）继承部分配置后创建子Agent
+            parent_agent = args.get("agent", None)
+            parent_model_group = None
+            parent_input_handler = None
+            parent_execute_tool_confirm = None
+            parent_multiline_inputer = None
             try:
                 if parent_agent is not None:
-                    # 继承模型组
                     if getattr(parent_agent, "model", None):
-                        model_group = getattr(parent_agent.model, "model_group", None)
-                    # 继承开关类参数
-                    summary_prompt = getattr(parent_agent, "summary_prompt", None)
-                    execute_tool_confirm = getattr(
-                        parent_agent, "execute_tool_confirm", None
-                    )
-                    use_methodology = getattr(parent_agent, "use_methodology", None)
-                    use_analysis = getattr(parent_agent, "use_analysis", None)
-                    force_save_memory = getattr(parent_agent, "force_save_memory", None)
-                    # 继承工具使用集（名称列表）
-                    parent_registry = parent_agent.get_tool_registry()
-                    if parent_registry:
-                        for t in parent_registry.get_all_tools():
-                            if isinstance(t, dict) and t.get("name"):
-                                use_tools.append(str(t["name"]))
+                        parent_model_group = getattr(parent_agent.model, "model_group", None)
+                    parent_input_handler = getattr(parent_agent, "input_handler", None)
+                    parent_execute_tool_confirm = getattr(parent_agent, "execute_tool_confirm", None)
+                    parent_multiline_inputer = getattr(parent_agent, "multiline_inputer", None)
             except Exception:
-                # 忽略继承失败，退回默认配置
+                # 安全兜底：无法从父Agent获取配置则保持为None，使用系统默认
                 pass
 
-            # 为避免交互阻塞：提供自动确认与空输入处理器
-            def _auto_confirm(tip: str, default: bool = True) -> bool:
-                return default
-
-            # 创建子Agent（其余配置使用默认/全局）
             agent = Agent(
                 system_prompt=system_prompt,
-                name="SubAgent",
+                name=agent_name,
                 description="Temporary sub agent for executing a subtask",
-
-                model_group=model_group,  # 继承父Agent模型组（如可用）
-                summary_prompt=summary_prompt,  # 继承父Agent总结提示词（如可用）
+                model_group=parent_model_group,
+                summary_prompt=summary_prompt,
                 auto_complete=auto_complete,
-                output_handler=None,  # 默认 ToolRegistry
-                use_tools=None,  # 初始不限定，稍后同步父Agent工具集
-                input_handler=None,  # 允许使用系统默认输入链
-                execute_tool_confirm=execute_tool_confirm,  # 继承父Agent（如可用）
+                output_handler=None,
+                use_tools=None,
+                input_handler=parent_input_handler,
+                execute_tool_confirm=parent_execute_tool_confirm,
                 need_summary=need_summary,
-                multiline_inputer=None,  # 使用系统默认输入器（允许用户输入）
-                use_methodology=use_methodology,  # 继承父Agent（如可用）
-                use_analysis=use_analysis,  # 继承父Agent（如可用）
-                force_save_memory=force_save_memory,  # 继承父Agent（如可用）
+                multiline_inputer=parent_multiline_inputer,
+                use_methodology=None,
+                use_analysis=None,
+                force_save_memory=None,
                 files=None,
-                confirm_callback=_auto_confirm,  # 自动确认
             )
 
-            # 同步父Agent的模型名称与工具使用集（若可用）
+            # 设置可用工具列表
+            try:
+                agent.set_use_tools(use_tools)
+            except Exception:
+                pass
+
+            # 校验子Agent所用模型是否有效，必要时回退到平台可用模型
             try:
-                if (
-                    parent_agent is not None
-                    and getattr(parent_agent, "model", None)
-                    and getattr(agent, "model", None)
-                ):
-                    try:
-                        model_name = parent_agent.model.name()  # type: ignore[attr-defined]
-                        if model_name:
-                            from typing import Any
-                            model_obj: Any = getattr(agent, "model", None)
-                            if model_obj is not None:
-                                model_obj.set_model_name(model_name)
-                    except Exception:
-                        pass
-                if use_tools:
-                    agent.set_use_tools(use_tools)
+                platform = getattr(agent, "model", None)
+                if platform:
+                    available_models = platform.get_model_list()
+                    if available_models:
+                        available_names = [m for m, _ in available_models]
+                        current_model_name = platform.name()
+                        if current_model_name not in available_names:
+                            PrettyOutput.print(
+                                f"检测到子Agent模型 {current_model_name} 不存在于平台 {platform.platform_name()} 的可用模型列表，将回退到 {available_names[0]}",
+                                OutputType.WARNING,
+                            )
+                            platform.set_model_name(available_names[0])
             except Exception:
+                # 获取模型列表或设置模型失败时，保持原设置并继续，交由底层报错处理
                 pass
 
             # 执行任务

jarvis/jarvis_tools/sub_code_agent.py

@@ -8,12 +8,13 @@ sub_code_agent 工具
 - 不依赖父 Agent，所有配置使用系统默认与全局变量
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 import json
 
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_utils.globals import delete_agent
-from jarvis.jarvis_code_agent import code_agent as code_agent_module
+from jarvis.jarvis_utils.config import set_config, get_git_check_mode
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SubCodeAgentTool:
@@ -59,11 +60,6 @@ class SubCodeAgentTool:
                     "stderr": "task 不能为空",
                 }
 
-            # 在模块级别打补丁，仅自动确认交互（允许用户输入）
-            def _auto_confirm(tip: str, default: bool = True) -> bool:
-                return default
-
-            code_agent_module.user_confirm = _auto_confirm
 
             # 读取背景信息并组合任务
             background: str = str(args.get("background", "")).strip()
@@ -131,7 +127,12 @@ class SubCodeAgentTool:
             except Exception:
                 append_tools = None
 
+            # 在子Agent中放宽 Git 配置校验，避免因严格校验导致进程退出
+            # 使用配置项将校验模式临时切换为 warn，构造完成后恢复原值
+            old_mode = None
             try:
+                old_mode = get_git_check_mode()
+                set_config("JARVIS_GIT_CHECK_MODE", "warn")
                 code_agent = CodeAgent(
                     model_group=model_group,
                     need_summary=True,
@@ -145,6 +146,12 @@ class SubCodeAgentTool:
                     "stdout": "",
                     "stderr": f"初始化 CodeAgent 失败（可能未配置 git 或当前非 git 仓库）: {se}",
                 }
+            finally:
+                if old_mode is not None:
+                    try:
+                        set_config("JARVIS_GIT_CHECK_MODE", old_mode)
+                    except Exception:
+                        pass
 
             # 子Agent需要自动完成
             try:
@@ -165,6 +172,21 @@ class SubCodeAgentTool:
                             model_obj: Any = getattr(code_agent.agent, "model", None)
                             if model_obj is not None:
                                 model_obj.set_model_name(parent_model_name)
+                                # 模型有效性校验与回退，确保父Agent模型在子Agent平台上可用
+                                try:
+                                    available_models = model_obj.get_model_list()
+                                    if available_models:
+                                        available_names = [m for m, _ in available_models]
+                                        current_model_name = model_obj.name()
+                                        if current_model_name not in available_names:
+                                            PrettyOutput.print(
+                                                f"检测到子CodeAgent模型 {current_model_name} 不存在于平台 {model_obj.platform_name()} 的可用模型列表，将回退到 {available_names[0]}",
+                                                OutputType.WARNING,
+                                            )
+                                            model_obj.set_model_name(available_names[0])
+                                except Exception:
+                                    # 获取模型列表或设置模型失败时，保持原设置并继续，交由底层报错处理
+                                    pass
                     except Exception:
                         pass
             except Exception:

jarvis/jarvis_tools/virtual_tty.py

@@ -7,25 +7,14 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 # 为了类型检查，总是导入这些模块
 if TYPE_CHECKING:
-    import fcntl
-    import pty
-    import select
-    import signal
-    import subprocess
-    import threading
-    import queue
+    pass
 
 # 平台相关的导入
 if sys.platform != "win32":
-    import fcntl
-    import pty
-    import select
-    import signal
+    pass
 else:
     # Windows平台的导入
-    import subprocess
-    import threading
-    import queue
+    pass
 
 
 class VirtualTTYTool:

jarvis/jarvis_utils/builtin_replace_map.py

@@ -31,25 +31,25 @@ arguments:
     },
     "FindRelatedFiles": {
         "append": False,
-        "template": f"""
+        "template": """
 请使用工具在当前目录下查找与以下功能相关的文件：
 """,
     },
     "Dev": {
         "append": False,
-        "template": f"""
+        "template": """
 请调用create_code_agent开发以下需求：
 """,
     },
     "Fix": {
         "append": False,
-        "template": f"""
+        "template": """
 请修复以下问题：
 """,
     },
     "Check": {
         "append": True,
-        "template": f"""
+        "template": """
 请使用静态检查工具检查当前代码，必须严格遵守工具调用格式。
 
 检查要求：

jarvis/jarvis_utils/config.py

@@ -130,9 +130,14 @@ def _get_resolved_model_config(
     解析并合并模型配置，处理模型组。
 
     优先级顺序:
-    1. 单独的环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, etc.)
-    2. JARVIS_LLM_GROUP 中定义的组配置
-    3. 代码中的默认值
+    - 当通过 model_group_override（例如命令行 -g/--llm-group）指定组时：
+        1. JARVIS_LLM_GROUP 中定义的组配置
+        2. 仅当组未提供对应键时，回退到顶层环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, JARVIS_MAX_INPUT_TOKEN_COUNT)
+        3. 代码中的默认值
+    - 当未显式指定组时（使用默认组或未设置）：
+        1. 顶层环境变量 (JARVIS_PLATFORM, JARVIS_MODEL, JARVIS_MAX_INPUT_TOKEN_COUNT)
+        2. JARVIS_LLM_GROUP 中定义的组配置
+        3. 代码中的默认值
 
     返回:
         Dict[str, Any]: 解析后的模型配置字典
@@ -155,14 +160,24 @@ def _get_resolved_model_config(
     # Start with group config
     resolved_config = group_config.copy()
 
-    # Override with specific settings from GLOBAL_CONFIG_DATA
-    for key in [
+    # 覆盖策略：
+    # - 若通过 CLI 传入了 model_group_override，则优先使用组内配置；
+    #   仅当组未提供对应键时，才回落到顶层 GLOBAL_CONFIG_DATA。
+    # - 若未传入 override（即使用默认组），保持原有行为：由顶层键覆盖组配置。
+    override_keys = [
         "JARVIS_PLATFORM",
         "JARVIS_MODEL",
         "JARVIS_MAX_INPUT_TOKEN_COUNT",
-    ]:
+    ]
+    for key in override_keys:
         if key in GLOBAL_CONFIG_DATA:
-            resolved_config[key] = GLOBAL_CONFIG_DATA[key]
+            if model_group_override is None:
+                # 未显式指定组：顶层覆盖组
+                resolved_config[key] = GLOBAL_CONFIG_DATA[key]
+            else:
+                # 显式指定组：仅在组未定义该键时回退到顶层
+                if key not in resolved_config:
+                    resolved_config[key] = GLOBAL_CONFIG_DATA[key]
 
     return resolved_config
 
@@ -196,7 +211,7 @@ def _deprecated_platform_name_v1(model_group_override: Optional[str] = None) ->
     返回：
         str: 平台名称，默认为正常操作平台
     """
-    config = _get_resolved_model_config(model_group_override)
+    _get_resolved_model_config(model_group_override)
     # Fallback to normal platform if thinking platform is not specified
     return get_normal_platform_name(model_group_override)
 
@@ -208,7 +223,7 @@ def _deprecated_model_name_v1(model_group_override: Optional[str] = None) -> str
     返回：
         str: 模型名称，默认为正常操作模型
     """
-    config = _get_resolved_model_config(model_group_override)
+    _get_resolved_model_config(model_group_override)
     # Fallback to normal model if thinking model is not specified
     return get_normal_model_name(model_group_override)
 
@@ -220,7 +235,7 @@ def is_execute_tool_confirm() -> bool:
     返回：
         bool: 如果需要确认则返回True，默认为False
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_EXECUTE_TOOL_CONFIRM", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_EXECUTE_TOOL_CONFIRM", False)
 
 
 def is_confirm_before_apply_patch() -> bool:
@@ -230,7 +245,7 @@ def is_confirm_before_apply_patch() -> bool:
     返回：
         bool: 如果需要确认则返回True，默认为False
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", False)
 
 
 def get_data_dir() -> str:
@@ -270,7 +285,7 @@ def get_pretty_output() -> bool:
     if platform.system() == "Windows":
         return False
 
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PRETTY_OUTPUT", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_PRETTY_OUTPUT", False)
 
 
 def is_use_methodology() -> bool:
@@ -280,7 +295,7 @@ def is_use_methodology() -> bool:
     返回：
         bool: 如果启用方法论则返回True，默认为True
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_METHODOLOGY", True) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_METHODOLOGY", True)
 
 
 def is_use_analysis() -> bool:
@@ -290,7 +305,7 @@ def is_use_analysis() -> bool:
     返回：
         bool: 如果启用任务分析则返回True，默认为True
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_ANALYSIS", True) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_ANALYSIS", True)
 
 
 def get_tool_load_dirs() -> List[str]:
@@ -390,7 +405,7 @@ def is_print_prompt() -> bool:
     返回：
         bool: 如果打印提示则返回True，默认为True
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PRINT_PROMPT", False) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_PRINT_PROMPT", False)
 
 
 def is_print_error_traceback() -> bool:
@@ -423,6 +438,20 @@ def is_enable_static_analysis() -> bool:
     return GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_STATIC_ANALYSIS", True) is True
 
 
+def get_git_check_mode() -> str:
+    """
+    获取Git校验模式。
+
+    返回:
+        str: "strict" 或 "warn"，默认为 "strict"
+    """
+    mode = GLOBAL_CONFIG_DATA.get("JARVIS_GIT_CHECK_MODE", "strict")
+    try:
+        return str(mode)
+    except Exception:
+        return "strict"
+
+
 def get_mcp_config() -> List[Dict[str, Any]]:
     """
     获取MCP配置列表。

jarvis/jarvis_utils/fzf.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+"""FZF selector utility."""
+import shutil
+import subprocess
+from typing import List, Optional, Union
+
+def fzf_select(
+    options: Union[List[str], List[dict]],
+    prompt: str = "SELECT> ",
+    key: Optional[str] = None,
+) -> Optional[str]:
+    """
+    Uses fzf to select an item from a list.
+
+    Args:
+        options: A list of strings or dicts to choose from.
+        prompt: The prompt to display in fzf.
+        key: If options is a list of dicts, this is the key to display.
+
+    Returns:
+        The selected item, or None if fzf is not available or the selection is cancelled.
+    """
+    if shutil.which("fzf") is None:
+        return None
+
+    if not options:
+        return None
+
+    if isinstance(options[0], dict):
+        if key is None:
+            raise ValueError("A key must be provided for a list of dicts.")
+        input_lines = [str(item.get(key, "")) for item in options]
+    else:
+        input_lines = [str(item) for item in options]
+
+    try:
+        process = subprocess.run(
+            [
+                "fzf",
+                "--prompt",
+                prompt,
+                "--height",
+                "40%",
+                "--border",
+                "--layout=reverse",
+            ],
+            input="\n".join(input_lines),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=True,
+        )
+        selected = process.stdout.strip()
+        return selected if selected else None
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return None

jarvis/jarvis_utils/git_utils.py

@@ -246,7 +246,7 @@ def handle_commit_workflow() -> bool:
             ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"], check=True
         )
         return True
-    except subprocess.CalledProcessError as e:
+    except subprocess.CalledProcessError:
         return False
 
 

jarvis/jarvis_utils/globals.py

@@ -10,8 +10,7 @@
 import os
 
 # 全局变量：保存消息历史
-from typing import Any, Dict, Set, List, Optional
-from datetime import datetime
+from typing import Any, Dict, List, Optional
 
 message_history: List[str] = []
 MAX_HISTORY_SIZE = 50