claude-dev-env 1.35.0 → 1.36.1

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

@@ -0,0 +1,220 @@
+"""Tests for fetch_bugbot_reviews.
+
+Covers:
+- gh command uses --paginate --slurp (per gh-paginate rule)
+- per-page filter happens in Python after fetching all pages
+- only cursor[bot] reviews are returned
+- reviews are sorted newest-first by submitted_at
+- review bodies matching the bugbot dirty-pattern are classified "dirty"
+- review bodies without the pattern are classified "clean"
+- 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_bugbot_reviews.py"
+    spec = importlib.util.spec_from_file_location("fetch_bugbot_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_bugbot_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_bugbot_reviews_module.fetch_bugbot_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_cursor_bot_only() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "copilot stuff",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "cursor[bot]"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "Cursor Bugbot has reviewed your changes and found 1 potential issue.",
+                },
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_bugbot_reviews_module.fetch_bugbot_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": "cursor[bot]"},
+                    "commit_id": "old",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "Bugbot reviewed your changes and found no new issues!",
+                }
+            ],
+            [
+                {
+                    "id": 11,
+                    "user": {"login": "cursor[bot]"},
+                    "commit_id": "new",
+                    "submitted_at": "2026-01-03T00:00:00Z",
+                    "body": "Cursor Bugbot has reviewed your changes and found 2 potential issues.",
+                },
+                {
+                    "id": 12,
+                    "user": {"login": "cursor[bot]"},
+                    "commit_id": "mid",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "Bugbot reviewed your changes and found no new issues!",
+                },
+            ],
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_bugbot_reviews_module.fetch_bugbot_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_body_matches_bugbot_findings_pattern() -> (
+    None
+):
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "cursor[bot]"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "Cursor Bugbot has reviewed your changes and found 3 potential issues.",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_bugbot_reviews_module.fetch_bugbot_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews[0]["classification"] == "dirty"
+
+
+def test_should_classify_clean_review_when_body_lacks_findings_pattern() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "cursor[bot]"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "Bugbot reviewed your changes and found no new issues!",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_bugbot_reviews_module.fetch_bugbot_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews[0]["classification"] == "clean"
+
+
+def test_should_reference_cursor_bot_login_constant_directly_without_local_alias() -> None:
+    source_text = (
+        Path(__file__).resolve().parent / "fetch_bugbot_reviews.py"
+    ).read_text(encoding="utf-8")
+    assert "cursor_bot_login = CURSOR_BOT_LOGIN" not in source_text
+    assert "CURSOR_BOT_LOGIN" in source_text
+
+
+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_bugbot_reviews_module.fetch_bugbot_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": "cursor[bot]"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "Bugbot reviewed your changes and found no new issues!",
+                }
+            ]
+        ]
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(pages_payload)
+        all_reviews = fetch_bugbot_reviews_module.fetch_bugbot_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

@@ -0,0 +1,372 @@
+"""Tests for fetch_copilot_inline_comments.
+
+Covers:
+- gh command uses --paginate --slurp on the comments endpoint
+- only copilot-pull-request-reviewer[bot] inline comments are returned
+- comments not anchored to the requested commit are filtered out
+- comments on the same commit but from an older Copilot review are filtered out
+- multi-page responses are flattened correctly
+- subprocess errors propagate
+"""
+
+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_copilot_inline_comments.py"
+    spec = importlib.util.spec_from_file_location(
+        "fetch_copilot_inline_comments", 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_copilot_inline_comments_module = _load_module()
+
+
+def _completed(stdout: str) -> subprocess.CompletedProcess:
+    process = MagicMock(spec=subprocess.CompletedProcess)
+    process.stdout = stdout
+    process.returncode = 0
+    return process
+
+
+def _default_review_for_head(*, commit: str, review_id: int) -> list[dict]:
+    return [
+        {
+            "review_id": review_id,
+            "commit_id": commit,
+            "submitted_at": "2026-01-01T00:00:00Z",
+            "state": "CHANGES_REQUESTED",
+            "body": "Please address the inline notes.",
+            "classification": "dirty",
+        }
+    ]
+
+
+def test_should_invoke_gh_with_paginate_slurp_against_comments_endpoint() -> None:
+    pages_payload = json.dumps([[]])
+    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)
+        fetch_copilot_inline_comments_module.fetch_copilot_inline_comments(
+            owner="acme", repo="widget", number=42, current_head="abc123"
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    assert invoked_argv[0] == "gh"
+    assert invoked_argv[1] == "api"
+    assert "repos/acme/widget/pulls/42/comments?per_page=100" in invoked_argv[2]
+    assert "--paginate" in invoked_argv
+    assert "--slurp" in invoked_argv
+
+
+def test_should_filter_to_copilot_reviewer_only() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 100,
+                    "user": {"login": "cursor[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "bugbot finding",
+                    "path": "x.py",
+                    "line": 5,
+                },
+                {
+                    "id": 101,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "copilot finding",
+                    "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 len(all_inline_comments) == 1
+    assert all_inline_comments[0]["comment_id"] == 101
+
+
+def test_should_filter_out_comments_not_on_current_head() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 200,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "old_sha",
+                    "pull_request_review_id": 1,
+                    "body": "stale finding",
+                    "path": "x.py",
+                    "line": 5,
+                },
+                {
+                    "id": 201,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "current_sha",
+                    "pull_request_review_id": 2,
+                    "body": "fresh finding",
+                    "path": "x.py",
+                    "line": 6,
+                },
+            ]
+        ]
+    )
+    with (
+        patch.object(
+            fetch_copilot_inline_comments_module,
+            "fetch_copilot_reviews",
+            return_value=_default_review_for_head(commit="current_sha", review_id=2),
+        ),
+        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="current_sha"
+            )
+        )
+    assert len(all_inline_comments) == 1
+    assert all_inline_comments[0]["comment_id"] == 201
+
+
+def test_should_ignore_inline_comments_from_older_copilot_review_on_same_commit() -> (
+    None
+):
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 300,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "same_sha",
+                    "pull_request_review_id": 10,
+                    "body": "stale dirty thread",
+                    "path": "x.py",
+                    "line": 1,
+                },
+                {
+                    "id": 301,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "same_sha",
+                    "pull_request_review_id": 11,
+                    "body": "current clean thread",
+                    "path": "x.py",
+                    "line": 2,
+                },
+            ]
+        ]
+    )
+    reviews_newest_first = [
+        {
+            "review_id": 11,
+            "commit_id": "same_sha",
+            "submitted_at": "2026-01-02T00:00:00Z",
+            "state": "APPROVED",
+            "body": "lgtm",
+            "classification": "clean",
+        },
+        {
+            "review_id": 10,
+            "commit_id": "same_sha",
+            "submitted_at": "2026-01-01T00:00:00Z",
+            "state": "CHANGES_REQUESTED",
+            "body": "fix the thing",
+            "classification": "dirty",
+        },
+    ]
+    with (
+        patch.object(
+            fetch_copilot_inline_comments_module,
+            "fetch_copilot_reviews",
+            return_value=reviews_newest_first,
+        ),
+        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="same_sha"
+            )
+        )
+    assert [each_comment["comment_id"] for each_comment in all_inline_comments] == [301]
+
+
+def test_should_return_empty_when_no_copilot_review_exists_for_commit() -> None:
+    with (
+        patch.object(
+            fetch_copilot_inline_comments_module,
+            "fetch_copilot_reviews",
+            return_value=[
+                {
+                    "review_id": 1,
+                    "commit_id": "other_sha",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "state": "APPROVED",
+                    "body": "",
+                    "classification": "clean",
+                }
+            ],
+        ),
+        patch("subprocess.run") as mock_run,
+    ):
+        all_inline_comments = (
+            fetch_copilot_inline_comments_module.fetch_copilot_inline_comments(
+                owner="acme", repo="widget", number=42, current_head="missing_sha"
+            )
+        )
+    assert all_inline_comments == []
+    mock_run.assert_not_called()
+
+
+def test_should_flatten_across_pages() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "abc",
+                    "pull_request_review_id": 9,
+                    "body": "a",
+                    "path": "f.py",
+                    "line": 1,
+                }
+            ],
+            [
+                {
+                    "id": 2,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "abc",
+                    "pull_request_review_id": 9,
+                    "body": "b",
+                    "path": "f.py",
+                    "line": 2,
+                },
+                {
+                    "id": 3,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "abc",
+                    "pull_request_review_id": 9,
+                    "body": "c",
+                    "path": "f.py",
+                    "line": 3,
+                },
+            ],
+        ]
+    )
+    with (
+        patch.object(
+            fetch_copilot_inline_comments_module,
+            "fetch_copilot_reviews",
+            return_value=_default_review_for_head(commit="abc", review_id=9),
+        ),
+        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="abc"
+            )
+        )
+    assert [each_comment["comment_id"] for each_comment in all_inline_comments] == [
+        1,
+        2,
+        3,
+    ]
+
+
+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_raise_when_gh_subprocess_fails() -> None:
+    failure = subprocess.CalledProcessError(
+        returncode=1, cmd=["gh"], stderr="auth failure"
+    )
+    with (
+        patch.object(
+            fetch_copilot_inline_comments_module,
+            "fetch_copilot_reviews",
+            return_value=_default_review_for_head(commit="abc", review_id=1),
+        ),
+        patch("subprocess.run", side_effect=failure),
+    ):
+        with pytest.raises(subprocess.CalledProcessError):
+            fetch_copilot_inline_comments_module.fetch_copilot_inline_comments(
+                owner="acme", repo="widget", number=42, current_head="abc"
+            )
+
+
+def test_should_return_entries_whose_keys_are_strings() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 101,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "copilot finding",
+                    "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 len(all_inline_comments) == 1
+    first_comment_entry = all_inline_comments[0]
+    assert isinstance(first_comment_entry, dict)
+    assert all(isinstance(each_key, str) for each_key in first_comment_entry.keys())