@bongos/core 1.19.251 → 1.19.252

package/docs/copy-registry.json

@@ -3,9 +3,9 @@
   "generator": "scripts/gds/copy-inventory.js",
   "goal": 1000074,
   "counts": {
-    "strings": 1332,
-    "unique_ids": 1178,
-    "certain": 1332,
+    "strings": 1334,
+    "unique_ids": 1180,
+    "certain": 1334,
     "heuristic": 0,
     "duplicate_ids": 123
   },
@@ -13,7 +13,7 @@
     "builders-hall": {
       "at": "modules/hall-ui/public",
       "files": 59,
-      "strings": 1051
+      "strings": 1053
     },
     "status-dashboard": {
       "at": "modules/status-ui/public",
@@ -996,7 +996,7 @@
       "occurrences": 2,
       "at": [
         "modules/hall-ui/public/gate.js:205",
-        "modules/hall-ui/public/government.js:763"
+        "modules/hall-ui/public/government.js:812"
       ]
     },
     {
@@ -1549,7 +1549,7 @@
       "surface": "builders-hall",
       "text": ", membership",
       "file": "modules/hall-ui/public/government.js",
-      "line": 707,
+      "line": 756,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -1855,7 +1855,7 @@
       "surface": "builders-hall",
       "text": "An objection returns the idea to its author with your reason and the section it faults \\u2014 the feedback they revise against.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 662,
+      "line": 711,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -2026,7 +2026,7 @@
       "surface": "builders-hall",
       "text": "As configuration:",
       "file": "modules/hall-ui/public/government.js",
-      "line": 554,
+      "line": 603,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -2269,7 +2269,7 @@
       "surface": "builders-hall",
       "text": "Cast objection",
       "file": "modules/hall-ui/public/government.js",
-      "line": 662,
+      "line": 711,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -2332,7 +2332,7 @@
       "surface": "builders-hall",
       "text": "Charter library",
       "file": "modules/hall-ui/public/government.js",
-      "line": 531,
+      "line": 580,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -2566,7 +2566,7 @@
       "surface": "builders-hall",
       "text": "Closed sittings",
       "file": "modules/hall-ui/public/government.js",
-      "line": 733,
+      "line": 782,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -2998,7 +2998,7 @@
       "surface": "builders-hall",
       "text": "Could not load government data just now.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 804,
+      "line": 853,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -3052,7 +3052,7 @@
       "surface": "builders-hall",
       "text": "Could not load the Board Room just now.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 725,
+      "line": 774,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -3061,7 +3061,7 @@
       "surface": "builders-hall",
       "text": "Could not load the constitution just now.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 549,
+      "line": 598,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -3457,7 +3457,7 @@
       "surface": "builders-hall",
       "text": "Could not vote: {…}",
       "file": "modules/hall-ui/public/government.js",
-      "line": 689,
+      "line": 738,
       "origin": "js-notice",
       "confidence": "certain"
     },
@@ -4087,7 +4087,7 @@
       "surface": "builders-hall",
       "text": "Full Idea",
       "file": "modules/hall-ui/public/government.js",
-      "line": 590,
+      "line": 639,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -4348,7 +4348,7 @@
       "surface": "builders-hall",
       "text": "How a project moves between structures over time — summarized from the synthesis:",
       "file": "modules/hall-ui/public/government.js",
-      "line": 531,
+      "line": 580,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -4366,7 +4366,7 @@
       "surface": "builders-hall",
       "text": "How it has changed",
       "file": "modules/hall-ui/public/government.js",
-      "line": 554,
+      "line": 603,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -4429,7 +4429,7 @@
       "surface": "builders-hall",
       "text": "How this project is governed — the constitution it runs, the Board Room, and the ranks & permissions that administer it.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 791,
+      "line": 840,
       "origin": "js-text-assign",
       "confidence": "certain"
     },
@@ -5509,7 +5509,7 @@
       "surface": "builders-hall",
       "text": "No sitting has closed yet.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 734,
