jarvis-ai-assistant 0.3.18__tar.gz → 0.3.20__tar.gz

{jarvis_ai_assistant-0.3.18/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.18
+Version: 0.3.20
 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.3.18 → jarvis_ai_assistant-0.3.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.18"
+version = "0.3.20"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.18",
+    version="0.3.20",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.18"
+__version__ = "0.3.20"

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/__init__.py

@@ -223,6 +223,7 @@ class Agent:
         use_analysis: Optional[bool] = None,
         force_save_memory: Optional[bool] = None,
         files: Optional[List[str]] = None,
+        confirm_callback: Optional[Callable[[str, bool], bool]] = None,
     ):
         """初始化Jarvis Agent实例
 
@@ -241,6 +242,7 @@ class Agent:
             use_methodology: 是否使用方法论
             use_analysis: 是否使用任务分析
             force_save_memory: 是否强制保存记忆
+            confirm_callback: 用户确认回调函数，签名为 (tip: str, default: bool) -> bool；默认使用CLI的user_confirm
         """
         # 基础属性初始化
         self.files = files or []
@@ -254,6 +256,11 @@ class Agent:
         self.user_data: Dict[str, Any] = {}
         self.after_tool_call_cb: Optional[Callable[[Agent], None]] = None
 
+        # 用户确认回调：默认使用 CLI 的 user_confirm，可由外部注入以支持 TUI/GUI
+        self.user_confirm: Callable[[str, bool], bool] = (
+            confirm_callback or user_confirm  # type: ignore[assignment]
+        )
+
         # 初始化模型和会话
         self._init_model(llm_type, model_group)
         self._init_session()
@@ -413,6 +420,19 @@ class Agent:
         """Sets the flag to run input handlers on the next turn."""
         self.run_input_handlers_next_turn = value
 
+    def _multiline_input(self, tip: str, print_on_empty: bool) -> str:
+        """
+        Safe wrapper for multiline input to optionally suppress empty-input notice.
+        If the configured multiline_inputer supports 'print_on_empty' keyword, pass it;
+        otherwise, fall back to calling with a single argument for compatibility.
+        """
+        try:
+            # Try to pass the keyword for enhanced input handler
+            return self.multiline_inputer(tip, print_on_empty=print_on_empty)  # type: ignore
+        except TypeError:
+            # Fallback for custom handlers that only accept one argument
+            return self.multiline_inputer(tip)  # type: ignore
+
     def set_after_tool_call_cb(self, cb: Callable[[Any], None]):  # type: ignore
         """设置工具调用后回调函数。
 
@@ -527,17 +547,17 @@ class Agent:
         注意:
             仅生成摘要，不修改对话状态
         """
-        print("📄 正在总结对话历史...")
+
         try:
             if not self.model:
                 raise RuntimeError("Model not initialized")
             summary = self.model.chat_until_success(
                 self.session.prompt + "\n" + SUMMARY_REQUEST_PROMPT
             )  # type: ignore
-            print("✅ 总结对话历史完成")
+
             return summary
         except Exception as e:
-            print("❌ 总结对话历史失败")
+            PrettyOutput.print("总结对话历史失败", OutputType.ERROR)
             return ""
 
     def _summarize_and_clear_history(self) -> str:
@@ -559,7 +579,7 @@ class Agent:
         """
         # 在清理历史之前，提示用户保存重要记忆
         if self.force_save_memory:
-            print("📌 对话历史即将被总结和清理，请先保存重要信息...")
+            PrettyOutput.print("对话历史即将被总结和清理，请先保存重要信息...", OutputType.INFO)
             self.memory_manager.prompt_memory_save()
 
         if self._should_use_file_upload():
@@ -634,12 +654,12 @@ class Agent:
         self._check_and_organize_memory()
 
         if self.need_summary:
-            print("📄 正在生成总结...")
+
             self.session.prompt = self.summary_prompt
             if not self.model:
                 raise RuntimeError("Model not initialized")
             ret = self.model.chat_until_success(self.session.prompt)  # type: ignore
-            print("✅ 总结生成完成")
+
             return ret
 
         return "任务完成"
@@ -789,7 +809,7 @@ class Agent:
             return None
 
         set_interrupt(False)
-        user_input = self.multiline_inputer(f"模型交互期间被中断，请输入用户干预信息：")
+        user_input = self._multiline_input("模型交互期间被中断，请输入用户干预信息：", False)
 
         self.run_input_handlers_next_turn = True
 
@@ -798,7 +818,7 @@ class Agent:
             return self._complete_task(auto_completed=False)
 
         if any(handler.can_handle(current_response) for handler in self.output_handler):
-            if user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
+            if self.user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
                 self.session.prompt = f"被用户中断，用户补充信息为：{user_input}\n\n用户同意继续工具调用。"
                 return None  # 继续执行工具调用
             else:
@@ -814,9 +834,7 @@ class Agent:
         返回:
             str: "continue" 或 "complete"
         """
