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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conduct-cli
-Version: 0.9.5
+Version: 0.9.7
 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.7}/pyproject.toml

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

@@ -576,7 +576,19 @@ def cmd_login(args):
     cfg.pop("api_key", None)
     _atomic_write(CONFIG_PATH, cfg)
 
-    print(f"{GREEN}✓ Logged in{RESET} — workspace {GRAY}{result['workspace_id']}{RESET}")
+    # Fetch workspaces so we can display the current one by name and nudge
+    # the user if their account has more than one (cross-surface switch drift).
+    try:
+        _hdrs = {"Authorization": f"Bearer {result['agent_token']}", "Content-Type": "application/json"}
+        _workspaces = api.req("GET", f"{api_url}/projects", _hdrs) or []
+    except Exception:
+        _workspaces = []
+    _current = next((w for w in _workspaces if str(w.get("id")) == str(result["workspace_id"])), None)
+    _name = (_current or {}).get("name") or ""
+    if _name:
+        print(f"{GREEN}✓ Logged in{RESET} — workspace {BOLD}{_name}{RESET} {GRAY}({str(result['workspace_id'])[:8]}…){RESET}")
+    else:
+        print(f"{GREEN}✓ Logged in{RESET} — workspace {GRAY}{result['workspace_id']}{RESET}")
 
     # Auto-sync: register hooks + pull policy
     try:
@@ -588,6 +600,15 @@ def cmd_login(args):
     except Exception:
         pass
 
+    # Nudge if the account has multiple workspaces — the web UI and CLI hold
+    # workspace context independently, so users routinely forget which one
+    # the CLI is now targeting.
+    if len(_workspaces) > 1:
+        _others = [w.get("name","") for w in _workspaces if str(w.get("id")) != str(result["workspace_id"])]
+        _preview = ", ".join(o for o in _others[:3] if o)
+        print(f"\n  {GRAY}You have {len(_workspaces)} workspaces. This CLI now targets:{RESET} {BOLD}{_name or result['workspace_id']}{RESET}")
+        print(f"  {GRAY}Switch with:{RESET} {CYAN}conduct switch \"<name>\"{RESET}  {GRAY}(others: {_preview}){RESET}")
+
 
 def cmd_agents(args):
     server, workspace_id, token = _require_auth(args)

{conduct_cli-0.9.5 → conduct_cli-0.9.7}/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.7
 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.7}/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.5 → conduct_cli-0.9.7}/tests/test_switch.py

@@ -227,3 +227,64 @@ def test_switch_accepts_api_url_key(tmp_path, capsys):
     out = capsys.readouterr().out
     assert "Not logged in" not in out
     assert "Engineering" in out
+
+
+# ---------------------------------------------------------------------------
+# Regression: `conduct login` prints workspace name (not just UUID) and a
+# switch-hint when the account has more than one workspace. Cross-surface
+# workspace drift (web-UI-switched, CLI still on old) was invisible before.
+# ---------------------------------------------------------------------------
+
+def test_login_shows_name_and_nudges_when_multiple_workspaces(tmp_path, capsys):
+    from conduct_cli import main as m
+
+    cfg_path = tmp_path / "config.json"
+    cfg_path.write_text(json.dumps({}))
+    args = _make_args(server=None, token=None)
+
+    fake_result = {
+        "agent_token": "cond_agt_testkey",
+        "workspace_id": "ef0a7e36-0000-0000-0000-000000000001",
+    }
+
+    with (
+        patch.object(m, "CONFIG_PATH", cfg_path),
+        patch.object(m, "_web_login_flow", return_value=fake_result),
+        patch.object(m.api, "req", return_value=_fake_workspaces()),
+        patch("conduct_cli.guard.cmd_guard_sync", return_value=None),
+    ):
+        m.cmd_login(args)
+
+    out = capsys.readouterr().out
+    # Current workspace displayed by name (not just UUID)
+    assert "Engineering" in out
+    # Nudge appears because account has >1 workspace
+    assert "conduct switch" in out
+    # Other workspace names surfaced in the preview
+    assert "Marketing" in out or "Eng Backup" in out
+
+
+def test_login_omits_nudge_when_single_workspace(tmp_path, capsys):
+    from conduct_cli import main as m
+
+    cfg_path = tmp_path / "config.json"
+    cfg_path.write_text(json.dumps({}))
+    args = _make_args(server=None, token=None)
+
+    fake_result = {
+        "agent_token": "cond_agt_testkey",
+        "workspace_id": "ef0a7e36-0000-0000-0000-000000000001",
+    }
+    single_ws = [{"id": "ef0a7e36-0000-0000-0000-000000000001", "name": "Only", "owner_id": "u1", "workflow_count": 0}]
+
+    with (
+        patch.object(m, "CONFIG_PATH", cfg_path),
+        patch.object(m, "_web_login_flow", return_value=fake_result),
+        patch.object(m.api, "req", return_value=single_ws),
+        patch("conduct_cli.guard.cmd_guard_sync", return_value=None),
+    ):
+        m.cmd_login(args)
+
+    out = capsys.readouterr().out
+    assert "Only" in out
+    assert "conduct switch" not in out