+      "line": 783,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -5563,7 +5563,7 @@
       "surface": "builders-hall",
       "text": "No votes yet{…}.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 608,
+      "line": 657,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -6292,7 +6292,7 @@
       "surface": "builders-hall",
       "text": "Ranks & Permissions is the Archon administration surface. The Constitution and the Board Room are yours to read.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 775,
+      "line": 824,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -6733,7 +6733,7 @@
       "surface": "builders-hall",
       "text": "Restricted.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 763,
+      "line": 812,
       "origin": "js-text-assign",
       "confidence": "certain"
     },
@@ -7030,7 +7030,7 @@
       "surface": "builders-hall",
       "text": "Selectable today",
       "file": "modules/hall-ui/public/government.js",
-      "line": 531,
+      "line": 580,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -7624,7 +7624,7 @@
       "surface": "builders-hall",
       "text": "The developmental ladder: {…}. Formality is adopted only where informal coordination breaks.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 537,
+      "line": 586,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -7795,7 +7795,7 @@
       "surface": "builders-hall",
       "text": "The seven government structures, for getting a team up to speed before deciding when to flip a switch.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 531,
+      "line": 580,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -8020,7 +8020,7 @@
       "surface": "builders-hall",
       "text": "This is your idea \\u2014 its author does not vote on it. The board decides; a return comes back to you with its reason.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 658,
+      "line": 707,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -8236,7 +8236,7 @@
       "surface": "builders-hall",
       "text": "Vote yes",
       "file": "modules/hall-ui/public/government.js",
-      "line": 662,
+      "line": 711,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -8371,7 +8371,7 @@
       "surface": "builders-hall",
       "text": "What this project runs today",
       "file": "modules/hall-ui/public/government.js",
-      "line": 554,
+      "line": 603,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -8479,7 +8479,7 @@
       "surface": "builders-hall",
       "text": "Why \\u2014 the reason the author will act on",
       "file": "modules/hall-ui/public/government.js",
-      "line": 662,
+      "line": 711,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -8623,7 +8623,7 @@
       "surface": "builders-hall",
       "text": "You have not voted on this item. Casting arrives with the vote form.",
       "file": "modules/hall-ui/public/government.js",
-      "line": 706,
+      "line": 755,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -8650,7 +8650,7 @@
       "surface": "builders-hall",
       "text": "You voted",
       "file": "modules/hall-ui/public/government.js",
-      "line": 705,
+      "line": 754,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -8956,7 +8956,7 @@
       "surface": "builders-hall",
       "text": "active builder{…}: {…}",
       "file": "modules/hall-ui/public/government.js",
-      "line": 531,
+      "line": 580,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9037,7 +9037,7 @@
       "surface": "builders-hall",
       "text": "as configuration: {…}",
       "file": "modules/hall-ui/public/government.js",
-      "line": 525,
+      "line": 574,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9122,6 +9122,15 @@
       "origin": "js-markup",
       "confidence": "certain"
     },
+    {
+      "id": "b73a83223bc0",
+      "surface": "builders-hall",
+      "text": "cannot be read, so",
+      "file": "modules/hall-ui/public/government.js",
+      "line": 482,
+      "origin": "js-markup",
+      "confidence": "certain"
+    },
     {
       "id": "3a49b4974af1",
       "surface": "builders-hall",
@@ -9172,7 +9181,7 @@
       "surface": "builders-hall",
       "text": "documented for later",
       "file": "modules/hall-ui/public/government.js",
-      "line": 523,
+      "line": 572,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9235,7 +9244,7 @@
       "surface": "builders-hall",
       "text": "first vote",
       "file": "modules/hall-ui/public/government.js",
-      "line": 451,
+      "line": 500,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9487,7 +9496,7 @@
       "surface": "builders-hall",
       "text": "means expressible through the real configuration — a rank-based membership plus a pass rule — with no new code. This project has",
       "file": "modules/hall-ui/public/government.js",
-      "line": 531,
+      "line": 580,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9550,7 +9559,7 @@
       "surface": "builders-hall",
       "text": "no clock",
       "file": "modules/hall-ui/public/government.js",
-      "line": 461,
+      "line": 510,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9613,7 +9622,7 @@
       "surface": "builders-hall",
       "text": "objected to",
       "file": "modules/hall-ui/public/government.js",
-      "line": 615,
+      "line": 664,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9698,6 +9707,15 @@
       "origin": "js-markup",
       "confidence": "certain"
     },
+    {
+      "id": "c38db02adb61",
+      "surface": "builders-hall",
+      "text": "or above",
+      "file": "modules/hall-ui/public/government.js",
+      "line": 494,
+      "origin": "js-markup",
+      "confidence": "certain"
+    },
     {
       "id": "66f7e9c2dde0",
       "surface": "builders-hall",
@@ -9748,7 +9766,7 @@
       "surface": "builders-hall",
       "text": "recommended at your headcount",
       "file": "modules/hall-ui/public/government.js",
-      "line": 524,
+      "line": 573,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9802,7 +9820,7 @@
       "surface": "builders-hall",
       "text": "selectable today",
       "file": "modules/hall-ui/public/government.js",
-      "line": 522,
+      "line": 571,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -9838,7 +9856,7 @@
       "surface": "builders-hall",
       "text": "tally: {…} yes · {…} no — sitting under",
       "file": "modules/hall-ui/public/government.js",
-      "line": 707,
+      "line": 756,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -10054,7 +10072,7 @@
       "surface": "builders-hall",
       "text": "your vote",
       "file": "modules/hall-ui/public/government.js",
-      "line": 612,
+      "line": 661,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -10153,7 +10171,7 @@
       "surface": "builders-hall",
       "text": "{…} minutes",
       "file": "modules/hall-ui/public/government.js",
-      "line": 466,
+      "line": 515,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -10234,7 +10252,7 @@
       "surface": "builders-hall",
       "text": "{…} proposed",
       "file": "modules/hall-ui/public/government.js",
-      "line": 478,
+      "line": 527,
       "origin": "js-markup",
       "confidence": "certain"
     },
@@ -10549,7 +10567,7 @@
       "surface": "builders-hall",
       "text": "— {…}{…}",
       "file": "modules/hall-ui/public/government.js",
-      "line": 526,
+      "line": 575,
       "origin": "js-markup",
       "confidence": "certain"
     },

package/modules/government/board-membership.js

@@ -3,8 +3,8 @@
 // modules/government/board-membership.js — WHO SITS ON THE BOARD, right now
 // (BV1.R06 of goal 1000069, ADR 0175).
 //
-// Resolves the constitution's membership predicate (R05: `board.membership`,
-// grammar `rank:<key>`) to the live member list. Consumed by R07 (who to
+// Resolves the constitution's membership predicate (R05: `board.membership`;
+// the grammar lives in ./membership-predicate) to the live member list. Consumed by R07 (who to
 // announce a window to), R08 (the live membership re-check before a vote
 // counts), and R10 (the tally's denominator).
 //
@@ -34,22 +34,13 @@
 
 const db = require('./db');
 
-// The one predicate grammar v1 defines, mirrored from config.js's MEMBERSHIP_RE
-// (the two must agree; tests/government_board_membership.mjs pins that). The
-// rank key is validated by SHAPE only — whether it names a live rank is the
-// DB's question, answered by the query returning nobody for a key with no
-// assignment rows. Config deliberately cannot see custom ranks (R05), so this
-// is where `rank:some-custom-rank` becomes real or resolves to an empty board.
-const PREDICATE_RE = /^rank:([a-z][a-z0-9_-]*)$/;
-
-// Pure: predicate string -> { rankKey } or null. Null means "unparseable", and
-// every caller must treat null as NOBODY. Exported so R07/R08 can validate a
-// snapshotted constitution's predicate without touching the DB.
-function parseMembershipPredicate(predicate) {
-  if (typeof predicate !== 'string') return null;
-  const m = PREDICATE_RE.exec(predicate);
-  return m ? Object.freeze({ rankKey: m[1] }) : null;
-}
+// The predicate GRAMMAR lives in ./membership-predicate — one parser, shared with
+// R05's config sanitizer (task 1003094). It used to be written twice, as a shape
+// regex there and a parse regex here, pinned only by a property test; the moment
+// the grammar gained a rule a regex cannot express (`+` is legal only on a rank
+// that HAS a ladder position) two hand-written copies became the same drift that
+// produced the bug this fixes. Read that file for the grammar and the reasoning.
+const { parseMembershipPredicate } = require('./membership-predicate');
 
 // The resolve entry point: constitution board block -> the live member list, as
 // a frozen array of { builder_id, github_login, display_name } rows sorted by
