diff --git a/base_api_manifest.yaml b/base_api_manifest.yaml
index d1e4102..c456b64 100644
--- a/base_api_manifest.yaml
+++ b/base_api_manifest.yaml
@@ -94,7 +94,7 @@ modules:
     signature_source: lib/bash/git/README.md
     inputs: documented per symbol in the module README and API charter
     outputs: documented per symbol; named outputs are caller-owned
-    statuses: documented per symbol; recoverable failures return status
+    statuses: usage and contract errors return 2; recoverable failures and false predicates return 1 unless a symbol documents a specific status; freshness checks use 3 for dirty, 4 for behind, and 5 for diverged
     side_effects: documented per symbol; sourcing is passive
     stability: stable
     since: 2.0.0
@@ -111,7 +111,7 @@ modules:
     signature_source: lib/bash/gh/README.md
     inputs: documented per symbol in the module README and API charter
     outputs: documented per symbol; named outputs are caller-owned
-    statuses: documented per symbol; recoverable failures return status
+    statuses: usage and contract errors return 2; recoverable failures return 1 unless a symbol preserves an underlying gh status
     side_effects: documented per symbol; sourcing is passive
     stability: stable
     since: 2.0.0
diff --git a/docs/api-reference.md b/docs/api-reference.md
index 5d68683..230991d 100644
--- a/docs/api-reference.md
+++ b/docs/api-reference.md
@@ -132,7 +132,7 @@ statuses, and side effects are normative in the linked module README and
 - Stability: `stable`; since `2.0.0`; deprecated: `false`
 - Inputs: documented per symbol in the module README and API charter
 - Outputs: documented per symbol; named outputs are caller-owned
-- Statuses: documented per symbol; recoverable failures return status
+- Statuses: usage and contract errors return 2; recoverable failures and false predicates return 1 unless a symbol documents a specific status; freshness checks use 3 for dirty, 4 for behind, and 5 for diverged
 - Side effects: documented per symbol; sourcing is passive
 
 #### Public symbols
@@ -158,7 +158,7 @@ statuses, and side effects are normative in the linked module README and
 - Stability: `stable`; since `2.0.0`; deprecated: `false`
 - Inputs: documented per symbol in the module README and API charter
 - Outputs: documented per symbol; named outputs are caller-owned
-- Statuses: documented per symbol; recoverable failures return status
+- Statuses: usage and contract errors return 2; recoverable failures return 1 unless a symbol preserves an underlying gh status
 - Side effects: documented per symbol; sourcing is passive
 
 #### Public symbols
diff --git a/docs/v2-api-contract.md b/docs/v2-api-contract.md
index 19a17f9..9d79413 100644
--- a/docs/v2-api-contract.md
+++ b/docs/v2-api-contract.md
@@ -192,8 +192,8 @@ signature/effects reference; this table makes coverage auditable.
 | std validation/reflection | `base_std_assert_variable_name`, `base_std_assert_indexed_array`, `base_std_assert_associative_array`, `base_std_command_path`, `base_std_function_exists`, `base_std_assert_function_exists`, `base_std_assert_not_null`, `base_std_assert_integer`, `base_std_assert_integer_range`, `base_std_assert_arg_count`, `base_std_assert_command_exists`, `base_std_assert_file_exists`, `base_std_assert_executable`, `base_std_assert_dir_exists` | Predicates return status; explicit `assert_*` APIs are intentional fail-fast precondition checks; named outputs are validated before writes. |
 | std miscellaneous | `base_std_safe_cd`, `base_std_safe_unalias`, `base_std_get_my_source_dir`, `base_std_ask_yes_no`, `base_std_wait_for_enter` | `safe_cd` changes `PWD`; source-dir writes one validated output; interactive functions return recoverable EOF/non-TTY statuses. |
 | file | `base_file_section_exists`, `base_file_section_needs_update`, `base_file_update_file_section` | Read-only predicates do not mutate; update is idempotent, symlink-preserving, atomic, metadata-preserving, and conflict-aware. |
-| git | `base_git_detect_default_branch`, `base_git_worktree_path_for_branch`, `base_git_list_worktree_branches`, `base_git_branch_upstream`, `base_git_branch_merged_to_ref`, `base_git_list_remote_branches`, `base_git_update_repo`, `base_git_get_current_branch`, `base_git_check_script_up_to_date` | Read-only inspections use named outputs/stdout as documented; update and freshness helpers return documented recoverable Git statuses. |
-| gh | `base_gh_require_cli`, `base_gh_auth_status_diagnostics`, `base_gh_report_command_failure`, `base_gh_run`, `base_gh_repo_from_remote_url`, `base_gh_infer_repo_from_origin`, `base_gh_repo_default_branch`, `base_gh_api_with_retry` | Diagnostics go stderr; repository/API values use named outputs; retries are bounded and mutation-aware. |
+| git | `base_git_detect_default_branch`, `base_git_worktree_path_for_branch`, `base_git_list_worktree_branches`, `base_git_branch_upstream`, `base_git_branch_merged_to_ref`, `base_git_list_remote_branches`, `base_git_update_repo`, `base_git_get_current_branch`, `base_git_check_script_up_to_date` | Usage and contract errors return `2`; recoverable Git failures and false predicates return `1` unless a function documents a specific status. Read-only inspections use named outputs/stdout as documented; freshness outcomes are `3` dirty, `4` behind, and `5` diverged. |
+| gh | `base_gh_require_cli`, `base_gh_auth_status_diagnostics`, `base_gh_report_command_failure`, `base_gh_run`, `base_gh_repo_from_remote_url`, `base_gh_infer_repo_from_origin`, `base_gh_repo_default_branch`, `base_gh_api_with_retry` | Usage and contract errors return `2`; recoverable GitHub failures return `1` unless the helper preserves the underlying `gh` status. Diagnostics go stderr; repository/API values use named outputs; retries are bounded and mutation-aware. |
 | str | `base_str_lower`, `base_str_upper`, `base_str_ltrim`, `base_str_rtrim`, `base_str_trim`, `base_str_contains`, `base_str_starts_with`, `base_str_ends_with`, `base_str_split`, `base_str_join` | String transforms/predicates preserve caller values until validation succeeds; split/join use validated named outputs. |
 | arg | `base_arg_parse` | Parses into caller-owned validated arrays/maps and leaves them unchanged on failure. |
 | list | `base_list_append`, `base_list_prepend`, `base_list_remove`, `base_list_contains`, `base_list_unique`, `base_list_length` | Indexed-array mutators/predicates use caller-owned arrays; usage and operational errors return rather than exit. |
diff --git a/lib/bash/gh/README.md b/lib/bash/gh/README.md
index 21a102a..5a797fc 100644
--- a/lib/bash/gh/README.md
+++ b/lib/bash/gh/README.md
@@ -53,12 +53,14 @@ leave caller-owned result variables unchanged on failure; use `--optional` with
 `base_gh_infer_repo_from_origin` when a missing or non-GitHub origin is expected.
 
 Public functions validate the documented argument count before expanding
-required positional parameters. Invalid calls return `1`, including when the
-caller has enabled `nounset`; optional flags such as `--optional` are rejected
-when misspelled. `base_gh_run` passes every GitHub argument after its optional
-protected-diagnostic control prefix through unchanged. `base_gh_api_with_retry`
-preserves those caller arguments except for the documented internal
-response-metadata instrumentation on compatible retry-authorized calls.
+required positional parameters. Usage and contract errors return `2`, including
+when the caller has enabled `nounset`; recoverable GitHub failures return `1`
+unless the function preserves the underlying `gh` status. Optional flags such
+as `--optional` are rejected when misspelled. `base_gh_run` passes every GitHub
+argument after its optional protected-diagnostic control prefix through
+unchanged. `base_gh_api_with_retry` preserves those caller arguments except for
+the documented internal response-metadata instrumentation on compatible
+retry-authorized calls.
 
 The library does not change the caller's `errexit`, `nounset`, `pipefail`,
 `noclobber`, `shopt`, `IFS`, `OPTIND`, cwd, umask, traps, or positional
diff --git a/lib/bash/gh/lib_gh.sh b/lib/bash/gh/lib_gh.sh
index 3292d75..ce18eb7 100644
--- a/lib/bash/gh/lib_gh.sh
+++ b/lib/bash/gh/lib_gh.sh
@@ -6,7 +6,7 @@
 [[ -n "${BASE_BASH_LIBS_GH_LOADED:-}" ]] && return 0
 if [[ "${BASE_BASH_LIBS_STDLIB_LOADED:-}" != "1" ]]; then
     printf '%s\n' "Error: lib_gh.sh requires lib_std.sh to be sourced first." >&2
-    return 1 2>/dev/null || exit 1
+    return 1 2> /dev/null || exit 1
 fi
 readonly BASE_BASH_LIBS_GH_LOADED=1
 
@@ -16,12 +16,12 @@ readonly BASE_BASH_LIBS_GH_LOADED=1
 base_gh_require_cli() {
     if (($# > 1)); then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_require_cli [install_hint]"
-        return 1
+        return 2
     fi
 
     local install_hint="${1:-}"
 
-    command -v gh >/dev/null 2>&1 || {
+    command -v gh > /dev/null 2>&1 || {
         base_std_log_error -l base_bash_libs.gh "Required command 'gh' was not found on PATH."
         [[ -z "$install_hint" ]] || base_std_log_error -l base_bash_libs.gh "$install_hint"
         return 1
@@ -32,14 +32,14 @@ __base_bash_libs_gh_sensitive_controls_usage__() {
     local __base_bash_libs_gh_controls_helper_name="${1-}"
 
     case "$__base_bash_libs_gh_controls_helper_name" in
-        base_gh_report_command_failure)
-            base_std_log_error -l base_bash_libs.gh \
-                "Usage: base_gh_report_command_failure <status> [gh args...] or base_gh_report_command_failure --sensitive [--safe-display <label>] -- <status> [gh args...]"
-            ;;
-        *)
-            base_std_log_error -l base_bash_libs.gh \
-                "Usage: $__base_bash_libs_gh_controls_helper_name [--sensitive [--safe-display <label>] --] [gh args...]"
-            ;;
+    base_gh_report_command_failure)
+        base_std_log_error -l base_bash_libs.gh \
+            "Usage: base_gh_report_command_failure <status> [gh args...] or base_gh_report_command_failure --sensitive [--safe-display <label>] -- <status> [gh args...]"
+        ;;
+    *)
+        base_std_log_error -l base_bash_libs.gh \
+            "Usage: $__base_bash_libs_gh_controls_helper_name [--sensitive [--safe-display <label>] --] [gh args...]"
+        ;;
     esac
 }
 
@@ -58,64 +58,63 @@ __base_bash_libs_gh_parse_sensitive_controls__() {
     local __base_bash_libs_gh_controls_separator_seen=0
 
     case "${1-}" in
-        --sensitive | --safe-display)
-            ;;
-        *)
-            printf -v "$__base_bash_libs_gh_controls_consumed_result_name" '%s' 0
-            printf -v "$__base_bash_libs_gh_controls_sensitive_result_name" '%s' 0
-            printf -v "$__base_bash_libs_gh_controls_display_result_name" '%s' ""
-            return 0
-            ;;
+    --sensitive | --safe-display) ;;
+    *)
+        printf -v "$__base_bash_libs_gh_controls_consumed_result_name" '%s' 0
+        printf -v "$__base_bash_libs_gh_controls_sensitive_result_name" '%s' 0
+        printf -v "$__base_bash_libs_gh_controls_display_result_name" '%s' ""
+        return 0
+        ;;
     esac
 
     while (($#)); do
         case "${1-}" in
-            --sensitive)
-                if ((__base_bash_libs_gh_controls_sensitive)); then
-                    __base_bash_libs_gh_sensitive_controls_usage__ "$__base_bash_libs_gh_controls_helper_name"
-                    return 1
-                fi
-                __base_bash_libs_gh_controls_sensitive=1
-                __base_bash_libs_gh_controls_consumed=$((__base_bash_libs_gh_controls_consumed + 1))
-                shift
-                ;;
-            --safe-display)
-                if ((__base_bash_libs_gh_controls_display_seen)) || (($# < 2)) ||
-                    ! __base_bash_libs_std_is_safe_display__ "${2-}"; then
-                    base_std_log_error -l base_bash_libs.gh \
-                        "$__base_bash_libs_gh_controls_helper_name: --safe-display requires one non-empty printable ASCII label that does not begin with '-'."
-                    return 1
-                fi
-                __base_bash_libs_gh_controls_safe_display="$2"
-                __base_bash_libs_gh_controls_display_seen=1
-                __base_bash_libs_gh_controls_consumed=$((__base_bash_libs_gh_controls_consumed + 2))
-                shift 2
-                ;;
-            --)
-                __base_bash_libs_gh_controls_separator_seen=1
-                __base_bash_libs_gh_controls_consumed=$((__base_bash_libs_gh_controls_consumed + 1))
-                shift
-                break
-                ;;
-            *)
-                # Do not echo the malformed token: it may itself contain a
-                # credential in an option=value form.
+        --sensitive)
+            if ((__base_bash_libs_gh_controls_sensitive)); then
+                __base_bash_libs_gh_sensitive_controls_usage__ "$__base_bash_libs_gh_controls_helper_name"
+                return 2
+            fi
+            __base_bash_libs_gh_controls_sensitive=1
+            __base_bash_libs_gh_controls_consumed=$((__base_bash_libs_gh_controls_consumed + 1))
+            shift
+            ;;
+        --safe-display)
+            if ((__base_bash_libs_gh_controls_display_seen)) || (($# < 2)) ||
+                ! __base_bash_libs_std_is_safe_display__ "${2-}"; then
                 base_std_log_error -l base_bash_libs.gh \
-                    "$__base_bash_libs_gh_controls_helper_name: protected diagnostic controls must end with -- before GitHub arguments."
-                return 1
-                ;;
+                    "$__base_bash_libs_gh_controls_helper_name: --safe-display requires one non-empty printable ASCII label that does not begin with '-'."
+                return 2
+            fi
+            __base_bash_libs_gh_controls_safe_display="$2"
+            __base_bash_libs_gh_controls_display_seen=1
+            __base_bash_libs_gh_controls_consumed=$((__base_bash_libs_gh_controls_consumed + 2))
+            shift 2
+            ;;
+        --)
+            __base_bash_libs_gh_controls_separator_seen=1
+            __base_bash_libs_gh_controls_consumed=$((__base_bash_libs_gh_controls_consumed + 1))
+            shift
+            break
+            ;;
+        *)
+            # Do not echo the malformed token: it may itself contain a
+            # credential in an option=value form.
+            base_std_log_error -l base_bash_libs.gh \
+                "$__base_bash_libs_gh_controls_helper_name: protected diagnostic controls must end with -- before GitHub arguments."
+            return 2
+            ;;
         esac
     done
 
     if ((!__base_bash_libs_gh_controls_sensitive)); then
         base_std_log_error -l base_bash_libs.gh \
             "$__base_bash_libs_gh_controls_helper_name: --safe-display is valid only with --sensitive."
-        return 1
+        return 2
     fi
     if ((!__base_bash_libs_gh_controls_separator_seen)); then
         base_std_log_error -l base_bash_libs.gh \
             "$__base_bash_libs_gh_controls_helper_name: --sensitive requires -- before GitHub arguments."
-        return 1
+        return 2
     fi
 
     printf -v "$__base_bash_libs_gh_controls_consumed_result_name" '%s' "$__base_bash_libs_gh_controls_consumed"
