jarvis-ai-assistant 0.7.0__py3-none-any.whl → 0.7.8__py3-none-any.whl

jarvis/jarvis_sec/workflow.py

@@ -187,6 +187,9 @@ def run_with_agent(
     report_file: Optional[str] = None,
     cluster_limit: int = 50,
     exclude_dirs: Optional[List[str]] = None,
+    enable_verification: bool = True,
+    force_save_memory: bool = False,
+    output_file: Optional[str] = None,
 ) -> str:
     """
     使用单Agent逐条子任务分析模式运行（与 jarvis.jarvis_sec.__init__ 中保持一致）。
@@ -199,6 +202,7 @@ def run_with_agent(
     - report_file: JSONL 报告文件路径（可选，透传）
     - cluster_limit: 聚类时每批次最多处理的告警数（默认 50），当单个文件告警过多时按批次进行聚类
     - exclude_dirs: 要排除的目录列表（可选），默认已包含构建产物（build, out, target, dist, bin, obj）、依赖目录（third_party, vendor, deps, dependencies, libs, libraries, external, node_modules）、测试目录（test, tests, __tests__, spec, testsuite, testdata）、性能测试目录（benchmark, benchmarks, perf, performance, bench, benches, profiling, profiler）、示例目录（example, examples）、临时/缓存（tmp, temp, cache, .cache）、文档（docs, doc, documentation）、生成代码（generated, gen）和其他（mocks, fixtures, samples, sample, playground, sandbox）
+    - enable_verification: 是否启用二次验证（默认 True），关闭后分析Agent确认的问题将直接写入报告
     """
     from jarvis.jarvis_sec import run_security_analysis  # 延迟导入，避免循环
     return run_security_analysis(
@@ -208,6 +212,9 @@ def run_with_agent(
         report_file=report_file,
         cluster_limit=cluster_limit,
         exclude_dirs=exclude_dirs,
+        enable_verification=enable_verification,
+        force_save_memory=force_save_memory,
+        output_file=output_file,
     )
 
 

jarvis/jarvis_smart_shell/main.py

@@ -9,7 +9,6 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_shell_name, set_config
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.utils import init_env
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 app = typer.Typer(
     help="将自然语言要求转换为shell命令",
@@ -115,8 +114,8 @@ def install_jss_completion(
 ) -> None:
     """为指定的shell安装'命令未找到'处理器，实现自然语言命令建议"""
     if shell not in ("fish", "bash", "zsh"):
-        PrettyOutput.print(
-            f"错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh", OutputType.ERROR
+        print(
+            f"❌ 错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh"
         )
         raise typer.Exit(code=1)
 
@@ -125,7 +124,7 @@ def install_jss_completion(
         start_marker, end_marker = _get_markers()
 
         if not os.path.exists(config_file):
-            PrettyOutput.print("未找到 config.fish 文件，将创建新文件", OutputType.INFO)
+            print("ℹ️ 未找到 config.fish 文件，将创建新文件")
             os.makedirs(os.path.dirname(config_file), exist_ok=True)
             with open(config_file, "w") as f:
                 f.write("")
@@ -134,9 +133,8 @@ def install_jss_completion(
             content = f.read()
 
         if start_marker in content:
-            PrettyOutput.print(
-                "JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish",
-                OutputType.SUCCESS,
+            print(
+                "✅ JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish"
             )
             return
 
@@ -157,16 +155,15 @@ end
 {end_marker}
 """
             )
-        PrettyOutput.print(
-            "JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish",
-            OutputType.SUCCESS,
+        print(
+            "✅ JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish"
         )
     elif shell == "bash":
         config_file = _get_bash_config_file()
         start_marker, end_marker = _get_bash_markers()
 
         if not os.path.exists(config_file):
-            PrettyOutput.print("未找到 ~/.bashrc 文件，将创建新文件", OutputType.INFO)
+            print("ℹ️ 未找到 ~/.bashrc 文件，将创建新文件")
             os.makedirs(os.path.dirname(config_file), exist_ok=True)
             with open(config_file, "w") as f:
                 f.write("")
@@ -175,9 +172,8 @@ end
             content = f.read()
 
         if start_marker in content:
-            PrettyOutput.print(
-                "JSS bash completion 已安装，请执行: source ~/.bashrc",
-                OutputType.SUCCESS,
+            print(
+                "✅ JSS bash completion 已安装，请执行: source ~/.bashrc"
             )
             return
         else:
@@ -221,16 +217,15 @@ command_not_found_handle() {{
 {end_marker}
 """
                 )
-            PrettyOutput.print(
-                "JSS bash completion 已安装，请执行: source ~/.bashrc",
-                OutputType.SUCCESS,
+            print(
+                "✅ JSS bash completion 已安装，请执行: source ~/.bashrc"
             )
     elif shell == "zsh":
         config_file = _get_zsh_config_file()
         start_marker, end_marker = _get_zsh_markers()
 
         if not os.path.exists(config_file):
-            PrettyOutput.print("未找到 ~/.zshrc 文件，将创建新文件", OutputType.INFO)
+            print("ℹ️ 未找到 ~/.zshrc 文件，将创建新文件")
             os.makedirs(os.path.dirname(config_file), exist_ok=True)
             with open(config_file, "w") as f:
                 f.write("")
@@ -239,8 +234,8 @@ command_not_found_handle() {{
             content = f.read()
 
         if start_marker in content:
-            PrettyOutput.print(
-                "JSS zsh completion 已安装，请执行: source ~/.zshrc", OutputType.SUCCESS
+            print(
+                "✅ JSS zsh completion 已安装，请执行: source ~/.zshrc"
             )
             return
 
@@ -288,55 +283,11 @@ command_not_found_handler() {{
 {end_marker}
 """
             )
-        PrettyOutput.print(
-            "JSS zsh completion 已安装，请执行: source ~/.zshrc", OutputType.SUCCESS
+        print(
+            "✅ JSS zsh completion 已安装，请执行: source ~/.zshrc"
         )
         return
 
-        with open(config_file, "a") as f:
-            f.write(
-                f"""
-{start_marker}
-# Bash 'command not found' handler for JSS
-# 行为：
-# - 生成可编辑的建议命令，用户可直接编辑后回车执行
-# - 非交互模式下仅打印建议
-command_not_found_handle() {{
-    local cmd="$1"
-    shift || true
-    local text="$cmd $*"
-
-    # 与 fish 行为保持一致：对过短输入不处理
-    if [ ${{#text}} -lt 10 ]; then
-        return 127
-    fi
-
-    local suggestion edited
-    suggestion=$(jss request "$text")
-    if [ -n "$suggestion" ]; then
-        # 交互式：用 readline 预填命令，用户可直接回车执行或编辑
-        if [[ $- == *i* ]]; then
-            edited="$suggestion"
-            # -e 启用 readline；-i 预填默认值；无提示前缀，使体验更接近 fish 的“替换命令行”
-            read -e -i "$edited" edited
-            if [ -n "$edited" ]; then
-                eval "$edited"
-                return $?
-            fi
-        else
-            # 非交互：仅打印建议
-            printf '%s\n' "$suggestion"
-        fi
-    fi
-    return 127
-}}
-{end_marker}
-"""
-            )
-        PrettyOutput.print(
-            "JSS bash completion 已安装，请执行: source ~/.bashrc", OutputType.SUCCESS
-        )
-
 
 @app.command("uninstall")
 def uninstall_jss_completion(
@@ -344,8 +295,8 @@ def uninstall_jss_completion(
 ) -> None:
     """卸载JSS shell'命令未找到'处理器"""
     if shell not in ("fish", "bash", "zsh"):
-        PrettyOutput.print(
-            f"错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh", OutputType.ERROR
+        print(
+            f"❌ 错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh"
         )
         raise typer.Exit(code=1)
 
@@ -354,8 +305,8 @@ def uninstall_jss_completion(
         start_marker, end_marker = _get_markers()
 
         if not os.path.exists(config_file):
-            PrettyOutput.print(
-                "未找到 JSS fish completion 配置，无需卸载", OutputType.INFO
+            print(
+                "ℹ️ 未找到 JSS fish completion 配置，无需卸载"
             )
             return
 
@@ -363,8 +314,8 @@ def uninstall_jss_completion(
             content = f.read()
 
         if start_marker not in content:
-            PrettyOutput.print(
-                "未找到 JSS fish completion 配置，无需卸载", OutputType.INFO
+            print(
+                "ℹ️ 未找到 JSS fish completion 配置，无需卸载"
             )
             return
 
@@ -373,17 +324,16 @@ def uninstall_jss_completion(
         with open(config_file, "w") as f:
             f.write(new_content)
 
-        PrettyOutput.print(
-            "JSS fish completion 已卸载，请执行: source ~/.config/fish/config.fish",
-            OutputType.SUCCESS,
+        print(
+            "✅ JSS fish completion 已卸载，请执行: source ~/.config/fish/config.fish"
         )
     elif shell == "bash":
         config_file = _get_bash_config_file()
         start_marker, end_marker = _get_bash_markers()
 
         if not os.path.exists(config_file):
-            PrettyOutput.print(
-                "未找到 JSS bash completion 配置，无需卸载", OutputType.INFO
+            print(
+                "ℹ️ 未找到 JSS bash completion 配置，无需卸载"
             )
             return
 
@@ -391,8 +341,8 @@ def uninstall_jss_completion(
             content = f.read()
 
         if start_marker not in content:
-            PrettyOutput.print(
-                "未找到 JSS bash completion 配置，无需卸载", OutputType.INFO
+            print(
+                "ℹ️ 未找到 JSS bash completion 配置，无需卸载"
             )
             return
 
@@ -401,16 +351,16 @@ def uninstall_jss_completion(
         with open(config_file, "w") as f:
             f.write(new_content)
 
-        PrettyOutput.print(
-            "JSS bash completion 已卸载，请执行: source ~/.bashrc", OutputType.SUCCESS
+        print(
+            "✅ JSS bash completion 已卸载，请执行: source ~/.bashrc"
         )
     elif shell == "zsh":
         config_file = _get_zsh_config_file()
         start_marker, end_marker = _get_zsh_markers()
 
         if not os.path.exists(config_file):
-            PrettyOutput.print(
-                "未找到 JSS zsh completion 配置，无需卸载", OutputType.INFO
+            print(
+                "ℹ️ 未找到 JSS zsh completion 配置，无需卸载"
             )
             return
 
@@ -418,8 +368,8 @@ def uninstall_jss_completion(
             content = f.read()
 
         if start_marker not in content:
-            PrettyOutput.print(
-                "未找到 JSS zsh completion 配置，无需卸载", OutputType.INFO
+            print(
+                "ℹ️ 未找到 JSS zsh completion 配置，无需卸载"
             )
             return
 
@@ -428,8 +378,8 @@ def uninstall_jss_completion(
         with open(config_file, "w") as f:
             f.write(new_content)
 
-        PrettyOutput.print(
-            "JSS zsh completion 已卸载，请执行: source ~/.zshrc", OutputType.SUCCESS
+        print(
+            "✅ JSS zsh completion 已卸载，请执行: source ~/.zshrc"
         )
 
 
@@ -444,6 +394,7 @@ def process_request(request: str) -> Optional[str]:
     """
     try:
         # Get language model instance
+        # 使用normal平台，智能shell命令生成是一般任务
         model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
 
         shell = get_shell_name()

jarvis/jarvis_stats/cli.py

@@ -379,7 +379,7 @@ def demo():
 def main():
     """主入口函数"""
     # 初始化环境，防止设置初始化太迟
-    init_env("欢迎使用 Jarvis-Stats，您的统计分析工具已准备就绪！", None)
+    init_env()
     app()
 
 

jarvis/jarvis_stats/stats.py

@@ -9,7 +9,7 @@ from typing import Dict, List, Optional, Union, Any
 
 from jarvis.jarvis_stats.storage import StatsStorage
 from jarvis.jarvis_stats.visualizer import StatsVisualizer
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput  # 保留用于语法高亮
 
 
 class StatsManager:
@@ -549,8 +549,8 @@ class StatsManager:
         )
 
         if not aggregated:
-            PrettyOutput.print(
-                f"没有找到指标 '{metric_name}' 的数据", OutputType.WARNING
+            print(
+                f"⚠️ 没有找到指标 '{metric_name}' 的数据"
             )
             return
 
@@ -585,7 +585,7 @@ class StatsManager:
             show_values=True,
         )
 
-        PrettyOutput.print(chart, OutputType.CODE, lang="text")
+        PrettyOutput.print(chart, OutputType.CODE, lang="text")  # 保留用于语法高亮
 
         # 显示时间范围
         from rich.panel import Panel
@@ -681,8 +681,8 @@ class StatsManager:
         )
 
         if not aggregated:
-            PrettyOutput.print(
-                f"没有找到指标 '{metric_name}' 的数据", OutputType.WARNING
+            print(
+                f"⚠️ 没有找到指标 '{metric_name}' 的数据"
             )
             return
 
@@ -693,7 +693,7 @@ class StatsManager:
         # 显示汇总
         summary = visualizer.show_summary(aggregated, metric_name, unit, tags)
         if summary:  # 如果返回了内容才打印（兼容性）
-            PrettyOutput.print(summary, OutputType.INFO)
+            print(f"ℹ️ {summary}")
 
         # 显示时间范围
         from rich.panel import Panel

jarvis/jarvis_stats/storage.py

@@ -71,7 +71,7 @@ class StatsStorage:
                 with open(filepath, "r", encoding="utf-8") as f:
                     data = json.load(f)
                     return data
-            except (json.JSONDecodeError, IOError):
+            except Exception:
                 if attempt < max_retries - 1:
                     time.sleep(0.1 * (attempt + 1))  # 递增延迟
                     continue
@@ -160,6 +160,9 @@ class StatsStorage:
 
         # 更新元数据
         meta = self._load_json(self.meta_file)
+        # 确保 meta 字典中有 "metrics" 键
+        if "metrics" not in meta:
+            meta["metrics"] = {}
         if metric_name not in meta["metrics"]:
             meta["metrics"][metric_name] = {
                 "unit": unit,
@@ -218,9 +221,9 @@ class StatsStorage:
                 new_total = current_total + float(value)
                 self._save_text_atomic(total_file, str(new_total))
             else:
-                # 首次生成：扫描历史数据（包含刚写入的这条记录）并写入
-                # 注意：get_metric_total 内部会完成扫描并写入 totals 文件，这里无需再额外写入或累加
-                _ = self.get_metric_total(metric_name)
+                # 首次生成：直接写入当前值，避免扫描所有历史文件
+                # 如果后续需要精确总量，可以通过 get_metric_total 重新计算
+                self._save_text_atomic(total_file, str(float(value)))
         except Exception:
             # 静默失败，不影响主流程
             pass
@@ -452,21 +455,11 @@ class StatsStorage:
 
     def list_metrics(self) -> List[str]:
         """列出所有指标"""
-        # 从元数据文件获取指标
+        # 从元数据文件获取指标（主要来源，避免扫描所有历史文件）
         meta = self._load_json(self.meta_file)
         metrics_from_meta = set(meta.get("metrics", {}).keys())
 
-        # 扫描所有数据文件获取实际存在的指标
-        metrics_from_data: Set[str] = set()
-        for data_file in self.data_dir.glob("stats_*.json"):
-            try:
-                data = self._load_json(data_file)
-                metrics_from_data.update(data.keys())
-            except (json.JSONDecodeError, OSError):
-                # 忽略无法读取的文件
-                continue
-
-        # 扫描总量缓存目录中已有的指标文件
+        # 扫描总量缓存目录中已有的指标文件（快速）
         metrics_from_totals: Set[str] = set()
         try:
             for f in self.totals_dir.glob("*"):
@@ -475,10 +468,9 @@ class StatsStorage:
         except Exception:
             pass
 
-        # 合并三个来源的指标并返回排序后的列表
-        all_metrics = metrics_from_meta.union(metrics_from_data).union(
-            metrics_from_totals
-        )
+        # 合并两个来源的指标并返回排序后的列表
+        # 注意：不再扫描所有历史数据文件，避免性能问题
+        all_metrics = metrics_from_meta.union(metrics_from_totals)
         return sorted(list(all_metrics))
 
     def aggregate_metrics(
@@ -560,7 +552,9 @@ class StatsStorage:
         """
         # 检查指标是否存在
         meta = self._load_json(self.meta_file)
-        if metric_name not in meta.get("metrics", {}):
+        if "metrics" not in meta:
+            meta["metrics"] = {}
+        if metric_name not in meta["metrics"]:
             return False
 
         # 从元数据中删除指标

jarvis/jarvis_tools/clear_memory.py

@@ -4,7 +4,6 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from jarvis.jarvis_utils.config import get_data_dir
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.globals import (
     clear_short_term_memories,
     short_term_memories,
@@ -15,21 +14,7 @@ class ClearMemoryTool:
     """清除记忆工具，用于批量清除指定的记忆"""
 
     name = "clear_memory"
-    description = """批量清除指定的记忆。
-    
-    支持的清除方式：
-    1. 按记忆类型清除所有记忆
-    2. 按标签清除特定记忆
-    3. 按记忆ID清除单个记忆
-    
-    支持的记忆类型：
-    - project_long_term: 项目长期记忆
-    - global_long_term: 全局长期记忆
-    - short_term: 短期记忆
-    - all: 所有类型的记忆
-    
-    注意：清除操作不可恢复，请谨慎使用
-    """
+    description = "批量清除指定的记忆。支持按类型、标签或ID清除。记忆类型：project_long_term/global_long_term/short_term/all。注意：清除操作不可恢复。"
 
     parameters = {
         "type": "object",
@@ -160,9 +145,7 @@ class ClearMemoryTool:
                     removed_count += 1
 
             except Exception as e:
-                PrettyOutput.print(
-                    f"处理记忆文件 {memory_file} 时出错: {str(e)}", OutputType.WARNING
-                )
+                print(f"⚠️ 处理记忆文件 {memory_file} 时出错: {str(e)}")
 
         # 如果目录为空，可以删除目录
         if not any(memory_dir.iterdir()) and memory_dir != self.project_memory_dir:
@@ -235,5 +218,5 @@ class ClearMemoryTool:
 
         except Exception as e:
             error_msg = f"清除记忆失败: {str(e)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
+            print(f"❌ {error_msg}")
             return {"success": False, "stdout": "", "stderr": error_msg}

jarvis/jarvis_tools/cli/main.py

@@ -38,7 +38,7 @@ def list_tools(
                 lang="json",
             )
     else:
-        PrettyOutput.section("可用工具列表", OutputType.SYSTEM)
+        print("📋 可用工具列表")
         # 为避免 PrettyOutput 对每行加框造成信息稀疏，先拼接字符串再统一打印
         lines = []
         import json as _json  # local import to ensure available
@@ -54,7 +54,7 @@ def list_tools(
                 except Exception:
                     lines.append(str(tool.get("parameters")))
                 lines.append("```")
-        PrettyOutput.print("\n".join(lines), OutputType.INFO, lang="markdown")
+        PrettyOutput.print("\n".join(lines), OutputType.CODE, lang="markdown")
 
 
 @app.command("stat")
@@ -90,7 +90,7 @@ def stat_tools(
             )
         else:
             time_desc = f"最近{last_days}天" if last_days else "所有历史"
-            PrettyOutput.section(f"工具调用统计 ({time_desc})", OutputType.SYSTEM)
+            print(f"📊 工具调用统计 ({time_desc})")
             if table_data:
                 PrettyOutput.print(
                     tabulate(
@@ -99,15 +99,12 @@ def stat_tools(
                     OutputType.CODE,
                     lang="text",
                 )
-                PrettyOutput.print(
-                    f"\n总计: {len(table_data)} 个工具被使用，共 {sum(x[1] for x in table_data)} 次调用",
-                    OutputType.INFO,
-                )
+                print(f"ℹ️ 总计: {len(table_data)} 个工具被使用，共 {sum(x[1] for x in table_data)} 次调用")
             else:
-                PrettyOutput.print("暂无工具调用记录", OutputType.INFO)
+                print("ℹ️ 暂无工具调用记录")
     else:
         # 使用 stats 系统的高级功能
-        PrettyOutput.section("工具组统计", OutputType.SYSTEM)
+        print("📊 工具组统计")
         # 显示所有标记为 tool 组的指标
         metrics = StatsManager.list_metrics()
         tool_metrics = []
@@ -166,7 +163,7 @@ def stat_tools(
                             tags={"group": "tool"},
                         )
         else:
-            PrettyOutput.print("暂无工具调用记录", OutputType.INFO)
+            print("ℹ️ 暂无工具调用记录")
 
 
 @app.command("call")
@@ -182,24 +179,24 @@ def call_tool(
     tool_obj = registry.get_tool(tool_name)
 
     if not tool_obj:
-        PrettyOutput.print(f"错误: 工具 '{tool_name}' 不存在", OutputType.ERROR)
+        print(f"❌ 错误: 工具 '{tool_name}' 不存在")
         available_tools = ", ".join([t["name"] for t in registry.get_all_tools()])
-        PrettyOutput.print(f"可用工具: {available_tools}", OutputType.INFO)
+        print(f"ℹ️ 可用工具: {available_tools}")
         raise typer.Exit(code=1)
 
     tool_args = {}
     if args:
         try:
             tool_args = json.loads(args)
-        except json.JSONDecodeError:
-            PrettyOutput.print("错误: 参数必须是有效的JSON格式", OutputType.ERROR)
+        except Exception:
+            print("❌ 错误: 参数必须是有效的JSON格式")
             raise typer.Exit(code=1)
     elif args_file:
         try:
             with open(args_file, "r", encoding="utf-8") as f:
                 tool_args = json.load(f)
-        except (json.JSONDecodeError, FileNotFoundError) as e:
-            PrettyOutput.print(f"错误: 无法从文件加载参数: {str(e)}", OutputType.ERROR)
+        except (Exception, FileNotFoundError) as e:
+            print(f"❌ 错误: 无法从文件加载参数: {str(e)}")
             raise typer.Exit(code=1)
 
     required_params = tool_obj.parameters.get("required", [])
@@ -217,23 +214,23 @@ def call_tool(
             param_info = params.get(param_name, {})
             desc = param_info.get("description", "无描述")
             lines.append(f"  - {param_name}: {desc}")
-        PrettyOutput.print("\n".join(lines), OutputType.ERROR)
+        print("❌ " + "\n❌ ".join(lines))
         raise typer.Exit(code=1)
 
     result = registry.execute_tool(tool_name, tool_args)
 
     if result["success"]:
-        PrettyOutput.section(f"工具 {tool_name} 执行成功", OutputType.SUCCESS)
+        print(f"✅ 工具 {tool_name} 执行成功")
     else:
-        PrettyOutput.section(f"工具 {tool_name} 执行失败", OutputType.ERROR)
+        print(f"❌ 工具 {tool_name} 执行失败")
 
     if result.get("stdout"):
-        PrettyOutput.print("\n输出:", OutputType.INFO)
+        print("\n📤 输出:")
         PrettyOutput.print(result["stdout"], OutputType.CODE, lang="text")
 
     if result.get("stderr"):
-        PrettyOutput.print("\n错误:", OutputType.ERROR)
-        PrettyOutput.print(result["stderr"], OutputType.ERROR, lang="text")
+        print("\n❌ 错误:")
+        PrettyOutput.print(result["stderr"], OutputType.CODE, lang="text")
 
     if not result["success"]:
         raise typer.Exit(code=1)
@@ -241,7 +238,7 @@ def call_tool(
 
 def cli():
     """Typer application entry point"""
-    init_env("欢迎使用 Jarvis-Tools，您的工具系统已准备就绪！")
+    init_env()
     app()