conduct-cli 0.5.5__tar.gz → 0.5.6__tar.gz

{conduct_cli-0.5.5 → conduct_cli-0.5.6}/PKG-INFO

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

{conduct_cli-0.5.5 → conduct_cli-0.5.6}/pyproject.toml

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

{conduct_cli-0.5.5 → conduct_cli-0.5.6}/src/conduct_cli/hook_template.py

@@ -2,6 +2,7 @@
 """ConductGuard PreToolUse hook — enforces team policies, tracks all tool calls."""
 import json
 import re
+import shlex
 import subprocess
 import sys
 import time
@@ -127,6 +128,35 @@ def _fetch_budget_status():
 try:
     from conduct_cli.guard import _check_policy
 except Exception:
+    def _bash_operator_signature(command):
+        """Extract argv[0] + subcommand + flag tokens per shell segment.
+        Skips quoted argument values so patterns don't match content inside --body/-m strings.
+        Returns space-joined signature across segments.
+        """
+        if not command:
+            return ""
+        segments = re.split(r'&&|\|\||\|(?!\|)|;', command)
+        parts = []
+        for seg in segments:
+            try:
+                tokens = shlex.split(seg.strip())
+            except ValueError:
+                continue
+            if not tokens:
+                continue
+            sig = [tokens[0]]
+            i = 1
+            # Subcommand: only barewords (no whitespace means wasn't a quoted multi-word value)
+            if i < len(tokens) and not tokens[i].startswith("-") and " " not in tokens[i]:
+                sig.append(tokens[i])
+                i += 1
+            # Flags: only real flag tokens, not flag-like strings inside quoted content
+            for t in tokens[i:]:
+                if t.startswith("-") and " " not in t:
+                    sig.append(t)
+            parts.append(" ".join(sig))
+        return " ; ".join(parts)
+
     def _check_policy(tool_name, tool_input, tokens_before=0):
         """Return (matched_rule, action, rule_id, message) or (None, 'allow', None, None)."""
         if not POLICY_PATH.exists():
@@ -137,7 +167,13 @@ except Exception:
             return None, "allow", None, None
 
         rules      = policy.get("rules", [])
-        input_text = json.dumps(tool_input)
+        # For Bash, match against operator signature (argv[0] + subcommand + flags) — not raw JSON.
+        # Prevents false positives where dangerous patterns appear inside quoted argument values
+        # (e.g. `gh issue create --body "...rm -rf..."` should not match no-rm-rf).
+        if tool_name == "Bash" and tool_input.get("command"):
+            input_text = _bash_operator_signature(tool_input["command"])
+        else:
+            input_text = json.dumps(tool_input)
         path_fields = [str(tool_input.get(f, "")) for f in ["file_path", "path", "command"]]
 
         for rule in rules:

{conduct_cli-0.5.5 → conduct_cli-0.5.6}/src/conduct_cli.egg-info/PKG-INFO

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

{conduct_cli-0.5.5 → conduct_cli-0.5.6}/src/conduct_cli.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ src/conduct_cli.egg-info/dependency_links.txt
 src/conduct_cli.egg-info/entry_points.txt
 src/conduct_cli.egg-info/requires.txt
 src/conduct_cli.egg-info/top_level.txt
+tests/test_bash_operator_signature.py
 tests/test_guard_policy.py
 tests/test_guard_savings.py
 tests/test_hook_syntax.py

conduct_cli-0.5.6/tests/test_bash_operator_signature.py

@@ -0,0 +1,82 @@
+"""Tests for _bash_operator_signature — fixes #728 false positives."""
+import re
+import shlex
+
+
+def _bash_operator_signature(command):
+    """Same logic as hook_template.py. Kept inline for unit testing."""
+    if not command:
+        return ""
+    segments = re.split(r'&&|\|\||\|(?!\|)|;', command)
+    parts = []
+    for seg in segments:
+        try:
+            tokens = shlex.split(seg.strip())
+        except ValueError:
+            continue
+        if not tokens:
+            continue
+        sig = [tokens[0]]
+        i = 1
+        # Subcommand: next token only if it's a bareword (no whitespace = wasn't a multi-word quoted value)
+        if i < len(tokens) and not tokens[i].startswith("-") and " " not in tokens[i]:
+            sig.append(tokens[i])
+            i += 1
+        # Flags only if they're real flags (no whitespace = not embedded in quoted content)
+        for t in tokens[i:]:
+            if t.startswith("-") and " " not in t:
+                sig.append(t)
+        parts.append(" ".join(sig))
+    return " ; ".join(parts)
+
+
+def assert_match(pattern, command, should_match):
+    sig = _bash_operator_signature(command)
+    matched = bool(re.search(pattern, sig, re.IGNORECASE))
+    assert matched is should_match, f"{command!r} → sig={sig!r}, pattern={pattern!r}, expected={should_match}, got={matched}"
+
+
+def test_rm_rf_actual_command_fires():
+    assert_match(r"\brm\s+-rf\b", "rm -rf /tmp/build", True)
+
+
+def test_rm_rf_in_gh_body_does_not_fire():
+    assert_match(r"\brm\s+-rf\b", 'gh issue create --body "contains rm -rf example"', False)
+
+
+def test_rm_rf_in_git_commit_does_not_fire():
+    assert_match(r"\brm\s+-rf\b", 'git commit -m "fix: remove rm -rf call from script"', False)
+
+
+def test_force_push_fires():
+    assert_match(r"git\s+push.*--force", "git push --force origin main", True)
+
+
+def test_force_push_in_commit_does_not_fire():
+    assert_match(r"git\s+push.*--force", 'git commit -m "add force-push docs"', False)
+
+
+def test_vercel_prod_fires():
+    assert_match(r"vercel.*--prod", "vercel deploy --prod", True)
+
+
+def test_vercel_prod_in_echo_does_not_fire():
+    assert_match(r"vercel.*--prod", 'echo "vercel deploy --prod example"', False)
+
+
+def test_chained_rm_rf_fires():
+    assert_match(r"\brm\s+-rf\b", "git add . && rm -rf node_modules", True)
+
+
+def test_chained_rm_in_commit_does_not_fire():
+    assert_match(r"\brm\s+-rf\b", 'git add . && git commit -m "rm -rf cleanup"', False)
+
+
+def test_empty_command():
+    assert _bash_operator_signature("") == ""
+
+
+def test_unterminated_quote_does_not_crash():
+    # Should skip the segment, not raise
+    sig = _bash_operator_signature('git commit -m "unterminated')
+    assert isinstance(sig, str)