claude-dev-env 8.19.1 → 8.20.0

package/scripts/dev_env_scripts_constants/agent_merge_check_constants.py

@@ -24,8 +24,44 @@ MERGEABLE_STATE_KEY = "mergeable_state"
 NUMBER_KEY = "number"
 TITLE_KEY = "title"
 HEAD_KEY = "head"
+BASE_KEY = "base"
+REF_KEY = "ref"
 SHA_KEY = "sha"
 
+BRANCH_RULES_ENDPOINT_TEMPLATE = "{api_root}/repos/{slug}/rules/branches/{branch}"
+CHECK_RUNS_ENDPOINT_TEMPLATE = (
+    "{api_root}/repos/{slug}/commits/{sha}/check-runs?{query}"
+)
+COMBINED_STATUS_ENDPOINT_TEMPLATE = (
+    "{api_root}/repos/{slug}/commits/{sha}/status?{query}"
+)
+COMPARE_ENDPOINT_TEMPLATE = "{api_root}/repos/{slug}/compare/{base}...{head}"
+CHECK_NAME_PARAMETER = "check_name"
+PER_PAGE_PARAMETER = "per_page"
+CHECK_PAGE_SIZE = 100
+
+RULE_TYPE_KEY = "type"
+RULE_PARAMETERS_KEY = "parameters"
+REQUIRED_STATUS_CHECKS_RULE_TYPE = "required_status_checks"
+MERGE_QUEUE_RULE_TYPE = "merge_queue"
+REQUIRED_STATUS_CHECKS_KEY = "required_status_checks"
+CONTEXT_KEY = "context"
+INTEGRATION_ID_KEY = "integration_id"
+CHECK_RUNS_KEY = "check_runs"
+CHECK_RUN_NAME_KEY = "name"
+CHECK_RUN_ID_KEY = "id"
+CHECK_RUN_APP_KEY = "app"
+CHECK_RUN_APP_ID_KEY = "id"
+CHECK_RUN_STATUS_KEY = "status"
+CHECK_RUN_CONCLUSION_KEY = "conclusion"
+CHECK_RUN_COMPLETED_STATUS = "completed"
+ALL_PASSING_CHECK_CONCLUSIONS = frozenset({"success", "neutral", "skipped"})
+STATUSES_KEY = "statuses"
+STATUS_STATE_KEY = "state"
+SUCCESS_STATUS_STATE = "success"
+PENDING_STATUS_STATE = "pending"
+BEHIND_BY_KEY = "behind_by"
+
 MERGEABLE_STATE_CLEAN = "clean"
 MERGEABLE_STATE_BEHIND = "behind"
 MERGEABLE_STATE_DIRTY = "dirty"
@@ -61,6 +97,19 @@ ALL_HOLD_REASONS_BY_STATE = {
     MERGEABLE_STATE_BLOCKED: BLOCKED_HOLD_REASON,
     MERGEABLE_STATE_UNSTABLE: UNSTABLE_HOLD_REASON,
 }
