conduct-cli 0.4.17__tar.gz → 0.4.19__tar.gz

{conduct_cli-0.4.17 → conduct_cli-0.4.19}/PKG-INFO

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

{conduct_cli-0.4.17 → conduct_cli-0.4.19}/pyproject.toml

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

{conduct_cli-0.4.17 → conduct_cli-0.4.19}/src/conduct_cli/guard.py

@@ -274,7 +274,7 @@ def _scan_codex_tokens(transcript_path):
                 buf = f.read(read_size) + buf
             text = buf.decode("utf-8", errors="ignore")
             # Split; if we haven't reached the start the first fragment may be partial
-            parts = text.split("\n")
+            parts = text.split("\\n")
             start = 1 if pos > 0 else 0
             for line in reversed(parts[start:]):
                 if "token_count" not in line or not line.strip():
@@ -502,10 +502,12 @@ def _install_codex_hook(hook_path: Path) -> None:
     hook_section = hooks.setdefault("hooks", {})
 
     # PreToolUse
-    pre_cmd = f"python3 {hook_path}"
+    pre_cmd = f"{sys.executable} {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 +515,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"{sys.executable} {hook_path} post"
     post = hook_section.setdefault("PostToolUse", [])
     # Remove stale conductguard-post entries registered by older CLI versions
     stale = "conductguard-post"
@@ -527,7 +536,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 +619,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"{sys.executable} {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 +630,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"{sys.executable} {hook_path} post"
     # Remove stale conductguard-post entries registered by older CLI versions
     stale = "conductguard-post"
     cleaned = False
@@ -634,7 +651,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.17 → conduct_cli-0.4.19}/src/conduct_cli.egg-info/PKG-INFO

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