-        user_input = self.multiline_inputer(
-            f"{self.name}: 请输入，或输入空行来结束当前任务："
-        )
+        user_input = self._multiline_input(f"{self.name}: 请输入，或输入空行来结束当前任务：", False)
 
         if user_input:
             self.session.prompt = user_input
@@ -894,7 +912,7 @@ class Agent:
             f"并且存在3个以上标签重叠的记忆。\n"
             f"是否立即整理记忆库以优化性能和相关性？"
         )
-        if user_confirm(prompt, default=True):
+        if self.user_confirm(prompt, True):
             PrettyOutput.print(
                 f"正在开始整理 '{scope_name}' ({memory_type}) 记忆库...",
                 OutputType.INFO,

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/config_editor.py

@@ -40,7 +40,7 @@ class ConfigEditor:
 
         if editor:
             try:
-                subprocess.run([editor, str(config_file_path)], check=True)
+                subprocess.run([editor, str(config_file_path)], check=True, shell=(platform.system() == "Windows"))
                 raise typer.Exit(code=0)
             except (subprocess.CalledProcessError, FileNotFoundError) as e:
                 PrettyOutput.print(f"Failed to open editor: {e}", OutputType.ERROR)

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/edit_file_handler.py

@@ -68,7 +68,7 @@ class EditFileHandler(OutputHandler):
                 {"SEARCH": diff["SEARCH"], "REPLACE": diff["REPLACE"]} for diff in diffs
             ]
 
-            print(f"📝 正在处理文件 {file_path}...")
+
             success, result = self._fast_edit(file_path, file_patches)
 
             if success:
@@ -208,7 +208,7 @@ class EditFileHandler(OutputHandler):
                     modified_content = modified_content.replace(
                         exact_search, replace_text, 1
                     )
-                    print(f"✅ 补丁 #{patch_count} 应用成功")
+
                     found = True
                 else:
                     # 如果匹配不到，并且search与replace块的首尾都是换行，尝试去掉第一个和最后一个换行
@@ -224,7 +224,7 @@ class EditFileHandler(OutputHandler):
                             modified_content = modified_content.replace(
                                 stripped_search, stripped_replace, 1
                             )
-                            print(f"✅ 补丁 #{patch_count} 应用成功 (自动去除首尾换行)")
+
                             found = True
 
                     if not found:
@@ -253,9 +253,7 @@ class EditFileHandler(OutputHandler):
                                 modified_content = modified_content.replace(
                                     indented_search, indented_replace, 1
                                 )
-                                print(
-                                    f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)"
-                                )
+
                                 found = True
                                 break
 
@@ -263,10 +261,7 @@ class EditFileHandler(OutputHandler):
                     successful_patches += 1
                 else:
                     error_msg = "搜索文本在文件中不存在"
-                    PrettyOutput.print(
-                        f"{error_msg}：\n{search_text}",
-                        output_type=OutputType.WARNING,
-                    )
+
                     failed_patches.append({"patch": patch, "error": error_msg})
 
             # 写入修改后的内容
@@ -284,12 +279,12 @@ class EditFileHandler(OutputHandler):
                     f"失败: {len(failed_patches)}/{patch_count}.\n"
                     f"失败详情:\n" + "\n".join(error_details)
                 )
-                print(f"❌ {summary}")
+                PrettyOutput.print(summary, OutputType.ERROR)
                 return False, summary
 
-            print(f"✅ 文件 {file_path} 修改完成，应用了 {patch_count} 个补丁")
+
             return True, modified_content
 
         except Exception as e:
-            print(f"❌ 文件修改失败: {str(e)}")
+            PrettyOutput.print(f"文件修改失败: {str(e)}", OutputType.ERROR)
             return False, f"文件修改失败: {str(e)}"

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/memory_manager.py

@@ -74,7 +74,7 @@ class MemoryManager:
         if "save_memory" not in tool_names:
             return
 
