Merge pull request #54 from warestack/feat/update-watchflow-rules

chore: update watchflow rules

Author: dkargatzis

.watchflow/rules.yaml

@@ -1,44 +1,29 @@
 rules:
-  # Essential Open Source Rules
-  - description: "Pull requests must have descriptive titles following conventional commit format"
+  - description: "PRs must reference a linked issue in the description or title (e.g. Fixes #123)."
     enabled: true
-    severity: "medium"
+    severity: "high"
     event_types: ["pull_request"]
     parameters:
-      title_pattern: "^feat|^fix|^docs|^style|^refactor|^test|^chore|^perf|^ci|^build|^revert"
+      require_linked_issue: true
 
-  - description: "New contributors require approval from at least one past contributor"
+  - description: "When a PR modifies paths with CODEOWNERS, those owners must be added as reviewers."
     enabled: true
-    severity: "medium"
+    severity: "high"
     event_types: ["pull_request"]
     parameters:
-      min_past_contributors: 1
+      require_code_owner_reviewers: true
 
-  - description: "Code changes must include corresponding tests"
+  - description: "PR total lines changed must not exceed a maximum (e.g. 500 lines)."
     enabled: true
     severity: "medium"
     event_types: ["pull_request"]
     parameters:
-      pattern: "tests/.*\\.py$|test_.*\\.py$"
-      condition_type: "files_match_pattern"
-
-  - description: "Changes to critical files require review from code owners"
-    enabled: true
-    severity: "high"
-    event_types: ["pull_request"]
-    parameters:
-      critical_owners: []
+      max_pr_loc: 500
 
-  - description: "When a PR modifies paths with CODEOWNERS, those owners must be added as reviewers"
+  - description: "PR titles must follow a pattern (e.g. feat:, fix:, docs:) and descriptions must align diff."
     enabled: true
-    severity: "high"
+    severity: "medium"
     event_types: ["pull_request"]
     parameters:
-      require_code_owner_reviewers: true
-
-  - description: "No direct pushes to main branch - all changes must go through PRs"
-    enabled: true
-    severity: "critical"
-    event_types: ["push"]
-    parameters:
-      no_force_push: true
+      title_pattern: "^feat|^fix|^docs|^style|^refactor|^test|^chore|^perf|^ci|^build|^revert"
+      min_description_length: 50

src/presentation/github_formatter.py