@@ -145,7 +144,7 @@ __base_bash_libs_gh_auth_status_diagnostics__() {
         while IFS= read -r __base_bash_libs_gh_auth_line || [[ -n "$__base_bash_libs_gh_auth_line" ]]; do
             [[ -n "$__base_bash_libs_gh_auth_line" ]] &&
                 base_std_log_error -l base_bash_libs.gh "gh auth status: $__base_bash_libs_gh_auth_line"
-        done <<<"$__base_bash_libs_gh_auth_output"
+        done <<< "$__base_bash_libs_gh_auth_output"
     fi
     [[ -z "$__base_bash_libs_gh_auth_login_hint" ]] || base_std_log_error -l base_bash_libs.gh "$__base_bash_libs_gh_auth_login_hint"
     return 1
@@ -157,7 +156,7 @@ __base_bash_libs_gh_auth_status_diagnostics__() {
 base_gh_auth_status_diagnostics() {
     if (($# > 1)); then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_auth_status_diagnostics [login_hint]"
-        return 1
+        return 2
     fi
 
     __base_bash_libs_gh_auth_status_diagnostics__ 0 "" "${1:-Run 'gh auth login -h github.com' and retry.}"
@@ -191,24 +190,24 @@ base_gh_report_command_failure() {
 
     __base_bash_libs_gh_parse_sensitive_controls__ __base_bash_libs_gh_report_public_consumed \
         __base_bash_libs_gh_report_public_sensitive __base_bash_libs_gh_report_public_safe_display \
-        base_gh_report_command_failure "$@" || return 1
+        base_gh_report_command_failure "$@" || return $?
     ((__base_bash_libs_gh_report_public_consumed == 0)) || shift "$__base_bash_libs_gh_report_public_consumed"
 
     if (($# < 1)); then
         __base_bash_libs_gh_sensitive_controls_usage__ base_gh_report_command_failure
-        return 1
+        return 2
     fi
     __base_bash_libs_gh_report_public_status="$1"
     shift
 
     if [[ ! "$__base_bash_libs_gh_report_public_status" =~ ^[0-9]{1,3}$ ]]; then
         __base_bash_libs_gh_sensitive_controls_usage__ base_gh_report_command_failure
-        return 1
+        return 2
     fi
     __base_bash_libs_gh_report_public_status=$((10#$__base_bash_libs_gh_report_public_status))
     if ((__base_bash_libs_gh_report_public_status < 1 || __base_bash_libs_gh_report_public_status > 255)); then
         __base_bash_libs_gh_sensitive_controls_usage__ base_gh_report_command_failure
-        return 1
+        return 2
     fi
 
     __base_bash_libs_gh_report_command_failure__ "$__base_bash_libs_gh_report_public_status" \
@@ -221,7 +220,7 @@ base_gh_run() {
     local __base_bash_libs_gh_run_status=0
 
     __base_bash_libs_gh_parse_sensitive_controls__ __base_bash_libs_gh_run_consumed __base_bash_libs_gh_run_sensitive \
-        __base_bash_libs_gh_run_safe_display base_gh_run "$@" || return 1
+        __base_bash_libs_gh_run_safe_display base_gh_run "$@" || return $?
     ((__base_bash_libs_gh_run_consumed == 0)) || shift "$__base_bash_libs_gh_run_consumed"
     # A caller may provide `gh` as a shell function. Lock the normalized
     # diagnostic policy before invoking it so Bash's dynamic scope cannot let
@@ -246,18 +245,18 @@ __base_bash_libs_gh_parse_repo_from_remote_url__() {
     local __base_bash_libs_gh_parse_repo
 
     case "$__base_bash_libs_gh_parse_remote_url" in
-        git@github.com:*)
-            __base_bash_libs_gh_parse_repo="${__base_bash_libs_gh_parse_remote_url#git@github.com:}"
-            ;;
-        ssh://git@github.com/*)
-            __base_bash_libs_gh_parse_repo="${__base_bash_libs_gh_parse_remote_url#ssh://git@github.com/}"
-            ;;
-        https://github.com/*)
-            __base_bash_libs_gh_parse_repo="${__base_bash_libs_gh_parse_remote_url#https://github.com/}"
-            ;;
-        *)
-            return 1
-            ;;
+    git@github.com:*)
+        __base_bash_libs_gh_parse_repo="${__base_bash_libs_gh_parse_remote_url#git@github.com:}"
+        ;;
+    ssh://git@github.com/*)
+        __base_bash_libs_gh_parse_repo="${__base_bash_libs_gh_parse_remote_url#ssh://git@github.com/}"
+        ;;
+    https://github.com/*)
+        __base_bash_libs_gh_parse_repo="${__base_bash_libs_gh_parse_remote_url#https://github.com/}"
+        ;;
+    *)
+        return 1
+        ;;
     esac
 
     __base_bash_libs_gh_parse_repo="${__base_bash_libs_gh_parse_repo%.git}"
@@ -268,9 +267,9 @@ __base_bash_libs_gh_parse_repo_from_remote_url__() {
 base_gh_repo_from_remote_url() {
     if (($# != 2)); then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_repo_from_remote_url <remote_url> <result_variable_name>"
-        return 1
+        return 2
     fi
-    __base_bash_libs_std_assert_public_variable_names__ base_gh_repo_from_remote_url "${2-}" || return 1
+    __base_bash_libs_std_assert_public_variable_names__ base_gh_repo_from_remote_url "${2-}" || return 2
 
     local __base_bash_libs_gh_remote_url="$1"
     local __base_bash_libs_gh_result_name="$2"
@@ -278,21 +277,21 @@ base_gh_repo_from_remote_url() {
 
     if [[ -z "$__base_bash_libs_gh_remote_url" || -z "$__base_bash_libs_gh_result_name" ]]; then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_repo_from_remote_url <remote_url> <result_variable_name>"
-        return 1
+        return 2
     fi
-    base_std_assert_variable_name "$__base_bash_libs_gh_result_name" || return 1
-    __base_bash_libs_std_assert_writable_output__ base_gh_repo_from_remote_url "$__base_bash_libs_gh_result_name" || return 1
+    base_std_assert_variable_name "$__base_bash_libs_gh_result_name" || return 2
+    __base_bash_libs_std_assert_writable_output__ base_gh_repo_from_remote_url "$__base_bash_libs_gh_result_name" || return 2
 
-    __base_bash_libs_gh_parse_repo_from_remote_url__ "$__base_bash_libs_gh_remote_url" __base_bash_libs_gh_parsed_repo || return 1
+    __base_bash_libs_gh_parse_repo_from_remote_url__ "$__base_bash_libs_gh_remote_url" __base_bash_libs_gh_parsed_repo || return 2
     printf -v "$__base_bash_libs_gh_result_name" '%s' "$__base_bash_libs_gh_parsed_repo"
 }
 
 base_gh_infer_repo_from_origin() {
     if (($# < 2 || $# > 3)) || { (($# == 3)) && [[ "$3" != "--optional" ]]; }; then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_infer_repo_from_origin <repo_dir> <result_variable_name> [--optional]"
-        return 1
+        return 2
     fi
-    __base_bash_libs_std_assert_public_variable_names__ base_gh_infer_repo_from_origin "${2-}" || return 1
+    __base_bash_libs_std_assert_public_variable_names__ base_gh_infer_repo_from_origin "${2-}" || return 2
 
     local __base_bash_libs_gh_infer_repo_dir="$1"
     local __base_bash_libs_gh_infer_result_name="$2"
@@ -301,16 +300,16 @@ base_gh_infer_repo_from_origin() {
 
     if [[ -z "$__base_bash_libs_gh_infer_repo_dir" || -z "$__base_bash_libs_gh_infer_result_name" ]]; then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_infer_repo_from_origin <repo_dir> <result_variable_name> [--optional]"
-        return 1
+        return 2
     fi
-    base_std_assert_variable_name "$__base_bash_libs_gh_infer_result_name" || return 1
-    __base_bash_libs_std_assert_writable_output__ base_gh_infer_repo_from_origin "$__base_bash_libs_gh_infer_result_name" || return 1
+    base_std_assert_variable_name "$__base_bash_libs_gh_infer_result_name" || return 2
+    __base_bash_libs_std_assert_writable_output__ base_gh_infer_repo_from_origin "$__base_bash_libs_gh_infer_result_name" || return 2
 
     if [[ "${3:-}" == "--optional" ]]; then
         __base_bash_libs_gh_infer_optional=1
     fi
 
-    __base_bash_libs_gh_infer_remote_url="$(git -C "$__base_bash_libs_gh_infer_repo_dir" remote get-url origin 2>/dev/null || true)"
+    __base_bash_libs_gh_infer_remote_url="$(git -C "$__base_bash_libs_gh_infer_repo_dir" remote get-url origin 2> /dev/null || true)"
     if [[ -z "$__base_bash_libs_gh_infer_remote_url" ]] ||
         ! __base_bash_libs_gh_parse_repo_from_remote_url__ "$__base_bash_libs_gh_infer_remote_url" __base_bash_libs_gh_infer_parsed_repo; then
         if ((__base_bash_libs_gh_infer_optional)); then
@@ -327,9 +326,9 @@ base_gh_infer_repo_from_origin() {
 base_gh_repo_default_branch() {
     if (($# != 2)); then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_repo_default_branch <owner/repo> <result_variable_name>"
-        return 1
+        return 2
     fi
-    __base_bash_libs_std_assert_public_variable_names__ base_gh_repo_default_branch "${2-}" || return 1
+    __base_bash_libs_std_assert_public_variable_names__ base_gh_repo_default_branch "${2-}" || return 2
 
     local __base_bash_libs_gh_repo="$1"
     local __base_bash_libs_gh_repo_result_name="$2"
@@ -337,13 +336,13 @@ base_gh_repo_default_branch() {
 
     if [[ -z "$__base_bash_libs_gh_repo" || -z "$__base_bash_libs_gh_repo_result_name" ]]; then
         base_std_log_error -l base_bash_libs.gh "Usage: base_gh_repo_default_branch <owner/repo> <result_variable_name>"
-        return 1
+        return 2
     fi
-    base_std_assert_variable_name "$__base_bash_libs_gh_repo_result_name" || return 1
-    __base_bash_libs_std_assert_writable_output__ base_gh_repo_default_branch "$__base_bash_libs_gh_repo_result_name" || return 1
+    base_std_assert_variable_name "$__base_bash_libs_gh_repo_result_name" || return 2
+    __base_bash_libs_std_assert_writable_output__ base_gh_repo_default_branch "$__base_bash_libs_gh_repo_result_name" || return 2
 
     base_gh_require_cli || return 1
-    __base_bash_libs_gh_repo_default_branch="$(gh repo view "$__base_bash_libs_gh_repo" --json defaultBranchRef --jq .defaultBranchRef.name 2>/dev/null)" || __base_bash_libs_gh_repo_status=$?
+    __base_bash_libs_gh_repo_default_branch="$(gh repo view "$__base_bash_libs_gh_repo" --json defaultBranchRef --jq .defaultBranchRef.name 2> /dev/null)" || __base_bash_libs_gh_repo_status=$?
     if ((__base_bash_libs_gh_repo_status != 0)); then
         base_gh_report_command_failure "$__base_bash_libs_gh_repo_status" repo view "$__base_bash_libs_gh_repo" --json defaultBranchRef --jq .defaultBranchRef.name
         return $?
@@ -367,8 +366,8 @@ __base_bash_libs_gh_api_bounded_decimal__() {
 
     [[ "$__base_bash_libs_gh_decimal_value" =~ ^[0-9]+$ && ${#__base_bash_libs_gh_decimal_value} -le 4 ]] || return 1
     __base_bash_libs_gh_decimal_normalized=$((10#$__base_bash_libs_gh_decimal_value))
-    ((__base_bash_libs_gh_decimal_normalized >= __base_bash_libs_gh_decimal_min &&
-        __base_bash_libs_gh_decimal_normalized <= __base_bash_libs_gh_decimal_max)) || return 1
+    ((__base_bash_libs_gh_decimal_normalized >= __base_bash_libs_gh_decimal_min && \
+    __base_bash_libs_gh_decimal_normalized <= __base_bash_libs_gh_decimal_max)) || return 1
     printf -v "$__base_bash_libs_gh_decimal_result_name" '%s' "$__base_bash_libs_gh_decimal_normalized"
 }
 
@@ -394,11 +393,11 @@ __base_bash_libs_gh_parse_api_controls__() {
     local __base_bash_libs_gh_controls_cap_seen=0 __base_bash_libs_gh_controls_started=0
 
     case "${1-}" in
-        --sensitive | --safe-display | --retry-policy | --max-attempts | \
-            --max-elapsed-seconds | --attempt-timeout-seconds | \
-            --base-delay-seconds | --max-delay-seconds)
-            __base_bash_libs_gh_controls_started=1
-            ;;
+    --sensitive | --safe-display | --retry-policy | --max-attempts | \
+        --max-elapsed-seconds | --attempt-timeout-seconds | \
+        --base-delay-seconds | --max-delay-seconds)
+        __base_bash_libs_gh_controls_started=1
+        ;;
     esac
 
     if ((!__base_bash_libs_gh_controls_started)); then
@@ -416,129 +415,129 @@ __base_bash_libs_gh_parse_api_controls__() {
 
     while (($#)); do
         case "${1-}" in
-            --sensitive)
-                if ((__base_bash_libs_gh_controls_sensitive_value)); then
-                    __base_bash_libs_gh_api_controls_usage__
-                    return 1
-                fi
-                __base_bash_libs_gh_controls_sensitive_value=1
-                __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 1))
-                shift
+        --sensitive)
+            if ((__base_bash_libs_gh_controls_sensitive_value)); then
+                __base_bash_libs_gh_api_controls_usage__
+                return 2
+            fi
+            __base_bash_libs_gh_controls_sensitive_value=1
+            __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 1))
+            shift
+            ;;
+        --safe-display)
+            if ((__base_bash_libs_gh_controls_display_seen)) || (($# < 2)) ||
+                ! __base_bash_libs_std_is_safe_display__ "${2-}"; then
+                base_std_log_error -l base_bash_libs.gh \
+                    "base_gh_api_with_retry: --safe-display requires one non-empty printable ASCII label that does not begin with '-'."
+                return 2
+            fi
+            __base_bash_libs_gh_controls_display_value="$2"
+            __base_bash_libs_gh_controls_display_seen=1
+            __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 2))
+            shift 2
+            ;;
+        --retry-policy)
+            if ((__base_bash_libs_gh_controls_policy_seen)) || (($# < 2)); then
+                __base_bash_libs_gh_api_controls_usage__
+                return 2
+            fi
+            case "$2" in
+            read-only | never | replay-safe) __base_bash_libs_gh_controls_policy_value="$2" ;;
+            *)
+                base_std_log_error -l base_bash_libs.gh \
+                    "base_gh_api_with_retry: --retry-policy must be read-only, never, or replay-safe."
+                return 2
                 ;;
-            --safe-display)
-                if ((__base_bash_libs_gh_controls_display_seen)) || (($# < 2)) ||
-                    ! __base_bash_libs_std_is_safe_display__ "${2-}"; then
-                    base_std_log_error -l base_bash_libs.gh \
-                        "base_gh_api_with_retry: --safe-display requires one non-empty printable ASCII label that does not begin with '-'."
-                    return 1
-                fi
-                __base_bash_libs_gh_controls_display_value="$2"
-                __base_bash_libs_gh_controls_display_seen=1
-                __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 2))
-                shift 2
+            esac
+            __base_bash_libs_gh_controls_policy_seen=1
+            __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 2))
+            shift 2
+            ;;
+        --max-attempts | --max-elapsed-seconds | --attempt-timeout-seconds | \
+            --base-delay-seconds | --max-delay-seconds)
+            local __base_bash_libs_gh_controls_numeric_option="$1" __base_bash_libs_gh_controls_numeric_value
+            if (($# < 2)); then
+                __base_bash_libs_gh_api_controls_usage__
+                return 2
+            fi
+            case "$__base_bash_libs_gh_controls_numeric_option" in
+            --max-attempts)
+                ((__base_bash_libs_gh_controls_attempts_seen == 0)) &&
+                    __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 10 __base_bash_libs_gh_controls_numeric_value || {
+                    __base_bash_libs_gh_api_controls_usage__
+                    return 2
+                }
+                __base_bash_libs_gh_controls_attempts_seen=1
+                __base_bash_libs_gh_controls_attempts_value="$__base_bash_libs_gh_controls_numeric_value"
                 ;;
-            --retry-policy)
-                if ((__base_bash_libs_gh_controls_policy_seen)) || (($# < 2)); then
+            --max-elapsed-seconds)
+                ((__base_bash_libs_gh_controls_elapsed_seen == 0)) &&
+                    __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 3600 __base_bash_libs_gh_controls_numeric_value || {
                     __base_bash_libs_gh_api_controls_usage__
-                    return 1
-                fi
-                case "$2" in
-                    read-only | never | replay-safe) __base_bash_libs_gh_controls_policy_value="$2" ;;
-                    *)
-                        base_std_log_error -l base_bash_libs.gh \
-                            "base_gh_api_with_retry: --retry-policy must be read-only, never, or replay-safe."
-                        return 1
-                        ;;
-                esac
-                __base_bash_libs_gh_controls_policy_seen=1
-                __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 2))
-                shift 2
+                    return 2
+                }
+                __base_bash_libs_gh_controls_elapsed_seen=1
+                __base_bash_libs_gh_controls_elapsed_value="$__base_bash_libs_gh_controls_numeric_value"
                 ;;
-            --max-attempts | --max-elapsed-seconds | --attempt-timeout-seconds | \
-                --base-delay-seconds | --max-delay-seconds)
-                local __base_bash_libs_gh_controls_numeric_option="$1" __base_bash_libs_gh_controls_numeric_value
-                if (($# < 2)); then
+            --attempt-timeout-seconds)
+                ((__base_bash_libs_gh_controls_timeout_seen == 0)) &&
+                    __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 600 __base_bash_libs_gh_controls_numeric_value || {
                     __base_bash_libs_gh_api_controls_usage__
-                    return 1
-                fi
-                case "$__base_bash_libs_gh_controls_numeric_option" in
-                    --max-attempts)
-                        ((__base_bash_libs_gh_controls_attempts_seen == 0)) &&
-                            __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 10 __base_bash_libs_gh_controls_numeric_value || {
-                            __base_bash_libs_gh_api_controls_usage__
-                            return 1
-                        }
-                        __base_bash_libs_gh_controls_attempts_seen=1
-                        __base_bash_libs_gh_controls_attempts_value="$__base_bash_libs_gh_controls_numeric_value"
-                        ;;
-                    --max-elapsed-seconds)
-                        ((__base_bash_libs_gh_controls_elapsed_seen == 0)) &&
-                            __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 3600 __base_bash_libs_gh_controls_numeric_value || {
-                            __base_bash_libs_gh_api_controls_usage__
-                            return 1
-                        }
-                        __base_bash_libs_gh_controls_elapsed_seen=1
-                        __base_bash_libs_gh_controls_elapsed_value="$__base_bash_libs_gh_controls_numeric_value"
-                        ;;
-                    --attempt-timeout-seconds)
-                        ((__base_bash_libs_gh_controls_timeout_seen == 0)) &&
-                            __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 600 __base_bash_libs_gh_controls_numeric_value || {
-                            __base_bash_libs_gh_api_controls_usage__
-                            return 1
-                        }
-                        __base_bash_libs_gh_controls_timeout_seen=1
-                        __base_bash_libs_gh_controls_timeout_value="$__base_bash_libs_gh_controls_numeric_value"
-                        ;;
-                    --base-delay-seconds)
-                        ((__base_bash_libs_gh_controls_base_seen == 0)) &&
-                            __base_bash_libs_gh_api_bounded_decimal__ "$2" 0 60 __base_bash_libs_gh_controls_numeric_value || {
-                            __base_bash_libs_gh_api_controls_usage__
-                            return 1
-                        }
-                        __base_bash_libs_gh_controls_base_seen=1
-                        __base_bash_libs_gh_controls_base_value="$__base_bash_libs_gh_controls_numeric_value"
-                        ;;
-                    --max-delay-seconds)
-                        ((__base_bash_libs_gh_controls_cap_seen == 0)) &&
-                            __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 300 __base_bash_libs_gh_controls_numeric_value || {
-                            __base_bash_libs_gh_api_controls_usage__
-                            return 1
-                        }
-                        __base_bash_libs_gh_controls_cap_seen=1
-                        __base_bash_libs_gh_controls_cap_value="$__base_bash_libs_gh_controls_numeric_value"
-                        ;;
-                esac
-                __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 2))
-                shift 2
+                    return 2
+                }
+                __base_bash_libs_gh_controls_timeout_seen=1
+                __base_bash_libs_gh_controls_timeout_value="$__base_bash_libs_gh_controls_numeric_value"
                 ;;
-            --)
-                __base_bash_libs_gh_controls_separator=1
-                __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 1))
-                shift
-                break
+            --base-delay-seconds)
+                ((__base_bash_libs_gh_controls_base_seen == 0)) &&
+                    __base_bash_libs_gh_api_bounded_decimal__ "$2" 0 60 __base_bash_libs_gh_controls_numeric_value || {
+                    __base_bash_libs_gh_api_controls_usage__
+                    return 2
+                }
+                __base_bash_libs_gh_controls_base_seen=1
+                __base_bash_libs_gh_controls_base_value="$__base_bash_libs_gh_controls_numeric_value"
                 ;;
-            *)
-                base_std_log_error -l base_bash_libs.gh \
-                    "base_gh_api_with_retry: framework controls must end with -- before GitHub arguments."
-                return 1
+            --max-delay-seconds)
+                ((__base_bash_libs_gh_controls_cap_seen == 0)) &&
+                    __base_bash_libs_gh_api_bounded_decimal__ "$2" 1 300 __base_bash_libs_gh_controls_numeric_value || {
+                    __base_bash_libs_gh_api_controls_usage__
+                    return 2
+                }
+                __base_bash_libs_gh_controls_cap_seen=1
+                __base_bash_libs_gh_controls_cap_value="$__base_bash_libs_gh_controls_numeric_value"
                 ;;
