claude-dev-env 1.36.2 → 1.37.1

package/skills/pr-converge/scripts/test_fetch_claude_reviews.py

@@ -0,0 +1,368 @@
+"""Tests for fetch_claude_reviews.
+
+Covers:
+- gh command uses --paginate --slurp (per gh-paginate rule)
+- per-page filter happens in Python after fetching all pages
+- only claude reviewer-bot reviews are returned (case-insensitive substring match)
+- reviews are sorted newest-first by submitted_at
+- reviews with state APPROVED are classified "clean"
+- reviews with state CHANGES_REQUESTED or COMMENTED are classified "dirty"
+- subprocess errors propagate with stderr context
+"""
+
+from __future__ import annotations
+
+import importlib.util
+import json
+import subprocess
+from pathlib import Path
+from types import ModuleType
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+
+def _load_module() -> ModuleType:
+    module_path = Path(__file__).parent / "fetch_claude_reviews.py"
+    spec = importlib.util.spec_from_file_location("fetch_claude_reviews", module_path)
+    assert spec is not None
+    assert spec.loader is not None
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+
+fetch_claude_reviews_module = _load_module()
+
+
+def _completed(stdout: str) -> subprocess.CompletedProcess:
+    process = MagicMock(spec=subprocess.CompletedProcess)
+    process.stdout = stdout
+    process.returncode = 0
+    return process
+
+
+def test_should_invoke_gh_with_paginate_slurp_against_reviews_endpoint() -> None:
+    pages_payload = json.dumps([[]])
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    assert invoked_argv[0] == "gh"
+    assert invoked_argv[1] == "api"
+    assert "repos/acme/widget/pulls/42/reviews?per_page=100" in invoked_argv[2]
+    assert "--paginate" in invoked_argv
+    assert "--slurp" in invoked_argv
+
+
+def test_should_filter_to_claude_reviewer_only() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "cursor[bot]"},
+                    "state": "COMMENTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "bugbot stuff",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "claude[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "claude finding",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert len(all_reviews) == 1
+    assert all_reviews[0]["review_id"] == 2
+
+
+def test_should_return_reviews_newest_first_across_pages() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 10,
+                    "user": {"login": "claude[bot]"},
+                    "state": "APPROVED",
+                    "commit_id": "old",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "lgtm",
+                }
+            ],
+            [
+                {
+                    "id": 11,
+                    "user": {"login": "claude[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "new",
+                    "submitted_at": "2026-01-03T00:00:00Z",
+                    "body": "issues found",
+                },
+                {
+                    "id": 12,
+                    "user": {"login": "claude[bot]"},
+                    "state": "APPROVED",
+                    "commit_id": "mid",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "lgtm",
+                },
+            ],
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    submitted_at_sequence = [each_review["submitted_at"] for each_review in all_reviews]
+    assert submitted_at_sequence == [
+        "2026-01-03T00:00:00Z",
+        "2026-01-02T00:00:00Z",
+        "2026-01-01T00:00:00Z",
+    ]
+
+
+def test_should_classify_dirty_review_when_state_is_changes_requested() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "claude[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "Issues need addressing.",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews[0]["classification"] == "dirty"
+
+
+def test_should_classify_dirty_review_when_state_is_commented_with_body() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "claude[bot]"},
+                    "state": "COMMENTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "Found a couple of nits inline.",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews[0]["classification"] == "dirty"
+
+
+def test_should_classify_clean_review_when_state_is_commented_with_empty_body() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "claude[bot]"},
+                    "state": "COMMENTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews[0]["classification"] == "clean"
+
+
+def test_should_dispatch_dirty_classification_off_claude_dirty_review_states_tuple() -> (
+    None
+):
+    source_text = (
+        Path(__file__).resolve().parent / "reviewer_specs.py"
+    ).read_text(encoding="utf-8")
+    assert "ALL_CLAUDE_DIRTY_REVIEW_STATES" in source_text
+    assert "all_dirty_states=ALL_CLAUDE_DIRTY_REVIEW_STATES" in source_text
+
+
+def test_should_classify_clean_review_when_state_is_approved() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "claude[bot]"},
+                    "state": "APPROVED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "looks good",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews[0]["classification"] == "clean"
+
+
+def test_should_match_login_case_insensitively() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "Claude"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "uppercase login",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "CLAUDE-CODE[bot]"},
+                    "state": "APPROVED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "screaming login",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert len(all_reviews) == 2
+    assert {each_review["review_id"] for each_review in all_reviews} == {1, 2}
+
+
+def test_should_match_login_containing_claude_substring() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "claude[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "canonical bot login",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "anthropic-claude[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "non-canonical login still matches",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert {each_review["review_id"] for each_review in all_reviews} == {1, 2}
+
+
+def test_should_exclude_login_without_claude_substring() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "wrong bot",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "dependabot[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "also wrong",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews == []
+
+
+def test_should_raise_when_gh_subprocess_fails() -> None:
+    failure = subprocess.CalledProcessError(
+        returncode=1, cmd=["gh"], stderr="auth failure"
+    )
+    with patch("subprocess.run", side_effect=failure):
+        with pytest.raises(subprocess.CalledProcessError):
+            fetch_claude_reviews_module.fetch_claude_reviews(
+                owner="acme", repo="widget", number=42
+            )
+
+
+def test_should_return_entries_whose_keys_are_strings() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "claude[bot]"},
+                    "state": "APPROVED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "looks good",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_claude_reviews_module.fetch_claude_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert len(all_reviews) == 1
+    first_review_entry = all_reviews[0]
+    assert isinstance(first_review_entry, dict)
+    assert all(isinstance(each_key, str) for each_key in first_review_entry.keys())