-        print("🔍 正在分析是否有值得记忆的信息...")
+
 
         # 构建提示词，让大模型自己判断并保存记忆
         prompt = """请回顾本次任务的整个过程，判断是否有值得长期记忆或项目记忆的信息。
@@ -97,12 +97,12 @@ class MemoryManager:
 
             # 根据响应判断是否保存了记忆
             if "save_memory" in response:
-                print("✅ 已自动保存有价值的信息到记忆系统")
+                PrettyOutput.print("已自动保存有价值的信息到记忆系统", OutputType.SUCCESS)
             else:
-                print("📝 本次任务没有特别需要记忆的信息")
+                PrettyOutput.print("本次任务没有特别需要记忆的信息", OutputType.INFO)
 
         except Exception as e:
-            print(f"❌ 记忆分析失败: {str(e)}")
+            PrettyOutput.print(f"记忆分析失败: {str(e)}", OutputType.ERROR)
 
     def add_memory_prompts_to_addon(self, addon_prompt: str, tool_registry) -> str:
         """在附加提示中添加记忆相关提示"""

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/shell_input_handler.py

@@ -11,9 +11,24 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     if len(cmdline) == 0:
         return user_input, False
     else:
-        script = "\n".join([c[1:] for c in cmdline])
+        marker = "# JARVIS-NOCONFIRM"
+
+        def _clean(line: str) -> str:
+            s = line[1:]  # remove leading '!'
+            # strip no-confirm marker if present
+            idx = s.find(marker)
+            if idx != -1:
+                s = s[:idx]
+            return s.rstrip()
+
+        # Build script while stripping the no-confirm marker from each line
+        script = "\n".join([_clean(c) for c in cmdline])
         PrettyOutput.print(script, OutputType.CODE, lang="bash")
-        if user_confirm(f"是否要执行以上shell脚本？", default=True):
+
+        # If any line contains the no-confirm marker, skip the pre-execution confirmation
+        no_confirm = any(marker in c for c in cmdline)
+
+        if no_confirm or user_confirm(f"是否要执行以上shell脚本？", default=True):
             from jarvis.jarvis_tools.registry import ToolRegistry
 
             output = ToolRegistry().handle_tool_calls(

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/task_analyzer.py

@@ -8,6 +8,7 @@ from typing import Optional
 from jarvis.jarvis_utils.globals import get_interrupt, set_interrupt
 from jarvis.jarvis_utils.input import user_confirm
 from jarvis.jarvis_agent.prompts import TASK_ANALYSIS_PROMPT
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class TaskAnalyzer:
@@ -24,7 +25,7 @@ class TaskAnalyzer:
 
     def analysis_task(self, satisfaction_feedback: str = ""):
         """分析任务并生成方法论"""
-        print("🔍 正在分析任务...")
+
         try:
             # 准备分析提示
             self.agent.session.prompt = self._prepare_analysis_prompt(
@@ -37,9 +38,9 @@ class TaskAnalyzer:
             # 循环处理工具调用，直到没有工具调用为止
             self._process_analysis_loop()
 
-            print("✅ 分析完成")
+
         except Exception as e:
-            print("❌ 分析失败")
+            PrettyOutput.print("分析失败", OutputType.ERROR)
 
     def _prepare_analysis_prompt(self, satisfaction_feedback: str) -> str:
         """准备分析提示"""

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/task_manager.py

@@ -29,7 +29,7 @@ class TaskManager:
         data_dir = get_data_dir()
         pre_command_path = os.path.join(data_dir, "pre-command")
         if os.path.exists(pre_command_path):
-            print(f"🔍 从{pre_command_path}加载预定义任务...")
+            PrettyOutput.print(f"从{pre_command_path}加载预定义任务...", OutputType.INFO)
             try:
                 with open(
                     pre_command_path, "r", encoding="utf-8", errors="ignore"
@@ -39,15 +39,15 @@ class TaskManager:
                     for name, desc in user_tasks.items():
                         if desc:
                             tasks[str(name)] = str(desc)
-                print(f"✅ 预定义任务加载完成 {pre_command_path}")
+                PrettyOutput.print(f"预定义任务加载完成 {pre_command_path}", OutputType.SUCCESS)
             except (yaml.YAMLError, OSError):
-                print(f"❌ 预定义任务加载失败 {pre_command_path}")
+                PrettyOutput.print(f"预定义任务加载失败 {pre_command_path}", OutputType.ERROR)
 
         # Check .jarvis/pre-command in current directory
         pre_command_path = ".jarvis/pre-command"
         if os.path.exists(pre_command_path):
             abs_path = os.path.abspath(pre_command_path)
-            print(f"🔍 从{abs_path}加载预定义任务...")
+            PrettyOutput.print(f"从{abs_path}加载预定义任务...", OutputType.INFO)
             try:
                 with open(
                     pre_command_path, "r", encoding="utf-8", errors="ignore"
@@ -57,9 +57,9 @@ class TaskManager:
                     for name, desc in local_tasks.items():
                         if desc:
                             tasks[str(name)] = str(desc)
-                print(f"✅ 预定义任务加载完成 {pre_command_path}")
+                PrettyOutput.print(f"预定义任务加载完成 {pre_command_path}", OutputType.SUCCESS)
             except (yaml.YAMLError, OSError):
-                print(f"❌ 预定义任务加载失败 {pre_command_path}")
+                PrettyOutput.print(f"预定义任务加载失败 {pre_command_path}", OutputType.ERROR)
 
         return tasks
 

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/tool_executor.py

@@ -42,9 +42,9 @@ def execute_tool_call(response: str, agent: "Agent") -> Tuple[bool, Any]:
         f"需要执行{tool_to_execute.name()}确认执行？", True
     ):
         try:
-            print(f"🔧 正在执行{tool_to_execute.name()}...")
+
             result = tool_to_execute.handle(response, agent)
-            print(f"✅ {tool_to_execute.name()}执行完成")
+
             return result
         except Exception as e:
             PrettyOutput.print(f"工具执行失败: {str(e)}", OutputType.ERROR)

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -205,11 +205,11 @@ class CodeAgent:
         返回:
             str: git根目录路径
         """
