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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.9.4
+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.4 → conduct_cli-0.9.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "conduct-cli"
-version = "0.9.4"
+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.4 → 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.4 → conduct_cli-0.9.6}/src/conduct_cli/main.py

@@ -343,7 +343,7 @@ def _report_tool_coverage() -> None:
     """Detect AI tools on this machine and POST coverage to Guard API. Silent on failure."""
     try:
         cfg = _load_config()
-        server  = cfg.get("server", "").rstrip("/")
+        server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
         api_key = cfg.get("agent_token", "")
         token   = cfg.get("token", "")
         email   = cfg.get("email", "")
@@ -1354,7 +1354,7 @@ def _atomic_write(path: Path, data: dict) -> None:
 
 def cmd_switch(args):
     cfg = _load_config()
-    server  = cfg.get("server", "").rstrip("/")
+    server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
     api_key = cfg.get("agent_token", "")
     token   = cfg.get("token", "")
 
@@ -1798,7 +1798,7 @@ def _render_table(rows: list[dict]) -> str:
 
 def _fetch_runs(cfg: dict) -> list[dict]:
     """Fetch recent runs from GET /runs."""
-    server  = cfg.get("server", "").rstrip("/")
+    server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
     api_key = cfg.get("agent_token", "")
     ws_id   = cfg.get("workspace", "")
     if not all([server, api_key, ws_id]):
@@ -1814,7 +1814,7 @@ def _fetch_runs(cfg: dict) -> list[dict]:
 
 def _fetch_guard_activity(cfg: dict, guard_cfg: dict) -> list[dict]:
     """Fetch recent Guard events grouped by developer."""
-    server  = cfg.get("server", "").rstrip("/")
+    server  = (cfg.get("server") or cfg.get("api_url") or "").rstrip("/")
     api_key = cfg.get("agent_token", "")
     ws_id   = cfg.get("workspace", "")
     if not all([server, api_key, ws_id]):

{conduct_cli-0.9.4 → 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.4
+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.4 → 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

{conduct_cli-0.9.4 → conduct_cli-0.9.6}/tests/test_switch.py

@@ -197,3 +197,33 @@ def test_whoami_prints_all_sections(tmp_path, capsys):
     assert "sudhi@b2bsphere.com" in out
     assert "3 rules" in out
     assert "Booster" in out
+
+
+# ---------------------------------------------------------------------------
+# Regression: cmd_switch must accept `api_url` when `server` is absent.
+# `conduct login` writes `api_url`; older cmd_switch only read `server`
+# and falsely reported "Not logged in".
+# ---------------------------------------------------------------------------
+
+def test_switch_accepts_api_url_key(tmp_path, capsys):
+    """conduct switch works when config was written by `conduct login` (api_url only)."""
+    from conduct_cli import main as m
+
+    cfg_path = tmp_path / "config.json"
+    cfg_path.write_text(json.dumps({
+        "api_url":     "https://api.conductai.ai",
+        "agent_token": "cond_agt_testkey",
+        "workspace":   "ef0a7e36-0000-0000-0000-000000000001",
+    }))
+
+    args = _make_args(workspace=None)
+
+    with (
+        patch.object(m, "CONFIG_PATH", cfg_path),
+        patch.object(m.api, "req", return_value=_fake_workspaces()),
+    ):
+        m.cmd_switch(args)
+
+    out = capsys.readouterr().out
+    assert "Not logged in" not in out
+    assert "Engineering" in out