claude-dev-env 1.35.0 → 1.36.1

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

@@ -0,0 +1,280 @@
+"""Tests for fetch_copilot_reviews.
+
+Covers:
+- gh command uses --paginate --slurp (per gh-paginate rule)
+- per-page filter happens in Python after fetching all pages
+- only copilot-pull-request-reviewer[bot] reviews are returned
+- 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_copilot_reviews.py"
+    spec = importlib.util.spec_from_file_location("fetch_copilot_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_copilot_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_copilot_reviews_module.fetch_copilot_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_copilot_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": "copilot-pull-request-reviewer[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "copilot finding",
+                },
+            ]
+        ]
+    )
+    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) == 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": "copilot-pull-request-reviewer[bot]"},
+                    "state": "APPROVED",
+                    "commit_id": "old",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "lgtm",
+                }
+            ],
+            [
+                {
+                    "id": 11,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "state": "CHANGES_REQUESTED",
+                    "commit_id": "new",
+                    "submitted_at": "2026-01-03T00:00:00Z",
+                    "body": "issues found",
+                },
+                {
+                    "id": 12,
+                    "user": {"login": "copilot-pull-request-reviewer[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_copilot_reviews_module.fetch_copilot_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": "copilot-pull-request-reviewer[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_copilot_reviews_module.fetch_copilot_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": "copilot-pull-request-reviewer[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_copilot_reviews_module.fetch_copilot_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": "copilot-pull-request-reviewer[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_copilot_reviews_module.fetch_copilot_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    assert all_reviews[0]["classification"] == "clean"
+
+
+def test_should_dispatch_dirty_classification_off_copilot_dirty_review_states_tuple() -> None:
+    source_text = (
+        Path(__file__).resolve().parent / "fetch_copilot_reviews.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
+
+
+def test_should_classify_clean_review_when_state_is_approved() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "copilot-pull-request-reviewer[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_copilot_reviews_module.fetch_copilot_reviews(
+            owner="acme", repo="widget", number=42
+        )
+    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_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_copilot_reviews_module.fetch_copilot_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": "copilot-pull-request-reviewer[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_copilot_reviews_module.fetch_copilot_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_mark_pr_ready.py

@@ -0,0 +1,69 @@
+"""Tests for mark_pr_ready.
+
+Covers:
+- gh pr ready is invoked with the PR number and --repo flag
+- subprocess errors propagate
+"""
+
+from __future__ import annotations
+
+import importlib.util
+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 / "mark_pr_ready.py"
+    spec = importlib.util.spec_from_file_location("mark_pr_ready", 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
+
+
+mark_pr_ready_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_pr_ready_with_number_and_repo() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed('Pull request "#42" is marked as ready')
+        mark_pr_ready_module.mark_pr_ready(owner="acme", repo="widget", number=42)
+    invoked_argv = mock_run.call_args[0][0]
+    assert invoked_argv[0:3] == ["gh", "pr", "ready"]
+    assert "42" in invoked_argv
+    assert "--repo" in invoked_argv
+    assert "acme/widget" in invoked_argv
+
+
+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):
+            mark_pr_ready_module.mark_pr_ready(owner="acme", repo="widget", number=42)
+
+
+def test_should_render_repo_arg_via_named_template_constant() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("ok\n")
+        mark_pr_ready_module.mark_pr_ready(owner="acme", repo="widget", number=42)
+    invoked_argv = mock_run.call_args[0][0]
+    expected_repo_arg = mark_pr_ready_module.GH_REPO_ARG_TEMPLATE.format(
+        owner="acme", repo="widget"
+    )
+    assert expected_repo_arg == "acme/widget"
+    repo_flag_index = invoked_argv.index("--repo")
+    assert invoked_argv[repo_flag_index + 1] == expected_repo_arg

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

@@ -0,0 +1,236 @@
+"""Tests for open_followup_copilot_pr.
+
+Covers:
+- branch name follows COPILOT_FOLLOWUP_BRANCH_TEMPLATE with the short SHA
+- subprocess sequence: gh pr view (base ref) -> git fetch -> git switch -c -> git push -> gh pr create
+- gh pr create uses --draft, --base, --head, --title, --body-file (per gh-body-file rule)
+- the returned PR URL is the trimmed stdout from gh pr create
+- 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 / "open_followup_copilot_pr.py"
+    spec = importlib.util.spec_from_file_location(
+        "open_followup_copilot_pr", 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
+
+
+open_followup_copilot_pr_module = _load_module()
+
+
+def _completed(stdout: str) -> subprocess.CompletedProcess:
+    process = MagicMock(spec=subprocess.CompletedProcess)
+    process.stdout = stdout
+    process.returncode = 0
+    return process
+
+
+def _scripted_subprocess_runs(
+    *,
+    base_ref_payload: str,
+    new_pr_url: str,
+) -> list[subprocess.CompletedProcess]:
+    return [
+        _completed(base_ref_payload),
+        _completed(""),
+        _completed(""),
+        _completed(""),
+        _completed(new_pr_url),
+    ]
+
+
+def test_should_build_branch_name_from_parent_number_and_short_sha(
+    tmp_path: Path,
+) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Item 1\n", encoding="utf-8")
+    payload_sequence = _scripted_subprocess_runs(
+        base_ref_payload=json.dumps({"baseRefName": "main"}),
+        new_pr_url="https://github.com/acme/widget/pull/313\n",
+    )
+    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
+        open_followup_copilot_pr_module.open_followup_copilot_pr(
+            owner="acme",
+            repo="widget",
+            parent_number=312,
+            head="abc12345deadbeefcafe",
+            findings_file=findings_file,
+        )
+    git_switch_argv = mock_run.call_args_list[2][0][0]
+    expected_branch = "chore/copilot-followup-312-abc12345"
+    assert expected_branch in git_switch_argv
+
+
+def test_should_invoke_subprocess_call_sequence_in_documented_order(
+    tmp_path: Path,
+) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Item\n", encoding="utf-8")
+    payload_sequence = _scripted_subprocess_runs(
+        base_ref_payload=json.dumps({"baseRefName": "main"}),
+        new_pr_url="https://github.com/acme/widget/pull/313\n",
+    )
+    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
+        open_followup_copilot_pr_module.open_followup_copilot_pr(
+            owner="acme",
+            repo="widget",
+            parent_number=312,
+            head="abc12345deadbeefcafe",
+            findings_file=findings_file,
+        )
+    invoked_command_sequence = [
+        each_call[0][0] for each_call in mock_run.call_args_list
+    ]
+    assert invoked_command_sequence[0][0:3] == ["gh", "pr", "view"]
+    assert invoked_command_sequence[1][0:2] == ["git", "fetch"]
+    assert invoked_command_sequence[2][0:3] == ["git", "switch", "-c"]
+    assert invoked_command_sequence[3][0:2] == ["git", "push"]
+    assert invoked_command_sequence[4][0:3] == ["gh", "pr", "create"]
+
+
+def test_should_invoke_gh_pr_create_with_draft_and_body_file_flags(
+    tmp_path: Path,
+) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Finding A\n", encoding="utf-8")
+    payload_sequence = _scripted_subprocess_runs(
+        base_ref_payload=json.dumps({"baseRefName": "develop"}),
+        new_pr_url="https://github.com/acme/widget/pull/444\n",
+    )
+    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
+        open_followup_copilot_pr_module.open_followup_copilot_pr(
+            owner="acme",
+            repo="widget",
+            parent_number=312,
+            head="abc12345deadbeef",
+            findings_file=findings_file,
+        )
+    pr_create_argv = mock_run.call_args_list[4][0][0]
+    assert pr_create_argv[0:3] == ["gh", "pr", "create"]
+    assert "--draft" in pr_create_argv
+    assert "--base" in pr_create_argv
+    assert "develop" in pr_create_argv
+    assert "--head" in pr_create_argv
+    assert "--title" in pr_create_argv
+    assert "--body-file" in pr_create_argv
+    body_file_argv = pr_create_argv[pr_create_argv.index("--body-file") + 1]
+    assert body_file_argv == str(findings_file)
+
+
+def test_should_render_pr_title_via_named_template_constant(tmp_path: Path) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Finding\n", encoding="utf-8")
+    payload_sequence = _scripted_subprocess_runs(
+        base_ref_payload=json.dumps({"baseRefName": "main"}),
+        new_pr_url="https://github.com/acme/widget/pull/513\n",
+    )
+    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
+        open_followup_copilot_pr_module.open_followup_copilot_pr(
+            owner="acme",
+            repo="widget",
+            parent_number=312,
+            head="abc12345deadbeef",
+            findings_file=findings_file,
+        )
+    pr_create_argv = mock_run.call_args_list[4][0][0]
+    title_index = pr_create_argv.index("--title")
+    title_value = pr_create_argv[title_index + 1]
+    assert title_value == "chore: address Copilot findings from PR #312"
+
+
+def test_should_return_trimmed_pr_url(tmp_path: Path) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Finding\n", encoding="utf-8")
+    payload_sequence = _scripted_subprocess_runs(
+        base_ref_payload=json.dumps({"baseRefName": "main"}),
+        new_pr_url="  https://github.com/acme/widget/pull/313  \n",
+    )
+    with patch("subprocess.run", side_effect=payload_sequence):
+        new_pr_url = open_followup_copilot_pr_module.open_followup_copilot_pr(
+            owner="acme",
+            repo="widget",
+            parent_number=312,
+            head="abc12345deadbeef",
+            findings_file=findings_file,
+        )
+    assert new_pr_url == "https://github.com/acme/widget/pull/313"
+
+
+def test_should_pass_repo_arg_to_gh_pr_view_for_base_ref(tmp_path: Path) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Finding\n", encoding="utf-8")
+    payload_sequence = _scripted_subprocess_runs(
+        base_ref_payload=json.dumps({"baseRefName": "main"}),
+        new_pr_url="https://github.com/acme/widget/pull/313\n",
+    )
+    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
+        open_followup_copilot_pr_module.open_followup_copilot_pr(
+            owner="acme",
+            repo="widget",
+            parent_number=312,
+            head="abc12345deadbeef",
+            findings_file=findings_file,
+        )
+    pr_view_argv = mock_run.call_args_list[0][0][0]
+    assert pr_view_argv[0:3] == ["gh", "pr", "view"]
+    assert "--repo" in pr_view_argv
+    repo_arg_value = pr_view_argv[pr_view_argv.index("--repo") + 1]
+    assert repo_arg_value == "acme/widget"
+
+
+def test_should_pass_repo_arg_to_gh_pr_create_for_followup_pr(
+    tmp_path: Path,
+) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Finding\n", encoding="utf-8")
+    payload_sequence = _scripted_subprocess_runs(
+        base_ref_payload=json.dumps({"baseRefName": "main"}),
+        new_pr_url="https://github.com/acme/widget/pull/313\n",
+    )
+    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
+        open_followup_copilot_pr_module.open_followup_copilot_pr(
+            owner="acme",
+            repo="widget",
+            parent_number=312,
+            head="abc12345deadbeef",
+            findings_file=findings_file,
+        )
+    pr_create_argv = mock_run.call_args_list[4][0][0]
+    assert pr_create_argv[0:3] == ["gh", "pr", "create"]
+    assert "--repo" in pr_create_argv
+    repo_arg_value = pr_create_argv[pr_create_argv.index("--repo") + 1]
+    assert repo_arg_value == "acme/widget"
+
+
+def test_should_raise_when_subprocess_fails(tmp_path: Path) -> None:
+    findings_file = tmp_path / "findings.md"
+    findings_file.write_text("- Finding\n", encoding="utf-8")
+    failure = subprocess.CalledProcessError(
+        returncode=1, cmd=["gh"], stderr="auth failure"
+    )
+    with patch("subprocess.run", side_effect=failure):
+        with pytest.raises(subprocess.CalledProcessError):
+            open_followup_copilot_pr_module.open_followup_copilot_pr(
+                owner="acme",
+                repo="widget",
+                parent_number=312,
+                head="abc12345",
+                findings_file=findings_file,
+            )