@@ -106,7 +106,8 @@ def format_check_run_output(
             text += f"## {emoji} {severity.title()} Severity\n\n"
 
             for violation in severity_groups[severity]:
-                text += f"### {violation.rule_description or 'Unknown Rule'}\n"
+                text += f"### {violation.rule_description or 'Unknown Rule'}\n\n"
+                text += f"{violation.message}\n\n"
                 text += f"Rule validation failed with severity: **{violation.severity}**\n"
                 if violation.how_to_fix:
                     text += f"**How to fix:** {violation.how_to_fix}\n"
@@ -169,7 +170,8 @@ def format_violations_comment(violations: list[Violation]) -> str:
             comment += f"### {emoji} {severity.title()} Severity\n\n"
 
             for violation in severity_groups[severity]:
-                comment += f"**{violation.rule_description or 'Unknown Rule'}**\n"
+                comment += f"### {violation.rule_description or 'Unknown Rule'}\n\n"
+                comment += f"{violation.message}\n\n"
                 comment += f"Rule validation failed with severity: **{violation.severity}**\n"
                 if violation.how_to_fix:
                     comment += f"**How to fix:** {violation.how_to_fix}\n"

src/rules/acknowledgment.py

@@ -38,17 +38,17 @@ class RuleID(StrEnum):
 
 # Mapping from violation text patterns to RuleID
 VIOLATION_TEXT_TO_RULE_MAPPING: dict[str, RuleID] = {
-    "Pull request does not have the minimum required": RuleID.MIN_PR_APPROVALS,
-    "Pull request is missing required label": RuleID.REQUIRED_LABELS,
-    "Pull request title does not match the required pattern": RuleID.PR_TITLE_PATTERN,
-    "Pull request description is too short": RuleID.PR_DESCRIPTION_REQUIRED,
-    "Individual files cannot exceed": RuleID.FILE_SIZE_LIMIT,
-    "Pull request exceeds maximum lines changed": RuleID.MAX_PR_LOC,
+    "approvals, requires": RuleID.MIN_PR_APPROVALS,
+    "Missing required labels": RuleID.REQUIRED_LABELS,
+    "does not match required pattern": RuleID.PR_TITLE_PATTERN,
+    "PR description is too short": RuleID.PR_DESCRIPTION_REQUIRED,
+    "exceed size limit of": RuleID.FILE_SIZE_LIMIT,
+    "exceeds maximum lines changed": RuleID.MAX_PR_LOC,
     "does not reference a linked issue": RuleID.REQUIRE_LINKED_ISSUE,
-    "Force pushes are not allowed": RuleID.NO_FORCE_PUSH,
-    "Direct pushes to main/master branches": RuleID.PROTECTED_BRANCH_PUSH,
-    "Paths without a code owner in CODEOWNERS": RuleID.PATH_HAS_CODE_OWNER,
-    "Code owners for modified paths must be added as reviewers": RuleID.REQUIRE_CODE_OWNER_REVIEWERS,
+    "Force push detected": RuleID.NO_FORCE_PUSH,
+    "targets protected branch": RuleID.PROTECTED_BRANCH_PUSH,
+    "Paths without a code owner": RuleID.PATH_HAS_CODE_OWNER,
+    "Code owners for modified paths": RuleID.REQUIRE_CODE_OWNER_REVIEWERS,
 }
 
 # Mapping from RuleID to human-readable descriptions

src/rules/conditions/access_control.py

@@ -298,6 +298,11 @@ def _required_code_owner_reviewers(event: dict[str, Any]) -> tuple[list[str], li
     requested_logins = {u.get("login") for u in requested_users if u.get("login")}
     requested_slugs = {t.get("slug") for t in requested_teams if t.get("slug")}
 
+    # The PR author is inherently a reviewer of their own code
+    author_login = pr.get("user", {}).get("login")
+    if author_login:
+        requested_logins.add(author_login)
+
     # Owner can be a user (login) or a team (slug or org/slug). Match user by login, team by slug.
     requested_identifiers = requested_logins | requested_slugs
 

src/rules/conditions/filesystem.py

@@ -225,9 +225,9 @@ class MaxPrLocCondition(BaseCondition):
 
     name = "max_pr_loc"
     description = "Validates that total lines changed (additions + deletions) in a PR do not exceed a maximum; enforces a maximum LOC per pull request."
-    parameter_patterns = ["max_lines"]
+    parameter_patterns = ["max_lines", "max_pr_loc", "max_changed_lines"]
     event_types = ["pull_request"]
-    examples = [{"max_lines": 500}, {"max_lines": 1000}]
+    examples = [{"max_lines": 500}, {"max_pr_loc": 1000}]
 
     async def evaluate(self, context: Any) -> list[Violation]:
         """Evaluate max PR LOC condition.
@@ -241,7 +241,9 @@ async def evaluate(self, context: Any) -> list[Violation]:
         parameters = context.get("parameters", {})
         event = context.get("event", {})
 
-        max_lines = parameters.get("max_lines", 0)
+        max_lines = (
+            parameters.get("max_lines") or parameters.get("max_pr_loc") or parameters.get("max_changed_lines") or 0
+        )
         if not max_lines:
             logger.debug("MaxPrLocCondition: No max_lines specified, skipping validation")
             return []
@@ -266,7 +268,9 @@ async def evaluate(self, context: Any) -> list[Violation]:
 
     async def validate(self, parameters: dict[str, Any], event: dict[str, Any]) -> bool:
         """Legacy validation interface for backward compatibility."""
-        max_lines = parameters.get("max_lines", 0)
+        max_lines = (
+            parameters.get("max_lines") or parameters.get("max_pr_loc") or parameters.get("max_changed_lines") or 0
+        )
         if not max_lines:
             return True
 

src/rules/loaders/github_loader.py

@@ -94,9 +94,6 @@ def _parse_rule(rule_data: dict[str, Any]) -> Rule:
         # Get parameters (strip internal "validator" key; engine infers validator from parameter names)
         parameters = dict(rule_data.get("parameters", {}))
         parameters.pop("validator", None)
-        # Normalize aliases so conditions match (e.g. max_changed_lines -> max_lines for MaxPrLocCondition)
-        if "max_changed_lines" in parameters and "max_lines" not in parameters:
-            parameters["max_lines"] = parameters["max_changed_lines"]
 
         # Instantiate conditions using Registry (matches on parameter keys, e.g. max_lines, require_linked_issue)
         conditions = ConditionRegistry.get_conditions_for_parameters(parameters)

tests/unit/event_processors/pull_request/test_enricher.py

@@ -65,7 +65,7 @@ async def test_enrich_event_data(enricher, mock_task, mock_github_client):
 async def test_fetch_acknowledgments(enricher, mock_github_client):
     mock_github_client.get_issue_comments.return_value = [
         {
-            "body": "🚨 Watchflow Rule Violations Detected\n\n**Reason:** valid reason\n\n---\nThe following violations have been overridden:\n• **Rule** - Pull request does not have the minimum required approvals\n",
+            "body": "🚨 Watchflow Rule Violations Detected\n\n**Reason:** valid reason\n\n---\nThe following violations have been overridden:\n• PR has 1 approvals, requires 2\n",
             "user": {"login": "reviewer"},
         }
     ]

tests/unit/presentation/test_github_formatter.py

@@ -19,9 +19,9 @@ def test_format_violations_comment_groups_by_severity():
     assert "## 🚨 Watchflow Rule Violations Detected" in comment
     assert "### 🔴 Critical Severity" in comment
     assert "### 🟠 High Severity" in comment
-    assert "**Rule 2**" in comment
-    assert "**Rule 1**" in comment
-    assert "**Rule 3**" in comment
+    assert "### Rule 2" in comment
+    assert "### Rule 1" in comment
+    assert "### Rule 3" in comment
     assert "Fix 1" in comment
     assert "Fix 2" in comment
 

tests/unit/rules/test_acknowledgment.py

@@ -140,18 +140,18 @@ class TestMapViolationTextToRuleId:
     @pytest.mark.parametrize(
         "text,expected_rule_id",
         [
-            ("Pull request does not have the minimum required approvals", RuleID.MIN_PR_APPROVALS),
-            ("Pull request is missing required label: security", RuleID.REQUIRED_LABELS),
-            ("Pull request title does not match the required pattern", RuleID.PR_TITLE_PATTERN),
-            ("Pull request description is too short (20 chars)", RuleID.PR_DESCRIPTION_REQUIRED),
-            ("Individual files cannot exceed 10MB limit", RuleID.FILE_SIZE_LIMIT),
+            ("PR has 1 approvals, requires 2", RuleID.MIN_PR_APPROVALS),
+            ("Missing required labels: security", RuleID.REQUIRED_LABELS),
+            ("PR title 'foo' does not match required pattern '^feat'", RuleID.PR_TITLE_PATTERN),
+            ("PR description is too short", RuleID.PR_DESCRIPTION_REQUIRED),
+            ("Files exceed size limit of 10MB", RuleID.FILE_SIZE_LIMIT),
             ("Pull request exceeds maximum lines changed (1234 > 500)", RuleID.MAX_PR_LOC),
             (
                 "PR does not reference a linked issue (e.g. #123 or closes #123 in body/title)",
                 RuleID.REQUIRE_LINKED_ISSUE,
             ),
-            ("Force pushes are not allowed on this branch", RuleID.NO_FORCE_PUSH),
-            ("Direct pushes to main/master branches prohibited", RuleID.PROTECTED_BRANCH_PUSH),
+            ("Force push detected on protected branch", RuleID.NO_FORCE_PUSH),
+            ("PR targets protected branch 'main'", RuleID.PROTECTED_BRANCH_PUSH),
             ("Paths without a code owner in CODEOWNERS: src/bar.py", RuleID.PATH_HAS_CODE_OWNER),
             (
                 "Code owners for modified paths must be added as reviewers: alice",
@@ -175,7 +175,7 @@ class TestMapViolationTextToRuleDescription:
 
     def test_maps_to_description(self):
         """Should map violation text to human-readable description."""
-        text = "Pull request does not have the minimum required approvals"
+        text = "PR has 1 approvals, requires 2"
         description = map_violation_text_to_rule_description(text)
         assert description == "Pull requests require at least 2 approvals"
 
@@ -193,7 +193,7 @@ def test_parses_single_violation(self):
 **Reason:** Emergency fix
 
 The following violations have been overridden:
-• Pull request does not have the minimum required approvals
+• PR has 1 approvals, requires 2
 
 ---
 *This acknowledgment was validated.*"""
@@ -211,8 +211,8 @@ def test_parses_multiple_violations(self):
 **Reason:** Sprint deadline
 
 The following violations have been overridden:
-• Pull request does not have the minimum required approvals
-• Pull request is missing required label: review
+• PR has 1 approvals, requires 2
+• Missing required labels: review
 
 ---"""
 
@@ -230,7 +230,7 @@ def test_empty_comment_returns_empty_list(self):
     def test_returns_acknowledgment_models(self):
         """Should return proper Acknowledgment model instances."""
         comment = """The following violations have been overridden:
-• Force pushes are not allowed"""
+• Force push detected on protected branch"""
 
         acknowledgments = parse_acknowledgment_comment(comment, "admin")
 
@@ -240,7 +240,7 @@ def test_returns_acknowledgment_models(self):
     def test_stops_at_section_delimiter(self):
         """Should stop parsing when hitting section delimiters."""
         comment = """The following violations have been overridden:
-• Pull request title does not match the required pattern
+• PR title 'foo' does not match required pattern '^feat'
 ---
 ⚠️ Other content that should be ignored
 • Some other bullet that is NOT a violation"""