conduct-cli 0.14.5__tar.gz → 0.14.7__tar.gz

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/PKG-INFO

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

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/pyproject.toml

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

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/src/conduct_cli/guard.py

@@ -1232,17 +1232,21 @@ def _detect_ai_tools() -> list[dict]:
     if codex_dir.exists():
         config = codex_dir / "config.toml"
         is_desktop = _check_toml_str(config, "[desktop]")
+        # Codex Desktop uses the same provider configuration as Codex CLI.
+        # Do not report it as partial when the Conduct provider is selected.
+        codex_proxy = _check_toml_str(config, 'model_provider = "conduct"')
+        codex_mcp = _check_toml_str(config, "mcp_servers.conduct") or _check_toml_str(config, "conduct-mcp")
         if is_desktop:
             tools.append({
                 "name": "codex-desktop",
-                "mcp_registered": _check_toml_str(config, "conduct-mcp"),
+                "mcp_registered": codex_mcp,
                 "hook_registered": _check_toml_str(config, "conductguard") or _check_toml_str(config, "conduct"),
-                "proxy_routed": False,
+                "proxy_routed": codex_proxy,
             })
         else:
             tools.append({
                 "name": "codex",
-                "mcp_registered": _check_toml_str(config, "conduct-mcp"),
+                "mcp_registered": codex_mcp,
                 "hook_registered": _check_toml_str(config, "conductguard") or _check_toml_str(config, "conduct"),
                 "proxy_routed": _is_openai_proxied(),
             })
@@ -1546,26 +1550,23 @@ def cmd_guard_sync(args):
     _save_policy(policy)
     print(f"  {GREEN}Policy refreshed:{RESET} {rule_count} hook rule(s). Proxy and non-hook rules run server-side.")
 
-    # Refresh agent token from server via refresh_token grant.
-    # Never rely on the locally-cached value — it may be stale or missing.
+    # Installation metadata is not a refresh grant. Keep the access/refresh pair
+    # together; another OAuth client's token must never replace this session.
     try:
         installed = _req(
             "GET",
             f"{base_url}/guard/config/installed?workspace_id={workspace_id}",
             token=_token,
         )
-        fresh_agent_token = installed.get("agent_token") or ""
-        if fresh_agent_token:
-            cfg["agent_token"] = fresh_agent_token
         if installed.get("user_email"):
             cfg["user_email"] = installed["user_email"]
         if installed.get("clerk_user_id"):
             cfg["clerk_user_id"] = installed["clerk_user_id"]
         _save_guard_config(cfg)
-        if not fresh_agent_token and not cfg.get("agent_token"):
+        if not cfg.get("agent_token"):
             print(f"  {YELLOW}Warning: server returned no token — proxy env may be stale{RESET}")
     except Exception as e:
-        print(f"  {YELLOW}Warning: could not refresh token ({e}) — using cached value{RESET}")
+        print(f"  {YELLOW}Warning: could not fetch installation metadata ({e}){RESET}")
 
     # Write LLM proxy env vars so any AI tool (Claude Code, Cursor, Codex, …)
     # routes through Conduct Guard. Customer-overridable via --proxy-url or

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/src/conduct_cli/hooks/posttooluse.py

@@ -236,8 +236,16 @@ def post_codex_main() -> None:
     time.sleep(2)
     transcript_path = args.get("transcript_path", "")
     tokens_in, tokens_out = _scan_codex_tokens(transcript_path)
-    if tokens_in or tokens_out:
-        _post_usage(args.get("session_id"), args.get("tool_name"), tokens_in, tokens_out, None, args.get("blast_radius"))
+    _post_usage(
+        args.get("session_id"),
+        args.get("tool_name") or "unknown",
+        tokens_in,
+        tokens_out,
+        None,
+        args.get("blast_radius"),
+        args.get("execution_status"),
+        args.get("result_summary"),
+    )
     sys.exit(0)
 
 
@@ -280,6 +288,8 @@ def main() -> None:
                 "tool_name":       tool_name,
                 "transcript_path": transcript_path,
                 "blast_radius":    blast_radius,
+                "execution_status": execution_status,
+                "result_summary":   result_summary,
             }))
             subprocess.Popen(
                 [sys.executable, str(_this_file), "post-codex", str(pending)],

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/src/conduct_cli/hooks/pretooluse.py

@@ -828,9 +828,12 @@ def main() -> None:
         sys.exit(2)
 
     decision = {"block": "blocked", "warn": "warned"}.get(action, "allowed")
-    if action == "warn" and session_id and rule_id and _already_warned_this_session(session_id, rule_id):
-        sys.exit(0)
-    if action == "warn" and session_id and rule_id:
+    # Deduplicate the warning message, never the audit event.
+    suppress_warning = bool(
+        action == "warn" and session_id and rule_id
+        and _already_warned_this_session(session_id, rule_id)
+    )
+    if action == "warn" and session_id and rule_id and not suppress_warning:
         _record_session_warn(session_id, rule_id)
 
     # Pre-mint the audit-row id ONLY on block. That way the receipt URL
@@ -855,7 +858,7 @@ def main() -> None:
         print(msg)
         print(_boxed(msg, receipt_url), file=sys.stderr)
         sys.exit(2)
-    if action == "warn":
+    if action == "warn" and not suppress_warning:
         print(f"[ConductGuard] {message}")
 
     sys.exit(0)

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/src/conduct_cli.egg-info/PKG-INFO

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

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/src/conduct_cli.egg-info/SOURCES.txt

@@ -54,4 +54,5 @@ tests/test_report_tool_coverage.py
 tests/test_session_start.py
 tests/test_signed_policy.py
 tests/test_switch.py
+tests/test_sync_credential_isolation.py
 tests/test_token_lifecycle.py

{conduct_cli-0.14.5 → conduct_cli-0.14.7}/tests/test_advisory_and_hook.py

@@ -308,7 +308,8 @@ class TestWarnDedup:
         posted = self._run_warn(monkeypatch, "sess-abc")
         assert "warned" in posted
 
-    def test_second_warn_same_session_skips(self, monkeypatch, tmp_path):
+    @pytest.mark.parametrize("tool", ["Bash", "exec_command", "apply_patch"])
+    def test_repeated_warn_records_every_call_but_prints_once(self, monkeypatch, capsys, tool):
         import conduct_cli.hooks.pretooluse as pt
         warns: dict[str, set] = {}
 
@@ -321,9 +322,6 @@ class TestWarnDedup:
         monkeypatch.setattr(pt, "_already_warned_this_session", _fake_already)
         monkeypatch.setattr(pt, "_record_session_warn", _fake_record)
 
-        # First call records the warn
-        _fake_record("sess-xyz", "no-echo")
-
         monkeypatch.setattr(pt, "check_policy", lambda tn, ti, **kw: ({}, "warn", "no-echo", "watch out"))
         monkeypatch.setattr(pt, "_get_fail_mode", lambda: "fail_open")
         monkeypatch.setattr(pt, "_get_advisory_mode", lambda: False)
@@ -332,16 +330,21 @@ class TestWarnDedup:
         monkeypatch.setattr(pt, "_maybe_sync_policy", lambda: None)
         monkeypatch.setattr(pt, "_should_periodic_flush", lambda: False)
 
-        posted: list[str] = []
-        monkeypatch.setattr(pt, "post_event", lambda tn, ti, d, r, m, s, **kw: posted.append(d))
-        monkeypatch.setattr(sys, "stdin", StringIO(_hook_input(session="sess-xyz")))
-
-        try:
-            pt.main()
-        except SystemExit:
-            pass
-
-        assert posted == [], "second warn same session should be skipped"
+        posted = []
+        monkeypatch.setattr(pt, "post_event", lambda tn, ti, d, r, m, s, **kw: posted.append((tn, ti, d, r, s)))
+        monkeypatch.setattr(pt, "record_hook_heartbeat", lambda *args: None)
+
+        for index, session in enumerate(["sess-xyz", "sess-xyz", "sess-new"]):
+            command = f"echo call-{index}"
+            monkeypatch.setattr(sys, "stdin", StringIO(_hook_input(tool=tool, cmd=command, session=session)))
+            with pytest.raises(SystemExit) as exc:
+                pt.main()
+            assert exc.value.code == 0
+            assert posted[-1] == (tool.lower(), {"command": command}, "warned", "no-echo", session)
+            assert len(posted) == index + 1
+            output = capsys.readouterr()
+            assert output.out == ("" if index == 1 else "[ConductGuard] watch out\n")
+            assert output.err == ""
 
 
 # ── advisory_mode mirrored on sync ────────────────────────────────────────────

conduct_cli-0.14.7/tests/test_sync_credential_isolation.py

@@ -0,0 +1,44 @@
+"""A metadata fetch must never swap out a client's access/refresh pair."""
+from types import SimpleNamespace
+from unittest.mock import Mock
+
+import pytest
+
+from conduct_cli import guard
+
+
+def test_sync_preserves_credentials_when_install_status_returns_another_token(monkeypatch):
+    cfg = {
+        "agent_token": "cond_agt_current-session",
+        "refresh_token": "cond_ref_current-session",
+        "workspace_id": "11111111-1111-4111-8111-111111111111",
+        "token_expires_at": "2099-01-01T00:00:00+00:00",
+    }
+    original = cfg.copy()
+    monkeypatch.setattr(guard, "_proactive_token_refresh", lambda: None)
+    monkeypatch.setattr(guard, "_require_guard_config", lambda: cfg)
+    monkeypatch.setattr(guard, "_api_url", lambda _: "https://api.example.test")
+    monkeypatch.setattr(guard, "_check_and_upgrade_packages", lambda: None)
+    monkeypatch.setattr(guard, "_save_policy", lambda _: None)
+    request = Mock(side_effect=[{"rules": []}, {
+        "agent_token": "cond_agt_another-client",
+        "user_email": "synthetic@example.test",
+        "clerk_user_id": "synthetic",
+    }])
+    monkeypatch.setattr(guard, "_req", request)
+
+    class MetadataSaved(BaseException):
+        pass
+
+    def save(value):
+        for key, expected in original.items():
+            assert value[key] == expected
+        assert value["clerk_user_id"] == "synthetic"
+        raise MetadataSaved()
+
+    monkeypatch.setattr(guard, "_save_guard_config", save)
+    # Stop before machine configuration, process launches or external requests.
+    with pytest.raises(MetadataSaved):
+        guard.cmd_guard_sync(SimpleNamespace(dry_run=False))
+    assert request.call_count == 2
+    assert all(call.kwargs["token"] == original["agent_token"] for call in request.call_args_list)