jarvis-ai-assistant 0.1.154__tar.gz → 0.1.155__tar.gz

{jarvis_ai_assistant-0.1.154/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.155}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.154
+Version: 0.1.155
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.154"
+version = "0.1.155"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -66,5 +66,6 @@ jarvis-multi-agent = "jarvis.jarvis_multi_agent.main:main"
 jarvis-agent = "jarvis.jarvis_agent.main:main"
 jarvis-tool = "jarvis.jarvis_tools.registry:main"
 jarvis-ask-codebase = "jarvis.jarvis_tools.ask_codebase:main"
+jac = "jarvis.jarvis_tools.ask_codebase:main"
 jarvis-git-details = "jarvis.jarvis_git_details.main:main"
 jarvis-methodology = "jarvis.jarvis_methodology.main:main"

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.154",
+    version="0.1.155",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -46,6 +46,7 @@ setup(
             "jarvis-agent=jarvis.jarvis_agent.main:main",
             "jarvis-tool=jarvis.jarvis_tools.registry:main",
             "jarvis-ask-codebase=jarvis.jarvis_tools.ask_codebase:main",
+            "jac=jarvis.jarvis_tools.ask_codebase:main",
             "jarvis-git-details=jarvis.jarvis_git_details.main:main",
             "jarvis-methodology=jarvis.jarvis_methodology.main:main",
         ],

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.154"
+__version__ = "0.1.155"

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_agent/__init__.py

@@ -15,7 +15,7 @@ from jarvis.jarvis_utils.methodology import load_methodology
 from jarvis.jarvis_utils.globals import make_agent_name, set_agent, delete_agent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.config import get_max_token_count
-from jarvis.jarvis_utils.utils import ct, ot
+from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import user_confirm
 
 from jarvis.jarvis_platform.registry import PlatformRegistry

jarvis_ai_assistant-0.1.155/src/jarvis/jarvis_agent/builtin_input_handler.py

@@ -0,0 +1,51 @@
+import re
+from typing import Any, Tuple
+from jarvis.jarvis_utils.config import get_replace_map
+
+
+
+def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
+    """
+    处理内置的特殊输入标记，并追加相应的提示词
+
+    参数：
+        user_input: 用户输入
+        agent: 代理对象
+
+    返回：
+        Tuple[str, bool]: 处理后的输入和是否需要进一步处理
+    """
+    # 查找特殊标记
+    special_tags = re.findall(r"'<([^>]+)>'", user_input)
+
+    if not special_tags:
+        return user_input, False
+
+    # 获取替换映射表
+    replace_map = get_replace_map()
+    # 处理每个标记
+    for tag in special_tags:
+
+        # 优先处理特殊标记
+        if tag == "Summary":
+            agent._summarize_and_clear_history()
+            return "", True
+        elif tag == "Clear":
+            agent.clear()
+            return "", True
+        
+        processed_tag = set()
+        add_on_prompt = ""
+
+        # 处理普通替换标记
+        if tag in replace_map:
+            processed_tag.add(tag)
+            if "append" in replace_map[tag] and replace_map[tag]["append"] and tag not in processed_tag:
+                user_input = user_input.replace(f"'<{tag}>'", "")
+                add_on_prompt += replace_map[tag]["template"] + "\n"
+            else:
+                user_input = user_input.replace(f"'<{tag}>'", replace_map[tag]["template"])
+
+        agent.set_addon_prompt(add_on_prompt)
+
+    return user_input, False

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_agent/jarvis.py

@@ -114,6 +114,7 @@ def main() -> None:
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
     parser.add_argument('-p', '--platform', type=str, help='Platform to use')
     parser.add_argument('-m', '--model', type=str, help='Model to use')
+    parser.add_argument('-t', '--task', type=str, help='Directly input task content from command line')
     args = parser.parse_args()
 
     try:
@@ -126,6 +127,11 @@ def main() -> None:
             need_summary=False
         )
 
+        # 优先处理命令行直接传入的任务
+        if args.task:
+            agent.run(args.task)
+            sys.exit(0)
+
         tasks = _load_tasks()
         if tasks and (selected_task := _select_task(tasks)):
             PrettyOutput.print(f"执行任务: {selected_task}", OutputType.INFO)

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_agent/patch.py

@@ -15,7 +15,8 @@ from jarvis.jarvis_utils.git_utils import get_commits_between, get_latest_commit
 from jarvis.jarvis_utils.globals import add_read_file_record, has_read_file
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import ct, ot, get_file_line_count, user_confirm
+from jarvis.jarvis_utils.utils import get_file_line_count, user_confirm
+from jarvis.jarvis_utils.tag import ot, ct
 
 
 class PatchOutputHandler(OutputHandler):
@@ -153,6 +154,13 @@ def apply_patch(output_str: str, agent: Any) -> str:
             spinner.fail("❌")
             return f"以下文件未读取: {not_read_file}，应用补丁存在风险，请先读取文件后再生成补丁"
 
+        # 检查是否有文件在Git仓库外
+        in_git_repo = True
+        for filepath in patches.keys():
+            if not _is_file_in_git_repo(filepath):
+                in_git_repo = False
+                break
+
         # 按文件逐个处理
         for filepath, patch_content in patches.items():
             try:
@@ -177,46 +185,50 @@ def apply_patch(output_str: str, agent: Any) -> str:
                 spinner.write(f"✅ 文件 {filepath} 回滚完成")
 
         final_ret = ""
-        diff = get_diff()
-        if diff:
-            PrettyOutput.print(diff, OutputType.CODE, lang="diff")
-            with spinner.hidden():
-                commited = handle_commit_workflow()
-            if commited:
-                # 获取提交信息
-                end_hash = get_latest_commit_hash()
-                commits = get_commits_between(start_hash, end_hash)
-
-                # 添加提交信息到final_ret
-                if commits:
-                    final_ret += "✅ 补丁已应用\n"
-                    final_ret += "# 提交信息:\n"
-                    for commit_hash, commit_message in commits:
-                        final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
-
-                    final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
-
-                    # 增加代码变更分析和错误提示
-
-                    addon_prompt =  "1. 请调用静态检查工具（如有）检查以上变更是否引入了潜在错误\n"
-                    addon_prompt += "2. 如果发现致命的代码错误，请立即开始修复\n"
-                    addon_prompt += "3. 如果发现性能、风格等问题，要询问用户是否需要立即修复\n"
-                    addon_prompt += "\n\n"
-                    addon_prompt += "如果没有问题，请继续进行下一步修改\n"
-                    addon_prompt += f"如果用户的需求已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
-                    addon_prompt += "如果有任何信息不清楚，调用工具获取信息\n"
-                    addon_prompt += "每次响应必须且只能包含一个操作\n"
-
-                    agent.set_addon_prompt(addon_prompt)
+        if in_git_repo:
+            diff = get_diff()
+            if diff:
+                PrettyOutput.print(diff, OutputType.CODE, lang="diff")
+                with spinner.hidden():
+                    commited = handle_commit_workflow()
+                if commited:
+                    # 获取提交信息
+                    end_hash = get_latest_commit_hash()
+                    commits = get_commits_between(start_hash, end_hash)
+
+                    # 添加提交信息到final_ret
+                    if commits:
+                        final_ret += "✅ 补丁已应用\n"
+                        final_ret += "# 提交信息:\n"
+                        for commit_hash, commit_message in commits:
+                            final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
+
+                        final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
+
+                        # 增加代码变更分析和错误提示
+                        addon_prompt =  "1. 请调用静态检查工具（如有）检查以上变更是否引入了潜在错误\n"
+                        addon_prompt += "2. 如果发现致命的代码错误，请立即开始修复\n"
+                        addon_prompt += "3. 如果发现性能、风格等问题，要询问用户是否需要立即修复\n"
+                        addon_prompt += "\n\n"
+                        addon_prompt += "如果没有问题，请继续进行下一步修改\n"
+                        addon_prompt += f"如果用户的需求已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
+                        addon_prompt += "如果有任何信息不清楚，调用工具获取信息\n"
+                        addon_prompt += "每次响应必须且只能包含一个操作\n"
+
+                        agent.set_addon_prompt(addon_prompt)
 
+                    else:
+                        final_ret += "✅ 补丁已应用（没有新的提交）"
                 else:
-                    final_ret += "✅ 补丁已应用（没有新的提交）"
+                    final_ret += "❌ 补丁应用被拒绝\n"
+                    final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
             else:
-                final_ret += "❌ 补丁应用被拒绝\n"
-                final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
+                commited = False
+                final_ret += "❌ 没有要提交的更改\n"
         else:
-            commited = False
-            final_ret += "❌ 没有要提交的更改\n"
+            # 对于Git仓库外的文件，直接返回成功
+            final_ret += "✅ 补丁已应用（文件不在Git仓库中）"
+            commited = True
         # 用户确认最终结果
         with spinner.hidden():
             if commited:
@@ -231,6 +243,22 @@ def apply_patch(output_str: str, agent: Any) -> str:
             return final_ret
 
 
+def _is_file_in_git_repo(filepath: str) -> bool:
+    """检查文件是否在当前Git仓库中"""
+    import subprocess
+    try:
+        # 获取Git仓库根目录
+        repo_root = subprocess.run(
+            ['git', 'rev-parse', '--show-toplevel'],
+            capture_output=True,
+            text=True
+        ).stdout.strip()
+        
+        # 检查文件路径是否在仓库根目录下
+        return os.path.abspath(filepath).startswith(os.path.abspath(repo_root))
+    except:
+        return False
+
 def revert_file(filepath: str):
     """增强版git恢复，处理新文件"""
     import subprocess

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -354,6 +354,8 @@ def main() -> None:
                       help='Target platform name', default=None)
     parser.add_argument('-m', '--model', type=str,
                       help='Model name to use', default=None)
+    parser.add_argument('-r', '--requirement', type=str,
+                      help='Requirement to process', default=None)
     args = parser.parse_args()
 
     curr_dir = os.getcwd()
@@ -361,7 +363,10 @@ def main() -> None:
     PrettyOutput.print(f"当前目录: {git_dir}", OutputType.INFO)
 
     try:
-        user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
+        if args.requirement:
+            user_input = args.requirement
+        else:
+            user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
         if not user_input:
             sys.exit(0)
         agent = CodeAgent(platform=args.platform,

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_code_analysis/code_review.py

@@ -13,7 +13,8 @@ from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import ct, ot, init_env
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
 
 class CodeReviewTool:
@@ -559,7 +560,7 @@ class CodeReviewTool:
 {ct("REPORT")}""",
                     output_handler=[tool_registry],
                     platform=PlatformRegistry().get_thinking_platform(),
-                    auto_complete=True
+                    auto_complete=False
                 )
                 
                 # Determine if we need to split the diff due to size
@@ -616,9 +617,8 @@ class CodeReviewTool:
                         complete_prompt = user_prompt + "\n\n代码差异内容:\n```diff\n" + diff_output + "\n```"
                     
                     # Run the agent with the prompt
-                    with yaspin(text="正在分析代码变更...", color="cyan") as spinner:
-                        result = agent.run(complete_prompt)
-                        spinner.ok("✅")
+                    
+                    result = agent.run(complete_prompt)                    
                 finally:
                     # Clean up the temporary file
                     if os.path.exists(temp_file_path):

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_git_utils/git_commiter.py

@@ -14,7 +14,8 @@ from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.git_utils import find_git_root, has_uncommitted_changes
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import ct, ot, init_env
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.tag import ot, ct
 
 
 class GitCommitTool:

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_platform/base.py

@@ -3,7 +3,8 @@ import re
 from typing import List, Tuple
 from jarvis.jarvis_utils.globals import clear_read_file_record
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import ct, ot, get_context_token_count, while_success, while_true
+from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
+from jarvis.jarvis_utils.tag import ot, ct
 
 
 class BasePlatform(ABC):

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_platform_manager/main.py

@@ -1,3 +1,4 @@
+import os
 from jarvis.jarvis_platform.registry import PlatformRegistry
 import asyncio
 from fastapi import FastAPI, HTTPException
@@ -61,6 +62,7 @@ def chat_with_model(platform_name: str, model_name: str):
         platform.set_model_name(model_name)
         platform.set_suppress_output(False)
         PrettyOutput.print(f"连接到 {platform_name} 平台 {model_name} 模型", OutputType.SUCCESS)
+        PrettyOutput.print("可用命令: /bye - 退出聊天, /clear - 清除会话, /upload - 上传文件, /shell - 执行shell命令", OutputType.INFO)
 
         # Start conversation loop
         while True:
@@ -86,6 +88,45 @@ def chat_with_model(platform_name: str, model_name: str):
                     PrettyOutput.print(f"清除会话失败: {str(e)}", OutputType.ERROR)
                 continue
 
+            # Check if it is an upload command
+            if user_input.strip().startswith("/upload"):
+                try:
+                    file_path = user_input.strip()[8:].strip()
+                    if not file_path:
+                        PrettyOutput.print("请指定要上传的文件路径，例如: /upload /path/to/file 或 /upload \"/path/with spaces/file\"", OutputType.WARNING)
+                        continue
+                    
+                    # Remove quotes if present
+                    if (file_path.startswith('"') and file_path.endswith('"')) or (file_path.startswith("'") and file_path.endswith("'")):
+                        file_path = file_path[1:-1]
+                    
+                    PrettyOutput.print(f"正在上传文件: {file_path}", OutputType.INFO)
+                    if platform.upload_files([file_path]):
+                        PrettyOutput.print("文件上传成功", OutputType.SUCCESS)
+                    else:
+                        PrettyOutput.print("文件上传失败", OutputType.ERROR)
+                except Exception as e:
+                    PrettyOutput.print(f"上传文件失败: {str(e)}", OutputType.ERROR)
+                continue
+
+            # Check if it is a shell command
+            if user_input.strip().startswith("/shell"):
+                try:
+                    command = user_input.strip()[6:].strip()
+                    if not command:
+                        PrettyOutput.print("请指定要执行的shell命令，例如: /shell ls -l", OutputType.WARNING)
+                        continue
+                    
+                    PrettyOutput.print(f"执行命令: {command}", OutputType.INFO)
+                    return_code = os.system(command)
+                    if return_code == 0:
+                        PrettyOutput.print("命令执行完成", OutputType.SUCCESS)
+                    else:
+                        PrettyOutput.print(f"命令执行失败(返回码: {return_code})", OutputType.ERROR)
+                except Exception as ex:
+                    PrettyOutput.print(f"执行命令失败: {str(ex)}", OutputType.ERROR)
+                continue
+
             try:
                 # Send to model and get reply
                 response = platform.chat_until_success(user_input)

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_smart_shell/main.py

@@ -2,33 +2,63 @@
 import argparse
 import os
 import sys
-import readline
 from typing import Optional
 
-from yaspin import yaspin
-
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_shell_name
 from jarvis.jarvis_utils.input import get_multiline_input
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
-def execute_command(command: str) -> None:
-    """Show command and allow user to edit, then execute, Ctrl+C to cancel"""
-    try:
-        print("生成的命令 (可以编辑, 按回车执行, Ctrl+C 取消):")
-        # Pre-fill input line
-        readline.set_startup_hook(lambda: readline.insert_text(command))
-        try:
-            edited_command = input("> ")
-            if edited_command.strip():  # Ensure command is not empty
-                os.system(edited_command)
-        except KeyboardInterrupt:
-            PrettyOutput.print("执行取消", OutputType.INFO)
-        finally:
-            readline.set_startup_hook()  # Clear pre-filled
-    except Exception as e:
-        PrettyOutput.print(f"执行命令失败: {str(e)}", OutputType.WARNING)
+def execute_command(command: str, should_run: bool) -> None:
+    """Print command without execution"""
+    print(command)
+    if should_run:
+        os.system(command)
+
+
+def install_fish_completion() -> int:
+    """Install fish shell command completion if not already installed
+    
+    Returns:
+        int: 0 if success, 1 if failed
+    """
+    if get_shell_name() != "fish":
+        print("当前不是fish shell，无需安装")
+        return 0
+        
+    # 使用fish命令检查函数是否已加载
+    check_cmd = 'functions --names | grep fish_command_not_found > /dev/null && echo "defined" || echo "undefined"'
+    result = os.popen(f'fish -c \'{check_cmd}\'').read().strip()
+    
+    if result == "defined":
+        print("fish_command_not_found函数已加载，无需安装")
+        return 0
+        
+    config_file = os.path.expanduser("~/.config/fish/config.fish")
+    
+    # 检查文件内容是否已定义但未加载
+    if os.path.exists(config_file):
+        with open(config_file, 'r') as config:
+            if "function fish_command_not_found" in config.read():
+                print("fish_command_not_found函数已定义但未加载，请执行: source ~/.config/fish/config.fish")
+                return 0
+                
+    # 创建config.fish文件如果不存在
+    os.makedirs(os.path.dirname(config_file), exist_ok=True)
+    
+    # 追加函数定义到config.fish
+    with open(config_file, 'a') as config:
+        config.write("""
+function fish_command_not_found
+    commandline -r (jss $argv)
+end
+
+function __fish_command_not_found_handler --on-event fish_command_not_found
+    fish_command_not_found $argv
+end
+""")
+    print("Fish shell命令补全功能已安装到config.fish，请执行: source ~/.config/fish/config.fish")
+    return 0
 
 
 def process_request(request: str) -> Optional[str]:
@@ -97,9 +127,7 @@ Output: find . -name "*.py"
         prefix = f"Current path: {current_path}\n"
         prefix += f"Current shell: {shell}\n"
 
-        with yaspin(text="正在生成命令...", color="cyan") as spinner:
-            result = model.chat_until_success(prefix + request)
-            spinner.ok("✅ 命令生成成功")
+        result = model.chat_until_success(prefix + request)
 
         # 提取命令
         if result and isinstance(result, str):
@@ -108,8 +136,7 @@ Output: find . -name "*.py"
 
         return None
 
-    except Exception as e:
-        PrettyOutput.print(f"处理请求失败: {str(e)}", OutputType.WARNING)
+    except Exception:
         return None
 
 def main():
@@ -123,6 +150,7 @@ Example:
   %(prog)s "Find all Python files in the current directory"
   %(prog)s "Compress all jpg images"
   %(prog)s "Find documents modified in the last week"
+  %(prog)s install
 """)
 
     # 修改为可选参数，添加从stdin读取的支持
@@ -131,21 +159,34 @@ Example:
         nargs='?',  # 设置为可选参数
         help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取"
     )
+    
+    # 添加install子命令
+    parser.add_argument(
+        "--install",
+        action="store_true",
+        help="安装fish shell的命令补全功能"
+    )
 
     # 解析参数
     args = parser.parse_args()
 
+    # 处理install命令
+    if args.install:
+        return install_fish_completion()
+    
+    should_run = False
+
     # 添加标准输入处理
     if not args.request:
         # 检查是否在交互式终端中运行
         args.request = get_multiline_input(tip="请输入您要执行的功能：")
-
+        should_run = True
     # 处理请求
     command = process_request(args.request)
 
     # 输出结果
     if command:
-        execute_command(command)  # 显示并执行命令
+        execute_command(command, should_run)  # 显示并执行命令
         return 0
     else:
         return 1

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_tools/create_code_agent.py

@@ -2,7 +2,6 @@ from typing import Dict, Any
 import os
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
-from jarvis.jarvis_code_analysis.code_review import CodeReviewTool, extract_code_report
 from jarvis.jarvis_utils.git_utils import get_latest_commit_hash, has_uncommitted_changes
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -69,23 +68,6 @@ class CreateCodeAgentTool:
                 # Get new commit hash after development
                 end_commit = get_latest_commit_hash()
 
-                # Step 3: Code Review
-                PrettyOutput.print("开始代码审查...", OutputType.INFO)
-                reviewer = CodeReviewTool()
-                review_result = reviewer.execute({
-                    "review_type": "range",
-                    "start_commit": start_commit,
-                    "end_commit": end_commit,
-                    "root_dir": root_dir
-                })
-
-                if not review_result["success"]:
-                    return {
-                        "success": False,
-                        "stderr": "Code review failed: " + review_result["stderr"],
-                        "stdout": ""
-                    }
-
                 # Step 4: Generate Summary
                 summary = f"""开发总结:
 
@@ -95,8 +77,6 @@ class CreateCodeAgentTool:
 需求:
 {requirement}
 
-代码审查结果:
-{extract_code_report(review_result["stdout"])}
 """
 
                 return {

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_tools/find_methodology.py

@@ -36,7 +36,8 @@ class FindMethodologyTool:
                 }
 
             with yaspin(text="搜索相关方法论...", color="cyan") as spinner:
-                methodology_prompt = load_methodology(args["query"])
+                with spinner.hidden():
+                    methodology_prompt = load_methodology(args["query"])
 
                 if methodology_prompt:
                     spinner.text = "找到相关方法论"

{jarvis_ai_assistant-0.1.154 → jarvis_ai_assistant-0.1.155}/src/jarvis/jarvis_tools/registry.py

@@ -17,7 +17,8 @@ from jarvis.jarvis_utils.config import (
 )
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import ct, ot, init_env
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_mcp.stdio_mcp_client import StdioMcpClient
 from jarvis.jarvis_mcp.sse_mcp_client import SSEMcpClient
 from jarvis.jarvis_mcp import McpClient