From 89bbeab1ee06ba8e203e73881c1cc0593ccd6cc2 Mon Sep 17 00:00:00 2001
From: Patrick Lewis <4015312+locus313@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:37:03 -0700
Subject: [PATCH 1/2] refactor: replace get_all_pages with gh_api_paginate and
 use err() helper

- Replace 52-line hand-rolled get_all_pages() paginator in
  github-close-archived-repo-security-alerts with gh_api_paginate
  streaming via 'while read'; non-array responses (e.g. Advanced
  Security not enabled) silently filtered by select(.number)
- Replace print_error + exit 1 two-liners with err() across 9 scripts
  (17 sites); two multi-message sites merged into single err() calls
- Merge CI shellcheck and unit-test jobs into one job to eliminate
  duplicate checkout + apt-get update; update ci-skip.yml to match
- Merge two apt-get steps in copilot-setup-steps.yml into one
- Remove ~96 lines of verbatim-duplicate content from AGENTS.md
  (script anatomy, helpers table, adding-a-script steps); replace with
  cross-reference to .github/copilot-instructions.md

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/ci-skip.yml                 |  13 ++-
 .github/workflows/ci.yml                      |  20 +---
 .github/workflows/copilot-setup-steps.yml     |   7 +-
 AGENTS.md                                     | 106 +-----------------
 ...ub-add-enterprise-team-read-permissions.sh |   3 +-
 .../github-dockerfile-discovery.sh            |  12 +-
 .../github-get-public-repos.sh                |   9 +-
 .../github-install-enterprise-app.sh          |  18 +--
 ...ithub-add-repo-collaborators-by-pattern.sh |   3 +-
 .../github-add-repo-permissions.sh            |   7 +-
 ...hub-close-archived-repo-security-alerts.sh |  95 +++-------------
 .../github-import-repo/github-import-repo.sh  |   3 +-
 .../github-monthly-issues-report.sh           |   6 +-
 13 files changed, 55 insertions(+), 247 deletions(-)

diff --git a/.github/workflows/ci-skip.yml b/.github/workflows/ci-skip.yml
index 8a1742b..22ac6e2 100644
--- a/.github/workflows/ci-skip.yml
+++ b/.github/workflows/ci-skip.yml
@@ -1,10 +1,11 @@
 name: CI
 
 # Companion to ci.yml. When a pull request only touches documentation or other
-# path-ignored files, ci.yml is skipped entirely and its required "Shellcheck"
-# check never reports — which blocks the PR from merging. This workflow runs on
-# exactly those ignored paths and emits a passing check with the same job name,
-# so the required status is always satisfied without a manual bypass.
+# path-ignored files, ci.yml is skipped entirely and its required
+# "Shellcheck + Unit Tests" check never reports — which blocks the PR from
+# merging. This workflow runs on exactly those ignored paths and emits a passing
+# check with the same job name, so the required status is always satisfied
+# without a manual bypass.
 
 on:
   pull_request:
@@ -14,8 +15,8 @@ on:
       - '.github/FUNDING.yml'
 
 jobs:
-  shellcheck:
-    name: Shellcheck
+  ci:
+    name: Shellcheck + Unit Tests
     runs-on: ubuntu-latest
     permissions:
       contents: read
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb6a722..2e97a4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ on:
       - '.github/FUNDING.yml'
 
 jobs:
-  shellcheck:
-    name: Shellcheck
+  ci:
+    name: Shellcheck + Unit Tests
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -24,8 +24,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - name: Install shellcheck
-        run: sudo apt-get update -qq && sudo apt-get install -y shellcheck
+      - name: Install shellcheck and bats
+        run: sudo apt-get update -qq && sudo apt-get install -y shellcheck bats
 
       - name: Run shellcheck on all scripts
         run: |
@@ -34,17 +34,5 @@ jobs:
             --exclude=SC2034,SC1091 \
             --shell=bash
 