+            esac
+            __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 2))
+            shift 2
+            ;;
+        --)
+            __base_bash_libs_gh_controls_separator=1
+            __base_bash_libs_gh_controls_consumed_value=$((__base_bash_libs_gh_controls_consumed_value + 1))
+            shift
+            break
+            ;;
+        *)
+            base_std_log_error -l base_bash_libs.gh \
+                "base_gh_api_with_retry: framework controls must end with -- before GitHub arguments."
+            return 2
+            ;;
         esac
     done
 
     if ((!__base_bash_libs_gh_controls_separator)); then
         base_std_log_error -l base_bash_libs.gh \
             "base_gh_api_with_retry: framework controls require -- before GitHub arguments."
-        return 1
+        return 2
     fi
     if ((__base_bash_libs_gh_controls_display_seen && !__base_bash_libs_gh_controls_sensitive_value)); then
         base_std_log_error -l base_bash_libs.gh \
             "base_gh_api_with_retry: --safe-display is valid only with --sensitive."
-        return 1
+        return 2
     fi
     if ((__base_bash_libs_gh_controls_base_value > __base_bash_libs_gh_controls_cap_value)); then
         base_std_log_error -l base_bash_libs.gh \
             "base_gh_api_with_retry: --base-delay-seconds must not exceed --max-delay-seconds."
-        return 1
+        return 2
     fi
 
     printf -v "$__base_bash_libs_gh_controls_consumed_name" '%s' "$__base_bash_libs_gh_controls_consumed_value"
