conduct-cli 0.9.5__tar.gz → 0.9.6__tar.gz

{conduct_cli-0.9.5 → conduct_cli-0.9.6}/PKG-INFO

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

{conduct_cli-0.9.5 → conduct_cli-0.9.6}/pyproject.toml

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

{conduct_cli-0.9.5 → conduct_cli-0.9.6}/src/conduct_cli/guard.py

@@ -1086,13 +1086,25 @@ def cmd_guard_join(args):
     )
 
 
+def _read_conduct_env_var(name: str) -> str:
+    # ponytail: fall back to ~/.conduct/env so proxy detection is truthful
+    # right after `conduct login`, before the user sources the file.
+    try:
+        for line in (Path.home() / ".conduct" / "env").read_text().splitlines():
+            if line.startswith(f"export {name}="):
+                return line.split("=", 1)[1].strip().strip('"').strip("'")
+    except Exception:
+        pass
+    return ""
+
+
 def _is_anthropic_proxied() -> bool:
-    url = os.environ.get("ANTHROPIC_BASE_URL", "")
+    url = os.environ.get("ANTHROPIC_BASE_URL", "") or _read_conduct_env_var("ANTHROPIC_BASE_URL")
     return "conductai.ai" in url or "conduct" in url.lower()
 
 
 def _is_openai_proxied() -> bool:
-    url = os.environ.get("OPENAI_BASE_URL", "")
+    url = os.environ.get("OPENAI_BASE_URL", "") or _read_conduct_env_var("OPENAI_BASE_URL")
     return "conductai.ai" in url or "conduct" in url.lower()
 
 

{conduct_cli-0.9.5 → conduct_cli-0.9.6}/src/conduct_cli.egg-info/PKG-INFO

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

{conduct_cli-0.9.5 → conduct_cli-0.9.6}/tests/test_proxy_env.py

@@ -170,3 +170,42 @@ def test_windows_prefers_ps7_profile_when_no_wps5_exists(tmp_path, monkeypatch):
     assert rc == ps7
     assert ps7.exists()
     assert not wps5.exists()
+
+
+# ---------------------------------------------------------------------------
+# Regression: _is_anthropic_proxied / _is_openai_proxied must fall back to
+# ~/.conduct/env when the env var is missing from the current process.
+# `conduct login` writes the file but does not re-source itself, so the
+# per-tool coverage table used to report `✗ Not routed` right after login
+# even though future shells will route correctly.
+# ---------------------------------------------------------------------------
+
+@pytestmark_posix
+def test_is_anthropic_proxied_falls_back_to_env_file(tmp_path, monkeypatch):
+    _redirect_home(tmp_path, monkeypatch)
+    monkeypatch.delenv("ANTHROPIC_BASE_URL", raising=False)
+    (tmp_path / ".conduct").mkdir(exist_ok=True)
+    (tmp_path / ".conduct" / "env").write_text(
+        'export ANTHROPIC_BASE_URL="https://api.conductai.ai/proxy"\n'
+        'export ANTHROPIC_API_KEY="cond_agt_test"\n'
+    )
+    assert guard._is_anthropic_proxied() is True
+
+
+@pytestmark_posix
+def test_is_openai_proxied_falls_back_to_env_file(tmp_path, monkeypatch):
+    _redirect_home(tmp_path, monkeypatch)
+    monkeypatch.delenv("OPENAI_BASE_URL", raising=False)
+    (tmp_path / ".conduct").mkdir(exist_ok=True)
+    (tmp_path / ".conduct" / "env").write_text(
+        'export OPENAI_BASE_URL="https://api.conductai.ai/proxy/openai"\n'
+    )
+    assert guard._is_openai_proxied() is True
+
+
+@pytestmark_posix
+def test_is_anthropic_proxied_false_when_no_env_and_no_file(tmp_path, monkeypatch):
+    _redirect_home(tmp_path, monkeypatch)
+    monkeypatch.delenv("ANTHROPIC_BASE_URL", raising=False)
+    # No ~/.conduct/env written
+    assert guard._is_anthropic_proxied() is False