claude-dev-env 1.35.0 → 1.36.1

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

@@ -0,0 +1,195 @@
+"""Tests for post-bugbot-run PowerShell helpers.
+
+Covers Resolve-InvocationMode / Build-GhArgumentList for URL, owner/repo#N, and
+-Repository/-Number forms (Windows Bugbot re-trigger argv construction).
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+import pytest
+
+
+def _run_powershell(*, expression: str) -> str:
+    helpers = Path(__file__).resolve().parent / "post-bugbot-run.helpers.ps1"
+    command = (
+        f". '{helpers}'; "
+        + expression
+        + " | ConvertTo-Json -Compress -Depth 5"
+    )
+    completed = subprocess.run(
+        ["pwsh", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", command],
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+        check=False,
+    )
+    if completed.returncode != 0:
+        raise AssertionError(
+            f"pwsh failed ({completed.returncode}): stderr={completed.stderr!r} stdout={completed.stdout!r}"
+        )
+    return completed.stdout.strip()
+
+
+def _argv_for(*, pull: str, repository: str, number: int, body: str) -> list[str]:
+    pull_esc = pull.replace("'", "''")
+    repository_esc = repository.replace("'", "''")
+    body_esc = body.replace("'", "''")
+    expression = (
+        f"$i = Resolve-InvocationMode -PullRequestInput '{pull_esc}' "
+        f"-RepositoryInput '{repository_esc}' -NumberInput {int(number)}; "
+        f"@(Build-GhArgumentList -Invocation $i -BodyFilePath '{body_esc}')"
+    )
+    raw = _run_powershell(expression=expression)
+    return json.loads(raw)
+
+
+def test_should_build_arguments_for_https_pull_url() -> None:
+    argv = _argv_for(
+        pull="https://github.com/acme/widget/pull/42",
+        repository="",
+        number=0,
+        body=r"C:\\temp\\body.md",
+    )
+    assert argv == [
+        "pr",
+        "comment",
+        "https://github.com/acme/widget/pull/42",
+        "--body-file",
+        r"C:\\temp\\body.md",
+    ]
+
+
+def test_should_build_arguments_for_owner_repo_hash_form() -> None:
+    argv = _argv_for(
+        pull="acme/widget#7",
+        repository="",
+        number=0,
+        body=r"D:\\x\\f.md",
+    )
+    assert argv == ["pr", "comment", "7", "-R", "acme/widget", "--body-file", r"D:\\x\\f.md"]
+
+
+def test_should_build_arguments_for_repository_and_number_parameters() -> None:
+    argv = _argv_for(
+        pull="",
+        repository="jl-cmd/claude-code-config",
+        number=331,
+        body=r"E:\\y\\z.md",
+    )
+    assert argv == [
+        "pr",
+        "comment",
+        "331",
+        "-R",
+        "jl-cmd/claude-code-config",
+        "--body-file",
+        r"E:\\y\\z.md",
+    ]
+
+
+def test_should_fail_when_number_without_repository() -> None:
+    helpers = Path(__file__).resolve().parent / "post-bugbot-run.helpers.ps1"
+    command = (
+        f". '{helpers}'; "
+        "try { Resolve-InvocationMode -PullRequestInput '' -RepositoryInput '' -NumberInput 3 } "
+        "catch { $_.Exception.Message }"
+    )
+    completed = subprocess.run(
+        ["pwsh", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", command],
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+        check=False,
+    )
+    assert completed.returncode == 0
+    message = completed.stdout.strip()
+    assert "Repository" in message
+
+
+def test_should_reject_pull_url_with_trailing_junk() -> None:
+    helpers = Path(__file__).resolve().parent / "post-bugbot-run.helpers.ps1"
+    pull = "https://github.com/acme/widget/pull/42extra"
+    command = (
+        f". '{helpers}'; "
+        f"$i = Resolve-InvocationMode -PullRequestInput '{pull}' -RepositoryInput '' -NumberInput 0; "
+        r"try { Build-GhArgumentList -Invocation $i -BodyFilePath 'C:\\t\\b.md' } "
+        "catch { $_.Exception.Message }"
+    )
+    completed = subprocess.run(
+        ["pwsh", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", command],
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+        check=False,
+    )
+    assert completed.returncode == 0
+    assert "Unrecognized PullRequest" in completed.stdout
+
+
+def test_should_fail_for_unrecognized_pull_string() -> None:
+    helpers = Path(__file__).resolve().parent / "post-bugbot-run.helpers.ps1"
+    pull = "not-a-valid-pr-reference"
+    command = (
+        f". '{helpers}'; "
+        f"$i = Resolve-InvocationMode -PullRequestInput '{pull}' -RepositoryInput '' -NumberInput 0; "
+        r"try { Build-GhArgumentList -Invocation $i -BodyFilePath 'C:\\t\\b.md' } "
+        "catch { $_.Exception.Message }"
+    )
+    completed = subprocess.run(
+        ["pwsh", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", command],
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+        check=False,
+    )
+    assert completed.returncode == 0
+    assert "Unrecognized PullRequest" in completed.stdout
+
+
+def test_full_script_removes_temp_files_when_gh_stub_succeeds(tmp_path: Path) -> None:
+    scripts_dir = Path(__file__).resolve().parent
+    script_path = scripts_dir / "post-bugbot-run.ps1"
+    stub_bin_dir = tmp_path / "gh_stub_bin"
+    stub_bin_dir.mkdir()
+    gh_cmd = stub_bin_dir / "gh.cmd"
+    gh_cmd.write_text("@echo off\r\nexit /b 0\r\n", encoding="utf-8")
+    env = dict(os.environ)
+    env["PATH"] = str(stub_bin_dir) + os.pathsep + env.get("PATH", "")
+    completed = subprocess.run(
+        [
+            "pwsh",
+            "-NoProfile",
+            "-NonInteractive",
+            "-ExecutionPolicy",
+            "Bypass",
+            "-File",
+            str(script_path),
+            "acme/widget#9",
+        ],
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+        env=env,
+        check=False,
+    )
+    assert completed.returncode == 0, (completed.stdout, completed.stderr)
+
+def test_post_bugbot_run_script_finally_removes_temp_paths() -> None:
+    script_text = (Path(__file__).resolve().parent / "post-bugbot-run.ps1").read_text(
+        encoding="utf-8"
+    )
+    assert "finally" in script_text
+    assert "Remove-Item" in script_text
+    assert "body_file_path" in script_text
+    assert "scratch_temp_path" in script_text

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

@@ -0,0 +1,159 @@
+"""Tests for reply_to_inline_comment.
+
+Covers:
+- gh api -X POST is invoked against the inline-comments replies endpoint
+- the reply body comes from a file via gh's `body=@<path>` form (per gh-body-file rule)
+- the reply id from gh's JSON output is returned
+- 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 / "reply_to_inline_comment.py"
+    spec = importlib.util.spec_from_file_location(
+        "reply_to_inline_comment", 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
+
+
+reply_to_inline_comment_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_api_post_against_replies_endpoint(tmp_path: Path) -> None:
+    body_file = tmp_path / "reply.md"
+    body_file.write_text("Confirmed and fixed.\n", encoding="utf-8")
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(json.dumps({"id": 7777}))
+        reply_to_inline_comment_module.reply_to_inline_comment(
+            owner="acme",
+            repo="widget",
+            number=42,
+            comment_id=12345,
+            body_file=body_file,
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    assert invoked_argv[0:2] == ["gh", "api"]
+    assert "-X" in invoked_argv
+    assert "POST" in invoked_argv
+    assert "repos/acme/widget/pulls/42/comments/12345/replies" in invoked_argv
+
+
+def test_should_pass_body_via_field_at_path_form(tmp_path: Path) -> None:
+    body_file = tmp_path / "reply.md"
+    body_file.write_text("Confirmed and fixed.\n", encoding="utf-8")
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(json.dumps({"id": 7777}))
+        reply_to_inline_comment_module.reply_to_inline_comment(
+            owner="acme",
+            repo="widget",
+            number=42,
+            comment_id=12345,
+            body_file=body_file,
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    assert "-F" in invoked_argv
+    field_value = invoked_argv[invoked_argv.index("-F") + 1]
+    assert field_value.startswith("body=@")
+    assert str(body_file) in field_value
+
+
+def test_should_return_reply_id_from_gh_response(tmp_path: Path) -> None:
+    body_file = tmp_path / "reply.md"
+    body_file.write_text("Reply text\n", encoding="utf-8")
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(json.dumps({"id": 7777, "body": "..."}))
+        reply_id = reply_to_inline_comment_module.reply_to_inline_comment(
+            owner="acme",
+            repo="widget",
+            number=42,
+            comment_id=12345,
+            body_file=body_file,
+        )
+    assert reply_id == 7777
+
+
+def test_should_raise_when_gh_subprocess_fails(tmp_path: Path) -> None:
+    body_file = tmp_path / "reply.md"
+    body_file.write_text("Reply text\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):
+            reply_to_inline_comment_module.reply_to_inline_comment(
+                owner="acme",
+                repo="widget",
+                number=42,
+                comment_id=12345,
+                body_file=body_file,
+            )
+
+
+def test_should_build_body_field_value_from_named_prefix_constant(
+    tmp_path: Path,
+) -> None:
+    body_file = tmp_path / "reply.md"
+    body_file.write_text("Reply text\n", encoding="utf-8")
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(json.dumps({"id": 7777}))
+        reply_to_inline_comment_module.reply_to_inline_comment(
+            owner="acme",
+            repo="widget",
+            number=42,
+            comment_id=12345,
+            body_file=body_file,
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    field_value = invoked_argv[invoked_argv.index("-F") + 1]
+    expected_prefix = (
+        reply_to_inline_comment_module.GH_FIELD_BODY_AT_PREFIX
+    )
+    assert expected_prefix == "body=@"
+    assert field_value == f"{expected_prefix}{body_file}"
+
+
+def test_should_extract_int_id_from_mixed_typed_response_payload(
+    tmp_path: Path,
+) -> None:
+    body_file = tmp_path / "reply.md"
+    body_file.write_text("Reply text\n", encoding="utf-8")
+    response_with_string_and_object_fields = json.dumps(
+        {
+            "id": 7777,
+            "body": "Reply body text",
+            "user": {"login": "octocat", "id": 1},
+            "created_at": "2026-05-02T12:00:00Z",
+        }
+    )
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed(response_with_string_and_object_fields)
+        reply_id = reply_to_inline_comment_module.reply_to_inline_comment(
+            owner="acme",
+            repo="widget",
+            number=42,
+            comment_id=12345,
+            body_file=body_file,
+        )
+    assert reply_id == 7777

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

@@ -0,0 +1,101 @@
+"""Tests for request_copilot_review.
+
+Covers:
+- gh api -X POST is invoked against requested_reviewers endpoint
+- the reviewer id literal is `copilot-pull-request-reviewer[bot]` (the [bot]
+  suffix is load-bearing per skills/copilot-review/SKILL.md)
+- subprocess errors propagate
+- the field carries the documented `reviewers[]=<id>` form
+"""
+
+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 / "request_copilot_review.py"
+    spec = importlib.util.spec_from_file_location("request_copilot_review", 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
+
+
+request_copilot_review_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_api_post_against_requested_reviewers_endpoint() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("{}")
+        request_copilot_review_module.request_copilot_review(
+            owner="acme", repo="widget", number=42
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    assert invoked_argv[0:2] == ["gh", "api"]
+    assert "-X" in invoked_argv
+    assert "POST" in invoked_argv
+    assert "repos/acme/widget/pulls/42/requested_reviewers" in invoked_argv
+
+
+def test_should_request_copilot_with_bot_suffix_literal() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("{}")
+        request_copilot_review_module.request_copilot_review(
+            owner="acme", repo="widget", number=42
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    assert "reviewers[]=copilot-pull-request-reviewer[bot]" in invoked_argv
+
+
+def test_should_pass_reviewer_field_via_dash_f_flag() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("{}")
+        request_copilot_review_module.request_copilot_review(
+            owner="acme", repo="widget", number=42
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    assert "-f" in invoked_argv
+    field_index = invoked_argv.index("-f")
+    field_value = invoked_argv[field_index + 1]
+    assert field_value == "reviewers[]=copilot-pull-request-reviewer[bot]"
+
+
+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):
+            request_copilot_review_module.request_copilot_review(
+                owner="acme", repo="widget", number=42
+            )
+
+
+def test_should_render_endpoint_via_named_template_constant() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("{}")
+        request_copilot_review_module.request_copilot_review(
+            owner="acme", repo="widget", number=42
+        )
+    invoked_argv = mock_run.call_args[0][0]
+    expected_endpoint = (
+        request_copilot_review_module.GH_REQUESTED_REVIEWERS_PATH_TEMPLATE.format(
+            owner="acme", repo="widget", number=42
+        )
+    )
+    assert expected_endpoint in invoked_argv

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

@@ -0,0 +1,79 @@
+"""Tests for resolve_pr_head.
+
+Covers:
+- gh command targets the single-object PR endpoint with --jq .head.sha
+- single-object endpoint does NOT use --paginate or --slurp (per gh-paginate rule)
+- the trimmed SHA is returned
+- 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 / "resolve_pr_head.py"
+    spec = importlib.util.spec_from_file_location("resolve_pr_head", 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
+
+
+resolve_pr_head_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_against_single_object_pr_endpoint() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("85309a0789e\n")
+        resolve_pr_head_module.resolve_pr_head(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 invoked_argv[2] == "repos/acme/widget/pulls/42"
+    assert "--jq" in invoked_argv
+    assert ".head.sha" in invoked_argv
+
+
+def test_should_not_use_paginate_or_slurp_on_single_object_endpoint() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("abc\n")
+        resolve_pr_head_module.resolve_pr_head(owner="acme", repo="widget", number=42)
+    invoked_argv = mock_run.call_args[0][0]
+    assert "--paginate" not in invoked_argv
+    assert "--slurp" not in invoked_argv
+
+
+def test_should_return_trimmed_sha() -> None:
+    with patch("subprocess.run") as mock_run:
+        mock_run.return_value = _completed("  85309a0789e  \n")
+        resolved_sha = resolve_pr_head_module.resolve_pr_head(
+            owner="acme", repo="widget", number=42
+        )
+    assert resolved_sha == "85309a0789e"
+
+
+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):
+            resolve_pr_head_module.resolve_pr_head(
+                owner="acme", repo="widget", number=42
+            )

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

@@ -0,0 +1,80 @@
+"""Tests for review_field_helpers.
+
+Covers defensive field-coercion for the four GitHub payload field accessors
+shared across fetch_*_reviews.py and fetch_*_inline_comments.py.
+"""
+
+from __future__ import annotations
+
+import importlib.util
+from pathlib import Path
+from types import ModuleType
+
+
+def _load_module() -> ModuleType:
+    module_path = Path(__file__).parent / "review_field_helpers.py"
+    spec = importlib.util.spec_from_file_location("review_field_helpers", 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
+
+
+review_field_helpers_module = _load_module()
+
+
+def test_login_of_should_return_login_string_when_user_dict_has_login() -> None:
+    payload = {"user": {"login": "cursor[bot]"}}
+    assert review_field_helpers_module.login_of(payload) == "cursor[bot]"
+
+
+def test_login_of_should_return_none_when_user_field_missing() -> None:
+    assert review_field_helpers_module.login_of({}) is None
+
+
+def test_login_of_should_return_none_when_user_field_not_dict() -> None:
+    assert review_field_helpers_module.login_of({"user": "not-a-dict"}) is None
+
+
+def test_login_of_should_return_none_when_login_field_not_string() -> None:
+    assert review_field_helpers_module.login_of({"user": {"login": 12345}}) is None
+
+
+def test_body_of_should_return_body_string_when_present() -> None:
+    assert review_field_helpers_module.body_of({"body": "review body"}) == "review body"
+
+
+def test_body_of_should_return_empty_string_when_body_missing() -> None:
+    assert review_field_helpers_module.body_of({}) == ""
+
+
+def test_body_of_should_return_empty_string_when_body_not_string() -> None:
+    assert review_field_helpers_module.body_of({"body": None}) == ""
+
+
+def test_submitted_at_of_should_return_string_when_present() -> None:
+    payload = {"submitted_at": "2026-05-03T12:00:00Z"}
+    assert (
+        review_field_helpers_module.submitted_at_of(payload) == "2026-05-03T12:00:00Z"
+    )
+
+
+def test_submitted_at_of_should_return_empty_string_when_missing() -> None:
+    assert review_field_helpers_module.submitted_at_of({}) == ""
+
+
+def test_submitted_at_of_should_return_empty_string_when_not_string() -> None:
+    assert review_field_helpers_module.submitted_at_of({"submitted_at": 0}) == ""
+
+
+def test_state_of_should_return_state_string_when_present() -> None:
+    assert review_field_helpers_module.state_of({"state": "APPROVED"}) == "APPROVED"
+
+
+def test_state_of_should_return_empty_string_when_missing() -> None:
+    assert review_field_helpers_module.state_of({}) == ""
+
+
+def test_state_of_should_return_empty_string_when_not_string() -> None:
+    assert review_field_helpers_module.state_of({"state": ["APPROVED"]}) == ""