@@ -556,9 +555,9 @@ __base_bash_libs_gh_api_path_is_stream__() {
     local __base_bash_libs_gh_stream_path="${1-}"
 
     case "$__base_bash_libs_gh_stream_path" in
-        - | /dev/stdin | /dev/fd/* | /proc/self/fd/* | /proc/[0-9]*/fd/*)
-            return 0
-            ;;
+    - | /dev/stdin | /dev/fd/* | /proc/self/fd/* | /proc/[0-9]*/fd/*)
+        return 0
+        ;;
     esac
     [[ -n "$__base_bash_libs_gh_stream_path" ]] || return 1
     # Existing non-regular sources (FIFO, character/block device, or socket)
@@ -595,66 +594,164 @@ __base_bash_libs_gh_api_classify_argv__() {
         fi
 
         case "$__base_bash_libs_gh_class_token" in
-            --)
-                __base_bash_libs_gh_class_flags_done=1
+        --)
+            __base_bash_libs_gh_class_flags_done=1
+            ;;
+        --method | --field | --raw-field | --input | --cache | --header | \
+            --hostname | --jq | --preview | --template)
+            if (($# == 0)); then
+                __base_bash_libs_gh_class_ambiguous_value=1
+                continue
+            fi
+            __base_bash_libs_gh_class_value="$1"
+            shift
+            case "$__base_bash_libs_gh_class_token" in
+            --method)
+                __base_bash_libs_gh_class_method_count=$((__base_bash_libs_gh_class_method_count + 1))
+                __base_bash_libs_gh_class_method_value="$__base_bash_libs_gh_class_value"
+                [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
+                ;;
+            --field)
+                __base_bash_libs_gh_class_field_seen=1
+                [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
+                if [[ "$__base_bash_libs_gh_class_value" == *=* ]]; then
+                    __base_bash_libs_gh_class_field_payload="${__base_bash_libs_gh_class_value#*=}"
+                else
+                    __base_bash_libs_gh_class_field_payload=""
+                fi
+                if [[ "$__base_bash_libs_gh_class_field_payload" == @* ]]; then
+                    __base_bash_libs_gh_class_file_path="${__base_bash_libs_gh_class_field_payload#@}"
+                    if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_file_path"; then
+                        __base_bash_libs_gh_class_stdin_value=1
+                    else
+                        __base_bash_libs_gh_class_file_value=1
+                    fi
+                fi
+                ;;
+            --raw-field)
+                __base_bash_libs_gh_class_field_seen=1
+                [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
                 ;;
-            --method | --field | --raw-field | --input | --cache | --header | \
-                --hostname | --jq | --preview | --template)
-                if (($# == 0)); then
+            --input)
+                __base_bash_libs_gh_class_input_seen=$((__base_bash_libs_gh_class_input_seen + 1))
+                if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_value"; then
+                    __base_bash_libs_gh_class_stdin_value=1
+                elif [[ -n "$__base_bash_libs_gh_class_value" ]]; then
+                    __base_bash_libs_gh_class_file_value=1
+                else
+                    __base_bash_libs_gh_class_ambiguous_value=1
+                fi
+                ;;
+            esac
+            ;;
+        --method=* | --field=* | --raw-field=* | --input=* | --cache=* | \
+            --header=* | --hostname=* | --jq=* | --preview=* | --template=*)
+            __base_bash_libs_gh_class_value="${__base_bash_libs_gh_class_token#*=}"
+            case "$__base_bash_libs_gh_class_token" in
+            --method=*)
+                __base_bash_libs_gh_class_method_count=$((__base_bash_libs_gh_class_method_count + 1))
+                __base_bash_libs_gh_class_method_value="$__base_bash_libs_gh_class_value"
+                [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
+                ;;
+            --field=*)
+                __base_bash_libs_gh_class_field_seen=1
+                [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
+                if [[ "$__base_bash_libs_gh_class_value" == *=* ]]; then
+                    __base_bash_libs_gh_class_field_payload="${__base_bash_libs_gh_class_value#*=}"
+                else
+                    __base_bash_libs_gh_class_field_payload=""
+                fi
+                if [[ "$__base_bash_libs_gh_class_field_payload" == @* ]]; then
+                    __base_bash_libs_gh_class_file_path="${__base_bash_libs_gh_class_field_payload#@}"
+                    if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_file_path"; then
+                        __base_bash_libs_gh_class_stdin_value=1
+                    else
+                        __base_bash_libs_gh_class_file_value=1
+                    fi
+                fi
+                ;;
+            --raw-field=*)
+                __base_bash_libs_gh_class_field_seen=1
+                [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
+                ;;
+            --input=*)
+                __base_bash_libs_gh_class_input_seen=$((__base_bash_libs_gh_class_input_seen + 1))
+                if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_value"; then
+                    __base_bash_libs_gh_class_stdin_value=1
+                elif [[ -n "$__base_bash_libs_gh_class_value" ]]; then
+                    __base_bash_libs_gh_class_file_value=1
+                else
                     __base_bash_libs_gh_class_ambiguous_value=1
-                    continue
                 fi
-                __base_bash_libs_gh_class_value="$1"
-                shift
-                case "$__base_bash_libs_gh_class_token" in
-                    --method)
-                        __base_bash_libs_gh_class_method_count=$((__base_bash_libs_gh_class_method_count + 1))
-                        __base_bash_libs_gh_class_method_value="$__base_bash_libs_gh_class_value"
-                        [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
-                        ;;
-                    --field)
-                        __base_bash_libs_gh_class_field_seen=1
-                        [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
-                        if [[ "$__base_bash_libs_gh_class_value" == *=* ]]; then
-                            __base_bash_libs_gh_class_field_payload="${__base_bash_libs_gh_class_value#*=}"
-                        else
-                            __base_bash_libs_gh_class_field_payload=""
-                        fi
-                        if [[ "$__base_bash_libs_gh_class_field_payload" == @* ]]; then
-                            __base_bash_libs_gh_class_file_path="${__base_bash_libs_gh_class_field_payload#@}"
-                            if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_file_path"; then
-                                __base_bash_libs_gh_class_stdin_value=1
-                            else
-                                __base_bash_libs_gh_class_file_value=1
-                            fi
-                        fi
-                        ;;
-                    --raw-field)
-                        __base_bash_libs_gh_class_field_seen=1
-                        [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
-                        ;;
-                    --input)
-                        __base_bash_libs_gh_class_input_seen=$((__base_bash_libs_gh_class_input_seen + 1))
-                        if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_value"; then
-                            __base_bash_libs_gh_class_stdin_value=1
-                        elif [[ -n "$__base_bash_libs_gh_class_value" ]]; then
-                            __base_bash_libs_gh_class_file_value=1
-                        else
-                            __base_bash_libs_gh_class_ambiguous_value=1
-                        fi
-                        ;;
-                esac
                 ;;
-            --method=* | --field=* | --raw-field=* | --input=* | --cache=* | \
-                --header=* | --hostname=* | --jq=* | --preview=* | --template=*)
-                __base_bash_libs_gh_class_value="${__base_bash_libs_gh_class_token#*=}"
-                case "$__base_bash_libs_gh_class_token" in
-                    --method=*)
+            *)
+                [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
+                ;;
+            esac
+            ;;
+        --include)
+            __base_bash_libs_gh_class_include_value=1
+            ;;
+        --include=*)
+            __base_bash_libs_gh_class_bool="${__base_bash_libs_gh_class_token#*=}"
+            case "$__base_bash_libs_gh_class_bool" in
+            1 | t | T | true | TRUE | True) __base_bash_libs_gh_class_include_value=1 ;;
+            0 | f | F | false | FALSE | False) __base_bash_libs_gh_class_include_value=0 ;;
+            *) __base_bash_libs_gh_class_ambiguous_value=1 ;;
+            esac
+            ;;
+        --allow-escape-sequences | --paginate | --silent | --slurp | --verbose) ;;
+        --allow-escape-sequences=* | --paginate=* | --silent=* | --slurp=* | --verbose=*)
+            __base_bash_libs_gh_class_bool="${__base_bash_libs_gh_class_token#*=}"
+            case "$__base_bash_libs_gh_class_bool" in
+            0 | 1 | f | F | false | FALSE | False | \
+                t | T | true | TRUE | True) ;;
+            *) __base_bash_libs_gh_class_ambiguous_value=1 ;;
+            esac
+            ;;
+        --*)
+            __base_bash_libs_gh_class_ambiguous_value=1
+            ;;
+        -?*)
+            __base_bash_libs_gh_class_short="${__base_bash_libs_gh_class_token#-}"
+            while [[ -n "$__base_bash_libs_gh_class_short" ]]; do
+                __base_bash_libs_gh_class_char="${__base_bash_libs_gh_class_short:0:1}"
+                __base_bash_libs_gh_class_short="${__base_bash_libs_gh_class_short:1}"
+                case "$__base_bash_libs_gh_class_char" in
+                i)
+                    if [[ "$__base_bash_libs_gh_class_short" == =* ]]; then
+                        __base_bash_libs_gh_class_bool="${__base_bash_libs_gh_class_short#=}"
+                        __base_bash_libs_gh_class_short=""
+                        case "$__base_bash_libs_gh_class_bool" in
+                        1 | t | T | true | TRUE | True) __base_bash_libs_gh_class_include_value=1 ;;
+                        0 | f | F | false | FALSE | False) __base_bash_libs_gh_class_include_value=0 ;;
+                        *) __base_bash_libs_gh_class_ambiguous_value=1 ;;
+                        esac
+                    else
+                        __base_bash_libs_gh_class_include_value=1
+                    fi
+                    ;;
+                F | H | q | X | p | f | t)
+                    if [[ -n "$__base_bash_libs_gh_class_short" ]]; then
+                        __base_bash_libs_gh_class_value="$__base_bash_libs_gh_class_short"
+                        __base_bash_libs_gh_class_value="${__base_bash_libs_gh_class_value#= }"
+                        [[ "$__base_bash_libs_gh_class_short" == =* ]] &&
+                            __base_bash_libs_gh_class_value="${__base_bash_libs_gh_class_short#=}"
+                        __base_bash_libs_gh_class_short=""
+                    elif (($#)); then
+                        __base_bash_libs_gh_class_value="$1"
+                        shift
+                    else
+                        __base_bash_libs_gh_class_value=""
+                        __base_bash_libs_gh_class_ambiguous_value=1
+                    fi
+                    case "$__base_bash_libs_gh_class_char" in
+                    X)
                         __base_bash_libs_gh_class_method_count=$((__base_bash_libs_gh_class_method_count + 1))
                         __base_bash_libs_gh_class_method_value="$__base_bash_libs_gh_class_value"
                         [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
                         ;;
-                    --field=*)
+                    F)
                         __base_bash_libs_gh_class_field_seen=1
                         [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
                         if [[ "$__base_bash_libs_gh_class_value" == *=* ]]; then
@@ -671,123 +768,24 @@ __base_bash_libs_gh_api_classify_argv__() {
                             fi
                         fi
                         ;;
-                    --raw-field=*)
+                    f)
                         __base_bash_libs_gh_class_field_seen=1
                         [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
                         ;;
-                    --input=*)
-                        __base_bash_libs_gh_class_input_seen=$((__base_bash_libs_gh_class_input_seen + 1))
-                        if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_value"; then
-                            __base_bash_libs_gh_class_stdin_value=1
-                        elif [[ -n "$__base_bash_libs_gh_class_value" ]]; then
-                            __base_bash_libs_gh_class_file_value=1
-                        else
-                            __base_bash_libs_gh_class_ambiguous_value=1
-                        fi
-                        ;;
-                    *)
-                        [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
-                        ;;
-                esac
-                ;;
-            --include)
-                __base_bash_libs_gh_class_include_value=1
-                ;;
-            --include=*)
-                __base_bash_libs_gh_class_bool="${__base_bash_libs_gh_class_token#*=}"
-                case "$__base_bash_libs_gh_class_bool" in
-                    1 | t | T | true | TRUE | True) __base_bash_libs_gh_class_include_value=1 ;;
-                    0 | f | F | false | FALSE | False) __base_bash_libs_gh_class_include_value=0 ;;
-                    *) __base_bash_libs_gh_class_ambiguous_value=1 ;;
-                esac
-                ;;
-            --allow-escape-sequences | --paginate | --silent | --slurp | --verbose)
-                ;;
-            --allow-escape-sequences=* | --paginate=* | --silent=* | --slurp=* | --verbose=*)
-                __base_bash_libs_gh_class_bool="${__base_bash_libs_gh_class_token#*=}"
-                case "$__base_bash_libs_gh_class_bool" in
-                    0 | 1 | f | F | false | FALSE | False | \
-                        t | T | true | TRUE | True) ;;
-                    *) __base_bash_libs_gh_class_ambiguous_value=1 ;;
-                esac
-                ;;
-            --*)
-                __base_bash_libs_gh_class_ambiguous_value=1
-                ;;
-            -?*)
-                __base_bash_libs_gh_class_short="${__base_bash_libs_gh_class_token#-}"
-                while [[ -n "$__base_bash_libs_gh_class_short" ]]; do
-                    __base_bash_libs_gh_class_char="${__base_bash_libs_gh_class_short:0:1}"
-                    __base_bash_libs_gh_class_short="${__base_bash_libs_gh_class_short:1}"
-                    case "$__base_bash_libs_gh_class_char" in
-                        i)
-                            if [[ "$__base_bash_libs_gh_class_short" == =* ]]; then
-                                __base_bash_libs_gh_class_bool="${__base_bash_libs_gh_class_short#=}"
-                                __base_bash_libs_gh_class_short=""
-                                case "$__base_bash_libs_gh_class_bool" in
-                                    1 | t | T | true | TRUE | True) __base_bash_libs_gh_class_include_value=1 ;;
-                                    0 | f | F | false | FALSE | False) __base_bash_libs_gh_class_include_value=0 ;;
-                                    *) __base_bash_libs_gh_class_ambiguous_value=1 ;;
-                                esac
-                            else
-                                __base_bash_libs_gh_class_include_value=1
-                            fi
-                            ;;
-                        F | H | q | X | p | f | t)
-                            if [[ -n "$__base_bash_libs_gh_class_short" ]]; then
-                                __base_bash_libs_gh_class_value="$__base_bash_libs_gh_class_short"
-                                __base_bash_libs_gh_class_value="${__base_bash_libs_gh_class_value#= }"
-                                [[ "$__base_bash_libs_gh_class_short" == =* ]] &&
-                                    __base_bash_libs_gh_class_value="${__base_bash_libs_gh_class_short#=}"
-                                __base_bash_libs_gh_class_short=""
-                            elif (($#)); then
-                                __base_bash_libs_gh_class_value="$1"
-                                shift
-                            else
-                                __base_bash_libs_gh_class_value=""
-                                __base_bash_libs_gh_class_ambiguous_value=1
-                            fi
-                            case "$__base_bash_libs_gh_class_char" in
-                                X)
-                                    __base_bash_libs_gh_class_method_count=$((__base_bash_libs_gh_class_method_count + 1))
-                                    __base_bash_libs_gh_class_method_value="$__base_bash_libs_gh_class_value"
-                                    [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
-                                    ;;
-                                F)
-                                    __base_bash_libs_gh_class_field_seen=1
-                                    [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
-                                    if [[ "$__base_bash_libs_gh_class_value" == *=* ]]; then
-                                        __base_bash_libs_gh_class_field_payload="${__base_bash_libs_gh_class_value#*=}"
-                                    else
-                                        __base_bash_libs_gh_class_field_payload=""
-                                    fi
-                                    if [[ "$__base_bash_libs_gh_class_field_payload" == @* ]]; then
-                                        __base_bash_libs_gh_class_file_path="${__base_bash_libs_gh_class_field_payload#@}"
-                                        if __base_bash_libs_gh_api_path_is_stream__ "$__base_bash_libs_gh_class_file_path"; then
-                                            __base_bash_libs_gh_class_stdin_value=1
-                                        else
-                                            __base_bash_libs_gh_class_file_value=1
-                                        fi
-                                    fi
-                                    ;;
-                                f)
-                                    __base_bash_libs_gh_class_field_seen=1
-                                    [[ -n "$__base_bash_libs_gh_class_value" ]] || __base_bash_libs_gh_class_ambiguous_value=1
-                                    ;;
-                            esac
-                            break
-                            ;;
-                        *)
-                            __base_bash_libs_gh_class_ambiguous_value=1
-                            __base_bash_libs_gh_class_short=""
-                            ;;
                     esac
-                done
-                ;;
-            *)
-                __base_bash_libs_gh_class_endpoint_count=$((__base_bash_libs_gh_class_endpoint_count + 1))
-                ((__base_bash_libs_gh_class_endpoint_count == 1)) && __base_bash_libs_gh_class_endpoint="$__base_bash_libs_gh_class_token"
-                ;;
+                    break
+                    ;;
+                *)
+                    __base_bash_libs_gh_class_ambiguous_value=1
+                    __base_bash_libs_gh_class_short=""
+                    ;;
+                esac
+            done
+            ;;
+        *)
+            __base_bash_libs_gh_class_endpoint_count=$((__base_bash_libs_gh_class_endpoint_count + 1))
+            ((__base_bash_libs_gh_class_endpoint_count == 1)) && __base_bash_libs_gh_class_endpoint="$__base_bash_libs_gh_class_token"
+            ;;
         esac
     done
 
@@ -826,11 +824,11 @@ __base_bash_libs_gh_api_can_inject_include__() {
         __base_bash_libs_gh_inject_value=0
     for __base_bash_libs_gh_inject_token; do
         case "$__base_bash_libs_gh_inject_token" in
-            --include | --include=* | -i | -i=* | \
-                --paginate | --paginate=* | --slurp | --slurp=* | \
-                --verbose | --verbose=*)
-                __base_bash_libs_gh_inject_value=0
-                ;;
+        --include | --include=* | -i | -i=* | \
+            --paginate | --paginate=* | --slurp | --slurp=* | \
+            --verbose | --verbose=*)
+            __base_bash_libs_gh_inject_value=0
+            ;;
         esac
     done
     printf -v "$__base_bash_libs_gh_inject_result_name" '%s' "$__base_bash_libs_gh_inject_value"
@@ -843,15 +841,15 @@ __base_bash_libs_gh_api_unstructured_transport_is_safe__() {
 
     for __base_bash_libs_gh_transport_token; do
         case "$__base_bash_libs_gh_transport_token" in
-            --jq | --jq=* | --template | --template=* | --silent | --silent=true | \
-                --paginate | --paginate=true | --slurp | --slurp=true | \
-                --verbose | --verbose=true | -q | -q?* | -t | -t?*)
-                __base_bash_libs_gh_transport_value=0
-                ;;
+        --jq | --jq=* | --template | --template=* | --silent | --silent=true | \
+            --paginate | --paginate=true | --slurp | --slurp=true | \
+            --verbose | --verbose=true | -q | -q?* | -t | -t?*)
+            __base_bash_libs_gh_transport_value=0
+            ;;
         esac
     done
     case "${GH_DEBUG-}:${DEBUG-}" in
-        *api*) __base_bash_libs_gh_transport_value=0 ;;
+    *api*) __base_bash_libs_gh_transport_value=0 ;;
     esac
     printf -v "$__base_bash_libs_gh_transport_result_name" '%s' "$__base_bash_libs_gh_transport_value"
 }
@@ -863,7 +861,7 @@ __base_bash_libs_gh_api_replay_file__() {
         # A block exactly the size of the parsed header prefix makes POSIX dd
         # skip it without byte-at-a-time copying. Suppress dd's own EPIPE text;
         # the caller reports a channel-safe replay diagnostic.
-        command dd if="$__base_bash_libs_gh_replay_file" bs="$__base_bash_libs_gh_replay_prefix" skip=1 2>/dev/null
+        command dd if="$__base_bash_libs_gh_replay_file" bs="$__base_bash_libs_gh_replay_prefix" skip=1 2> /dev/null
     else
         command cat -- "$__base_bash_libs_gh_replay_file"
     fi
@@ -877,7 +875,7 @@ __base_bash_libs_gh_api_monotonic_seconds__() {
 
 __base_bash_libs_gh_api_epoch_seconds__() {
     local __base_bash_libs_gh_epoch_result_name="$1" __base_bash_libs_gh_epoch_value
-    __base_bash_libs_gh_epoch_value="$(command date +%s 2>/dev/null)" || return 1
+    __base_bash_libs_gh_epoch_value="$(command date +%s 2> /dev/null)" || return 1
     [[ "$__base_bash_libs_gh_epoch_value" =~ ^[0-9]+$ && ${#__base_bash_libs_gh_epoch_value} -le 12 ]] || return 1
     printf -v "$__base_bash_libs_gh_epoch_result_name" '%s' "$__base_bash_libs_gh_epoch_value"
 }
@@ -908,20 +906,20 @@ __base_bash_libs_gh_api_sleep__() {
     __base_bash_libs_gh_sleep_pid=$!
     __base_bash_libs_gh_api_active_sleep_pid="$__base_bash_libs_gh_sleep_pid"
     if ((__base_bash_libs_gh_api_cancel_status != 0)); then
-        kill -KILL "$__base_bash_libs_gh_sleep_pid" 2>/dev/null || true
-        wait "$__base_bash_libs_gh_sleep_pid" 2>/dev/null || true
+        kill -KILL "$__base_bash_libs_gh_sleep_pid" 2> /dev/null || true
+        wait "$__base_bash_libs_gh_sleep_pid" 2> /dev/null || true
         __base_bash_libs_gh_api_active_sleep_pid=""
         return "$__base_bash_libs_gh_api_cancel_status"
     fi
-    if wait "$__base_bash_libs_gh_sleep_pid" 2>/dev/null; then
+    if wait "$__base_bash_libs_gh_sleep_pid" 2> /dev/null; then
         __base_bash_libs_gh_sleep_status=0
     else
         __base_bash_libs_gh_sleep_status=$?
     fi
     __base_bash_libs_gh_api_active_sleep_pid=""
     if ((__base_bash_libs_gh_api_cancel_status != 0)); then
-        kill -KILL "$__base_bash_libs_gh_sleep_pid" 2>/dev/null || true
-        wait "$__base_bash_libs_gh_sleep_pid" 2>/dev/null || true
+        kill -KILL "$__base_bash_libs_gh_sleep_pid" 2> /dev/null || true
+        wait "$__base_bash_libs_gh_sleep_pid" 2> /dev/null || true
         return "$__base_bash_libs_gh_api_cancel_status"
     fi
     return "$__base_bash_libs_gh_sleep_status"
@@ -971,12 +969,12 @@ __base_bash_libs_gh_api_call_hook__() {
     local -a __base_bash_libs_gh_api_attempt_argv=()
 
     case "$__base_bash_libs_gh_hook_kind" in
-        attempt) __base_bash_libs_gh_api_attempt__ "$@" ;;
-        epoch) __base_bash_libs_gh_api_epoch_seconds__ "$@" ;;
-        jitter) __base_bash_libs_gh_api_jitter_seconds__ "$@" ;;
-        monotonic) __base_bash_libs_gh_api_monotonic_seconds__ "$@" ;;
-        sleep) __base_bash_libs_gh_api_sleep__ "$@" ;;
-        *) return 1 ;;
+    attempt) __base_bash_libs_gh_api_attempt__ "$@" ;;
+    epoch) __base_bash_libs_gh_api_epoch_seconds__ "$@" ;;
+    jitter) __base_bash_libs_gh_api_jitter_seconds__ "$@" ;;
+    monotonic) __base_bash_libs_gh_api_monotonic_seconds__ "$@" ;;
+    sleep) __base_bash_libs_gh_api_sleep__ "$@" ;;
+    *) return 1 ;;
     esac
 }
 
@@ -992,13 +990,13 @@ __base_bash_libs_gh_api_attempt__() {
     __base_bash_libs_std_run_once__ __base_bash_libs_gh_attempt_outcome \
         "$__base_bash_libs_gh_attempt_timeout" "$__base_bash_libs_gh_attempt_timeout_path" \
         "$__base_bash_libs_gh_attempt_number" gh api "$@" \
-        >|"$__base_bash_libs_gh_attempt_stdout" 2>|"$__base_bash_libs_gh_attempt_stderr"
+        >| "$__base_bash_libs_gh_attempt_stdout" 2>| "$__base_bash_libs_gh_attempt_stderr"
 }
 
 __base_bash_libs_gh_api_byte_length__() {
     local __base_bash_libs_gh_byte_result_name="$1" __base_bash_libs_gh_byte_value __base_bash_libs_gh_byte_count
 
-    __base_bash_libs_gh_byte_count="$(printf '%s' "$2" | command wc -c 2>/dev/null)" || return 1
+    __base_bash_libs_gh_byte_count="$(printf '%s' "$2" | command wc -c 2> /dev/null)" || return 1
     __base_bash_libs_gh_byte_count="${__base_bash_libs_gh_byte_count//[[:space:]]/}"
     [[ "$__base_bash_libs_gh_byte_count" =~ ^[0-9]{1,8}$ ]] || return 1
     __base_bash_libs_gh_byte_value="$((10#$__base_bash_libs_gh_byte_count))"
@@ -1012,20 +1010,20 @@ __base_bash_libs_gh_api_file_prefix_is_nul_free__() {
 
     [[ "$__base_bash_libs_gh_nul_bytes" =~ ^[1-9][0-9]{0,7}$ ]] || return 1
     __base_bash_libs_gh_nul_raw_count="$(
-        LC_ALL=C command dd if="$__base_bash_libs_gh_nul_file" bs="$__base_bash_libs_gh_nul_bytes" count=1 2>/dev/null |
-            LC_ALL=C command wc -c 2>/dev/null
+        LC_ALL=C command dd if="$__base_bash_libs_gh_nul_file" bs="$__base_bash_libs_gh_nul_bytes" count=1 2> /dev/null |
+            LC_ALL=C command wc -c 2> /dev/null
         __base_bash_libs_gh_nul_pipeline_status=("${PIPESTATUS[@]}")
-        ((__base_bash_libs_gh_nul_pipeline_status[0] == 0 &&
-            __base_bash_libs_gh_nul_pipeline_status[1] == 0)) || exit 1
+        ((__base_bash_libs_gh_nul_pipeline_status[0] == 0 && \
+        __base_bash_libs_gh_nul_pipeline_status[1] == 0)) || exit 1
     )" || return 1
     __base_bash_libs_gh_nul_clean_count="$(
-        LC_ALL=C command dd if="$__base_bash_libs_gh_nul_file" bs="$__base_bash_libs_gh_nul_bytes" count=1 2>/dev/null |
+        LC_ALL=C command dd if="$__base_bash_libs_gh_nul_file" bs="$__base_bash_libs_gh_nul_bytes" count=1 2> /dev/null |
             LC_ALL=C command tr -d '\000' |
-            LC_ALL=C command wc -c 2>/dev/null
+            LC_ALL=C command wc -c 2> /dev/null
         __base_bash_libs_gh_nul_pipeline_status=("${PIPESTATUS[@]}")
-        ((__base_bash_libs_gh_nul_pipeline_status[0] == 0 &&
-            __base_bash_libs_gh_nul_pipeline_status[1] == 0 &&
-            __base_bash_libs_gh_nul_pipeline_status[2] == 0)) || exit 1
+        ((__base_bash_libs_gh_nul_pipeline_status[0] == 0 && \
+        __base_bash_libs_gh_nul_pipeline_status[1] == 0 && \
+        __base_bash_libs_gh_nul_pipeline_status[2] == 0)) || exit 1
     )" || return 1
     __base_bash_libs_gh_nul_raw_count="${__base_bash_libs_gh_nul_raw_count//[[:space:]]/}"
     __base_bash_libs_gh_nul_clean_count="${__base_bash_libs_gh_nul_clean_count//[[:space:]]/}"
@@ -1040,11 +1038,11 @@ __base_bash_libs_gh_api_file_size__() {
 
     [[ -f "$__base_bash_libs_gh_size_file" ]] || return 1
     if __base_bash_libs_gh_size_value="$(
-        LC_ALL=C command stat -c '%s' "$__base_bash_libs_gh_size_file" 2>/dev/null
+        LC_ALL=C command stat -c '%s' "$__base_bash_libs_gh_size_file" 2> /dev/null
     )" && [[ "$__base_bash_libs_gh_size_value" =~ ^[0-9]{1,18}$ ]]; then
         :
     elif __base_bash_libs_gh_size_value="$(
-        LC_ALL=C command stat -f '%z' "$__base_bash_libs_gh_size_file" 2>/dev/null
+        LC_ALL=C command stat -f '%z' "$__base_bash_libs_gh_size_file" 2> /dev/null
     )" && [[ "$__base_bash_libs_gh_size_value" =~ ^[0-9]{1,18}$ ]]; then
         :
     else
@@ -1062,10 +1060,10 @@ __base_bash_libs_gh_api_file_is_nul_free__() {
     ((10#$__base_bash_libs_gh_nul_raw_count <= __base_bash_libs_gh_nul_max_bytes)) || return 1
     __base_bash_libs_gh_nul_clean_count="$(
         LC_ALL=C command tr -d '\000' < "$__base_bash_libs_gh_nul_file" |
-            LC_ALL=C command wc -c 2>/dev/null
+            LC_ALL=C command wc -c 2> /dev/null
         __base_bash_libs_gh_nul_pipeline_status=("${PIPESTATUS[@]}")
-        ((__base_bash_libs_gh_nul_pipeline_status[0] == 0 &&
-            __base_bash_libs_gh_nul_pipeline_status[1] == 0)) || exit 1
+        ((__base_bash_libs_gh_nul_pipeline_status[0] == 0 && \
+        __base_bash_libs_gh_nul_pipeline_status[1] == 0)) || exit 1
     )" || return 1
     __base_bash_libs_gh_nul_clean_count="${__base_bash_libs_gh_nul_clean_count//[[:space:]]/}"
     [[ "$__base_bash_libs_gh_nul_clean_count" =~ ^[0-9]{1,8}$ ]] || return 1
@@ -1157,46 +1155,46 @@ __base_bash_libs_gh_api_parse_headers__() {
             __base_bash_libs_gh_headers_value="${__base_bash_libs_gh_headers_value#"${__base_bash_libs_gh_headers_value%%[!$' \t']*}"}"
             __base_bash_libs_gh_headers_value="${__base_bash_libs_gh_headers_value%"${__base_bash_libs_gh_headers_value##*[!$' \t']}"}"
             case "$__base_bash_libs_gh_headers_name" in
-                retry-after)
-                    if [[ ! "$__base_bash_libs_gh_headers_value" =~ ^[0-9]+$ || ${#__base_bash_libs_gh_headers_value} -gt 10 ]]; then
-                        __base_bash_libs_gh_headers_invalid_value=1
-                    elif [[ -n "$__base_bash_libs_gh_headers_retry_value" &&
-                        "$__base_bash_libs_gh_headers_retry_value" != "$__base_bash_libs_gh_headers_value" ]]; then
+            retry-after)
+                if [[ ! "$__base_bash_libs_gh_headers_value" =~ ^[0-9]+$ || ${#__base_bash_libs_gh_headers_value} -gt 10 ]]; then
+                    __base_bash_libs_gh_headers_invalid_value=1
+                elif [[ -n "$__base_bash_libs_gh_headers_retry_value" &&
+                    "$__base_bash_libs_gh_headers_retry_value" != "$__base_bash_libs_gh_headers_value" ]]; then
+                    __base_bash_libs_gh_headers_invalid_value=1
+                else
+                    __base_bash_libs_gh_headers_retry_value="$((10#$__base_bash_libs_gh_headers_value))"
+                fi
+                ;;
+            x-ratelimit-remaining)
+                if [[ "$__base_bash_libs_gh_headers_value" =~ ^[0-9]+$ && ${#__base_bash_libs_gh_headers_value} -le 10 ]]; then
+                    __base_bash_libs_gh_headers_normalized="$((10#$__base_bash_libs_gh_headers_value))"
+                    if [[ -n "$__base_bash_libs_gh_headers_remaining_value" &&
+                        "$__base_bash_libs_gh_headers_remaining_value" != "$__base_bash_libs_gh_headers_normalized" ]]; then
                         __base_bash_libs_gh_headers_invalid_value=1
                     else
-                        __base_bash_libs_gh_headers_retry_value="$((10#$__base_bash_libs_gh_headers_value))"
+                        __base_bash_libs_gh_headers_remaining_value="$__base_bash_libs_gh_headers_normalized"
                     fi
-                    ;;
-                x-ratelimit-remaining)
-                    if [[ "$__base_bash_libs_gh_headers_value" =~ ^[0-9]+$ && ${#__base_bash_libs_gh_headers_value} -le 10 ]]; then
-                        __base_bash_libs_gh_headers_normalized="$((10#$__base_bash_libs_gh_headers_value))"
-                        if [[ -n "$__base_bash_libs_gh_headers_remaining_value" &&
-                            "$__base_bash_libs_gh_headers_remaining_value" != "$__base_bash_libs_gh_headers_normalized" ]]; then
-                            __base_bash_libs_gh_headers_invalid_value=1
-                        else
-                            __base_bash_libs_gh_headers_remaining_value="$__base_bash_libs_gh_headers_normalized"
-                        fi
-                    else
+                else
+                    __base_bash_libs_gh_headers_invalid_value=1
+                fi
+                ;;
+            x-ratelimit-reset)
+                if [[ "$__base_bash_libs_gh_headers_value" =~ ^[0-9]+$ && ${#__base_bash_libs_gh_headers_value} -le 12 ]]; then
+                    __base_bash_libs_gh_headers_normalized="$((10#$__base_bash_libs_gh_headers_value))"
+                    if [[ -n "$__base_bash_libs_gh_headers_reset_value" &&
+                        "$__base_bash_libs_gh_headers_reset_value" != "$__base_bash_libs_gh_headers_normalized" ]]; then
                         __base_bash_libs_gh_headers_invalid_value=1
-                    fi
-                    ;;
-                x-ratelimit-reset)
-                    if [[ "$__base_bash_libs_gh_headers_value" =~ ^[0-9]+$ && ${#__base_bash_libs_gh_headers_value} -le 12 ]]; then
-                        __base_bash_libs_gh_headers_normalized="$((10#$__base_bash_libs_gh_headers_value))"
-                        if [[ -n "$__base_bash_libs_gh_headers_reset_value" &&
-                            "$__base_bash_libs_gh_headers_reset_value" != "$__base_bash_libs_gh_headers_normalized" ]]; then
-                            __base_bash_libs_gh_headers_invalid_value=1
-                        else
-                            __base_bash_libs_gh_headers_reset_value="$__base_bash_libs_gh_headers_normalized"
-                        fi
                     else
-                        __base_bash_libs_gh_headers_invalid_value=1
+                        __base_bash_libs_gh_headers_reset_value="$__base_bash_libs_gh_headers_normalized"
                     fi
-                    ;;
+                else
+                    __base_bash_libs_gh_headers_invalid_value=1
+                fi
+                ;;
             esac
         done
         ((__base_bash_libs_gh_headers_terminated)) || __base_bash_libs_gh_headers_invalid_value=1
-    } 7<"$__base_bash_libs_gh_headers_file"
+    } 7< "$__base_bash_libs_gh_headers_file"
     ((__base_bash_libs_gh_headers_terminated)) || __base_bash_libs_gh_headers_bytes=0
     if ((__base_bash_libs_gh_headers_bytes > 0)) &&
         ! __base_bash_libs_gh_api_file_prefix_is_nul_free__ "$__base_bash_libs_gh_headers_file" \
@@ -1238,10 +1236,10 @@ __base_bash_libs_gh_api_parse_stderr__() {
                 break
             fi
             case "$__base_bash_libs_gh_stderr_lines" in
-                1) __base_bash_libs_gh_stderr_first="$__base_bash_libs_gh_stderr_line" ;;
-                2) __base_bash_libs_gh_stderr_second="$__base_bash_libs_gh_stderr_line" ;;
+            1) __base_bash_libs_gh_stderr_first="$__base_bash_libs_gh_stderr_line" ;;
+            2) __base_bash_libs_gh_stderr_second="$__base_bash_libs_gh_stderr_line" ;;
             esac
-        done 7<"$__base_bash_libs_gh_stderr_file"
+        done 7< "$__base_bash_libs_gh_stderr_file"
     fi
 
     # GitHub CLI renders HTTP/API response errors as `gh: ...`, so that
@@ -1251,23 +1249,22 @@ __base_bash_libs_gh_api_parse_stderr__() {
     # narrow transient suffix allowlist; extra/debug lines fail closed.
     if ((!__base_bash_libs_gh_stderr_invalid_value)) && ((__base_bash_libs_gh_stderr_lines == 2)) &&
         [[ "$__base_bash_libs_gh_stderr_first" =~ ^error\ connecting\ to\ ([A-Za-z0-9]([A-Za-z0-9.-]*[A-Za-z0-9])?)(:[0-9]{1,5})?$ ]] &&
-        [[ "$__base_bash_libs_gh_stderr_second" == \
-            "check your internet connection or https://githubstatus.com" ]]; then
+        [[ "$__base_bash_libs_gh_stderr_second" == "check your internet connection or https://githubstatus.com" ]]; then
         __base_bash_libs_gh_stderr_transport_value=1
     elif ((!__base_bash_libs_gh_stderr_invalid_value)) && ((__base_bash_libs_gh_stderr_lines == 1)) &&
         [[ "$__base_bash_libs_gh_stderr_first" =~ $__base_bash_libs_gh_stderr_url_error_re ]]; then
         __base_bash_libs_gh_stderr_detail="${BASH_REMATCH[2]}"
         __base_bash_libs_gh_stderr_lower="${__base_bash_libs_gh_stderr_detail,,}"
         case "$__base_bash_libs_gh_stderr_lower" in
-            "eof" | "unexpected eof" | "net/http: tls handshake timeout" | \
-                dial\ tcp\ *:\ connect:\ connection\ refused | \
-                dial\ tcp\ *:\ connect:\ network\ is\ unreachable | \
-                dial\ tcp\ *:\ connect:\ no\ route\ to\ host | \
-                read\ tcp\ *:\ read:\ connection\ reset\ by\ peer | \
-                write\ tcp\ *:\ write:\ connection\ reset\ by\ peer | \
-                *": i/o timeout" | *": connection timed out")
-                __base_bash_libs_gh_stderr_transport_value=1
-                ;;
+        "eof" | "unexpected eof" | "net/http: tls handshake timeout" | \
+            dial\ tcp\ *:\ connect:\ connection\ refused | \
+            dial\ tcp\ *:\ connect:\ network\ is\ unreachable | \
+            dial\ tcp\ *:\ connect:\ no\ route\ to\ host | \
+            read\ tcp\ *:\ read:\ connection\ reset\ by\ peer | \
+            write\ tcp\ *:\ write:\ connection\ reset\ by\ peer | \
+            *": i/o timeout" | *": connection timed out")
+            __base_bash_libs_gh_stderr_transport_value=1
+            ;;
         esac
     fi
 
@@ -1319,14 +1316,14 @@ __base_bash_libs_gh_api_failure_metadata__() {
         __base_bash_libs_gh_meta_retryable_value=0
     elif [[ -n "$__base_bash_libs_gh_meta_status" ]]; then
         case "$__base_bash_libs_gh_meta_status" in
-            408 | 425 | 429 | 500 | 502 | 503 | 504)
+        408 | 425 | 429 | 500 | 502 | 503 | 504)
+            __base_bash_libs_gh_meta_retryable_value=1
+            ;;
+        403)
+            if [[ -n "$__base_bash_libs_gh_meta_retry_after" || "$__base_bash_libs_gh_meta_remaining" == "0" ]]; then
                 __base_bash_libs_gh_meta_retryable_value=1
-                ;;
-            403)
-                if [[ -n "$__base_bash_libs_gh_meta_retry_after" || "$__base_bash_libs_gh_meta_remaining" == "0" ]]; then
-                    __base_bash_libs_gh_meta_retryable_value=1
-                fi
-                ;;
+            fi
+            ;;
         esac
     elif ((__base_bash_libs_gh_meta_transport && __base_bash_libs_gh_meta_transport_allowed)); then
         __base_bash_libs_gh_meta_retryable_value=1
@@ -1334,7 +1331,7 @@ __base_bash_libs_gh_api_failure_metadata__() {
 
     if ((__base_bash_libs_gh_meta_retryable_value)) && {
         [[ "$__base_bash_libs_gh_meta_status" == "429" || "$__base_bash_libs_gh_meta_status" == "403" ||
-            "$__base_bash_libs_gh_meta_remaining" == "0" ]];
+            "$__base_bash_libs_gh_meta_remaining" == "0" ]]
     }; then
         __base_bash_libs_gh_meta_rate_value=1
     fi
@@ -1357,7 +1354,7 @@ __base_bash_libs_gh_api_failure_metadata__() {
     fi
     if [[ -n "$__base_bash_libs_gh_meta_reset_delay" ]] && {
         [[ -z "$__base_bash_libs_gh_meta_delay_value" ]] ||
-            ((__base_bash_libs_gh_meta_reset_delay > __base_bash_libs_gh_meta_delay_value));
+            ((__base_bash_libs_gh_meta_reset_delay > __base_bash_libs_gh_meta_delay_value))
     }; then
         __base_bash_libs_gh_meta_delay_value="$__base_bash_libs_gh_meta_reset_delay"
     fi
@@ -1391,7 +1388,7 @@ __base_bash_libs_gh_api_cleanup_capture__() {
     local __base_bash_libs_gh_cleanup_path
     for __base_bash_libs_gh_cleanup_path in "$@"; do
         [[ -n "$__base_bash_libs_gh_cleanup_path" ]] || continue
-        command rm -f -- "$__base_bash_libs_gh_cleanup_path" 2>/dev/null || true
+        command rm -f -- "$__base_bash_libs_gh_cleanup_path" 2> /dev/null || true
     done
 }
 
@@ -1403,8 +1400,8 @@ __base_bash_libs_gh_api_cleanup_workspace__() {
         "$__base_bash_libs_gh_workspace_dir/stdout" \
         "$__base_bash_libs_gh_workspace_dir/stderr" \
         "$__base_bash_libs_gh_workspace_dir/guardian" \
-        "$__base_bash_libs_gh_workspace_dir/guardian.ready" 2>/dev/null || true
-    command rmdir -- "$__base_bash_libs_gh_workspace_dir" 2>/dev/null || true
+        "$__base_bash_libs_gh_workspace_dir/guardian.ready" 2> /dev/null || true
+    command rmdir -- "$__base_bash_libs_gh_workspace_dir" 2> /dev/null || true
 }
 
 __base_bash_libs_gh_api_start_capture_guardian__() {
@@ -1413,7 +1410,7 @@ __base_bash_libs_gh_api_start_capture_guardian__() {
     local __base_bash_libs_gh_guard_pid __base_bash_libs_gh_guard_fd __base_bash_libs_gh_guard_monitor_was_enabled=0
     local __base_bash_libs_gh_guard_probe
 
-    if ! exec {__base_bash_libs_gh_guard_fd}<>"$__base_bash_libs_gh_guard_workspace/guardian"; then
+    if ! exec {__base_bash_libs_gh_guard_fd}<> "$__base_bash_libs_gh_guard_workspace/guardian"; then
         return 1
     fi
     [[ $- == *m* ]] && __base_bash_libs_gh_guard_monitor_was_enabled=1
@@ -1428,7 +1425,7 @@ __base_bash_libs_gh_api_start_capture_guardian__() {
         # actual parent relationship reported for its own BASHPID. A recycled
         # owner PID cannot impersonate that relationship after reparenting.
         exec {__base_bash_libs_gh_guard_fd}>&-
-        if ! exec {__base_bash_libs_gh_guard_read_fd}<"$__base_bash_libs_gh_guard_workspace/guardian"; then
+        if ! exec {__base_bash_libs_gh_guard_read_fd}< "$__base_bash_libs_gh_guard_workspace/guardian"; then
             __base_bash_libs_gh_api_cleanup_workspace__ "$__base_bash_libs_gh_guard_workspace"
             exit 1
         fi
@@ -1445,22 +1442,22 @@ __base_bash_libs_gh_api_start_capture_guardian__() {
             __base_bash_libs_gh_guard_parent_pid=""
             if [[ -x /bin/ps ]]; then
                 __base_bash_libs_gh_guard_parent_pid="$(
-                    LC_ALL=C /bin/ps -o ppid= -p "$__base_bash_libs_gh_guard_self_pid" 2>/dev/null
+                    LC_ALL=C /bin/ps -o ppid= -p "$__base_bash_libs_gh_guard_self_pid" 2> /dev/null
                 )" || __base_bash_libs_gh_guard_parent_pid=""
             else
                 __base_bash_libs_gh_guard_parent_pid="$(
-                    LC_ALL=C command ps -o ppid= -p "$__base_bash_libs_gh_guard_self_pid" 2>/dev/null
+                    LC_ALL=C command ps -o ppid= -p "$__base_bash_libs_gh_guard_self_pid" 2> /dev/null
                 )" || __base_bash_libs_gh_guard_parent_pid=""
             fi
             __base_bash_libs_gh_guard_parent_pid="${__base_bash_libs_gh_guard_parent_pid//[[:space:]]/}"
             if [[ "$__base_bash_libs_gh_guard_parent_pid" =~ ^[1-9][0-9]*$ ]]; then
                 [[ "$__base_bash_libs_gh_guard_parent_pid" == "$__base_bash_libs_gh_guard_owner_pid" ]] || break
-            elif ! kill -0 "$__base_bash_libs_gh_guard_owner_pid" 2>/dev/null; then
+            elif ! kill -0 "$__base_bash_libs_gh_guard_owner_pid" 2> /dev/null; then
                 break
             fi
         done
         __base_bash_libs_gh_api_cleanup_workspace__ "$__base_bash_libs_gh_guard_workspace"
-    ) </dev/null >/dev/null 2>&1 &
+    ) < /dev/null > /dev/null 2>&1 &
     __base_bash_libs_gh_guard_pid=$!
     if ((__base_bash_libs_gh_guard_monitor_was_enabled)); then
         set -m
@@ -1469,12 +1466,12 @@ __base_bash_libs_gh_api_start_capture_guardian__() {
     fi
     for ((__base_bash_libs_gh_guard_probe = 0; __base_bash_libs_gh_guard_probe < 100; __base_bash_libs_gh_guard_probe++)); do
         [[ -e "$__base_bash_libs_gh_guard_workspace/guardian.ready" ]] && break
-        kill -0 "$__base_bash_libs_gh_guard_pid" 2>/dev/null || break
+        kill -0 "$__base_bash_libs_gh_guard_pid" 2> /dev/null || break
         __base_bash_libs_std_sleep_interval__ 0.01 || break
     done
     if [[ ! -e "$__base_bash_libs_gh_guard_workspace/guardian.ready" ]]; then
-        kill -KILL "$__base_bash_libs_gh_guard_pid" 2>/dev/null || true
-        wait "$__base_bash_libs_gh_guard_pid" 2>/dev/null || true
+        kill -KILL "$__base_bash_libs_gh_guard_pid" 2> /dev/null || true
+        wait "$__base_bash_libs_gh_guard_pid" 2> /dev/null || true
         exec {__base_bash_libs_gh_guard_fd}>&-
         return 1
     fi
@@ -1486,17 +1483,17 @@ __base_bash_libs_gh_api_stop_capture_guardian__() {
     local __base_bash_libs_gh_guard_pid="${1-}" __base_bash_libs_gh_guard_fd="${2-}"
 
     if [[ "$__base_bash_libs_gh_guard_fd" =~ ^[1-9][0-9]*$ ]]; then
-        { printf 'stop\n' 1>&"$__base_bash_libs_gh_guard_fd"; } 2>/dev/null || true
+        { printf 'stop\n' 1>&"$__base_bash_libs_gh_guard_fd"; } 2> /dev/null || true
         exec {__base_bash_libs_gh_guard_fd}>&-
     fi
     if [[ "$__base_bash_libs_gh_guard_pid" =~ ^[1-9][0-9]*$ ]]; then
         # `wait` can reap only this shell's child, so a guardian that has
         # already exited can never turn a recycled PID into a signal target.
-        while kill -0 "$__base_bash_libs_gh_guard_pid" 2>/dev/null; do
-            wait "$__base_bash_libs_gh_guard_pid" 2>/dev/null && break
-            kill -0 "$__base_bash_libs_gh_guard_pid" 2>/dev/null || break
+        while kill -0 "$__base_bash_libs_gh_guard_pid" 2> /dev/null; do
+            wait "$__base_bash_libs_gh_guard_pid" 2> /dev/null && break
+            kill -0 "$__base_bash_libs_gh_guard_pid" 2> /dev/null || break
         done
-        wait "$__base_bash_libs_gh_guard_pid" 2>/dev/null || true
+        wait "$__base_bash_libs_gh_guard_pid" 2> /dev/null || true
     fi
 }
 
@@ -1531,8 +1528,8 @@ __base_bash_libs_gh_api_finish__() {
     fi
 
     case "$__base_bash_libs_gh_finish_method" in
-        GET | HEAD | OPTIONS | POST | PUT | PATCH | DELETE) ;;
-        *) __base_bash_libs_gh_finish_method=OTHER ;;
+    GET | HEAD | OPTIONS | POST | PUT | PATCH | DELETE) ;;
+    *) __base_bash_libs_gh_finish_method=OTHER ;;
     esac
     [[ "$__base_bash_libs_gh_finish_http" =~ ^[0-9]{3}$ ]] || __base_bash_libs_gh_finish_http=unknown
     [[ "$__base_bash_libs_gh_finish_elapsed" =~ ^[0-9]+$ ]] || __base_bash_libs_gh_finish_elapsed=unknown
@@ -1613,11 +1610,11 @@ __base_bash_libs_gh_api_with_retry_impl__() {
     __base_bash_libs_gh_parse_api_controls__ __base_bash_libs_gh_api_consumed __base_bash_libs_gh_api_sensitive \
         __base_bash_libs_gh_api_safe_display __base_bash_libs_gh_api_policy __base_bash_libs_gh_api_max_attempts \
         __base_bash_libs_gh_api_max_elapsed __base_bash_libs_gh_api_attempt_timeout __base_bash_libs_gh_api_base_delay \
-        __base_bash_libs_gh_api_max_delay "$@" || return 1
+        __base_bash_libs_gh_api_max_delay "$@" || return $?
     ((__base_bash_libs_gh_api_consumed == 0)) || shift "$__base_bash_libs_gh_api_consumed"
     if (($# == 0)); then
         __base_bash_libs_gh_api_controls_usage__
-        return 1
+        return 2
     fi
 
     base_gh_require_cli || return 1
@@ -1625,19 +1622,19 @@ __base_bash_libs_gh_api_with_retry_impl__() {
         __base_bash_libs_gh_api_file __base_bash_libs_gh_api_graphql __base_bash_libs_gh_api_ambiguous "$@"
 
     case "$__base_bash_libs_gh_api_policy" in
-        never)
-            __base_bash_libs_gh_api_retry_authorized=0
-            ;;
-        replay-safe)
-            ((__base_bash_libs_gh_api_stdin == 0)) && __base_bash_libs_gh_api_retry_authorized=1
-            ;;
-        read-only)
-            if ((!__base_bash_libs_gh_api_stdin && !__base_bash_libs_gh_api_file && !__base_bash_libs_gh_api_graphql && !__base_bash_libs_gh_api_ambiguous)); then
-                case "$__base_bash_libs_gh_api_method" in
-                    GET | HEAD | OPTIONS) __base_bash_libs_gh_api_retry_authorized=1 ;;
-                esac
-            fi
-            ;;
+    never)
+        __base_bash_libs_gh_api_retry_authorized=0
+        ;;
+    replay-safe)
+        ((__base_bash_libs_gh_api_stdin == 0)) && __base_bash_libs_gh_api_retry_authorized=1
+        ;;
+    read-only)
+        if ((!__base_bash_libs_gh_api_stdin && !__base_bash_libs_gh_api_file && !__base_bash_libs_gh_api_graphql && !__base_bash_libs_gh_api_ambiguous)); then
+            case "$__base_bash_libs_gh_api_method" in
+            GET | HEAD | OPTIONS) __base_bash_libs_gh_api_retry_authorized=1 ;;
+            esac
+        fi
+        ;;
     esac
 
     __base_bash_libs_gh_api_attempt_argv=("$@")
@@ -1667,9 +1664,9 @@ __base_bash_libs_gh_api_with_retry_impl__() {
     __base_bash_libs_std_make_internal_temp_dir__ --keep __base_bash_libs_gh_api_capture_workspace \
         base-bash-libs-gh-api || return 1
     __base_bash_libs_gh_api_owned_workspace="$__base_bash_libs_gh_api_capture_workspace"
-    if ! command chmod 700 "$__base_bash_libs_gh_api_owned_workspace" 2>/dev/null ||
-        ! command mkfifo "$__base_bash_libs_gh_api_owned_workspace/guardian" 2>/dev/null ||
-        ! command chmod 600 "$__base_bash_libs_gh_api_owned_workspace/guardian" 2>/dev/null; then
+    if ! command chmod 700 "$__base_bash_libs_gh_api_owned_workspace" 2> /dev/null ||
+        ! command mkfifo "$__base_bash_libs_gh_api_owned_workspace/guardian" 2> /dev/null ||
+        ! command chmod 600 "$__base_bash_libs_gh_api_owned_workspace/guardian" 2> /dev/null; then
         __base_bash_libs_gh_api_cleanup_workspace__ "$__base_bash_libs_gh_api_owned_workspace"
         base_std_log_error -l base_bash_libs.gh \
             "base_gh_api_with_retry: could not secure the retry capture workspace."
@@ -1684,9 +1681,9 @@ __base_bash_libs_gh_api_with_retry_impl__() {
     fi
     __base_bash_libs_gh_api_stdout="$__base_bash_libs_gh_api_owned_workspace/stdout"
     __base_bash_libs_gh_api_stderr="$__base_bash_libs_gh_api_owned_workspace/stderr"
-    if ! : > "$__base_bash_libs_gh_api_stdout" 2>/dev/null ||
-        ! : > "$__base_bash_libs_gh_api_stderr" 2>/dev/null ||
-        ! command chmod 600 "$__base_bash_libs_gh_api_stdout" "$__base_bash_libs_gh_api_stderr" 2>/dev/null; then
+    if ! : > "$__base_bash_libs_gh_api_stdout" 2> /dev/null ||
+        ! : > "$__base_bash_libs_gh_api_stderr" 2> /dev/null ||
+        ! command chmod 600 "$__base_bash_libs_gh_api_stdout" "$__base_bash_libs_gh_api_stderr" 2> /dev/null; then
         __base_bash_libs_gh_api_cleanup_workspace__ "$__base_bash_libs_gh_api_owned_workspace"
         base_std_log_error -l base_bash_libs.gh \
             "base_gh_api_with_retry: could not secure retry capture files."
@@ -1840,7 +1837,7 @@ __base_bash_libs_gh_api_with_retry_impl__() {
             __base_bash_libs_gh_api_reason=""
         fi
 
-        if ((__base_bash_libs_gh_api_metadata_invalid || !__base_bash_libs_gh_api_retryable || !__base_bash_libs_gh_api_retry_authorized ||
+        if ((__base_bash_libs_gh_api_metadata_invalid || !__base_bash_libs_gh_api_retryable || !__base_bash_libs_gh_api_retry_authorized || \
             __base_bash_libs_gh_api_attempt >= __base_bash_libs_gh_api_max_attempts)); then
             __base_bash_libs_gh_api_finish__ "$__base_bash_libs_gh_api_status" "$__base_bash_libs_gh_api_stdout" "$__base_bash_libs_gh_api_stderr" \
                 "$__base_bash_libs_gh_api_sensitive" "$__base_bash_libs_gh_api_display" "$__base_bash_libs_gh_api_attempt" \
@@ -1968,8 +1965,8 @@ base_gh_api_with_retry() {
         __base_bash_libs_gh_api_public_status="$__base_bash_libs_gh_api_cancel_status"
     fi
     if [[ -n "$__base_bash_libs_gh_api_active_sleep_pid" ]]; then
-        kill -KILL "$__base_bash_libs_gh_api_active_sleep_pid" 2>/dev/null || true
-        wait "$__base_bash_libs_gh_api_active_sleep_pid" 2>/dev/null || true
+        kill -KILL "$__base_bash_libs_gh_api_active_sleep_pid" 2> /dev/null || true
+        wait "$__base_bash_libs_gh_api_active_sleep_pid" 2> /dev/null || true
     fi
     __base_bash_libs_gh_api_stop_capture_guardian__ "$__base_bash_libs_gh_api_guardian_pid" \
         "$__base_bash_libs_gh_api_guardian_fd"
@@ -1990,13 +1987,13 @@ base_gh_api_with_retry() {
     [[ -z "$__base_bash_libs_gh_api_saved_term_trap" ]] || eval "$__base_bash_libs_gh_api_saved_term_trap"
 
     case "$__base_bash_libs_gh_api_cancel_signal" in
-        HUP | INT | QUIT | TERM)
-            # Cleanup is complete and the exact caller disposition is active
-            # again. Re-delivery preserves default termination and invokes
-            # custom handlers; an explicitly ignored signal was never
-            # intercepted above.
-            kill "-$__base_bash_libs_gh_api_cancel_signal" "$BASHPID" 2>/dev/null || true
-            ;;
+    HUP | INT | QUIT | TERM)
+        # Cleanup is complete and the exact caller disposition is active
+        # again. Re-delivery preserves default termination and invokes
+        # custom handlers; an explicitly ignored signal was never
+        # intercepted above.
+        kill "-$__base_bash_libs_gh_api_cancel_signal" "$BASHPID" 2> /dev/null || true
+        ;;
     esac
     return "$__base_bash_libs_gh_api_public_status"
 }
diff --git a/lib/bash/gh/tests/lib_gh.bats b/lib/bash/gh/tests/lib_gh.bats
index efdaea8..8aee830 100644
--- a/lib/bash/gh/tests/lib_gh.bats
+++ b/lib/bash/gh/tests/lib_gh.bats
@@ -173,7 +173,7 @@ gh_api_retry_observed() {
                 exit "$rc"
             ' bash "$mode" "$BASE_BASH_DIR/std/lib_std.sh" "$BASE_BASH_DIR/gh/lib_gh.sh" "$function_name"
 
-            [ "$status" -eq 1 ]
+            [ "$status" -eq 2 ]
             [[ "$output" == *"Usage:"* ]]
             [[ "$output" != *"unbound variable"* ]]
         done
@@ -182,27 +182,27 @@ gh_api_retry_observed() {
 
 @test "GitHub optional forms reject excess arguments and invalid values" {
     capture_command base_gh_require_cli one two
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_gh_require_cli [install_hint]"* ]]
 
     capture_command base_gh_auth_status_diagnostics one two
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_gh_auth_status_diagnostics [login_hint]"* ]]
 
     capture_command base_gh_infer_repo_from_origin repo result --required
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_gh_infer_repo_from_origin <repo_dir> <result_variable_name> [--optional]"* ]]
 
     capture_command base_gh_report_command_failure invalid issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_gh_report_command_failure <status> [gh args...]"* ]]
 
     capture_command base_gh_report_command_failure 0 issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_gh_report_command_failure <status> [gh args...]"* ]]
 
     capture_command base_gh_report_command_failure 256 issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_gh_report_command_failure <status> [gh args...]"* ]]
 }
 
@@ -218,45 +218,45 @@ exit 0
 EOF
 
     capture_command base_gh_run --sensitive "--opaque=$secret" -- issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"protected diagnostic controls must end with --"* ]]
     [[ "$output" != *"$secret"* ]]
 
     capture_command base_gh_api_with_retry --safe-display "safe API operation" -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"--safe-display is valid only with --sensitive"* ]]
 
     capture_command base_gh_run --sensitive --safe-display "--token=$secret" -- issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"one non-empty printable ASCII label"* ]]
     [[ "$output" != *"$secret"* ]]
 
     capture_command base_gh_run --sensitive --safe-display "-H$secret" -- issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"one non-empty printable ASCII label"* ]]
     [[ "$output" != *"$secret"* ]]
 
     capture_command base_gh_api_with_retry --sensitive --safe-display "-fsecret=$secret" -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"one non-empty printable ASCII label"* ]]
     [[ "$output" != *"$secret"* ]]
 
     capture_command base_gh_run --sensitive --safe-display "$unicode_label" -- issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"one non-empty printable ASCII label"* ]]
     [[ "$output" != *"unicode-label-canary"* ]]
 
     capture_command base_gh_report_command_failure --sensitive 77 issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"protected diagnostic controls must end with --"* ]]
 
     capture_command base_gh_report_command_failure --sensitive -- "status=$secret" issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_gh_report_command_failure"* ]]
     [[ "$output" != *"$secret"* ]]
 
     capture_command base_gh_run --sensitive --safe-display $'unsafe\nparser-secret' -- issue list
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"one non-empty printable ASCII label"* ]]
     [[ "$output" != *"parser-secret"* ]]
     [ ! -e "$invocation_file" ]
@@ -365,7 +365,7 @@ EOF
         rc=$?
     fi
 
-    [ "$rc" -eq 1 ]
+    [ "$rc" -eq 2 ]
     [ "$repo" = "sentinel" ]
     [[ "$(cat "$stderr_file")" == *"result variable 'repo' is readonly"* ]]
 }
@@ -383,7 +383,7 @@ EOF
     else
         rc=$?
     fi
-    [ "$rc" -eq 1 ]
+    [ "$rc" -eq 2 ]
     [ "$parsed" = "keep-parsed" ]
 
     if base_gh_infer_repo_from_origin . __base_bash_libs_gh_infer_result_name --optional 2>"$stderr_file"; then
@@ -391,7 +391,7 @@ EOF
     else
         rc=$?
     fi
-    [ "$rc" -eq 1 ]
+    [ "$rc" -eq 2 ]
     [ "$inferred" = "keep-inferred" ]
 
     if base_gh_repo_default_branch owner/project __base_bash_libs_gh_repo_result_name 2>"$stderr_file"; then
@@ -399,7 +399,7 @@ EOF
     else
         rc=$?
     fi
-    [ "$rc" -eq 1 ]
+    [ "$rc" -eq 2 ]
     [ "$defaulted" = "keep-defaulted" ]
     [[ "$(cat "$stderr_file")" == *"uses the reserved '__' internal namespace"* ]]
     [[ "$(cat "$stderr_file")" != *"readonly variable"* ]]
@@ -670,22 +670,22 @@ EOF
 
     bats_run base_gh_repo_from_remote_url "https://example.com/owner/repo.git" repo
 
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [ "$repo" = "sentinel" ]
 
     bats_run base_gh_repo_from_remote_url "https://github.com/owner" repo
 
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [ "$repo" = "sentinel" ]
 
     bats_run base_gh_repo_from_remote_url "ssh://git@github.com//repo.git" repo
 
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [ "$repo" = "sentinel" ]
 
     bats_run base_gh_repo_from_remote_url "https://github.com/owner/repo?query=1" repo
 
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [ "$repo" = "sentinel" ]
 }
 
@@ -840,23 +840,23 @@ EOF
     }
 
     capture_command base_gh_api_with_retry --retry-policy "$secret" -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" != *"$secret"* ]]
 
     capture_command base_gh_api_with_retry --max-attempts 0 -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     capture_command base_gh_api_with_retry --max-attempts 2 --max-attempts 3 -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     capture_command base_gh_api_with_retry --base-delay-seconds 5 --max-delay-seconds 4 -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     capture_command base_gh_api_with_retry --attempt-timeout-seconds 601 -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     capture_command base_gh_api_with_retry --max-elapsed-seconds 3601 -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     capture_command base_gh_api_with_retry --retry-policy read-only repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     capture_command base_gh_api_with_retry --safe-display "safe operation" -- repos/owner/repo
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [ ! -e "$invocation_file" ]
 }
 
diff --git a/lib/bash/git/README.md b/lib/bash/git/README.md
index 9a65bfd..3870ecb 100644
--- a/lib/bash/git/README.md
+++ b/lib/bash/git/README.md
@@ -51,9 +51,11 @@ base_std_log_info "Current branch: $branch"
 ## Behavior Notes
 
 - Public functions validate the documented argument count before expanding
-  required positional parameters. Invalid calls return `1`, including when the
-  caller has enabled `nounset`; extra arguments are rejected unless the
-  signature explicitly accepts them.
+  required positional parameters. Usage and contract errors return `2`,
+  including when the caller has enabled `nounset`; recoverable Git failures and
+  false predicates return `1` unless the function documents a more specific
+  status. Extra arguments are rejected unless the signature explicitly accepts
+  them.
 - The library does not change the caller's `errexit`, `nounset`, `pipefail`,
   `shopt`, `IFS`, `OPTIND`, cwd, umask, traps, or positional parameters.
   Parsing that requires field splitting uses a command-scoped `IFS`, so a
@@ -83,11 +85,11 @@ base_std_log_info "Current branch: $branch"
 | Status | Meaning |
 | ---: | --- |
 | `0` | Current or ahead of upstream, or an explicit non-error skip state. |
-| `1` | Invalid usage. |
-| `2` | Behind upstream; the script may be stale. |
+| `1` | Operational failure while discovering metadata, inspecting changes, fetching, or comparing revisions. |
+| `2` | Invalid usage or contract. |
 | `3` | The tracked script has local modifications. This takes precedence over a successful current, ahead, behind, or diverged comparison, and over documented skip states. |
-| `4` | The repository has diverged from upstream. |
-| `5` | Operational failure while discovering repository metadata, inspecting changes, fetching, or comparing revisions. Freshness is unknown. |
+| `4` | Behind upstream; the script may be stale. |
+| `5` | The repository has diverged from upstream. |
 
 Operational failures take precedence over the dirty status because the result
 cannot be trusted. Every status is accompanied by an explicit diagnostic, and
diff --git a/lib/bash/git/lib_git.sh b/lib/bash/git/lib_git.sh
index 6f64250..7269093 100644
--- a/lib/bash/git/lib_git.sh
+++ b/lib/bash/git/lib_git.sh
@@ -46,9 +46,9 @@ __base_bash_libs_git_detect_default_branch__() {
 base_git_detect_default_branch() {
     if (($# != 2)); then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_detect_default_branch <repo_dir> <result_variable_name>"
-        return 1
+        return 2
     fi
-    __base_bash_libs_std_assert_public_variable_names__ base_git_detect_default_branch "${2-}" || return 1
+    __base_bash_libs_std_assert_public_variable_names__ base_git_detect_default_branch "${2-}" || return 2
 
     local __base_bash_libs_git_detect_repo_dir="$1"
     local __base_bash_libs_git_detect_result_name="$2"
@@ -56,10 +56,10 @@ base_git_detect_default_branch() {
 
     if [[ -z "$__base_bash_libs_git_detect_repo_dir" || -z "$__base_bash_libs_git_detect_result_name" ]]; then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_detect_default_branch <repo_dir> <result_variable_name>"
-        return 1
+        return 2
     fi
-    base_std_assert_variable_name "$__base_bash_libs_git_detect_result_name" || return 1
-    __base_bash_libs_std_assert_writable_output__ base_git_detect_default_branch "$__base_bash_libs_git_detect_result_name" || return 1
+    base_std_assert_variable_name "$__base_bash_libs_git_detect_result_name" || return 2
+    __base_bash_libs_std_assert_writable_output__ base_git_detect_default_branch "$__base_bash_libs_git_detect_result_name" || return 2
 
     if __base_bash_libs_git_detect_branch="$(__base_bash_libs_git_detect_default_branch__ "$__base_bash_libs_git_detect_repo_dir")"; then
         printf -v "$__base_bash_libs_git_detect_result_name" '%s' "$__base_bash_libs_git_detect_branch"
@@ -72,7 +72,7 @@ base_git_detect_default_branch() {
 base_git_worktree_path_for_branch() {
     if (($# < 1 || $# > 2)); then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_worktree_path_for_branch <branch> [repo_dir]"
-        return 1
+        return 2
     fi
 
     local branch="$1"
@@ -83,7 +83,7 @@ base_git_worktree_path_for_branch() {
 
     [[ -n "$branch" ]] || {
         base_std_log_error -l base_bash_libs.git "Usage: base_git_worktree_path_for_branch <branch> [repo_dir]"
-        return 1
+        return 2
     }
 
     [[ -z "$repo_dir" ]] || git_cmd=(git -C "$repo_dir")
@@ -112,7 +112,7 @@ base_git_worktree_path_for_branch() {
 base_git_list_worktree_branches() {
     if (($# > 1)); then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_list_worktree_branches [repo_dir]"
-        return 1
+        return 2
     fi
 
     local repo_dir="${1:-}"
@@ -149,7 +149,7 @@ base_git_list_worktree_branches() {
 base_git_branch_upstream() {
     if (($# != 2)); then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_branch_upstream <repo_dir> <branch>"
-        return 1
+        return 2
     fi
 
     local repo_dir="$1"
@@ -157,7 +157,7 @@ base_git_branch_upstream() {
 
     if [[ -z "$repo_dir" || -z "$branch" ]]; then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_branch_upstream <repo_dir> <branch>"
-        return 1
+        return 2
     fi
 
     git -C "$repo_dir" for-each-ref --format='%(upstream:short)' "refs/heads/$branch"
@@ -166,7 +166,7 @@ base_git_branch_upstream() {
 base_git_branch_merged_to_ref() {
     if (($# != 3)); then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_branch_merged_to_ref <repo_dir> <branch> <ref>"
-        return 1
+        return 2
     fi
 
     local repo_dir="$1"
@@ -175,7 +175,7 @@ base_git_branch_merged_to_ref() {
 
     if [[ -z "$repo_dir" || -z "$branch" || -z "$ref" ]]; then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_branch_merged_to_ref <repo_dir> <branch> <ref>"
-        return 1
+        return 2
     fi
 
     git -C "$repo_dir" merge-base --is-ancestor "refs/heads/$branch" "$ref" > /dev/null 2>&1
@@ -184,7 +184,7 @@ base_git_branch_merged_to_ref() {
 base_git_list_remote_branches() {
     if (($# > 1)); then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_list_remote_branches [repo_dir]"
-        return 1
+        return 2
     fi
 
     local repo_dir="${1:-.}"
@@ -344,7 +344,7 @@ __base_bash_libs_git_pull_with_retry__() {
 base_git_update_repo() {
     if (($# < 1 || $# > 3)); then
         base_std_log_info -l base_bash_libs.git "Usage: base_git_update_repo /path/to/repo [allowed_dirty_path] [expected_branch]"
-        return 1
+        return 2
     fi
 
     local git_repo="$1"
@@ -355,7 +355,7 @@ base_git_update_repo() {
     if [[ -z "$git_repo" ]]; then
         base_std_log_error -l base_bash_libs.git "No git repository path provided."
         base_std_log_info -l base_bash_libs.git "Usage: base_git_update_repo /path/to/repo [allowed_dirty_path] [expected_branch]"
-        return 1
+        return 2
     fi
 
     if [[ ! -d "$git_repo" ]]; then
@@ -453,9 +453,9 @@ base_git_update_repo() {
 base_git_get_current_branch() {
     if (($# != 2)); then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_get_current_branch <directory> <result_variable_name>"
-        return 1
+        return 2
     fi
-    __base_bash_libs_std_assert_public_variable_names__ base_git_get_current_branch "${2-}" || return 1
+    __base_bash_libs_std_assert_public_variable_names__ base_git_get_current_branch "${2-}" || return 2
 
     local __base_bash_libs_git_branch_target_dir="$1"
     local __base_bash_libs_git_branch_result_name="$2"
@@ -463,13 +463,13 @@ base_git_get_current_branch() {
     # --- Argument Validation ---
     if [[ -z "$__base_bash_libs_git_branch_target_dir" || -z "$__base_bash_libs_git_branch_result_name" ]]; then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_get_current_branch <directory> <result_variable_name>"
-        return 1
+        return 2
     fi
     if ! __base_bash_libs_std_is_valid_variable_name__ "$__base_bash_libs_git_branch_result_name"; then
         base_std_log_error -l base_bash_libs.git "base_git_get_current_branch: result variable name must be a valid Bash variable name."
-        return 1
+        return 2
     fi
-    __base_bash_libs_std_assert_writable_output__ base_git_get_current_branch "$__base_bash_libs_git_branch_result_name" || return 1
+    __base_bash_libs_std_assert_writable_output__ base_git_get_current_branch "$__base_bash_libs_git_branch_result_name" || return 2
 
     printf -v "$__base_bash_libs_git_branch_result_name" '%s' ""
 
@@ -508,12 +508,12 @@ base_git_get_current_branch() {
 #   - 0 if the repository is current or ahead, or the check is skipped for a
 #     documented non-error state (missing git, not a repo, untracked script,
 #     detached HEAD, or missing upstream).
-#   - 1 on invalid usage.
-#   - 2 if the repository is behind its upstream (the script may be stale).
+#   - 1 if Git metadata, diff, fetch, or comparison commands fail.
+#   - 2 on invalid usage.
 #   - 3 if the script has local modifications and the comparison completed or
 #     was skipped for a documented non-error state.
-#   - 4 if the repository has diverged from its upstream.
-#   - 5 if Git metadata, diff, fetch, or comparison commands fail.
+#   - 4 if the repository is behind its upstream (the script may be stale).
+#   - 5 if the repository has diverged from its upstream.
 #
 # Status precedence:
 #   - A dirty script takes precedence over a successful comparison, including
@@ -532,13 +532,13 @@ base_git_check_script_up_to_date() {
     if (($# == 2)); then
         if [[ "$1" != "--fetch" ]]; then
             base_std_log_error -l base_bash_libs.git "Usage: base_git_check_script_up_to_date [--fetch] <script_path>"
-            return 1
+            return 2
         fi
         fetch_before_check=true
         shift
     elif (($# != 1)) || [[ "$1" == "--fetch" ]]; then
         base_std_log_error -l base_bash_libs.git "Usage: base_git_check_script_up_to_date [--fetch] <script_path>"
-        return 1
+        return 2
     fi
     script_path="$1"
 
@@ -555,7 +555,7 @@ base_git_check_script_up_to_date() {
     local script_dir repo_root prefix rel_path
     script_dir=$(dirname -- "$script_path") || {
         base_std_log_error -l base_bash_libs.git "Unable to resolve the script directory for '$script_path'."
-        return 5
+        return 1
     }
 
     local repo_probe repo_probe_status
@@ -572,7 +572,7 @@ base_git_check_script_up_to_date() {
             return 0
         fi
         base_std_log_error -l base_bash_libs.git "Unable to discover the Git repository for '$script_path' (git status $repo_probe_status)."
-        return 5
+        return 1
     fi
 
     local repo_root_status
@@ -581,7 +581,7 @@ base_git_check_script_up_to_date() {
     else
         repo_root_status=$?
         base_std_log_error -l base_bash_libs.git "Unable to resolve the Git repository root for '$script_path' (git status $repo_root_status)."
-        return 5
+        return 1
     fi
     local prefix_status
     if prefix=$(git -C "$script_dir" rev-parse --show-prefix 2> /dev/null); then
@@ -589,7 +589,7 @@ base_git_check_script_up_to_date() {
     else
         prefix_status=$?
         base_std_log_error -l base_bash_libs.git "Unable to resolve the repo-relative path for '$script_path' (git status $prefix_status)."
-        return 5
+        return 1
     fi
     rel_path="${prefix}$(basename -- "$script_path")"
 
@@ -607,7 +607,7 @@ base_git_check_script_up_to_date() {
         ;;
     *)
         base_std_log_error -l base_bash_libs.git "Unable to determine whether '$rel_path' is tracked (git status $tracked_status)."
-        return 5
+        return 1
         ;;
     esac
 
@@ -624,7 +624,7 @@ base_git_check_script_up_to_date() {
         ;;
     *)
         base_std_log_error -l base_bash_libs.git "Unable to inspect working-tree changes for '$rel_path' (git status $diff_status)."
-        return 5
+        return 1
         ;;
     esac
     if git -C "$repo_root" diff --cached --quiet -- "$rel_path"; then
@@ -639,7 +639,7 @@ base_git_check_script_up_to_date() {
         ;;
     *)
         base_std_log_error -l base_bash_libs.git "Unable to inspect staged changes for '$rel_path' (git status $diff_status)."
-        return 5
+        return 1
         ;;
     esac
     if [[ "$dirty" == true ]]; then
@@ -657,7 +657,7 @@ base_git_check_script_up_to_date() {
             return 0
         fi
         base_std_log_error -l base_bash_libs.git "Unable to determine the current Git branch (git status $branch_status)."
-        return 5
+        return 1
     fi
 
     local upstream upstream_result upstream_status
@@ -672,11 +672,11 @@ base_git_check_script_up_to_date() {
             return 0
         fi
         base_std_log_error -l base_bash_libs.git "Unable to resolve the upstream for '$branch_name' (git status $upstream_status)."
-        return 5
+        return 1
     fi
     if [[ -z "$upstream" || "$upstream" == *$'\n'* ]]; then
         base_std_log_error -l base_bash_libs.git "Git returned an invalid upstream for '$branch_name'."
-        return 5
+        return 1
     fi
 
     if [[ "$fetch_before_check" == true ]]; then
@@ -684,7 +684,7 @@ base_git_check_script_up_to_date() {
             base_std_log_info -l base_bash_libs.git "Fetched upstream state before latest-version check."
         else
             base_std_log_error -l base_bash_libs.git "Unable to fetch upstream state for '$upstream'; freshness is unknown."
-            return 5
+            return 1
         fi
     else
         base_std_log_debug -l base_bash_libs.git "Using local remote-tracking refs; pass --fetch for a live remote check."
@@ -696,29 +696,29 @@ base_git_check_script_up_to_date() {
     else
         rev_list_status=$?
         base_std_log_error -l base_bash_libs.git "Unable to compare HEAD with '$upstream' (git status $rev_list_status); freshness is unknown."
-        return 5
+        return 1
     fi
     if ahead=$(git -C "$repo_root" rev-list --count "$upstream..HEAD" 2> /dev/null); then
         :
     else
         rev_list_status=$?
         base_std_log_error -l base_bash_libs.git "Unable to compare '$upstream' with HEAD (git status $rev_list_status); freshness is unknown."
-        return 5
+        return 1
     fi
     if [[ ! "$behind" =~ ^[0-9]+$ || ! "$ahead" =~ ^[0-9]+$ ]]; then
         base_std_log_error -l base_bash_libs.git "Git returned invalid freshness counts for '$upstream'; freshness is unknown."
-        return 5
+        return 1
     fi
 
     if ((behind > 0 && ahead > 0)); then
         base_std_log_warn -l base_bash_libs.git "Repository has diverged from $upstream ($behind commit(s) behind, $ahead commit(s) ahead)."
         [[ "$dirty" == true ]] && return 3
-        return 4
+        return 5
     fi
     if ((behind > 0)); then
         base_std_log_warn -l base_bash_libs.git "Repository is $behind commit(s) behind $upstream. Script may be out of date."
         [[ "$dirty" == true ]] && return 3
-        return 2
+        return 4
     fi
     if ((ahead > 0)); then
         base_std_log_info -l base_bash_libs.git "Repository is $ahead commit(s) ahead of $upstream."
diff --git a/lib/bash/git/tests/lib_git.bats b/lib/bash/git/tests/lib_git.bats
index 7170696..aaa01d8 100644
--- a/lib/bash/git/tests/lib_git.bats
+++ b/lib/bash/git/tests/lib_git.bats
@@ -59,7 +59,7 @@ setup() {
                 exit "$rc"
             ' bash "$mode" "$BASE_BASH_DIR/std/lib_std.sh" "$BASE_BASH_DIR/git/lib_git.sh" "$function_name"
 
-            [ "$status" -eq 1 ]
+            [ "$status" -eq 2 ]
             [[ "$output" == *"Usage:"* ]]
             [[ "$output" != *"unbound variable"* ]]
         done
@@ -68,23 +68,23 @@ setup() {
 
 @test "git optional forms reject excess arguments and unsupported option placement" {
     capture_command base_git_list_worktree_branches one two
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_git_list_worktree_branches [repo_dir]"* ]]
 
     capture_command base_git_list_remote_branches one two
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_git_list_remote_branches [repo_dir]"* ]]
 
     capture_command base_git_worktree_path_for_branch branch repo extra
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_git_worktree_path_for_branch <branch> [repo_dir]"* ]]
 
     capture_command base_git_check_script_up_to_date --refresh script.sh
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_git_check_script_up_to_date [--fetch] <script_path>"* ]]
 
     capture_command base_git_check_script_up_to_date --fetch
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_git_check_script_up_to_date [--fetch] <script_path>"* ]]
 }
 
@@ -304,7 +304,7 @@ EOF
         rc=$?
     fi
 
-    [ "$rc" -eq 1 ]
+    [ "$rc" -eq 2 ]
     [ "$branch" = "sentinel" ]
     [[ "$(cat "$stderr_file")" == *"result variable 'branch' is readonly"* ]]
 }
@@ -322,7 +322,7 @@ EOF
     else
         rc=$?
     fi
-    [ "$rc" -eq 1 ]
+    [ "$rc" -eq 2 ]
     [ "$detected" = "keep-detected" ]
 
     if base_git_get_current_branch . __base_bash_libs_git_branch_result_name 2>"$stderr_file"; then
@@ -330,7 +330,7 @@ EOF
     else
         rc=$?
     fi
-    [ "$rc" -eq 1 ]
+    [ "$rc" -eq 2 ]
     [ "$current" = "keep-current" ]
     [[ "$(cat "$stderr_file")" == *"uses the reserved '__' internal namespace"* ]]
     [[ "$(cat "$stderr_file")" != *"readonly variable"* ]]
@@ -406,7 +406,7 @@ EOF
 @test "base_git_get_current_branch usage names the current function" {
     bats_run base_git_get_current_branch
 
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_git_get_current_branch <directory> <result_variable_name>"* ]]
     [[ "$output" != *"Usage: get_git_branch"* ]]
 }
@@ -418,7 +418,7 @@ EOF
 
     bats_run base_git_get_current_branch "$repo" "bad-name"
 
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"base_git_get_current_branch: result variable name must be a valid Bash variable name"* ]]
     [[ "$output" != *"invalid variable name"* ]]
 }
@@ -426,7 +426,7 @@ EOF
 @test "base_git_update_repo usage names the current function" {
     capture_command base_git_update_repo
 
-    [ "$status" -eq 1 ]
+    [ "$status" -eq 2 ]
     [[ "$output" == *"Usage: base_git_update_repo /path/to/repo [allowed_dirty_path] [expected_branch]"* ]]
     [[ "$output" != *"Usage: update_repo"* ]]
 }
@@ -1037,7 +1037,7 @@ EOF
 
     bats_run base_git_check_script_up_to_date --fetch "$script_path"
 
-    [ "$status" -eq 2 ]
+    [ "$status" -eq 4 ]
     [[ "$output" == *"Fetched upstream state before latest-version check."* ]]
     [[ "$output" == *"Repository is 1 commit(s) behind origin/main"* ]]
 }
@@ -1213,7 +1213,7 @@ EOF
 
     bats_run base_git_check_script_up_to_date "$script_path"
 
-    [ "$status" -eq 4 ]
+    [ "$status" -eq 5 ]
     [[ "$output" == *"has diverged from origin/main"* ]]
     [[ "$output" != *"up to date"* ]]
 }
@@ -1235,7 +1235,7 @@ EOF
     bats_run base_git_check_script_up_to_date --fetch "$script_path"
     unset -f git
 
-    [ "$status" -eq 5 ]
+    [ "$status" -eq 1 ]
     [[ "$output" == *"freshness is unknown"* ]]
     [[ "$output" != *"up to date"* ]]
 }
@@ -1257,7 +1257,7 @@ EOF
     bats_run base_git_check_script_up_to_date "$script_path"
     unset -f git
 
-    [ "$status" -eq 5 ]
+    [ "$status" -eq 1 ]
     [[ "$output" == *"freshness is unknown"* ]]
     [[ "$output" != *"up to date"* ]]
 }
@@ -1280,7 +1280,7 @@ EOF
     bats_run base_git_check_script_up_to_date "$script_path"
     unset -f git
 
-    [ "$status" -eq 5 ]
+    [ "$status" -eq 1 ]
     [[ "$output" == *"Unable to discover the Git repository"* ]]
     [[ "$output" != *"up to date"* ]]
 }
@@ -1302,7 +1302,7 @@ EOF
     bats_run base_git_check_script_up_to_date "$script_path"
     unset -f git
 
-    [ "$status" -eq 5 ]
+    [ "$status" -eq 1 ]
     [[ "$output" == *"Unable to inspect working-tree changes"* ]]
     [[ "$output" != *"up to date"* ]]
 }
diff --git a/tests/bash-option-contract.sh b/tests/bash-option-contract.sh
index 8a9737a..6574530 100755
--- a/tests/bash-option-contract.sh
+++ b/tests/bash-option-contract.sh
@@ -44,31 +44,31 @@ contract_expect_status() {
 }
 
 contract_quiet_call() {
-    "$@" >/dev/null 2>&1
+    "$@" > /dev/null 2>&1
 }
 
 contract_quiet_success() {
     local label="${1-}" status
     shift
 
-    "$@" >/dev/null 2>&1
+    "$@" > /dev/null 2>&1
     status=$?
     contract_assert_equal "$label status" 0 "$status"
 }
 
 contract_quiet_subshell() {
-    ("$@") >/dev/null 2>&1
+    ("$@") > /dev/null 2>&1
 }
 
 contract_enable_mode() {
     case "$contract_mode" in
-        e | eu | ep | eup) builtin set -o errexit ;;
+    e | eu | ep | eup) builtin set -o errexit ;;
     esac
     case "$contract_mode" in
-        u | eu | up | eup) builtin set -o nounset ;;
+    u | eu | up | eup) builtin set -o nounset ;;
     esac
     case "$contract_mode" in
-        p | ep | up | eup) builtin set -o pipefail ;;
+    p | ep | up | eup) builtin set -o pipefail ;;
     esac
 }
 
@@ -77,13 +77,13 @@ contract_assert_mode_options() {
     local actual_errexit=0 actual_nounset=0 actual_pipefail=0
 
     case "$contract_mode" in
-        e | eu | ep | eup) expected_errexit=1 ;;
+    e | eu | ep | eup) expected_errexit=1 ;;
     esac
     case "$contract_mode" in
-        u | eu | up | eup) expected_nounset=1 ;;
+    u | eu | up | eup) expected_nounset=1 ;;
     esac
     case "$contract_mode" in
-        p | ep | up | eup) expected_pipefail=1 ;;
+    p | ep | up | eup) expected_pipefail=1 ;;
     esac
     case "$-" in *e*) actual_errexit=1 ;; esac
     case "$-" in *u*) actual_nounset=1 ;; esac
@@ -98,8 +98,8 @@ contract_assert_mode_options() {
 
 contract_assert_version() {
     if (($# == 0)); then
-        if ((BASH_VERSINFO[0] < 4 ||
-            (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] < 2))); then
+        if ((BASH_VERSINFO[0] < 4 || (\
+            BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] < 2))); then
             contract_fail "requires Bash 4.2 or newer; running $BASH_VERSION"
         fi
         return 0
@@ -476,40 +476,40 @@ contract_git_stub() {
     fi
 
     case "${1-}" in
-        symbolic-ref)
-            if [[ "${4-}" == "refs/remotes/origin/HEAD" ]]; then
-                printf 'origin/main\n'
-            else
-                printf 'main\n'
-            fi
-            ;;
-        show-ref | merge-base)
-            return 0
-            ;;
-        worktree)
-            printf 'worktree /contract/worktree\nHEAD 0123456789\nbranch refs/heads/main\n\n'
-            ;;
-        for-each-ref)
+    symbolic-ref)
+        if [[ "${4-}" == "refs/remotes/origin/HEAD" ]]; then
             printf 'origin/main\n'
-            ;;
-        ls-remote)
-            printf '0123456789abcdef\trefs/heads/main\n'
-            printf 'fedcba9876543210\trefs/heads/topic/one\n'
-            ;;
-        remote)
-            printf 'git@github.com:basefoundry/base-bash-libs.git\n'
-            ;;
-        rev-parse)
-            case "${2-}" in
-                --is-inside-work-tree) printf 'true\n' ;;
-                --show-toplevel) printf '%s\n' "$contract_tmp" ;;
-                --show-prefix) printf '\n' ;;
-                *) return 1 ;;
-            esac
-            ;;
-        *)
-            return 0
-            ;;
+        else
+            printf 'main\n'
+        fi
+        ;;
+    show-ref | merge-base)
+        return 0
+        ;;
+    worktree)
+        printf 'worktree /contract/worktree\nHEAD 0123456789\nbranch refs/heads/main\n\n'
+        ;;
+    for-each-ref)
+        printf 'origin/main\n'
+        ;;
+    ls-remote)
+        printf '0123456789abcdef\trefs/heads/main\n'
+        printf 'fedcba9876543210\trefs/heads/topic/one\n'
+        ;;
+    remote)
+        printf 'git@github.com:basefoundry/base-bash-libs.git\n'
+        ;;
+    rev-parse)
+        case "${2-}" in
+        --is-inside-work-tree) printf 'true\n' ;;
+        --show-toplevel) printf '%s\n' "$contract_tmp" ;;
+        --show-prefix) printf '\n' ;;
+        *) return 1 ;;
+        esac
+        ;;
+    *)
+        return 0
+        ;;
     esac
 }
 
@@ -541,11 +541,11 @@ contract_gh_stub() {
         return 1
     fi
     case "${1-}:${2-}" in
-        repo:view) printf 'main\n' ;;
-        api:*)
-            ((contract_gh_include == 0)) || printf 'HTTP/2.0 200 OK\r\n\r\n'
-            printf '{"contract":true}\n'
-            ;;
+    repo:view) printf 'main\n' ;;
+    api:*)
+        ((contract_gh_include == 0)) || printf 'HTTP/2.0 200 OK\r\n\r\n'
+        printf '{"contract":true}\n'
+        ;;
     esac
     return 0
 }
@@ -573,17 +573,17 @@ contract_git_gh_api_smoke() {
     contract_quiet_success "base_git_check_script_up_to_date missing file" \
         base_git_check_script_up_to_date "$contract_tmp/missing-script"
 
-    contract_expect_status "base_git_detect_default_branch usage" 1 contract_quiet_call base_git_detect_default_branch
-    contract_expect_status "base_git_worktree_path_for_branch usage" 1 contract_quiet_call base_git_worktree_path_for_branch
-    contract_expect_status "base_git_list_worktree_branches usage" 1 \
+    contract_expect_status "base_git_detect_default_branch usage" 2 contract_quiet_call base_git_detect_default_branch
+    contract_expect_status "base_git_worktree_path_for_branch usage" 2 contract_quiet_call base_git_worktree_path_for_branch
+    contract_expect_status "base_git_list_worktree_branches usage" 2 \
         contract_quiet_call base_git_list_worktree_branches one two
-    contract_expect_status "base_git_branch_upstream usage" 1 contract_quiet_call base_git_branch_upstream
-    contract_expect_status "base_git_branch_merged_to_ref usage" 1 contract_quiet_call base_git_branch_merged_to_ref
-    contract_expect_status "base_git_list_remote_branches usage" 1 \
+    contract_expect_status "base_git_branch_upstream usage" 2 contract_quiet_call base_git_branch_upstream
+    contract_expect_status "base_git_branch_merged_to_ref usage" 2 contract_quiet_call base_git_branch_merged_to_ref
+    contract_expect_status "base_git_list_remote_branches usage" 2 \
         contract_quiet_call base_git_list_remote_branches one two
-    contract_expect_status "base_git_update_repo usage" 1 contract_quiet_call base_git_update_repo
-    contract_expect_status "base_git_get_current_branch usage" 1 contract_quiet_call base_git_get_current_branch
-    contract_expect_status "base_git_check_script_up_to_date usage" 1 contract_quiet_call base_git_check_script_up_to_date
+    contract_expect_status "base_git_update_repo usage" 2 contract_quiet_call base_git_update_repo
+    contract_expect_status "base_git_get_current_branch usage" 2 contract_quiet_call base_git_get_current_branch
+    contract_expect_status "base_git_check_script_up_to_date usage" 2 contract_quiet_call base_git_check_script_up_to_date
 
     base_gh_require_cli
     base_gh_auth_status_diagnostics
@@ -653,7 +653,7 @@ contract_git_gh_api_smoke() {
     contract_assert_equal "base_gh_api_with_retry replay-safe mutation count" 2 "$contract_result"
     unset CONTRACT_GH_COUNT_FILE CONTRACT_GH_FAILS_BEFORE_SUCCESS
 
-    contract_expect_status "base_gh_api_with_retry invalid retry policy" 1 contract_quiet_call \
+    contract_expect_status "base_gh_api_with_retry invalid retry policy" 2 contract_quiet_call \
         base_gh_api_with_retry --retry-policy unsafe -- repos/basefoundry/base-bash-libs
     contract_expect_status "base_gh_report_command_failure status" 7 contract_quiet_call \
         base_gh_report_command_failure 7 api contract
@@ -676,16 +676,16 @@ contract_git_gh_api_smoke() {
         contract_fail "sensitive base_gh_run exposed a protected argument"
     unset CONTRACT_GH_STATUS
 
-    contract_expect_status "base_gh_require_cli usage" 1 contract_quiet_call base_gh_require_cli one two
-    contract_expect_status "base_gh_auth_status_diagnostics usage" 1 \
+    contract_expect_status "base_gh_require_cli usage" 2 contract_quiet_call base_gh_require_cli one two
+    contract_expect_status "base_gh_auth_status_diagnostics usage" 2 \
         contract_quiet_call base_gh_auth_status_diagnostics one two
-    contract_expect_status "base_gh_report_command_failure usage" 1 \
+    contract_expect_status "base_gh_report_command_failure usage" 2 \
         contract_quiet_call base_gh_report_command_failure
-    contract_expect_status "base_gh_repo_from_remote_url usage" 1 \
+    contract_expect_status "base_gh_repo_from_remote_url usage" 2 \
         contract_quiet_call base_gh_repo_from_remote_url
-    contract_expect_status "base_gh_infer_repo_from_origin usage" 1 \
+    contract_expect_status "base_gh_infer_repo_from_origin usage" 2 \
         contract_quiet_call base_gh_infer_repo_from_origin
-    contract_expect_status "base_gh_repo_default_branch usage" 1 \
+    contract_expect_status "base_gh_repo_default_branch usage" 2 \
         contract_quiet_call base_gh_repo_default_branch
 }
 
@@ -744,8 +744,8 @@ if [[ "${1-}" == "--mode" ]]; then
     contract_mode="$2"
     shift 2
     case "$contract_mode" in
-        none | e | u | p | eu | ep | up | eup) ;;
-        *) contract_fail "unknown option mode '$contract_mode'" ;;
+    none | e | u | p | eu | ep | up | eup) ;;
+    *) contract_fail "unknown option mode '$contract_mode'" ;;
     esac
     contract_run_mode "$@"
     exit 0