jarvis-ai-assistant 0.4.2__py3-none-any.whl → 0.5.0__py3-none-any.whl

jarvis/jarvis_data/config_schema.json

@@ -279,12 +279,12 @@
     },
     "JARVIS_CENTRAL_METHODOLOGY_REPO": {
       "type": "string",
-      "description": "中心方法论Git仓库地址，该仓库会自动添加到方法论加载路径中",
+      "description": "中心方法论仓库路径或Git仓库地址。支持本地目录（含git子路径）：若为本地目录将直接加入方法论加载路径；若为Git URL则会克隆到数据目录后加载。",
       "default": ""
     },
     "JARVIS_CENTRAL_TOOL_REPO": {
       "type": "string",
-      "description": "中心工具库Git仓库地址，该仓库会自动克隆到数据目录并加载其中的工具",
+      "description": "中心工具仓库路径或Git仓库地址。支持本地目录（含git子路径）：若为本地目录将直接加载其中的工具；若为Git URL则会克隆到数据目录并加载。",
       "default": ""
     },
     "JARVIS_PRINT_PROMPT": {

jarvis/jarvis_tools/registry.py

@@ -350,22 +350,28 @@ class ToolRegistry(OutputHandlerProtocol):
         # 如果配置了中心工具仓库，将其添加到加载路径
         central_repo = get_central_tool_repo()
         if central_repo:
-            # 中心工具仓库存储在数据目录下的特定位置
-            central_repo_path = os.path.join(get_data_dir(), "central_tool_repo")
-            tool_dirs.append(central_repo_path)
+            # 支持本地目录路径或Git仓库URL
+            expanded = os.path.expanduser(os.path.expandvars(central_repo))
+            if os.path.isdir(expanded):
+                # 直接使用本地目录（支持Git仓库的子目录）
+                tool_dirs.append(expanded)
+            else:
+                # 中心工具仓库存储在数据目录下的特定位置
+                central_repo_path = os.path.join(get_data_dir(), "central_tool_repo")
+                tool_dirs.append(central_repo_path)
 
-            # 确保中心工具仓库被克隆/更新
-            if not os.path.exists(central_repo_path):
-                try:
-                    import subprocess
+                # 确保中心工具仓库被克隆/更新
+                if not os.path.exists(central_repo_path):
+                    try:
+                        import subprocess
 
-                    subprocess.run(
-                        ["git", "clone", central_repo, central_repo_path], check=True
-                    )
-                except Exception as e:
-                    PrettyOutput.print(
-                        f"克隆中心工具仓库失败: {str(e)}", OutputType.ERROR
-                    )
+                        subprocess.run(
+                            ["git", "clone", central_repo, central_repo_path], check=True
+                        )
+                    except Exception as e:
+                        PrettyOutput.print(
+                            f"克隆中心工具仓库失败: {str(e)}", OutputType.ERROR
+                        )
 
         # --- 全局每日更新检查 ---
         daily_check_git_updates(tool_dirs, "tools")

jarvis/jarvis_utils/methodology.py

@@ -54,25 +54,31 @@ def _load_all_methodologies() -> Dict[str, str]:
     # 如果配置了中心方法论仓库，将其添加到加载路径
     central_repo = get_central_methodology_repo()
     if central_repo:
-        # 中心方法论仓库存储在数据目录下的特定位置
-        central_repo_path = os.path.join(get_data_dir(), "central_methodology_repo")
-        methodology_dirs.append(central_repo_path)
-
-        # 确保中心方法论仓库被克隆/更新
-        if not os.path.exists(central_repo_path):
-            try:
-                import subprocess
-
-                PrettyOutput.print(
-                    f"正在克隆中心方法论仓库: {central_repo}", OutputType.INFO
-                )
-                subprocess.run(
-                    ["git", "clone", central_repo, central_repo_path], check=True
-                )
-            except Exception as e:
-                PrettyOutput.print(
-                    f"克隆中心方法论仓库失败: {str(e)}", OutputType.ERROR
-                )
+        # 支持本地目录路径或Git仓库URL
+        expanded = os.path.expanduser(os.path.expandvars(central_repo))
+        if os.path.isdir(expanded):
+            # 直接使用本地目录（支持Git仓库的子目录）
+            methodology_dirs.append(expanded)
+        else:
+            # 中心方法论仓库存储在数据目录下的特定位置
+            central_repo_path = os.path.join(get_data_dir(), "central_methodology_repo")
+            methodology_dirs.append(central_repo_path)
+
+            # 确保中心方法论仓库被克隆/更新
+            if not os.path.exists(central_repo_path):
+                try:
+                    import subprocess
+
+                    PrettyOutput.print(
+                        f"正在克隆中心方法论仓库: {central_repo}", OutputType.INFO
+                    )
+                    subprocess.run(
+                        ["git", "clone", central_repo, central_repo_path], check=True
+                    )
+                except Exception as e:
+                    PrettyOutput.print(
+                        f"克隆中心方法论仓库失败: {str(e)}", OutputType.ERROR
+                    )
 
     # --- 全局每日更新检查 ---
     daily_check_git_updates(methodology_dirs, "methodologies")

jarvis/jarvis_utils/utils.py

@@ -1212,6 +1212,37 @@ def _collect_optional_config_interactively(
         or changed
     )
 
+    # 新增：会话与调试相关配置
+    changed = (
+        _ask_and_set(
+            "JARVIS_SAVE_SESSION_HISTORY",
+            "是否保存会话记录？",
+            False,
+            "bool",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_PRINT_ERROR_TRACEBACK",
+            "是否在错误输出时打印回溯调用链？",
+            False,
+            "bool",
+        )
+        or changed
+    )
+
+    # 其它可选开关
+    changed = (
+        _ask_and_set(
+            "JARVIS_SKIP_PREDEFINED_TASKS",
+            "是否跳过预定义任务加载（不读取 pre-command 列表）？",
+            False,
+            "bool",
+        )
+        or changed
+    )
+
     # 代码与工具操作安全提示
     changed = (
         _ask_and_set(
@@ -1258,6 +1289,23 @@ def _collect_optional_config_interactively(
         )
         or changed
     )
+    # 新增：自动总结轮次与脚本超时
+    changed = (
+        _ask_and_set_int(
+            "JARVIS_AUTO_SUMMARY_ROUNDS",
+            "基于对话轮次的自动总结阈值（达到该轮次后自动总结并清理历史，默认20）",
+            20,
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set_int(
+            "JARVIS_SCRIPT_EXECUTION_TIMEOUT",
+            "脚本执行超时时间（秒，默认300，仅非交互模式生效）",
+            300,
+        )
+        or changed
+    )
 
     # 目录类配置（逗号分隔）
     changed = (
@@ -1295,6 +1343,14 @@ def _collect_optional_config_interactively(
         )
         or changed
     )
+    # 新增：工具调用后回调实现目录
+    changed = (
+        _ask_and_set_list(
+            "JARVIS_AFTER_TOOL_CALL_CB_DIRS",
+            "指定工具调用后回调实现目录（逗号分隔，留空跳过）：",
+        )
+        or changed
+    )
 
     # Web 搜索配置（可选）
     changed = (
@@ -1439,7 +1495,7 @@ def _collect_optional_config_interactively(
     changed = (
         _ask_and_set(
             "JARVIS_CENTRAL_METHODOLOGY_REPO",
-            "请输入中心方法论仓库地址（可留空跳过）：",
+            "请输入中心方法论仓库路径或Git地址（可留空跳过）：",
             "",
             "str",
         )
@@ -1448,7 +1504,7 @@ def _collect_optional_config_interactively(
     changed = (
         _ask_and_set(
             "JARVIS_CENTRAL_TOOL_REPO",
-            "请输入中心工具仓库地址（可留空跳过）：",
+            "请输入中心工具仓库路径或Git地址（可留空跳过）：",
             "",
             "str",
         )

{jarvis_ai_assistant-0.4.2.dist-info → jarvis_ai_assistant-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.4.2
+Version: 0.5.0
 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.4.2.dist-info → jarvis_ai_assistant-0.5.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=NIbT8I8sAw3cCWWXtArSe6_eWeB17Gf7WmiF9nyxdKs,73
-jarvis/jarvis_agent/__init__.py,sha256=OOoHubIIQ3A9xB7jHFRpJKDtAk0or8Y7TmUkdq00l4Q,51386
+jarvis/__init__.py,sha256=oTkuIy1EsFy9C2D4yYth5JohcbEgLLtiPlfbyY7LvrM,73
+jarvis/jarvis_agent/__init__.py,sha256=uq8p8ruYW5CjN8J8fncYAe7YrRORXjm183TSu_0ST2Y,51837
 jarvis/jarvis_agent/agent_manager.py,sha256=Q0S-mYTPt8Xd7RKGoLWoWU_RP_wEXFWxCjve8_t2f2A,3807
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
 jarvis/jarvis_agent/config_editor.py,sha256=hlb9EYxKWcR_qdW2O89CgNDdciR9Isi743JU_1gD8j4,1927
@@ -20,7 +20,7 @@ jarvis/jarvis_agent/protocols.py,sha256=YFJaC9MHi7JfLzmvlyotJDjiCO4Z07XJXy1gKhVd
 jarvis/jarvis_agent/rewrite_file_handler.py,sha256=FVSrfrC115_cGvdPW9RIn3A-gQAhok7GyyBfnOFdpXs,5276
 jarvis/jarvis_agent/run_loop.py,sha256=iGfa28J2K6I07k6p66O3WJFSk9z4uOarqe6CLqALIsk,6167
 jarvis/jarvis_agent/session_manager.py,sha256=5wVcaZGwJ9cEKTQglSbqyxUDJ2fI5KxYN8C8L16UWLw,3024
-jarvis/jarvis_agent/share_manager.py,sha256=MF2RlomcgPxF8nVUk28DP6IRddZ_tot5l_YRvy0qXSQ,8726
+jarvis/jarvis_agent/share_manager.py,sha256=Nl7zvy5PbcYAPXUgfnvatoUB0V4sIQOt61LyYkp5-2w,9127
 jarvis/jarvis_agent/shell_input_handler.py,sha256=wiAPjB-9uTkcLszbO5dlOUwIfaeR39RgRcZhahIGqoA,2018
 jarvis/jarvis_agent/stdio_redirect.py,sha256=xqF-sENitpefCT3TA9oRwATFqbDrU2dvqM-UiMZRhbE,9944
 jarvis/jarvis_agent/task_analyzer.py,sha256=JXc-63hnTD7oSX-nIfRcgxqCMhh4fM4QYVc7C1gp--M,7813
@@ -33,9 +33,9 @@ jarvis/jarvis_agent/web_bridge.py,sha256=h15PXuPWWfZynWt8bPW4BDeCpIVoIOlRXfO0je6
 jarvis/jarvis_agent/web_output_sink.py,sha256=sZ6WbLZnuCdT5dS9d8msHY_g-pnj-dvML-I6uJ7-sbc,1733
 jarvis/jarvis_agent/web_server.py,sha256=oZZy4nAOPhRWJn7K8VjBlho1F9AsvLEYiusKgipjO94,28204
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=UaYppteSUzwni-ZUDAKDrGTDijBrXU1Ia91OoLdfYLs,38072
+jarvis/jarvis_code_agent/code_agent.py,sha256=JtUZ6maMxOic5g5THCoOpgv9hyYecJZL71QR7nE2KDM,42269
 jarvis/jarvis_code_agent/lint.py,sha256=_qLJB_bC3PuoHG-j4EGOnYzNGO26jHlKLbkysfyQW1c,3954
-jarvis/jarvis_code_analysis/code_review.py,sha256=A3LaxFAlIH5qCfMajIr02ExG6YiolIVpjl9blsLh4SY,34402
+jarvis/jarvis_code_analysis/code_review.py,sha256=48r0UE4pmOUaRgBJIJrpPW307sKGo1rnTNkWdsqkOrY,29889
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=9t62bMqs6qTkFSio4SKkj88qyb5ZubWrw3MxJBQ4X1A,1317
 jarvis/jarvis_code_analysis/checklists/csharp.py,sha256=ShPXrl2_UPAnGaCHAG2wLl90COG3HK2XCSr1UK2dxN4,2420
@@ -56,7 +56,7 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=VlPqakEXx7k2wm5Uv-ZlbKeIPbHNc98r1pHFtXEBBBY,14884
+jarvis/jarvis_data/config_schema.json,sha256=1c8h8kDlcBqqiX2uHhajgT70F9o88QR1ee-zk2GJJ6w,15093
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=BRbsEQVXwseVFKliVqV8_JPh1om6QT6dLTHw0jQ7OE0,2474
@@ -108,7 +108,7 @@ jarvis/jarvis_tools/generate_new_tool.py,sha256=tJz0YtfDwyH9y00VEWw3Btqr9JCNhvtI
 jarvis/jarvis_tools/methodology.py,sha256=_K4GIDUodGEma3SvNRo7Qs5rliijgNespVLyAPN35JU,5233
 jarvis/jarvis_tools/read_code.py,sha256=F1RuO0c69t0h7CvrUGqrTyNcOCcUrFQPACc61O_YSso,6382
 jarvis/jarvis_tools/read_webpage.py,sha256=dfyXJ9vaX-ZRbua1P5ZlaU_SlSzKkeNw-1kI_3-gxFE,5433
-jarvis/jarvis_tools/registry.py,sha256=9gIhiyh7jAAnLeGBIDyUUHwOeDtgOx3UUWk6kRN1sJg,33670
+jarvis/jarvis_tools/registry.py,sha256=KDDuaQC_Ej8nGKk2P5W7uMV22BQQx_lSf9dLrLZ6ocY,34033
 jarvis/jarvis_tools/retrieve_memory.py,sha256=hhhGSr7jebPHICY9oEKICyI8mfqsRtKjh58qZNZApKc,8624
 jarvis/jarvis_tools/save_memory.py,sha256=RQtNxcpU53FFv_EBjH0i0oyQ7jWubm-trD1BHuqaGjI,6985
 jarvis/jarvis_tools/search_web.py,sha256=Hi8WBxcRH02qjOF1qcJP2qSqs3kVOKGFAARfh548Ii4,6370
@@ -128,13 +128,13 @@ jarvis/jarvis_utils/git_utils.py,sha256=zxjdxbFb_X6aYo-w1fbMx3d2n1ScbmmaAYlE3wGa
 jarvis/jarvis_utils/globals.py,sha256=7Xvf9HY6jYJL4vSD1F1WCoxHkHCAyltJUYt4V9gGVU4,8865
 jarvis/jarvis_utils/http.py,sha256=eRhV3-GYuWmQ0ogq9di9WMlQkFcVb1zGCrySnOgT1x0,4392
 jarvis/jarvis_utils/input.py,sha256=4VXpUZoAocW1mldlZd4bmXI8a_CmcQj7IPLBNgNLGSI,40045
-jarvis/jarvis_utils/methodology.py,sha256=z_renvRGgHiC-XTQPuN6rvrJ_ffHlwxK_b1BU_jmNAQ,12800
+jarvis/jarvis_utils/methodology.py,sha256=YuuKBjr58cu8QWcniU7QVlEM9Cem6wo4IYcq1iwSDMw,13158
 jarvis/jarvis_utils/output.py,sha256=y2fVcao_2ZowFl0IxUrJZCi8T6ZM0z-iPzpk8T8eLxc,13623
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
-jarvis/jarvis_utils/utils.py,sha256=uMtfaStxDtp2i9AFIxwtPKgSxLwQxw8Z2rXsX-ZGlis,72728
-jarvis_ai_assistant-0.4.2.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.4.2.dist-info/METADATA,sha256=etNq0w20riwTP8aha2pt_wXBdC6SZHhrjTVeV5K4K38,18751
-jarvis_ai_assistant-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.4.2.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.4.2.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.4.2.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=uBWPwVmzM23HUDjnFdEOEsPF50cjJvC7lMvJqXHyjJ0,74276
+jarvis_ai_assistant-0.5.0.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.5.0.dist-info/METADATA,sha256=Y1rxsB9YwcJmuEDvCayrnpUAVx87Nq-yVdjuBWo_g8U,18751
+jarvis_ai_assistant-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.5.0.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.5.0.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.5.0.dist-info/RECORD,,