jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.3.32__py3-none-any.whl

jarvis/jarvis_agent/jarvis.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI 助手主入口模块"""
 from typing import Optional, List
+import shutil
+from datetime import datetime
 
 import typer
 
@@ -16,6 +18,7 @@ from jarvis.jarvis_utils.config import (
     get_agent_definition_dirs,
     get_multi_agent_dirs,
     get_roles_dirs,
+    get_data_dir,
 )
 import jarvis.jarvis_utils.utils as jutils
 from jarvis.jarvis_utils.input import user_confirm, get_single_line_input
@@ -184,6 +187,72 @@ def handle_interactive_config_option(
         return True
 
 
+def handle_backup_option(backup: bool) -> bool:
+    """处理数据备份选项，返回是否已处理并需提前结束。"""
+    if not backup:
+        return False
+
+    init_env("", config_file=None)
+    data_dir = Path(get_data_dir())
+    if not data_dir.is_dir():
+        PrettyOutput.print(f"数据目录不存在: {data_dir}", OutputType.ERROR)
+        return True
+
+    backup_dir = Path(os.path.expanduser("~/jarvis_backups"))
+    backup_dir.mkdir(exist_ok=True)
+
+    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+    backup_file_base = backup_dir / f"jarvis_data_{timestamp}"
+
+    try:
+        archive_path = shutil.make_archive(
+            str(backup_file_base), "zip", root_dir=str(data_dir)
+        )
+        PrettyOutput.print(f"数据已成功备份到: {archive_path}", OutputType.SUCCESS)
+    except Exception as e:
+        PrettyOutput.print(f"数据备份失败: {e}", OutputType.ERROR)
+
+    return True
+
+
+def handle_restore_option(restore_path: Optional[str]) -> bool:
+    """处理数据恢复选项，返回是否已处理并需提前结束。"""
+    if not restore_path:
+        return False
+
+    restore_file = Path(restore_path)
+    if not restore_file.is_file():
+        PrettyOutput.print(f"指定的恢复文件不存在: {restore_path}", OutputType.ERROR)
+        return True
+
+    init_env("", config_file=None)
+    data_dir = Path(get_data_dir())
+
+    if data_dir.exists():
+        if not user_confirm(
+            f"数据目录 '{data_dir}' 已存在，恢复操作将覆盖它。是否继续？", default=False
+        ):
+            PrettyOutput.print("恢复操作已取消。", OutputType.INFO)
+            return True
+        try:
+            shutil.rmtree(data_dir)
+        except Exception as e:
+            PrettyOutput.print(f"无法移除现有数据目录: {e}", OutputType.ERROR)
+            return True
+
+    try:
+        data_dir.mkdir(parents=True)
+        shutil.unpack_archive(str(restore_file), str(data_dir), "zip")
+        PrettyOutput.print(
+            f"数据已从 '{restore_path}' 成功恢复到 '{data_dir}'", OutputType.SUCCESS
+        )
+
+    except Exception as e:
+        PrettyOutput.print(f"数据恢复失败: {e}", OutputType.ERROR)
+
+    return True
+
+
 def preload_config_for_flags(config_file: Optional[str]) -> None:
     """预加载配置（仅用于读取功能开关），不会显示欢迎信息或影响后续 init_env。"""
     try:
@@ -521,6 +590,12 @@ def run_cli(
         "--disable-methodology-analysis",
         help="禁用方法论和任务分析（覆盖配置文件设置）",
     ),
+    backup_data: bool = typer.Option(
+        False, "--backup-data", help="备份 Jarvis 数据目录 (~/.jarvis)"
+    ),
+    restore_data: Optional[str] = typer.Option(
+        None, "--restore-data", help="从指定的压缩包恢复 Jarvis 数据"
+    ),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -529,6 +604,14 @@ def run_cli(
     # 使用 rich 输出命令与快捷方式总览
     print_commands_overview()
 
+    # 处理数据备份
+    if handle_backup_option(backup_data):
+        return
+
+    # 处理数据恢复
+    if handle_restore_option(restore_data):
+        return
+
     # 处理配置文件编辑
     if handle_edit_option(edit, config_file):
         return

jarvis/jarvis_code_agent/code_agent.py

@@ -529,8 +529,9 @@ class CodeAgent:
             if self.agent.force_save_memory:
                 self.agent.memory_manager.prompt_memory_save()
         elif start_commit:
-            os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
-            PrettyOutput.print("已重置到初始提交", OutputType.INFO)
+            if user_confirm("是否要重置到初始提交？", True):
+                os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
+                PrettyOutput.print("已重置到初始提交", OutputType.INFO)
 
     def run(self, user_input: str, prefix: str = "", suffix: str = "") -> Optional[str]:
         """使用给定的用户输入运行代码代理。