-        print("🔍 正在查找git根目录...")
+
         curr_dir = os.getcwd()
         git_dir = find_git_root_and_cd(curr_dir)
         self.root_dir = git_dir
-        print(f"✅ 已找到git根目录: {git_dir}")
+
         return git_dir
 
     def _update_gitignore(self, git_dir: str) -> None:
@@ -218,33 +218,30 @@ class CodeAgent:
         参数:
             git_dir: git根目录路径
         """
-        print("📝 正在检查.gitignore文件...")
+
         gitignore_path = os.path.join(git_dir, ".gitignore")
         jarvis_ignore = ".jarvis"
 
         if not os.path.exists(gitignore_path):
             with open(gitignore_path, "w", encoding="utf-8") as f:
                 f.write(f"{jarvis_ignore}\n")
-            print(f"✅ 已创建.gitignore文件并添加'{jarvis_ignore}'")
+            PrettyOutput.print(f"已创建 .gitignore 并添加 '{jarvis_ignore}'", OutputType.SUCCESS)
         else:
             with open(gitignore_path, "r+", encoding="utf-8") as f:
                 content = f.read()
                 if jarvis_ignore not in content.splitlines():
                     f.write(f"\n{jarvis_ignore}\n")
-                    print(f"✅ 已更新.gitignore文件，添加'{jarvis_ignore}'")
-                else:
-                    print("ℹ️ .jarvis已在.gitignore中")
+                    PrettyOutput.print(
+                        f"已更新 .gitignore，添加 '{jarvis_ignore}'", OutputType.SUCCESS
+                    )
 
     def _handle_git_changes(self, prefix: str, suffix: str) -> None:
         """处理git仓库中的未提交修改"""
-        print("🔄 正在检查未提交的修改...")
+
         if has_uncommitted_changes():
-            print("⏳ 发现未提交修改，正在处理...")
+
             git_commiter = GitCommitTool()
             git_commiter.execute({"prefix": prefix, "suffix": suffix})
-            print("✅ 未提交修改已处理完成")
-        else:
-            print("✅ 没有未提交的修改")
 
     def _init_env(self, prefix: str, suffix: str) -> None:
         """初始化环境，组合以下功能：
