claude-dev-env 1.36.2 → 1.37.1

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

@@ -0,0 +1,98 @@
+"""Reviewer specifications shared by the per-reviewer fetch entry-point scripts.
+
+A ReviewerSpec carries the two knobs that vary across the bugbot, copilot, and
+claude reviewers: the case-insensitive substring used to match the reviewer's
+GitHub login, and the callable that classifies a single review payload as
+``"clean"`` or ``"dirty"``. The spec instances declared at module scope are
+imported by the thin entry-point wrappers (``fetch_bugbot_reviews.py`` etc.)
+and by ``reviewer_fetch_core``.
+"""
+
+from __future__ import annotations
+
+import re
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Callable
+
+if str(Path(__file__).resolve().parent) not in sys.path:
+    sys.path.insert(0, str(Path(__file__).resolve().parent))
+
+from evict_cached_config_modules import evict_cached_config_modules
+
+evict_cached_config_modules()
+
+from config.pr_converge_constants import (
+    ALL_CLAUDE_DIRTY_REVIEW_STATES,
+    ALL_COPILOT_DIRTY_REVIEW_STATES,
+    BUGBOT_DIRTY_BODY_REGEX,
+    CLAUDE_CLEAN_REVIEW_STATE,
+    CLAUDE_LOGIN_FILTER_SUBSTRING,
+    CLAUDE_SOFT_DIRTY_REVIEW_STATE,
+    COPILOT_CLEAN_REVIEW_STATE,
+    COPILOT_LOGIN_FILTER_SUBSTRING,
+    COPILOT_SOFT_DIRTY_REVIEW_STATE,
+    CURSOR_LOGIN_FILTER_SUBSTRING,
+)
+from review_field_helpers import body_of, state_of
+
+
+@dataclass(frozen=True)
+class ReviewerSpec:
+    """Per-reviewer configuration: login substring filter plus classify callable."""
+
+    login_filter_substring: str
+    classify_review: Callable[[dict[str, object]], str]
+
+
+def _classify_bugbot_review(field_by_key: dict[str, object]) -> str:
+    review_body = body_of(field_by_key)
+    if re.search(BUGBOT_DIRTY_BODY_REGEX, review_body):
+        return "dirty"
+    return "clean"
+
+
+def _make_state_based_classifier(
+    *,
+    clean_state: str,
+    all_dirty_states: tuple[str, ...],
+    soft_dirty_state: str,
+) -> Callable[[dict[str, object]], str]:
+    def classify_review(field_by_key: dict[str, object]) -> str:
+        review_state = state_of(field_by_key)
+        if review_state == clean_state:
+            return "clean"
+        if review_state not in all_dirty_states:
+            return "clean"
+        if review_state == soft_dirty_state and not body_of(field_by_key):
+            return "clean"
+        return "dirty"
+
+    return classify_review
+
+
+bugbot_spec = ReviewerSpec(
+    login_filter_substring=CURSOR_LOGIN_FILTER_SUBSTRING,
+    classify_review=_classify_bugbot_review,
+)
+
+
+copilot_spec = ReviewerSpec(
+    login_filter_substring=COPILOT_LOGIN_FILTER_SUBSTRING,
+    classify_review=_make_state_based_classifier(
+        clean_state=COPILOT_CLEAN_REVIEW_STATE,
+        all_dirty_states=ALL_COPILOT_DIRTY_REVIEW_STATES,
+        soft_dirty_state=COPILOT_SOFT_DIRTY_REVIEW_STATE,
+    ),
+)
+
+
+claude_spec = ReviewerSpec(
+    login_filter_substring=CLAUDE_LOGIN_FILTER_SUBSTRING,
+    classify_review=_make_state_based_classifier(
+        clean_state=CLAUDE_CLEAN_REVIEW_STATE,
+        all_dirty_states=ALL_CLAUDE_DIRTY_REVIEW_STATES,
+        soft_dirty_state=CLAUDE_SOFT_DIRTY_REVIEW_STATE,
+    ),
+)

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