@@ -603,10 +604,92 @@ class CodeAgent:
         """工具调用后回调函数。"""
         final_ret = ""
         diff = get_diff()
+
+        # 构造按文件的状态映射与差异文本，删除文件不展示diff，仅提示删除
+        def _build_name_status_map() -> dict:
+            status_map = {}
+            try:
+                head_exists = bool(get_latest_commit_hash())
+                # 临时 -N 以包含未跟踪文件的差异检测
+                subprocess.run(["git", "add", "-N", "."], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                cmd = ["git", "diff", "--name-status"] + (["HEAD"] if head_exists else [])
+                res = subprocess.run(
+                    cmd,
+                    capture_output=True,
+                    text=True,
+                    encoding="utf-8",
+                    errors="replace",
+                    check=False,
+                )
+            finally:
+                subprocess.run(["git", "reset"], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+            if res.returncode == 0 and res.stdout:
+                for line in res.stdout.splitlines():
+                    if not line.strip():
+                        continue
+                    parts = line.split("\t")
+                    if not parts:
+                        continue
+                    status = parts[0]
+                    if status.startswith("R") or status.startswith("C"):
+                        # 重命名/复制：使用新路径作为键
+                        if len(parts) >= 3:
+                            old_path, new_path = parts[1], parts[2]
+                            status_map[new_path] = status
+                            # 也记录旧路径，便于匹配 name-only 的结果
+                            status_map[old_path] = status
+                        elif len(parts) >= 2:
+                            status_map[parts[-1]] = status
+                    else:
+                        if len(parts) >= 2:
+                            status_map[parts[1]] = status
+            return status_map
+
+        def _get_file_diff(file_path: str) -> str:
+            """获取单文件的diff，包含新增文件内容；失败时返回空字符串"""
+            head_exists = bool(get_latest_commit_hash())
+            try:
+                # 为了让未跟踪文件也能展示diff，临时 -N 该文件
+                subprocess.run(["git", "add", "-N", "--", file_path], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                cmd = ["git", "diff"] + (["HEAD"] if head_exists else []) + ["--", file_path]
+                res = subprocess.run(
+                    cmd,
+                    capture_output=True,
+                    text=True,
+                    encoding="utf-8",
+                    errors="replace",
+                    check=False,
+                )
+                if res.returncode == 0:
+                    return res.stdout or ""
+                return ""
+            finally:
+                subprocess.run(["git", "reset", "--", file_path], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+        def _build_per_file_patch_preview(modified_files: List[str]) -> str:
+            status_map = _build_name_status_map()
+            lines: List[str] = []
+            for f in modified_files:
+                status = status_map.get(f, "")
+                # 删除文件：不展示diff，仅提示
+                if (status.startswith("D")) or (not os.path.exists(f)):
+                    lines.append(f"- {f} 文件被删除")
+                    continue
+                # 其它情况：展示该文件的diff
+                file_diff = _get_file_diff(f)
+                if file_diff.strip():
+                    lines.append(f"文件: {f}\n```diff\n{file_diff}\n```")
+                else:
+                    # 当无法获取到diff（例如重命名或特殊状态），避免空输出
+                    lines.append(f"- {f} 变更已记录（无可展示的文本差异）")
+            return "\n".join(lines)
+
         if diff:
             start_hash = get_latest_commit_hash()
             PrettyOutput.print(diff, OutputType.CODE, lang="diff")
             modified_files = get_diff_file_list()
+            per_file_preview = _build_per_file_patch_preview(modified_files)
             commited = handle_commit_workflow()
             if commited:
                 # 统计代码行数变化
@@ -630,15 +713,14 @@ class CodeAgent:
 
                 StatsManager.increment("code_modifications", group="code_agent")
 
-
                 # 获取提交信息
                 end_hash = get_latest_commit_hash()
                 commits = get_commits_between(start_hash, end_hash)
 
-                # 添加提交信息到final_ret
+                # 添加提交信息到final_ret（按文件展示diff；删除文件仅提示）
                 if commits:
                     final_ret += (
-                        f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
+                        f"\n\n代码已修改完成\n补丁内容（按文件）:\n{per_file_preview}\n"
                     )
                     # 修改后的提示逻辑
                     lint_tools_info = "\n".join(
@@ -665,7 +747,7 @@ class CodeAgent:
                     final_ret += "\n\n修改没有生效\n"
             else:
                 final_ret += "\n修改被拒绝\n"
-                final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
+                final_ret += f"# 补丁预览（按文件）:\n{per_file_preview}"
         else:
             return
         # 用户确认最终结果

jarvis/jarvis_data/config_schema.json

@@ -7,6 +7,7 @@
     "JARVIS_MCP": {
       "type": "array",
       "description": "MCP工具配置列表",
+      "default": [],
       "items": {
         "type": "object",
         "oneOf": [
@@ -182,11 +183,22 @@
       "description": "执行工具前是否需要确认",
       "default": false
     },
+    "JARVIS_TOOL_FILTER_THRESHOLD": {
+      "type": "number",
+      "description": "AI工具筛选阈值：当可用工具数量超过此值时触发AI筛选",
+      "default": 30
+    },
     "JARVIS_CONFIRM_BEFORE_APPLY_PATCH": {
       "type": "boolean",
       "description": "应用补丁前是否需要确认",
       "default": false
     },
+    "JARVIS_PATCH_FORMAT": {
+      "type": "string",
+      "enum": ["all", "search", "search_range"],
+      "description": "补丁格式处理模式：all 同时支持 SEARCH 与 SEARCH_START/SEARCH_END；search 仅允许精确片段匹配；search_range 仅允许范围匹配。",
+      "default": "all"
+    },
     "JARVIS_DATA_PATH": {
       "type": "string",
       "description": "Jarvis数据存储目录路径",
@@ -195,7 +207,7 @@
     "JARVIS_PRETTY_OUTPUT": {
       "type": "boolean",
       "description": "是否启用美化输出",
-      "default": false
+      "default": true
     },
     "JARVIS_USE_METHODOLOGY": {
       "type": "boolean",
@@ -270,6 +282,11 @@
       "description": "是否打印提示",
       "default": false
     },
+    "JARVIS_PRINT_ERROR_TRACEBACK": {
+      "type": "boolean",
+      "description": "是否在错误输出时打印回溯调用链",
+      "default": false
+    },
     "JARVIS_ENABLE_STATIC_ANALYSIS": {
       "type": "boolean",
       "description": "是否启用静态代码分析",
@@ -278,7 +295,7 @@
     "JARVIS_FORCE_SAVE_MEMORY": {
       "type": "boolean",
       "description": "是否强制保存记忆",
-      "default": true
+      "default": false
     },
     "JARVIS_ENABLE_GIT_JCA_SWITCH": {
       "type": "boolean",
@@ -341,7 +358,23 @@
     "JARVIS_RAG_GROUPS": {
       "type": "array",
       "description": "预定义的RAG配置组",
-      "default": [],
+      "default": [
+        {
+          "text": {
+            "embedding_model": "BAAI/bge-m3",
+            "rerank_model": "BAAI/bge-reranker-v2-m3",
+            "use_bm25": true,
+            "use_rerank": true
+          }
+        },
+        {
+          "code": {
+            "embedding_model": "Qodo/Qodo-Embed-1-1.5B",
+            "use_bm25": false,
+            "use_rerank": false
+          }
+        }
+      ],
       "items": {
         "type": "object",
         "additionalProperties": {
@@ -421,7 +454,8 @@
         "required": [
           "template"
         ]
-      }
+      },
+      "default": {}
     },
     "OPENAI_API_KEY": {
       "type": "string",

jarvis/jarvis_platform/openai.py

@@ -24,7 +24,32 @@ class OpenAIModel(BasePlatform):
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1")
         self.model_name = os.getenv("JARVIS_MODEL") or "gpt-4o"
 
-        self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+                # Optional: Inject extra HTTP headers via environment variable
+        # Expected format: OPENAI_EXTRA_HEADERS='{"Header-Name": "value", "X-Trace": "abc"}'
+        headers_str = os.getenv("OPENAI_EXTRA_HEADERS")
+        self.extra_headers: Dict[str, str] = {}
+        if headers_str:
+            try:
+                parsed = json.loads(headers_str)
+                if isinstance(parsed, dict):
+                    # Ensure all header keys/values are strings
+                    self.extra_headers = {str(k): str(v) for k, v in parsed.items()}
+                else:
+                    PrettyOutput.print("OPENAI_EXTRA_HEADERS 应为 JSON 对象，如 {'X-Source':'jarvis'}", OutputType.WARNING)
+            except Exception as e:
+                PrettyOutput.print(f"解析 OPENAI_EXTRA_HEADERS 失败: {e}", OutputType.WARNING)
+
+        # Initialize OpenAI client, try to pass default headers if SDK supports it
+        try:
+            if self.extra_headers:
+                self.client = OpenAI(api_key=self.api_key, base_url=self.base_url, default_headers=self.extra_headers)
+            else:
+                self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+        except TypeError:
+            # Fallback: SDK version may not support default_headers
+            self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+            if self.extra_headers:
+                PrettyOutput.print("当前 OpenAI SDK 不支持 default_headers，未能注入额外 HTTP 头", OutputType.WARNING)
         self.messages: List[Dict[str, str]] = []
         self.system_message = ""
 

jarvis/jarvis_tools/edit_file.py

@@ -27,15 +27,25 @@ class FileSearchReplaceTool:
 
 ## 基本使用
 1. 指定需要修改的文件路径（单个或多个）
-2. 提供一组或多组修改，每个修改包含:
-   - reason: 修改原因描述
-   - SEARCH: 需要查找的原始代码(必须包含足够上下文)
-   - REPLACE: 替换后的新代码
+2. 提供一组或多组修改，每个修改支持两种格式:
+   - 单点替换：
+     - reason: 修改原因描述
+     - SEARCH: 需要查找的原始代码(必须包含足够上下文)
+     - REPLACE: 替换后的新代码
+   - 区间替换：
+     - reason: 修改原因描述
+     - SEARCH_START: 起始标记
+     - SEARCH_END: 结束标记
+     - REPLACE: 替换后的新代码
+     - RANGE: 可选的行号范围 'start-end' (1-based, 闭区间), 用于限定匹配范围
+   - **说明**: 区间替换会从包含 SEARCH_START 的行首开始，到包含 SEARCH_END 的行尾结束，替换整个区域
 
 ## 核心原则
 1. **精准修改**: 只修改必要的代码部分，保持其他部分不变
 2. **最小补丁原则**: 生成最小范围的补丁，包含必要的上下文
-3. **唯一匹配**: 确保搜索文本在文件中唯一匹配
+3. **唯一匹配**:
+   - 单点替换：确保 SEARCH 在文件中唯一匹配
+   - 区间替换：确保在指定范围内，第一个 SEARCH_START 之后能找到 SEARCH_END
 4. **格式保持**: 严格保持原始代码的格式风格
 5. **部分成功**: 支持多个文件编辑，允许部分文件编辑成功
 
@@ -62,12 +72,24 @@ class FileSearchReplaceTool:
                                     },
                                     "SEARCH": {
                                         "type": "string",
-                                        "description": "需要查找的原始代码",
+                                        "description": "需要查找的原始代码（单点替换模式）",
+                                    },
+                                    "SEARCH_START": {
+                                        "type": "string",
+                                        "description": "区间替换的起始标记（包含在替换范围内）",
+                                    },
+                                    "SEARCH_END": {
+                                        "type": "string",
+                                        "description": "区间替换的结束标记（包含在替换范围内）",
                                     },
                                     "REPLACE": {
                                         "type": "string",
                                         "description": "替换后的新代码",
                                     },
+                                    "RANGE": {
+                                        "type": "string",
+                                        "description": "行号范围 'start-end'（1-based，闭区间），可选，仅用于区间替换模式，用于限定匹配与替换的行号范围",
+                                    },
                                 },
                             },
                         },
@@ -93,10 +115,17 @@ class FileSearchReplaceTool:
             args: 包含以下键的字典:
                 - files: 文件列表，每个文件包含(必填):
                     - path: 要修改的文件路径
-                    - changes: 修改列表，每个修改包含:
-                        - reason: 修改原因描述
-                        - SEARCH: 需要查找的原始代码(必须包含足够上下文)
-                        - REPLACE: 替换后的新代码
+                    - changes: 修改列表，每个修改支持两种格式:
+                        1) 单点替换：
+                            - reason: 修改原因描述
+                            - SEARCH: 需要查找的原始代码(必须包含足够上下文)
+                            - REPLACE: 替换后的新代码
+                        2) 区间替换：
+                            - reason: 修改原因描述
+                            - SEARCH_START: 起始标记
+                            - SEARCH_END: 结束标记
+                            - REPLACE: 替换后的新代码
+                        - **说明**: 区间替换会从包含 SEARCH_START 的行首开始，到包含 SEARCH_END 的行尾结束，替换整个区域
 
         返回:
             Dict[str, Any] 包含:

jarvis/jarvis_tools/read_code.py

@@ -62,10 +62,9 @@ class ReadCodeTool:
                 }
 
             # 读取文件内容
+            # 第一遍流式读取，仅统计总行数，避免一次性读入内存
             with open(abs_path, "r", encoding="utf-8", errors="ignore") as f:
-                lines = f.readlines()
-
-            total_lines = len(lines)
+                total_lines = sum(1 for _ in f)
 
             # 处理空文件情况
             if total_lines == 0:
@@ -99,14 +98,16 @@ class ReadCodeTool:
                     "stderr": f"无效的行范围 [{start_line}-{end_line}] (总行数: {total_lines})",
                 }
 
-            # 添加行号并构建输出内容
-            selected_lines = lines[start_line - 1 : end_line]
-            numbered_content = "".join(
-                [
-                    f"{i:4d}:{line}"
-                    for i, line in enumerate(selected_lines, start=start_line)
-                ]
-            )
+            # 添加行号并构建输出内容（第二遍流式读取，仅提取范围行）
+            selected_items = []
+            with open(abs_path, "r", encoding="utf-8", errors="ignore") as f:
+                for i, line in enumerate(f, start=1):
+                    if i < start_line:
+                        continue
+                    if i > end_line:
+                        break
+                    selected_items.append((i, line))
+            numbered_content = "".join(f"{i:4d}:{line}" for i, line in selected_items)
 
             # 构建输出格式
             output = (

jarvis/jarvis_tools/registry.py

@@ -51,6 +51,7 @@ arguments:
 - 完全按照上述格式
 - 使用正确的YAML格式，2个空格作为缩进
 - 包含所有必需参数
+- {ot("TOOL_CALL")} 和 {ct("TOOL_CALL")} 必须出现在行首
 </rule>
 
 <rule>
@@ -101,6 +102,7 @@ arguments:
 - 创建虚构对话
 - 在没有所需信息的情况下继续
 - yaml 格式错误
+- {ot("TOOL_CALL")} 和 {ct("TOOL_CALL")} 没有出现在行首
 </common_errors>
 </tool_system_guide>
 """
@@ -121,7 +123,8 @@ class ToolRegistry(OutputHandlerProtocol):
         return "TOOL_CALL"
 
     def can_handle(self, response: str) -> bool:
-        return ot("TOOL_CALL") in response
+        # 仅当 {ot("TOOL_CALL")} 出现在行首时才认为可以处理
+        return re.search(rf'(?m){re.escape(ot("TOOL_CALL"))}', response) is not None
 
     def prompt(self) -> str:
         """加载工具"""
@@ -608,11 +611,9 @@ class ToolRegistry(OutputHandlerProtocol):
 
     @staticmethod
     def _has_tool_calls_block(content: str) -> bool:
-        """从内容中提取工具调用块"""
-        return (
-            re.search(ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"), content, re.DOTALL)
-            is not None
-        )
+        """从内容中提取工具调用块（仅匹配行首标签）"""
+        pattern = rf'(?ms){re.escape(ot("TOOL_CALL"))}(.*?)^{re.escape(ct("TOOL_CALL"))}'
+        return re.search(pattern, content) is not None
 
     @staticmethod
     def _extract_tool_calls(
@@ -633,22 +634,22 @@ class ToolRegistry(OutputHandlerProtocol):
             Exception: 如果工具调用缺少必要字段
         """
         # 将内容拆分为行
-        data = re.findall(
-            ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"), content, re.DOTALL
-        )
+        pattern = rf'(?ms){re.escape(ot("TOOL_CALL"))}(.*?)^{re.escape(ct("TOOL_CALL"))}'
+        data = re.findall(pattern, content)
         auto_completed = False
         if not data:
-            # can_handle 确保 ot("TOOL_CALL") 在内容中。
-            # 如果数据为空，则表示 ct("TOOL_CALL") 可能丢失。
-            if ot("TOOL_CALL") in content and ct("TOOL_CALL") not in content:
-                # 尝试通过附加结束标签来修复它
+            # can_handle 确保 ot("TOOL_CALL") 在内容中（行首）。
+            # 如果数据为空，则表示行首的 ct("TOOL_CALL") 可能丢失。
+            has_open_at_bol = re.search(rf'(?m){re.escape(ot("TOOL_CALL"))}', content) is not None
+            has_close_at_bol = re.search(rf'(?m)^{re.escape(ct("TOOL_CALL"))}', content) is not None
+            if has_open_at_bol and not has_close_at_bol:
+                # 尝试通过附加结束标签来修复它（确保结束标签位于行首）
                 fixed_content = content.strip() + f"\n{ct('TOOL_CALL')}"
 
                 # 再次提取，并检查YAML是否有效
                 temp_data = re.findall(
-                    ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"),
+                    pattern,
                     fixed_content,
-                    re.DOTALL,
                 )
 
                 if temp_data:

jarvis/jarvis_utils/config.py

@@ -248,6 +248,23 @@ def is_confirm_before_apply_patch() -> bool:
     return GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", False)
 
 
+def get_patch_format() -> str:
+    """
+    获取补丁格式。
+
+    - "search": 仅使用精确匹配的 `SEARCH` 模式。此模式对能力较弱的模型更稳定，因为它要求代码片段完全匹配。
+    - "search_range": 仅使用 `SEARCH_START` 和 `SEARCH_END` 的范围匹配模式。此模式对能力较强的模型更灵活，因为它允许在代码块内部进行修改，而不要求整个块完全匹配。
+    - "all": 同时支持以上两种模式（默认）。
+
+    返回:
+        str: "all", "search", or "search_range"
+    """
+    mode = GLOBAL_CONFIG_DATA.get("JARVIS_PATCH_FORMAT", "all")
+    if mode in ["all", "search", "search_range"]:
+        return mode
+    return "all"
+
+
 def get_data_dir() -> str:
     """
     获取Jarvis数据存储目录路径。

jarvis/jarvis_utils/embedding.py

@@ -21,6 +21,9 @@ def get_context_token_count(text: str) -> int:
     返回：
         int: 文本中的token数量
     """
+    # 防御性检查：入参为 None 或空字符串时直接返回 0
+    if text is None or text == "":
+        return 0
     try:
         import tiktoken
 

jarvis/jarvis_utils/git_utils.py

@@ -34,7 +34,13 @@ def find_git_root_and_cd(start_dir: str = ".") -> str:
     """
     os.chdir(start_dir)
     try:
-        git_root = os.popen("git rev-parse --show-toplevel").read().strip()
+        result = subprocess.run(
+            ["git", "rev-parse", "--show-toplevel"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        git_root = result.stdout.strip()
         if not git_root:
             subprocess.run(["git", "init"], check=True)
             git_root = os.path.abspath(".")
@@ -291,7 +297,13 @@ def get_modified_line_ranges() -> Dict[str, List[Tuple[int, int]]]:
         行号从1开始。
     """
     # 获取所有文件的Git差异
-    diff_output = os.popen("git show").read()
+    # 仅用于解析修改行范围，减少上下文以降低输出体积和解析成本
+    result = subprocess.run(
+        ["git", "show", "--no-color"],
+        capture_output=True,
+        text=True,
+    )
+    diff_output = result.stdout
 
     # 解析差异以获取修改的文件及其行范围
     result: Dict[str, List[Tuple[int, int]]] = {}

jarvis/jarvis_utils/input.py

@@ -482,7 +482,7 @@ def _get_multiline_input_internal(
         """Handle Ctrl+O by exiting the prompt and returning the sentinel value."""
         event.app.exit(result=CTRL_O_SENTINEL)
 
-    @bindings.add("c-t", filter=has_focus(DEFAULT_BUFFER))
+    @bindings.add("c-t", filter=has_focus(DEFAULT_BUFFER), eager=True)
     def _(event):
         """Return a shell command like '!bash' for upper input_handler to execute."""