@codedrifters/configulator 0.0.407 → 0.0.409

package/lib/index.mjs

@@ -5027,7 +5027,15 @@ var createRuleSkill = {
     "- Use `ruleExtensions` to add project-specific content to existing bundle rules instead of replacing them"
   ].join("\n")
 };
-function buildBaseBundle(paths = DEFAULT_AGENT_PATHS) {
+var DEFAULT_BASE_CONVENTIONS = {
+  progressFiles: resolveProgressFiles(),
+  sharedEditing: resolveSharedEditing(),
+  temporalFraming: resolveTemporalFraming(),
+  skillEvals: resolveSkillEvals(),
+  issueTemplates: resolveIssueTemplates(),
+  hasDownstreamIssueKindBundles: true
+};
+function buildBaseBundle(paths = DEFAULT_AGENT_PATHS, conventions = DEFAULT_BASE_CONVENTIONS) {
   return {
     name: "base",
     description: "Core rules: project overview, interaction style, and general coding conventions",
@@ -5696,7 +5704,7 @@ function buildBaseBundle(paths = DEFAULT_AGENT_PATHS) {
         // them via `agentConfig.additionalRulePaths`; other consumers
         // get a clean default.
         filePatterns: [".claude/agents/*.md", ".claude/procedures/**"],
-        content: renderProgressFilesRuleContent(resolveProgressFiles()),
+        content: renderProgressFilesRuleContent(conventions.progressFiles),
         platforms: {
           cursor: { exclude: true }
         },
@@ -5707,7 +5715,7 @@ function buildBaseBundle(paths = DEFAULT_AGENT_PATHS) {
         description: "Shared-editing safety: single-entry deterministic-sort inserts on index files, commit-path verification, and the merge-conflict resolution recipe that keeps concurrent agent sessions from dropping each other's rows on shared registries and feature matrices.",
         scope: AGENT_RULE_SCOPE.FILE_PATTERN,
         filePatterns: DEFAULT_SHARED_INDEX_PATHS,
-        content: renderSharedEditingRuleContent(resolveSharedEditing()),
+        content: renderSharedEditingRuleContent(conventions.sharedEditing),
         platforms: {
           cursor: { exclude: true }
         },
@@ -5725,7 +5733,7 @@ function buildBaseBundle(paths = DEFAULT_AGENT_PATHS) {
           "docs/src/content/docs/standards-research/**/*.md",
           "docs/src/content/docs/customer-research/**/*.md"
         ],
-        content: renderTemporalFramingRuleContent(resolveTemporalFraming()),
+        content: renderTemporalFramingRuleContent(conventions.temporalFraming),
         platforms: {
           cursor: { exclude: true }
         },
@@ -5738,7 +5746,7 @@ function buildBaseBundle(paths = DEFAULT_AGENT_PATHS) {
         // Bundle defaults exclude paths into configulator's own
         // source — see comment on progress-file-convention above.
         filePatterns: [".claude/skills/**"],
-        content: renderSkillEvalsRuleContent(resolveSkillEvals()),
+        content: renderSkillEvalsRuleContent(conventions.skillEvals),
         platforms: {
           cursor: { exclude: true }
         },
@@ -5755,7 +5763,10 @@ function buildBaseBundle(paths = DEFAULT_AGENT_PATHS) {
           ".claude/agents/*.md",
           `${paths.docsRoot}/agents/issue-templates.md`
         ],
-        content: renderIssueTemplatesRuleContent(resolveIssueTemplates()),
+        content: renderIssueTemplatesRuleContent(
+          conventions.issueTemplates,
+          conventions.hasDownstreamIssueKindBundles
+        ),
         platforms: {
           cursor: { exclude: true }
         },
@@ -11373,6 +11384,278 @@ var docsSyncBundle = buildDocsSyncBundle();
 
 // src/agent/bundles/github-workflow.ts
 import { GitHub } from "projen/lib/github";
+
+// src/agent/bundles/closing-keywords.ts
+function renderCheckClosingKeywordsScript() {
+  return [
+    "#!/usr/bin/env bash",
+    "# check-closing-keywords.sh \u2014 Detect PR bodies that strand issues.",
+    "#",
+    "# GitHub honours exactly ONE issue reference per closing keyword. A",
+    "# body that writes `Closes #593, #594, #595` closes #593 and leaves",
+    "# #594 and #595 open forever. The only correct form is one keyword",
+    "# per issue, each on its own line:",
+    "#",
+    "#   Closes #593",
+    "#   Closes #594",
+    "#",
+    "# Usage:",
+    "#   .claude/procedures/check-closing-keywords.sh <pr-number>",
+    "#   .claude/procedures/check-closing-keywords.sh --body-file <path>",
+    "#",
+    "# Output (one stable line per reference, then a summary line):",
+    "#   CLOSES #<n> line=<L>",
+    "#       A reference GitHub WILL honour (the first one after a keyword).",
+    "#   STRANDED #<n> line=<L> keyword=<kw> first=#<n>",
+    "#       A reference chained onto an earlier one. GitHub will NOT",
+    "#       close it \u2014 the issue is stranded.",
+    "#   CLOSING_KEYWORDS_OK closes=<K>",
+    "#   CLOSING_KEYWORDS_MALFORMED closes=<K> stranded=<S>",
+    "#   NO_CLOSING_KEYWORD",
+    "#",
+    "# Exit codes:",
+    "#   0 \u2014 at least one closing keyword, every one well-formed",
+    "#   1 \u2014 at least one stranded reference (malformed body)",
+    "#   2 \u2014 argument error",
+    "#   3 \u2014 required command not on PATH",
+    "#   4 \u2014 could not read the PR body",
+    "#   5 \u2014 no closing keyword found at all",
+    "",
+    "set -uo pipefail",
+    "",
+    "# \u2500\u2500 helpers \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",
+    "",
+    "err() {",
+    '  printf "check-closing-keywords.sh: %s\\n" "$*" >&2',
+    "}",
+    "",
+    "usage() {",
+    "  cat >&2 <<'USAGE'",
+    "Usage: check-closing-keywords.sh <pr-number>",
+    "       check-closing-keywords.sh --body-file <path>",
+    "",
+    "  <pr-number>          Positive integer PR number; the body is read",
+    "                       via `gh pr view <n> --json body`.",
+    "  --body-file <path>   Read the body from a file instead. Use this to",
+    "                       check a drafted body BEFORE `gh pr create`.",
+    "",
+    "Emits one CLOSES / STRANDED line per issue reference, then a summary.",
+    "Exits 1 when any reference is stranded by a multi-issue keyword.",
+    "USAGE",
+    "}",
+    "",
+    "# \u2500\u2500 argument parsing \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",
+    "",
+    'mode=""',
+    'arg=""',
+    "",
+    "while [[ $# -gt 0 ]]; do",
+    '  case "$1" in',
+    "    --body-file)",
+    '      if [[ $# -lt 2 || -z "${2:-}" ]]; then',
+    '        err "--body-file requires a value"',
+    "        usage",
+    "        exit 2",
+    "      fi",
+    '      if [[ -n "$mode" ]]; then',
+    '        err "specify either a PR number or --body-file, not both"',
+    "        exit 2",
+    "      fi",
+    '      mode="file"',
+    '      arg="$2"',
+    "      shift 2",
+    "      ;;",
+    "    -h|--help)",
+    "      usage",
+    "      exit 0",
+    "      ;;",
+    "    -*)",
+    '      err "unknown option: $1"',
+    "      usage",
+    "      exit 2",
+    "      ;;",
+    "    *)",
+    '      if [[ -n "$mode" ]]; then',
+    '        err "unexpected extra argument: $1"',
+    "        usage",
+    "        exit 2",
+    "      fi",
+    '      mode="pr"',
+    '      arg="$1"',
+    "      shift",
+    "      ;;",
+    "  esac",
+    "done",
+    "",
+    'if [[ -z "$mode" ]]; then',
+    '  err "expected a PR number or --body-file <path>"',
+    "  usage",
+    "  exit 2",
+    "fi",
+    "",
+    "# \u2500\u2500 read the body \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",
+    "",
+    'body=""',
+    "",
+    'if [[ "$mode" == "file" ]]; then',
+    '  if [[ ! -r "$arg" ]]; then',
+    '    err "body file not readable: $arg"',
+    "    exit 4",
+    "  fi",
+    '  body=$(cat "$arg")',
+    "else",
+    '  if ! [[ "$arg" =~ ^[1-9][0-9]*$ ]]; then',
+    `    err "PR number must be a positive integer (got: '$arg')"`,
+    "    exit 2",
+    "  fi",
+    "  if ! command -v gh >/dev/null 2>&1; then",
+    '    err "required command not found on PATH: gh"',
+    "    exit 3",
+    "  fi",
+    `  if ! body=$(gh pr view "$arg" --json body -q '.body' 2>/dev/null); then`,
+    '    err "could not read the body of PR #${arg} via gh"',
+    "    exit 4",
+    "  fi",
+    "fi",
+    "",
+    "# \u2500\u2500 parsing contract \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",
+    "#",
+    "# Regexes live in single-quoted variables so backticks and other shell",
+    "# metacharacters inside them are never expanded by [[ ]].",
+    "#",
+    "# kw_re matches a closing keyword plus its FIRST issue reference. The",
+    "# leading (^|[^[:alnum:]_]) is a word boundary so `prefixes #1` is not",
+    "# read as `fixes #1`.",
+    "#",
+    "# sep_re / ws_re walk the tail AFTER that first reference, matching",
+    "# only references CHAINED directly onto it by a separator a human",
+    "# would mistake for a list: `,`  `/`  `&`  `+`  `and`  `, and`, or",
+    "# bare whitespace. Anything else \u2014 a period, a dash, a word, an",
+    "# opening paren \u2014 terminates the chain. That is what keeps prose like",
+    "# `Closes #893. See #607 and #860 for context.` from false-positiving:",
+    "# the `.` after #893 ends the chain before `#607` is ever considered.",
+    "",
+    "fence_re='^[[:space:]]{0,3}(```+|~~~+)'",
+    "quote_re='^[[:space:]]*>'",
+    "kw_re='(^|[^[:alnum:]_])(closes|closed|close|fixes|fixed|fix|resolves|resolved|resolve)[[:space:]]*:?[[:space:]]*#([0-9]+)(.*)$'",
+    "sep_re='^[[:space:]]*(,[[:space:]]*and|,|/|&|[+]|and)[[:space:]]*#([0-9]+)(.*)$'",
+    "ws_re='^[[:space:]]+#([0-9]+)(.*)$'",
+    "",
+    "# Keywords are case-insensitive on GitHub, so the scan is too.",
+    "shopt -s nocasematch",
+    "",
+    "# A single backtick, held in a variable so the code-span stripper",
+    "# never has to quote one inline.",
+    "bt='`'",
+    "",
+    "# Remove inline code spans (`...`) from a line. A PR body that",
+    "# DISCUSSES the malformed form \u2014 writing `Closes #593, #594` inside",
+    "# backticks \u2014 must not trip the detector.",
+    "strip_code_spans() {",
+    '  local s="$1"',
+    '  local out=""',
+    '  while [[ "$s" == *"$bt"*"$bt"* ]]; do',
+    '    out="$out${s%%$bt*}"',
+    '    s="${s#*$bt}"',
+    '    s="${s#*$bt}"',
+    "  done",
+    `  printf '%s%s' "$out" "$s"`,
+    "}",
+    "",
+    "# \u2500\u2500 scan \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\u2500",
+    "",
+    "line_no=0",
+    "in_fence=0",
+    'fence_marker=""',
+    "closes_count=0",
+    "stranded_count=0",
+    "",
+    'while IFS= read -r raw || [[ -n "$raw" ]]; do',
+    "  line_no=$((line_no + 1))",
+    "  # gh returns CRLF bodies; strip the CR so end-of-line matching works.",
+    `  raw="\${raw//$'\\r'/}"`,
+    "",
+    "  # Fenced code blocks are quoted content, never the PR's own intent.",
+    '  if [[ "$raw" =~ $fence_re ]]; then',
+    '    marker="${BASH_REMATCH[1]:0:1}"',
+    "    if [[ $in_fence -eq 0 ]]; then",
+    "      in_fence=1",
+    '      fence_marker="$marker"',
+    '    elif [[ "$marker" == "$fence_marker" ]]; then',
+    "      in_fence=0",
+    '      fence_marker=""',
+    "    fi",
+    "    continue",
+    "  fi",
+    "  if [[ $in_fence -eq 1 ]]; then",
+    "    continue",
+    "  fi",
+    "",
+    "  # Blockquoted text is someone else's words being cited.",
+    '  if [[ "$raw" =~ $quote_re ]]; then',
+    "    continue",
+    "  fi",
+    "",
+    '  line=$(strip_code_spans "$raw")',
+    "",
+    '  rest="$line"',
+    '  while [[ "$rest" =~ $kw_re ]]; do',
+    '    kw="${BASH_REMATCH[2]}"',
+    '    first="${BASH_REMATCH[3]}"',
+    '    tail="${BASH_REMATCH[4]}"',
+    "",
+    `    printf 'CLOSES #%s line=%s\\n' "$first" "$line_no"`,
+    "    closes_count=$((closes_count + 1))",
+    "",
+    "    # Walk every reference chained onto this keyword's first one.",
+    '    t="$tail"',
+    "    while :; do",
+    '      if [[ "$t" =~ $sep_re ]]; then',
+    '        extra="${BASH_REMATCH[2]}"',
+    '        t="${BASH_REMATCH[3]}"',
+    '      elif [[ "$t" =~ $ws_re ]]; then',
+    '        extra="${BASH_REMATCH[1]}"',
+    '        t="${BASH_REMATCH[2]}"',
+    "      else",
+    "        break",
+    "      fi",
+    "      printf 'STRANDED #%s line=%s keyword=%s first=#%s\\n' \\",
+    '        "$extra" "$line_no" "$kw" "$first"',
+    "      stranded_count=$((stranded_count + 1))",
+    "    done",
+    "",
+    '    rest="$t"',
+    "  done",
+    'done <<< "$body"',
+    "",
+    "# \u2500\u2500 summary \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",
+    "",
+    "if [[ $closes_count -eq 0 ]]; then",
+    '  echo "NO_CLOSING_KEYWORD"',
+    "  exit 5",
+    "fi",
+    "",
+    "if [[ $stranded_count -gt 0 ]]; then",
+    "  printf 'CLOSING_KEYWORDS_MALFORMED closes=%s stranded=%s\\n' \\",
+    '    "$closes_count" "$stranded_count"',
+    '  err "GitHub honours only ONE issue reference per closing keyword."',
+    '  err "Give every issue its own keyword, one per line:"',
+    '  err "  Closes #123"',
+    '  err "  Closes #456"',
+    "  exit 1",
+    "fi",
+    "",
+    `printf 'CLOSING_KEYWORDS_OK closes=%s\\n' "$closes_count"`,
+    "exit 0"
+  ].join("\n");
+}
+var checkClosingKeywordsProcedure = {
+  name: "check-closing-keywords.sh",
+  description: "Parse a PR body (by PR number or --body-file) and report every closing-keyword issue reference as CLOSES (GitHub will honour it) or STRANDED (chained onto an earlier reference and silently ignored). Exits 1 when any reference is stranded. Skips fenced code blocks, blockquotes, and inline code spans.",
+  content: renderCheckClosingKeywordsScript()
+};
+
+// src/agent/bundles/github-workflow.ts
 var setIssueTypeProcedure = {
   name: "set-issue-type.sh",
   description: "Assign a GitHub issue type (Feature / Task / Epic / Bug / etc.) via the updateIssueIssueType GraphQL mutation in a single step",
@@ -12047,8 +12330,24 @@ function buildGithubWorkflowBundle(buildPolicy = DEFAULT_BUILD_POLICY) {
           "5. **Push the branch** to origin: `git push -u origin <branch>`",
           "6. **Create the PR** using `gh pr create`:",
           "   - **Title**: use a conventional commit style title (e.g., `feat(scope): short description`)",
-          "   - **Body**: include `Closes #<issue-number>` (derived from the branch name) and a brief summary of changes",
-          "7. **Delegate review and merge to the `pr-reviewer` sub-agent.** After the PR is created, invoke the `/review-pr <pr-number>` skill (or otherwise hand the new PR number to the `pr-reviewer` sub-agent). The reviewer verifies the diff against the linked issue's acceptance criteria and enables squash auto-merge when all checks pass. Do **not** run `gh pr merge --auto` yourself \u2014 review/merge policy lives solely in the `pr-reviewer` agent.",
+          "   - **Body**: include one `Closes #<issue-number>` line per issue the PR closes (derived from the branch name and any additional issues in scope) and a brief summary of changes. See **Closing Keywords** below \u2014 never list several issues after a single keyword.",
+          "7. **Verify the closing keywords** with `.claude/procedures/check-closing-keywords.sh --body-file <path>` on the body you are about to post, then `.claude/procedures/check-closing-keywords.sh <pr-number>` on the body that landed. Exit `0` means every referenced issue will auto-close; exit `1` prints a `STRANDED #<n>` line per issue GitHub would silently leave open \u2014 fix the body with `gh pr edit <pr-number> --body-file <path>` and re-run until it exits `0`.",
+          "8. **Delegate review and merge to the `pr-reviewer` sub-agent.** After the PR is created, invoke the `/review-pr <pr-number>` skill (or otherwise hand the new PR number to the `pr-reviewer` sub-agent). The reviewer verifies the diff against the linked issue's acceptance criteria and enables squash auto-merge when all checks pass. Do **not** run `gh pr merge --auto` yourself \u2014 review/merge policy lives solely in the `pr-reviewer` agent.",
+          "",
+          "### Closing Keywords",
+          "",
+          "**GitHub honours exactly ONE issue reference per closing keyword.** `Closes #593, #594, #595` closes **#593 only** \u2014 #594 and #595 stay open forever with no warning anywhere. `Closes #821 / #837` and `Closes #821 and #837` strand the second issue the same way. Give every issue its own keyword, one per line:",
+          "",
+          "```markdown",
+          "Closes #593        <- correct: repeat the keyword, one issue each",
+          "Closes #594",
+          "",
+          "Closes #593, #594  <- WRONG: closes #593, strands #594",
+          "Closes #821 / #837 <- WRONG: closes #821, strands #837",
+          "Closes #821 and #837  <- WRONG: closes #821, strands #837",
+          "```",
+          "",
+          "`Fixes` and `Resolves` behave identically \u2014 the rule is the keyword-to-issue ratio, not the verb. Non-closing references (`Refs #849`, `Related to #607`) are unaffected. `.claude/procedures/check-closing-keywords.sh` is the mechanical check; it skips fenced code blocks, blockquotes, and inline code spans, so a body that *discusses* the malformed form does not trip it.",
           "",
           "### PR Body Template",
           "",
@@ -12065,10 +12364,18 @@ function buildGithubWorkflowBundle(buildPolicy = DEFAULT_BUILD_POLICY) {
           "- [ ] Relevant changes have been reviewed",
           "```",
           "",
+          "When the PR closes more than one issue, the closing block expands to one keyword per issue \u2014 it never becomes a list:",
+          "",
+          "```markdown",
+          "Closes #<first-issue-number>",
+          "Closes #<second-issue-number>",
+          "```",
+          "",
           "### Important",
           "",
           "- Always derive the issue number from the branch name (e.g., `feat/42-add-login` \u2192 `#42`)",
           "- Use conventional commit format for the PR title",
+          "- **One closing keyword per issue, each on its own line.** Never `Closes #A, #B` \u2014 GitHub closes only `#A`. Run `.claude/procedures/check-closing-keywords.sh` before and after `gh pr create`; a non-zero exit means the PR would strand an issue",
           "- Delegate merge to the `pr-reviewer` sub-agent \u2014 do not merge manually and do not enable auto-merge directly"
         ].join("\n"),
         tags: ["workflow"]
@@ -12101,7 +12408,11 @@ function buildGithubWorkflowBundle(buildPolicy = DEFAULT_BUILD_POLICY) {
       }
     ],
     skills: [cleanMergedBranchesSkill],
-    procedures: [setIssueTypeProcedure, cleanMergedBranchesProcedure]
+    procedures: [
+      setIssueTypeProcedure,
+      cleanMergedBranchesProcedure,
+      checkClosingKeywordsProcedure
+    ]
   };
 }
 var githubWorkflowBundle = buildGithubWorkflowBundle();
@@ -19189,6 +19500,27 @@ var issueWorkerSubAgent = {
     'Closes #<issue-number>"',
     "```",
     "",
+    "**One closing keyword per issue, each on its own line.** GitHub honours",
+    "only one issue reference per keyword, so `Closes #A, #B` closes `#A` and",
+    "leaves `#B` open forever \u2014 the same is true of `Closes #A / #B` and",
+    "`Closes #A and #B`. A PR that closes several issues repeats the keyword:",
+    "",
+    "```",
+    "Closes #<first-issue-number>",
+    "Closes #<second-issue-number>",
+    "```",
+    "",
+    "Verify it mechanically before moving on \u2014 this exits non-zero and names",
+    "every issue the body would strand:",
+    "",
+    "```bash",
+    ".claude/procedures/check-closing-keywords.sh <pr-number>",
+    "```",
+    "",
+    "If it reports `CLOSING_KEYWORDS_MALFORMED`, fix the body with",
+    "`gh pr edit <pr-number> --body-file <path>` and re-run until it exits",
+    "`0`. See the **Closing Keywords** section of the `pr-workflow` rule.",
+    "",
     "Do **not** enable auto-merge yourself. The `pr-reviewer` sub-agent owns",
     "review and merge for every PR \u2014 it verifies the diff against the issue's",
     "acceptance criteria and enables squash auto-merge only when all checks",
@@ -19462,37 +19794,7 @@ var scanCommand = {
     ""
   ].join("\n")
 };
-var orchestratorBundle = {
-  name: "orchestrator",
-  description: "Pipeline orchestrator agent for issue triage, PR review, and queue management",
-  // Always included by default
-  appliesWhen: () => true,
-  rules: [
-    {
-      name: "orchestrator-conventions",
-      description: "Guidelines for orchestrator agent behavior and pipeline management, including the funnel-tier dispatch sort, scope gate, and per-agent scheduled-task layout",
-      scope: AGENT_RULE_SCOPE.FILE_PATTERN,
-      // Bundle defaults exclude paths into configulator's own source
-      // (only meaningful when configulator is a workspace package).
-      // codedrifters/packages restores them via
-      // `agentConfig.additionalRulePaths`.
-      filePatterns: [
-        ".claude/agents/orchestrator.md",
-        ".claude/scheduled-tasks/**"
-      ],
-      content: buildOrchestratorConventionsContent(
-        DEFAULT_AGENT_TIERS,
-        resolveScopeGate(),
-        resolveRunRatio(),
-        resolveScheduledTasks(),
-        resolveUnblockDependents()
-      ),
-      platforms: {
-        cursor: { exclude: true }
-      },
-      tags: ["workflow"]
-    }
-  ],
+var ORCHESTRATOR_BUNDLE_STATIC = {
   subAgents: [orchestratorSubAgent, issueWorkerSubAgent],
   procedures: [
     checkBlockedProcedure,
@@ -19508,6 +19810,51 @@ var orchestratorBundle = {
     ]
   }
 };
+var DEFAULT_ORCHESTRATOR_CONVENTIONS = {
+  tiers: DEFAULT_AGENT_TIERS,
+  scopeGate: resolveScopeGate(),
+  runRatio: resolveRunRatio(),
+  scheduledTasks: resolveScheduledTasks(),
+  unblockDependents: resolveUnblockDependents(),
+  excludeBundles: []
+};
+function buildOrchestratorBundle(conventions = DEFAULT_ORCHESTRATOR_CONVENTIONS) {
+  return {
+    name: "orchestrator",
+    description: "Pipeline orchestrator agent for issue triage, PR review, and queue management",
+    // Always included by default
+    appliesWhen: () => true,
+    rules: [
+      {
+        name: "orchestrator-conventions",
+        description: "Guidelines for orchestrator agent behavior and pipeline management, including the funnel-tier dispatch sort, scope gate, and per-agent scheduled-task layout",
+        scope: AGENT_RULE_SCOPE.FILE_PATTERN,
+        // Bundle defaults exclude paths into configulator's own source
+        // (only meaningful when configulator is a workspace package).
+        // codedrifters/packages restores them via
+        // `agentConfig.additionalRulePaths`.
+        filePatterns: [
+          ".claude/agents/orchestrator.md",
+          ".claude/scheduled-tasks/**"
+        ],
+        content: buildOrchestratorConventionsContent(
+          conventions.tiers,
+          conventions.scopeGate,
+          conventions.runRatio,
+          conventions.scheduledTasks,
+          conventions.unblockDependents,
+          conventions.excludeBundles
+        ),
+        platforms: {
+          cursor: { exclude: true }
+        },
+        tags: ["workflow"]
+      }
+    ],
+    ...ORCHESTRATOR_BUNDLE_STATIC
+  };
+}
+var orchestratorBundle = buildOrchestratorBundle();
 
 // src/agent/bundles/people-profile.ts
 function buildPeopleProfileAnalystSubAgent(paths, issueDefaults, tier) {
@@ -20853,8 +21200,32 @@ var prReviewerSubAgent = {
     "   resolve CI via the **CI Verification** section's Actions-runs",
     "   fallback before deciding eligibility \u2014 do **not** treat the 403 as",
     "   either a pass or an automatic disqualification.",
-    "3. The PR body contains a linked issue via one of the closing keywords:",
-    "   `Closes #N`, `Fixes #N`, or `Resolves #N` (case-insensitive).",
+    "3. The PR body contains at least one linked issue via a closing",
+    "   keyword (`Closes #N`, `Fixes #N`, `Resolves #N`, case-insensitive).",
+    "   Resolve this mechanically \u2014 do **not** eyeball the body:",
+    "",
+    "```bash",
+    ".claude/procedures/check-closing-keywords.sh <pr-number>",
+    "```",
+    "",
+    "   The procedure is the single source of truth for closing-keyword",
+    "   parsing in this pipeline. It emits one `CLOSES #<n> line=<L>` line",
+    "   per reference GitHub will honour, one",
+    "   `STRANDED #<n> line=<L> keyword=<kw> first=#<n>` line per reference",
+    "   GitHub will silently ignore, then a summary line. It skips fenced",
+    "   code blocks, blockquotes, and inline code spans, so a body that",
+    "   merely discusses closing keywords does not confuse it.",
+    "",
+    "   - Exit `5` / `NO_CLOSING_KEYWORD` \u2014 check (3) **fails**; the PR has",
+    "     no linked issue.",
+    "   - Exit `0` / `CLOSING_KEYWORDS_OK` \u2014 check (3) passes. Record the",
+    "     `CLOSES` set as the **linked-issue set** for the rest of the pass.",
+    "   - Exit `1` / `CLOSING_KEYWORDS_MALFORMED` \u2014 check (3) **passes**",
+    "     (there is a linked issue), but the body would strand every",
+    "     `STRANDED` issue. This is **not** an eligibility rejection \u2014 the",
+    "     code is not at fault. Record both the `CLOSES` and `STRANDED`",
+    "     sets as the linked-issue set and carry the malformed finding into",
+    "     Phase 4 and Phase 5.",
     "",
     "If the **CI** check (2) or the **linked-issue** check (3) fails, post",
     "a short comment explaining the reason and stop. Do not proceed to",
@@ -20922,16 +21293,29 @@ var prReviewerSubAgent = {
     "gh pr checks <pr-number>",
     "```",
     "",
-    "Extract the linked issue number from the PR body using the closing keywords",
-    "(`Closes #N`, `Fixes #N`, or `Resolves #N`) identified in Phase 1.5.",
+    "Use the **linked-issue set** already computed in Phase 1.5 \u2014 the union",
+    "of the `CLOSES` and `STRANDED` issue numbers the",
+    "`check-closing-keywords.sh` run reported. Do not re-derive it by",
+    "reading the body yourself.",
+    "",
+    "Most PRs link exactly one issue, and every phase below reads naturally",
+    "in the singular. When the set has more than one member, treat **every**",
+    "member as a linked issue: fetch each one, union their acceptance",
+    "criteria in Phase 3, and close each one in Phase 5. The **primary**",
+    "linked issue \u2014 the one cited in the sticky summary and the structured",
+    "report \u2014 is the first `CLOSES` entry.",
     "",
-    "Then fetch the linked issue, including its `issueType` so Phase 2.75 can",
-    "evaluate the issue-type portion of the review policy:",
+    "Then fetch each linked issue, including its `issueType` so Phase 2.75",
+    "can evaluate the issue-type portion of the review policy:",
     "",
     "```bash",
     "gh issue view <issue-number> --json number,title,body,labels,state,issueType",
     "```",
     "",
+    "When several issues are linked, Phase 2.75's issue-type rule matches if",
+    "**any** linked issue's type is in `human-required.issue-types` \u2014 the",
+    "conservative reading, consistent with the policy's mixed-signal rule.",
+    "",
     "## Phase 2.5: Gather Comments",
     "",
     "Before deciding review mode, collect every human comment on the PR so",
@@ -21229,6 +21613,14 @@ var prReviewerSubAgent = {
     "",
     "- **Convention compliance** \u2014 PR title uses a conventional commit prefix,",
     "  body includes a closing keyword, branch name follows project conventions",
+    "- **Closing-keyword integrity** \u2014 the Phase 1.5",
+    "  `check-closing-keywords.sh` run exited `0`. A",
+    "  `CLOSING_KEYWORDS_MALFORMED` result is a **Suggested** finding (not",
+    "  blocking): the diff is unaffected, and Phase 5 closes the stranded",
+    "  issues deterministically, so gating the merge on it would wedge a",
+    "  correct PR over a body typo. Record every `STRANDED #<n>` in the",
+    "  findings and in the sticky summary so the malformed body is visible",
+    "  rather than silent.",
     "- **Test coverage** \u2014 new or changed behavior has tests",
     "- **CI status** \u2014 resolve CI via the **CI Verification** section",
     "  (primary check-runs read, with the Actions-runs fallback on a",
@@ -21591,7 +21983,38 @@ var prReviewerSubAgent = {
     "",
     "### If all acceptance criteria are met and CI is green",
     "",
-    "Branch on the **review mode** decided in Phase 2.75:",
+    "#### Pre-merge closing-keyword check",
+    "",
+    "Run this **before** branching on the review mode \u2014 it applies in both",
+    "modes and is the last cheap moment to catch a body that would strand",
+    "issues on merge:",
+    "",
+    "```bash",
+    ".claude/procedures/check-closing-keywords.sh <pr-number>",
+    "```",
+    "",
+    "Re-run it here rather than reusing the Phase 1.5 result: the body may",
+    "have been edited since, and the merge is about to make the answer",
+    "permanent.",
+    "",
+    "- **Exit `0`** \u2014 nothing to do; every linked issue will auto-close.",
+    "- **Exit `1`** \u2014 the body strands at least one issue. Do **not** block",
+    "  the merge; post one comment naming the stranded issues and the",
+    "  corrected block, then continue. Phase 5 closes the survivors",
+    "  explicitly, so the malformed body costs a comment, not a wedged PR.",
+    "",
+    "```bash",
+    "gh pr comment <pr-number> --body 'GitHub honours only one issue reference per closing keyword, so this body would close #<first> and silently leave #<stranded\u2026> open. Give each issue its own keyword, one per line:",
+    "",
+    "Closes #<first>",
+    "Closes #<stranded>",
+    "",
+    "Merging anyway \u2014 Phase 5 will close the stranded issues explicitly.'",
+    "```",
+    "",
+    "Carry the full stranded set into Phase 5 verbatim.",
+    "",
+    "Then branch on the **review mode** decided in Phase 2.75:",
     "",
     "#### Mode `auto-merge`",
     "",
@@ -21779,6 +22202,7 @@ var prReviewerSubAgent = {
     "**Outstanding:** <list of comments still open with their classification and author>",
     "**Pushbacks:** <list of disputes with reasons>",
     "**Label reconciliation:** <consistent | corrections applied this pass>",
+    "**Closing keywords:** ok | malformed \u2014 strands #<n>[, #<n>\u2026]",
     "**Last pass:** <ISO timestamp>",
     "```",
     "",
@@ -21803,6 +22227,11 @@ var prReviewerSubAgent = {
     "  the corrections applied this pass (the detected violation combo,",
     "  the label(s) removed, and the resulting self-consistent set).",
     "  Every reconciliation correction is recorded here for auditability.",
+    "- **Closing keywords** \u2014 the",
+    "  `.claude/procedures/check-closing-keywords.sh` verdict: `ok`, or",
+    "  `malformed` plus every `STRANDED #<n>` the body would leave open.",
+    "  Recorded on every pass so a body that strands issues is visible to a",
+    "  human before the merge, not only after Phase 5 repairs it.",
     "- **Last pass** \u2014 the ISO 8601 timestamp of this run.",
     "",
     "### Step 3: Create or edit in place",
@@ -22187,42 +22616,64 @@ var prReviewerSubAgent = {
     "gh pr view <pr-number> --json state --jq '.state'",
     "```",
     "",
-    "- **`MERGED`** \u2014 clean up locally **and** verify the linked issue closed:",
+    "- **`MERGED`** \u2014 clean up locally **and** verify **every** linked issue",
+    "  closed:",
     "  ```bash",
     "  git checkout {{repository.defaultBranch}}",
     "  git pull origin {{repository.defaultBranch}}",
     "  git fetch --prune origin",
     "  git branch -d <branch-name> 2>/dev/null || git branch -D <branch-name> 2>/dev/null || true",
     "  ```",
-    "  Transition the linked issue to `status:done` (replaces whichever of",
-    "  `status:ready-for-review` or `status:in-progress` it was carrying):",
+    "",
+    "  **Post-merge closure verification.** Iterate the **full linked-issue",
+    "  set** from Phase 1.5 \u2014 the union of the `CLOSES` and `STRANDED`",
+    "  numbers `check-closing-keywords.sh` reported \u2014 not just the primary",
+    "  issue. This loop is the structural guard against the stranded-issue",
+    "  defect class: GitHub honours only one issue reference per closing",
+    "  keyword, so a body written as `Closes #A, #B` closes `#A` and leaves",
+    "  `#B` open forever with no signal anywhere. Because the reviewer",
+    "  already knows the full set, every survivor is closed here",
+    "  deterministically instead of being discovered months later by an",
+    "  audit.",
+    "",
+    "  For **each** issue in the set, in order:",
+    "",
+    "  1. Transition it to `status:done` (replaces whichever of",
+    "     `status:ready-for-review` or `status:in-progress` it was carrying):",
     "  ```bash",
     "  gh issue edit <issue-number> \\",
     '    --remove-label "status:ready-for-review" \\',
     '    --remove-label "status:in-progress" \\',
     '    --add-label "status:done"',
     "  ```",
-    "  Then check the linked issue state:",
+    "  2. Check its state:",
     "  ```bash",
     "  gh issue view <issue-number> --json state --jq '.state'",
     "  ```",
-    "  If the issue is **not** `CLOSED`, close it explicitly (this covers",
-    "  malformed or missing closing keywords on the merge commit):",
+    "  3. If the issue is **not** `CLOSED`, close it explicitly (this covers",
+    "     both a missing closing keyword and an issue stranded by a",
+    "     multi-issue keyword):",
     "  ```bash",
     "  gh issue close <issue-number> --reason completed",
     "  gh issue comment <issue-number> --body 'PR #<pr-number> merged. Closing issue.'",
     "  ```",
-    "  Once `status:done` is applied (either via the edit above or the",
-    "  explicit close path), run the targeted unblock sweep so any",
-    "  dependents waiting on this issue flip from `status:blocked` to",
-    "  `status:ready` immediately:",
+    "  4. Once `status:done` is applied (either via the edit above or the",
+    "     explicit close path), run the targeted unblock sweep so any",
+    "     dependents waiting on this issue flip from `status:blocked` to",
+    "     `status:ready` immediately:",
     "  ```bash",
     "  .claude/procedures/unblock-dependents.sh <issue-number>",
     "  ```",
+    "",
     "  Log the sweep's output (one line per processed dependent:",
     "  `UNBLOCKED #<n>` / `STILL_BLOCKED #<n>` / `NO_DEPENDENTS #<m>`)",
     "  in the PR review summary. See the **Agent-driven unblocking**",
     "  section in `CLAUDE.md` for the full contract.",
+    "",
+    "  Report one `Issue #<n>: <closed-by-github | closed-explicitly>` line",
+    "  per member of the set. Any issue that needed the explicit close was",
+    "  stranded by the PR body \u2014 say so in the summary so the authoring",
+    "  defect is visible, not just repaired.",
     "- **`CLOSED` (not merged)** \u2014 leave the branch in place; report the closure.",
     "- **Still `OPEN`** \u2014 auto-merge is pending; report and stop without deleting.",
     "",
@@ -22235,6 +22686,8 @@ var prReviewerSubAgent = {
     "```",
     "PR #<number> \u2014 <title>",
     "Linked issue: #<issue-number>",
+    "Linked issue set: #<n> [, #<n>\u2026]   (from check-closing-keywords.sh)",
+    "Closing keywords: <ok | malformed: strands #<n>[, #<n>\u2026]>",
     "Review mode: <auto-merge | human-required>",
     "Reason: <short explanation from Phase 2.75>",
     "Verdict: AUTO_MERGE_ENABLED | AWAITING_HUMAN | DELEGATED_TO_WORKER | NEEDS_CHANGES | INELIGIBLE | BLOCKED",
@@ -22275,6 +22728,14 @@ var prReviewerSubAgent = {
     "   PR in turn.",
     "2. **Never merge without a linked issue.** If the PR body has no",
     "   `Closes #N` / `Fixes #N` / `Resolves #N`, comment and stop.",
+    "2a. **Never merge without verifying every linked issue closes.** Resolve",
+    "    the linked-issue set with",
+    "    `.claude/procedures/check-closing-keywords.sh <pr-number>`, never by",
+    "    eyeballing the body. GitHub honours only one issue reference per",
+    "    closing keyword, so a `STRANDED` line means that issue will stay",
+    "    open after the merge unless Phase 5 closes it. Phase 5 must iterate",
+    "    the **whole** set \u2014 `CLOSES` plus `STRANDED` \u2014 and explicitly close",
+    "    every issue GitHub left open.",
     "3. **Never merge with failing CI.** Even if every criterion is met,",
     "   block on red checks. Resolve CI status via the **CI",
     "   Verification** section: read check-runs first, and only on a",
@@ -33981,10 +34442,14 @@ function renderPriorityRulesSection(rules) {
 }
 
 // src/agent/bundles/index.ts
-function buildBuiltInBundles(paths = DEFAULT_AGENT_PATHS, issueDefaults = DEFAULT_RESOLVED_ISSUE_DEFAULTS, defaultAgentTier = AGENT_MODEL.BALANCED, bundleAgentTiers = /* @__PURE__ */ new Map(), prReviewPolicy = resolvePrReviewPolicy(), buildPolicy = DEFAULT_BUILD_POLICY) {
+var DEFAULT_RULE_CONVENTIONS = {
+  base: DEFAULT_BASE_CONVENTIONS,
+  orchestrator: DEFAULT_ORCHESTRATOR_CONVENTIONS
+};
+function buildBuiltInBundles(paths = DEFAULT_AGENT_PATHS, issueDefaults = DEFAULT_RESOLVED_ISSUE_DEFAULTS, defaultAgentTier = AGENT_MODEL.BALANCED, bundleAgentTiers = /* @__PURE__ */ new Map(), prReviewPolicy = resolvePrReviewPolicy(), buildPolicy = DEFAULT_BUILD_POLICY, conventions = DEFAULT_RULE_CONVENTIONS) {
   const tierFor = (bundle) => bundleAgentTiers.get(bundle) ?? defaultAgentTier;
   return [
-    buildBaseBundle(paths),
+    buildBaseBundle(paths, conventions.base),
     upstreamConfigulatorDocsBundle,
     typescriptBundle,
     vitestBundle,
@@ -33997,7 +34462,7 @@ function buildBuiltInBundles(paths = DEFAULT_AGENT_PATHS, issueDefaults = DEFAUL
     slackBundle,
     buildMeetingAnalysisBundle(tierFor("meeting-analysis")),
     agendaBundle,
-    orchestratorBundle,
+    buildOrchestratorBundle(conventions.orchestrator),
     buildPrReviewBundle(prReviewPolicy),
     buildRequirementsAnalystBundle(paths, issueDefaults),
     buildRequirementsWriterBundle(paths, issueDefaults),
@@ -35085,6 +35550,13 @@ var AgentConfig = class _AgentConfig extends Component8 {
    * credential requirement when a remote cache actually exists. The
    * getter is lazy by design — `TurboRepo` must already be attached
    * to the project when the bundles are first read.
+   *
+   * Every **config-driven convention rule** is likewise resolved here
+   * and seeded into its owning bundle, so the rule enters the rule map
+   * already carrying the consumer's settings. Rewriting those rules
+   * after the map was assembled — the previous approach — silently
+   * discarded any `ruleExtensions` append or same-name `rules`
+   * override that had already been merged in.
    */
   get pathAwareBundles() {
     if (!this.cachedBundles) {
@@ -35094,11 +35566,52 @@ var AgentConfig = class _AgentConfig extends Component8 {
         resolveDefaultAgentTier(this.options),
         resolveBundleAgentTiers(this.options),
         resolvePrReviewPolicy(this.options.prReviewPolicy),
-        resolveBuildPolicy(this.project)
+        resolveBuildPolicy(this.project),
+        this.resolvedRuleConventions
       );
     }
     return this.cachedBundles;
   }
+  /**
+   * Resolved settings for every config-driven convention rule, derived
+   * from this project's options. Consumed by `buildBuiltInBundles` so
+   * the `base` and `orchestrator` bundles seed final rule content.
+   *
+   * `excludeBundles` feeds two of these: the orchestrator's rendered
+   * tier table / scope-gate overrides / scheduled-tasks registry drop
+   * rows owned by excluded bundles, and the issue-templates rule falls
+   * back to its disabled stub once every downstream-issue-kind bundle
+   * has been excluded.
+   */
+  get resolvedRuleConventions() {
+    const excludeBundles = this.options.excludeBundles ?? [];
+    const orchestratorAssets = resolveOrchestratorAssets(
+      this.options.tiers,
+      this.options.scopeGate,
+      this.options.runRatio,
+      this.options.scheduledTasks,
+      this.options.unblockDependents,
+      excludeBundles
+    );
+    return {
+      base: {
+        progressFiles: resolveProgressFiles(this.options.progressFiles),
+        sharedEditing: resolveSharedEditing(this.options.sharedEditing),
+        temporalFraming: resolveTemporalFraming(this.options.temporalFraming),
+        skillEvals: resolveSkillEvals(this.options.skillEvals),
+        issueTemplates: resolveIssueTemplates(this.options.issueTemplates),
+        hasDownstreamIssueKindBundles: hasAnyDownstreamIssueKindBundle(excludeBundles)
+      },
+      orchestrator: {
+        tiers: orchestratorAssets.tiers,
+        scopeGate: orchestratorAssets.scopeGate,
+        runRatio: orchestratorAssets.runRatio,
+        scheduledTasks: orchestratorAssets.scheduledTasks,
+        unblockDependents: orchestratorAssets.unblockDependents,
+        excludeBundles
+      }
+    };
+  }
   /**
    * Returns the bundles that are active for this project: auto-detected
    * bundles (when `autoDetectBundles !== false`) plus force-included
@@ -35413,43 +35926,10 @@ ${section}`
       }
     }
     const excludedBundleNames = this.options.excludeBundles ?? [];
-    if (this.options.tiers || this.options.scopeGate || this.options.runRatio || this.options.scheduledTasks || this.options.unblockDependents || excludedBundleNames.length > 0) {
-      const orchestratorRule = ruleMap.get("orchestrator-conventions");
-      if (orchestratorRule) {
-        const { conventionsContent } = resolveOrchestratorAssets(
-          this.options.tiers,
-          this.options.scopeGate,
-          this.options.runRatio,
-          this.options.scheduledTasks,
-          this.options.unblockDependents,
-          excludedBundleNames
-        );
-        if (conventionsContent !== orchestratorRule.content) {
-          ruleMap.set("orchestrator-conventions", {
-            ...orchestratorRule,
-            content: conventionsContent
-          });
-        }
-      }
-    }
     const injectBundleHooks = this.options.claudeMd?.injectBundleHooks ?? true;
     const resolvedProgressFiles = resolveProgressFiles(
       this.options.progressFiles
     );
-    if (this.options.progressFiles) {
-      const progressRule = ruleMap.get("progress-file-convention");
-      if (progressRule) {
-        const progressContent = renderProgressFilesRuleContent(
-          resolvedProgressFiles
-        );
-        if (progressContent !== progressRule.content) {
-          ruleMap.set("progress-file-convention", {
-            ...progressRule,
-            content: progressContent
-          });
-        }
-      }
-    }
     if (injectBundleHooks && resolvedProgressFiles.enabled) {
       for (const [ruleName, label] of PROGRESS_FILE_BUNDLE_HOOKS) {
         const existing = ruleMap.get(ruleName);
@@ -35476,20 +35956,6 @@ ${hook}`
     const resolvedSharedEditingForRules = resolveSharedEditing(
       this.options.sharedEditing
     );
-    if (this.options.sharedEditing) {
-      const sharedEditingRule = ruleMap.get("shared-editing-safety");
-      if (sharedEditingRule) {
-        const sharedEditingContent = renderSharedEditingRuleContent(
-          resolvedSharedEditingForRules
-        );
-        if (sharedEditingContent !== sharedEditingRule.content) {
-          ruleMap.set("shared-editing-safety", {
-            ...sharedEditingRule,
-            content: sharedEditingContent
-          });
-        }
-      }
-    }
     if (injectBundleHooks && resolvedSharedEditingForRules.enabled) {
       for (const [ruleName, label] of SHARED_EDITING_BUNDLE_HOOKS) {
         const existing = ruleMap.get(ruleName);
@@ -35516,20 +35982,6 @@ ${hook}`
     const resolvedSkillEvalsForRules = resolveSkillEvals(
       this.options.skillEvals
     );
-    if (this.options.skillEvals) {
-      const skillEvalsRule = ruleMap.get("skill-evals");
-      if (skillEvalsRule) {
-        const skillEvalsContent = renderSkillEvalsRuleContent(
-          resolvedSkillEvalsForRules
-        );
-        if (skillEvalsContent !== skillEvalsRule.content) {
-          ruleMap.set("skill-evals", {
-            ...skillEvalsRule,
-            content: skillEvalsContent
-          });
-        }
-      }
-    }
     if (injectBundleHooks && resolvedSkillEvalsForRules.enabled) {
       for (const [ruleName, label] of SKILL_EVALS_BUNDLE_HOOKS) {
         const existing = ruleMap.get(ruleName);
@@ -35557,21 +36009,6 @@ ${hook}`
       this.options.issueTemplates
     );
     const hasDownstreamBundles = hasAnyDownstreamIssueKindBundle(excludedBundleNames);
-    if (this.options.issueTemplates || !hasDownstreamBundles) {
-      const issueTemplatesRule = ruleMap.get("issue-templates-convention");
-      if (issueTemplatesRule) {
-        const issueTemplatesContent = renderIssueTemplatesRuleContent(
-          resolvedIssueTemplatesForRules,
-          hasDownstreamBundles
-        );
-        if (issueTemplatesContent !== issueTemplatesRule.content) {
-          ruleMap.set("issue-templates-convention", {
-            ...issueTemplatesRule,
-            content: issueTemplatesContent
-          });
-        }
-      }
-    }
     if (injectBundleHooks && resolvedIssueTemplatesForRules.enabled && hasDownstreamBundles) {
       for (const [ruleName, label] of ISSUE_TEMPLATES_BUNDLE_HOOKS) {
         const existing = ruleMap.get(ruleName);
@@ -35595,23 +36032,6 @@ ${hook}`
         });
       }
     }
-    const resolvedTemporalFramingForRules = resolveTemporalFraming(
-      this.options.temporalFraming
-    );
-    if (this.options.temporalFraming) {
-      const temporalFramingRule = ruleMap.get("temporal-framing-convention");
-      if (temporalFramingRule) {
-        const temporalFramingContent = renderTemporalFramingRuleContent(
-          resolvedTemporalFramingForRules
-        );
-        if (temporalFramingContent !== temporalFramingRule.content) {
-          ruleMap.set("temporal-framing-convention", {
-            ...temporalFramingRule,
-            content: temporalFramingContent
-          });
-        }
-      }
-    }
     const tierExamples = this.options.features?.sourceTierExamples;
     if (_AgentConfig.hasActiveTierExamples(tierExamples)) {
       const sourceRule = ruleMap.get("source-quality-verification");
@@ -41836,6 +42256,7 @@ export {
   DEFAULT_API_EXTRACTOR_REPORT_FILENAME,
   DEFAULT_API_EXTRACTOR_REPORT_FOLDER,
   DEFAULT_AUDIT_REPORT_DIR,
+  DEFAULT_BASE_CONVENTIONS,
   DEFAULT_BUILD_POLICY,
   DEFAULT_BUNDLE_OVERRIDES,
   DEFAULT_DECOMPOSITION_TEMPLATE,
@@ -41852,6 +42273,7 @@ export {
   DEFAULT_ISSUE_TEMPLATES_PATH,
   DEFAULT_ISSUE_TEMPLATES_REQUIRE_REFERENCE,
   DEFAULT_OFF_PEAK_CRON_EXAMPLE,
+  DEFAULT_ORCHESTRATOR_CONVENTIONS,
   DEFAULT_PARTIAL_UNBLOCK_COMMENT_TEMPLATE,
   DEFAULT_PATHS_EXEMPT_FROM_SIZE,
   DEFAULT_PRIORITY_LABELS,
@@ -41864,6 +42286,7 @@ export {
   DEFAULT_REQUIREMENT_CATEGORY_DIRS,
   DEFAULT_REQUIRE_PRODUCT_CONTEXT,
   DEFAULT_RESOLVED_ISSUE_DEFAULTS,
+  DEFAULT_RULE_CONVENTIONS,
   DEFAULT_SAMPLE_COMPILER_OPTIONS,
   DEFAULT_SCHEDULED_TASKS_ROOT,
   DEFAULT_SCHEDULED_TASK_ENTRIES,
@@ -41967,6 +42390,7 @@ export {
   buildIndustryDiscoveryBundle,
   buildMaintenanceAuditBundle,
   buildMeetingAnalysisBundle,
+  buildOrchestratorBundle,
   buildOrchestratorConventionsContent,
   buildPeopleProfileBundle,
   buildPrReviewBundle,
@@ -41982,6 +42406,7 @@ export {
   buildUnblockDependentsProcedure,
   bundleNameForWorkflowRule,
   businessModelsBundle,
+  checkClosingKeywordsProcedure,
   checkDocSamplesProcedure,
   checkLinksProcedure,
   classifyIssueScope,
@@ -42056,6 +42481,7 @@ export {
   renderCdkRollback,
   renderCdkSynth,
   renderCdkWatch,
+  renderCheckClosingKeywordsScript,
   renderCheckDocSamplesProcedure,
   renderCheckLinksProcedure,
   renderCustomDocSectionBlock,