-  test:
-    name: Unit Tests
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-
-      - name: Install bats
-        run: sudo apt-get update -qq && sudo apt-get install -y bats
-
       - name: Run unit tests
         run: bats tests/
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index ea1787b..c8f3233 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -10,11 +10,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - name: Install jq
-        run: sudo apt-get update -qq && sudo apt-get install -y jq
-
-      - name: Install shellcheck
-        run: sudo apt-get install -y shellcheck
+      - name: Install jq, shellcheck, and bats
+        run: sudo apt-get update -qq && sudo apt-get install -y jq shellcheck bats
 
       - name: Install gitleaks
         run: |
diff --git a/AGENTS.md b/AGENTS.md
index 5bc8f58..a5dcf98 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -136,106 +136,10 @@ Use `_mock_curl_200` (defined in `test_script_validation.bats`) when a test must
 
 ## Key Patterns and Conventions
 
-### Script anatomy
-
-Every script begins with a `# ===` header (exactly 79 `=` chars), then immediately `set -euo pipefail`:
-
-```bash
-#!/usr/bin/env bash
-# =============================================================================
-# github-<name>.sh
-#
-# <description>
-#
-# Usage:
-#   export GITHUB_TOKEN=ghp_yourtoken
-#   export ORG=my-org
-#   ./github-<name>.sh
-#
-# Environment variables:
-#   GITHUB_TOKEN    Required. PAT with <scope> scope
-#   ORG             Required. GitHub organization name
-#   API_URL_PREFIX  Optional. GitHub API base URL (default: https://api.github.com)
-#
-# Requirements:
-#   - curl
-#   - jq
-# =============================================================================
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../../lib/github-common.sh
-source "${SCRIPT_DIR}/../../lib/github-common.sh"
-```
-
-### Sourcing the shared library
-
-Always use `SCRIPT_DIR` to build the path to `lib/github-common.sh`. The library is two directory levels up from any script (`../../lib/github-common.sh`). Never hardcode absolute paths.
-
-### Authentication
-
-- Standard org/repo REST calls: `Authorization: token ${GITHUB_TOKEN}`
-- Enterprise endpoints and GraphQL: `Authorization: Bearer ${GITHUB_TOKEN}`
-- The `gh_api` helper in `lib/github-common.sh` always uses Bearer; pass `"bearer"` to `validate_github_token` for enterprise scripts
-
-### Shared library helpers
-
-| Function | Purpose |
-|----------|---------|
-| `print_status` / `print_success` / `print_warning` / `print_error` | Colored output |
-| `err <message>` | `print_error` + `exit 1` in one call |
-| `require_env_var <VAR>` | Exit with message if variable unset/empty |
-| `require_command <cmd>` | Exit if binary not in PATH |
-| `configure_gh_auth [scope_hint]` | Bridge GITHUB_TOKEN→GH_TOKEN or verify gh auth session |
-| `validate_github_token [bearer]` | Verify GITHUB_TOKEN via /user endpoint |
-| `validate_slug <value> <label>` | Reject values with non-alphanumeric/hyphen/underscore chars |
-| `gh_api <path> [--api-version V] [curl args...]` | Bearer-auth REST helper with 5-retry rate-limit handling; optional `--api-version` overrides the default `2022-11-28` header; returns literal `__404__` or `__422__` for those HTTP statuses — callers must check for these sentinels |
-| `gh_api_paginate <path> [filter] [version]` | Paginated REST helper, follows Link headers, streams items; returns silently with empty output on 404/422 |
-| `get_enterprise_orgs` | Three-tier enterprise org resolver (REST → GraphQL → /user/orgs) |
-| `get_repo_page_count <url>` | Returns total pages for a paginated endpoint |
-
-### Error handling sequence
-
-1. `require_env_var` all required variables
-2. `validate_github_token` (or `validate_token` for secondary tokens)
-3. Validate additional inputs with `validate_slug` where needed
-4. Proceed with main logic
-
-> **Note on token auto-resolution:** Sourcing `lib/github-common.sh` automatically populates `GITHUB_TOKEN` from an active `gh` auth session if the variable is unset. This means `require_env_var GITHUB_TOKEN` may pass even when no explicit token was provided by the caller — the token was silently resolved from `gh auth token`. Script headers should document `GITHUB_TOKEN` as "Required (or provided by an active gh auth session)". Scripts that use the `gh` CLI instead of `curl` should call `configure_gh_auth` instead of step 2 above.
-
-### Pagination (REST)
-
-```bash
-for PAGE in $(seq "$(get_repo_page_count "${API_URL_PREFIX}/orgs/${ORG}/repos?per_page=100")"); do
-  # process page
-done
-```
-
-### Rate limiting
-
-- Repo-level operations (permission grants, archival): `sleep 5` between each repo
-- Code search: configurable `SEARCH_SLEEP` (default 2s) and `CONTENT_SLEEP` (default 1s)
-- `gh_api` auto-retries on HTTP 403/429 with 60s sleep
-- `gh_api` returns the literal string `__404__` or `__422__` (exit 0) for those HTTP statuses — callers must check for these sentinels before passing output to `jq`
-
----
-
-## Adding a New Script
-
-1. **Create the directory:** `<domain>/github-<verb-noun>/`
-2. **Create the script:** `github-<verb-noun>.sh` (name must match the directory)
-3. **Copy the header template** from Script Anatomy above — fill in description, all env vars, requirements
-4. **Source the shared library** using `SCRIPT_DIR`
-5. **Validate all inputs** before any API calls
-6. **Create `action.yml`** in the same directory — expose every env var as an input (required inputs first, optional inputs with defaults); map CLI flags (`--dry-run`, `--type`, etc.) to boolean/string inputs and construct the `ARGS` array in the `run:` step. See existing `action.yml` files for the pattern.
-7. **Add tests to `tests/test_script_validation.bats`** — add a labelled section (`# ═══ github-<name> ═══`) with tests for: every required env var missing (exit 1), unknown CLI args (exit 1), `--help` exits 0, and any script-specific validation (enum guards, URL allowlists, positional args). See existing sections for the pattern.
-8. **Add to README.md** — follow the existing format: use case, env var table, usage example, output format; add a row to the Available Actions table in the "Using Scripts in GitHub Actions" section
-9. Place in the correct domain:
-   - `org-admin/` — organization-level operations (repos, teams, members)
-   - `enterprise/` — enterprise-level operations (licenses, org enumeration)
-   - `reporting/` — read-only reports and audits
-   - `personal/` — personal GitHub utilities (stars, profile)
+> The full reference for script anatomy, shared library helpers, authentication,
+> pagination, and adding new scripts lives in
+> [`.github/copilot-instructions.md`](.github/copilot-instructions.md).
+> The sections below cover only what is unique to this guide.
 
 ---
 
