@codedrifters/configulator 0.0.382 → 0.0.384

package/lib/index.js

@@ -291,6 +291,7 @@ __export(index_exports, {
   ROOT_CI_TASK_NAME: () => ROOT_CI_TASK_NAME,
   ROOT_TURBO_TASK_NAME: () => ROOT_TURBO_TASK_NAME,
   ReactViteSiteProject: () => ReactViteSiteProject,
+  RequirementIssueTemplate: () => RequirementIssueTemplate,
   ResetTask: () => ResetTask,
   SCHEDULED_TASK_MODEL_VALUES: () => SCHEDULED_TASK_MODEL_VALUES,
   SCOPE_CLASS_VALUES: () => SCOPE_CLASS_VALUES,
@@ -391,6 +392,7 @@ __export(index_exports, {
   maintenanceAuditBundle: () => maintenanceAuditBundle,
   meetingAnalysisBundle: () => meetingAnalysisBundle,
   mergeCdkOptions: () => mergeCdkOptions,
+  nextRequirementIdProcedure: () => nextRequirementIdProcedure,
   orchestratorBundle: () => orchestratorBundle,
   parseApiRollup: () => parseApiRollup,
   peopleProfileBundle: () => peopleProfileBundle,
@@ -438,11 +440,13 @@ __export(index_exports, {
   renderIssueTemplatesRuleContent: () => renderIssueTemplatesRuleContent,
   renderIssueTemplatesStarterPage: () => renderIssueTemplatesStarterPage,
   renderMeetingTypesSection: () => renderMeetingTypesSection,
+  renderNextRequirementIdProcedure: () => renderNextRequirementIdProcedure,
   renderPriorityRulesSection: () => renderPriorityRulesSection,
   renderProgressFileName: () => renderProgressFileName,
   renderProgressFilePath: () => renderProgressFilePath,
   renderProgressFilesBundleHook: () => renderProgressFilesBundleHook,
   renderProgressFilesRuleContent: () => renderProgressFilesRuleContent,
+  renderRequirementBlock: () => renderRequirementBlock,
   renderRunRatioSection: () => renderRunRatioSection,
   renderRunRatioShellHelpers: () => renderRunRatioShellHelpers,
   renderScheduledTaskSkillFile: () => renderScheduledTaskSkillFile,
@@ -14235,6 +14239,16 @@ var DEFAULT_BUNDLE_OVERRIDES = {
   "meeting:link": {
     acceptanceCriteria: { smallMax: 3, mediumMax: 15 },
     sources: { smallMax: 2, mediumMax: 10 }
+  },
+  "type:docs": {
+    acceptanceCriteria: { smallMax: 3, mediumMax: 12 }
+  },
+  "bcm:context": {
+    acceptanceCriteria: { smallMax: 3, mediumMax: 12 }
+  },
+  "req:scan": {
+    acceptanceCriteria: { smallMax: 3, mediumMax: 12 },
+    sources: { smallMax: 2, mediumMax: 12 }
   }
 };
 var DEFAULT_DECOMPOSITION_TEMPLATE = [
@@ -15283,6 +15297,55 @@ function shellSingleQuote(value) {
 }
 
 // src/agent/bundles/orchestrator.ts
+function renderDelegationActiveSignalsHelper() {
+  return [
+    "# delegation_active_signals <pr-number> <head-oid>",
+    "# Echo a \\x1f-separated triple: <fixlist_at><US><report_at><US><head_at>",
+    "# (US = ASCII Unit Separator; see the printf below for why not a tab).",
+    "# Each field is an ISO-8601 timestamp or empty. Shared by the",
+    "# feedback-drain (cmd_needs_worker) and the lease-reconcile",
+    "# (cmd_lease_reconcile) so both judge a delegation 'active' the same",
+    "# way. See the block comment above the renderer for field semantics.",
+    "delegation_active_signals() {",
+    '  local pr_num="$1"',
+    '  local head_oid="${2:-}"',
+    "",
+    "  # Pull the PR comments once; derive both the fix-list reference time",
+    "  # and the newest worker-report time from the same payload.",
+    "  local comments",
+    '  comments=$(gh pr view "$pr_num" --json comments \\',
+    `    --jq '.comments' 2>/dev/null || echo "[]")`,
+    "",
+    "  # Newest fix-list comment createdAt (empty if none found).",
+    "  local fixlist_at",
+    `  fixlist_at=$(echo "$comments" | jq -r '`,
+    '    [.[] | select(.body | contains("## Reviewer: fix list for @issue-worker"))]',
+    `    | sort_by(.createdAt) | last | .createdAt // ""' 2>/dev/null)`,
+    "",
+    "  # Newest worker-report createdAt (empty if none found). Keyed off the",
+    "  # stable HTML marker complete-feedback-handoff.sh embeds.",
+    "  local report_at",
+    `  report_at=$(echo "$comments" | jq -r '`,
+    '    [.[] | select(.body | contains("issue-worker feedback hand-off \u2014 review:needs-worker cleared"))]',
+    `    | sort_by(.createdAt) | last | .createdAt // ""' 2>/dev/null)`,
+    "",
+    "  # Branch HEAD committer date (empty when no head-oid or lookup fails).",
+    '  local head_at=""',
+    '  if [[ -n "$head_oid" ]]; then',
+    '    head_at=$(gh api "repos/{owner}/{repo}/commits/${head_oid}" \\',
+    `      --jq '.commit.committer.date // ""' 2>/dev/null || echo "")`,
+    "  fi",
+    "",
+    "  # Emit the triple delimited by the ASCII Unit Separator (\\x1f), NOT a",
+    "  # tab: any field may be empty, and `read` with a whitespace IFS (tab",
+    "  # counts) collapses adjacent empty fields \u2014 which would shift head_at",
+    "  # into report_at. \\x1f is non-whitespace and never appears in a",
+    "  # timestamp, so callers `IFS=$'\\x1f' read -r fixlist_at report_at",
+    "  # head_at` recover all three fields even when the middle one is empty.",
+    `  printf '%s\\x1f%s\\x1f%s\\n' "$fixlist_at" "$report_at" "$head_at"`,
+    "}"
+  ];
+}
 function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
   const tierCase = renderAgentTierCaseStatement(tiers);
   const scopeHelper = renderScopeGateShellHelpers(scopeGate);
@@ -15345,12 +15408,20 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "",
     scopeHelperIndented,
     "",
+    ...renderDelegationActiveSignalsHelper(),
+    "",
     "# \u2500\u2500 subcommands \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
     "",
     "cmd_unblock() {",
+    "  # Fetch ALL open status:blocked issues, not just the first page (#823).",
+    "  # This is a label-filtered `gh issue list` (REST issues endpoint, which gh",
+    "  # paginates up to --limit) \u2014 NOT a --search query \u2014 so a large ceiling is",
+    "  # safe from the search-API secondary rate limits that cap unblock-dependents",
+    "  # at 100. An all-deps-closed issue must be reachable regardless of backlog",
+    "  # position.",
     "  local issues",
     '  issues=$(gh issue list --label "status:blocked" --state open \\',
-    '    --json number,body --limit 50 2>/dev/null || echo "[]")',
+    '    --json number,body --limit 1000 2>/dev/null || echo "[]")',
     "",
     "  local count",
     `  count=$(echo "$issues" | jq 'length')`,
@@ -15518,9 +15589,10 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "",
     "cmd_stale() {",
     "  # Check in-progress issues",
+    "  # (#823) cover all in-progress issues, not just the first 50",
     "  local ip_issues",
     '  ip_issues=$(gh issue list --label "status:in-progress" --state open \\',
-    '    --json number,title,updatedAt --limit 50 2>/dev/null || echo "[]")',
+    '    --json number,title,updatedAt --limit 1000 2>/dev/null || echo "[]")',
     "",
     "  local ip_count",
     `  ip_count=$(echo "$ip_issues" | jq 'length')`,
@@ -15545,9 +15617,10 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "  fi",
     "",
     "  # Check blocked issues",
+    "  # (#823) cover all blocked issues, not just the first 50",
     "  local bl_issues",
     '  bl_issues=$(gh issue list --label "status:blocked" --state open \\',
-    '    --json number,title,updatedAt --limit 50 2>/dev/null || echo "[]")',
+    '    --json number,title,updatedAt,body --limit 1000 2>/dev/null || echo "[]")',
     "",
     "  local bl_count",
     `  bl_count=$(echo "$bl_issues" | jq 'length')`,
@@ -15558,13 +15631,36 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     '      || date -u -d "${STALE_BLOCKED_HOURS} hours ago" +%Y-%m-%dT%H:%M:%S 2>/dev/null)',
     "",
     "    local bl_data",
-    `    bl_data=$(echo "$bl_issues" | jq -r '.[] | "\\(.number)\\t\\(.title)\\t\\(.updatedAt)"')`,
+    `    bl_data=$(echo "$bl_issues" | jq -r '`,
+    "      .[] |",
+    '      (.body | split("\\n") | map(select(test("Depends on:"; "i"))) | .[0] // "") as $dep_line |',
+    '      "\\(.number)\\t\\(.title)\\t\\(.updatedAt)\\t\\($dep_line)"',
+    "    ')",
     "",
-    "    while IFS=$'\\t' read -r num title updated; do",
+    "    while IFS=$'\\t' read -r num title updated dep_line; do",
     '      [[ -z "$num" ]] && continue',
     '      local updated_trimmed="${updated%%+*}"',
     '      updated_trimmed="${updated_trimmed%%Z*}"',
     '      if [[ "$updated_trimmed" < "$bl_threshold" ]]; then',
+    "        # (#822) Only flag a blocked issue with NO resolvable open dependency.",
+    "        # A parseable `Depends on: #N` naming any OPEN issue means the block is",
+    "        # legitimate phase-chain progress (the unblock sweep clears it when the",
+    "        # dep closes) \u2014 do NOT flag. Reserve the >7d flag for issues with no",
+    "        # `Depends on:` line, or whose deps are all closed yet still blocked.",
+    '        local deps=""',
+    '        [[ -n "$dep_line" ]] && deps=$(parse_deps "$dep_line")',
+    "        local has_open_dep=false",
+    '        if [[ -n "${deps// /}" ]]; then',
+    "          for dep in $deps; do",
+    '            if ! is_closed "$dep"; then',
+    "              has_open_dep=true",
+    "              break",
+    "            fi",
+    "          done",
+    "        fi",
+    "        if $has_open_dep; then",
+    "          continue",
+    "        fi",
     '        local date_part="${updated_trimmed%%T*}"',
     '        echo "STALE_BLOCKED #${num} \u2014 blocked since ${date_part} \u2014 \\"${title}\\""',
     "      fi",
@@ -15661,7 +15757,10 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "  #     `review:fixing` lease is left for that confirm pass to release,",
     "  #     mirroring complete-feedback-handoff.sh.",
     "  #",
-    "  # Signals (all read via gh/jq):",
+    "  # Signals \u2014 gathered by the shared `delegation_active_signals`",
+    "  # helper (defined once, embedded here AND in pr-sweep.sh's",
+    "  # cmd_needs_worker) so the reconcile and the feedback-drain judge a",
+    "  # delegation 'active' identically:",
     "  #   - fix-list comment: the reviewer's most recent PR comment whose",
     "  #     body contains the stable heading `## Reviewer: fix list for",
     "  #     @issue-worker`. Its createdAt is the lease's reference time.",
@@ -15670,7 +15769,7 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "  #     `<!-- issue-worker feedback hand-off \u2014 review:needs-worker",
     "  #     cleared -->` posted by complete-feedback-handoff.sh. Presence +",
     "  #     createdAt newer than the fix-list means a result landed.",
-    "  #   - branch HEAD: the PR head commit committedDate, compared against",
+    "  #   - branch HEAD: the PR head commit committer date, compared against",
     "  #     the fix-list createdAt to detect a push that advanced past the",
     "  #     delegation without a hand-off.",
     "",
@@ -15707,24 +15806,14 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "  while IFS=$'\\t' read -r pr_num has_marker head_oid; do",
     '    [[ -z "$pr_num" ]] && continue',
     "",
-    "    # Pull the PR comments once; derive both the fix-list reference time",
-    "    # and the newest worker-report time from the same payload.",
-    "    local comments",
-    '    comments=$(gh pr view "$pr_num" --json comments \\',
-    `      --jq '.comments' 2>/dev/null || echo "[]")`,
-    "",
-    "    # Newest fix-list comment createdAt (empty if none found).",
-    "    local fixlist_at",
-    `    fixlist_at=$(echo "$comments" | jq -r '`,
-    '      [.[] | select(.body | contains("## Reviewer: fix list for @issue-worker"))]',
-    `      | sort_by(.createdAt) | last | .createdAt // ""' 2>/dev/null)`,
-    "",
-    "    # Newest worker-report createdAt (empty if none found). Keyed off the",
-    "    # stable HTML marker complete-feedback-handoff.sh embeds.",
-    "    local report_at",
-    `    report_at=$(echo "$comments" | jq -r '`,
-    '      [.[] | select(.body | contains("issue-worker feedback hand-off \u2014 review:needs-worker cleared"))]',
-    `      | sort_by(.createdAt) | last | .createdAt // ""' 2>/dev/null)`,
+    "    # Gather the shared delegation-active signals in one call \u2014 the same",
+    "    # helper the feedback-drain (cmd_needs_worker) uses, so the two never",
+    "    # disagree on whether a delegation is demonstrably active. Yields the",
+    "    # fix-list reference time, the newest worker-report time, and the",
+    "    # branch HEAD committer date.",
+    "    local signals fixlist_at report_at head_at",
+    '    signals=$(delegation_active_signals "$pr_num" "$head_oid")',
+    `    IFS=$'\\x1f' read -r fixlist_at report_at head_at <<< "$signals"`,
     "",
     "    # No fix-list comment at all \u2014 we cannot reason about this lease",
     "    # (e.g. a human applied `review:fixing` by hand). Leave it alone.",
@@ -15743,9 +15832,6 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "      # Marker still set + no worker-report. Reconcile only when the",
     "      # branch advanced past the fix-list (the worker pushed but skipped",
     "      # the hand-off); otherwise this is a normal in-flight delegation.",
-    "      local head_at",
-    '      head_at=$(gh api "repos/{owner}/{repo}/commits/${head_oid}" \\',
-    `        --jq '.commit.committer.date // ""' 2>/dev/null || echo "")`,
     '      if [[ -n "$head_at" && "$head_at" > "$fixlist_at" ]]; then',
     '        if gh pr edit "$pr_num" --remove-label "review:needs-worker" >/dev/null 2>&1; then',
     '          gh pr comment "$pr_num" \\',
@@ -15819,6 +15905,16 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "        # Extract the issue number after the '#' and before the ' '.",
     "        local num=${line#STALE #}",
     "        num=${num%% *}",
+    "        # (#822) Idempotent: never re-apply the human-clear-only flag to an",
+    "        # issue that already carries status:needs-attention.",
+    "        local existing_labels",
+    '        existing_labels=$(gh issue view "$num" --json labels \\',
+    `          --jq '.labels | map(.name) | index("status:needs-attention") != null' 2>/dev/null || echo "false")`,
+    '        if [[ "$existing_labels" == "true" ]]; then',
+    '          echo "SKIP_FLAGGED #${num} \u2014 already status:needs-attention (in-progress)"',
+    '          echo "$line"',
+    "          continue",
+    "        fi",
     '        if gh issue edit "$num" --add-label "status:needs-attention" >/dev/null 2>&1; then',
     '          gh issue comment "$num" \\',
     '            --body "Flagged: in-progress for >3 days with no activity." >/dev/null 2>&1 || true',
@@ -15833,9 +15929,19 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "      'STALE_BLOCKED #'*)",
     "        local num=${line#STALE_BLOCKED #}",
     "        num=${num%% *}",
+    "        # (#822) Idempotent: never re-apply the human-clear-only flag to an",
+    "        # issue that already carries status:needs-attention.",
+    "        local existing_labels",
+    '        existing_labels=$(gh issue view "$num" --json labels \\',
+    `          --jq '.labels | map(.name) | index("status:needs-attention") != null' 2>/dev/null || echo "false")`,
+    '        if [[ "$existing_labels" == "true" ]]; then',
+    '          echo "SKIP_FLAGGED #${num} \u2014 already status:needs-attention (blocked)"',
+    '          echo "$line"',
+    "          continue",
+    "        fi",
     '        if gh issue edit "$num" --add-label "status:needs-attention" >/dev/null 2>&1; then',
     '          gh issue comment "$num" \\',
-    '            --body "Flagged: blocked for >7 days \u2014 may need human intervention." >/dev/null 2>&1 || true',
+    '            --body "Flagged: blocked for >7 days with no resolvable dependency \u2014 may need human intervention." >/dev/null 2>&1 || true',
     '          echo "FLAGGED_BLOCKED #${num} \u2014 added status:needs-attention"',
     "          flagged_blocked_count=$((flagged_blocked_count + 1))",
     "        else",
@@ -16096,11 +16202,12 @@ function buildPrSweepScript() {
     "#                 PR_ELIGIBLE / PR_SKIP line per open PR; the",
     "#                 orchestrator dispatches `pr-reviewer` per eligible PR.",
     "#   needs-worker \u2014 Phase B1 feedback-drain. Emits one DRAIN line per",
-    "#                 open PR carrying the `review:needs-worker` marker that",
-    "#                 is NOT already in-flight (no `review:fixing` lease),",
+    "#                 open PR carrying the `review:needs-worker` marker,",
     "#                 ordered highest-priority-first so the orchestrator",
     "#                 dispatches `issue-worker` per PR to consume the",
-    "#                 reviewer's fix-list.",
+    "#                 reviewer's fix-list. A PR that also holds the",
+    "#                 `review:fixing` lease still drains unless a worker is",
+    "#                 demonstrably active (see the needs-worker skip rules).",
     "#",
     "# Review-mode skip rules:",
     "#   - isDraft = true                          \u2192 reason=draft",
@@ -16108,10 +16215,21 @@ function buildPrSweepScript() {
     "#   - review:awaiting-human label             \u2192 reason=awaiting-human",
     "#",
     "# Needs-worker-mode skip rules (PR carries review:needs-worker but is",
-    "# not eligible to drain this cycle):",
-    "#   - review:fixing label present             \u2192 reason=in-flight",
-    "#     (a delegation is already being consumed; the marker plus the",
-    "#      lease means another worker is mid-run \u2014 skip to stay idempotent)",
+    "# not eligible to drain this cycle). A PR with NO review:fixing lease",
+    "# always drains \u2014 an idle marker means no worker has been dispatched.",
+    "# A PR that ALSO carries review:fixing drains UNLESS a worker is",
+    "# demonstrably active, judged by the SAME signals the lease-reconcile",
+    "# uses (fix-list / worker-report / branch-HEAD timestamps):",
+    "#   - no reviewer fix-list comment              \u2192 reason=no-fixlist",
+    "#     (nothing to drain \u2014 e.g. a hand-applied lease; be conservative)",
+    "#   - worker-report newer than the fix-list     \u2192 reason=reported",
+    "#     (a worker result already landed \u2014 the reviewer confirm pass owns it)",
+    "#   - branch HEAD newer than the fix-list       \u2192 reason=in-flight",
+    "#     (a worker pushed \u2014 actively fixing / consumed-uncleared; the",
+    "#      lease-reconcile owns it)",
+    "#   - otherwise (delegated but idle, no worker has touched it) \u2192 DRAIN.",
+    "#     This is the deadlock fix: the FIRST worker of a delegation is",
+    "#     dispatched instead of being skipped forever on the bare lease.",
     "#",
     "# Usage:",
     "#   .claude/procedures/pr-sweep.sh [review|needs-worker]",
@@ -16147,6 +16265,8 @@ function buildPrSweepScript() {
     "  esac",
     "}",
     "",
+    ...renderDelegationActiveSignalsHelper(),
+    "",
     "# \u2500\u2500 modes \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
     "",
     "cmd_review() {",
@@ -16181,15 +16301,22 @@ function buildPrSweepScript() {
     "",
     "cmd_needs_worker() {",
     "  # Phase B1 feedback-drain: enumerate open PRs carrying the durable",
-    "  # `review:needs-worker` marker that are NOT already in-flight (no",
-    "  # `review:fixing` lease), ordered highest-priority-first so the",
-    "  # orchestrator dispatches `issue-worker` per PR to consume the",
-    "  # reviewer's fix-list. A PR holding both labels is a delegation",
-    "  # mid-flight \u2014 it is skipped (reason=in-flight) so the drain stays",
-    "  # idempotent and respects the cross-session lease semantics.",
+    "  # `review:needs-worker` marker and dispatch `issue-worker` per PR to",
+    "  # consume the reviewer's fix-list, ordered highest-priority-first.",
+    "  #",
+    "  # A PR without the `review:fixing` lease is an idle marker \u2014 no worker",
+    "  # has been dispatched \u2014 so it DRAINs directly. A PR that ALSO carries",
+    "  # `review:fixing` is a delegation; it DRAINs UNLESS a worker is",
+    "  # demonstrably active, judged by the shared `delegation_active_signals`",
+    "  # helper (the SAME signals cmd_lease_reconcile uses). Crucially, the",
+    "  # bare presence of `review:fixing` no longer skips: the reviewer",
+    "  # acquires the lease and applies the marker in ONE atomic pass and",
+    "  # then holds the lease across sessions, so a lease with no worker",
+    "  # activity yet is a delegated-but-idle PR whose FIRST worker must be",
+    "  # dispatched \u2014 skipping it on the bare lease wedged the PR forever.",
     "  local prs",
     "  prs=$(gh pr list --state open --label 'review:needs-worker' \\",
-    '    --json number,labels --limit 50 2>/dev/null || echo "[]")',
+    '    --json number,labels,headRefOid --limit 50 2>/dev/null || echo "[]")',
     "",
     "  local count",
     `  count=$(echo "$prs" | jq 'length')`,
@@ -16198,34 +16325,65 @@ function buildPrSweepScript() {
     "    return 0",
     "  fi",
     "",
-    "  # First pass: split into skip (in-flight) and drain-candidate sets.",
-    "  # The skip lines are emitted immediately for log visibility; the",
-    "  # candidates are resolved to a priority key and sorted before",
-    "  # emission so the orchestrator drains highest-priority first.",
+    "  # First pass: classify each PR. A PR with no `review:fixing` lease is",
+    "  # an idle marker \u2192 DRAIN directly (head-oid unused). A PR that also",
+    "  # carries `review:fixing` is a CANDIDATE \u2014 the demonstrably-active",
+    "  # predicate is applied per-PR in the loop below (it needs comment /",
+    "  # commit reads, so it cannot live in jq). Emit `kind\\tnumber\\thead`.",
     "  local candidates",
     `  candidates=$(echo "$prs" | jq -r '`,
     "    sort_by(.number) |",
     "    .[] |",
     "    (.labels | map(.name)) as $labels |",
     '    if ($labels | index("review:fixing")) then',
-    '      "SKIP\\t\\(.number)"',
+    '      "CANDIDATE\\t\\(.number)\\t\\(.headRefOid)"',
     "    else",
-    '      "DRAIN\\t\\(.number)"',
+    '      "DRAIN\\t\\(.number)\\t"',
     "    end",
     "  ')",
     "",
     '  local drain_rows=""',
     '  local emitted_any=""',
-    "  while IFS=$'\\t' read -r kind pr_num; do",
+    "  while IFS=$'\\t' read -r kind pr_num head_oid; do",
     '    [[ -z "$pr_num" ]] && continue',
-    '    if [[ "$kind" == "SKIP" ]]; then',
-    '      echo "PR_SKIP #${pr_num} reason=in-flight"',
-    '      emitted_any="1"',
-    "      continue",
+    "",
+    '    if [[ "$kind" == "CANDIDATE" ]]; then',
+    "      # `review:fixing` present \u2014 drain UNLESS a worker is demonstrably",
+    "      # active. Mirror cmd_lease_reconcile's skip conditions exactly so",
+    "      # the drain and the reconcile never diverge on what 'active' means.",
+    "      local signals fixlist_at report_at head_at",
+    '      signals=$(delegation_active_signals "$pr_num" "$head_oid")',
+    `      IFS=$'\\x1f' read -r fixlist_at report_at head_at <<< "$signals"`,
+    "",
+    '      if [[ -z "$fixlist_at" ]]; then',
+    "        # No reviewer fix-list (e.g. a hand-applied lease). Nothing to",
+    "        # drain \u2014 be conservative and leave it for a human / reconcile.",
+    '        echo "PR_SKIP #${pr_num} reason=no-fixlist"',
+    '        emitted_any="1"',
+    "        continue",
+    "      fi",
+    '      if [[ -n "$report_at" && "$report_at" > "$fixlist_at" ]]; then',
+    "        # A worker result already landed \u2014 the reviewer confirm pass",
+    "        # owns this PR now, not the drain.",
+    '        echo "PR_SKIP #${pr_num} reason=reported"',
+    '        emitted_any="1"',
+    "        continue",
+    "      fi",
+    '      if [[ -n "$head_at" && "$head_at" > "$fixlist_at" ]]; then',
+    "        # Branch advanced past the fix-list \u2192 a worker pushed. Actively",
+    "        # fixing (or consumed-uncleared); the lease-reconcile owns it.",
+    '        echo "PR_SKIP #${pr_num} reason=in-flight"',
+    '        emitted_any="1"',
+    "        continue",
+    "      fi",
+    "      # else: delegated but idle \u2014 no worker has touched it. Fall",
+    "      # through to DRAIN. THIS is the deadlock fix.",
     "    fi",
-    "    # DRAIN candidate \u2014 resolve the linked issue's priority so the",
-    "    # drain order is highest-priority-first, tie-broken by PR number",
-    "    # ascending (FIFO, mirroring the queue scan's number-asc tie-break).",
+    "",
+    "    # DRAIN (idle marker, or a delegated-but-idle candidate that fell",
+    "    # through) \u2014 resolve the linked issue's priority so the drain order",
+    "    # is highest-priority-first, tie-broken by PR number ascending",
+    "    # (FIFO, mirroring the queue scan's number-asc tie-break).",
     "    local pkey",
     '    pkey=$(priority_key_for_pr "$pr_num")',
     '    drain_rows="${drain_rows}${pkey}\\t${pr_num}\\n"',
@@ -16263,7 +16421,7 @@ function buildPrSweepScript() {
 function buildPrSweepProcedure() {
   return {
     name: "pr-sweep.sh",
-    description: "Token-efficient PR enumeration for the orchestrator. In `review` mode (default) it emits one `PR_ELIGIBLE #<n>` or `PR_SKIP #<n> reason=<draft|human-required|awaiting-human>` line per open PR so the orchestrator dispatches `pr-reviewer` per eligible PR. In `needs-worker` mode it lists open PRs carrying the `review:needs-worker` marker that are not already in-flight (skipping any holding the `review:fixing` lease as `reason=in-flight`), emitting `PR_DRAIN #<n>` lines ordered highest-priority-first so the orchestrator drains the feedback queue by dispatching `issue-worker` per PR; `NO_NEEDS_WORKER_PRS` when none.",
+    description: "Token-efficient PR enumeration for the orchestrator. In `review` mode (default) it emits one `PR_ELIGIBLE #<n>` or `PR_SKIP #<n> reason=<draft|human-required|awaiting-human>` line per open PR so the orchestrator dispatches `pr-reviewer` per eligible PR. In `needs-worker` mode it lists open PRs carrying the `review:needs-worker` marker and drains them, emitting `PR_DRAIN #<n>` lines ordered highest-priority-first so the orchestrator dispatches `issue-worker` per PR. A PR without the `review:fixing` lease is an idle marker and always drains; a PR that also holds `review:fixing` drains UNLESS a worker is demonstrably active (judged by the shared `delegation_active_signals` helper cmd_lease_reconcile also uses) \u2014 skipping as `reason=no-fixlist` / `reason=reported` / `reason=in-flight`. `NO_NEEDS_WORKER_PRS` when none.",
     content: buildPrSweepScript()
   };
 }
@@ -16544,19 +16702,27 @@ var orchestratorSubAgent = {
     "",
     "```",
     "PR_DRAIN #<n>",
-    "PR_SKIP #<n> reason=in-flight",
+    "PR_SKIP #<n> reason=<no-fixlist|reported|in-flight>",
     "```",
     "",
     "The procedure enumerates every open PR carrying the",
     "`review:needs-worker` marker, ordered **highest-priority-first**",
-    "(linked-issue `priority:*`, tie-broken by PR number ascending). It",
-    "skips \u2014 never drains \u2014 any PR that **also** carries the",
-    "`review:fixing` lease: that label pair means a delegation is already",
-    "in flight (a worker is mid-run or the reviewer's confirm pass is",
-    "pending), so re-dispatching would double-work the fix-list. This is",
-    "what makes the phase **idempotent** \u2014 a PR already being worked, or",
-    "one whose marker was already cleared by a finished worker, never",
-    "appears as a `PR_DRAIN` line.",
+    "(linked-issue `priority:*`, tie-broken by PR number ascending). A PR",
+    "with an idle marker (no `review:fixing` lease) always drains. A PR",
+    "that **also** carries the `review:fixing` lease still drains **unless",
+    "a worker is demonstrably active** \u2014 the reviewer acquires the lease",
+    "and applies the marker in one atomic pass and then holds the lease",
+    "across sessions, so the bare lease does **not** mean a worker is",
+    "running. The procedure judges 'active' with the same",
+    "`delegation_active_signals` helper the maintenance lease-reconcile",
+    "uses, skipping only when: there is no reviewer fix-list comment",
+    "(`reason=no-fixlist`), a worker-report already landed newer than the",
+    "fix-list (`reason=reported`), or the branch HEAD advanced past the",
+    "fix-list (`reason=in-flight`). A delegated-but-idle PR \u2014 lease held",
+    "but no worker has touched it \u2014 **drains**, so its FIRST worker gets",
+    "dispatched instead of the PR wedging forever. The phase stays",
+    "**idempotent**: a PR actively being worked, or one whose worker",
+    "already reported, never appears as a `PR_DRAIN` line.",
     "",
     "If the script emits `NO_NEEDS_WORKER_PRS`, log the empty result and",
     "skip directly to Phase C.",
@@ -16908,9 +17074,12 @@ var orchestratorSubAgent = {
     "    PR (highest-priority first) to consume the reviewer's fix-list,",
     "    and loops until the queue is empty \u2014 feedback PRs are preferred",
     "    over fresh issues, so Phase B1 runs before Phase E / Phase G.",
-    "    Skip any PR that also carries the `review:fixing` lease (a",
-    "    delegation already in flight) so the drain stays idempotent. A",
-    "    single worker's failure never stops the drain; the next cycle",
+    "    A PR that also carries the `review:fixing` lease still drains",
+    "    **unless a worker is demonstrably active** (the procedure skips",
+    "    it as `reason=no-fixlist` / `reason=reported` / `reason=in-flight`",
+    "    via the shared active-signals check) \u2014 a delegated-but-idle PR",
+    "    holding the bare lease drains so its first worker is dispatched.",
+    "    A single worker's failure never stops the drain; the next cycle",
     "    re-dispatches against any PR whose marker is still unconsumed."
   ].join("\n")
 };
@@ -17613,8 +17782,8 @@ var ORCHESTRATOR_CONVENTIONS_PREAMBLE = [
   "",
   "- The orchestrator runs **one full end-to-end cycle every invocation**: startup \u2192 PR review sweep \u2192 feedback drain \u2192 triage / unblock \u2192 maintenance \u2192 queue scan \u2192 delegate to `issue-worker` \u2192 cleanup",
   "- The orchestrator **never** implements code, creates branches, or pushes commits \u2014 it routes work to other sub-agents. The merge decision is still owned by the `pr-reviewer` sub-agent; Phase B only chooses which open PRs the reviewer should look at and dispatches one reviewer session per eligible PR (skipping drafts and any PR carrying `review:human-required` or `review:awaiting-human`).",
-  "- **Phase B produces `review:needs-worker` markers; Phase B1 consumes them.** Phase B's `pr-reviewer` dispatch leaves a durable `review:needs-worker` marker whenever it delegates a fix-list (it cannot spawn the worker in session \u2014 it may run at depth-1). Phase B1 (feedback drain) actively drains that queue every cycle: it dispatches a top-level `issue-worker` per open `review:needs-worker` PR \u2014 highest-priority first, looping until the queue is empty \u2014 to consume the reviewer's fix-list. **Feedback PRs are preferred over fresh issues**, so Phase B1 runs after the review sweep but before the queue scan (Phase E) and fresh delegation (Phase G). A PR that also carries the `review:fixing` lease is a delegation already in flight and is skipped, keeping the drain idempotent.",
-  "- All triage queries use `.claude/procedures/check-blocked.sh` for token efficiency. PR-eligibility filtering for Phase B uses `.claude/procedures/pr-sweep.sh review`, which emits `PR_ELIGIBLE` / `PR_SKIP` lines; the Phase B1 feedback-drain enumeration uses `.claude/procedures/pr-sweep.sh needs-worker`, which emits `PR_DRAIN` / `PR_SKIP reason=in-flight` lines. The orchestrator never iterates raw `gh pr list` JSON.",
+  "- **Phase B produces `review:needs-worker` markers; Phase B1 consumes them.** Phase B's `pr-reviewer` dispatch leaves a durable `review:needs-worker` marker whenever it delegates a fix-list (it cannot spawn the worker in session \u2014 it may run at depth-1). Phase B1 (feedback drain) actively drains that queue every cycle: it dispatches a top-level `issue-worker` per open `review:needs-worker` PR \u2014 highest-priority first, looping until the queue is empty \u2014 to consume the reviewer's fix-list. **Feedback PRs are preferred over fresh issues**, so Phase B1 runs after the review sweep but before the queue scan (Phase E) and fresh delegation (Phase G). A PR that also carries the `review:fixing` lease still drains **unless a worker is demonstrably active** \u2014 the reviewer acquires the lease and applies the marker in one atomic pass and holds the lease across sessions, so the bare lease does not mean a worker is running. The drain judges 'active' with the same `delegation_active_signals` helper the maintenance lease-reconcile uses: it skips only when there is no reviewer fix-list (`reason=no-fixlist`), a worker-report already landed (`reason=reported`), or the branch HEAD advanced past the fix-list (`reason=in-flight`); otherwise the delegated-but-idle PR drains so its FIRST worker gets dispatched.",
+  "- All triage queries use `.claude/procedures/check-blocked.sh` for token efficiency. PR-eligibility filtering for Phase B uses `.claude/procedures/pr-sweep.sh review`, which emits `PR_ELIGIBLE` / `PR_SKIP` lines; the Phase B1 feedback-drain enumeration uses `.claude/procedures/pr-sweep.sh needs-worker`, which emits `PR_DRAIN` / `PR_SKIP reason=<no-fixlist|reported|in-flight>` lines. The orchestrator never iterates raw `gh pr list` JSON.",
   "- The queue scan reads only `priority:*` and `status:*` labels \u2014 type-routing (which typed agent handles a given `type:*` label) is the `issue-worker`'s concern, not the orchestrator's. The orchestrator's funnel-tier sort is a tie-breaker on `priority:*`, not a routing decision.",
   "- Priority order: critical > high > medium > low > trivial, then **funnel tier asc** (lower tier wins ties), then FIFO by issue number. Phase E's queue scan walks each priority bucket in turn (one `gh issue list` call per bucket, **capped at 50 issues per bucket**) and short-circuits on the first bucket whose survivors clear the `Depends on:` filter, so every higher-priority issue is visible even when the global ready backlog is much larger than 50.",
   "- Stale thresholds: 72h for in-progress, 168h for blocked",
@@ -22354,11 +22523,47 @@ function buildRegulatoryResearchAnalystSubAgent(paths, issueDefaults) {
       "",
       "   ## Traceability",
       "   - **Source regulation:** <citation>",
-      "   - **Requirements created:** #<N>, #<N> (SEC req:scan issues)",
       "   - **Affected segments:** <relative links>",
       "   - **Standards implementing:** <relative links> (if applicable)",
+      "",
+      "   **Requirements created** (one per line, ascending issue-number",
+      "   order \u2014 append your own entries only):",
+      "",
+      "   - #<N> \u2014 <PREFIX> req:scan",
       "   ```",
       "",
+      "   The **Requirements created** block is an **append-only,",
+      "   one-issue-per-line, deterministically sorted** list \u2014 it is a",
+      "   merge-conflict hotspot because sibling `regulatory:impact`",
+      "   sessions land requirement entries into the same regulation page",
+      "   concurrently. Maintain it under the following discipline (the",
+      "   same discipline the `shared-editing-safety` rule prescribes for",
+      "   shared registries, applied here to this one list section \u2014 the",
+      "   surrounding regulation page is a hand-authored document, not a",
+      "   registry, so only this section is governed):",
+      "",
+      "   - **One entry per line.** Write each requirement you created as",
+      "     its own new `- #<N> \u2014 <PREFIX> req:scan` bullet. Never collapse",
+      "     entries into a single comma-separated",
+      "     `**Requirements created:** #N, #M` line \u2014 that single mutable",
+      "     line is the original conflict cause and always conflicts when",
+      "     two sessions touch it.",
+      "   - **Ascending issue-number order.** Insert your bullet in the",
+      "     position that keeps the list sorted by issue number. A",
+      "     single-line bullet insert into a sorted list rarely truly",
+      "     conflicts, so git auto-merges concurrent sibling inserts.",
+      "   - **Append-only.** Never rewrite, reorder, or merge existing",
+      "     bullets. If a legacy comma line",
+      "     (`**Requirements created:** #N, #M`) already exists on the",
+      "     page, leave it untouched and add your entries as per-line",
+      "     bullets below it \u2014 do **not** rewrite the legacy line, because",
+      "     rewriting it is itself a conflict.",
+      "   - **Defer the commit of this section to the final pre-push",
+      "     step.** Pull the latest default branch before inserting, insert",
+      "     only your own entry, and if a concurrent sibling already landed",
+      "     a bullet, rebase and re-insert. Commit this shared list section",
+      "     on its own at the end, then push immediately.",
+      "",
       "4. **Create `req:scan` issues** for each capability gap identified.",
       "   Each issue hands off to the `requirements-analyst` bundle so its",
       "   scan phase can deduplicate and open `req:write` issues in the",
@@ -22901,6 +23106,13 @@ var REQ_WRITE_ISSUE_SCHEMA_SECTION = [
   "",
   "### Strongly Recommended",
   "",
+  "- **Requirement ID:** the reserved requirement ID (e.g.",
+  "  `FR-1240`), a HINT allocated at issue-creation. Optional \u2014",
+  "  legacy issues may omit it. The writer re-validates and finalizes",
+  "  the ID at write-start (via `next-requirement-id.sh`) before",
+  "  authoring, so this field is advisory: if a concurrent claim took",
+  "  the reserved number, the writer authors under the freshly",
+  "  finalized ID instead and updates this field to match.",
   "- **Inputs / Read:** bullet list of source files the writer should",
   "  consult \u2014 the upstream proposal file (when one exists), the",
   "  BCM/source document(s) the proposal cites, and any related",
@@ -22925,518 +23137,6 @@ var REQ_WRITE_ISSUE_SCHEMA_SECTION = [
   "the label to `status:ready` before the writer picks it up."
 ];
 
-// src/agent/bundles/requirements-analyst.ts
-function buildRequirementsAnalystSubAgent(paths, issueDefaults) {
-  return {
-    name: "requirements-analyst",
-    description: "Discovers requirement gaps from BCM model docs, competitive analysis, product docs, and meeting extracts. Produces scan reports, proposals, and req:write issues for the downstream requirements-writer agent. Runs through a 2-phase pipeline (scan \u2192 draft-trace), one phase per session, tracked by req:* GitHub issue labels.",
-    model: AGENT_MODEL.POWERFUL,
-    maxTurns: 80,
-    platforms: { cursor: { exclude: true } },
-    prompt: [
-      "# Requirements Analyst Agent",
-      "",
-      "Dedicated agent loop for discovering requirement gaps from BCM (Business",
-      "Capability Model) documents, product docs, and competitive analysis \u2014 then",
-      "creating well-formed requirement issues for the downstream",
-      "`requirements-writer` agent to draft. Designed for scheduled execution",
-      "downstream of the BCM writer and company research agents.",
-      "",
-      "Follow your project's shared agent conventions (`AGENTS.md`,",
-      "`CLAUDE.md`, or equivalent) for all commit, branch, and PR rules.",
-      "",
-      "---",
-      "",
-      ...PROJECT_CONTEXT_MAINTAINER_SECTION,
-      "## Design Principles",
-      "",
-      "1. **Discover, don't write.** This agent identifies *what requirements are",
-      "   missing*. The `requirements-writer` agent writes the actual documents.",
-      "   The boundary keeps this agent fast and the `requirements-writer`",
-      "   authoritative.",
-      "2. **Trace everything.** Every discovered gap links to the source that",
-      "   revealed it (a BCM model doc, competitive analysis, product doc, or",
-      "   meeting extract).",
-      "3. **Respect the taxonomy.** Route every discovered requirement to the",
-      "   correct BCM category (FR, BR, NFR, SEC, DR, INT, OPS, UX, MT, ADR, TR)",
-      "   using the shared disambiguation rules \u2014 the same taxonomy the",
-      "   `requirements-writer` and `requirements-reviewer` load. The",
-      "   canonical source lives in `requirements-taxonomy.ts` and is",
-      "   embedded verbatim in both downstream agents' prompts.",
-      "4. **Deduplicate.** Before creating an issue, check whether a requirement",
-      "   already exists or an issue is already open for it.",
-      "",
-      "---",
-      "",
-      "## State Machine Overview",
-      "",
-      "Requirements synthesis flows through **2 phases**:",
-      "",
-      "```",
-      "\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510     \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510",
-      "\u2502  1. SCAN     \u2502\u2500\u2500\u2500\u2500\u25B6\u2502  2. DRAFT-TRACE  \u2502",
-      "\u2502  Read docs,  \u2502     \u2502  Write proposals,\u2502",
-      "\u2502  identify    \u2502     \u2502  create req:write\u2502",
-      "\u2502  gaps, check \u2502     \u2502  issues, update  \u2502",
-      "\u2502  for dupes   \u2502     \u2502  source docs     \u2502",
-      "\u2502              \u2502     \u2502  with traceability\u2502",
-      "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518     \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518",
-      "```",
-      "",
-      "This pipeline matches the `scan \u2192 draft-trace \u2192 write` pattern",
-      "used by the sibling openhi project. Draft and Trace were previously",
-      "separate phases; they were collapsed because the proposals file Draft",
-      "wrote was only ever consumed by Trace (no human review, no async work",
-      "between the two), so the phase boundary added latency without value.",
-      "See ADR-009 for the full reasoning.",
-      "",
-      "**Issue labels encode the phase:**",
-      "",
-      "| Label | Phase | Session work |",
-      "|-------|-------|-------------|",
-      "| `req:scan` | 1. Scan | Read source docs, identify potential requirement gaps, check against existing requirements and open issues, write deduplicated scan report |",
-      "| `req:draft-trace` | 2. Draft & Trace | Write proposals, create `req:write` GitHub issues for each proposal, and update source documents with traceability notes \u2014 all in a single session |",
-      "",
-      "All issues also carry `type:requirement` and a `status:*` label.",
-      "",
-      "**Issue count per scan cycle:** 1 scan + 1 draft-trace = **2 sessions**.",
-      "",
-      "**Shortened paths:**",
-      "- No gaps found after scan \u2192 skip draft-trace \u2192 **1 session**",
-      "",
-      "---",
-      "",
-      "## Configurable Paths",
-      "",
-      "Projects adopting this bundle must define these paths in their agent",
-      "configuration (`agentConfig.rules` extension or project-level docs):",
-      "",
-      "| Placeholder | Meaning | Typical value |",
-      "|-------------|---------|---------------|",
-      `| \`<BCM_DOCS_ROOT>\` | Root of BCM model docs (capability models) | \`${paths.bcmRoot}/\` |`,
-      `| \`<COMPETITIVE_ROOT>\` | Competitive analysis docs | \`${paths.docsRoot}/business-strategy/competitive/\` |`,
-      `| \`<PRODUCT_ROOT>\` | Product roadmap / entity taxonomy | \`${paths.docsRoot}/product/\` |`,
-      `| \`<MEETINGS_ROOT>\` | Meeting extracts | \`${paths.docsRoot}/research/meetings/\` |`,
-      `| \`<RESEARCH_REQUIREMENTS_ROOT>\` | Scan reports and proposals | \`${paths.researchRequirementsRoot}/\` |`,
-      `| \`<REQUIREMENTS_ROOT>\` | Final requirement documents (owned by requirements-writer) | \`${paths.requirementsRoot}/\` |`,
-      "| `<PREFIX>` | Project-specific requirement ID prefix | e.g. `VRTX`, `ACME` |",
-      "",
-      "If your project stores these in different locations, substitute accordingly",
-      "wherever the phase instructions reference a path.",
-      "",
-      "---",
-      "",
-      "## Agent Loop",
-      "",
-      "Run this loop exactly once per session. Never start a second issue.",
-      "",
-      "1. Claim one open `type:requirement` issue using phase priority:",
-      "   `req:scan` > `req:draft-trace`.",
-      "2. Transition `status:ready` \u2192 `status:in-progress` and create the branch",
-      "   per your project's branch-naming convention.",
-      "3. Execute the phase handler that matches the issue's `req:*` label.",
-      "4. Commit, push, open a PR (if applicable), and close the issue per your",
-      "   project's PR workflow.",
-      "",
-      "---",
-      "",
-      "## Phase 1: Scan (`req:scan`)",
-      "",
-      "**Goal:** Read source documents, identify where requirements are missing,",
-      "incomplete, or contradictory, then check each potential gap against existing",
-      "requirements and open issues to eliminate duplicates. Produces a single",
-      "deduplicated scan report.",
-      "",
-      "**Budget:** Reading source docs + reading requirement registries + searching",
-      "issues. Write one deduplicated scan output file.",
-      "",
-      "### Scan Sources",
-      "",
-      "The issue specifies which source(s) to scan. Common scan scopes:",
-      "",
-      "| Scope | What to read | What to look for |",
-      "|-------|-------------|-----------------|",
-      `| **BCM model doc** | One \`{PREFIX}-NNN\` doc under \`<BCM_DOCS_ROOT>\` | The doc's project-relevance section (commonly \`## <Project> Relevance\` or \`## Strategic Implications\`) \u2014 gaps where capabilities exist but no FR/BR/INT addresses them. Use \`${paths.docsRoot}/project-context.md\` to judge what is relevant. |`,
-      "| **Competitive analysis** | One `comp-*.md` doc under `<COMPETITIVE_ROOT>` | Feature comparison gaps \u2014 competitor features the product lacks requirements for |",
-      "| **Product roadmap** | `<PRODUCT_ROOT>/prioritized-feature-roadmap.md` | Roadmap items without corresponding FRs |",
-      "| **Entity taxonomy** | `<PRODUCT_ROOT>/entity-taxonomy.md` | Entities without CRUD requirements (FR), data requirements (DR), or security requirements (SEC) |",
-      "| **Meeting extract** | `<MEETINGS_ROOT>/meeting-*.extract.md` | Requirements identified but not yet formalized |",
-      "",
-      "### Steps",
-      "",
-      "1. **Read the source documents** specified in the issue.",
-      "",
-      "2. **Identify potential gaps.** For each potential missing requirement:",
-      "   - Classify into the correct BCM category (FR, BR, NFR, SEC, DR, INT,",
-      "     OPS, UX, MT, ADR, TR)",
-      "   - Apply the shared disambiguation rules (from `requirements-taxonomy.ts`,",
-      "     also embedded in the requirements-writer and requirements-reviewer",
-      "     prompts)",
-      "   - Note the source that revealed the gap",
-      "   - Estimate priority based on the source context",
-      "",
-      "3. **Read the requirements registry.** Scan `_index.md` files in each",
-      "   `<REQUIREMENTS_ROOT>/<category>/` directory to know what already exists.",
-      "",
-      "4. **Search for existing issues.** For each potential gap, search open issues:",
-      "   ```bash",
-      '   gh issue list --label "type:requirement" --state open \\',
-      "     --json number,title --limit 100",
-      "   ```",
-      "",
-      "5. **Classify each gap:**",
-      "   - **New** \u2014 no existing requirement or open issue covers this",
-      "   - **Duplicate** \u2014 an existing requirement already addresses this",
-      "   - **In progress** \u2014 an open issue already targets this",
-      "   - **Partial** \u2014 existing requirement partially covers this; note the gap",
-      "",
-      "6. **Write the deduplicated scan report** to:",
-      "   ```",
-      "   <RESEARCH_REQUIREMENTS_ROOT>/req-scan-<scope>-<YYYY-MM-DD>.md",
-      "   ```",
-      "",
-      "   Format:",
-      "   ```markdown",
-      "   ---",
-      '   title: "Requirements Scan: <scope>"',
-      "   date: YYYY-MM-DD",
-      "   parent_issue: <N>",
-      "   status: complete",
-      "   ---",
-      "",
-      "   ## Source Documents Reviewed",
-      "   - <path> \u2014 <brief description>",
-      "",
-      "   ## Existing Requirements Checked",
-      "   - <category>: <count> existing docs, <count> open issues",
-      "",
-      "   ## Identified Gaps (New)",
-      "   ### Gap 1: <Title>",
-      "   - **Category:** FR / BR / NFR / SEC / DR / INT / OPS / UX / MT / ADR / TR",
-      "   - **Source:** <path to doc + section that revealed this gap>",
-      "   - **Priority:** High / Normal / Low",
-      "   - **Rationale:** <why this requirement is needed>",
-      "   - **Duplicate check:** No existing requirement or open issue found",
-      "   - **Proposed scope:** <1-2 sentences on what the requirement should cover>",
-      "",
-      "   ## Already Covered",
-      "   <list of potential gaps that turned out to already have requirements>",
-      "",
-      "   ## In Progress",
-      "   <gaps that already have open issues \u2014 include issue numbers>",
-      "",
-      "   ## Ambiguous / Needs Human Decision",
-      "   <gaps where the correct category or scope is unclear>",
-      "   ```",
-      "",
-      "7. **Create downstream issues based on findings:**",
-      "   - If any new gaps were identified \u2192 create `req:draft-trace` issue",
-      "     (blocked on this issue via `Depends on: #N`).",
-      "   - If **no gaps** were found \u2192 stop (no further phases needed). Comment",
-      "     on the issue noting that no gaps were identified, and proceed directly",
-      "     to commit and push. The scan issue will be marked done with no",
-      "     downstream work needed.",
-      "",
-      "8. **Commit and push.**",
-      "",
-      "---",
-      "",
-      "## Phase 2: Draft & Trace (`req:draft-trace`)",
-      "",
-      "**Goal:** Expand each identified gap into a requirement proposal, create",
-      "a `req:write` GitHub issue for each proposal so the downstream",
-      "`requirements-writer` bundle picks it up, and backfill source-document",
-      "traceability notes \u2014 all in a single session.",
-      "",
-      "**Budget:** No web searches. Reading + writing proposals + issue creation",
-      "+ minor traceability edits to source documents.",
-      "",
-      "Draft and Trace were previously separate phases. They were collapsed",
-      "because the proposals file written by Draft was only ever consumed by",
-      "Trace \u2014 no human review, no async work, no CI validation sat between",
-      "them. See ADR-009 for the decision record.",
-      "",
-      "### `req:write` issue schema",
-      "",
-      "The `req:write` issues this phase creates are picked up by the",
-      "downstream `requirements-writer` agent, which parses a strict",
-      "schema on intake. The authoritative schema is defined in the",
-      "`requirements-writer` sub-agent prompt under **The `req:write`",
-      "Issue Schema** \u2014 every `req:write` issue this phase opens must",
-      "conform. The same schema is embedded in the",
-      "`requirements-reviewer` follow-up generator so the three",
-      "producers never drift apart.",
-      "",
-      ...REQ_WRITE_ISSUE_SCHEMA_SECTION,
-      "",
-      "**Deriving the three required fields from the proposal.** For",
-      "every `req:write` issue this phase opens, the three fields come",
-      "directly from the proposal entry written earlier in the same",
-      "session:",
-      "",
-      "- **Category** \u2014 the proposal's `**Category:**` line.",
-      "- **Tier** \u2014 the proposal's `**Tier:**` line.",
-      "- **Output Path** \u2014",
-      "  `<REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md`,",
-      "  using the sequence number determined in the proposal step below.",
-      "",
-      "**Validation step \u2014 required before opening the issue.** Before",
-      "calling `gh issue create`, verify all three required fields are",
-      "populated and internally consistent (Category matches title",
-      "prefix, Tier matches `tier:*` label, Output Path filename starts",
-      "with the Category prefix). If any field cannot be derived, open",
-      "the issue with `status:needs-attention` (not `status:ready`) and",
-      "include a `Missing: <field> \u2014 <one-line reason>` line so a human",
-      "triaging the issue only has to supply the remaining value(s)",
-      "before flipping the label to `status:ready`.",
-      "",
-      "### Steps",
-      "",
-      "1. **Read the scan report** from Phase 1.",
-      "",
-      "2. **For each gap**, write a detailed proposal:",
-      "",
-      "   ```markdown",
-      "   ## Proposed: <PREFIX>-<NNN> \u2014 <Title>",
-      "",
-      "   **Category:** <FR/BR/NFR/SEC/DR/INT/OPS/UX/MT/ADR/TR>",
-      "   **Tier:** <platform/industry/customer-workflow/consumer-app>",
-      "   **Priority:** <High/Normal/Low>",
-      "   **Source:** <document path and section>",
-      "",
-      "   ### Summary",
-      "   <2-3 sentences describing what the requirement should capture>",
-      "",
-      "   ### Draft Acceptance Criteria",
-      "   - [ ] <testable criterion 1>",
-      "   - [ ] <testable criterion 2>",
-      "   - [ ] <testable criterion 3>",
-      "",
-      "   ### Traceability",
-      "   - **Implements:** <BR or parent requirement if applicable>",
-      "   - **Related:** <existing requirements that interact with this one>",
-      "   - **Source:** <BCM doc, competitive analysis, or meeting that revealed",
-      "     the gap \u2014 use a markdown link. If the source is a meeting note, the",
-      "     downstream requirement doc must include the same meeting as a link in",
-      "     its Traceability `Related:` list.>",
-      "",
-      "   ### Decision Authority",
-      '   <"Direct write" for BR/FR/NFR/SEC/UX, or "Proposed \u2014 needs human',
-      '   decision" for ADR/TR, or "Mixed \u2014 defer technology choices" for',
-      "   DR/MT/INT/OPS>",
-      "",
-      "   ### Notes for Requirements Writer",
-      "   <any context the writer should know \u2014 related ADRs, existing partial",
-      "   coverage, relevant competitive features>",
-      "   ```",
-      "",
-      "3. **Write the proposals** to:",
-      "   ```",
-      "   <RESEARCH_REQUIREMENTS_ROOT>/req-proposals-<scope>-<YYYY-MM-DD>.md",
-      "   ```",
-      "",
-      "4. **Determine next sequence numbers.** Check each target category",
-      "   directory under `<REQUIREMENTS_ROOT>/<category>/` to find the next",
-      "   available `NNN` for each proposed requirement.",
-      "",
-      "5. **Create requirement issues.** For each proposal, file a",
-      "   `req:write` issue using the canonical recipe documented in",
-      "   `## Template: req:write` of",
-      "   `docs/src/content/docs/agents/issue-templates.md`.",
-      "",
-      `   All \`type:requirement\` issues default to \`priority:${labelsForPhase(issueDefaults, "req:write").priority}\` (override`,
-      "   only if the proposal's priority was explicitly High or Low). Each",
-      "   issue must also carry the `req:write` phase label plus the matching",
-      "   `tier:*` label so the downstream `requirements-writer` bundle picks",
-      "   it up with the correct tier. Concretely, the label list includes",
-      '   `--label "type:requirement"`, `--label "req:write"`,',
-      `   \`--label "tier:<tier-slug>"\`, \`--label "status:${labelsForPhase(issueDefaults, "req:write").status}"\`, and`,
-      `   \`--label "priority:${labelsForPhase(issueDefaults, "req:write").priority}"\`.`,
-      "",
-      "   The body must carry the three writer-required fields in an",
-      "   `## Objective` block, written as bold-prefixed lines so the",
-      "   writer's intake parser can pull them out:",
-      "",
-      "   - `**Category:** <BR/FR/NFR/TR/ADR/SEC/DR/INT/OPS/UX/MT>`",
-      "   - `**Tier:** <platform/industry/customer-workflow/consumer-app>`",
-      "   - `**Output Path:** <REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md`",
-      "",
-      "   Then under `## Inputs / Read`, list the proposals file",
-      "   (`<RESEARCH_REQUIREMENTS_ROOT>/req-proposals-<scope>-<date>.md`)",
-      "   and any source documents the writer should consult (BCM model",
-      "   docs, competitive analyses, product docs).",
-      "",
-      "   When one of Category / Tier / Output Path could not be derived",
-      "   from the proposal (for example, the proposal omitted the Tier",
-      `   line), replace \`status:${labelsForPhase(issueDefaults, "req:write").status}\` with \`status:needs-attention\` in`,
-      "   the label list and add a `Missing: <field> \u2014 <reason>` line",
-      "   directly below the Output Path line in the body. Populate",
-      "   whichever of the three fields **could** be derived so a human",
-      "   triaging the issue has the minimum possible cleanup.",
-      "",
-      "6. **Update source documents.** In each BCM model doc or competitive",
-      "   analysis that was scanned, add a note in the project-relevance /",
-      "   strategic-implications section (whichever heading the source doc uses)",
-      "   indicating that a requirement issue was created:",
-      "",
-      "   ```markdown",
-      "   - Gap addressed: see [<PREFIX>-<NNN>](<relative path to requirement doc>)",
-      "     (issue #<N>)",
-      "   ```",
-      "",
-      "7. **Comment on the scan issue** with a summary of all issues created and",
-      "   all docs updated.",
-      "",
-      "8. **Commit and push.**",
-      "",
-      "---",
-      "",
-      "## Coordination with Other Agents",
-      "",
-      "| Direction | Agent | What |",
-      "|-----------|-------|------|",
-      `| Upstream | BCM Writer | Scans capability-model docs for project-relevance gaps (judged against \`${paths.docsRoot}/project-context.md\`) |`,
-      "| Upstream | Company Research | Scans competitive analysis for feature comparison gaps |",
-      "| Upstream | Meeting Analyst | Scans meeting extracts for requirement proposals |",
-      "| Downstream | `requirements-writer` | Picks up the `type:requirement` + `req:write` issues this agent creates and drafts the actual requirement document |",
-      "",
-      "**File boundaries:** Writes to `<RESEARCH_REQUIREMENTS_ROOT>/req-*.md` and",
-      "minor traceability edits to `<BCM_DOCS_ROOT>` and `<COMPETITIVE_ROOT>`.",
-      "Never writes to `<REQUIREMENTS_ROOT>/` \u2014 that is owned by the",
-      "requirements-writer agent.",
-      "",
-      "---",
-      "",
-      "## Blocked Issues",
-      "",
-      "Additional block reasons specific to requirements synthesis:",
-      "- Source document has unresolved contradictions",
-      "- Category classification is ambiguous (needs human disambiguation)",
-      "- Dependent BCM documents are still in draft with placeholder content",
-      "",
-      "---",
-      "",
-      "## Rules",
-      "",
-      "- **Discover, don't write requirements.** Create issues for the",
-      "  `requirements-writer` agent \u2014 don't write requirement documents",
-      "  directly.",
-      "- **Deduplicate rigorously.** Check both existing docs and open issues",
-      "  before flagging a gap.",
-      "- **Respect decision authority.** Mark ADR/TR proposals as needing human",
-      "  decision. Don't create direct-write issues for technology choices.",
-      "- **Bidirectional traceability.** Every `req-scan-*.md` and",
-      "  `req-proposals-*.md` must include a `## Produced` section listing the",
-      "  downstream requirement issues (and eventual requirement documents) it",
-      "  spawned, as markdown links; each formal requirement document under",
-      "  `<REQUIREMENTS_ROOT>/` must include a forward link back to the scan or",
-      "  proposal that produced it."
-    ].join("\n")
-  };
-}
-function buildScanRequirementsSkill(issueDefaults) {
-  return {
-    name: "scan-requirements",
-    description: "Kick off a requirements-analyst scan across BCM model docs, competitive analysis, product docs, or meeting extracts. Creates a req:scan issue and dispatches Phase 1.",
-    disableModelInvocation: true,
-    userInvocable: true,
-    context: "fork",
-    agent: "requirements-analyst",
-    platforms: { cursor: { exclude: true } },
-    instructions: [
-      "# Scan Requirements",
-      "",
-      "Kick off a requirements-analyst scan cycle. Creates a `req:scan` issue",
-      "targeted at the requested scope and dispatches Phase 1 (Scan) in the",
-      "requirements-analyst agent.",
-      "",
-      "## Usage",
-      "",
-      "/scan-requirements <scope>",
-      "",
-      "Where `<scope>` is one of:",
-      "- `bcm:<PREFIX-NNN>` \u2014 a single BCM model doc",
-      "- `competitive:<slug>` \u2014 a single competitive analysis doc",
-      "- `product-roadmap` \u2014 the prioritized feature roadmap",
-      "- `entity-taxonomy` \u2014 the entity taxonomy doc",
-      "- `meeting:<slug>` \u2014 a meeting extract",
-      "- `all-bcm` / `all-competitive` \u2014 full sweep (long-running)",
-      "",
-      "## Steps",
-      "",
-      `1. Create a \`req:scan\` issue with \`type:requirement\`, \`priority:${labelsForPhase(issueDefaults, "req:scan").priority}\`,`,
-      `   and \`status:${labelsForPhase(issueDefaults, "req:scan").status}\`. Body must list the files to read and the scan scope.`,
-      "2. Execute Phase 1 (Scan) of the requirements-analyst agent.",
-      "3. If gaps are found, a `req:draft-trace` issue is created automatically.",
-      "",
-      "## Output",
-      "",
-      "- A `req-scan-<scope>-<YYYY-MM-DD>.md` file under the project's research",
-      "  requirements directory.",
-      "- A `req:draft-trace` issue if any gaps were identified."
-    ].join("\n")
-  };
-}
-function buildRequirementsAnalystBundle(paths = DEFAULT_AGENT_PATHS, issueDefaults = DEFAULT_RESOLVED_ISSUE_DEFAULTS) {
-  return {
-    name: "requirements-analyst",
-    description: "Requirements gap-discovery agent bundle for BCM-driven projects. 2-phase pipeline (scan, draft-trace) with req:* phase labels.",
-    appliesWhen: () => true,
-    rules: [
-      {
-        name: "requirements-analyst-workflow",
-        description: "Describes the 2-phase requirements gap-discovery pipeline, the req:* label taxonomy, and the boundary with the downstream requirements-writer agent.",
-        scope: AGENT_RULE_SCOPE.ALWAYS,
-        content: [
-          "# Requirements Analyst Workflow",
-          "",
-          "Use `/scan-requirements <scope>` to kick off a requirements gap",
-          "discovery cycle. The pipeline runs in 2 phases \u2014 scan and",
-          "draft-trace \u2014 each tracked by its own GitHub issue labeled",
-          "`req:scan` or `req:draft-trace`. All issues carry",
-          "`type:requirement`.",
-          "",
-          "The requirements-analyst *discovers gaps, drafts proposals, and",
-          "opens `req:write` issues for the downstream writer*; it does",
-          "**not** write final requirement documents. Writing is the job of",
-          "the downstream `requirements-writer` agent (a separate bundle).",
-          "Keep that boundary clean: proposals land under the research",
-          "requirements directory, not under the authoritative requirements",
-          "tree. The draft-trace phase tags new issues with `req:write` so",
-          "the writer bundle picks them up automatically.",
-          "",
-          "See the `requirements-analyst` agent definition for full workflow",
-          "details and phase-by-phase instructions."
-        ].join("\n"),
-        platforms: {
-          cursor: { exclude: true }
-        },
-        tags: ["workflow"]
-      }
-    ],
-    skills: [buildScanRequirementsSkill(issueDefaults)],
-    subAgents: [buildRequirementsAnalystSubAgent(paths, issueDefaults)],
-    labels: [
-      {
-        name: "type:requirement",
-        color: "1D76DB",
-        description: "Work that produces or discovers a requirement document (FR, BR, NFR, etc.)"
-      },
-      {
-        name: "req:scan",
-        color: "C5DEF5",
-        description: "Phase 1: scan source docs for requirement gaps and deduplicate"
-      },
-      {
-        name: "req:draft-trace",
-        color: "BFDADC",
-        description: "Phase 2: draft proposals, create req:write issues, and backfill source-doc traceability"
-      }
-    ]
-  };
-}
-var requirementsAnalystBundle = buildRequirementsAnalystBundle();
-
 // src/agent/bundles/requirements-writer.ts
 var templateBr = (paths) => `---
 title: "BR-NNN: [Business Requirement Title]"
@@ -24797,7 +24497,7 @@ Use [\`_template-{PREFIX}.md\`](../templates/_template-{PREFIX}.md) for all new
 ## Conventions
 
 - File naming: \`{PREFIX}-NNN-descriptive-slug.md\`
-- Number sequentially \u2014 check the table above for the next available number
+- Number sequentially \u2014 check the table above for the next available number. Do not embed per-requirement descriptions, a running change-log, or a mutable "next available: X (\u2026)" counter in this Conventions section; the table above is the sole registry, and each document's ID is finalized at write-start.
 - Every document must include YAML frontmatter with a \`title\` field
 - Every document must include a \`## Traceability\` section
 `;
@@ -25573,9 +25273,14 @@ function buildRequirementsWriterSubAgent(paths) {
       "  `ADR`, `SEC`, `DR`, `INT`, `OPS`, `UX`, `MT`). If the project",
       `  declares a project-wide prefix in \`${paths.docsRoot}/project-context.md\`, use`,
       "  it instead.",
-      "- **NNN** \u2014 three-digit sequential number (001, 002, 012). Always",
-      "  check the target category directory under `<REQUIREMENTS_ROOT>`",
-      "  for the next available number before writing.",
+      "- **NNN** \u2014 sequential number, zero-padded to at least three",
+      "  digits (001, 002, 012; grows past 999 naturally, e.g. 1240). The",
+      "  ID is **finalized at write-start** via",
+      "  `.claude/procedures/next-requirement-id.sh`, which allocates from",
+      "  live state (existing docs plus open `req:write` issues). Scanning",
+      "  the target category directory under `<REQUIREMENTS_ROOT>` for the",
+      "  next available number is the **fallback** used only when that",
+      "  procedure is unavailable.",
       "- **slug** \u2014 lowercase kebab-case descriptive name.",
       "",
       "Examples: `FR-001-user-registration.md`,",
@@ -25760,153 +25465,939 @@ function buildRequirementsWriterSubAgent(paths) {
       "   PR workflow. Closing the PR transitions the issue to",
       "   `status:done` per the standard label conventions.",
       "",
-      "---",
+      "---",
+      "",
+      "## The `req:write` Issue Schema",
+      "",
+      "This section is the **authoritative schema** for `req:write` issue",
+      "bodies. Upstream producers (the `requirements-analyst` trace phase,",
+      "the `requirements-reviewer` follow-up generator, and any human",
+      "authoring a `req:write` issue directly) must embed or link to this",
+      "same schema so the three required fields are always present when",
+      "the writer picks the issue up.",
+      "",
+      ...REQ_WRITE_ISSUE_SCHEMA_SECTION,
+      "",
+      "---",
+      "",
+      "## The `req:write` Phase",
+      "",
+      "**Goal:** Read the proposal that produced this issue, write a single",
+      "requirement document under `<REQUIREMENTS_ROOT>`, and update the",
+      "category index.",
+      "",
+      "**Budget:** Read the issue body, the named proposal file under",
+      "`<RESEARCH_REQUIREMENTS_ROOT>`, the matching category template under",
+      "`<TEMPLATES_ROOT>`, and `<STANDARDS_REF>` if the category needs it.",
+      "Write one requirement document and one category-index update. No web",
+      "searches.",
+      "",
+      "### Steps",
+      "",
+      "1. **Parse the issue.** The `req:write` issue body follows the",
+      "   authoritative schema in the",
+      "   [The `req:write` Issue Schema](#the-reqwrite-issue-schema)",
+      "   section below. Before writing, verify every required field",
+      "   (Category, Tier, Output Path) is present and internally",
+      "   consistent:",
+      "",
+      "   - Category matches the prefix on the requirement title and on",
+      "     the Output Path filename.",
+      "   - Tier matches the `tier:*` label applied to the issue.",
+      "   - Output Path sits under",
+      "     `<REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md`.",
+      "",
+      "   If any required field is missing, contradictory, or the issue",
+      "   already carries `status:needs-attention` with a `Missing:` line",
+      "   (upstream could not derive it), comment on the issue with",
+      "   which field is wrong, ensure `status:needs-attention` is set,",
+      "   and stop without writing. A human triages before the writer",
+      "   tries again.",
+      "",
+      "2. **Read the proposal.** Open the proposals file referenced in the",
+      "   issue inputs (under `<RESEARCH_REQUIREMENTS_ROOT>`). Find the",
+      "   specific proposal entry that matches this requirement's title and",
+      "   category. Treat the proposal as the authoritative source \u2014 do not",
+      "   invent fields it omits.",
+      "",
+      "3. **Read the matching template** under `<TEMPLATES_ROOT>` for the",
+      "   category. Read `<STANDARDS_REF>` if the category is SEC, NFR,",
+      "   INT, ADR, or TR \u2014 these depend on the standards reference for",
+      "   correct framing.",
+      "",
+      "4. **Finalize the requirement ID first \u2014 before you author any",
+      "   document content, filename, or self-reference.** Run",
+      "   `.claude/procedures/next-requirement-id.sh <PREFIX> <category-dir> <this-issue-number>`",
+      "   to compute the next free ID from live state (existing docs plus",
+      "   open `req:write` issues, with the issue-number tiebreak). Use",
+      "   `<category-dir>` = the resolved `<REQUIREMENTS_ROOT>/<category-dir>`",
+      "   for the target category, and `<this-issue-number>` = the number of",
+      "   the `req:write` issue you are working.",
+      "",
+      "   - If the issue's reserved `Requirement ID` hint is present **and",
+      "     equals** the procedure's output, use it.",
+      "   - Otherwise use the **procedure's output** \u2014 a concurrent claim",
+      "     took the reserved number, and the procedure has already resolved",
+      "     the collision in your favor via the issue-number order.",
+      "",
+      "   **Author the document exactly once with this finalized ID** \u2014 the",
+      "   filename and every in-body self-reference. **Never renumber after",
+      "   authoring:** the ID is fixed before any body content exists, so a",
+      "   concurrent claim is resolved here for free \u2014 no rename, no",
+      "   self-reference rewrite, no post-authoring renumber treadmill.",
+      "",
+      "   After finalizing, and before opening the PR, you SHOULD update this",
+      "   issue's `Requirement ID` field to the finalized value",
+      "   (`gh issue edit <this-issue-number>`) so other in-flight writers",
+      "   see the resolved claim. This is best-effort \u2014 do not block or fail",
+      "   the write if the edit does not succeed.",
+      "",
+      "   If `next-requirement-id.sh` is unavailable, fall back to scanning",
+      "   the target category directory under `<REQUIREMENTS_ROOT>` for",
+      "   existing files matching `{PREFIX}-NNN-*.md` and take the next",
+      "   unused three-digit number.",
+      "",
+      "5. **Apply the decision-authority rules.** Default to `Status:",
+      "   Draft` for direct-write categories (BR, FR, NFR, SEC, UX). Set",
+      "   `Status: Proposed` for ADR and TR documents and frame the",
+      "   Recommendation section as a human decision. For DR/MT/INT/OPS",
+      "   categories that imply a technology choice, write the requirement",
+      "   directly but spin the technology decision off into a separate",
+      "   `Proposed` ADR or TR \u2014 record the cross-link in the Open Items",
+      "   section of both documents.",
+      "",
+      "6. **Write the document.** Fill every section in the template. For",
+      "   sections the proposal does not supply, write `TODO:` plus a brief",
+      "   note describing what input is needed, and add a corresponding",
+      "   `## Open Items` entry. Never leave a template section out.",
+      "",
+      "7. **Set frontmatter.** At minimum: `title`, `description`, `tier`.",
+      "   If the project declares optional frontmatter conventions in",
+      `   \`${paths.docsRoot}/project-context.md\` (such as \`referencedIn.meetings[]\`),`,
+      "   honor them. Otherwise stop at the minimum.",
+      "",
+      "8. **Update the category index.** If the category directory has a",
+      "   `README.md` or `_index.md` registry, add a row for the new",
+      "   document in sequence order. If no index exists yet, generate one",
+      "   from `_template-category-README.md`. The requirement ID was",
+      "   already finalized at write-start (step 4), so this is a plain",
+      "   append-only, deterministic row insert \u2014 never renumber existing",
+      "   rows or mutate a sequence counter here.",
+      "",
+      "9. **Cross-link upstream.** Add `## Traceability` entries pointing",
+      "   to the proposals file (under `<RESEARCH_REQUIREMENTS_ROOT>`),",
+      "   the source documents the proposal cited, and any BCM capability",
+      "   the requirement supports.",
+      "",
+      "10. **Quality checks.** Before committing, verify:",
+      "    - [ ] Frontmatter has `title` and `description` (and `tier` if",
+      "          the project uses tier classification)",
+      "    - [ ] Title matches the `# Heading` line",
+      "    - [ ] File name follows `{PREFIX}-{NNN}-{slug}.md`",
+      "    - [ ] Status is `Draft` for direct-write categories or `Proposed`",
+      "          for ADR/TR",
+      "    - [ ] Every template section is present (use `TODO:` or `Not",
+      "          applicable \u2014 <reason>` for unfilled sections)",
+      "    - [ ] `## Traceability` exists with at least one upstream link",
+      "    - [ ] No technology decisions made in direct-write categories \u2014",
+      "          deferred to `Proposed` ADR/TR with cross-links in Open",
+      "          Items",
+      "    - [ ] `## Open Items` is present with Identified Gaps,",
+      "          Follow-up Questions, and Contradictions subsections",
+      "    - [ ] ADR/TR documents include a Recommendation section and an",
+      "          Open Item flagging the human decision required",
+      "    - [ ] Category index updated with a row for the new document",
+      "    - [ ] Tier value matches the issue's `tier:*` label",
+      "    - [ ] Cross-tier traceability entries exist where the document",
+      "          depends on or enables a different tier",
+      "",
+      "11. **Commit and push.** Use a `docs(<category>):` conventional",
+      "    commit message. The PR closes the `req:write` issue.",
+      "",
+      "---",
+      "",
+      "## Output Boundaries",
+      "",
+      "This agent writes **only** to:",
+      "",
+      "- `<REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md` \u2014 one",
+      "  requirement document per session",
+      "- `<REQUIREMENTS_ROOT>/<category-dir>/README.md` (or `_index.md`) \u2014",
+      "  category index, one row appended per session",
+      "- `<REQUIREMENTS_ROOT>/README.md` (or `_index.md`) \u2014 only if the",
+      "  top-level requirements README does not yet exist; generate from",
+      "  `_template-requirements-README.md` and stop",
+      "",
+      "The pipeline produces **requirement documents**. It does not write",
+      "BCM capability models, people profiles, company profiles, software",
+      "profiles, scan reports, or proposal files \u2014 those belong to",
+      "specialized upstream/downstream agents.",
+      "",
+      "**Do NOT create:**",
+      "- `req:scan` or `req:draft-trace` issues \u2014 those belong to",
+      "  the `requirements-analyst` bundle",
+      "- `bcm:*` issues \u2014 those belong to the `bcm-writer` bundle",
+      "- `people:*`, `company:*`, `software:*`, `research:*`, or",
+      "  `industry:*` issues \u2014 those belong to their respective bundles",
+      "",
+      "If the proposal surfaces work that needs one of the above, comment",
+      "on the `req:write` issue with the suggested follow-up and let a",
+      "human route it.",
+      "",
+      "---",
+      "",
+      "## Coordination with Other Agents",
+      "",
+      "| Direction | Agent | What |",
+      "|-----------|-------|------|",
+      "| Upstream | `requirements-analyst` | Discovers gaps, drafts proposals, and creates `req:write` issues that this agent picks up |",
+      "| Upstream | `bcm-writer` | Provides BCM capability documents that requirements trace back to via `## Traceability` links |",
+      "| Peer | `meeting-analyst` | Provides meeting transcripts that may inform a requirement's traceability extensions (optional) |",
+      "",
+      "**File boundaries:** Reads `<RESEARCH_REQUIREMENTS_ROOT>` (proposals)",
+      "and the source documents the proposals cite. Writes",
+      "`<REQUIREMENTS_ROOT>` and the category index files. Never edits",
+      "proposals, scan reports, BCM documents, or profiles.",
+      "",
+      "---",
+      "",
+      "## Rules",
+      "",
+      "- **One requirement per session.** Never write two documents in one",
+      "  session and never start a second issue.",
+      "- **Templates are authoritative.** Use the shipped template verbatim",
+      "  for the category. Every template section must appear in the final",
+      "  document.",
+      "- **Decision authority is non-negotiable.** Direct-write categories",
+      "  ship as `Draft`. ADR and TR ship as `Proposed` with a Recommendation",
+      "  framed for human decision. Mixed-deferral categories spin",
+      "  technology choices off into separate `Proposed` documents.",
+      "- **Cite, don't invent.** When the proposal omits a stakeholder,",
+      "  metric, threat model entry, or technology option, write `TODO:` and",
+      "  flag the issue with `status:needs-attention`.",
+      "- **Trace upstream.** Every requirement links back to its proposal,",
+      "  the source documents the proposal cited, and the BCM capability",
+      "  it supports (when applicable).",
+      "- **Update the category index every time.** A requirement that",
+      "  exists as a file but is missing from its category index is",
+      "  invisible to anyone browsing the documentation tree.",
+      "- **Write requirements, not capability models or gap reports.**",
+      "  Never open `req:scan`, `req:draft-trace`, or `bcm:*` issues from",
+      "  this pipeline."
+    ].join("\n")
+  };
+}
+function buildWriteRequirementSkill(paths, issueDefaults) {
+  return {
+    name: WRITE_REQUIREMENT_SKILL_NAME,
+    description: "Write one formal requirement document (BR / FR / NFR / TR / ADR / SEC / DR / INT / OPS / UX / MT) using the shipped category template and decision-authority rules. Picks up a req:write issue created by the upstream requirements-analyst pipeline (or kicked off ad hoc) and dispatches the requirements-writer agent.",
+    disableModelInvocation: true,
+    userInvocable: true,
+    context: "fork",
+    agent: "requirements-writer",
+    platforms: { cursor: { exclude: true } },
+    referenceFiles: buildRequirementsWriterReferenceFiles(paths),
+    instructions: [
+      "# Write Requirement",
+      "",
+      "Write one formal requirement document using the 11-category taxonomy",
+      "(BR, FR, NFR, TR, ADR, SEC, DR, INT, OPS, UX, MT) and the",
+      "decision-authority rules (direct-write vs. propose-only ADR/TR).",
+      "Dispatches the `requirements-writer` agent.",
+      "",
+      "## Usage",
+      "",
+      "/write-requirement <category> <short-title>",
+      "",
+      "Where `<category>` is one of `BR`, `FR`, `NFR`, `TR`, `ADR`, `SEC`,",
+      "`DR`, `INT`, `OPS`, `UX`, `MT`.",
+      "",
+      "Optional extensions in the issue body:",
+      "- `tier: platform | industry | customer-workflow | consumer-app` \u2014",
+      "  the architectural tier (default: `platform`)",
+      "- `prefix: <PROJECT_PREFIX>` \u2014 override the default category prefix",
+      `  with a project-specific one declared in \`${paths.docsRoot}/project-context.md\``,
+      "- `customer: <link-or-slug>` \u2014 link the requirement to a customer",
+      "  profile (expected for Customer Workflow / Consumer Application",
+      "  tiers in projects that track customer profiles)",
+      "- `proposal: <path>` \u2014 pin the upstream proposal file under",
+      "  `<RESEARCH_REQUIREMENTS_ROOT>` (default: derived from the issue",
+      "  context)",
+      "- `output: <path>` \u2014 override the default Output Path",
+      "",
+      "## Default Paths",
+      "",
+      `If the project has no override in \`${paths.docsRoot}/project-context.md\` or`,
+      "`agentConfig.rules`, outputs land under:",
+      "",
+      `- \`${paths.requirementsRoot}/<category-dir>/<PREFIX>-<NNN>-<slug>.md\``,
+      `- \`${paths.requirementsRoot}/<category-dir>/README.md\` (registry update)`,
+      `- \`${paths.requirementsRoot}/README.md\` (top-level README, generated on`,
+      "  first use only)",
+      "",
+      "Templates and the standards reference ship with this skill under",
+      "`_references/templates/` and `_references/standards-and-frameworks.md`.",
+      "",
+      "## Steps",
+      "",
+      "1. Create a `req:write` issue with `type:requirement`,",
+      `   \`priority:${labelsForPhase(issueDefaults, "req:write").priority}\`, \`status:${labelsForPhase(issueDefaults, "req:write").status}\`, and the matching \`tier:*\` label.`,
+      "   Body must include the category, tier, output path, and a pointer",
+      "   to the upstream proposal (or a direct user description if no",
+      "   proposals file exists).",
+      "2. Execute the write phase of the requirements-writer agent.",
+      "3. The agent writes one requirement document, updates the category",
+      "   index, opens a PR, and closes the issue.",
+      "",
+      "## Output",
+      "",
+      "- One requirement document under `<REQUIREMENTS_ROOT>` following the",
+      "  shipped category template, with `Status: Draft` for direct-write",
+      "  categories or `Status: Proposed` for ADR/TR",
+      "- A category-index row pointing at the new document",
+      "- (First-time only) a top-level requirements README derived from",
+      "  `_template-requirements-README.md`"
+    ].join("\n")
+  };
+}
+function renderNextRequirementIdProcedure() {
+  return [
+    "#!/usr/bin/env bash",
+    "# next-requirement-id.sh \u2014 print the next free requirement ID for a",
+    "# category, allocated from live GitHub state (open req:write issues)",
+    "# plus the merged docs already on disk.",
+    "#",
+    "# Usage:",
+    "#   .claude/procedures/next-requirement-id.sh <PREFIX> <category-dir> [<self-issue-number>]",
+    "#",
+    "# Example:",
+    "#   next-requirement-id.sh FR docs/src/content/docs/requirements/functional 850",
+    "#   -> FR-1240",
+    "#",
+    "# Behaviour:",
+    "#   - Collects candidate NNN numbers from (1) files in <category-dir>",
+    "#     matching ^<PREFIX>-([0-9]+)-.*\\.md$ and (2) open req:write",
+    "#     issues whose body carries a `Requirement ID: <PREFIX>-<NNN>`",
+    "#     line. Prints `<PREFIX>-<max+1>` zero-padded to at least three",
+    "#     digits (grows past 999 naturally, e.g. FR-1240).",
+    "#   - When <self-issue-number> is given, only open req:write issues",
+    "#     with a STRICTLY LOWER number are counted. This excludes the",
+    "#     caller's own reservation and imposes an issue-number total",
+    "#     order so two concurrent writers never both pick the same",
+    "#     number. Omit it (analyst use, before any issue is filed) to",
+    "#     count every open req:write issue.",
+    "#",
+    "# Guards:",
+    "#   - Side-effect-free: never edits issues, docs, or any counter.",
+    "#   - Every gh/jq call is guarded (|| true, 2>/dev/null); a missing",
+    "#     binary, missing auth, or non-repo cwd contributes nothing and",
+    "#     the helper falls back to the directory scan.",
+    "#   - Prints a usage message to stderr and exits 2 on bad args; a",
+    "#     missing or empty <category-dir> is tolerated (scan finds",
+    "#     nothing). Happy path always exits 0.",
+    "",
+    "set -uo pipefail",
+    "",
+    "usage() {",
+    '  printf "usage: next-requirement-id.sh <PREFIX> <category-dir> [<self-issue-number>]\\n" >&2',
+    "}",
+    "",
+    "# Require at least a prefix and a category directory argument.",
+    'if [ "$#" -lt 2 ]; then',
+    "  usage",
+    "  exit 2",
+    "fi",
+    "",
+    'prefix="$1"',
+    'category_dir="$2"',
+    'self_issue="${3:-}"',
+    "",
+    "# The running maximum NNN seen across both candidate sources. Starts",
+    "# at 0 so an empty category with no open issues yields <PREFIX>-001.",
+    "max=0",
+    "",
+    "# Fold a bare integer candidate into the running max. Ignores any",
+    "# value that is not a run of digits (defensive against malformed",
+    "# filenames or issue bodies).",
+    "consider() {",
+    '  local n="$1"',
+    '  case "$n" in',
+    "    '' | *[!0-9]*) return 0 ;;",
+    "  esac",
+    "  # Strip leading zeros for base-10 arithmetic (avoid octal parsing).",
+    "  n=$((10#$n))",
+    '  if [ "$n" -gt "$max" ]; then',
+    '    max="$n"',
+    "  fi",
+    "}",
+    "",
+    "# --- Source 1: merged docs on disk -------------------------------------",
+    "# Scan <category-dir> for files named <PREFIX>-<NNN>-<slug>.md and fold",
+    "# each NNN into the running max. A missing/empty directory is a no-op.",
+    'if [ -n "$category_dir" ] && [ -d "$category_dir" ]; then',
+    '  for f in "$category_dir"/"$prefix"-*.md; do',
+    "    # Guard the literal-glob case when nothing matches.",
+    '    [ -e "$f" ] || continue',
+    '    base="$(basename "$f")"',
+    "    # Extract the digit run between the prefix and the next hyphen.",
+    '    nnn="${base#"$prefix"-}"',
+    '    nnn="${nnn%%-*}"',
+    '    consider "$nnn"',
+    "  done",
+    "fi",
+    "",
+    "# --- Source 2: live state \u2014 open req:write issues ----------------------",
+    "# Ask GitHub for open req:write issues and parse each body for a",
+    "# `Requirement ID: <PREFIX>-<NNN>` field. The whole block is guarded so",
+    "# a missing gh/jq, missing auth, or non-repo cwd simply yields no",
+    "# candidates and the directory scan stands alone.",
+    "if command -v gh >/dev/null 2>&1 && command -v jq >/dev/null 2>&1; then",
+    '  issues_json="$(gh issue list --label req:write --state open --limit 500 --json number,body 2>/dev/null || true)"',
+    '  if [ -n "$issues_json" ]; then',
+    "    # Flatten each issue to a single `<number>\\t<body>` line (newlines",
+    "    # in the body collapsed to spaces) so a plain read loop can walk",
+    "    # them. jq is guarded; on any parse error `parsed` is empty and the",
+    "    # loop runs zero times. Captured into a variable first so the loop",
+    "    # runs in THIS shell (a piped `while` would subshell and lose max).",
+    `    parsed="$(printf '%s' "$issues_json" | jq -r '.[] | "\\(.number)\\t\\(.body // "" | gsub("[\\\\n\\\\r]"; " "))"' 2>/dev/null || true)"`,
+    '    if [ -n "$parsed" ]; then',
+    "      while IFS=$'\\t' read -r issue_number issue_body; do",
+    '        [ -n "$issue_number" ] || continue',
+    "        # Skip non-numeric issue numbers defensively.",
+    '        case "$issue_number" in',
+    "          '' | *[!0-9]*) continue ;;",
+    "        esac",
+    "        # Issue-number total order: when a self issue is given, count",
+    "        # this issue only if it is STRICTLY lower-numbered than us.",
+    '        if [ -n "$self_issue" ]; then',
+    '          case "$self_issue" in',
+    "            '' | *[!0-9]*) : ;;",
+    "            *)",
+    '              if [ "$issue_number" -ge "$self_issue" ]; then',
+    "                continue",
+    "              fi",
+    "              ;;",
+    "          esac",
+    "        fi",
+    "        # Pull the NNN out of a `Requirement ID: <PREFIX>-<NNN>` field.",
+    "        # Tolerant of surrounding markdown (**bold**, leading `- `) and",
+    "        # case-insensitive on the label. First match wins.",
+    `        id_match="$(printf '%s\\n' "$issue_body" | grep -ioE "Requirement ID:[^A-Za-z0-9]*$prefix-[0-9]+" | head -n1 || true)"`,
+    '        if [ -n "$id_match" ]; then',
+    `          id_nnn="$(printf '%s' "$id_match" | grep -oE '[0-9]+$' || true)"`,
+    '          consider "$id_nnn"',
+    "        fi",
+    "      done <<EOF",
+    "$parsed",
+    "EOF",
+    "    fi",
+    "  fi",
+    "fi",
+    "",
+    "# next = max seen + 1, printed zero-padded to at least three digits.",
+    "next=$((max + 1))",
+    `printf '%s-%03d\\n' "$prefix" "$next"`,
+    "",
+    "exit 0"
+  ].join("\n");
+}
+var nextRequirementIdProcedure = {
+  name: "next-requirement-id.sh",
+  description: "Prints the next free requirement ID (e.g. FR-1240) for a category, allocated from live GitHub state (open req:write issues, with an optional strictly-lower issue-number tiebreak) plus the merged docs on disk. Side-effect-free; every gh/jq call is guarded so a missing binary, missing auth, or non-repo cwd degrades to the directory scan. Exits 0 on the happy path.",
+  content: renderNextRequirementIdProcedure()
+};
+function buildRequirementsWriterBundle(paths = DEFAULT_AGENT_PATHS, issueDefaults = DEFAULT_RESOLVED_ISSUE_DEFAULTS) {
+  return {
+    name: "requirements-writer",
+    description: "Requirements writer agent bundle. Authors formal requirement documents from upstream proposals using the 11-category taxonomy (BR, FR, NFR, TR, ADR, SEC, DR, INT, OPS, UX, MT), the four-tier classification, and decision-authority rules (direct-write vs. propose-only). Ships 13 templates plus a standards-and-frameworks reference.",
+    appliesWhen: () => true,
+    rules: [
+      {
+        name: "requirements-writer-workflow",
+        description: "Describes the requirements-writer pipeline, the req:write phase label, the four tier:* labels, and the boundary with the upstream requirements-analyst and bcm-writer bundles.",
+        scope: AGENT_RULE_SCOPE.ALWAYS,
+        content: [
+          "# Requirements Writer Workflow",
+          "",
+          "Use `/write-requirement <category> <short-title>` to author one",
+          "formal requirement document. The writer runs in a single phase",
+          "tracked by a GitHub issue labeled `req:write` plus the matching",
+          "`tier:*` label. Issues also carry `type:requirement` (declared",
+          "by the upstream `requirements-analyst` bundle).",
+          "",
+          "The pipeline produces **requirement documents only** \u2014 capability",
+          "models are written by the `bcm-writer` agent and gap discovery is",
+          "the responsibility of the `requirements-analyst` agent. The",
+          "writer never opens `req:scan`, `req:draft-trace`, or `bcm:*`",
+          "issues.",
+          "",
+          "Documents follow the 11-category taxonomy (BR, FR, NFR, TR, ADR,",
+          "SEC, DR, INT, OPS, UX, MT) and the four-tier classification",
+          "(Platform, Industry, Customer Workflow, Consumer Application).",
+          "Templates and a standards-and-frameworks reference ship with the",
+          "skill \u2014 they are the same files for every project that adopts",
+          "the bundle.",
+          "",
+          "Decision-authority rules are non-negotiable: BR / FR / NFR /",
+          "SEC / UX ship as `Status: Draft`; ADR and TR ship as",
+          "`Status: Proposed` with a Recommendation framed for human",
+          "decision; DR / MT / INT / OPS spin technology choices off into",
+          "separate `Proposed` ADR or TR documents.",
+          "",
+          "See the `requirements-writer` agent definition for full workflow",
+          "details, configurable paths, decision-authority rules, and",
+          "phase-by-phase instructions."
+        ].join("\n"),
+        platforms: {
+          cursor: { exclude: true }
+        },
+        tags: ["workflow"]
+      }
+    ],
+    skills: [buildWriteRequirementSkill(paths, issueDefaults)],
+    subAgents: [buildRequirementsWriterSubAgent(paths)],
+    procedures: [nextRequirementIdProcedure],
+    labels: [
+      {
+        name: "req:write",
+        color: "FEF2C0",
+        description: "Phase: write a formal requirement document using the requirements-writer skill"
+      },
+      {
+        name: "tier:platform",
+        color: "EDEDED",
+        description: "Architectural tier: core platform (shared infrastructure, APIs, auth, tenant isolation)"
+      },
+      {
+        name: "tier:industry",
+        color: "EDEDED",
+        description: "Architectural tier: industry vertical (capabilities not every tenant needs)"
+      },
+      {
+        name: "tier:customer-workflow",
+        color: "EDEDED",
+        description: "Architectural tier: customer-configured workflow (business logic tenants configure)"
+      },
+      {
+        name: "tier:consumer-app",
+        color: "EDEDED",
+        description: "Architectural tier: consumer application (UI/UX and integrations in external front-ends/systems)"
+      }
+    ]
+  };
+}
+var requirementsWriterBundle = buildRequirementsWriterBundle();
+
+// src/agent/bundles/requirements-analyst.ts
+function buildRequirementsAnalystSubAgent(paths, issueDefaults) {
+  return {
+    name: "requirements-analyst",
+    description: "Discovers requirement gaps from BCM model docs, competitive analysis, product docs, and meeting extracts. Produces scan reports, proposals, and req:write issues for the downstream requirements-writer agent. Runs through a 2-phase pipeline (scan \u2192 draft-trace), one phase per session, tracked by req:* GitHub issue labels.",
+    model: AGENT_MODEL.POWERFUL,
+    maxTurns: 80,
+    platforms: { cursor: { exclude: true } },
+    prompt: [
+      "# Requirements Analyst Agent",
+      "",
+      "Dedicated agent loop for discovering requirement gaps from BCM (Business",
+      "Capability Model) documents, product docs, and competitive analysis \u2014 then",
+      "creating well-formed requirement issues for the downstream",
+      "`requirements-writer` agent to draft. Designed for scheduled execution",
+      "downstream of the BCM writer and company research agents.",
+      "",
+      "Follow your project's shared agent conventions (`AGENTS.md`,",
+      "`CLAUDE.md`, or equivalent) for all commit, branch, and PR rules.",
+      "",
+      "---",
+      "",
+      ...PROJECT_CONTEXT_MAINTAINER_SECTION,
+      "## Design Principles",
+      "",
+      "1. **Discover, don't write.** This agent identifies *what requirements are",
+      "   missing*. The `requirements-writer` agent writes the actual documents.",
+      "   The boundary keeps this agent fast and the `requirements-writer`",
+      "   authoritative.",
+      "2. **Trace everything.** Every discovered gap links to the source that",
+      "   revealed it (a BCM model doc, competitive analysis, product doc, or",
+      "   meeting extract).",
+      "3. **Respect the taxonomy.** Route every discovered requirement to the",
+      "   correct BCM category (FR, BR, NFR, SEC, DR, INT, OPS, UX, MT, ADR, TR)",
+      "   using the shared disambiguation rules \u2014 the same taxonomy the",
+      "   `requirements-writer` and `requirements-reviewer` load. The",
+      "   canonical source lives in `requirements-taxonomy.ts` and is",
+      "   embedded verbatim in both downstream agents' prompts.",
+      "4. **Deduplicate.** Before creating an issue, check whether a requirement",
+      "   already exists or an issue is already open for it.",
+      "",
+      "---",
+      "",
+      "## State Machine Overview",
+      "",
+      "Requirements synthesis flows through **2 phases**:",
+      "",
+      "```",
+      "\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510     \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510",
+      "\u2502  1. SCAN     \u2502\u2500\u2500\u2500\u2500\u25B6\u2502  2. DRAFT-TRACE  \u2502",
+      "\u2502  Read docs,  \u2502     \u2502  Write proposals,\u2502",
+      "\u2502  identify    \u2502     \u2502  create req:write\u2502",
+      "\u2502  gaps, check \u2502     \u2502  issues, update  \u2502",
+      "\u2502  for dupes   \u2502     \u2502  source docs     \u2502",
+      "\u2502              \u2502     \u2502  with traceability\u2502",
+      "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518     \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518",
+      "```",
+      "",
+      "This pipeline matches the `scan \u2192 draft-trace \u2192 write` pattern",
+      "used by the sibling openhi project. Draft and Trace were previously",
+      "separate phases; they were collapsed because the proposals file Draft",
+      "wrote was only ever consumed by Trace (no human review, no async work",
+      "between the two), so the phase boundary added latency without value.",
+      "See ADR-009 for the full reasoning.",
+      "",
+      "**Issue labels encode the phase:**",
+      "",
+      "| Label | Phase | Session work |",
+      "|-------|-------|-------------|",
+      "| `req:scan` | 1. Scan | Read source docs, identify potential requirement gaps, check against existing requirements and open issues, write deduplicated scan report |",
+      "| `req:draft-trace` | 2. Draft & Trace | Write proposals, create `req:write` GitHub issues for each proposal, and update source documents with traceability notes \u2014 all in a single session |",
+      "",
+      "All issues also carry `type:requirement` and a `status:*` label.",
+      "",
+      "**Issue count per scan cycle:** 1 scan + 1 draft-trace = **2 sessions**.",
+      "",
+      "**Shortened paths:**",
+      "- No gaps found after scan \u2192 skip draft-trace \u2192 **1 session**",
+      "",
+      "---",
+      "",
+      "## Configurable Paths",
+      "",
+      "Projects adopting this bundle must define these paths in their agent",
+      "configuration (`agentConfig.rules` extension or project-level docs):",
+      "",
+      "| Placeholder | Meaning | Typical value |",
+      "|-------------|---------|---------------|",
+      `| \`<BCM_DOCS_ROOT>\` | Root of BCM model docs (capability models) | \`${paths.bcmRoot}/\` |`,
+      `| \`<COMPETITIVE_ROOT>\` | Competitive analysis docs | \`${paths.docsRoot}/business-strategy/competitive/\` |`,
+      `| \`<PRODUCT_ROOT>\` | Product roadmap / entity taxonomy | \`${paths.docsRoot}/product/\` |`,
+      `| \`<MEETINGS_ROOT>\` | Meeting extracts | \`${paths.docsRoot}/research/meetings/\` |`,
+      `| \`<RESEARCH_REQUIREMENTS_ROOT>\` | Scan reports and proposals | \`${paths.researchRequirementsRoot}/\` |`,
+      `| \`<REQUIREMENTS_ROOT>\` | Final requirement documents (owned by requirements-writer) | \`${paths.requirementsRoot}/\` |`,
+      "| `<PREFIX>` | Project-specific requirement ID prefix | e.g. `VRTX`, `ACME` |",
+      "",
+      "If your project stores these in different locations, substitute accordingly",
+      "wherever the phase instructions reference a path.",
+      "",
+      "---",
+      "",
+      "## Agent Loop",
+      "",
+      "Run this loop exactly once per session. Never start a second issue.",
+      "",
+      "1. Claim one open `type:requirement` issue using phase priority:",
+      "   `req:scan` > `req:draft-trace`.",
+      "2. Transition `status:ready` \u2192 `status:in-progress` and create the branch",
+      "   per your project's branch-naming convention.",
+      "3. Execute the phase handler that matches the issue's `req:*` label.",
+      "4. Commit, push, open a PR (if applicable), and close the issue per your",
+      "   project's PR workflow.",
+      "",
+      "---",
+      "",
+      "## Phase 1: Scan (`req:scan`)",
+      "",
+      "**Goal:** Read source documents, identify where requirements are missing,",
+      "incomplete, or contradictory, then check each potential gap against existing",
+      "requirements and open issues to eliminate duplicates. Produces a single",
+      "deduplicated scan report.",
+      "",
+      "**Budget:** Reading source docs + reading requirement registries + searching",
+      "issues. Write one deduplicated scan output file.",
+      "",
+      "### Scan Sources",
+      "",
+      "The issue specifies which source(s) to scan. Common scan scopes:",
+      "",
+      "| Scope | What to read | What to look for |",
+      "|-------|-------------|-----------------|",
+      `| **BCM model doc** | One \`{PREFIX}-NNN\` doc under \`<BCM_DOCS_ROOT>\` | The doc's project-relevance section (commonly \`## <Project> Relevance\` or \`## Strategic Implications\`) \u2014 gaps where capabilities exist but no FR/BR/INT addresses them. Use \`${paths.docsRoot}/project-context.md\` to judge what is relevant. |`,
+      "| **Competitive analysis** | One `comp-*.md` doc under `<COMPETITIVE_ROOT>` | Feature comparison gaps \u2014 competitor features the product lacks requirements for |",
+      "| **Product roadmap** | `<PRODUCT_ROOT>/prioritized-feature-roadmap.md` | Roadmap items without corresponding FRs |",
+      "| **Entity taxonomy** | `<PRODUCT_ROOT>/entity-taxonomy.md` | Entities without CRUD requirements (FR), data requirements (DR), or security requirements (SEC) |",
+      "| **Meeting extract** | `<MEETINGS_ROOT>/meeting-*.extract.md` | Requirements identified but not yet formalized |",
+      "",
+      "### Steps",
+      "",
+      "1. **Read the source documents** specified in the issue.",
+      "",
+      "2. **Identify potential gaps.** For each potential missing requirement:",
+      "   - Classify into the correct BCM category (FR, BR, NFR, SEC, DR, INT,",
+      "     OPS, UX, MT, ADR, TR)",
+      "   - Apply the shared disambiguation rules (from `requirements-taxonomy.ts`,",
+      "     also embedded in the requirements-writer and requirements-reviewer",
+      "     prompts)",
+      "   - Note the source that revealed the gap",
+      "   - Estimate priority based on the source context",
+      "",
+      "3. **Read the requirements registry.** Scan `_index.md` files in each",
+      "   `<REQUIREMENTS_ROOT>/<category>/` directory to know what already exists.",
+      "",
+      "4. **Search for existing issues.** For each potential gap, search open issues:",
+      "   ```bash",
+      '   gh issue list --label "type:requirement" --state open \\',
+      "     --json number,title --limit 100",
+      "   ```",
+      "",
+      "5. **Classify each gap:**",
+      "   - **New** \u2014 no existing requirement or open issue covers this",
+      "   - **Duplicate** \u2014 an existing requirement already addresses this",
+      "   - **In progress** \u2014 an open issue already targets this",
+      "   - **Partial** \u2014 existing requirement partially covers this; note the gap",
+      "",
+      "6. **Write the deduplicated scan report** to:",
+      "   ```",
+      "   <RESEARCH_REQUIREMENTS_ROOT>/req-scan-<scope>-<YYYY-MM-DD>.md",
+      "   ```",
+      "",
+      "   Format:",
+      "   ```markdown",
+      "   ---",
+      '   title: "Requirements Scan: <scope>"',
+      "   date: YYYY-MM-DD",
+      "   parent_issue: <N>",
+      "   status: complete",
+      "   ---",
+      "",
+      "   ## Source Documents Reviewed",
+      "   - <path> \u2014 <brief description>",
+      "",
+      "   ## Existing Requirements Checked",
+      "   - <category>: <count> existing docs, <count> open issues",
+      "",
+      "   ## Identified Gaps (New)",
+      "   ### Gap 1: <Title>",
+      "   - **Category:** FR / BR / NFR / SEC / DR / INT / OPS / UX / MT / ADR / TR",
+      "   - **Source:** <path to doc + section that revealed this gap>",
+      "   - **Priority:** High / Normal / Low",
+      "   - **Rationale:** <why this requirement is needed>",
+      "   - **Duplicate check:** No existing requirement or open issue found",
+      "   - **Proposed scope:** <1-2 sentences on what the requirement should cover>",
+      "",
+      "   ## Already Covered",
+      "   <list of potential gaps that turned out to already have requirements>",
+      "",
+      "   ## In Progress",
+      "   <gaps that already have open issues \u2014 include issue numbers>",
+      "",
+      "   ## Ambiguous / Needs Human Decision",
+      "   <gaps where the correct category or scope is unclear>",
+      "   ```",
+      "",
+      "7. **Create downstream issues based on findings:**",
+      "   - If any new gaps were identified \u2192 create `req:draft-trace` issue",
+      "     (blocked on this issue via `Depends on: #N`).",
+      "   - If **no gaps** were found \u2192 stop (no further phases needed). Comment",
+      "     on the issue noting that no gaps were identified, and proceed directly",
+      "     to commit and push. The scan issue will be marked done with no",
+      "     downstream work needed.",
+      "",
+      "8. **Commit and push.**",
+      "",
+      "---",
+      "",
+      "## Phase 2: Draft & Trace (`req:draft-trace`)",
+      "",
+      "**Goal:** Expand each identified gap into a requirement proposal, create",
+      "a `req:write` GitHub issue for each proposal so the downstream",
+      "`requirements-writer` bundle picks it up, and backfill source-document",
+      "traceability notes \u2014 all in a single session.",
+      "",
+      "**Budget:** No web searches. Reading + writing proposals + issue creation",
+      "+ minor traceability edits to source documents.",
+      "",
+      "Draft and Trace were previously separate phases. They were collapsed",
+      "because the proposals file written by Draft was only ever consumed by",
+      "Trace \u2014 no human review, no async work, no CI validation sat between",
+      "them. See ADR-009 for the decision record.",
       "",
-      "## The `req:write` Issue Schema",
+      "### `req:write` issue schema",
       "",
-      "This section is the **authoritative schema** for `req:write` issue",
-      "bodies. Upstream producers (the `requirements-analyst` trace phase,",
-      "the `requirements-reviewer` follow-up generator, and any human",
-      "authoring a `req:write` issue directly) must embed or link to this",
-      "same schema so the three required fields are always present when",
-      "the writer picks the issue up.",
+      "The `req:write` issues this phase creates are picked up by the",
+      "downstream `requirements-writer` agent, which parses a strict",
+      "schema on intake. The authoritative schema is defined in the",
+      "`requirements-writer` sub-agent prompt under **The `req:write`",
+      "Issue Schema** \u2014 every `req:write` issue this phase opens must",
+      "conform. The same schema is embedded in the",
+      "`requirements-reviewer` follow-up generator so the three",
+      "producers never drift apart.",
       "",
       ...REQ_WRITE_ISSUE_SCHEMA_SECTION,
       "",
-      "---",
-      "",
-      "## The `req:write` Phase",
+      "**Deriving the three required fields from the proposal.** For",
+      "every `req:write` issue this phase opens, the three fields come",
+      "directly from the proposal entry written earlier in the same",
+      "session:",
       "",
-      "**Goal:** Read the proposal that produced this issue, write a single",
-      "requirement document under `<REQUIREMENTS_ROOT>`, and update the",
-      "category index.",
+      "- **Category** \u2014 the proposal's `**Category:**` line.",
+      "- **Tier** \u2014 the proposal's `**Tier:**` line.",
+      "- **Output Path** \u2014",
+      "  `<REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md`,",
+      "  using the sequence number determined in the proposal step below.",
       "",
-      "**Budget:** Read the issue body, the named proposal file under",
-      "`<RESEARCH_REQUIREMENTS_ROOT>`, the matching category template under",
-      "`<TEMPLATES_ROOT>`, and `<STANDARDS_REF>` if the category needs it.",
-      "Write one requirement document and one category-index update. No web",
-      "searches.",
+      "**Validation step \u2014 required before opening the issue.** Before",
+      "calling `gh issue create`, verify all three required fields are",
+      "populated and internally consistent (Category matches title",
+      "prefix, Tier matches `tier:*` label, Output Path filename starts",
+      "with the Category prefix). If any field cannot be derived, open",
+      "the issue with `status:needs-attention` (not `status:ready`) and",
+      "include a `Missing: <field> \u2014 <one-line reason>` line so a human",
+      "triaging the issue only has to supply the remaining value(s)",
+      "before flipping the label to `status:ready`.",
       "",
       "### Steps",
       "",
-      "1. **Parse the issue.** The `req:write` issue body follows the",
-      "   authoritative schema in the",
-      "   [The `req:write` Issue Schema](#the-reqwrite-issue-schema)",
-      "   section below. Before writing, verify every required field",
-      "   (Category, Tier, Output Path) is present and internally",
-      "   consistent:",
+      "1. **Read the scan report** from Phase 1.",
       "",
-      "   - Category matches the prefix on the requirement title and on",
-      "     the Output Path filename.",
-      "   - Tier matches the `tier:*` label applied to the issue.",
-      "   - Output Path sits under",
-      "     `<REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md`.",
+      "2. **For each gap**, write a detailed proposal:",
       "",
-      "   If any required field is missing, contradictory, or the issue",
-      "   already carries `status:needs-attention` with a `Missing:` line",
-      "   (upstream could not derive it), comment on the issue with",
-      "   which field is wrong, ensure `status:needs-attention` is set,",
-      "   and stop without writing. A human triages before the writer",
-      "   tries again.",
+      "   ```markdown",
+      "   ## Proposed: <PREFIX>-<NNN> \u2014 <Title>",
       "",
-      "2. **Read the proposal.** Open the proposals file referenced in the",
-      "   issue inputs (under `<RESEARCH_REQUIREMENTS_ROOT>`). Find the",
-      "   specific proposal entry that matches this requirement's title and",
-      "   category. Treat the proposal as the authoritative source \u2014 do not",
-      "   invent fields it omits.",
+      "   **Category:** <FR/BR/NFR/SEC/DR/INT/OPS/UX/MT/ADR/TR>",
+      "   **Tier:** <platform/industry/customer-workflow/consumer-app>",
+      "   **Priority:** <High/Normal/Low>",
+      "   **Source:** <document path and section>",
       "",
-      "3. **Read the matching template** under `<TEMPLATES_ROOT>` for the",
-      "   category. Read `<STANDARDS_REF>` if the category is SEC, NFR,",
-      "   INT, ADR, or TR \u2014 these depend on the standards reference for",
-      "   correct framing.",
+      "   ### Summary",
+      "   <2-3 sentences describing what the requirement should capture>",
       "",
-      "4. **Pick the next sequence number.** Scan the target category",
-      "   directory under `<REQUIREMENTS_ROOT>` for existing files matching",
-      "   `{PREFIX}-NNN-*.md`. Use the next unused three-digit number.",
+      "   ### Draft Acceptance Criteria",
+      "   - [ ] <testable criterion 1>",
+      "   - [ ] <testable criterion 2>",
+      "   - [ ] <testable criterion 3>",
       "",
-      "5. **Apply the decision-authority rules.** Default to `Status:",
-      "   Draft` for direct-write categories (BR, FR, NFR, SEC, UX). Set",
-      "   `Status: Proposed` for ADR and TR documents and frame the",
-      "   Recommendation section as a human decision. For DR/MT/INT/OPS",
-      "   categories that imply a technology choice, write the requirement",
-      "   directly but spin the technology decision off into a separate",
-      "   `Proposed` ADR or TR \u2014 record the cross-link in the Open Items",
-      "   section of both documents.",
+      "   ### Traceability",
+      "   - **Implements:** <BR or parent requirement if applicable>",
+      "   - **Related:** list each interacting requirement on its own",
+      "     `- <PREFIX>-<NNN>` line in ascending ID order (append-only \u2014",
+      "     add your own entries, never rewrite or collapse existing ones",
+      "     into a comma-separated line), not a single comma-joined line",
+      "   - **Source:** <BCM doc, competitive analysis, or meeting that revealed",
+      "     the gap \u2014 use a markdown link. If the source is a meeting note, the",
+      "     downstream requirement doc must include the same meeting as a link in",
+      "     its Traceability `Related:` list.>",
       "",
-      "6. **Write the document.** Fill every section in the template. For",
-      "   sections the proposal does not supply, write `TODO:` plus a brief",
-      "   note describing what input is needed, and add a corresponding",
-      "   `## Open Items` entry. Never leave a template section out.",
+      "   ### Decision Authority",
+      '   <"Direct write" for BR/FR/NFR/SEC/UX, or "Proposed \u2014 needs human',
+      '   decision" for ADR/TR, or "Mixed \u2014 defer technology choices" for',
+      "   DR/MT/INT/OPS>",
       "",
-      "7. **Set frontmatter.** At minimum: `title`, `description`, `tier`.",
-      "   If the project declares optional frontmatter conventions in",
-      `   \`${paths.docsRoot}/project-context.md\` (such as \`referencedIn.meetings[]\`),`,
-      "   honor them. Otherwise stop at the minimum.",
+      "   ### Notes for Requirements Writer",
+      "   <any context the writer should know \u2014 related ADRs, existing partial",
+      "   coverage, relevant competitive features>",
+      "   ```",
       "",
-      "8. **Update the category index.** If the category directory has a",
-      "   `README.md` or `_index.md` registry, add a row for the new",
-      "   document in sequence order. If no index exists yet, generate one",
-      "   from `_template-category-README.md`.",
+      "3. **Write the proposals** to:",
+      "   ```",
+      "   <RESEARCH_REQUIREMENTS_ROOT>/req-proposals-<scope>-<YYYY-MM-DD>.md",
+      "   ```",
       "",
-      "9. **Cross-link upstream.** Add `## Traceability` entries pointing",
-      "   to the proposals file (under `<RESEARCH_REQUIREMENTS_ROOT>`),",
-      "   the source documents the proposal cited, and any BCM capability",
-      "   the requirement supports.",
+      "4. **Determine next sequence numbers.** For the **first** proposal",
+      "   in a given category this session, run",
+      "   `.claude/procedures/next-requirement-id.sh <PREFIX> <category-dir>`",
+      "   (no issue number \u2014 the `req:write` issues are not filed yet) to",
+      "   get the starting ID from live state (existing docs plus open",
+      "   `req:write` issues). For each subsequent proposal in the **same**",
+      "   category within this single batch session, increment the ID",
+      "   locally (the freshly-filed issues from this batch are not yet",
+      "   reflected in the procedure's live-state query). These IDs are",
+      "   **hints** stamped into the issue body; the downstream writer",
+      "   re-validates and finalizes each ID at write-start, so a residual",
+      "   collision costs nothing. If the procedure is unavailable, fall",
+      "   back to scanning `<REQUIREMENTS_ROOT>/<category>/` for the next",
+      "   available `NNN`.",
       "",
-      "10. **Quality checks.** Before committing, verify:",
-      "    - [ ] Frontmatter has `title` and `description` (and `tier` if",
-      "          the project uses tier classification)",
-      "    - [ ] Title matches the `# Heading` line",
-      "    - [ ] File name follows `{PREFIX}-{NNN}-{slug}.md`",
-      "    - [ ] Status is `Draft` for direct-write categories or `Proposed`",
-      "          for ADR/TR",
-      "    - [ ] Every template section is present (use `TODO:` or `Not",
-      "          applicable \u2014 <reason>` for unfilled sections)",
-      "    - [ ] `## Traceability` exists with at least one upstream link",
-      "    - [ ] No technology decisions made in direct-write categories \u2014",
-      "          deferred to `Proposed` ADR/TR with cross-links in Open",
-      "          Items",
-      "    - [ ] `## Open Items` is present with Identified Gaps,",
-      "          Follow-up Questions, and Contradictions subsections",
-      "    - [ ] ADR/TR documents include a Recommendation section and an",
-      "          Open Item flagging the human decision required",
-      "    - [ ] Category index updated with a row for the new document",
-      "    - [ ] Tier value matches the issue's `tier:*` label",
-      "    - [ ] Cross-tier traceability entries exist where the document",
-      "          depends on or enables a different tier",
+      "5. **Create requirement issues.** For each proposal, file a",
+      "   `req:write` issue using the canonical recipe documented in",
+      "   `## Template: req:write` of",
+      "   `docs/src/content/docs/agents/issue-templates.md`.",
       "",
-      "11. **Commit and push.** Use a `docs(<category>):` conventional",
-      "    commit message. The PR closes the `req:write` issue.",
+      `   All \`type:requirement\` issues default to \`priority:${labelsForPhase(issueDefaults, "req:write").priority}\` (override`,
+      "   only if the proposal's priority was explicitly High or Low). Each",
+      "   issue must also carry the `req:write` phase label plus the matching",
+      "   `tier:*` label so the downstream `requirements-writer` bundle picks",
+      "   it up with the correct tier. Concretely, the label list includes",
+      '   `--label "type:requirement"`, `--label "req:write"`,',
+      `   \`--label "tier:<tier-slug>"\`, \`--label "status:${labelsForPhase(issueDefaults, "req:write").status}"\`, and`,
+      `   \`--label "priority:${labelsForPhase(issueDefaults, "req:write").priority}"\`.`,
       "",
-      "---",
+      "   The body must carry the three writer-required fields in an",
+      "   `## Objective` block, written as bold-prefixed lines so the",
+      "   writer's intake parser can pull them out, plus the reserved-ID",
+      "   hint from step 4:",
       "",
-      "## Output Boundaries",
+      "   - `**Category:** <BR/FR/NFR/TR/ADR/SEC/DR/INT/OPS/UX/MT>`",
+      "   - `**Tier:** <platform/industry/customer-workflow/consumer-app>`",
+      "   - `**Output Path:** <REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md`",
+      "   - `**Requirement ID:** <PREFIX>-<NNN>` \u2014 the ID reserved in step 4",
+      "     (must match the `<PREFIX>-<NNN>` in the Output Path). This is a",
+      "     **hint**: the downstream writer re-validates and finalizes the",
+      "     ID at write-start, so a residual collision is repaired there",
+      "     for free.",
       "",
-      "This agent writes **only** to:",
+      "   Then under `## Inputs / Read`, list the proposals file",
+      "   (`<RESEARCH_REQUIREMENTS_ROOT>/req-proposals-<scope>-<date>.md`)",
+      "   and any source documents the writer should consult (BCM model",
+      "   docs, competitive analyses, product docs).",
       "",
-      "- `<REQUIREMENTS_ROOT>/<category-dir>/<PREFIX>-<NNN>-<slug>.md` \u2014 one",
-      "  requirement document per session",
-      "- `<REQUIREMENTS_ROOT>/<category-dir>/README.md` (or `_index.md`) \u2014",
-      "  category index, one row appended per session",
-      "- `<REQUIREMENTS_ROOT>/README.md` (or `_index.md`) \u2014 only if the",
-      "  top-level requirements README does not yet exist; generate from",
-      "  `_template-requirements-README.md` and stop",
+      "   When one of Category / Tier / Output Path could not be derived",
+      "   from the proposal (for example, the proposal omitted the Tier",
+      `   line), replace \`status:${labelsForPhase(issueDefaults, "req:write").status}\` with \`status:needs-attention\` in`,
+      "   the label list and add a `Missing: <field> \u2014 <reason>` line",
+      "   directly below the Output Path line in the body. Populate",
+      "   whichever of the three fields **could** be derived so a human",
+      "   triaging the issue has the minimum possible cleanup.",
       "",
-      "The pipeline produces **requirement documents**. It does not write",
-      "BCM capability models, people profiles, company profiles, software",
-      "profiles, scan reports, or proposal files \u2014 those belong to",
-      "specialized upstream/downstream agents.",
+      "6. **Update source documents.** In each BCM model doc or competitive",
+      "   analysis that was scanned, add a note in the project-relevance /",
+      "   strategic-implications section (whichever heading the source doc uses)",
+      "   indicating that a requirement issue was created. Each note is its",
+      "   own single line:",
       "",
-      "**Do NOT create:**",
-      "- `req:scan` or `req:draft-trace` issues \u2014 those belong to",
-      "  the `requirements-analyst` bundle",
-      "- `bcm:*` issues \u2014 those belong to the `bcm-writer` bundle",
-      "- `people:*`, `company:*`, `software:*`, `research:*`, or",
-      "  `industry:*` issues \u2014 those belong to their respective bundles",
+      "   ```markdown",
+      "   - Gap addressed: see [<PREFIX>-<NNN>](<relative path to requirement doc>)",
+      "     (issue #<N>)",
+      "   ```",
       "",
-      "If the proposal surfaces work that needs one of the above, comment",
-      "on the `req:write` issue with the suggested follow-up and let a",
-      "human route it.",
+      "   These `Gap addressed:` notes form an **append-only,",
+      "   one-per-line, deterministically sorted** list \u2014 the shared BCM /",
+      "   competitive-analysis source docs are edited concurrently by",
+      "   sibling `req:draft-trace` sessions, so this list is a",
+      "   merge-conflict hotspot. Maintain it under the same discipline",
+      "   the `shared-editing-safety` rule prescribes for shared registries,",
+      "   applied here to this one list section (the surrounding source doc",
+      "   is a hand-authored document, not a registry, so only this list is",
+      "   governed):",
+      "",
+      "   - **One entry per line.** Add each `- Gap addressed:` note as its",
+      "     own new bullet. Never collapse notes into a single",
+      "     comma-separated line \u2014 a single mutable line always conflicts",
+      "     when two sessions touch it.",
+      "   - **Ascending order.** Insert your bullet in the position that",
+      "     keeps the list sorted by requirement ID (`<PREFIX>-<NNN>`), so",
+      "     concurrent sibling inserts land on different lines and git",
+      "     auto-merges them.",
+      "   - **Append-only.** Never rewrite, reorder, or merge existing",
+      "     notes; add only your own.",
+      "   - **Defer the commit of this section to the final pre-push",
+      "     step.** Pull the latest default branch before inserting, insert",
+      "     only your own note, and if a concurrent sibling already landed a",
+      "     bullet, rebase and re-insert. Commit this shared list section on",
+      "     its own at the end, then push immediately.",
+      "",
+      "7. **Comment on the scan issue** with a summary of all issues created and",
+      "   all docs updated.",
+      "",
+      "8. **Commit and push.**",
       "",
       "---",
       "",
@@ -25914,157 +26405,118 @@ function buildRequirementsWriterSubAgent(paths) {
       "",
       "| Direction | Agent | What |",
       "|-----------|-------|------|",
-      "| Upstream | `requirements-analyst` | Discovers gaps, drafts proposals, and creates `req:write` issues that this agent picks up |",
-      "| Upstream | `bcm-writer` | Provides BCM capability documents that requirements trace back to via `## Traceability` links |",
-      "| Peer | `meeting-analyst` | Provides meeting transcripts that may inform a requirement's traceability extensions (optional) |",
+      `| Upstream | BCM Writer | Scans capability-model docs for project-relevance gaps (judged against \`${paths.docsRoot}/project-context.md\`) |`,
+      "| Upstream | Company Research | Scans competitive analysis for feature comparison gaps |",
+      "| Upstream | Meeting Analyst | Scans meeting extracts for requirement proposals |",
+      "| Downstream | `requirements-writer` | Picks up the `type:requirement` + `req:write` issues this agent creates and drafts the actual requirement document |",
       "",
-      "**File boundaries:** Reads `<RESEARCH_REQUIREMENTS_ROOT>` (proposals)",
-      "and the source documents the proposals cite. Writes",
-      "`<REQUIREMENTS_ROOT>` and the category index files. Never edits",
-      "proposals, scan reports, BCM documents, or profiles.",
+      "**File boundaries:** Writes to `<RESEARCH_REQUIREMENTS_ROOT>/req-*.md` and",
+      "minor traceability edits to `<BCM_DOCS_ROOT>` and `<COMPETITIVE_ROOT>`.",
+      "Never writes to `<REQUIREMENTS_ROOT>/` \u2014 that is owned by the",
+      "requirements-writer agent.",
+      "",
+      "---",
+      "",
+      "## Blocked Issues",
+      "",
+      "Additional block reasons specific to requirements synthesis:",
+      "- Source document has unresolved contradictions",
+      "- Category classification is ambiguous (needs human disambiguation)",
+      "- Dependent BCM documents are still in draft with placeholder content",
       "",
       "---",
       "",
       "## Rules",
       "",
-      "- **One requirement per session.** Never write two documents in one",
-      "  session and never start a second issue.",
-      "- **Templates are authoritative.** Use the shipped template verbatim",
-      "  for the category. Every template section must appear in the final",
-      "  document.",
-      "- **Decision authority is non-negotiable.** Direct-write categories",
-      "  ship as `Draft`. ADR and TR ship as `Proposed` with a Recommendation",
-      "  framed for human decision. Mixed-deferral categories spin",
-      "  technology choices off into separate `Proposed` documents.",
-      "- **Cite, don't invent.** When the proposal omits a stakeholder,",
-      "  metric, threat model entry, or technology option, write `TODO:` and",
-      "  flag the issue with `status:needs-attention`.",
-      "- **Trace upstream.** Every requirement links back to its proposal,",
-      "  the source documents the proposal cited, and the BCM capability",
-      "  it supports (when applicable).",
-      "- **Update the category index every time.** A requirement that",
-      "  exists as a file but is missing from its category index is",
-      "  invisible to anyone browsing the documentation tree.",
-      "- **Write requirements, not capability models or gap reports.**",
-      "  Never open `req:scan`, `req:draft-trace`, or `bcm:*` issues from",
-      "  this pipeline."
+      "- **Discover, don't write requirements.** Create issues for the",
+      "  `requirements-writer` agent \u2014 don't write requirement documents",
+      "  directly.",
+      "- **Deduplicate rigorously.** Check both existing docs and open issues",
+      "  before flagging a gap.",
+      "- **Respect decision authority.** Mark ADR/TR proposals as needing human",
+      "  decision. Don't create direct-write issues for technology choices.",
+      "- **Bidirectional traceability.** Every `req-scan-*.md` and",
+      "  `req-proposals-*.md` must include a `## Produced` section listing the",
+      "  downstream requirement issues (and eventual requirement documents) it",
+      "  spawned, as markdown links; each formal requirement document under",
+      "  `<REQUIREMENTS_ROOT>/` must include a forward link back to the scan or",
+      "  proposal that produced it."
     ].join("\n")
   };
 }
-function buildWriteRequirementSkill(paths, issueDefaults) {
+function buildScanRequirementsSkill(issueDefaults) {
   return {
-    name: WRITE_REQUIREMENT_SKILL_NAME,
-    description: "Write one formal requirement document (BR / FR / NFR / TR / ADR / SEC / DR / INT / OPS / UX / MT) using the shipped category template and decision-authority rules. Picks up a req:write issue created by the upstream requirements-analyst pipeline (or kicked off ad hoc) and dispatches the requirements-writer agent.",
+    name: "scan-requirements",
+    description: "Kick off a requirements-analyst scan across BCM model docs, competitive analysis, product docs, or meeting extracts. Creates a req:scan issue and dispatches Phase 1.",
     disableModelInvocation: true,
     userInvocable: true,
     context: "fork",
-    agent: "requirements-writer",
+    agent: "requirements-analyst",
     platforms: { cursor: { exclude: true } },
-    referenceFiles: buildRequirementsWriterReferenceFiles(paths),
     instructions: [
-      "# Write Requirement",
+      "# Scan Requirements",
       "",
-      "Write one formal requirement document using the 11-category taxonomy",
-      "(BR, FR, NFR, TR, ADR, SEC, DR, INT, OPS, UX, MT) and the",
-      "decision-authority rules (direct-write vs. propose-only ADR/TR).",
-      "Dispatches the `requirements-writer` agent.",
+      "Kick off a requirements-analyst scan cycle. Creates a `req:scan` issue",
+      "targeted at the requested scope and dispatches Phase 1 (Scan) in the",
+      "requirements-analyst agent.",
       "",
       "## Usage",
       "",
-      "/write-requirement <category> <short-title>",
-      "",
-      "Where `<category>` is one of `BR`, `FR`, `NFR`, `TR`, `ADR`, `SEC`,",
-      "`DR`, `INT`, `OPS`, `UX`, `MT`.",
-      "",
-      "Optional extensions in the issue body:",
-      "- `tier: platform | industry | customer-workflow | consumer-app` \u2014",
-      "  the architectural tier (default: `platform`)",
-      "- `prefix: <PROJECT_PREFIX>` \u2014 override the default category prefix",
-      `  with a project-specific one declared in \`${paths.docsRoot}/project-context.md\``,
-      "- `customer: <link-or-slug>` \u2014 link the requirement to a customer",
-      "  profile (expected for Customer Workflow / Consumer Application",
-      "  tiers in projects that track customer profiles)",
-      "- `proposal: <path>` \u2014 pin the upstream proposal file under",
-      "  `<RESEARCH_REQUIREMENTS_ROOT>` (default: derived from the issue",
-      "  context)",
-      "- `output: <path>` \u2014 override the default Output Path",
-      "",
-      "## Default Paths",
-      "",
-      `If the project has no override in \`${paths.docsRoot}/project-context.md\` or`,
-      "`agentConfig.rules`, outputs land under:",
-      "",
-      `- \`${paths.requirementsRoot}/<category-dir>/<PREFIX>-<NNN>-<slug>.md\``,
-      `- \`${paths.requirementsRoot}/<category-dir>/README.md\` (registry update)`,
-      `- \`${paths.requirementsRoot}/README.md\` (top-level README, generated on`,
-      "  first use only)",
+      "/scan-requirements <scope>",
       "",
-      "Templates and the standards reference ship with this skill under",
-      "`_references/templates/` and `_references/standards-and-frameworks.md`.",
+      "Where `<scope>` is one of:",
+      "- `bcm:<PREFIX-NNN>` \u2014 a single BCM model doc",
+      "- `competitive:<slug>` \u2014 a single competitive analysis doc",
+      "- `product-roadmap` \u2014 the prioritized feature roadmap",
+      "- `entity-taxonomy` \u2014 the entity taxonomy doc",
+      "- `meeting:<slug>` \u2014 a meeting extract",
+      "- `all-bcm` / `all-competitive` \u2014 full sweep (long-running)",
       "",
       "## Steps",
       "",
-      "1. Create a `req:write` issue with `type:requirement`,",
-      `   \`priority:${labelsForPhase(issueDefaults, "req:write").priority}\`, \`status:${labelsForPhase(issueDefaults, "req:write").status}\`, and the matching \`tier:*\` label.`,
-      "   Body must include the category, tier, output path, and a pointer",
-      "   to the upstream proposal (or a direct user description if no",
-      "   proposals file exists).",
-      "2. Execute the write phase of the requirements-writer agent.",
-      "3. The agent writes one requirement document, updates the category",
-      "   index, opens a PR, and closes the issue.",
+      `1. Create a \`req:scan\` issue with \`type:requirement\`, \`priority:${labelsForPhase(issueDefaults, "req:scan").priority}\`,`,
+      `   and \`status:${labelsForPhase(issueDefaults, "req:scan").status}\`. Body must list the files to read and the scan scope.`,
+      "2. Execute Phase 1 (Scan) of the requirements-analyst agent.",
+      "3. If gaps are found, a `req:draft-trace` issue is created automatically.",
       "",
       "## Output",
       "",
-      "- One requirement document under `<REQUIREMENTS_ROOT>` following the",
-      "  shipped category template, with `Status: Draft` for direct-write",
-      "  categories or `Status: Proposed` for ADR/TR",
-      "- A category-index row pointing at the new document",
-      "- (First-time only) a top-level requirements README derived from",
-      "  `_template-requirements-README.md`"
+      "- A `req-scan-<scope>-<YYYY-MM-DD>.md` file under the project's research",
+      "  requirements directory.",
+      "- A `req:draft-trace` issue if any gaps were identified."
     ].join("\n")
   };
 }
-function buildRequirementsWriterBundle(paths = DEFAULT_AGENT_PATHS, issueDefaults = DEFAULT_RESOLVED_ISSUE_DEFAULTS) {
+function buildRequirementsAnalystBundle(paths = DEFAULT_AGENT_PATHS, issueDefaults = DEFAULT_RESOLVED_ISSUE_DEFAULTS) {
   return {
-    name: "requirements-writer",
-    description: "Requirements writer agent bundle. Authors formal requirement documents from upstream proposals using the 11-category taxonomy (BR, FR, NFR, TR, ADR, SEC, DR, INT, OPS, UX, MT), the four-tier classification, and decision-authority rules (direct-write vs. propose-only). Ships 13 templates plus a standards-and-frameworks reference.",
+    name: "requirements-analyst",
+    description: "Requirements gap-discovery agent bundle for BCM-driven projects. 2-phase pipeline (scan, draft-trace) with req:* phase labels.",
     appliesWhen: () => true,
     rules: [
       {
-        name: "requirements-writer-workflow",
-        description: "Describes the requirements-writer pipeline, the req:write phase label, the four tier:* labels, and the boundary with the upstream requirements-analyst and bcm-writer bundles.",
+        name: "requirements-analyst-workflow",
+        description: "Describes the 2-phase requirements gap-discovery pipeline, the req:* label taxonomy, and the boundary with the downstream requirements-writer agent.",
         scope: AGENT_RULE_SCOPE.ALWAYS,
         content: [
-          "# Requirements Writer Workflow",
-          "",
-          "Use `/write-requirement <category> <short-title>` to author one",
-          "formal requirement document. The writer runs in a single phase",
-          "tracked by a GitHub issue labeled `req:write` plus the matching",
-          "`tier:*` label. Issues also carry `type:requirement` (declared",
-          "by the upstream `requirements-analyst` bundle).",
-          "",
-          "The pipeline produces **requirement documents only** \u2014 capability",
-          "models are written by the `bcm-writer` agent and gap discovery is",
-          "the responsibility of the `requirements-analyst` agent. The",
-          "writer never opens `req:scan`, `req:draft-trace`, or `bcm:*`",
-          "issues.",
+          "# Requirements Analyst Workflow",
           "",
-          "Documents follow the 11-category taxonomy (BR, FR, NFR, TR, ADR,",
-          "SEC, DR, INT, OPS, UX, MT) and the four-tier classification",
-          "(Platform, Industry, Customer Workflow, Consumer Application).",
-          "Templates and a standards-and-frameworks reference ship with the",
-          "skill \u2014 they are the same files for every project that adopts",
-          "the bundle.",
+          "Use `/scan-requirements <scope>` to kick off a requirements gap",
+          "discovery cycle. The pipeline runs in 2 phases \u2014 scan and",
+          "draft-trace \u2014 each tracked by its own GitHub issue labeled",
+          "`req:scan` or `req:draft-trace`. All issues carry",
+          "`type:requirement`.",
           "",
-          "Decision-authority rules are non-negotiable: BR / FR / NFR /",
-          "SEC / UX ship as `Status: Draft`; ADR and TR ship as",
-          "`Status: Proposed` with a Recommendation framed for human",
-          "decision; DR / MT / INT / OPS spin technology choices off into",
-          "separate `Proposed` ADR or TR documents.",
+          "The requirements-analyst *discovers gaps, drafts proposals, and",
+          "opens `req:write` issues for the downstream writer*; it does",
+          "**not** write final requirement documents. Writing is the job of",
+          "the downstream `requirements-writer` agent (a separate bundle).",
+          "Keep that boundary clean: proposals land under the research",
+          "requirements directory, not under the authoritative requirements",
+          "tree. The draft-trace phase tags new issues with `req:write` so",
+          "the writer bundle picks them up automatically.",
           "",
-          "See the `requirements-writer` agent definition for full workflow",
-          "details, configurable paths, decision-authority rules, and",
-          "phase-by-phase instructions."
+          "See the `requirements-analyst` agent definition for full workflow",
+          "details and phase-by-phase instructions."
         ].join("\n"),
         platforms: {
           cursor: { exclude: true }
@@ -26072,38 +26524,34 @@ function buildRequirementsWriterBundle(paths = DEFAULT_AGENT_PATHS, issueDefault
         tags: ["workflow"]
       }
     ],
-    skills: [buildWriteRequirementSkill(paths, issueDefaults)],
-    subAgents: [buildRequirementsWriterSubAgent(paths)],
+    skills: [buildScanRequirementsSkill(issueDefaults)],
+    subAgents: [buildRequirementsAnalystSubAgent(paths, issueDefaults)],
+    // Shares the write-start ID allocator with the writer bundle. Both
+    // bundles auto-detect and AgentConfig.resolveProcedures dedupes by
+    // name, so `next-requirement-id.sh` is emitted to disk exactly once.
+    // The analyst runs it (without a self-issue-number) to seed the first
+    // reserved ID in a category during draft-trace.
+    procedures: [nextRequirementIdProcedure],
     labels: [
       {
-        name: "req:write",
-        color: "FEF2C0",
-        description: "Phase: write a formal requirement document using the requirements-writer skill"
-      },
-      {
-        name: "tier:platform",
-        color: "EDEDED",
-        description: "Architectural tier: core platform (shared infrastructure, APIs, auth, tenant isolation)"
-      },
-      {
-        name: "tier:industry",
-        color: "EDEDED",
-        description: "Architectural tier: industry vertical (capabilities not every tenant needs)"
+        name: "type:requirement",
+        color: "1D76DB",
+        description: "Work that produces or discovers a requirement document (FR, BR, NFR, etc.)"
       },
       {
-        name: "tier:customer-workflow",
-        color: "EDEDED",
-        description: "Architectural tier: customer-configured workflow (business logic tenants configure)"
+        name: "req:scan",
+        color: "C5DEF5",
+        description: "Phase 1: scan source docs for requirement gaps and deduplicate"
       },
       {
-        name: "tier:consumer-app",
-        color: "EDEDED",
-        description: "Architectural tier: consumer application (UI/UX and integrations in external front-ends/systems)"
+        name: "req:draft-trace",
+        color: "BFDADC",
+        description: "Phase 2: draft proposals, create req:write issues, and backfill source-doc traceability"
       }
     ]
   };
 }
-var requirementsWriterBundle = buildRequirementsWriterBundle();
+var requirementsAnalystBundle = buildRequirementsAnalystBundle();
 
 // src/agent/bundles/requirements-reviewer.ts
 function buildRequirementsReviewerSubAgent(paths, issueDefaults) {
@@ -30819,7 +31267,7 @@ var _TurboRepo = class _TurboRepo extends import_lib2.Component {
     }
   }
   activateBranchNameEnvVar(options) {
-    const value = '$(echo "${GIT_BRANCH_NAME:-$(git rev-parse --abbrev-ref HEAD)}")';
+    const value = '$([ -n "$GIT_BRANCH_NAME" ] && echo "$GIT_BRANCH_NAME" || git rev-parse --abbrev-ref HEAD)';
     if (options === void 0) {
       this.project.logger.warn(
         "TurboRepo.activateBranchNameEnvVar() with no arguments is deprecated. It writes GIT_BRANCH_NAME to the root `globalEnv`, which forces every task in the monorepo to miss cache on every branch switch. Pass `{ tasks: [...] }` and name only the tasks that actually consume the branch (e.g. CDK synth/package) to preserve cross-branch cache hits for everything else."
@@ -31332,7 +31780,7 @@ var VERSION = {
   /**
    * Version of `@types/node` to use across all packages (pnpm catalog).
    */
-  TYPES_NODE_VERSION: "26.1.0",
+  TYPES_NODE_VERSION: "26.1.1",
   /**
    * What version of Vite to use (pnpm override). Pinned to 5.x so Vitest 4.x
    * can load config (Vite 6+/7+ are ESM-only; see issue #142). Remove override
@@ -33024,7 +33472,11 @@ var DEFAULT_CLAUDE_HOOKS = {
       hooks: [
         {
           type: "command",
-          command: `echo "$(date -u +%FT%TZ),\${CLAUDE_SESSION_ID:-unknown},\${CLAUDE_INPUT_TOKENS:-0},\${CLAUDE_OUTPUT_TOKENS:-0}" >> ${DEFAULT_USAGE_LOG_PATH}`
+          // Claude Code delivers hook data as a JSON object on stdin, not
+          // as CLAUDE_* env vars, so read the session id from `.session_id`
+          // via jq. Token counts are not passed to hooks, so the two token
+          // columns are dropped — usage.log is now `<timestamp>,<session-id>`.
+          command: `sid="$(jq -r '.session_id // "unknown"' 2>/dev/null)"; echo "$(date -u +%FT%TZ),\${sid:-unknown}" >> ${DEFAULT_USAGE_LOG_PATH}`
         }
       ]
     }
@@ -33035,7 +33487,13 @@ var DEFAULT_CLAUDE_HOOKS = {
       hooks: [
         {
           type: "command",
-          command: 'case "${CLAUDE_TOOL_INPUT_path:-}" in *docs/src/content/docs/*) if [ -x .claude/procedures/strip-tool-artifact-tags.sh ]; then bash .claude/procedures/strip-tool-artifact-tags.sh "$CLAUDE_TOOL_INPUT_path" >/dev/null 2>&1; fi; if [ -x .claude/procedures/check-links.sh ]; then bash .claude/procedures/check-links.sh "$CLAUDE_TOOL_INPUT_path" 2>&1 | head -20; fi ;; esac'
+          // Claude Code delivers hook data as a JSON object on stdin, not
+          // as CLAUDE_* env vars, so read the edited file path from
+          // `.tool_input.file_path` via jq. On files under
+          // docs/src/content/docs/ this runs only the tool-artifact-tag
+          // stripper (#779); it is `-x`-guarded so it no-ops cleanly when
+          // the path is empty or the procedure script is not shipped.
+          command: `path="$(jq -r '.tool_input.file_path // empty' 2>/dev/null)"; case "$path" in *docs/src/content/docs/*) if [ -x .claude/procedures/strip-tool-artifact-tags.sh ]; then bash .claude/procedures/strip-tool-artifact-tags.sh "$path" >/dev/null 2>&1; fi ;; esac`
         }
       ]
     }
@@ -33123,7 +33581,12 @@ var AgentConfig = class _AgentConfig extends import_projen8.Component {
    * entries. Both `allow` and `deny` are deduped via
    * `Array.from(new Set(...))`; V8 `Set` iteration preserves insertion
    * order, so the final ordering is defaults first, then bundle, then
-   * user, with duplicates removed (first-occurrence wins). `defaultMode`
+   * user, with duplicates removed (first-occurrence wins). After the
+   * merge+dedupe, any entry whose value exactly matches a string in
+   * `permissions.excludeDefaults` is dropped from `allow` / `deny` / `ask`
+   * — the only supported way to remove a baseline default, since the merge
+   * is otherwise append-only. `excludeDefaults` is a build-time directive
+   * and is stripped from the rendered `permissions` object. `defaultMode`
    * is opt-in (steering decision D7): it is set only from
    * `userSettings.defaultMode` and left undefined otherwise, so the
    * renderer omits the key for un-opted-in consumers — see the inline
@@ -33148,6 +33611,29 @@ var AgentConfig = class _AgentConfig extends import_projen8.Component {
     const bundleDeny = bundlePermissions?.deny ?? [];
     const userAllow = userSettings?.permissions?.allow ?? [];
     const userDeny = userSettings?.permissions?.deny ?? [];
+    const exclude = new Set(userSettings?.permissions?.excludeDefaults ?? []);
+    const dropExcluded = (entries) => entries.filter((entry) => !exclude.has(entry));
+    const { excludeDefaults: _excludeDefaults, ...passthroughPermissions } = userSettings?.permissions ?? {};
+    const askOverride = passthroughPermissions.ask?.length ? { ask: dropExcluded([...passthroughPermissions.ask]) } : {};
+    const mergedPermissions = {
+      ...passthroughPermissions,
+      allow: dropExcluded(
+        Array.from(
+          /* @__PURE__ */ new Set([...DEFAULT_CLAUDE_ALLOW, ...bundleAllow, ...userAllow])
+        )
+      ),
+      deny: dropExcluded(
+        Array.from(
+          /* @__PURE__ */ new Set([
+            ...DEFAULT_CLAUDE_DENY,
+            ...DEFAULT_CLAUDE_PATH_DENY,
+            ...bundleDeny,
+            ...userDeny
+          ])
+        )
+      ),
+      ...askOverride
+    };
     return {
       ...userSettings,
       // `defaultMode` is opt-in (steering decision D7): the base
@@ -33160,20 +33646,7 @@ var AgentConfig = class _AgentConfig extends import_projen8.Component {
       // confirmation prompts — opt in by setting
       // `claudeSettings.defaultMode: "dontAsk"`.
       defaultMode: userSettings?.defaultMode,
-      permissions: {
-        ...userSettings?.permissions,
-        allow: Array.from(
-          /* @__PURE__ */ new Set([...DEFAULT_CLAUDE_ALLOW, ...bundleAllow, ...userAllow])
-        ),
-        deny: Array.from(
-          /* @__PURE__ */ new Set([
-            ...DEFAULT_CLAUDE_DENY,
-            ...DEFAULT_CLAUDE_PATH_DENY,
-            ...bundleDeny,
-            ...userDeny
-          ])
-        )
-      },
+      permissions: mergedPermissions,
       hooks: _AgentConfig.mergeClaudeHooks(userSettings),
       env: { ...DEFAULT_CLAUDE_ENV, ...userSettings?.env ?? {} }
     };
@@ -35017,7 +35490,7 @@ var AwsDeploymentConfig = class _AwsDeploymentConfig extends import_projen12.Com
     };
     this.cdkCli = CdkCli.of(project) || new CdkCli(project);
     this.env = {
-      GIT_BRANCH_NAME: '$(echo "${GIT_BRANCH_NAME:-$(git branch --show-current)}")'
+      GIT_BRANCH_NAME: '$([ -n "$GIT_BRANCH_NAME" ] && echo "$GIT_BRANCH_NAME" || git branch --show-current)'
     };
     this.projectPath = (0, import_node_path2.relative)(project.root.outdir, project.outdir);
     this.rootPath = (0, import_node_path2.relative)(project.outdir, project.root.outdir);
@@ -36995,7 +37468,7 @@ export default preview;
 }
 
 // src/projects/astro-project.ts
-var import_projen24 = require("projen");
+var import_projen25 = require("projen");
 var import_ts_deepmerge3 = require("ts-deepmerge");
 
 // src/projects/monorepo-layout.ts
@@ -37143,7 +37616,7 @@ function resolveReactViteSiteProjectOutdir(packageName) {
 }
 
 // src/projects/typescript-project.ts
-var import_projen23 = require("projen");
+var import_projen24 = require("projen");
 var import_javascript4 = require("projen/lib/javascript");
 var import_release = require("projen/lib/release");
 var import_ts_deepmerge2 = require("ts-deepmerge");
@@ -37587,8 +38060,62 @@ function patchStepArray3(steps, pinned) {
   }
 }
 
-// src/workflows/sync-labels.ts
+// src/workflows/requirement-issue-template.ts
 var import_projen20 = require("projen");
+function renderRequirementBlock(fields) {
+  return [
+    "## Requirement",
+    "",
+    `- **ID:** ${fields.id}`,
+    `- **Spec:** ${fields.specUrl}`,
+    `- **Tier:** ${fields.tier}`,
+    `- **Customer:** ${fields.customer}`
+  ].join("\n");
+}
+var DEFAULT_TEMPLATE_PATH = ".github/ISSUE_TEMPLATE/requirement-impl.md";
+var DEFAULT_TEMPLATE_LABELS = ["type:feat"];
+var RequirementIssueTemplate = class extends import_projen20.Component {
+  constructor(project, options = {}) {
+    super(project);
+    const path8 = options.path ?? DEFAULT_TEMPLATE_PATH;
+    const labels = options.labels ?? DEFAULT_TEMPLATE_LABELS;
+    const labelsYaml = `[${labels.map((l) => `"${l}"`).join(", ")}]`;
+    const requirementBlock = renderRequirementBlock({
+      id: "<!-- e.g. FR-042 -->",
+      specUrl: "<!-- URL to the canonical requirement doc in the planning repo -->",
+      tier: "<!-- Platform | Industry | Customer Workflow | Consumer Application -->",
+      customer: "<!-- customer scope, or \u2014 -->"
+    });
+    const lines = [
+      "---",
+      "name: Requirement implementation",
+      "about: Implement a canonical requirement tracked in the planning repo",
+      'title: "feat: implement <REQ-ID> \u2014 <short summary>"',
+      `labels: ${labelsYaml}`,
+      "---",
+      "",
+      ...requirementBlock.split("\n"),
+      "",
+      "> Add the `req:<ID>` label (e.g. `req:FR-042`) so this issue is traceable to the requirement across repos.",
+      "",
+      "## Summary",
+      "",
+      "<!-- What must change in THIS repo to satisfy the requirement above. -->",
+      "",
+      "## Acceptance Criteria",
+      "",
+      "- [ ]"
+    ];
+    new import_projen20.TextFile(project, path8, {
+      marker: false,
+      committed: true,
+      lines
+    });
+  }
+};
+
+// src/workflows/sync-labels.ts
+var import_projen21 = require("projen");
 var import_workflows_model4 = require("projen/lib/github/workflows-model");
 var DEFAULT_STATUS_LABELS = [
   {
@@ -37796,10 +38323,10 @@ ${offenders}`
     }
   });
 }
-var LabelsFile = class extends import_projen20.Component {
+var LabelsFile = class extends import_projen21.Component {
   constructor(project, labels) {
     super(project);
-    new import_projen20.YamlFile(project, LABELS_CONFIG_PATH, {
+    new import_projen21.YamlFile(project, LABELS_CONFIG_PATH, {
       obj: labels.map((l) => ({
         name: l.name,
         color: l.color,
@@ -38013,6 +38540,9 @@ var MonorepoProject = class extends import_typescript3.TypeScriptAppProject {
     super({ ...options });
     postInstallDependenciesMap.set(this, []);
     this.tsconfig?.removeInclude(`${this.srcdir}/**/*.ts`);
+    this.preCompileTask.exec(
+      '[ -e "tsconfig.tsbuildinfo" ] && rm -f tsconfig.tsbuildinfo || true'
+    );
     this.pnpmVersion = options.pnpmVersion;
     this.configulatorRegistryConsumer = options.configulatorRegistryConsumer ?? true;
     this.layoutEnforcement = options.layoutEnforcement ?? LAYOUT_ENFORCEMENT.WARN;
@@ -38043,7 +38573,16 @@ var MonorepoProject = class extends import_typescript3.TypeScriptAppProject {
     }
     if (options.resetTask !== false) {
       const defaultResetTaskOptions = {
-        pathsToRemove: ["node_modules", ".turbo", "dist", "lib"]
+        pathsToRemove: [
+          "node_modules",
+          ".turbo",
+          "dist",
+          "lib",
+          // Root reset must also drop the incremental buildinfo (#656) so a
+          // stale `.tsbuildinfo` can't hide a regressed dependency `.d.ts`
+          // rollup from the next compile. Sub-projects already clean this.
+          "tsconfig.tsbuildinfo"
+        ]
       };
       const userResetTaskOptions = options.resetTaskOptions ?? {};
       const resetTaskOptions = (0, import_ts_deepmerge.merge)(
@@ -38087,6 +38626,12 @@ var MonorepoProject = class extends import_typescript3.TypeScriptAppProject {
         bundles: syncLabelsOptions.bundles ?? agentConfig?.activeBundles
       });
     }
+    if (options.requirementIssueTemplate) {
+      new RequirementIssueTemplate(
+        this,
+        typeof options.requirementIssueTemplate === "object" ? options.requirementIssueTemplate : {}
+      );
+    }
     if (this.buildWorkflow) {
       addBuildCompleteJob(this.buildWorkflow);
     }
@@ -38222,11 +38767,11 @@ var MonorepoProject = class extends import_typescript3.TypeScriptAppProject {
 };
 
 // src/typescript/tsdoc-config.ts
-var import_projen21 = require("projen");
+var import_projen22 = require("projen");
 var STANDARD_MODIFIER_TAGS = ["@default"];
 var STANDARD_INLINE_TAGS = ["@code"];
 var ALWAYS_ON_SCOPES = ["@codedrifters"];
-var TsdocConfig = class _TsdocConfig extends import_projen21.Component {
+var TsdocConfig = class _TsdocConfig extends import_projen22.Component {
   /**
    * Derive a workspace scope from a scoped package name (`@scope/name`).
    * Returns `undefined` when the name is unscoped.
@@ -38271,7 +38816,7 @@ var TsdocConfig = class _TsdocConfig extends import_projen21.Component {
         allowMultiple: true
       }))
     ].sort((a, b) => a.tagName.localeCompare(b.tagName));
-    new import_projen21.JsonFile(project, "tsdoc.json", {
+    new import_projen22.JsonFile(project, "tsdoc.json", {
       marker: false,
       obj: {
         $schema: "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -38284,9 +38829,9 @@ var TsdocConfig = class _TsdocConfig extends import_projen21.Component {
 
 // src/typescript/typescript-config.ts
 var import_node_path3 = require("path");
-var import_projen22 = require("projen");
+var import_projen23 = require("projen");
 var import_path = require("projen/lib/util/path");
-var TypeScriptConfig = class extends import_projen22.Component {
+var TypeScriptConfig = class extends import_projen23.Component {
   constructor(project) {
     super(project);
     let tsPaths = {};
@@ -38317,7 +38862,7 @@ var TestRunner = {
   JEST: "jest",
   VITEST: "vitest"
 };
-var TypeScriptProject = class extends import_projen23.typescript.TypeScriptProject {
+var TypeScriptProject = class extends import_projen24.typescript.TypeScriptProject {
   constructor(userOptions) {
     if (!(userOptions.parent instanceof MonorepoProject)) {
       throw new Error(
@@ -38647,10 +39192,10 @@ var AstroProject = class extends TypeScriptProject {
       adapter: options.adapter
     });
     if (options.sampleCode === true) {
-      new import_projen24.SampleFile(this, "src/pages/index.astro", {
+      new import_projen25.SampleFile(this, "src/pages/index.astro", {
         contents: DEFAULT_INDEX_ASTRO
       });
-      new import_projen24.SampleFile(this, "public/favicon.svg", {
+      new import_projen25.SampleFile(this, "public/favicon.svg", {
         contents: DEFAULT_FAVICON_SVG
       });
     }
@@ -38675,19 +39220,19 @@ var DEFAULT_FAVICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0
 `;
 
 // src/projects/aws-cdk-project.ts
-var import_projen27 = require("projen");
+var import_projen28 = require("projen");
 var import_javascript5 = require("projen/lib/javascript");
 var import_release2 = require("projen/lib/release");
 var import_ts_deepmerge4 = require("ts-deepmerge");
 
 // src/workflows/aws-deploy-workflow.ts
 var import_utils11 = __toESM(require_lib());
-var import_projen25 = require("projen");
+var import_projen26 = require("projen");
 var import_build = require("projen/lib/build");
 var import_github6 = require("projen/lib/github");
 var import_workflows_model5 = require("projen/lib/github/workflows-model");
 var PROD_DEPLOY_NAME = "prod-deploy";
-var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen25.Component {
+var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen26.Component {
   constructor(project, options = {}) {
     super(project);
     this.project = project;
@@ -39004,7 +39549,7 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen25.Compone
 };
 
 // src/workflows/aws-teardown-workflow.ts
-var import_projen26 = require("projen");
+var import_projen27 = require("projen");
 var import_github7 = require("projen/lib/github");
 var import_workflows_model6 = require("projen/lib/github/workflows-model");
 var DEFAULT_TEARDOWN_BRANCH_PATTERNS = [
@@ -39026,7 +39571,7 @@ var resolveBranchPatterns = (explicit, targets) => {
   }
   return [...DEFAULT_TEARDOWN_BRANCH_PATTERNS];
 };
-var AwsTeardownWorkflow = class extends import_projen26.Component {
+var AwsTeardownWorkflow = class extends import_projen27.Component {
   constructor(rootProject, options) {
     super(rootProject);
     this.rootProject = rootProject;
@@ -39208,7 +39753,7 @@ var AwsTeardownWorkflow = class extends import_projen26.Component {
 };
 
 // src/projects/aws-cdk-project.ts
-var AwsCdkProject = class extends import_projen27.awscdk.AwsCdkTypeScriptApp {
+var AwsCdkProject = class extends import_projen28.awscdk.AwsCdkTypeScriptApp {
   constructor(userOptions) {
     if (!(userOptions.parent instanceof MonorepoProject)) {
       throw new Error(
@@ -39418,7 +39963,7 @@ var AwsCdkProject = class extends import_projen27.awscdk.AwsCdkTypeScriptApp {
 };
 
 // src/projects/react-vite-site-project.ts
-var import_projen28 = require("projen");
+var import_projen29 = require("projen");
 var import_ts_deepmerge5 = require("ts-deepmerge");
 var ReactViteSiteProject = class extends TypeScriptProject {
   constructor(userOptions) {
@@ -39457,7 +40002,7 @@ var ReactViteSiteProject = class extends TypeScriptProject {
     };
     super(options);
     this.package.addField("type", "module");
-    new import_projen28.TextFile(this, ".nvmrc", { lines: ["v24.11.0"] });
+    new import_projen29.TextFile(this, ".nvmrc", { lines: ["v24.11.0"] });
     this.tsconfig?.file.addOverride("compilerOptions.target", "ES2020");
     this.tsconfig?.file.addOverride("compilerOptions.lib", [
       "ES2020",
@@ -39492,7 +40037,7 @@ var ReactViteSiteProject = class extends TypeScriptProject {
       "vitest/globals",
       "vite/client"
     ]);
-    new import_projen28.SampleFile(this, "vite.config.ts", {
+    new import_projen29.SampleFile(this, "vite.config.ts", {
       contents: `import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import tailwindcss from '@tailwindcss/vite';
@@ -39504,7 +40049,7 @@ export default defineConfig({
 });
 `
     });
-    new import_projen28.SampleFile(this, "src/vite-env.d.ts", {
+    new import_projen29.SampleFile(this, "src/vite-env.d.ts", {
       contents: `/// <reference types="vite/client" />
 
 interface ImportMetaEnv {
@@ -39519,7 +40064,7 @@ interface ImportMeta {
     });
     if (options.testRunner !== TestRunner.JEST) {
       this.tryRemoveFile("vitest.config.ts");
-      new import_projen28.SampleFile(this, "vitest.config.ts", {
+      new import_projen29.SampleFile(this, "vitest.config.ts", {
         contents: `import { defineConfig, mergeConfig } from 'vitest/config';
 import react from '@vitejs/plugin-react';
 import viteConfig from './vite.config';
@@ -39663,7 +40208,7 @@ export default mergeConfig(
     }
     if (userOptions.sampleCode === true) {
       const siteName = options.name;
-      new import_projen28.SampleFile(this, "index.html", {
+      new import_projen29.SampleFile(this, "index.html", {
         contents: `<!doctype html>
 <html>
   <head>
@@ -39678,7 +40223,7 @@ export default mergeConfig(
 </html>
 `
       });
-      new import_projen28.SampleFile(this, "src/routes.tsx", {
+      new import_projen29.SampleFile(this, "src/routes.tsx", {
         contents: `import { createBrowserRouter } from 'react-router-dom';
 import App from './App';
 
@@ -39687,7 +40232,7 @@ export const router = createBrowserRouter([
 ]);
 `
       });
-      new import_projen28.SampleFile(this, "src/main.tsx", {
+      new import_projen29.SampleFile(this, "src/main.tsx", {
         contents: `import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { RouterProvider } from 'react-router-dom';
@@ -39701,7 +40246,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 );
 `
       });
-      new import_projen28.SampleFile(this, "src/App.tsx", {
+      new import_projen29.SampleFile(this, "src/App.tsx", {
         contents: `export default function App() {
   return (
     <main className="p-4">
@@ -39711,11 +40256,11 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 }
 `
       });
-      new import_projen28.SampleFile(this, "src/index.css", {
+      new import_projen29.SampleFile(this, "src/index.css", {
         contents: `@import "tailwindcss";
 `
       });
-      new import_projen28.SampleFile(this, "src/setupTests.ts", {
+      new import_projen29.SampleFile(this, "src/setupTests.ts", {
         contents: `import '@testing-library/jest-dom';
 `
       });
@@ -39724,7 +40269,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 };
 
 // src/projects/starlight-project.ts
-var import_projen29 = require("projen");
+var import_projen30 = require("projen");
 var STARLIGHT_ROLE = {
   DOCS: "docs",
   SITE: "site"
@@ -39766,10 +40311,10 @@ var StarlightProject = class extends AstroProject {
       turbo.compileTask.inputs.push("src/content/**");
     }
     if (userOptions.sampleContent === true) {
-      new import_projen29.SampleFile(this, "src/content/docs/index.mdx", {
+      new import_projen30.SampleFile(this, "src/content/docs/index.mdx", {
         contents: DEFAULT_INDEX_MDX
       });
-      new import_projen29.SampleFile(this, "src/content.config.ts", {
+      new import_projen30.SampleFile(this, "src/content.config.ts", {
         contents: DEFAULT_CONTENT_CONFIG_TS
       });
     }
@@ -39959,6 +40504,7 @@ export const collections = {
   ROOT_CI_TASK_NAME,
   ROOT_TURBO_TASK_NAME,
   ReactViteSiteProject,
+  RequirementIssueTemplate,
   ResetTask,
   SCHEDULED_TASK_MODEL_VALUES,
   SCOPE_CLASS_VALUES,
@@ -40059,6 +40605,7 @@ export const collections = {
   maintenanceAuditBundle,
   meetingAnalysisBundle,
   mergeCdkOptions,
+  nextRequirementIdProcedure,
   orchestratorBundle,
   parseApiRollup,
   peopleProfileBundle,
@@ -40106,11 +40653,13 @@ export const collections = {
   renderIssueTemplatesRuleContent,
   renderIssueTemplatesStarterPage,
   renderMeetingTypesSection,
+  renderNextRequirementIdProcedure,
   renderPriorityRulesSection,
   renderProgressFileName,
   renderProgressFilePath,
   renderProgressFilesBundleHook,
   renderProgressFilesRuleContent,
+  renderRequirementBlock,
   renderRunRatioSection,
   renderRunRatioShellHelpers,
   renderScheduledTaskSkillFile,