@norskvideo/ctl-dev-kit 0.2.55 → 0.2.56

package/conventions/bot-prs.yml

@@ -13,12 +13,27 @@
 # So, for every open PR whose branch a bot owns:
 #   - every check on its head has passed and it merges cleanly -> squash-merge it
 #     (the PR's checks + smoke ARE the verdict; integration then runs on main);
-#   - a check failed, it conflicts with main, or it is a draft (the bot's own
-#     gate was red) -> list it, and report this repo's `bot-prs` cell RED on the
-#     product dashboard, which is the Discord message people actually read;
+#   - it conflicts with main -> re-run the bot that owns the branch, ONCE per
+#     head, so it rebuilds the branch from today's main (see below);
+#   - a check failed, it still conflicts after that rebuild, or it is a draft
+#     (the bot's own gate was red) -> list it, and report this repo's `bot-prs`
+#     cell RED on the product dashboard, which is the Discord message people
+#     actually read;
 #   - checks still running -> leave it for the next trigger.
 # The cell goes green again once nothing is red.
 #
+# Why the conflict rebuild: the three bots fire within minutes of each other
+# each morning and all write package.json and bun.lock, each from main as it
+# stood. Whichever lands first leaves the other's open PR conflicting, and the
+# bot only rebuilds its branch on its next DAILY run -- so on 2026-10-09
+# commentary, probe and reuters each had a sync-ctl-packages PR "needing a
+# human" that a re-run of sync-ctl-packages fixed outright. Every bot rebuilds
+# from main when run: sync-ctl-packages force-pushes a fresh branch, and
+# upgrade-latest / sync-dev-kit either land on main and close the PR they
+# superseded, or force-push their branch. The marker comment caps it at one
+# rebuild per head, so a rebuild that still conflicts goes to a human instead
+# of looping every hour.
+#
 # Runs when a PR's checks or smoke finish (the prompt path), hourly as a sweep,
 # and on demand. No checkout: it only talks to the GitHub API, so it needs none
 # of the runner-workspace steps the building workflows carry.
@@ -41,6 +56,8 @@ permissions:
   contents: read
   checks: read
   pull-requests: read
+  # The rebuild dispatch and its marker comment go through the PAT (WRITE_TOKEN),
+  # like the merges; this token only reads.
 
 concurrency:
   # One at a time per repo, and never cancelled: a merge half-done by a run that
@@ -86,8 +103,19 @@ jobs:
                  | select(.head.ref | test("^(upgrade-latest/|sync-dev-kit/|chore/sync-ctl-packages$)"))
                  | {number, ref: .head.ref, sha: .head.sha, draft, url: .html_url}]' <<<"$pulls")"
 
+          # The workflow that owns each bot branch, i.e. the one that rebuilds it.
+          producer() {
+            case "$1" in
+              upgrade-latest/*) echo upgrade-latest.yml ;;
+              sync-dev-kit/*) echo sync-dev-kit.yml ;;
+              chore/sync-ctl-packages) echo sync-ctl-packages.yml ;;
+              *) echo "" ;;
+            esac
+          }
+
           red=()
           merged=()
+          rebuilt=()
           while IFS= read -r pr; do
             [ -n "$pr" ] || continue
             n="$(jq -r .number <<<"$pr")"; ref="$(jq -r .ref <<<"$pr")"; sha="$(jq -r .sha <<<"$pr")"
@@ -106,7 +134,29 @@ jobs:
               [ "$mergeable" != "null" ] && break
               sleep 3
             done
-            if [ "$mergeable" != "true" ]; then red+=("#$n $ref: does not merge cleanly with main"); continue; fi
+            if [ "$mergeable" != "true" ]; then
+              # One rebuild per head: the marker names the sha it was asked for.
+              marker="bot-prs: rebuild requested for head $sha"
+              wf="$(producer "$ref")"
+              comments="$(gh_api "$api/issues/$n/comments?per_page=100")"
+              expect "reading comments on #$n" 'type == "array"' "$comments"
+              if [ -z "$wf" ]; then
+                red+=("#$n $ref: does not merge cleanly with main, and no bot is known to rebuild it")
+              elif jq -e --arg m "$marker" 'any(.[]; .body | contains($m))' >/dev/null <<<"$comments"; then
+                red+=("#$n $ref: still does not merge cleanly with main after $wf rebuilt it")
+              else
+                code="$(gh_write -o /dev/null -w '%{http_code}' -X POST "$api/actions/workflows/$wf/dispatches" -d '{"ref":"main"}')"
+                if [ "$code" = "204" ]; then
+                  body="$marker -- it conflicted with main (another bot landed first), so $wf was re-run to rebuild it from today's main. If the rebuilt branch conflicts too, this PR is reported for a human."
+                  gh_write -o /dev/null -X POST "$api/issues/$n/comments" -d "$(jq -nc --arg b "$body" '{body:$b}')" || true
+                  rebuilt+=("#$n")
+                  echo "#$n $ref: conflicts with main; re-ran $wf to rebuild it"
+                else
+                  red+=("#$n $ref: does not merge cleanly with main, and re-running $wf failed (HTTP $code)")
+                fi
+              fi
+              continue
+            fi
             # sha pins the merge to what was checked: a bot force-pushing the
             # branch meanwhile makes this refuse rather than land unchecked code.
             res="$(gh_write -X PUT "$api/pulls/$n/merge" -d "$(jq -nc --arg sha "$sha" '{merge_method:"squash", sha:$sha}')")"
@@ -128,7 +178,9 @@ jobs:
             state=success
             # Never empty: the dashboard step reads an empty detail as missing.
             merged_detail="${merged[*]:+merged ${merged[*]}}"
-            detail="${merged_detail:-no bot PRs waiting}"
+            rebuilt_detail="${rebuilt[*]:+rebuilding ${rebuilt[*]}}"
+            detail="$(printf '%s' "$merged_detail${merged_detail:+${rebuilt_detail:+; }}$rebuilt_detail")"
+            detail="${detail:-no bot PRs waiting}"
           fi
           echo "state=$state" >> "$GITHUB_OUTPUT"
           echo "detail=${detail%; }" >> "$GITHUB_OUTPUT"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-dev-kit",
-  "version": "0.2.55",
+  "version": "0.2.56",
   "type": "module",
   "exports": {
     "./create-product": "./create-product/create-product.ts",