@@ -244,7 +148,7 @@ done
 - **Pre-commit hook:** `.githooks/pre-commit` — runs gitleaks + shellcheck on staged `.sh` files
 - **Install:** `./install-hooks.sh` or `git config core.hooksPath .githooks`
 - **Bypass (emergency only):** `git commit --no-verify`
-- **CI:** shellcheck runs on all `.sh` files on every PR (`.github/workflows/ci.yml`); bats unit tests run in a dedicated `test` job (`bats tests/`)
+- **CI:** shellcheck + bats unit tests run together on every PR (`.github/workflows/ci.yml`)
 - **Releases:** automated by Release Please (`.github/workflows/release.yml`) — pushes to `main` trigger a release PR; merging it publishes the GitHub Release and tag
 
 ## Commit Messages — Conventional Commits (required)
diff --git a/enterprise/github-add-enterprise-team-read-permissions/github-add-enterprise-team-read-permissions.sh b/enterprise/github-add-enterprise-team-read-permissions/github-add-enterprise-team-read-permissions.sh
index 8ea0bc5..84fe653 100755
--- a/enterprise/github-add-enterprise-team-read-permissions/github-add-enterprise-team-read-permissions.sh
+++ b/enterprise/github-add-enterprise-team-read-permissions/github-add-enterprise-team-read-permissions.sh
@@ -138,8 +138,7 @@ print_status "Fetching organizations in enterprise: ${ENTERPRISE}..."
 mapfile -t ORG_LIST < <(get_enterprise_orgs)
 
 if [ "${#ORG_LIST[@]}" -eq 0 ]; then
-  print_error "No organizations found in enterprise '${ENTERPRISE}'. Check the enterprise slug and token permissions."
-  exit 1
+  err "No organizations found in enterprise '${ENTERPRISE}'. Check the enterprise slug and token permissions."
 fi
 
 print_status "Found ${#ORG_LIST[@]} organization(s)"
diff --git a/enterprise/github-dockerfile-discovery/github-dockerfile-discovery.sh b/enterprise/github-dockerfile-discovery/github-dockerfile-discovery.sh
index 2e337e8..5ec74f6 100755
--- a/enterprise/github-dockerfile-discovery/github-dockerfile-discovery.sh
+++ b/enterprise/github-dockerfile-discovery/github-dockerfile-discovery.sh
@@ -350,8 +350,7 @@ main() {
   fi
 
   if [ "${#orgs[@]}" -eq 0 ]; then
-    print_error "No organisations found. Check ENTERPRISE slug and token permissions."
-    exit 1
+    err "No organisations found. Check ENTERPRISE slug and token permissions."
   fi
 
 # ── Apply ORG_FILTER (inclusion) if set ────────────────────────────────
@@ -359,8 +358,7 @@ main() {
     local _rc=0
     echo "" | grep -qE "${ORG_FILTER}" 2>/dev/null || _rc=$?
     if [ "${_rc}" -eq 2 ]; then
-      print_error "ORG_FILTER is not a valid ERE regex: ${ORG_FILTER}"
-      exit 1
+      err "ORG_FILTER is not a valid ERE regex: ${ORG_FILTER}"
     fi
     local filtered=()
     for org in "${orgs[@]}"; do
@@ -378,8 +376,7 @@ main() {
     local _rc=0
     echo "" | grep -qE "${ORG_EXCLUDE}" 2>/dev/null || _rc=$?
     if [ "${_rc}" -eq 2 ]; then
-      print_error "ORG_EXCLUDE is not a valid ERE regex: ${ORG_EXCLUDE}"
-      exit 1
+      err "ORG_EXCLUDE is not a valid ERE regex: ${ORG_EXCLUDE}"
     fi
     local kept=()
     for org in "${orgs[@]}"; do
@@ -393,8 +390,7 @@ main() {
   fi
 
   if [ "${#orgs[@]}" -eq 0 ]; then
-    print_error "No organisations remain after applying ORG_FILTER/ORG_EXCLUDE filters."
-    exit 1
+    err "No organisations remain after applying ORG_FILTER/ORG_EXCLUDE filters."
   fi
   print_success "Found ${#orgs[@]} organisation(s): ${orgs[*]}"
 
diff --git a/enterprise/github-get-public-repos/github-get-public-repos.sh b/enterprise/github-get-public-repos/github-get-public-repos.sh
index 9614012..07fe361 100755
--- a/enterprise/github-get-public-repos/github-get-public-repos.sh
+++ b/enterprise/github-get-public-repos/github-get-public-repos.sh
@@ -78,8 +78,7 @@ resolve_orgs() {
     local _rc=0
     echo "" | grep -qE "${ORG_FILTER}" 2>/dev/null || _rc=$?
     if [ "${_rc}" -eq 2 ]; then
-      print_error "ORG_FILTER is not a valid ERE regex: ${ORG_FILTER}"
-      exit 1
+      err "ORG_FILTER is not a valid ERE regex: ${ORG_FILTER}"
     fi
     raw_orgs=$(echo "${raw_orgs}" | grep -E "${ORG_FILTER}" || true)
   fi
@@ -89,8 +88,7 @@ resolve_orgs() {
     local _rc=0
     echo "" | grep -qE "${ORG_EXCLUDE}" 2>/dev/null || _rc=$?
     if [ "${_rc}" -eq 2 ]; then
-      print_error "ORG_EXCLUDE is not a valid ERE regex: ${ORG_EXCLUDE}"
-      exit 1
+      err "ORG_EXCLUDE is not a valid ERE regex: ${ORG_EXCLUDE}"
     fi
     raw_orgs=$(echo "${raw_orgs}" | grep -Ev "${ORG_EXCLUDE}" || true)
   fi
@@ -186,8 +184,7 @@ main() {
   orgs=$(resolve_orgs)
 
   if [ -z "${orgs}" ]; then
-    print_error "No organisations found. Check your ENTERPRISE/ORGS/ORG_FILTER settings."
-    exit 1
+    err "No organisations found. Check your ENTERPRISE/ORGS/ORG_FILTER settings."
   fi
 
   local org_count
diff --git a/enterprise/github-install-enterprise-app/github-install-enterprise-app.sh b/enterprise/github-install-enterprise-app/github-install-enterprise-app.sh
index 0ab5f6f..25d1772 100755
--- a/enterprise/github-install-enterprise-app/github-install-enterprise-app.sh
+++ b/enterprise/github-install-enterprise-app/github-install-enterprise-app.sh
@@ -76,8 +76,7 @@ for arg in "$@"; do
       exit 0
       ;;
     *)
-      print_error "Unknown option: ${arg}"
-      exit 1
+      err "Unknown option: ${arg}"
       ;;
   esac
 done
@@ -100,8 +99,7 @@ validate_slug "${INSTALLER_APP_INSTALL_ID}" "installer app installation ID"
 case "${REPO_SELECTION}" in
   all|selected) ;;
   *)
-    print_error "REPO_SELECTION must be 'all' or 'selected' (got '${REPO_SELECTION}')"
-    exit 1
+    err "REPO_SELECTION must be 'all' or 'selected' (got '${REPO_SELECTION}')"
     ;;
 esac
 
@@ -111,12 +109,10 @@ INSTALLER_APP_PRIVATE_KEY="${INSTALLER_APP_PRIVATE_KEY/#\~/${HOME}}"
   AUTOMATION_APP_PRIVATE_KEY="${AUTOMATION_APP_PRIVATE_KEY/#\~/${HOME}}"
 
 if [ ! -r "${INSTALLER_APP_PRIVATE_KEY}" ]; then
-  print_error "Installer app private key not readable: ${INSTALLER_APP_PRIVATE_KEY}"
-  exit 1
+  err "Installer app private key not readable: ${INSTALLER_APP_PRIVATE_KEY}"
 fi
 if [ -n "${AUTOMATION_APP_PRIVATE_KEY}" ] && [ ! -r "${AUTOMATION_APP_PRIVATE_KEY}" ]; then
-  print_error "Automation app private key not readable: ${AUTOMATION_APP_PRIVATE_KEY}"
-  exit 1
+  err "Automation app private key not readable: ${AUTOMATION_APP_PRIVATE_KEY}"
 fi
 
 ###
@@ -233,8 +229,7 @@ case "${INSTALL_HTTP_CODE}" in
     ;;
   *)
     INSTALL_MESSAGE=$(echo "${INSTALL_BODY}" | jq -r '.message // empty' 2>/dev/null || true)
-    print_error "Failed to install automation app (HTTP ${INSTALL_HTTP_CODE}): ${INSTALL_MESSAGE:-unknown error}"
-    exit 1
+    err "Failed to install automation app (HTTP ${INSTALL_HTTP_CODE}): ${INSTALL_MESSAGE:-unknown error}"
     ;;
 esac
 
@@ -256,6 +251,5 @@ if mint_installation_token \
   "${AUTOMATION_APP_INSTALL_ID}" > /dev/null; then
   print_success "Automation app authenticated successfully in '${ORG}'. Installation is live."
 else
-  print_error "Could not authenticate the automation app after install."
-  exit 1
+  err "Could not authenticate the automation app after install."
 fi
diff --git a/org-admin/github-add-repo-collaborators-by-pattern/github-add-repo-collaborators-by-pattern.sh b/org-admin/github-add-repo-collaborators-by-pattern/github-add-repo-collaborators-by-pattern.sh
index 7181f95..79243e7 100755
--- a/org-admin/github-add-repo-collaborators-by-pattern/github-add-repo-collaborators-by-pattern.sh
+++ b/org-admin/github-add-repo-collaborators-by-pattern/github-add-repo-collaborators-by-pattern.sh
@@ -59,8 +59,7 @@ validate() {
   case "${PERMISSION}" in
     pull|triage|push|maintain|admin) ;;
     *)
-      print_error "Invalid PERMISSION '${PERMISSION}'. Must be one of: pull, triage, push, maintain, admin"
-      exit 1
+      err "Invalid PERMISSION '${PERMISSION}'. Must be one of: pull, triage, push, maintain, admin"
       ;;
   esac
   require_command jq
diff --git a/org-admin/github-add-repo-permissions/github-add-repo-permissions.sh b/org-admin/github-add-repo-permissions/github-add-repo-permissions.sh
index 4784279..fa40f8e 100755
--- a/org-admin/github-add-repo-permissions/github-add-repo-permissions.sh
+++ b/org-admin/github-add-repo-permissions/github-add-repo-permissions.sh
@@ -58,9 +58,7 @@ require_command jq
 
 # Check if at least one permission level is set
 if [ -z "${REPO_ADMIN}" ] && [ -z "${REPO_MAINTAIN}" ] && [ -z "${REPO_PUSH}" ] && [ -z "${REPO_TRIAGE}" ] && [ -z "${REPO_PULL}" ]; then
-  print_error "At least one permission level must be set."
-  print_error "Available variables: REPO_ADMIN, REPO_MAINTAIN, REPO_PUSH, REPO_TRIAGE, REPO_PULL"
-  exit 1
+  err "At least one permission level must be set. Available: REPO_ADMIN, REPO_MAINTAIN, REPO_PUSH, REPO_TRIAGE, REPO_PULL"
 fi
 
 validate_github_token
@@ -103,8 +101,7 @@ process_repos () {
 
     if ! echo "${repos_json}" | jq -e 'type == "array"' > /dev/null 2>&1; then
       print_error "Unexpected API response for page ${PAGE}"
-      print_error "$(echo "${repos_json}" | jq -r '.message // "unknown error"')"
-      exit 1
+      err "$(echo "${repos_json}" | jq -r '.message // "unknown error"')"
     fi
 
     while IFS= read -r REPO; do
diff --git a/org-admin/github-close-archived-repo-security-alerts/github-close-archived-repo-security-alerts.sh b/org-admin/github-close-archived-repo-security-alerts/github-close-archived-repo-security-alerts.sh
index d6f41ea..1beef3e 100755
--- a/org-admin/github-close-archived-repo-security-alerts/github-close-archived-repo-security-alerts.sh
+++ b/org-admin/github-close-archived-repo-security-alerts/github-close-archived-repo-security-alerts.sh
@@ -65,9 +65,8 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     *)
-      print_error "Unknown argument: $1"
       echo "Usage: $0 [--type dependabot|code-scanning|secret-scanning|all] [--dry-run]"
-      exit 1
+      err "Unknown argument: $1"
       ;;
   esac
 done
@@ -76,8 +75,7 @@ done
 case "$ALERT_TYPE" in
   dependabot|code-scanning|secret-scanning|all) ;;
   *)