@@ -0,0 +1,65 @@
+"""Tests for the Cursor Agents AutoHotkey pacer."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+
+def _script_text() -> str:
+    return (Path(__file__).resolve().parent / "cursor-agents-continue.ahk").read_text(
+        encoding="utf-8"
+    )
+
+
+def _function_body(function_name: str, next_marker: str) -> str:
+    script_text = _script_text()
+    function_start = script_text.index(function_name)
+    function_end = script_text.index(next_marker, function_start)
+    return script_text[function_start:function_end]
+
+
+def test_should_fallback_when_pwsh_is_unavailable() -> None:
+    script_text = _script_text()
+    terminate_body = _function_body(
+        "terminate_other_script_instances() {",
+        "\n}\n\nrun_stop_script_with_shell",
+    )
+    helper_body = _function_body(
+        "run_stop_script_with_shell(shell_name, stop_script) {",
+        "\n}\n\nterminate_other_script_instances()",
+    )
+
+    first_shell_check = (
+        "if run_stop_script_with_shell(POWERSHELL_CORE_SHELL_NAME, stop_script)"
+    )
+    fallback_shell_check = (
+        "if run_stop_script_with_shell(WINDOWS_POWERSHELL_SHELL_NAME, stop_script)"
+    )
+
+    assert 'POWERSHELL_CORE_SHELL_NAME := "pwsh"' in script_text
+    assert 'WINDOWS_POWERSHELL_SHELL_NAME := "powershell.exe"' in script_text
+    assert "STOP_SCRIPT_ARGUMENTS_FORMAT :=" in script_text
+    assert 'RUN_WAIT_WINDOW_OPTION := "Hide"' in script_text
+    assert first_shell_check in terminate_body
+    assert fallback_shell_check in terminate_body
+    assert "throw Error(Format(STOP_SCRIPT_FAILURE_MESSAGE_FORMAT" in terminate_body
+    assert terminate_body.index(first_shell_check) < terminate_body.index(
+        fallback_shell_check
+    )
+    assert terminate_body.index(fallback_shell_check) < terminate_body.index(
+        "throw Error"
+    )
+    assert '"pwsh"' not in terminate_body
+    assert '"powershell.exe"' not in terminate_body
+    assert "try {" in helper_body
+    assert "catch {" in helper_body
+    assert (
+        "Format(STOP_SCRIPT_ARGUMENTS_FORMAT, stop_script, ProcessExist())"
+        in helper_body
+    )
+    assert (
+        "RunWait(shell_name stop_command_arguments, , RUN_WAIT_WINDOW_OPTION)"
+        in helper_body
+    )
+    assert "-NoProfile" not in helper_body
+    assert '"Hide"' not in helper_body

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

@@ -286,12 +286,113 @@ def test_should_flatten_across_pages() -> None:
     ]
 
 
-def test_should_reference_cursor_bot_login_constant_directly_without_local_alias() -> None:
-    source_text = (
-        Path(__file__).resolve().parent / "fetch_bugbot_inline_comments.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_match_login_case_insensitively() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 300,
+                    "user": {"login": "Cursor"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "uppercase login",
+                    "path": "x.py",
+                    "line": 5,
+                },
+                {
+                    "id": 301,
+                    "user": {"login": "CURSOR[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "screaming login",
+                    "path": "x.py",
+                    "line": 6,
+                },
+            ]
+        ]
+    )
+    with patch.object(
+        fetch_bugbot_inline_comments_module,
+        "fetch_bugbot_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_bugbot_inline_comments_module.fetch_bugbot_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_cursor_substring() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 400,
+                    "user": {"login": "internal-cursor-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_bugbot_inline_comments_module,
+        "fetch_bugbot_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_bugbot_inline_comments_module.fetch_bugbot_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_exclude_login_without_cursor_substring() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 500,
+                    "user": {"login": "copilot-pull-request-reviewer[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "copilot finding",
+                    "path": "x.py",
+                    "line": 5,
+                },
+                {
+                    "id": 501,
+                    "user": {"login": "dependabot[bot]"},
+                    "commit_id": "abc123",
+                    "pull_request_review_id": 1,
+                    "body": "dependency bump",
+                    "path": "x.py",
+                    "line": 6,
+                },
+            ]
+        ]
+    )
+    with patch.object(
+        fetch_bugbot_inline_comments_module,
+        "fetch_bugbot_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_bugbot_inline_comments_module.fetch_bugbot_inline_comments(
+                owner="acme", repo="widget", number=42, current_head="abc123"
+            )
+        )
+    assert all_inline_comments == []
 
 
 def test_should_raise_when_gh_subprocess_fails() -> None:

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

@@ -176,12 +176,91 @@ def test_should_classify_clean_review_when_body_lacks_findings_pattern() -> None
     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_match_login_case_insensitively() -> None:
+    pages_payload = json.dumps(
+        [
+            [
+                {
+                    "id": 1,
+                    "user": {"login": "Cursor"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-01T00:00:00Z",
+                    "body": "Cursor Bugbot has reviewed your changes and found 1 potential issue.",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "CURSOR[bot]"},
+                    "commit_id": "abc",
+                    "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
+        )
+    assert {each_review["review_id"] for each_review in all_reviews} == {1, 2}
+
+
+def test_should_match_login_containing_cursor_substring() -> 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 1 potential issue.",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "internal-cursor-fork[bot]"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "Cursor Bugbot has reviewed your changes and found 2 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 {each_review["review_id"] for each_review in all_reviews} == {1, 2}
+
+
+def test_should_exclude_login_without_cursor_substring() -> 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 finding",
+                },
+                {
+                    "id": 2,
+                    "user": {"login": "dependabot[bot]"},
+                    "commit_id": "abc",
+                    "submitted_at": "2026-01-02T00:00:00Z",
+                    "body": "dependency bump",
+                },
+            ]
+        ]
+    )
+    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 == []
 
 
 def test_should_raise_when_gh_subprocess_fails() -> None: