OpenJarvis 1.0.4.dev1012__py3-none-any.whl → 1.0.4.dev1014__py3-none-any.whl

openjarvis/skills/dependency.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections import deque
-from typing import TYPE_CHECKING, Dict, List, Set
+from typing import TYPE_CHECKING, Dict, List, Optional, Set
 
 if TYPE_CHECKING:
     from openjarvis.skills.types import SkillManifest
@@ -12,6 +12,13 @@ if TYPE_CHECKING:
 class DependencyCycleError(Exception):
     """Raised when a cycle is detected in the skill dependency graph."""
 
+    def __init__(self, message: str, skills: Optional[Set[str]] = None) -> None:
+        super().__init__(message)
+        # The skills involved in (or downstream of) the cycle, so callers
+        # can prune exactly those rather than parsing the message string
+        # or discarding the whole graph (#781).
+        self.skills: Set[str] = skills if skills is not None else set()
+
 
 class DepthExceededError(Exception):
     """Raised when the dependency depth exceeds the configured maximum."""
@@ -101,9 +108,11 @@ def validate_dependencies(
                 queue.append(dependent)
 
     if len(order) != len(graph):
+        cyclic = set(graph) - set(order)
         raise DependencyCycleError(
             "Cycle detected in skill dependency graph. "
-            f"Skills involved: {set(graph) - set(order)}"
+            f"Skills involved: {cyclic}",
+            skills=cyclic,
         )
 
     # --- Depth enforcement via DFS ---

openjarvis/skills/manager.py

@@ -3,18 +3,21 @@
 from __future__ import annotations
 
 import html
+import logging
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from openjarvis.core.events import EventBus
 from openjarvis.core.paths import get_config_dir
-from openjarvis.skills.dependency import validate_dependencies
+from openjarvis.skills.dependency import DependencyCycleError, validate_dependencies
 from openjarvis.skills.executor import SkillExecutor, SkillResult
 from openjarvis.skills.loader import discover_skills
 from openjarvis.skills.tool_adapter import SkillTool
 from openjarvis.skills.types import SkillManifest
 from openjarvis.tools._stubs import BaseTool, ToolExecutor
 
+logger = logging.getLogger(__name__)
+
 
 class SkillManager:
     """Coordinate skill discovery, resolution, catalog generation, and execution.
@@ -86,13 +89,41 @@ class SkillManager:
 
             # Validate the dependency graph after loading skills
             if self._skills:
-                validate_dependencies(self._skills)
+                self._prune_dependency_cycles()
 
         # Load optimization overlays (Plan 2A) — always runs, even when no
         # paths are provided, so callers can apply overlays to skills loaded
         # via other means.
         self._load_overlays()
 
+    def _prune_dependency_cycles(self) -> None:
+        """Validate the dependency graph, iteratively dropping any skills
+        involved in a cycle so the rest of discovery still succeeds (#781).
+
+        Previously ``validate_dependencies`` was called unguarded: a single
+        cyclic pair raised ``DependencyCycleError`` straight out of
+        ``discover()``, which crashed CLI callers outright and, in
+        ``SystemBuilder``, was caught by a broad exception handler that
+        silently discarded every discovered skill — not just the cyclic
+        ones. Each pass removes exactly the skills the error identifies as
+        cyclic and re-validates, since removing them can resolve skills
+        that only *looked* stuck because of an edge into the cycle.
+        """
+        while self._skills:
+            try:
+                validate_dependencies(self._skills)
+                return
+            except DependencyCycleError as exc:
+                if not exc.skills:
+                    # No indication of which skills to drop; bail out
+                    # rather than looping forever.
+                    return
+                for name in sorted(exc.skills):
+                    logger.warning(
+                        "Skill '%s' removed: part of a dependency cycle", name
+                    )
+                    self._skills.pop(name, None)
+
     def _load_overlays(self) -> None:
         """Apply optimization overlays to discovered skills.
 

openjarvis/tools/shell_exec.py

@@ -20,8 +20,32 @@ _MAX_TIMEOUT = 300
 # Default timeout (seconds)
 _DEFAULT_TIMEOUT = 30
 
-# Environment variables always passed through
-_BASE_ENV_KEYS = ("PATH", "HOME", "USER", "LANG", "TERM")
+# Environment variables always passed through on every platform.
+_PORTABLE_ENV_KEYS = (
+    "PATH",
+    "HOME",
+    "USER",
+    "LANG",
+    "TERM",
+)
+
+# Windows needs these to bootstrap ordinary child processes: missing
+# SystemRoot breaks Winsock/DNS initialization, while missing LOCALAPPDATA
+# can make the Store Python launcher provision a fresh interpreter in cwd.
+# Keep them conditional so a POSIX host that happens to define similarly
+# named variables does not expand the tool's minimal environment.
+_WINDOWS_ENV_KEYS = (
+    "SystemRoot",
+    "SystemDrive",
+    "COMSPEC",
+    "PATHEXT",
+    "TEMP",
+    "TMP",
+    "USERPROFILE",
+    "LOCALAPPDATA",
+    "APPDATA",
+)
+_BASE_ENV_KEYS = _PORTABLE_ENV_KEYS + (_WINDOWS_ENV_KEYS if os.name == "nt" else ())
 
 
 @ToolRegistry.register("shell_exec")

{openjarvis-1.0.4.dev1012.dist-info → openjarvis-1.0.4.dev1014.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: OpenJarvis
-Version: 1.0.4.dev1012
+Version: 1.0.4.dev1014
 Summary: OpenJarvis — modular AI assistant backend with composable intelligence primitives
 Project-URL: Homepage, https://github.com/open-jarvis/OpenJarvis
 Project-URL: Documentation, https://open-jarvis.github.io/OpenJarvis/

{openjarvis-1.0.4.dev1012.dist-info → openjarvis-1.0.4.dev1014.dist-info}/RECORD

@@ -768,12 +768,12 @@ openjarvis/sessions/__init__.py,sha256=kv78IvoPDvXK4X7TeIZxiMlpXWQrQmtnqEePdzDCf
 openjarvis/sessions/compression.py,sha256=KB0VoCVXa1j-_4RJafMTLAscCjIO9fpSEEch4v6nrx0,3677
 openjarvis/sessions/session.py,sha256=mXlftYDluF2TX0M9-IwGSKg0X-D_VFjwQp6y85w7wYI,12202
 openjarvis/skills/__init__.py,sha256=Ho43L58RscRL4P8yJx4b_T6GCLgkYDXoISVlDhsfMOs,1310
-openjarvis/skills/dependency.py,sha256=-dqUUXiG0sWazVOo3QfhPew5Ug3XPid1_PQuVsfgzQ0,5939
+openjarvis/skills/dependency.py,sha256=zYKIacRqbexUfpBbF27Z4bhXZiwJO08MofsSohFRyBA,6384
 openjarvis/skills/executor.py,sha256=EyTTbOPn0rEfsTvJKq5okRCbzjUdT8OUyxQaYD9NGyI,7599
 openjarvis/skills/importer.py,sha256=-3htZU64yWbXbKbqoX2wBOpQ32ne_clulAs3vs4-f0o,9335
 openjarvis/skills/index.py,sha256=UpypJzu6EkBWdgzHcZqX-wmxBYbpE3NMFiroQSxVkVQ,3123
 openjarvis/skills/loader.py,sha256=Sa-FZCQtZwo7me03aCPKhECtxFh4AsSsR8lII9Y2yB0,10929
-openjarvis/skills/manager.py,sha256=vWcuNQrfwzYs4t9GCm_JehxLxy0Hcw4qPnYL3KWYhNg,16597
+openjarvis/skills/manager.py,sha256=OcEjilLQSMAfr9w75O2qptg-gTp3vY8KLlDc_7qb3K0,18037
 openjarvis/skills/overlay.py,sha256=rcZNbaWRNWN5MoPkZjfEpzmivogkSOAcI_bco_Ywun8,4832
 openjarvis/skills/parser.py,sha256=M72s4twtAvG8fv5iGtXr3iwQzyXL3oiMl-qfL0pAZ-4,8811
 openjarvis/skills/security.py,sha256=on53PIvVPo-f3voKrA2-3L-skbJdfjUFyXEirGNexZw,1797
@@ -891,7 +891,7 @@ openjarvis/tools/proactive_tools.py,sha256=Ej89KDO5kucq4X9WYbjIxgJ2ERvC2jTg6BtO_
 openjarvis/tools/repl.py,sha256=5UYWDYD2VYErNhBr9Qibg87nZ6BvfitVcjithL1Iphk,10289
 openjarvis/tools/retrieval.py,sha256=rx7_8eI0RjzGxQmeS6dNcNKskjcRX3fkbqyk8L0Yf08,2847
 openjarvis/tools/scan_chunks.py,sha256=AV3OrPQAJTARGf4QqxLmTHtW98tPiEqd03Sh4pko43c,6699
-openjarvis/tools/shell_exec.py,sha256=bx9rfjQz3HZWl2B5p4XIwb2xEs1x4p_bKdfxI85IeGo,7143
+openjarvis/tools/shell_exec.py,sha256=HqlfLsBj29ujJyMJgVIL4jFVLOlBmvc7WFreHS_Y-Gg,7801
 openjarvis/tools/skill_manage.py,sha256=ld6tmulz_LCuug5BVl9aBpGCY5spUjQ0r7ocapqLnvU,5378
 openjarvis/tools/storage_tools.py,sha256=TWdPQszrlzJJ78La_iOXVqSHHLMmuvq_U1VXhA1gMT0,10274
 openjarvis/tools/text_to_speech.py,sha256=L4OL0ZKnNvI1DZEnRKK6UvxuDA6uTm9dD0pDxuqDjAs,3577
@@ -949,8 +949,8 @@ _node_modules/whatsapp_baileys_bridge/package-lock.json,sha256=MPMyCqNAzQGB16-hm
 _node_modules/whatsapp_baileys_bridge/package.json,sha256=iIdmM7Pg2uas-RBOtA2PlYHas_Fc8YCKvPGOJHS2YTg,410
 _node_modules/whatsapp_baileys_bridge/tsconfig.json,sha256=CZwRjhfDvWEr6IBdM_5_2Mgtam53nUHS8kNCHXyfLhY,258
 _node_modules/whatsapp_baileys_bridge/src/bridge.ts,sha256=QFrrqy2sSR01qvw6xYB0opuF4fh3ytZe5X2086Jyxs8,4418
-openjarvis-1.0.4.dev1012.dist-info/METADATA,sha256=R_u0rSwpy41Vq9EJN1pk0eTL0EBQTvI8BHXP9v6gQiY,17250
-openjarvis-1.0.4.dev1012.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-openjarvis-1.0.4.dev1012.dist-info/entry_points.txt,sha256=_KQ__IsIkCPIMrokIXk0U5Fl8QijcJGncFuX3ZxP4TY,91
-openjarvis-1.0.4.dev1012.dist-info/licenses/LICENSE,sha256=rGF-zdt__rJ6I5xsnIFFISMGuqkOI-5pSEm_PO-xB0M,10773
-openjarvis-1.0.4.dev1012.dist-info/RECORD,,
+openjarvis-1.0.4.dev1014.dist-info/METADATA,sha256=sB8AfCq9Ck5rN-9a27WbKiXTfutt-WUUaBcnAD63Zf0,17250
+openjarvis-1.0.4.dev1014.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+openjarvis-1.0.4.dev1014.dist-info/entry_points.txt,sha256=_KQ__IsIkCPIMrokIXk0U5Fl8QijcJGncFuX3ZxP4TY,91
+openjarvis-1.0.4.dev1014.dist-info/licenses/LICENSE,sha256=rGF-zdt__rJ6I5xsnIFFISMGuqkOI-5pSEm_PO-xB0M,10773
+openjarvis-1.0.4.dev1014.dist-info/RECORD,,