+FAILING_REQUIRED_CHECKS_HOLD_TEMPLATE = (
+    "A required check is not passing on this head: {checks}. Read the "
+    "failing check, fix it, and push."
+)
+REQUIRED_CHECK_STATE_TEMPLATE = "{context} ({state})"
+REQUIRED_CHECK_SEPARATOR = ", "
+MISSING_CHECK_STATE = "missing"
+PENDING_CHECK_STATE = "pending"
+BEHIND_MERGE_QUEUE_HOLD_TEMPLATE = (
+    "Every required check passes, but the head is {count} commit(s) behind "
+    "the base branch and the merge queue will not take it. Merge the base "
+    "branch into this one and push."
+)
 UNKNOWN_STATE_HOLD_TEMPLATE = (
     "GitHub reports the merge state as {state}, which this check does not "
     "treat as ready. Read the pull request page."
@@ -68,6 +117,13 @@ UNKNOWN_STATE_HOLD_TEMPLATE = (
 UNRESOLVED_THREADS_HOLD_TEMPLATE = (
     "{count} review thread(s) are open. Answer each one and resolve it."
 )
+MERGE_QUEUE_EJECTION_HOLD_TEMPLATE = (
+    "The merge queue ejected this head for failed checks, and no commit has "
+    "landed since. Read the merge_group run for the "
+    "gh-readonly-queue/{base}/pr-{number}-<sha> branch, fix the failure, and "
+    "push before you enqueue it again."
+)
+FAILED_CHECKS_REMOVAL_REASON = "failed_checks"
 
 MERGE_VERDICT_LABEL = "MERGE"
 HOLD_VERDICT_LABEL = "HOLD"
@@ -99,6 +155,19 @@ query($owner: String!, $name: String!, $number: Int!, $pageSize: Int!) {
   }
 }
 """
+MERGE_QUEUE_REMOVAL_PAGE_SIZE = 100
+MERGE_QUEUE_REMOVAL_QUERY = """
+query($owner: String!, $name: String!, $number: Int!, $pageSize: Int!) {
+  repository(owner: $owner, name: $name) {
+    pullRequest(number: $number) {
+      commits(last: 1) { nodes { commit { committedDate } } }
+      timelineItems(last: $pageSize, itemTypes: [REMOVED_FROM_MERGE_QUEUE_EVENT]) {
+        nodes { ... on RemovedFromMergeQueueEvent { createdAt reason } }
+      }
+    }
+  }
+}
+"""
 QUERY_KEY = "query"
 VARIABLES_KEY = "variables"
 OWNER_VARIABLE = "owner"
@@ -117,5 +186,25 @@ ALL_THREAD_NODE_KEYS = (
     REVIEW_THREADS_KEY,
     NODES_KEY,
 )
+COMMITS_KEY = "commits"
+COMMIT_KEY = "commit"
+COMMITTED_DATE_KEY = "committedDate"
+TIMELINE_ITEMS_KEY = "timelineItems"
+CREATED_AT_KEY = "createdAt"
+REMOVAL_REASON_KEY = "reason"
+ALL_MERGE_QUEUE_REMOVAL_NODE_KEYS = (
+    DATA_KEY,
+    REPOSITORY_KEY,
+    PULL_REQUEST_KEY,
+    TIMELINE_ITEMS_KEY,
+    NODES_KEY,
+)
+ALL_HEAD_COMMIT_NODE_KEYS = (
+    DATA_KEY,
+    REPOSITORY_KEY,
+    PULL_REQUEST_KEY,
+    COMMITS_KEY,
+    NODES_KEY,
+)
 ALL_RESOLVED_KEYS = ("isResolved", "is_resolved", "resolved")
 ALL_OUTDATED_KEYS = ("isOutdated", "is_outdated", "outdated")

package/scripts/dev_env_scripts_constants/review_closure_constants.py

@@ -131,6 +131,12 @@ NUMBER_KEY: str = "number"
 USER_KEY: str = "user"
 """Field carrying the account that opened a pull request."""
 
+USER_TYPE_KEY: str = "type"
+"""Field on a REST user naming whether the account is a person or a bot."""
+
+BOT_USER_TYPE: str = "Bot"
+"""The user type GitHub reports for an app account such as a review bot."""
+
 SHORT_SHA_LENGTH: int = 7
 """How much of a commit identifier the verdict line prints."""
 

package/scripts/review_closure_model.py

@@ -13,10 +13,14 @@ and the approvals conclusion, and name what waits.
     thread: a red circle, resolved in silence   -> open
     top-level: a bot comment, no agent comment  -> open
     top-level: a bot comment, then an agent one -> closed
-    top-level: the bot edits after that reply   -> open
+    top-level: the bot edits after that reply   -> closed
+    top-level: a person edits after that reply  -> open
 
 A red circle marks a finding a review states as blocking, so resolution alone
 leaves it open. The reply says what changed, or why the finding stands.
+A review bot rewrites its summary comment on each pass, and any new finding it
+has arrives as a review thread or a new comment, so its edit alone reopens
+nothing.
 """
 
 from __future__ import annotations
@@ -34,6 +38,7 @@ from dev_env_scripts_constants.review_closure_constants import (
     APPROVALS_CHECK_NAME,
     APPROVALS_OPEN_REASON,
     AUTHOR_LOGIN_KEY,
+    BOT_USER_TYPE,
     CHECK_RUN_CONCLUSION_KEY,
     CHECK_RUN_NAME_KEY,
     CLOSED_DETAIL,
@@ -58,6 +63,7 @@ from dev_env_scripts_constants.review_closure_constants import (
     UNNAMED_THREAD_SUBJECT,
     UPDATED_AT_KEY,
     USER_KEY,
+    USER_TYPE_KEY,
     VERDICT_LINE_TEMPLATE,
 )
 
@@ -86,6 +92,7 @@ class TopLevelComment:
 
     identifier: object
     author_login: str
+    is_bot: bool
     created_at: datetime
     updated_at: datetime
     url: str
@@ -212,7 +219,8 @@ def top_level_finding(
     """
     if comment.author_login in all_driver_logins:
         return None
-    if latest_driver_time is not None and comment.updated_at <= latest_driver_time:
+    last_counted_at = comment.created_at if comment.is_bot else comment.updated_at
+    if latest_driver_time is not None and last_counted_at <= latest_driver_time:
         return None
     return OpenFinding(
         subject=comment.url,
@@ -228,15 +236,18 @@ def top_level_findings(
 
     The driving agent answers a top-level comment by posting a top-level
     comment of its own. Its latest one answers every comment last touched
-    before it, and a comment edited after it waits again.
+    before it. A person's comment edited after it waits again. A bot's edit
+    leaves its comment answered, since a bot posts each new finding as a
+    review thread or a new comment.
 
     Args:
         all_comments: The top-level comments on the pull request.
         all_driver_logins: The logins whose comments count as the answer.
 
     Returns:
-        One finding per comment from another account that was posted or
-        edited after the driving agent's latest top-level comment.
+        One finding per comment from another account posted after the
+        driving agent's latest top-level comment, and one per person's
+        comment edited after it.
     """
     all_listed_comments = tuple(all_comments)
     latest_driver_time = latest_driver_comment_time(
@@ -424,6 +435,7 @@ def parse_top_level_comment(
     return TopLevelComment(
         identifier=all_comment_fields.get(COMMENT_IDENTIFIER_KEY),
         author_login=_comment_author_login(all_comment_fields),
+        is_bot=_is_bot_author(all_comment_fields),
         created_at=datetime.fromisoformat(str(all_comment_fields.get(CREATED_AT_KEY))),
         updated_at=datetime.fromisoformat(str(all_comment_fields.get(UPDATED_AT_KEY))),
         url=str(all_comment_fields.get(HTML_URL_KEY) or ""),
@@ -477,6 +489,14 @@ def _parse_comment(all_comment_fields: Mapping[str, object]) -> ReviewComment:
     )
 
 
+def _is_bot_author(all_comment_fields: Mapping[str, object]) -> bool:
+    all_author_fields = all_comment_fields.get(USER_KEY)
+    return (
+        isinstance(all_author_fields, Mapping)
+        and all_author_fields.get(USER_TYPE_KEY) == BOT_USER_TYPE
+    )
+
+
 def _comment_author_login(all_comment_fields: Mapping[str, object]) -> str:
     for each_key in ALL_COMMENT_AUTHOR_KEYS:
         all_author_fields = all_comment_fields.get(each_key)