@@ -253,13 +250,12 @@ class CodeAgent:
         3. 处理未提交的修改
         4. 配置git对换行符变化不敏感
         """
-        print("🚀 正在初始化环境...")
+
         git_dir = self._find_git_root()
         self._update_gitignore(git_dir)
         self._handle_git_changes(prefix, suffix)
         # 配置git对换行符变化不敏感
         self._configure_line_ending_settings()
-        print("✅ 环境初始化完成")
 
     def _configure_line_ending_settings(self) -> None:
         """配置git对换行符变化不敏感，只在当前设置与目标设置不一致时修改"""
@@ -285,17 +281,17 @@ class CodeAgent:
                 need_change = True
 
         if not need_change:
-            print("✅ git换行符敏感设置已符合要求")
+
             return
 
         PrettyOutput.print(
             "⚠️ 正在修改git换行符敏感设置，这会影响所有文件的换行符处理方式",
             OutputType.WARNING,
         )
-        print("将进行以下设置：")
+        PrettyOutput.print("将进行以下设置：", OutputType.INFO)
         for key, value in target_settings.items():
             current = current_settings.get(key, "未设置")
-            print(f"  {key}: {current} -> {value}")
+            PrettyOutput.print(f"{key}: {current} -> {value}", OutputType.INFO)
 
         # 直接执行设置，不需要用户确认
         for key, value in target_settings.items():
@@ -305,7 +301,7 @@ class CodeAgent:
         if sys.platform.startswith("win"):
             self._handle_windows_line_endings()
 
-        print("✅ git换行符敏感设置已更新")
+        PrettyOutput.print("git换行符敏感设置已更新", OutputType.SUCCESS)
 
     def _handle_windows_line_endings(self) -> None:
         """在Windows系统上处理换行符问题，提供建议而非强制修改"""
@@ -319,10 +315,8 @@ class CodeAgent:
             if any(keyword in content for keyword in ["text=", "eol=", "binary"]):
                 return
 
-        print(
-            "\n💡 提示：在Windows系统上，建议配置.gitattributes文件来避免换行符问题。"
-        )
-        print("这可以防止仅因换行符不同而导致整个文件被标记为修改。")
+        PrettyOutput.print("提示：在Windows系统上，建议配置 .gitattributes 文件来避免换行符问题。", OutputType.INFO)
+        PrettyOutput.print("这可以防止仅因换行符不同而导致整个文件被标记为修改。", OutputType.INFO)
 
         if user_confirm("是否要创建一个最小化的.gitattributes文件？", False):
             # 最小化的内容，只影响特定类型的文件
@@ -341,20 +335,18 @@ class CodeAgent:
             if not os.path.exists(gitattributes_path):
                 with open(gitattributes_path, "w", encoding="utf-8", newline="\n") as f:
                     f.write(minimal_content)
-                print("✅ 已创建最小化的.gitattributes文件")
+                PrettyOutput.print("已创建最小化的 .gitattributes 文件", OutputType.SUCCESS)
             else:
-                print("📝 将以下内容追加到现有.gitattributes文件：")
-                print(minimal_content)
+                PrettyOutput.print("将以下内容追加到现有 .gitattributes 文件：", OutputType.INFO)
+                PrettyOutput.print(minimal_content, OutputType.CODE, lang="text")
                 if user_confirm("是否追加到现有文件？", True):
                     with open(
                         gitattributes_path, "a", encoding="utf-8", newline="\n"
                     ) as f:
                         f.write("\n" + minimal_content)
-                    print("✅ 已更新.gitattributes文件")
+                    PrettyOutput.print("已更新 .gitattributes 文件", OutputType.SUCCESS)
         else:
-            print(
-                "ℹ️ 跳过.gitattributes文件创建。如果遇到换行符问题，可以手动创建此文件。"
-            )
+            PrettyOutput.print("跳过 .gitattributes 文件创建。如遇换行符问题，可手动创建此文件。", OutputType.INFO)
 
     def _record_code_changes_stats(self, diff_text: str) -> None:
         """记录代码变更的统计信息。

{jarvis_ai_assistant-0.3.18 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_code_analysis/code_review.py

@@ -286,7 +286,6 @@ class CodeReviewTool:
                 diff_output = ""
 
                 # Build git diff command based on review type
-                print("📊 正在获取代码变更...")
 
                 if review_type == "commit":
                     if "commit_sha" not in args:
@@ -458,7 +457,6 @@ class CodeReviewTool:
                 diff_output = review_info + diff_output
 
                 PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
-                print("✅ 代码变更获取完成")
 
                 system_prompt = """<code_review_guide>
 <role>
@@ -753,10 +751,10 @@ class CodeReviewTool:
                                 "stdout": "",
                                 "stderr": "代码差异太大，无法处理",
                             }
-                        print("📤 正在上传代码差异文件...")
+
                         upload_success = agent.model.upload_files([temp_file_path])
                         if upload_success:
-                            print("✅ 已成功上传代码差异文件")
+                            pass
                         else:
                             return {
                                 "success": False,