diff --git a/docs/conventions/config-cascade/CHANGELOG.md b/docs/conventions/config-cascade/CHANGELOG.md
index 7f927926ef..974d5c809a 100644
--- a/docs/conventions/config-cascade/CHANGELOG.md
+++ b/docs/conventions/config-cascade/CHANGELOG.md
@@ -7,6 +7,16 @@ by a pointer line). Per-concern keys and schema are versioned by their own owner
 change independently. A change to the precedence order or the meaning of a layer is a major bump;
 adding an optional layer or relaxing a rule additively is a minor bump.
 
+## Deviations and Implementers table, 2026-09-28
+
+- **`source-control` `branch_issue_pattern` fail-closed stop declared (#4673).** The Declared list
+  gains the surface's divergence from rule 4 (degrade soft on a malformed layer): a layer whose
+  `## branch_issue_pattern` section exists but yields no usable pattern stops resolution with no
+  issue number, because the value feeds a `Closes #N` line and a lower source's number could close
+  the wrong issue. The row's conformance cell names the exception. The near-miss-heading stop that
+  shipped in #4581 was that divergence already, undeclared. No contract rule change, so no version
+  bump.
+
 ## Implementers table, 2026-09-08
 
 - **`architecture` and `authoring-formats` C4 dialect surfaces (#3910).** The two rows no longer
diff --git a/docs/conventions/config-cascade/README.md b/docs/conventions/config-cascade/README.md
index 3907561de0..c834b1ac4b 100644
--- a/docs/conventions/config-cascade/README.md
+++ b/docs/conventions/config-cascade/README.md
@@ -265,6 +265,18 @@ surface, or amend this contract) is a separate human-gated decision.
   gitignoring one. Claude Code documents local behavior only for surfaces it actually resolves
   (`CLAUDE.local.md`, `settings.local.json`); a generic `*.local.*` filename has no
   platform-defined meaning.
+- **`source-control` stops `branch_issue_pattern` resolution on an unusable layer (#4673).**
+  Rule 4 of the resolution algorithm would resolve as if a malformed layer were absent. For this
+  one key, `parse-branch-issue.sh` instead fails closed: a layer whose `## branch_issue_pattern`
+  section exists but yields no usable pattern (a near-miss heading, no value, a heading or HTML
+  comment as the first value line, an empty or unterminated fence, or a pattern that fails
+  validation) prints a note naming the layer and the reason, emits no issue number, and exits 1.
+  The consumer is a `Closes #N` line that closes an issue on merge, so a lower layer or the
+  default supplying a different number is worse than no number; the no-number path already exists
+  and `/source-control:pull-request create` relays the note. A higher layer that already supplied
+  a valid pattern still wins, since the lower layer is never read, and a malformed deprecated
+  `userConfig` value is still ignored with a note. Every other `source-control` key keeps the
+  soft degrade.
 
 **Undeclared**, meaning divergence with no recorded rationale:
 
@@ -281,7 +293,7 @@ convention home, layers → `team, via pointer line`, conformance → the retire
 
 | Surface | Consumer config path | Layers | Conformance |
 |---|---|---|---|
-| `source-control` | `.claude/source-control.md` | all three | conforms (per-key override, #660); enforcement reads team-tracked only per [`commit-convention`](../commit-convention/README.md); loop-lane keys (`babysit_loop_*`, read by the source-control babysit lane; the work-items lanes tie in via the loop-lane convention only) ride the same surface, with the merge-rung key in the policy-floor class: standing raises bind from the team-tracked layer only, and the one named single-invocation exception is an explicitly typed argument rather than a config value in any layer, per [`loop-lane`](../loop-lane/README.md) |
+| `source-control` | `.claude/source-control.md` | all three | conforms (per-key override, #660), except the declared fail-closed stop on an unusable `branch_issue_pattern` layer (#4673, see Declared); enforcement reads team-tracked only per [`commit-convention`](../commit-convention/README.md); loop-lane keys (`babysit_loop_*`, read by the source-control babysit lane; the work-items lanes tie in via the loop-lane convention only) ride the same surface, with the merge-rung key in the policy-floor class: standing raises bind from the team-tracked layer only, and the one named single-invocation exception is an explicitly typed argument rather than a config value in any layer, per [`loop-lane`](../loop-lane/README.md) |
 | `toolchain` / `ecosystem-commands` | `.claude/ecosystems/<ecosystem>.yaml` | all three | conforms |
 | `codebase-health` | `.claude/codebase-health.md` | all three | conforms (concatenating, with a declared empty-list opt-out) |
 | `bugs` | `.claude/bugs.md` | all three | conforms; `lanes` concatenate and deduplicate by lane `name`, with a declared empty-list opt-out that also drops the bundled defaults, and `filing_posture` is a nearest-wins scalar. Keys owned by the plugin's `reference/config.md`, which also partitions them from the plugin's `output_dir` `userConfig` option. That option is never a key in this surface, and a layer declaring it is reported as an inert unknown key. Written (team layer only) by `/bugs:setup apply`, read by `/bugs:scan` |
diff --git a/plugins/source-control/.claude-plugin/plugin.json b/plugins/source-control/.claude-plugin/plugin.json
index a8b1df7795..97d25a4506 100644
--- a/plugins/source-control/.claude-plugin/plugin.json
+++ b/plugins/source-control/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/claude-code-plugin-manifest.json",
   "name": "source-control",
-  "version": "0.61.5",
+  "version": "0.62.0",
   "description": "Git and GitHub delivery workflow: /commit (Conventional Commits + Co-authored-by trailer via safe heredoc mechanics), /pull-request (prep, create, CI monitoring, review-comment triage, merge, CI-log fetch), /babysit-prs (self-pacing fleet loop, safe by default; opt-in worker/autopilot tiers add gate-checked merge and thread resolution behind a deterministic Python engine), /babysit-loop (the loop-lane merge lane: a standing or drain loop that invokes babysit-prs per cycle, configured through repo-scoped babysit_loop_* keys on the layered source-control.md seam, with merge authority human-only until the target repo's tracked config adopts the lane, a gate-proven C2-mechanical baseline once adopted, and standing merge-rung raises binding from the team-tracked layer only, with one named exception, where an invocation line explicitly typing both the autopilot tier keyword and the dedicated raise argument --merge c3-this-run widens that single invocation's merge authority up to C3 behind a fresh independent frontier-tier resolver, while C4-structural and C5-untrusted-provenance stay unconditionally human-merge), /worktree (create, status, cleanup, audit for parallel-session isolation), /setup (check the effective commit-subject / PR-title convention merged across its config layers and the babysit-prs config, or apply, which interviews the repo and writes the convention config to a chosen layer), and /resolve-conflicts (intent-first merge/rebase conflict resolution with a semantic-conflict sweep, never --abort). The commit-subject / PR-title convention is configurable via a source-control.md config written by a re-runnable setup skill, layered across a ~/.claude user-global file, the tracked team file, and a gitignored .claude/source-control.local.md personal overlay merged per key; Conventional Commits is the default when no convention is declared.",
   "author": {
     "name": "Melodic Software",
diff --git a/plugins/source-control/CHANGELOG.md b/plugins/source-control/CHANGELOG.md
index 8b75fbccdd..a2aec7492d 100644
--- a/plugins/source-control/CHANGELOG.md
+++ b/plugins/source-control/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to the `source-control` plugin are documented here. Format follows
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); this plugin uses semantic versioning.
 
+## [0.62.0] - 2026-09-28
+
+### Changed
+
+- **`parse-branch-issue.sh` stops on an unusable `branch_issue_pattern` layer instead of skipping it** ([#4673](https://github.com/melodic-software/claude-code-plugins/issues/4673)). A layer whose `## branch_issue_pattern` section exists but yields no usable pattern now prints a note containing `resolution stopped`, emits no issue number, and exits 1. Before, it was reported and skipped, and a lower layer, the userConfig, or the built-in default could then supply a different number to the `Closes #N` line: with a broken trailing-number team pattern, `feat/12-widget-34` closed #12. The stop covers a heading or HTML comment as the first value line, an empty or unterminated fence, a pattern that breaks a limit, holds a backreference, or does not compile, and a section with no value (previously skipped without a note). The near-miss-heading stop is unchanged. A higher layer that already supplied a valid pattern still wins, and a userConfig value that fails validation is still ignored, with a note, so the default applies. `create.md`, `config-resolution.md`, setup's `SKILL.md`, and `apply-convention.md` describe the stop, and setup's check reports a stopped layer as a FAIL. The repo's config-cascade convention records the stop as a declared deviation from its degrade-soft rule.
+
 ## [0.61.5] - 2026-09-28
 
 ### Fixed
diff --git a/plugins/source-control/reference/config-resolution.md b/plugins/source-control/reference/config-resolution.md
index 121a23ebf5..f0c4189bf9 100644
--- a/plugins/source-control/reference/config-resolution.md
+++ b/plugins/source-control/reference/config-resolution.md
@@ -68,15 +68,23 @@ Markdown, one `## <key>` H2 per key, the value as the section body:
   - A leading UTF-8 BOM and CRLF line endings are accepted, and so are trailing whitespace and a
     closing `#` sequence on the heading (`## branch_issue_pattern ##`). Headings inside fenced
     blocks are ignored.
-  - A **near-miss heading** stops resolution: an H2 outside a fence whose text contains
-    `branch_issue_pattern` in any case but is not the exact heading (`## branch_issue_pattern:`,
-    `## Branch_Issue_Pattern`, `## branch_issue_pattern (ERE)`). The script prints a note and no
-    issue number, and exits 1. It does not fall back to a lower layer, the userConfig, or the
-    default, because any of those could close the wrong issue. A higher-precedence layer that
-    already supplied a valid pattern wins, since the lower layer is never read.
-  - A layer is reported and skipped, and resolution continues with the next source, when the
-    section's first value line is a heading or an HTML comment (`<!--`), its fence is empty or
-    unterminated, or its pattern fails validation.
+  - A layer whose section exists but yields no usable pattern **stops resolution**. The script
+    prints a note containing `resolution stopped` and no issue number, and exits 1. It does not
+    fall back to a lower layer, the userConfig, or the default, because any of those could close
+    the wrong issue; the no-number path already exists and `create` relays the note. A
+    higher-precedence layer that already supplied a valid pattern wins, since the lower layer is
+    never read. The stop reasons:
+    - a **near-miss heading**: an H2 outside a fence whose text contains `branch_issue_pattern` in
+      any case but is not the exact heading (`## branch_issue_pattern:`, `## Branch_Issue_Pattern`,
+      `## branch_issue_pattern (ERE)`);
+    - a section with no value before the next H2 or the end of the file;
+    - a first value line that is a heading or an HTML comment (`<!--`);
+    - an empty or unterminated fence;
+    - a pattern that fails validation.
+
+    This diverges from the config-cascade rule to degrade soft on a malformed layer, and this repo's
+    `config-cascade` convention records it as a declared deviation. A userConfig value that fails
+    validation is still reported and ignored, so the default applies.
 
   A pattern passes validation when it compiles as an ERE and keeps within these limits, which are
   checked before it is compiled: at most 200 characters, every `{m}`, `{m,}`, or `{m,n}` bound at
diff --git a/plugins/source-control/skills/pull-request/reference/create.md b/plugins/source-control/skills/pull-request/reference/create.md
index cbe14391d7..d97f013bc6 100644
--- a/plugins/source-control/skills/pull-request/reference/create.md
+++ b/plugins/source-control/skills/pull-request/reference/create.md
@@ -163,7 +163,7 @@ If SKILL.md's "Branch-to-issue grammar" surface shows a configured `branch_issue
 ISSUE_NUM=$(bash "${CLAUDE_PLUGIN_ROOT}/skills/pull-request/scripts/parse-branch-issue.sh" "" '<branch-issue-pattern>' || true)
 ```
 
-The script's stderr is left visible on purpose: it carries the deprecation note when the userConfig value is used, and a note naming the source and the reason (never the pattern text) when a layer or the userConfig value is skipped (a heading or HTML comment as the first value line, an empty or unterminated code fence, or a pattern that is invalid, holds a backreference, or breaks the length, bound, or nested-quantifier limit), when a near-miss heading such as `## branch_issue_pattern:` stops resolution (no issue number, whatever the lower sources say), or when a match yields no numeric id. Relay any note to the user; stdout carries only the issue number. Fill `<branch-issue-pattern>` with the resolved ERE. Its last capture group must resolve to the numeric GitHub issue number (a pattern with no capture group, or a non-numeric capture such as a bare Jira key, prints nothing and takes the no-closure path); configure a scheme that captures the number wherever it sits, e.g. `^[^/]+/([0-9]+)-` for `alice/1234-slug` or `-([0-9]+)$` for `feat/add-widget-1234`.
+The script's stderr is left visible on purpose: it carries the deprecation note when the userConfig value is used, and a note naming the source and the reason (never the pattern text) when a layer's section exists but yields no usable pattern (a near-miss heading such as `## branch_issue_pattern:`, no value, a heading or HTML comment as the first value line, an empty or unterminated code fence, or a pattern that is invalid, holds a backreference, or breaks the length, bound, or nested-quantifier limit), which stops resolution with no issue number whatever the lower sources say; when the userConfig value breaks one of those pattern checks and is ignored; or when a match yields no numeric id. Relay any note to the user; stdout carries only the issue number. Fill `<branch-issue-pattern>` with the resolved ERE. Its last capture group must resolve to the numeric GitHub issue number (a pattern with no capture group, or a non-numeric capture such as a bare Jira key, prints nothing and takes the no-closure path); configure a scheme that captures the number wherever it sits, e.g. `^[^/]+/([0-9]+)-` for `alice/1234-slug` or `-([0-9]+)$` for `feat/add-widget-1234`.
 
 ```bash
 CLOSES_LINE=""
diff --git a/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.sh b/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.sh
index e6cdd9aa19..9689566783 100755
--- a/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.sh
+++ b/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.sh
@@ -30,14 +30,17 @@
 #      CLAUDE_PLUGIN_OPTION_BRANCH_ISSUE_PATTERN. Using it prints a deprecation
 #      note on stderr.
 #   3. The built-in default.
-# A layer whose first value line is a heading or an HTML comment, whose fence
-# is empty or unterminated, or whose pattern breaks a limit (see
-# usable_pattern) is reported on stderr and skipped; a userConfig value that
-# breaks a limit is reported and ignored. A layer holding a near-miss H2 (one
-# whose text contains `branch_issue_pattern` but is not the exact heading, e.g.
-# `## branch_issue_pattern:`) stops resolution: the script prints nothing and
-# exits 1, so a lower source never supplies the wrong issue number. Notes name
-# the source and the reason, never the pattern text.
+# A layer whose section exists but yields no usable pattern stops resolution:
+# the script prints nothing and exits 1, so a lower layer, the userConfig, or
+# the default never supplies an issue number the author did not intend. That
+# covers a near-miss H2 (one whose text contains `branch_issue_pattern` but is
+# not the exact heading, e.g. `## branch_issue_pattern:`), a section with no
+# value, a first value line that is a heading or an HTML comment, an empty or
+# unterminated fence, and a pattern that breaks a limit (see usable_pattern).
+# A higher layer that already supplied a valid pattern still wins, since the
+# lower layer is never read. A userConfig value that breaks a limit is
+# reported and ignored, so the default applies. Notes name the source and the
+# reason, never the pattern text.
 # Prints the captured issue id on stdout and exits 0 on match.
 # Exits 1 with no stdout if the branch does not match.
 set -uo pipefail
@@ -57,17 +60,19 @@ fi
 # repo-controlled value is not echoed into the caller's context.
 note() { echo "parse-branch-issue: $*" >&2; }
 
+STOP="resolution stopped, no issue id emitted"
+
 FENCE_OPEN='^(```+|~~~+)'
 FENCE_CLOSE='^(```+|~~~+)$'
 
 # Print the value of the `## branch_issue_pattern` section of file $1: its first
 # non-blank line, surrounding whitespace and backticks stripped, or, when that
 # line opens a code fence, the first non-blank line inside the fence. Headings
-# inside fenced blocks are ignored. Prints nothing when the file or the section
-# is absent. Returns 1 (with a note, nothing printed) when the layer must be
-# skipped: an empty or unterminated fence, or a first value line that is a
-# heading or an HTML comment. Returns 3 (with a note) on a near-miss H2 anywhere
-# outside a fence, which stops resolution.
+# inside fenced blocks are ignored. Prints nothing and returns 0 when the file
+# or the section is absent. Returns 1 (with a note, nothing printed) when the
+# section exists but yields no value, which stops resolution: a near-miss H2
+# anywhere outside a fence, a section with no value, an empty or unterminated
+# fence, or a first value line that is a heading or an HTML comment.
 section_value() {
   local file="$1" line state=0 fence="" value="" first=1
   # state: 0 before the section, 1 inside it awaiting the value, 2 done.
@@ -84,7 +89,7 @@ section_value() {
       if [[ "$line" =~ $FENCE_CLOSE && "${line:0:1}" == "${fence:0:1}" && ${#line} -ge ${#fence} ]]; then
         if [[ "$state" -eq 1 ]]; then
           if [[ -z "$value" ]]; then
-            note "${file}: ## ${KEY} holds an empty code fence; layer skipped"
+            note "${file}: ## ${KEY} holds an empty code fence; ${STOP}"
             return 1
           fi
           state=2
@@ -99,10 +104,11 @@ section_value() {
       if [[ "$line" =~ ^##[[:space:]]+${KEY}([[:space:]]+#+)?$ ]]; then
         [[ "$state" -eq 0 ]] && state=1
       elif [[ "${line,,}" == *"$KEY"* ]]; then
-        note "${file}: near-miss heading for ## ${KEY}; resolution stopped, no issue id emitted"
-        return 3
+        note "${file}: near-miss heading for ## ${KEY}; ${STOP}"
+        return 1
       elif [[ "$state" -eq 1 ]]; then
-        state=2
+        note "${file}: ## ${KEY} holds no value; ${STOP}"
+        return 1
       fi
       continue
     fi
@@ -112,20 +118,28 @@ section_value() {
     fi
     [[ "$state" -eq 1 && -n "$line" ]] || continue
     if [[ "$line" =~ ^#{1,6}([[:space:]]|$) ]]; then
-      note "${file}: ## ${KEY} starts with a heading, not a pattern; layer skipped"
+      note "${file}: ## ${KEY} starts with a heading, not a pattern; ${STOP}"
       return 1
     fi
     if [[ "$line" == '<!--'* ]]; then
-      note "${file}: ## ${KEY} starts with an HTML comment, not a pattern; layer skipped"
+      note "${file}: ## ${KEY} starts with an HTML comment, not a pattern; ${STOP}"
       return 1
     fi
     while [[ "$line" == \`* ]]; do line="${line#\`}"; done
     while [[ "$line" == *\` ]]; do line="${line%\`}"; done
+    if [[ -z "$line" ]]; then
+      note "${file}: ## ${KEY} holds no value; ${STOP}"
+      return 1
+    fi
     value="$line"
     state=2
   done <"$file"
-  if [[ -n "$fence" && "$state" -eq 1 ]]; then
-    note "${file}: ## ${KEY} holds an unterminated code fence; layer skipped"
+  if [[ "$state" -eq 1 ]]; then
+    if [[ -n "$fence" ]]; then
+      note "${file}: ## ${KEY} holds an unterminated code fence; ${STOP}"
+    else
+      note "${file}: ## ${KEY} holds no value; ${STOP}"
+    fi
     return 1
   fi
   [[ -z "$value" ]] || printf '%s\n' "$value"
@@ -204,22 +218,23 @@ pattern_limit() {
 
 # True when pattern $2 from source $1 is usable: it keeps within the limits
 # pattern_limit checks, holds no backreference, and compiles as an ERE (bash's
-# =~ returns 2 on a bad pattern). Otherwise reports the source and the reason.
+# =~ returns 2 on a bad pattern). Otherwise reports the source, the reason,
+# and outcome $3.
 usable_pattern() {
-  local src="$1" value="$2" rc limit
+  local src="$1" value="$2" outcome="$3" rc limit
   limit="$(pattern_limit "$value")"
   if [[ -n "$limit" ]]; then
-    note "${src}: ${KEY} ${limit}; skipped"
+    note "${src}: ${KEY} ${limit}; ${outcome}"
     return 1
   fi
   if [[ "$value" =~ \\[1-9] ]]; then
-    note "${src}: ${KEY} uses a backreference, which is not allowed; skipped"
+    note "${src}: ${KEY} uses a backreference, which is not allowed; ${outcome}"
     return 1
   fi
   { [[ "" =~ $value ]]; } 2>/dev/null
   rc=$?
   if [[ "$rc" -eq 2 ]]; then
-    note "${src}: ${KEY} is an invalid ERE; skipped"
+    note "${src}: ${KEY} is an invalid ERE; ${outcome}"
     return 1
   fi
   return 0
@@ -234,15 +249,11 @@ LAYERS+=("${HOME:-}/.claude/source-control.md")
 
 PATTERN="" SOURCE=""
 for layer in "${LAYERS[@]}"; do
-  value="$(section_value "$layer")"
-  # A near-miss heading stops resolution rather than letting a lower source
-  # supply a number the author did not intend.
-  [[ $? -eq 3 ]] && exit 1
+  value="$(section_value "$layer")" || exit 1
   [[ -n "$value" ]] || continue
-  if usable_pattern "$layer" "$value"; then
-    PATTERN="$value" SOURCE="$layer"
-    break
-  fi
+  usable_pattern "$layer" "$value" "$STOP" || exit 1
+  PATTERN="$value" SOURCE="$layer"
+  break
 done
 
 if [[ -z "$PATTERN" ]]; then
@@ -252,7 +263,7 @@ if [[ -z "$PATTERN" ]]; then
   # shellcheck disable=SC2016  # matching the literal placeholder text, not expanding it
   [[ "$LEGACY" == *'${user_config'* ]] && LEGACY=""
   [[ -n "$LEGACY" ]] || LEGACY="${CLAUDE_PLUGIN_OPTION_BRANCH_ISSUE_PATTERN:-}"
-  if [[ -n "$LEGACY" ]] && usable_pattern userConfig "$LEGACY"; then
+  if [[ -n "$LEGACY" ]] && usable_pattern userConfig "$LEGACY" "ignored, default applies"; then
     PATTERN="$LEGACY" SOURCE="userConfig"
     note "the ${KEY} userConfig is deprecated; set a \`## ${KEY}\` section in .claude/source-control.md instead."
   fi
diff --git a/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.test.sh b/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.test.sh
index aa473ad98b..754bdc1564 100755
--- a/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.test.sh
+++ b/plugins/source-control/skills/pull-request/scripts/parse-branch-issue.test.sh
@@ -149,21 +149,42 @@ layer "${CASE_REPO}/.claude/source-control.md" '-([0-9]+)$'
 layer "${CASE_REPO}/.claude/source-control.local.md" '^[a-z]+/([0-9]+)/'
 run_cfg "local overlay beats team and user-global" "a/5/77-x-9" "" - "5" 0 empty
 
+# A layer whose section exists but yields no usable pattern stops resolution:
+# no stdout, exit 1, and a note naming the layer and `stopped`, even when a
+# lower layer, the userConfig, or the default would match.
+STOPPED='resolution stopped, no issue id emitted'
+
 new_case
 layer "${CASE_REPO}/.claude/source-control.md" '-([0-9]+)$'
 layer "${CASE_REPO}/.claude/source-control.local.md" '(['
-run_cfg "invalid local layer reported and skipped, team applies" \
-  "feat/12-add-widget-1234" "" - "1234" 0 'source-control\.local\.md'
+run_cfg "invalid local layer stops resolution, team never applies" \
+  "feat/12-add-widget-1234" "" - "" 1 "source-control\.local\.md.*invalid ERE.*${STOPPED}"
 
 new_case
+layer "${CASE_REPO}/.claude/source-control.local.md" '-([0-9]+)$'
 layer "${CASE_REPO}/.claude/source-control.md" '(['
-run_cfg "invalid only layer skipped, falls through to userConfig with note" \
-  "alice.b/1234-fix" '^[^/]+/([0-9]+)-' - "1234" 0 "$DEPRECATION"
+run_cfg "valid local layer wins before an invalid team layer is read" \
+  "feat/12-add-widget-1234" "" - "1234" 0 empty
 
 new_case
 layer "${CASE_REPO}/.claude/source-control.md" '(['
-run_cfg "invalid only layer skipped, falls through to built-in default" \
-  "feat/42-x" "" - "42" 0 'invalid'
+run_cfg "invalid only layer stops resolution, never reaches the userConfig" \
+  "alice.b/1234-fix" '^[^/]+/([0-9]+)-' - "" 1 "invalid ERE.*${STOPPED}" 'deprecated'
+
+new_case
+layer "${CASE_REPO}/.claude/source-control.md" '(['
+run_cfg "invalid only layer stops resolution, never reaches the userConfig env var" \
+  "alice.b/1234-fix" "" '^[^/]+/([0-9]+)-' "" 1 "invalid ERE.*${STOPPED}" 'deprecated'
+
+new_case
+layer "${CASE_REPO}/.claude/source-control.md" '(['
+run_cfg "invalid only layer stops resolution, never reaches the built-in default" \
+  "feat/42-x" "" - "" 1 "invalid ERE.*${STOPPED}"
+
+new_case
+layer "${CASE_HOME}/.claude/source-control.md" '(['
+run_cfg "invalid user-global layer stops resolution, never reaches the default" \
+  "feat/42-x" "" - "" 1 "home\.[^ ]*/\.claude/source-control\.md.*${STOPPED}"
 
 new_case
 # shellcheck disable=SC2016  # the placeholder is a literal test input, not an expansion
@@ -188,14 +209,14 @@ run_cfg "fenced value with an info string resolves" "feat/12-add-widget-1234" ""
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n```\n\n```\n'
-run_cfg "empty fence reported with its path and skipped" \
-  "feat/12-add-widget-1234" "" - "1234" 0 'repo\.[^ ]*/\.claude/source-control\.md.*empty'
+run_cfg "empty fence stops resolution, note names its path" \
+  "feat/12-add-widget-1234" "" - "" 1 "repo\.[^ ]*/\.claude/source-control\.md.*empty.*${STOPPED}"
 
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n```\n'
-run_cfg "unterminated fence reported with its path and skipped" \
-  "feat/12-add-widget-1234" "" - "1234" 0 'repo\.[^ ]*/\.claude/source-control\.md.*unterminated'
+run_cfg "unterminated fence stops resolution, note names its path" \
+  "feat/12-add-widget-1234" "" - "" 1 "repo\.[^ ]*/\.claude/source-control\.md.*unterminated.*${STOPPED}"
 
 new_case
 layer_raw "${CASE_REPO}/.claude/source-control.md" \
@@ -220,18 +241,22 @@ run_cfg "non-numeric userConfig capture: no output, note names userConfig" \
 # Backreferences are rejected.
 new_case
 layer "${CASE_REPO}/.claude/source-control.md" '^([a-z]+)/\1([0-9]+)'
-run_cfg "backreference layer rejected, default applies" \
-  "feat/42-x" "" - "42" 0 'source-control\.md.*backreference' '\1'
+run_cfg "backreference layer stops resolution, never the default" \
+  "feat/42-x" "" - "" 1 "source-control\.md.*backreference.*${STOPPED}" '\1'
 
 new_case
 run_cfg "backreference userConfig ignored, default applies" \
-  "feat/42-x" '^([a-z]+)/\1([0-9]+)' - "42" 0 'userConfig.*backreference'
+  "feat/42-x" '^([a-z]+)/\1([0-9]+)' - "42" 0 'userConfig.*backreference.*ignored'
+
+new_case
+run_cfg "invalid-ERE userConfig env var ignored, default applies" \
+  "feat/42-x" "" '([' "42" 0 'userConfig.*invalid ERE.*ignored' 'stopped'
 
 # Notes never echo the raw repo-file value.
 new_case
 layer "${CASE_REPO}/.claude/source-control.md" 'ZQXMARK(['
 run_cfg "invalid-ERE note omits the raw pattern" \
-  "feat/42-x" "" - "42" 0 'source-control\.md' 'ZQXMARK'
+  "feat/42-x" "" - "" 1 'source-control\.md.*stopped' 'ZQXMARK'
 
 # Section parsing. The branch `feat/12-widget-34` makes a wrong source visible:
 # the intended trailing-number pattern gives 34, the built-in default gives 12.
@@ -272,43 +297,74 @@ run_cfg "near-miss heading inside a fence is ignored" "$WN" "" - "34" 0 empty
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n### note\n`^feat/([0-9]+)-`\n'
-run_cfg "heading as the first value line: layer skipped with a note" \
-  "$WN" "" - "34" 0 'source-control\.md.*heading.*skipped'
+run_cfg "heading as the first value line stops resolution over a valid user-global layer" \
+  "$WN" "" - "" 1 "source-control\.md.*heading.*${STOPPED}"
 
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n<!-- first number -->\n`^feat/([0-9]+)-`\n'
-run_cfg "HTML comment as the first value line: layer skipped with a note" \
-  "$WN" "" - "34" 0 'source-control\.md.*comment.*skipped'
+run_cfg "HTML comment as the first value line stops resolution over a valid user-global layer" \
+  "$WN" "" - "" 1 "source-control\.md.*comment.*${STOPPED}"
+
+new_case
+layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n<!-- first number -->\n'
+run_cfg "HTML comment first line alone: no output, never the default 12" \
+  "$WN" "" - "" 1 "source-control\.md.*comment.*${STOPPED}"
 
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n```\n^feat/([0-9]+)-\n'
-run_cfg "unterminated fence with content: layer skipped with a note" \
-  "$WN" "" - "34" 0 'source-control\.md.*unterminated'
+run_cfg "unterminated fence with content stops resolution" \
+  "$WN" "" - "" 1 "source-control\.md.*unterminated.*${STOPPED}"
+
+new_case
+layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
+layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n## trailer_policy\n\nnone\n'
+run_cfg "section with no value before the next heading stops resolution" \
+  "$WN" "" - "" 1 "source-control\.md.*no value.*${STOPPED}"
+
+new_case
+layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n'
+run_cfg "section with no value at end of file stops resolution, never the default" \
+  "$WN" "" - "" 1 "source-control\.md.*no value.*${STOPPED}"
+
+new_case
+layer_raw "${CASE_REPO}/.claude/source-control.md" $'## branch_issue_pattern\n\n``\n'
+run_cfg "value of only backticks stops resolution, never the default" \
+  "$WN" "" - "" 1 "source-control\.md.*no value.*${STOPPED}"
 
 # Pattern limits, checked before the pattern is compiled or matched. Each
-# rejected layer falls through to the user-global `-([0-9]+)$` (34).
+# rejected layer stops resolution; the user-global `-([0-9]+)$` (34) and the
+# default (12) must both stay unreached.
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer "${CASE_REPO}/.claude/source-control.md" "^feat/([0-9]+)-|$(printf 'z%.0s' {1..190})"
-run_cfg "pattern over 200 characters rejected" "$WN" "" - "34" 0 'source-control\.md.*too long' 'zzzzzzzz'
+run_cfg "pattern over 200 characters stops resolution" \
+  "$WN" "" - "" 1 "source-control\.md.*too long.*${STOPPED}" 'zzzzzzzz'
 
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer "${CASE_REPO}/.claude/source-control.md" '^feat/x{0,17}([0-9]+)-'
-run_cfg "repetition bound over 16 rejected" "$WN" "" - "34" 0 'source-control\.md.*repetition bound' 'x{0,17}'
+run_cfg "repetition bound over 16 stops resolution" \
+  "$WN" "" - "" 1 "source-control\.md.*repetition bound.*${STOPPED}" 'x{0,17}'
 
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer "${CASE_REPO}/.claude/source-control.md" '^feat/((1+)+)[0-9]*-'
-run_cfg "quantifier on a group holding a quantifier rejected" "$WN" "" - "34" 0 'source-control\.md.*nested quantifier' '(1+)+'
+run_cfg "quantifier on a group holding a quantifier stops resolution" \
+  "$WN" "" - "" 1 "source-control\.md.*nested quantifier.*${STOPPED}" '(1+)+'
 
 new_case
 layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
 layer "${CASE_REPO}/.claude/source-control.md" '^[a-z]+/((x{0,255}){0,255})([0-9]+)-'
-run_cfg "large nested bounded repetition rejected before it is compiled" \
-  "$WN" "" - "34" 0 'source-control\.md.*repetition bound' 'x{0,255}'
+run_cfg "large nested bounded repetition stops resolution before it is compiled" \
+  "$WN" "" - "" 1 "source-control\.md.*repetition bound.*${STOPPED}" 'x{0,255}'
+
+new_case
+layer "${CASE_HOME}/.claude/source-control.md" '-([0-9]+)$'
+layer "${CASE_REPO}/.claude/source-control.md" '^feat/([0-9]+)-\1'
+run_cfg "backreference team layer stops resolution over a valid user-global layer" \
+  "$WN" "" - "" 1 "source-control\.md.*backreference.*${STOPPED}" '\1'
 
 new_case
 run_cfg "nested-quantifier userConfig ignored, default applies" \
diff --git a/plugins/source-control/skills/setup/SKILL.md b/plugins/source-control/skills/setup/SKILL.md
index 12be0a4833..3c4add2a8c 100644
--- a/plugins/source-control/skills/setup/SKILL.md
+++ b/plugins/source-control/skills/setup/SKILL.md
@@ -65,7 +65,10 @@ token means unset), then the built-in `<type>/<N>-<slug>` convention. `won by` n
 `userConfig (deprecated)` with a WARN recommending `apply branch_issue_pattern=<ERE>`, or
 `plugin default`. Confirm the row by running
 `bash "${CLAUDE_PLUGIN_ROOT}/skills/pull-request/scripts/parse-branch-issue.sh" <sample-branch> '${user_config.branch_issue_pattern}'`
-from `REPO_ROOT` and relaying any stderr note, which names a skipped layer and the reason. The
+from `REPO_ROOT` and relaying any stderr note, which names the source and the reason. A note
+containing `resolution stopped` means that layer's section exists but yields no usable pattern:
+the script prints no number, whatever the lower sources say, so report the row as a FAIL naming
+that layer rather than the source a lower rung would have supplied. The
 single-quoted second argument passes the deprecated userConfig value, so a configuration set only
 there is reported correctly; the script ignores the literal placeholder when the key is unset.
 
diff --git a/plugins/source-control/skills/setup/reference/apply-convention.md b/plugins/source-control/skills/setup/reference/apply-convention.md
index 6dd155ce6f..b994a62630 100644
--- a/plugins/source-control/skills/setup/reference/apply-convention.md
+++ b/plugins/source-control/skills/setup/reference/apply-convention.md
@@ -81,11 +81,13 @@ file.
   body already holds one (`(a+)+`, `([a-z]+-)*`), holds a backreference (`\1` through `\9`), does
   not compile as an ERE, or has no capture group. Check the first three by reading the value, never
   by compiling it, since compiling a large bounded repetition can exhaust memory.
-  `parse-branch-issue.sh` applies the same limits and skips a layer that breaks any of the first
-  five, with a stderr note; a pattern with no capture group is not skipped but can never yield a
-  number, so the script prints nothing and exits 1. It reads the issue number from the **last**
-  capture group and prints it only when it is all digits. Write the heading exactly as
-  `## branch_issue_pattern`: a near-miss heading stops resolution
+  `parse-branch-issue.sh` applies the same limits: a layer that breaks any of the first five stops
+  resolution with a stderr note, printing no number rather than falling through to a lower
+  source; a pattern with no capture group can never yield a number either, so the script prints
+  nothing and exits 1. It reads the issue number from the **last** capture group and prints it
+  only when it is all digits. Write the heading exactly as `## branch_issue_pattern`, with the
+  value on its first non-blank line: a near-miss heading, a section with no value, or a heading or
+  HTML comment as that line also stops resolution
   ([config-resolution.md](../../../reference/config-resolution.md)).
 - **Alone** (no `subject_pattern=`): write or replace only the `## branch_issue_pattern` section of
   the chosen layer, value in backticks on the first line under the heading (a value that itself