-    print_error "Invalid --type value: '${ALERT_TYPE}'. Must be one of: dependabot, code-scanning, secret-scanning, all"
-    exit 1
+    err "Invalid --type value: '${ALERT_TYPE}'. Must be one of: dependabot, code-scanning, secret-scanning, all"
     ;;
 esac
 
@@ -85,16 +83,14 @@ esac
 case "${DEPENDABOT_REASON}" in
   fix_started|inaccurate|no_bandwidth|not_used|tolerable_risk) ;;
   *)
-    print_error "Invalid DEPENDABOT_REASON '${DEPENDABOT_REASON}'. Must be one of: fix_started, inaccurate, no_bandwidth, not_used, tolerable_risk"
-    exit 1
+    err "Invalid DEPENDABOT_REASON '${DEPENDABOT_REASON}'. Must be one of: fix_started, inaccurate, no_bandwidth, not_used, tolerable_risk"
     ;;
 esac
 
 case "${SECRET_SCANNING_RESOLUTION}" in
   false_positive|wont_fix|revoked|used_in_tests) ;;
   *)
-    print_error "Invalid SECRET_SCANNING_RESOLUTION '${SECRET_SCANNING_RESOLUTION}'. Must be one of: false_positive, wont_fix, revoked, used_in_tests"
-    exit 1
+    err "Invalid SECRET_SCANNING_RESOLUTION '${SECRET_SCANNING_RESOLUTION}'. Must be one of: false_positive, wont_fix, revoked, used_in_tests"
     ;;
 esac
 
@@ -125,65 +121,10 @@ if [ "${DRY_RUN}" = false ]; then
   echo "timestamp,org,repo,alert_type,alert_number,alert_summary,action" > "${REPORT_FILE}"
 fi
 
-###
-## HELPER: paginate a GET endpoint and collect all JSON array items
-###
-get_all_pages() {
-  local url="$1"
-  local page=1
-  local results='[]'
-
-  while true; do
-    local response
-    response=$(curl -s \
-      -H "Authorization: token ${GITHUB_TOKEN}" \
-      -H "Accept: application/vnd.github+json" \
-      -H "X-GitHub-Api-Version: 2022-11-28" \
-      "${url}&per_page=100&page=${page}")
-
-    # Empty body — feature not available for this repo
-    if [ -z "${response}" ]; then
-      break
-    fi
-
-    # Not valid JSON at all (e.g. HTML redirect page)
-    if ! echo "${response}" | jq -e '.' &>/dev/null; then
-      break
-    fi
-
-    # Response is an error object, not an array
-    if ! echo "${response}" | jq -e 'type == "array"' &>/dev/null; then
-      local msg
-      msg=$(echo "${response}" | jq -r '.message // "unknown error"')
-      # Silently skip expected "not enabled / not found" responses
-      local msg_lower
-      msg_lower=$(echo "${msg}" | tr '[:upper:]' '[:lower:]')
-      if [[ "${msg_lower}" != *"not enabled"* ]] && \
-         [[ "${msg_lower}" != *"advanced security"* ]] && \
-         [[ "${msg_lower}" != *"not found"* ]] && \
-         [[ "${msg_lower}" != *"disabled"* ]]; then
-        print_warning "API message: ${msg}" >&2
-      fi
-      break
-    fi
-
-    local count
-    count=$(echo "${response}" | jq 'length')
-    if [ "${count}" -eq 0 ]; then
-      break
-    fi
-
-    results=$(echo "${results} ${response}" | jq -s '.[0] + .[1]')
-    page=$((page + 1))
-  done
-
-  echo "${results}"
-}
-
 ###
 ## close_alerts <type> <repo> <summary_jq> <action> <payload>
-## Generic alert-closer: fetches all open alerts on the given type endpoint,
-## then dismisses/resolves each one.
+## Generic alert-closer: streams all open alerts on the given type endpoint
+## via gh_api_paginate, then dismisses/resolves each one.
 ##   type        — endpoint segment and display label (dependabot, code-scanning, secret-scanning)
 ##   repo        — repository name (without org prefix)
 ##   summary_jq  — jq expression to extract a human-readable alert summary from one alert object
@@ -193,22 +134,18 @@ get_all_pages() {
 close_alerts() {
   local type="$1" repo="$2" summary_jq="$3" action="$4" payload="$5"
   local base_path="/repos/${ORG}/${repo}/${type}/alerts"
+  local any_found=false
 
   print_status "[${type}] Processing ${ORG}/${repo}..."
-  local alerts count
-  alerts=$(get_all_pages "${API_URL_PREFIX}${base_path}?state=open")
-  count=$(echo "${alerts}" | jq 'length')
 
-  if [ "${count}" -eq 0 ]; then
-    print_status "[${type}] No open alerts in ${repo}"
-    return
-  fi
-  print_status "[${type}] Found ${count} open alert(s) in ${repo}"
+  while IFS= read -r alert_json; do
+    local alert_number
+    alert_number=$(printf '%s' "${alert_json}" | jq -r '.number // empty' 2>/dev/null) || continue
+    [[ -z "${alert_number}" ]] && continue
+    any_found=true
 
-  for i in $(seq 0 $((count - 1))); do
-    local alert_number summary
-    alert_number=$(echo "${alerts}" | jq -r ".[${i}].number")
-    summary=$(echo "${alerts}" | jq -r ".[${i}] | ${summary_jq}")
+    local summary
+    summary=$(printf '%s' "${alert_json}" | jq -r "${summary_jq}")
 
     if [ "${DRY_RUN}" = true ]; then
       print_warning "[DRY-RUN] Would ${action} ${type} alert #${alert_number} in ${ORG}/${repo}: ${summary}"
@@ -235,7 +172,9 @@ close_alerts() {
     fi
 
     sleep 0.2
-  done
+  done < <(gh_api_paginate "${base_path}?state=open&per_page=100" '.[] | select(.number) | @json' || true)
+
+  "${any_found}" || print_status "[${type}] No open alerts in ${repo}"
 }
 
 ###
diff --git a/org-admin/github-import-repo/github-import-repo.sh b/org-admin/github-import-repo/github-import-repo.sh
index b29c3af..58a527a 100755
--- a/org-admin/github-import-repo/github-import-repo.sh
+++ b/org-admin/github-import-repo/github-import-repo.sh
@@ -85,9 +85,8 @@ case "${GIT_URL_PREFIX}" in
   https://github.com|https://*.github.com|https://*.ghe.com|https://*.githubenterprise.com)
     ;;
   *)
-    print_error "GIT_URL_PREFIX '${GIT_URL_PREFIX}' is not a recognised GitHub host. \
+    err "GIT_URL_PREFIX '${GIT_URL_PREFIX}' is not a recognised GitHub host. \
 Refusing to run git operations that would expose GITHUB_TOKEN to an unverified host."
-    exit 1
     ;;
 esac
 
diff --git a/reporting/github-monthly-issues-report/github-monthly-issues-report.sh b/reporting/github-monthly-issues-report/github-monthly-issues-report.sh
index 47ccd7a..b89c607 100755
--- a/reporting/github-monthly-issues-report/github-monthly-issues-report.sh
+++ b/reporting/github-monthly-issues-report/github-monthly-issues-report.sh
@@ -55,12 +55,10 @@ validate_github_token
 
 # Validate date format to prevent jq filter injection
 if ! [[ "${MONTH_START}" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then
-  print_error "MONTH_START must be YYYY-MM-DD, got: ${MONTH_START}"
-  exit 1
+  err "MONTH_START must be YYYY-MM-DD, got: ${MONTH_START}"
 fi
 if ! [[ "${MONTH_END}" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then
-  print_error "MONTH_END must be YYYY-MM-DD, got: ${MONTH_END}"
-  exit 1
+  err "MONTH_END must be YYYY-MM-DD, got: ${MONTH_END}"
 fi
 
 ISSUES_TEMP=$(mktemp)

From 942ccdb244da7392ca0f47a9a49120864c865f0e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:56:25 -0700
Subject: [PATCH 2/2] chore(main): release 1.3.1 (#47)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .release-please-manifest.json | 2 +-
 CHANGELOG.md                  | 7 +++++++
 VERSION                       | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 96f1cd9..9049e2f 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.3.0"
+  ".": "1.3.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b70ad57..17d1640 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 This changelog is automatically maintained by [Release Please](https://github.com/googleapis/release-please) using [Conventional Commits](https://www.conventionalcommits.org/). Do not edit the versioned sections manually.
 
+## [1.3.1](https://github.com/locus313/github-api-scripts/compare/v1.3.0...v1.3.1) (2026-07-08)
+
+
+### Code Refactoring
+
+* replace get_all_pages with gh_api_paginate and use err() helper ([89bbeab](https://github.com/locus313/github-api-scripts/commit/89bbeab1ee06ba8e203e73881c1cc0593ccd6cc2))
+
 ## [1.3.0](https://github.com/locus313/github-api-scripts/compare/v1.2.1...v1.3.0) (2026-07-08)
 
 
diff --git a/VERSION b/VERSION
index f0bb29e..3a3cd8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.0
+1.3.1