conduct-cli 0.6.3__tar.gz → 0.6.5__tar.gz

{conduct_cli-0.6.3 → conduct_cli-0.6.5}/PKG-INFO

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

{conduct_cli-0.6.3 → conduct_cli-0.6.5}/pyproject.toml

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

{conduct_cli-0.6.3 → conduct_cli-0.6.5}/src/conduct_cli/guard.py

@@ -562,7 +562,7 @@ def _install_claude_hook(hook_path: Path) -> None:
 def cmd_guard_install(args):
     """Called automatically from `conduct login`. Sets up Guard: downloads policies, installs hook + MCP."""
     api_key = getattr(args, "api_key", None)
-    server  = getattr(args, "server", "https://api.conductai.ai").rstrip("/")
+    server  = (getattr(args, "server", None) or "https://api.conductai.ai").rstrip("/")
 
     # Load workspace_id from ~/.conduct/config.json
     conduct_cfg_path = Path.home() / ".conduct" / "config.json"

{conduct_cli-0.6.3 → conduct_cli-0.6.5}/src/conduct_cli/hook_template.py

@@ -327,7 +327,7 @@ except Exception:
         return None, "allow", None, None
 
 
-def _detect_repo() -> str | None:
+def _detect_repo():  # -> Optional[str]
     try:
         import subprocess
         out = subprocess.check_output(["git", "remote", "get-url", "origin"],
@@ -343,8 +343,18 @@ def _detect_repo() -> str | None:
 
 def _detect_ai_tool():
     import os
-    if os.environ.get("CLAUDECODE") or os.environ.get("CLAUDE_CODE_ENTRYPOINT"):
+    # Explicit env vars — most reliable, set by the tool itself
+    if os.environ.get("CLAUDE_CODE_ENTRYPOINT") or os.environ.get("CLAUDECODE"):
         return "claude-code"
+    if os.environ.get("CODEX_SESSION_ID") or os.environ.get("CODEX_CLI_VERSION"):
+        return "codex"
+    # TERM_PROGRAM is set by Cursor, Windsurf, and similar IDE terminals
+    term = os.environ.get("TERM_PROGRAM", "").lower()
+    if term == "cursor":
+        return "cursor"
+    if term == "windsurf":
+        return "windsurf"
+    # PATH-based fallback
     path = os.environ.get("PATH", "")
     if "Codex.app" in path or "codex" in path.lower():
         return "codex"
@@ -352,7 +362,7 @@ def _detect_ai_tool():
         return "cursor"
     if "windsurf" in path.lower():
         return "windsurf"
-    return "unknown"
+    return "claude-code"  # default — Claude Code is primary
 
 
 def _already_warned_this_session(session_id: str, rule_id: str) -> bool:
@@ -730,11 +740,12 @@ def post_usage_main():
         data = json.load(sys.stdin)
     except Exception:
         sys.exit(0)
-    session_id      = data.get("session_id")
     tool_name       = (data.get("tool_name") or "").lower()
     tool_use_id     = data.get("tool_use_id")
     transcript_path = data.get("transcript_path")
-    is_codex = (tool_use_id or "").startswith("call_")
+    is_codex        = (tool_use_id or "").startswith("call_")
+    # Codex sends transcript_path but not session_id — use path as stable session key
+    session_id      = data.get("session_id") or (f"transcript:{transcript_path}" if transcript_path else None)
 
     if is_codex and transcript_path:
         # Write pending args; spawn delayed background reader so hook exits instantly

{conduct_cli-0.6.3 → conduct_cli-0.6.5}/src/conduct_cli.egg-info/PKG-INFO

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