conduct-cli 0.4.18__tar.gz → 0.4.20__tar.gz

{conduct_cli-0.4.18 → conduct_cli-0.4.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.4.18
+Version: 0.4.20
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT

{conduct_cli-0.4.18 → conduct_cli-0.4.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "conduct-cli"
-version = "0.4.18"
+version = "0.4.20"
 description = "CLI for Conduct AI — install agents, manage projects, run tests"
 readme = "README.md"
 license = { text = "MIT" }

{conduct_cli-0.4.18 → conduct_cli-0.4.20}/src/conduct_cli/guard.py

@@ -402,6 +402,20 @@ if __name__ == "__main__":
         main()
 '''
 
+# ── Python interpreter selection ─────────────────────────────────────────────
+
+def _best_python() -> str:
+    """Return the best available Python 3 interpreter path.
+    Prefers 3.11+ (Homebrew) over Apple's system Python 3.9 which has
+    restrictions that cause the hook to fail silently."""
+    import shutil
+    for candidate in ("python3.13", "python3.12", "python3.11", "python3.10"):
+        found = shutil.which(candidate)
+        if found:
+            return found
+    return sys.executable
+
+
 # ── Hook write helper ─────────────────────────────────────────────────────────
 
 def _write_hook(path: Path) -> None:
@@ -502,10 +516,12 @@ def _install_codex_hook(hook_path: Path) -> None:
     hook_section = hooks.setdefault("hooks", {})
 
     # PreToolUse
-    pre_cmd = f"python3 {hook_path}"
+    pre_cmd = f"{_best_python()} {hook_path}"
+    hook_path_str = str(hook_path)
     pre = hook_section.setdefault("PreToolUse", [])
+    # Match by hook path so old python3/python3.11 entries are treated as already registered
     pre_already = any(
-        e.get("command") == pre_cmd
+        hook_path_str in e.get("command", "")
         for h in pre
         for e in h.get("hooks", [])
     )
@@ -513,9 +529,16 @@ def _install_codex_hook(hook_path: Path) -> None:
     if not pre_already:
         pre.append({"matcher": ".*", "hooks": [{"type": "command", "command": pre_cmd}]})
         changed = True
-
-    # PostToolUse — self-contained: python3 /path/hook.py post (no PATH dependency)
-    post_cmd = f"python3 {hook_path} post"
+    else:
+        # Update existing entry to use current sys.executable
+        for h in pre:
+            for e in h.get("hooks", []):
+                if hook_path_str in e.get("command", "") and e["command"] != pre_cmd:
+                    e["command"] = pre_cmd
+                    changed = True
+
+    # PostToolUse
+    post_cmd = f"{_best_python()} {hook_path} post"
     post = hook_section.setdefault("PostToolUse", [])
     # Remove stale conductguard-post entries registered by older CLI versions
     stale = "conductguard-post"
@@ -527,7 +550,7 @@ def _install_codex_hook(hook_path: Path) -> None:
             cleaned = True
     post[:] = [h for h in post if h.get("hooks")]
     post_already = any(
-        e.get("command") == post_cmd
+        hook_path_str in e.get("command", "")
         for h in post
         for e in h.get("hooks", [])
     )
@@ -610,9 +633,10 @@ def _install_claude_hook(hook_path: Path) -> None:
 
     # PreToolUse — existing hook script
     pre = hooks.setdefault("PreToolUse", [])
-    pre_cmd = f"python3 {hook_path}"
+    pre_cmd = f"{_best_python()} {hook_path}"
+    hook_path_str = str(hook_path)
     pre_already = any(
-        e.get("command") == pre_cmd
+        hook_path_str in e.get("command", "")
         for h in pre
         for e in h.get("hooks", [])
     )
@@ -620,10 +644,17 @@ def _install_claude_hook(hook_path: Path) -> None:
     if not pre_already:
         pre.append({"matcher": ".*", "hooks": [{"type": "command", "command": pre_cmd}]})
         changed = True
-
-    # PostToolUse — self-contained: python3 /path/hook.py post (no PATH dependency)
+    else:
+        # Update existing entry to use current sys.executable
+        for h in pre:
+            for e in h.get("hooks", []):
+                if hook_path_str in e.get("command", "") and e["command"] != pre_cmd:
+                    e["command"] = pre_cmd
+                    changed = True
+
+    # PostToolUse
     post = hooks.setdefault("PostToolUse", [])
-    post_cmd = f"python3 {hook_path} post"
+    post_cmd = f"{_best_python()} {hook_path} post"
     # Remove stale conductguard-post entries registered by older CLI versions
     stale = "conductguard-post"
     cleaned = False
@@ -634,7 +665,7 @@ def _install_claude_hook(hook_path: Path) -> None:
             cleaned = True
     post[:] = [h for h in post if h.get("hooks")]
     post_already = any(
-        e.get("command") == post_cmd
+        hook_path_str in e.get("command", "")
         for h in post
         for e in h.get("hooks", [])
     )

{conduct_cli-0.4.18 → conduct_cli-0.4.20}/src/conduct_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.4.18
+Version: 0.4.20
 Summary: CLI for Conduct AI — install agents, manage projects, run tests
 Author-email: Conduct AI <hello@conductai.ai>
 License: MIT