@@ -60,7 +51,7 @@ function parseMembershipPredicate(predicate) {
 async function resolveBoardMembers(board) {
   const parsed = parseMembershipPredicate(board && board.membership);
   if (!parsed) return Object.freeze([]); // unparseable predicate → nobody governs
-  const rows = await db.getActiveBuildersWithRank(parsed.rankKey);
+  const rows = await db.getActiveBuildersWithRank(parsed.rankKeys);
   return Object.freeze(rows.map((r) => Object.freeze({
     builder_id: String(r.builder_id),
     github_login: r.github_login,
@@ -75,11 +66,20 @@ async function isBoardMember(builderId, board) {
   if (builderId === null || builderId === undefined || builderId === '') return false;
   const parsed = parseMembershipPredicate(board && board.membership);
   if (!parsed) return false;
-  return db.builderHoldsRankActive(builderId, parsed.rankKey);
+  return db.builderHoldsRankActive(builderId, parsed.rankKeys);
+}
+
+// Would `builderId` sit on the board under this PROPOSED board block? Same
+// question as isBoardMember, named for its one caller — R14's disenfranchisement
+// guard (board.js) — so the intent is legible where it is used and nobody has to
+// infer "we are asking about a constitution that is not in force yet".
+async function wouldBeBoardMember(builderId, proposedBoard) {
+  return isBoardMember(builderId, proposedBoard);
 }
 
 module.exports = {
   parseMembershipPredicate,
   resolveBoardMembers,
   isBoardMember,
+  wouldBeBoardMember,
 };

package/modules/government/board.js

@@ -48,7 +48,12 @@ const db = require('./db');
 // load and un-patchable).
 const governmentConfig = require('./config');
 const { loadGovernmentConfig, PASS_RULES, MAX_WINDOW_MINUTES } = governmentConfig;
-const { isBoardMember, resolveBoardMembers, parseMembershipPredicate } = require('./board-membership');
+const {
+  isBoardMember, resolveBoardMembers, parseMembershipPredicate, wouldBeBoardMember,
+} = require('./board-membership');
+// describeMembership renders a predicate in the words the proposer was thinking
+// in ("metic and above"), for the disenfranchisement refusal (task 1003094).
+const { describeMembership } = require('./membership-predicate');
 
 // ADR 0175 §5: the completeness bar a Full Idea must clear to reach the board.
 // Held equal to economy's IDEA_FULL_PASS_BAR by test — see the header.
@@ -462,7 +467,15 @@ function validateProposedConstitution(raw) {
     if (!known.includes(k)) return { ok: false, reason: 'unknown_field', field: k };
   }
   if (!parseMembershipPredicate(raw.membership)) {
-    return { ok: false, reason: 'bad_membership', expected: "the predicate grammar rank:<key>" };
+    return {
+      ok: false,
+      reason: 'bad_membership',
+      // The refusal TEACHES the grammar, because the person hitting it is trying
+      // to write a constitution and the commonest reason to land here since task
+      // 1003094 is reaching for "and above" — the exact thing that used to be
+      // inexpressible and cost an Archon their own board seat.
+      expected: 'rank:<key> (exactly that rank), rank:<key>+ (that rank and above, standard ranks only), or a comma list such as rank:metic,archon',
+    };
   }
   if (!PASS_RULES.includes(raw.pass_rule)) {
     return { ok: false, reason: 'bad_pass_rule', expected: PASS_RULES };
@@ -493,10 +506,51 @@ function validateProposedConstitution(raw) {
 // anti-self note). Concurrent amendment windows are legal like any concurrent
 // windows; applies land in close order and the last close wins, deterministic
 // because applyBoardAmendment rewrites the whole block.
-async function proposeAmendment({ proposal, rationaleMd = null, proposedBy } = {}) {
+async function proposeAmendment({
+  proposal, rationaleMd = null, proposedBy, acknowledgeSelfRemoval = false,
+} = {}) {
   const v = validateProposedConstitution(proposal);
   if (!v.ok) return { ok: false, ...v };
   if (proposedBy == null || proposedBy === '') return { ok: false, reason: 'missing_proposer' };
+
+  // ── THE DISENFRANCHISEMENT GUARD (task 1003094) ──────────────────────────
+  //
+  // A change to the government that removes the person making it is the ONE
+  // shape that cannot self-correct: once it lands they can no longer vote to
+  // change it back. This is not hypothetical — it is what happened on the R25
+  // rehearsal.
+  // An Archon ratified `rank:metic` under monarchy, the apply worked perfectly,
+  // and the next vote came back 403 not_board_member. The board would have
+  // deadlocked at one member, because an Archon can still PROPOSE
+  // (board.item.open floors at metic) but no longer VOTE.
+  //
+  // REFUSE BY DEFAULT, with an explicit acknowledgement to proceed — the owner's
+  // "refuse or loudly confirm". Not a hard ban: handing the franchise to a wider
+  // body and stepping back is a legitimate constitutional act, and a system that
+  // cannot express it is telling owners what they may decide. The flag is a
+  // SEPARATE PARAMETER, never a field on the proposal, so the acknowledgement
+  // never becomes part of the ratified text (validateProposedConstitution
+  // refuses unknown fields, which keeps that honest).
+  //
+  // Checked against the PROPOSED block and the proposer's LIVE rank, per request
+  // and uncached like every other membership read here.
+  if (!acknowledgeSelfRemoval) {
+    const stillSeated = await wouldBeBoardMember(proposedBy, v.proposal);
+    if (!stillSeated) {
+      return {
+        ok: false,
+        reason: 'proposer_would_lose_their_seat',
+        membership: v.proposal.membership,
+        describes: describeMembership(v.proposal.membership),
+        what_this_means:
+          'This amendment would remove YOU from the board. If it passes you could no longer vote — including to undo it. '
+          + 'If that is deliberate, re-submit with acknowledge_self_removal.',
+        // The commonest cause, named, because the fix is usually one character.
+        hint: 'A bare rank:<key> means EXACTLY that rank. To keep yourself and everyone above, use rank:<key>+.',
+      };
+    }
+  }
+
   const amendment = await db.createAmendment({ proposed: v.proposal, rationaleMd, proposedBy });
   const { board } = loadGovernmentConfig();
   const item = await db.openBoardItem({

package/modules/government/config.js

@@ -154,13 +154,19 @@ const BOARD_DEFAULTS = Object.freeze({
 // default and what an unreadable value falls back to.
 const PASS_RULES = Object.freeze(['first_ratifier', 'consent']);
 
-// A membership predicate is `rank:<key>` — the only grammar v1 defines. It is NOT
-// validated against catalog.RANK_ORDER on purpose: a project may govern by a CUSTOM
-// rank, and custom ranks are DB rows this file cannot see (checking here would make
-// config authoritative over a live rank list, which is exactly the inversion the
-// header forbids). R06 resolves the predicate against the live ranks and yields an
-// empty board if it names nothing — fail-closed there, shape-checked here.
-const MEMBERSHIP_RE = /^rank:[a-z][a-z0-9_-]*$/;
+// A membership predicate names WHO SITS. The grammar and its parser live in
+// ./membership-predicate — ONE implementation, shared with R06's resolver
+// (board-membership.js). They used to be two hand-written regexes pinned only by
+// a property test; task 1003094 added a rule a regex cannot express (`+` is legal
+// only on a rank that HAS a ladder position), and two copies of a rule with a
+// lookup in it is precisely the drift that produced the bug that task fixes.
+//
+// Still NOT validated against a live rank list, and that is unchanged: a project
+// may govern by a CUSTOM rank, which is a DB row this file cannot see. Checking
+// that here would make config authoritative over the live ranks — the inversion
+// the header forbids. R06 resolves against the real rows and yields an empty
+// board if the predicate names nobody: fail-closed there, shape-checked here.
+const { isMembershipPredicate } = require('./membership-predicate');
 
 // A sitting longer than a week is indistinguishable from no clock at all, and a
 // zero/negative window would close every item the instant it opened. Both are far
@@ -178,7 +184,7 @@ const MAX_WINDOW_MINUTES = 7 * 24 * 60;
 // config cannot quietly enfranchise anyone or lower the bar.
 function sanitizeBoard(raw) {
   const r = isObj(raw) ? raw : {};
-  const membership = typeof r.membership === 'string' && MEMBERSHIP_RE.test(r.membership)
+  const membership = typeof r.membership === 'string' && isMembershipPredicate(r.membership)
     ? r.membership
     : BOARD_DEFAULTS.membership;
   const passRule = PASS_RULES.includes(r.pass_rule) ? r.pass_rule : BOARD_DEFAULTS.pass_rule;

package/modules/government/db.js

@@ -252,31 +252,42 @@ async function unassignRank({ builderId, rankKey }) {
 //     that is circumstance, not a rule; this makes it structural, mirroring the
 //     resolver's principal-key drop (R98).
 
-async function getActiveBuildersWithRank(rankKey) {
+// Both reads take a SET of rank keys, not one key (task 1003094). The board
+// predicate grammar gained `rank:metic+` (ladder) and `rank:a,b` (union), and
+// board-membership.js resolves every form — including the bare one — to a set.
+// `= ANY($1)` is the whole change; the exact-match behaviour of a one-element
+// set is byte-identical to the old `= $1`, which is why no ratified constitution
+// changes meaning.
+//
+// DISTINCT is deliberate and not defensive noise: a set can now match a builder
+// through more than one key, and government_builder_ranks does not structurally
+// forbid a second row. Without it a member could be counted twice in the tally's
+// denominator, which silently raises the bar a consent vote has to clear.
+async function getActiveBuildersWithRank(rankKeys) {
   const { rows } = await pool.query(
-    `SELECT br.builder_id, b.github_login, b.display_name
+    `SELECT DISTINCT br.builder_id, b.github_login, b.display_name
        FROM government_builder_ranks br
        JOIN builders b ON b.id = br.builder_id
-      WHERE br.rank_key = $1
+      WHERE br.rank_key = ANY($1)
         AND b.status = 'active'
         AND b.system_role IS NULL
       ORDER BY br.builder_id`,
-    [rankKey],
+    [rankKeys],
   );
   return rows;
 }
 
-async function builderHoldsRankActive(builderId, rankKey) {
+async function builderHoldsRankActive(builderId, rankKeys) {
   const { rows } = await pool.query(
     `SELECT 1
        FROM government_builder_ranks br
        JOIN builders b ON b.id = br.builder_id
       WHERE br.builder_id = $1
-        AND br.rank_key = $2
+        AND br.rank_key = ANY($2)
         AND b.status = 'active'
         AND b.system_role IS NULL
       LIMIT 1`,
-    [builderId, rankKey],
+    [builderId, rankKeys],
   );
   return rows.length > 0;
 }