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

jarvis/jarvis_data/config_schema.json

@@ -7,6 +7,7 @@
     "JARVIS_MCP": {
       "type": "array",
       "description": "MCP工具配置列表",
+      "default": [],
       "items": {
         "type": "object",
         "oneOf": [
@@ -111,14 +112,9 @@
       "description": "Git提交信息生成提示模板",
       "default": ""
     },
-    "JARVIS_MAX_TOKEN_COUNT": {
-      "type": "number",
-      "description": "模型能处理的最大token数量",
-      "default": 960000
-    },
     "JARVIS_MAX_INPUT_TOKEN_COUNT": {
       "type": "number",
-      "description": "模型能处理的最大输入token数量",
+      "description": "模型能处理的最大输入token数量。其他token限制基于此值计算：最大token数量=此值×100，最大大内容尺寸=此值×5",
       "default": 32000
     },
     "JARVIS_PLATFORM": {
@@ -131,40 +127,107 @@
       "description": "常规操作模型名称",
       "default": "deep_seek_v3"
     },
-    "JARVIS_THINKING_PLATFORM": {
+    "JARVIS_WEB_SEARCH_PLATFORM": {
       "type": "string",
-      "description": "思考操作平台名称",
-      "default": "yuanbao"
+      "description": "Web搜索使用的平台名称",
+      "default": ""
+    },
+    "JARVIS_WEB_SEARCH_MODEL": {
+      "type": "string",
+      "description": "Web搜索使用的模型名称",
+      "default": ""
     },
-    "JARVIS_THINKING_MODEL": {
+    "JARVIS_LLM_GROUP": {
       "type": "string",
-      "description": "思考操作模型名称",
-      "default": "deep_seek"
+      "description": "选择一个预定义的模型组",
+      "default": ""
+    },
+    "JARVIS_LLM_GROUPS": {
+      "type": "array",
+      "description": "预定义的模型配置组",
+      "default": [],
+      "items": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object",
+          "properties": {
+            "JARVIS_PLATFORM": {
+              "type": "string",
+              "default": "yuanbao"
+            },
+            "JARVIS_MODEL": {
+              "type": "string",
+              "default": "deep_seek_v3"
+            },
+            "JARVIS_MAX_INPUT_TOKEN_COUNT": {
+              "type": "number",
+              "default": 32000
+            },
+            "ENV": {
+              "type": "object",
+              "description": "该模型组特定的环境变量，会覆盖全局 ENV 配置",
+              "additionalProperties": {
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "JARVIS_PLATFORM",
+            "JARVIS_MODEL"
+          ]
+        }
+      }
     },
     "JARVIS_EXECUTE_TOOL_CONFIRM": {
       "type": "boolean",
       "description": "执行工具前是否需要确认",
       "default": false
     },
+    "JARVIS_TOOL_FILTER_THRESHOLD": {
+      "type": "number",
+      "description": "AI工具筛选阈值：当可用工具数量超过此值时触发AI筛选",
+      "default": 30
+    },
+    "JARVIS_PLAN_ENABLED": {
+      "type": "boolean",
+      "description": "是否默认启用任务规划。当 Agent 初始化时 plan 参数未指定，将从此配置加载。默认 true。",
+      "default": true
+    },
+    "JARVIS_PLAN_MAX_DEPTH": {
+      "type": "number",
+      "description": "任务规划的最大层数。用于限制 plan 模式的递归拆分深度。仅在启用规划时生效（通过 CLI --plan/--no-plan 控制），默认 2。",
+      "default": 2
+    },
+    "JARVIS_SCRIPT_EXECUTION_TIMEOUT": {
+      "type": "number",
+      "description": "脚本执行的超时时间（秒），仅在非交互模式下生效。",
+      "default": 300
+    },
+    "JARVIS_AUTO_SUMMARY_ROUNDS": {
+      "type": "number",
+      "description": "基于对话轮次的自动总结阈值（达到该轮次后自动总结并清理历史）",
+      "default": 50
+    },
     "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数据存储目录路径",
       "default": "~/.jarvis"
     },
-    "JARVIS_MAX_BIG_CONTENT_SIZE": {
-      "type": "number",
-      "description": "最大大内容尺寸",
-      "default": 160000
-    },
     "JARVIS_PRETTY_OUTPUT": {
       "type": "boolean",
       "description": "是否启用美化输出",
-      "default": false
+      "default": true
     },
     "JARVIS_USE_METHODOLOGY": {
       "type": "boolean",
@@ -176,34 +239,252 @@
       "description": "是否启用任务分析",
       "default": true
     },
+    "JARVIS_TOOL_LOAD_DIRS": {
+      "type": "array",
+      "description": "自定义工具加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_METHODOLOGY_DIRS": {
+      "type": "array",
+      "description": "方法论加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_AGENT_DEFINITION_DIRS": {
+      "type": "array",
+      "description": "agent 定义加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_MULTI_AGENT_DIRS": {
+      "type": "array",
+      "description": "multi_agent 加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_ROLES_DIRS": {
+      "type": "array",
+      "description": "roles 加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_AFTER_TOOL_CALL_CB_DIRS": {
+      "type": "array",
+      "description": "工具调用后回调函数实现目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_CENTRAL_METHODOLOGY_REPO": {
+      "type": "string",
+      "description": "中心方法论仓库路径或Git仓库地址。支持本地目录（含git子路径）：若为本地目录将直接加入方法论加载路径；若为Git URL则会克隆到数据目录后加载。",
+      "default": ""
+    },
+    "JARVIS_CENTRAL_TOOL_REPO": {
+      "type": "string",
+      "description": "中心工具仓库路径或Git仓库地址。支持本地目录（含git子路径）：若为本地目录将直接加载其中的工具；若为Git URL则会克隆到数据目录并加载。",
+      "default": ""
+    },
     "JARVIS_PRINT_PROMPT": {
       "type": "boolean",
       "description": "是否打印提示",
       "default": false
     },
+    "JARVIS_PRINT_ERROR_TRACEBACK": {
+      "type": "boolean",
+      "description": "是否在错误输出时打印回溯调用链",
+      "default": false
+    },
     "JARVIS_ENABLE_STATIC_ANALYSIS": {
       "type": "boolean",
       "description": "是否启用静态代码分析",
       "default": true
     },
+    "JARVIS_ENABLE_BUILD_VALIDATION": {
+      "type": "boolean",
+      "description": "是否启用构建验证。在代码编辑后自动验证代码能否成功编译/构建，确保编辑不会破坏项目构建。",
+      "default": true
+    },
+    "JARVIS_BUILD_VALIDATION_TIMEOUT": {
+      "type": "number",
+      "description": "构建验证的超时时间（秒）。当构建验证执行时间超过此值时，将终止验证并报告超时。",
+      "default": 30
+    },
+    "JARVIS_ENABLE_IMPACT_ANALYSIS": {
+      "type": "boolean",
+      "description": "是否启用编辑影响范围分析。分析代码编辑的影响范围，识别可能受影响的文件、函数、测试等，帮助评估编辑风险。",
+      "default": true
+    },
+    "JARVIS_FORCE_SAVE_MEMORY": {
+      "type": "boolean",
+      "description": "是否强制保存记忆",
+      "default": false
+    },
+    "JARVIS_ENABLE_GIT_JCA_SWITCH": {
+      "type": "boolean",
+      "description": "在初始化环境前检测Git仓库并提示可切换到代码开发模式（jca）",
+      "default": true
+    },
+    "JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR": {
+      "type": "boolean",
+      "description": "在进入默认通用代理前，列出可用配置（agent/multi_agent/roles）供选择",
+      "default": true
+    },
+    "JARVIS_IMMEDIATE_ABORT": {
+      "type": "boolean",
+      "description": "是否启用立即中断：在对话迭代中检测到中断信号时立即返回",
+      "default": false
+    },
+    "JARVIS_SAVE_SESSION_HISTORY": {
+      "type": "boolean",
+      "description": "是否保存会话记录",
+      "default": false
+    },
+    "JARVIS_SKIP_PREDEFINED_TASKS": {
+      "type": "boolean",
+      "description": "是否跳过预定义任务加载（不读取 pre-command 列表）",
+      "default": false
+    },
+    "JARVIS_ADDON_PROMPT_THRESHOLD": {
+      "type": "number",
+      "description": "附加提示的触发阈值（字符数）。当消息长度超过此值时，会自动添加默认的附加提示",
+      "default": 1024
+    },
+    "JARVIS_ENABLE_INTENT_RECOGNITION": {
+      "type": "boolean",
+      "description": "是否启用意图识别功能。用于智能上下文推荐中的LLM意图提取和语义分析",
+      "default": true
+    },
+    "JARVIS_GIT_CHECK_MODE": {
+      "type": "string",
+      "enum": ["strict", "warn"],
+      "description": "Git 配置校验模式：strict 表示严格模式（默认），缺失配置时直接退出；warn 表示警告模式，仅提示并继续运行",
+      "default": "strict"
+    },
+    "JARVIS_TOOL_GROUP": {
+      "type": "string",
+      "description": "选择一个预定义的工具配置组",
+      "default": ""
+    },
+    "JARVIS_TOOL_GROUPS": {
+      "type": "array",
+      "description": "预定义的工具配置组",
+      "default": [],
+      "items": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object",
+          "properties": {
+            "use": {
+              "type": "array",
+              "description": "要使用的工具名称列表",
+              "items": {
+                "type": "string"
+              }
+            },
+            "dont_use": {
+              "type": "array",
+              "description": "不使用的工具名称列表",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    },
+    "JARVIS_RAG_GROUP": {
+      "type": "string",
+      "description": "选择一个预定义的RAG配置组",
+      "default": ""
+    },
+    "JARVIS_RAG_GROUPS": {
+      "type": "array",
+      "description": "预定义的RAG配置组",
+      "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": {
+          "type": "object",
+          "properties": {
+            "embedding_model": {
+              "type": "string",
+              "default": "BAAI/bge-m3"
+            },
+            "rerank_model": {
+              "type": "string",
+              "default": "BAAI/bge-reranker-v2-m3"
+            },
+            "use_bm25": {
+              "type": "boolean",
+              "default": true
+            },
+            "use_rerank": {
+              "type": "boolean",
+              "default": true
+            }
+          }
+        }
+      }
+    },
     "JARVIS_RAG": {
       "type": "object",
-      "description": "RAG框架的配置",
+      "description": "RAG框架的顶层配置。注意：此处的设置将覆盖任何由JARVIS_RAG_GROUP选择的组配置。",
       "properties": {
         "embedding_model": {
           "type": "string",
-          "default": "BAAI/bge-base-zh-v1.5",
-          "description": "用于RAG的嵌入模型的名称, 默认为 'BAAI/bge-base-zh-v1.5'"
+          "default": "BAAI/bge-m3",
+          "description": "用于RAG的嵌入模型的名称, 默认为 'BAAI/bge-m3'"
         },
         "rerank_model": {
           "type": "string",
-          "default": "BAAI/bge-reranker-base",
-          "description": "用于RAG的rerank模型的名称, 默认为 'BAAI/bge-reranker-base'"
+          "default": "BAAI/bge-reranker-v2-m3",
+          "description": "用于RAG的rerank模型的名称, 默认为 'BAAI/bge-reranker-v2-m3'"
+        },
+        "use_bm25": {
+          "type": "boolean",
+          "default": true,
+          "description": "是否在RAG中为检索使用BM25, 默认为 true"
+        },
+        "use_rerank": {
+          "type": "boolean",
+          "default": true,
+          "description": "是否在RAG中为检索使用rerank, 默认为 true"
         }
       },
       "default": {
-        "embedding_model": "BAAI/bge-base-zh-v1.5",
-        "rerank_model": "BAAI/bge-reranker-base"
+        "embedding_model": "BAAI/bge-m3",
+        "rerank_model": "BAAI/bge-reranker-v2-m3",
+        "use_bm25": true,
+        "use_rerank": true
       }
     },
     "JARVIS_REPLACE_MAP": {
@@ -228,8 +509,38 @@
         "required": [
           "template"
         ]
-      }
+      },
+      "default": {}
+    },
+    "OPENAI_API_KEY": {
+      "type": "string",
+      "description": "OpenAI API Key"
+    },
+    "OPENAI_API_BASE": {
+      "type": "string",
+      "description": "OpenAI API Base URL"
+    },
+    "KIMI_API_KEY": {
+      "type": "string",
+      "description": "Kimi API Key"
+    },
+    "TONGYI_COOKIES": {
+      "type": "string",
+      "description": "Tongyi Cookies"
+    },
+    "YUANBAO_COOKIES": {
+      "type": "string",
+      "description": "Yuanbao Cookies"
+    },
+    "AI8_API_KEY": {
+      "type": "string",
+      "description": "AI8 API Key"
+    },
+    "SHELL": {
+      "type": "string",
+      "description": "系统Shell路径，用于获取当前使用的shell类型",
+      "default": "/bin/bash"
     }
   },
-  "additionalProperties": false
-}
+  "additionalProperties": true
+}

jarvis/jarvis_git_squash/main.py

@@ -1,13 +1,16 @@
 # -*- coding: utf-8 -*-
-import argparse
 import subprocess
-import sys
 from typing import Dict
 
+import typer
+
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.input import user_confirm
+from jarvis.jarvis_utils.globals import get_agent, current_agent_name
+
+app = typer.Typer(help="Git压缩工具")
 
 
 class GitSquashTool:
@@ -44,23 +47,29 @@ class GitSquashTool:
 
             # Use existing GitCommitTool for new commit
             commit_tool = GitCommitTool()
-            commit_tool.execute({"lang": args.get("lang", "Chinese")})
+            agent = get_agent(current_agent_name)
+            exec_args = {"lang": args.get("lang", "Chinese")}
+            if agent:
+                exec_args["agent"] = agent
+            commit_tool.execute(exec_args)
         except Exception as e:
             PrettyOutput.print(f"压缩提交失败: {str(e)}", OutputType.WARNING)
 
 
-def main():
+@app.command()
+def cli(
+    commit_hash: str = typer.Argument(..., help="要压缩的基础提交哈希"),
+    lang: str = typer.Option("Chinese", "--lang", help="提交信息的语言"),
+):
     init_env("欢迎使用 Jarvis-GitSquash，您的Git压缩助手已准备就绪！")
-    parser = argparse.ArgumentParser(description="Git squash tool")
-    parser.add_argument("commit_hash", type=str, help="Base commit hash to squash from")
-    parser.add_argument(
-        "--lang", type=str, default="Chinese", help="Language for commit messages"
-    )
-    args = parser.parse_args()
-
     tool = GitSquashTool()
-    tool.execute({"commit_hash": args.commit_hash, "lang": args.lang})
+    tool.execute({"commit_hash": commit_hash, "lang": lang})
+
+
+def main():
+    """Application entry point"""
+    app()
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    main()