package/skills/pr-converge/scripts/test_fetch_copilot_inline_comments.py

@@ -310,12 +310,80 @@ def test_should_flatten_across_pages() -> None:
     ]
 
 
-def test_should_reference_copilot_login_constant_directly_without_local_alias() -> None:
-    source_text = (
-        Path(__file__).resolve().parent / "fetch_copilot_inline_comments.py"
-    ).read_text(encoding="utf-8")
-    assert "copilot_reviewer_login = COPILOT_REVIEWER_LOGIN" not in source_text
-    assert "COPILOT_REVIEWER_LOGIN" in source_text
+def test_should_match_login_case_insensitively() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 300,
+                    "user": {"login": "Copilot"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "uppercase login",
+                    "path": "x.py",
+                    "line": 5,
+                },
+                {
+                    "id": 301,
+                    "user": {"login": "GITHUB-COPILOT[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "screaming login",
+                    "path": "x.py",
+                    "line": 6,
+                },
+            ]
+        ]
+    )
+    with (
+        patch.object(
+            fetch_copilot_inline_comments_module,
+            "fetch_copilot_reviews",
+            return_value=_default_review_for_head(commit="abc123", review_id=1),
+        ),
+        patch("subprocess.run") as mock_run,
+    ):
+        mock_run.return_value = _completed(pages_payload)
+        all_inline_comments = (
+            fetch_copilot_inline_comments_module.fetch_copilot_inline_comments(
+                owner="acme", repo="widget", number=42, current_head="abc123"
+            )
+        )
+    assert {each_comment["comment_id"] for each_comment in all_inline_comments} == {300, 301}
+
+
+def test_should_match_login_containing_copilot_substring() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 400,
+                    "user": {"login": "internal-copilot-fork[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "non-canonical login still matches",
+                    "path": "x.py",
+                    "line": 5,
+                }
+            ]
+        ]
+    )
+    with (
+        patch.object(
+            fetch_copilot_inline_comments_module,
+            "fetch_copilot_reviews",
+            return_value=_default_review_for_head(commit="abc123", review_id=1),
+        ),
+        patch("subprocess.run") as mock_run,
+    ):
+        mock_run.return_value = _completed(pages_payload)
+        all_inline_comments = (
+            fetch_copilot_inline_comments_module.fetch_copilot_inline_comments(
+                owner="acme", repo="widget", number=42, current_head="abc123"
+            )
+        )
+    assert len(all_inline_comments) == 1
+    assert all_inline_comments[0]["comment_id"] == 400
 
 
 def test_should_raise_when_gh_subprocess_fails() -> None:

package/skills/pr-converge/scripts/test_fetch_copilot_reviews.py

@@ -206,10 +206,10 @@ def test_should_classify_clean_review_when_state_is_commented_with_empty_body()
 
 def test_should_dispatch_dirty_classification_off_copilot_dirty_review_states_tuple() -> None:
     source_text = (
-        Path(__file__).resolve().parent / "fetch_copilot_reviews.py"
+        Path(__file__).resolve().parent / "reviewer_specs.py"
     ).read_text(encoding="utf-8")
     assert "ALL_COPILOT_DIRTY_REVIEW_STATES" in source_text
-    assert "in ALL_COPILOT_DIRTY_REVIEW_STATES" in source_text
+    assert "all_dirty_states=ALL_COPILOT_DIRTY_REVIEW_STATES" in source_text
 
 
 def test_should_classify_clean_review_when_state_is_approved() -> None:
@@ -235,12 +235,98 @@ def test_should_classify_clean_review_when_state_is_approved() -> None:
     assert all_reviews[0]["classification"] == "clean"
 
 
-def test_should_reference_copilot_login_constant_directly_without_local_alias() -> None:
-    source_text = (
-        Path(__file__).resolve().parent / "fetch_copilot_reviews.py"
-    ).read_text(encoding="utf-8")
-    assert "copilot_reviewer_login = COPILOT_REVIEWER_LOGIN" not in source_text
-    assert "COPILOT_REVIEWER_LOGIN" in source_text
+def test_should_match_login_case_insensitively() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "Copilot"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "uppercase login",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "GITHUB-COPILOT[bot]"},
+                    "state": "APPROVED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "screaming login",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_copilot_reviews_module.fetch_copilot_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert len(all_reviews) == 2
+    assert {each_review["review_id"] for each_review in all_reviews} == {1, 2}
+
+
+def test_should_match_login_containing_copilot_substring() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "canonical bot login",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "internal-copilot-fork[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "non-canonical login still matches",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_copilot_reviews_module.fetch_copilot_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert {each_review["review_id"] for each_review in all_reviews} == {1, 2}
+
+
+def test_should_exclude_login_without_copilot_substring() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "cursor[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "wrong bot",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "dependabot[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "also wrong",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_copilot_reviews_module.fetch_copilot_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews == []
 
 
 def test_should_raise_when_gh_subprocess_fails() -> None: