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

jarvis/jarvis_utils/utils.py

@@ -6,6 +6,8 @@ import signal
 import subprocess
 import sys
 import time
+import atexit
+import errno
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Tuple
 from datetime import datetime, date
@@ -205,6 +207,130 @@ def _setup_signal_handler() -> None:
     signal.signal(signal.SIGINT, sigint_handler)
 
 
+# ----------------------------
+# 单实例文件锁（放置于初始化早期使用）
+# ----------------------------
+_INSTANCE_LOCK_PATH: Optional[Path] = None
+
+
+def _get_instance_lock_path(lock_name: str = "instance.lock") -> Path:
+    try:
+        data_dir = Path(str(get_data_dir()))
+    except Exception:
+        data_dir = Path(os.path.expanduser("~/.jarvis"))
+    data_dir.mkdir(parents=True, exist_ok=True)
+    return data_dir / lock_name
+
+
+def _read_lock_owner_pid(lock_path: Path) -> Optional[int]:
+    try:
+        txt = lock_path.read_text(encoding="utf-8", errors="ignore").strip()
+        if not txt:
+            return None
+        try:
+            info = json.loads(txt)
+            pid = info.get("pid")
+            return int(pid) if pid is not None else None
+        except Exception:
+            # 兼容纯数字PID
+            return int(txt)
+    except Exception:
+        return None
+
+
+def _is_process_alive(pid: int) -> bool:
+    if pid is None or pid <= 0:
+        return False
+    try:
+        os.kill(pid, 0)
+    except ProcessLookupError:
+        return False
+    except PermissionError:
+        # 无权限但进程存在
+        return True
+    except OSError as e:
+        # 某些平台上，EPERM 表示进程存在但无权限
+        if getattr(e, "errno", None) == errno.EPERM:
+            return True
+        return False
+    else:
+        return True
+
+
+def _release_instance_lock() -> None:
+    global _INSTANCE_LOCK_PATH
+    try:
+        if _INSTANCE_LOCK_PATH and _INSTANCE_LOCK_PATH.exists():
+            _INSTANCE_LOCK_PATH.unlink()
+    except Exception:
+        # 清理失败不影响退出
+        pass
+    _INSTANCE_LOCK_PATH = None
+
+
+def _acquire_single_instance_lock(lock_name: str = "instance.lock") -> None:
+    """
+    在数据目录(~/.jarvis 或配置的数据目录)下创建实例锁，防止重复启动。
+    如果检测到已有存活实例，提示后退出。
+    """
+    global _INSTANCE_LOCK_PATH
+    lock_path = _get_instance_lock_path(lock_name)
+
+    # 已存在锁：检查是否为有效存活实例
+    if lock_path.exists():
+        pid = _read_lock_owner_pid(lock_path)
+        if pid and _is_process_alive(pid):
+            PrettyOutput.print(
+                f"检测到已有一个 Jarvis 实例正在运行 (PID: {pid})。\n"
+                f"如果确认不存在正在运行的实例，请删除锁文件后重试：{lock_path}",
+                OutputType.WARNING,
+            )
+            sys.exit(0)
+        # 尝试移除陈旧锁
+        try:
+            lock_path.unlink()
+        except Exception:
+            PrettyOutput.print(
+                f"无法删除旧锁文件：{lock_path}，请手动清理后重试。",
+                OutputType.ERROR,
+            )
+            sys.exit(1)
+
+    # 原子创建锁文件，避免并发竞争
+    flags = os.O_CREAT | os.O_EXCL | os.O_WRONLY
+    try:
+        fd = os.open(str(lock_path), flags)
+        with os.fdopen(fd, "w", encoding="utf-8") as fp:
+            payload = {
+                "pid": os.getpid(),
+                "time": int(time.time()),
+                "argv": sys.argv[:10],
+            }
+            try:
+                fp.write(json.dumps(payload, ensure_ascii=False))
+            except Exception:
+                fp.write(str(os.getpid()))
+        _INSTANCE_LOCK_PATH = lock_path
+        atexit.register(_release_instance_lock)
+    except FileExistsError:
+        # 极端并发下再次校验
+        pid = _read_lock_owner_pid(lock_path)
+        if pid and _is_process_alive(pid):
+            PrettyOutput.print(
+                f"检测到已有一个 Jarvis 实例正在运行 (PID: {pid})。",
+                OutputType.WARNING,
+            )
+            sys.exit(0)
+        PrettyOutput.print(
+            f"锁文件已存在但可能为陈旧状态：{lock_path}，请手动删除后重试。",
+            OutputType.ERROR,
+        )
+        sys.exit(1)
+    except Exception as e:
+        PrettyOutput.print(f"创建实例锁失败: {e}", OutputType.ERROR)
+        sys.exit(1)
+
+
 def _check_pip_updates() -> bool:
     """检查pip安装的Jarvis是否有更新
 
@@ -1289,12 +1415,21 @@ def _collect_optional_config_interactively(
         )
         or changed
     )
+    # 规划相关：最大递归层数（仅在启用规划时生效，CLI --plan/--no-plan 控制启用）
+    changed = (
+        _ask_and_set_int(
+            "JARVIS_PLAN_MAX_DEPTH",
+            "任务规划的最大层数（限制递归拆分深度，默认2；仅在启用规划时生效）",
+            3,
+        )
+        or changed
+    )
     # 新增：自动总结轮次与脚本超时
     changed = (
         _ask_and_set_int(
             "JARVIS_AUTO_SUMMARY_ROUNDS",
-            "基于对话轮次的自动总结阈值（达到该轮次后自动总结并清理历史，默认20）",
-            20,
+            "基于对话轮次的自动总结阈值（达到该轮次后自动总结并清理历史，默认50）",
+            50,
         )
         or changed
     )

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

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

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=oTkuIy1EsFy9C2D4yYth5JohcbEgLLtiPlfbyY7LvrM,73
-jarvis/jarvis_agent/__init__.py,sha256=uq8p8ruYW5CjN8J8fncYAe7YrRORXjm183TSu_0ST2Y,51837
+jarvis/__init__.py,sha256=sOKEklWEZaCxQadO6f1UkOMRanbgJ3rJjjBTWjm6JC4,73
+jarvis/jarvis_agent/__init__.py,sha256=uEd9UrrHK5CRpOVSCxPESfxcAclMfoRacQrzVzQLiEk,56763
 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
@@ -8,7 +8,7 @@ jarvis/jarvis_agent/event_bus.py,sha256=pRdfk7d0OG18K6yNfWlCvAh_dW5p9sBtT2Yc3jGm
 jarvis/jarvis_agent/events.py,sha256=rmFQ37PasImCh7OCdCzNBvubk-kHwcUiYLgzmL0t0_4,3689
 jarvis/jarvis_agent/file_context_handler.py,sha256=2MPn_O_2llX39meFg272Cjk3wMPn5nmgbGMUyX06YQo,2113
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=LnhgTx5xQXCBK8esjCkFbgFm9iEyFX7TryUlC40Kzpw,4428
-jarvis/jarvis_agent/jarvis.py,sha256=4HlG4Wfs0HRqLq3mLHx3kt5MV--yjLpAkK7KtIhskwQ,48591
+jarvis/jarvis_agent/jarvis.py,sha256=eZpONtA7mFZtG6v-xQeVElXAWtl3ZZrrp4jgvtlK96c,48925
 jarvis/jarvis_agent/main.py,sha256=IgS7d3rng2vFlu983OUeCkOAosKjFAn1sFCk3gT9J9Q,4563
 jarvis/jarvis_agent/memory_manager.py,sha256=WSyUffx9xTmkcj4QrSLEfsjI3sTMUwZmkkC9_N_gTjo,8042
 jarvis/jarvis_agent/methodology_share_manager.py,sha256=AB_J9BwRgaeENQfL6bH83FOLeLrgHhppMb7psJNevKs,6874
@@ -25,6 +25,7 @@ jarvis/jarvis_agent/shell_input_handler.py,sha256=wiAPjB-9uTkcLszbO5dlOUwIfaeR39
 jarvis/jarvis_agent/stdio_redirect.py,sha256=xqF-sENitpefCT3TA9oRwATFqbDrU2dvqM-UiMZRhbE,9944
 jarvis/jarvis_agent/task_analyzer.py,sha256=JXc-63hnTD7oSX-nIfRcgxqCMhh4fM4QYVc7C1gp--M,7813
 jarvis/jarvis_agent/task_manager.py,sha256=lme_aN8vaF_a4Tvv2kaSEnWATy8RPSjogTxeLnEYZdg,6504
+jarvis/jarvis_agent/task_planner.py,sha256=MaoyyMkpbs-QmYjLZOKmNLsDXmlKwM89_UaqGI1geGw,10600
 jarvis/jarvis_agent/tool_executor.py,sha256=k73cKhZEZpljvui4ZxALlFEIE-iLzJ32Softsmiwzqk,1896
 jarvis/jarvis_agent/tool_share_manager.py,sha256=Do08FRxis0ynwR2a6iRoa6Yq0qCP8NkuhMbPrimaxMA,5169
 jarvis/jarvis_agent/user_interaction.py,sha256=tifFN49GkO_Q80sqOTVmhxwbNWTazF3K0cr8AnnvzdU,1453
@@ -33,7 +34,7 @@ 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=JtUZ6maMxOic5g5THCoOpgv9hyYecJZL71QR7nE2KDM,42269
+jarvis/jarvis_code_agent/code_agent.py,sha256=1jdIZUgHFoevFljoZiDOO0Zxs_oKR_vJS4-eUSTSqPY,42720
 jarvis/jarvis_code_agent/lint.py,sha256=_qLJB_bC3PuoHG-j4EGOnYzNGO26jHlKLbkysfyQW1c,3954
 jarvis/jarvis_code_analysis/code_review.py,sha256=48r0UE4pmOUaRgBJIJrpPW307sKGo1rnTNkWdsqkOrY,29889
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
@@ -56,7 +57,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=1c8h8kDlcBqqiX2uHhajgT70F9o88QR1ee-zk2GJJ6w,15093
+jarvis/jarvis_data/config_schema.json,sha256=5tNhALZ61smZP7VzppWxs99LP21RY3gB1wrqemQ-xoo,15358
 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
@@ -91,6 +92,16 @@ jarvis/jarvis_rag/query_rewriter.py,sha256=LGAWZ8kwH_dpquuYqc4QWC7IXmHX3SsnPSYMW
 jarvis/jarvis_rag/rag_pipeline.py,sha256=aaTuxiArtVaPemWeySApw64q204JeLNXpOEtq7Adn1I,13797
 jarvis/jarvis_rag/reranker.py,sha256=7Azc3y5fngwfPKtzZ8tx6iGKNeqC8uDy8yo8VCyLyL4,2670
 jarvis/jarvis_rag/retriever.py,sha256=J4jO0492yHEwxJz_Cp2WP3vGHRHKj56rDyWZQ2W0XdA,18374
+jarvis/jarvis_sec/README.md,sha256=0GpTAOAupOGEAv0juLJXEBBfaa6KL74t2nRbj0N5Mkw,7621
+jarvis/jarvis_sec/__init__.py,sha256=SYgHZcxoV4xgjdal1S04u7QXCQJdgPpwiAxmEcK1pYg,25690
+jarvis/jarvis_sec/cli.py,sha256=_DWWcYscLWCyIs5k7bKjXSBkQPxLbYLJKkU0QuTaeZs,3494
+jarvis/jarvis_sec/prompts.py,sha256=ObGFNvrCtbIhsWlJHYQ5tcsTkuBlID0FozncYCv8S8k,14165
+jarvis/jarvis_sec/report.py,sha256=5wLKqK-CDFZ2fPtwP3sGYgjAi69TKoYizyLK1cchDVA,8516
+jarvis/jarvis_sec/types.py,sha256=_C3IHwnni3kApryP3c_UTYdvFdmlJSVXQLLefX94zl0,365
+jarvis/jarvis_sec/workflow.py,sha256=DokD8ZBcAfyiq078OM7rmZdpWrOXAL_7ZGkLF2TOqcc,20187
+jarvis/jarvis_sec/checkers/__init__.py,sha256=ZF7zHJS6P6cu9VE3kMc66DK7m-Ki2bmMkwkap5mm26g,786
+jarvis/jarvis_sec/checkers/c_checker.py,sha256=ezW_-9wwzLxYEENd3HhdgDnLfJiLccJacJklTOnVXgw,53498
+jarvis/jarvis_sec/checkers/rust_checker.py,sha256=SBobyUjN1rDzFPESZ6uif3PR3HUW6Mux2ofxeqRUJ2Q,13483
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=lUJPwLR9RlaaVv0lx3ojjjv5dELHOaindlsLDDkpssQ,14960
 jarvis/jarvis_stats/__init__.py,sha256=jJzgP43nxzLbNGs8Do4Jfta1PNCJMf1Oq9YTPd6EnFM,342
@@ -112,15 +123,15 @@ jarvis/jarvis_tools/registry.py,sha256=KDDuaQC_Ej8nGKk2P5W7uMV22BQQx_lSf9dLrLZ6o
 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
-jarvis/jarvis_tools/sub_agent.py,sha256=Fn2RZ7jLD4cZCWt0HnpSLkdIbeqeZq-1h97Nfg2RAqE,8485
-jarvis/jarvis_tools/sub_code_agent.py,sha256=KpwTCU89kq_RGNpfyA1C0bTl-f0dTvsCyDKplU-hrds,9600
+jarvis/jarvis_tools/sub_agent.py,sha256=oV_-R5kAnocA3X8yrxtccGKa6UIo08_YbMQB0ozCPzU,8534
+jarvis/jarvis_tools/sub_code_agent.py,sha256=F9iY0XgYsHJEdfMo_0UR646qYbj61t4jIUVnrq9zPuE,9479
 jarvis/jarvis_tools/virtual_tty.py,sha256=L7-J00ARQvIa25T45Hhqg2eCBl6W2LFgqDlWMWf-7dk,25275
 jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/cli/main.py,sha256=WL2GNV7WqYl7G1-btRGvCkzDCMk4fPfNvzCrnUFVPxs,9323
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=z8iAqsbZUiGFaozxG1xSu128op8udqHOeEw-GxNt4bU,1708
 jarvis/jarvis_utils/clipboard.py,sha256=D3wzQeqg_yiH7Axs4d6MRxyNa9XxdnenH-ND2uj2WVQ,2967
-jarvis/jarvis_utils/config.py,sha256=jOVCrlD597U6FTu8j-lyO93Mpoyqv3Do7Seja_XrRfE,22580
+jarvis/jarvis_utils/config.py,sha256=7aGTlZMpXC0PhZeu3WD3asBAC0hf4xlAmFep-ObwtR0,22918
 jarvis/jarvis_utils/embedding.py,sha256=x6mrkL7Bc3qgfuBDsjc4fg4nKG8ofGxVLVVydbsb8PY,2838
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/fzf.py,sha256=vCs0Uh5dUqGbWzXn2JCtLLCOYE2B39ZNdNveR9PK4DA,1681
@@ -131,10 +142,10 @@ jarvis/jarvis_utils/input.py,sha256=4VXpUZoAocW1mldlZd4bmXI8a_CmcQj7IPLBNgNLGSI,
 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=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,,
+jarvis/jarvis_utils/utils.py,sha256=bN7HxVBs3Hoa8xM4NtOaKXpSm7WbhwwRyU4jE0v8NjY,78702
+jarvis_ai_assistant-0.5.1.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.5.1.dist-info/METADATA,sha256=DeO39HTIYe-SziDd5J0lWoiPuADScAqzRdC7hIgiL6o,18751
+jarvis_ai_assistant-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.5.1.dist-info/entry_points.txt,sha256=wS5YtI-Patr7PIB_DaKzlbDuQ2cDmQSDljA6psIkjbM,1469
+jarvis_ai_assistant-0.5.1.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.5.1.dist-info/RECORD,,

{jarvis_ai_assistant-0.5.0.dist-info → jarvis_ai_assistant-0.5.1.dist-info}/entry_points.txt

@@ -11,6 +11,7 @@ jarvis-methodology = jarvis.jarvis_methodology.main:main
 jarvis-multi-agent = jarvis.jarvis_multi_agent.main:main
 jarvis-platform-manager = jarvis.jarvis_platform_manager.main:main
 jarvis-rag = jarvis.jarvis_rag.cli:main
+jarvis-sec = jarvis.jarvis_sec.cli:main
 jarvis-smart-shell = jarvis.jarvis_smart_shell.main:main
 jarvis-stats = jarvis.jarvis_stats.cli:main
 jarvis-tool = jarvis.jarvis_tools.cli.main:main
@@ -23,6 +24,7 @@ jma = jarvis.jarvis_multi_agent.main:main
 jmo = jarvis.jarvis_memory_organizer.memory_organizer:main
 jpm = jarvis.jarvis_platform_manager.main:main
 jrg = jarvis.jarvis_rag.cli:main
+jsec = jarvis.jarvis_sec.cli:main
 jss = jarvis.jarvis_smart_shell.main:main
 jst = jarvis.jarvis_stats.cli:main
 jt = jarvis.jarvis_tools.cli.main:main