@bongos/core 1.21.18 → 1.21.20

package/modules/hall-ui/public/street-inside.js

@@ -24,20 +24,21 @@
 //    are about the government rather than the sample project). A floor the
 //    governor docket (GET /government/docket) already reads is BOUND to it: a
 //    source (its open matters, their count, needs you when one does) or a
-//    reading (its figure and line), or, for Planning's goals, the open goals the
-//    street already holds. Every other floor stands in an honest "not recorded
-//    yet" state: its name, what it holds, no number. Real data for every floor
-//    is task 1004527, which fills these same descriptors (floorFor()).
-//  * Who holds a building and how it decides. The docket does not carry a
-//    holder yet (task 1004529 sets who decides what, per project); until it
-//    does the seat is drawn empty and says so, and the rule is the one the
-//    building's own open matters are decided by, else the design's default,
-//    named as the default. A docket building that carries `holders` / `rule`
-//    is read first (holderOf()).
+//    reading (its figure and line), or a FLOOR (task 1004527: docket.floors, a
+//    state the owning module reads live — who sits, what the month cost, what
+//    went live). A floor whose engine does not exist yet comes back `coming`
+//    and stands faint with "not recorded yet" and the docket's reason; nothing
+//    here ever writes a number the docket did not send.
+//  * Who holds a building and how it decides: the building's `decision` row
+//    (task 1004529's table) and the `holders` that row seats now. Without a row
+//    the seat is drawn empty and says so, and the rule is the building's own
+//    matters' rule, else the design's default, named as the default
+//    (holderOf()).
 //  * On the table here: the docket's matters at this building. Each row opens
 //    the short card (GovStreet.cardFor(); task 1004528 makes it act).
-//  * The record: those same matters filed by the month they were opened, one
-//    drawer a month, newest first.
+//  * The record: the building's history (docket.history: rulings, amendments,
+//    sign-offs, releases, payouts) and its matters, filed by month, one drawer
+//    a month, newest first.
 //  * The annex lot stands when the building is full, as the prototype's
 //    "growth" lines say it would.
 //  * A district's work is the goal's tasks (GET /tasks?goal_id=N): shape from
@@ -268,7 +269,7 @@
       sym: f ? Object.assign(symbolPath(floorSymbol(f.name)), { c: '#fb9569' }) : { d: '', f: '', c: 'none' },
       flipA: ((st.picks || 0) % 2) === 0, flipB: ((st.picks || 0) % 2) === 1,
       openTitle: f ? f.name : '', openLines: f ? f.lines.map((l, i) => ({ key: 'l' + i, text: l[0], meta: l[1] })) : [],
-      drawers: record.map((r, i) => ({ key: r.label, index: i, label: r.label, count: r.items.length, aria: 'Open the ' + r.label + ' drawer', selected: i === selDrawer, bg: i === selDrawer ? T.wash : 'transparent', border: i === selDrawer ? T.ink : T.ruleStrong, handle: i === selDrawer ? T.ink : T.ruleStrong, color: T.ink })),
+      drawers: record.map((r, i) => ({ key: r.label, index: i, label: r.label, count: r.count == null ? r.items.length : r.count, aria: 'Open the ' + r.label + ' drawer', selected: i === selDrawer, bg: i === selDrawer ? T.wash : 'transparent', border: i === selDrawer ? T.ink : T.ruleStrong, handle: i === selDrawer ? T.ink : T.ruleStrong, color: T.ink })),
       drawerItems: selDrawer >= 0 ? record[selDrawer].items.map((it, i) => ({ key: 'r' + i, text: it[0], meta: it[1] })) : [],
       onFile: b.onFile, shapes: shapes, texts: texts, syms: syms, floors: floors,
       lift: { x: X - 38, y: GY - FH + 6, ty: -(selFloor * FH), h: FH - 16 },
@@ -314,7 +315,7 @@
   // its sample project: what it holds, the rule the design gives it, its
   // capacity, its growth line and its annex.
   const GROUPS = Object.freeze({ charter: 'how we decide', rules: 'how we decide', disputes: 'how we decide', people: 'who and what', planning: 'who and what', automation: 'the work', review: 'checks and going live', release: 'checks and going live', treasury: 'money' });
-  const RULE_WORDS = Object.freeze({ decide: 'one person decides', first: 'first yes wins', consent: 'passes unless someone objects', majority: 'more than half must say yes', unanimous: 'everyone has to agree', signoff: 'signed off by someone who did not build it', rule: 'settled by a rule' });
+  const RULE_WORDS = Object.freeze({ decide: 'one person decides', first: 'first yes wins', consent: 'passes unless someone objects', majority: 'more than half must say yes', unanimous: 'everyone has to agree', signoff: 'signed off by someone who did not build it', rule: 'settled by a rule', vacant: 'its matters wait until a seat is filled' });
 
   // A floor: [name, what it holds, binding]. A binding is { source }, { reading }
   // or { goals: true }; no binding is a floor not recorded yet.
@@ -322,12 +323,12 @@
     charter: {
       holds: 'The form of government. Seven sections say who holds each building and how it decides.', rule: 'unanimous', cap: 9,
       growth: 'Room for more sections before the charter needs a second volume.', annex: 'room for a second volume',
-      floors: [['Founding', 'the starting government'], ['§1 Purpose', 'what this project is for'], ['§2 Membership', 'who belongs, and how they join'], ['§3 The council', 'who sits on the council'], ['§4 Rules', 'how a rule passes'], ['§5 Money', 'who may spend, and how much'], ['§6 Review', 'who signs off finished work'], ['§7 Release', 'who puts work live']],
+      floors: [['Founding', 'the starting government', { floor: 'charter.founding' }], ['§1 Purpose', 'what this project is for', { floor: 'charter.purpose' }], ['§2 Membership', 'who belongs, and how they join', { floor: 'charter.membership' }], ['§3 The council', 'who sits on the council', { floor: 'charter.council' }], ['§4 Rules', 'how a rule passes', { floor: 'charter.rules' }], ['§5 Money', 'who may spend, and how much', { floor: 'charter.money' }], ['§6 Review', 'who signs off finished work', { floor: 'charter.review' }], ['§7 Release', 'who puts work live', { floor: 'charter.release' }]],
     },
     rules: {
       holds: 'Standing rules. Each one settles a kind of matter so the council never votes on it again.', rule: 'majority', cap: 8,
       growth: 'When the hall fills, the council can open an annex for one area, such as money rules.', annex: 'room for an annex, such as money rules',
-      floors: [['Rules in force', 'the rules settling matters now', { reading: 'rules' }], ['New rules', 'a rule put to the council', { source: 'standing_rules' }]],
+      floors: [['Rules in force', 'the rules settling matters now', { floor: 'rules.in_force', reading: 'rules' }], ['New rules', 'a rule put to the council', { source: 'standing_rules' }]],
     },
     disputes: {
       holds: 'Grade appeals, removal requests and security reports. Every ruling becomes precedent for the next one.', rule: 'decide', cap: 5,
@@ -337,32 +338,32 @@
     people: {
       holds: 'Who belongs, the rank each person holds, and who sits in which seat.', rule: 'consent', cap: 8,
       growth: 'A new floor opens whenever the charter creates a new seat.', annex: 'room for an annex of seats',
-      floors: [['The council', 'who sits, and for how long'], ['Testers', 'who signs off finished work'], ['Builders', 'who builds here', { reading: 'people' }], ['Newcomers', 'builders on newcomer tasks'], ['Waiting to join', 'asked to join the project', { source: 'access_requests' }], ['Ranks', 'the ranks, and who holds each'], ['Goal teams', 'asked to join a goal team', { source: 'goal_join_requests' }]],
+      floors: [['The council', 'who sits, and for how long', { floor: 'people.council' }], ['Testers', 'who signs off finished work', { floor: 'people.testers' }], ['Builders', 'who builds here', { reading: 'people' }], ['Newcomers', 'builders on newcomer tasks', { floor: 'people.newcomers' }], ['Waiting to join', 'asked to join the project', { source: 'access_requests' }], ['Ranks', 'the ranks, and who holds each', { floor: 'people.ranks' }], ['Goal teams', 'asked to join a goal team', { source: 'goal_join_requests' }]],
     },
     planning: {
       holds: 'Goals, and the promises that say when each one is done. Kept promises are what the project owes its users.', rule: 'majority', cap: 9,
       growth: 'When it fills, the next new goal opens a second planning office.', annex: 'room for a second planning office',
-      floors: [['Goals', 'the open goals', { goals: true }], ['Promises', 'what the goals say they deliver', { reading: 'promises' }], ['Ideas to ratify', 'full ideas waiting for a vote'], ['Priorities', 'the order goals are worked in'], ['Versions', 'what each version holds'], ['Waiting on a decision', 'blockers holding work', { source: 'blockers' }]],
+      floors: [['Goals', 'the open goals', { floor: 'planning.goals', goals: true }], ['Promises', 'what the goals say they deliver', { reading: 'promises' }], ['Ideas to ratify', 'full ideas waiting for a vote', { floor: 'planning.ideas' }], ['Priorities', 'the order goals are worked in', { floor: 'planning.priorities' }], ['Versions', 'what each version holds', { floor: 'planning.versions' }], ['Waiting on a decision', 'blockers holding work', { source: 'blockers' }]],
     },
     automation: {
       holds: 'AI builders working on their own. You choose which goals they may build and how much they may spend, and you can stop them at any time.', rule: 'decide', cap: 6,
       growth: 'A new floor opens for each goal you let it build.', annex: 'room for an annex',
-      floors: [['The switch', 'unattended building, on or off', { source: 'autobongos_fence' }], ['Allowed goals', 'the goals it may build'], ['Running now', 'builds in progress'], ['Spending limit', 'what it may spend a day'], ['Reports', 'what it did, told without asking']],
+      floors: [['The switch', 'unattended building, on or off', { source: 'autobongos_fence' }], ['Allowed goals', 'the goals it may build', { floor: 'automation.allowed_goals' }], ['Running now', 'builds in progress', { floor: 'automation.running' }], ['Spending limit', 'what it may spend', { floor: 'automation.spending_limit' }], ['Reports', 'what it did, told without asking', { floor: 'automation.reports' }]],
     },
     review: {
       holds: 'Testing finished work and signing it off. Work does not count until someone who did not build it says it works.', rule: 'signoff', cap: 5,
       growth: 'When one queue of testers is not enough, an annex can take design reviews.', vacantGrowth: 'Nothing is built here until the charter says who holds the seat.', annex: 'room for an annex, such as design review',
-      floors: [['Testers', 'who signs off finished work'], ['Waiting outside', 'finished work waiting for a tester', { source: 'criteria_uat' }], ['Signed off', 'work a tester has signed off']],
+      floors: [['Testers', 'who signs off finished work', { floor: 'review.testers' }], ['Waiting outside', 'finished work waiting for a tester', { source: 'criteria_uat', held: 'Being tested' }], ['Signed off', 'work a tester has signed off', { floor: 'review.signed_off' }]],
     },
     release: {
       holds: 'Putting finished work live, and taking updates to Bongos itself.', rule: 'decide', cap: 7,
       growth: 'Room for a second gate if releases are ever split by area.', annex: 'room for a second gate',
-      floors: [['Overrides', 'past a failed check or grade', { source: 'override_requests' }], ['Modules', 'listed modules, and their re-checks', { source: 'module_rechecks' }], ['Held back', 'work held from going live'], ['Core update', 'a new version of Bongos', { source: 'core_update' }], ['Live this month', 'what went live'], ['Ready to go', 'signed off, waiting to go live', { source: 'gate_approvals' }]],
+      floors: [['Overrides', 'past a failed check or grade', { source: 'override_requests' }], ['Modules', 'listed modules, and their re-checks', { source: 'module_rechecks' }], ['Held back', 'work held from going live', { floor: 'release.held_back' }], ['Core update', 'a new version of Bongos', { source: 'core_update' }], ['Live this month', 'what went live', { floor: 'release.live_month' }], ['Ready to go', 'signed off, waiting to go live', { source: 'gate_approvals' }]],
     },
     treasury: {
       holds: 'The budget, and who gets paid for what.', rule: 'majority', cap: 7,
       growth: 'Each new spending line takes a floor.', annex: 'room for an annex of spending lines',
-      floors: [['Builder rewards', 'paid for shipped work'], ['AI grading', 'the reviewer that grades every ship'], ['Hosting', 'servers and storage'], ['Reserve', 'what is left this month', { reading: 'money' }], ['Spending matters', 'spending put to a vote', { source: 'treasury_spending' }]],
+      floors: [['Builder rewards', 'paid for shipped work', { floor: 'treasury.rewards' }], ['AI grading', 'the reviewer that grades every ship', { floor: 'treasury.grading' }], ['Hosting', 'servers and storage', { floor: 'treasury.hosting' }], ['Reserve', 'what is left this month', { reading: 'money' }], ['Spending matters', 'spending put to a vote', { source: 'treasury_spending' }]],
     },
   });
   const MONTHS = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'];
@@ -396,6 +397,18 @@
     const docket = ctx.docket, now = ctx.now;
     if (!bind) return F(name, what, '', 'coming', [['What this floor holds is not recorded in Bongos yet.', 'coming']]);
     if (!docket) return F(name, what, '', 'unavailable', [['The docket could not be read just now.', '']]);
+    if (bind.floor) {
+      const fl = (Array.isArray(docket.floors) ? docket.floors : []).find((x) => x && x.key === bind.floor);
+      if (fl && fl.status === 'live') {
+        const titles = new Map((ctx.goals || []).map((g) => [String(g.id), String(g.title || '')]));
+        // a line that names a goal by id ('goal 12') is lettered with its title
+        const word = (t) => { const m = /^goal (\d+)$/.exec(String(t)); return m && titles.get(m[1]) ? titles.get(m[1]) : String(t); };
+        const lines = (Array.isArray(fl.lines) ? fl.lines : []).map((l) => [word(l[0]), String(l[1] || '')]);
+        return F(name, String(fl.line || what), fl.count == null ? '' : String(fl.count), fl.hot ? 'pending' : 'ok', lines.length ? lines : [[String(fl.line || what), '']]);
+      }
+      if (fl) return quietFloor(name, what, fl.status, fl.reason);
+      if (!bind.goals && !bind.reading) return F(name, what, '', 'unavailable', [['This could not be read just now.', '']]);
+    }
     if (bind.goals) {
       const goals = ctx.goals || [];
       const lines = goals.slice(0, MAX_LINES).map((g) => [String(g.title || 'Goal ' + g.id), 'open']);
@@ -423,36 +436,73 @@
     return F(name, what, '', 'unavailable', [[String(reason || 'It could not be read just now.'), '']]);
   }
 
-  // Who holds the building and how it decides. A docket building that names
-  // its holders (task 1004529) is read first; otherwise the seat is empty and
-  // says so, and the rule is its matters' own, else the design's default (and
-  // the words say 'by default', so a default is never read as a decision).
-  function holderOf(key, info, matters) {
+  // Who holds the building and how it decides. The building's decision row
+  // (task 1004529's table) is read first, with the people it seats now
+  // (`holders`); a vacant row is an empty seat that says so. A building with no
+  // row falls back to the legacy `holders` / `who` / `rule`, then its matters'
+  // own rule, then the design's default (and the words say 'by default', so a
+  // default is never read as a decision).
+  function holderOf(key, info, matters, viewerId) {
     const plan = PLAN[key];
     const holders = info && Array.isArray(info.holders) ? info.holders.filter((h) => h && (h.name || h.login)) : [];
-    const seats = holders.length ? holders.slice(0, 5).map((h) => String(h.name || h.login).charAt(0).toUpperCase()) : ['—'];
-    const who = info && info.who ? String(info.who) : holders.length ? holders.map((h) => String(h.name || h.login)).join(', ') : 'who holds it is not set on this project yet';
+    const nameOf = (h) => String(h.name || h.login);
+    const seatOf = (h) => (viewerId != null && h.id != null && String(h.id) === String(viewerId) ? 'you' : nameOf(h).charAt(0).toUpperCase());
+    const d = info && info.decision && typeof info.decision === 'object' ? info.decision : null;
+    if (d) {
+      if (d.rule === 'vacant') return { seats: ['—'], who: 'no one holds it yet', rule: 'vacant', how: RULE_WORDS.vacant };
+      const rule = RULE_WORDS[d.rule] ? d.rule : plan.rule;
+      const n = info.holder_count == null ? holders.length : Number(info.holder_count) || 0;
+      const named = holders.slice(0, 3).map(nameOf);
+      const people = !n || !named.length ? '' : n <= 3 ? (named.length > 1 ? named.slice(0, -1).join(', ') + ' and ' + named[named.length - 1] : named[0]) : named.join(', ') + ' and ' + (n - 3) + ' more';
+      return {
+        seats: holders.length ? holders.slice(0, 5).map(seatOf) : ['—'],
+        who: people ? people + ' · ' + String(d.who || '') : String(d.who || 'who holds it is not set on this project yet'),
+        rule: rule,
+        how: RULE_WORDS[rule] + (RULE_WORDS[d.rule] ? '' : ' · by default'),
+      };
+    }
+    const seats = holders.length ? holders.slice(0, 5).map(seatOf) : ['—'];
+    const who = info && info.who ? String(info.who) : holders.length ? holders.map(nameOf).join(', ') : 'who holds it is not set on this project yet';
     const fromMatter = matters.find((m) => m && RULE_WORDS[m.rule]);
     const rule = info && RULE_WORDS[info.rule] ? info.rule : fromMatter ? fromMatter.rule : plan.rule;
     const how = RULE_WORDS[rule] + (info && RULE_WORDS[info.rule] ? '' : fromMatter ? '' : ' · by default');
     return { seats: seats, who: who, rule: rule, how: how };
   }
 
-  // The record: the building's matters filed by the month each was opened.
-  function recordOf(matters, now) {
+  // The record: the building's history (what closed, dated by when it closed)
+  // and its matters (dated by when each was opened), filed by month, newest
+  // drawer first. A settled sitting that is also in the history is filed once.
+  // A drawer shows MAX_DRAWER items and says how many more; its count is all.
+  const MAX_DRAWER = 12;
+  function recordOf(matters, now, history) {
     const by = new Map();
-    matters.forEach((m) => {
-      const t = m.opened_at ? new Date(m.opened_at) : null;
+    const file = (at, item) => {
+      const t = at ? new Date(at) : null;
       const ok = t && !isNaN(t.getTime());
       const k = ok ? t.getUTCFullYear() * 12 + t.getUTCMonth() : -1;
       if (!by.has(k)) by.set(k, []);
-      by.get(k).push([String(m.title || m.short || ''), STATE_WORDS[stateOf(m)]]);
+      by.get(k).push(item);
+    };
+    const filed = new Set();
+    (history || []).forEach((h) => {
+      const m = /:(?:board|amendment|founding):(.+)$/.exec(String(h.id || ''));
+      if (m) filed.add(m[1]);
+    });
+    (history || []).forEach((h) => file(h.at, [String(h.title || ''), String(h.outcome || '')]));
+    matters.forEach((m) => {
+      if (m.ref && m.ref.type === 'board_item' && filed.has(String(m.ref.id))) return;
+      file(m.opened_at, [String(m.title || m.short || ''), STATE_WORDS[stateOf(m)]]);
     });
     const thisYear = new Date(now || 0).getUTCFullYear();
-    return [...by.keys()].sort((a, b) => b - a).map((k) => ({
-      label: k < 0 ? 'undated' : MONTHS[k % 12] + (Math.floor(k / 12) === thisYear ? '' : ' ' + String(Math.floor(k / 12)).slice(2)),
-      items: by.get(k),
-    }));
+    return [...by.keys()].sort((a, b) => b - a).map((k) => {
+      const all = by.get(k);
+      const items = all.slice(0, MAX_DRAWER);
+      if (all.length > MAX_DRAWER) items.push(['and ' + (all.length - MAX_DRAWER) + ' more', '']);
+      return {
+        label: k < 0 ? 'undated' : MONTHS[k % 12] + (Math.floor(k / 12) === thisYear ? '' : ' ' + String(Math.floor(k / 12)).slice(2)),
+        items: items, count: all.length,
+      };
+    });
   }
 
   // The whole building as civicInfo() shaped it, from the real feeds.
@@ -464,21 +514,27 @@
     const c = { key: key, docket: docket, goals: (ctx && ctx.goals) || [], now: (ctx && ctx.now) || 0 };
     const matters = docket ? docket.matters.filter((m) => m && m.building === key) : [];
     const info = docket && Array.isArray(docket.buildings) ? docket.buildings.find((b) => b && b.key === key) : null;
-    const h = holderOf(key, info, matters);
-    const vacant = key === 'review' && !S.reviewHeldOf(docket);
-    const floors = plan.floors.map((spec) => floorFor(spec, c));
+    const h = holderOf(key, info, matters, docket && docket.viewer ? docket.viewer.id : null);
+    const vacant = key === 'review' && (!S.reviewHeldOf(docket) || !!(info && info.decision && info.decision.rule === 'vacant'));
+    // a held Review's waiting floor is the prototype's 'Being tested'
+    const floors = plan.floors.map((spec) => {
+      const fl = floorFor(spec, c);
+      if (!vacant && spec[2] && spec[2].held) fl.name = spec[2].held;
+      return fl;
+    });
     const order = { needs: 0, moving: 1, settled: 2 };
     const table = matters.slice().sort((a, b) => order[stateOf(a)] - order[stateOf(b)]).map((m) => {
       const s = stateOf(m), when = S.whenWord(m.deadline, c.now);
       return { key: String(m.id), matter: String(m.id), label: String(m.title || m.short || ''), status: s === 'needs' ? 'needs you' + (when ? ' · ' + when : '') : s === 'moving' ? 'moving' + (when ? ' · ' + when : '') : (when || 'settled'), state: s, color: s === 'needs' ? 'accent' : 'ink' };
     });
-    const record = recordOf(matters, c.now);
+    const history = docket && Array.isArray(docket.history) ? docket.history.filter((x) => x && x.building === key) : [];
+    const record = recordOf(matters, c.now, history);
     return {
       key: key, group: GROUPS[key], name: info && info.name ? String(info.name) : key.charAt(0).toUpperCase() + key.slice(1), holds: plan.holds,
       seats: h.seats, who: h.who, rule: h.rule, how: h.how, cap: plan.cap,
       growth: vacant ? plan.vacantGrowth : plan.growth,
       floors: floors, record: record,
-      onFile: !docket ? 'the docket could not be read just now' : matters.length ? matters.length + (matters.length === 1 ? ' matter' : ' matters') + ' on the docket' : 'nothing on file yet',
+      onFile: !docket ? 'the docket could not be read just now' : matters.length ? matters.length + (matters.length === 1 ? ' matter' : ' matters') + ' on the docket' + (history.length ? ' · ' + history.length + ' on the record' : '') : history.length ? history.length + ' on the record' : 'nothing on file yet',
       table: table, annex: !vacant && floors.length >= plan.cap ? plan.annex : null, vacant: vacant,
     };
   }

package/modules/hall-ui/public/street.css

@@ -240,6 +240,13 @@ html:has(body[data-page="street"]) { height: 100%; }
 .inside-glyph path + path { fill: none; stroke: var(--ink); stroke-width: 1.4; }
 .inside-textbtn { background: none; border: 0; padding: 6px 0; min-height: 24px; text-decoration: underline; text-underline-offset: 4px; font-family: var(--font-body); font-size: 14px; cursor: pointer; text-align: left; color: var(--street-accent-text); flex: none; }
 .inside-note { margin: 0; font-size: 13px; line-height: 1.45; color: var(--ink-soft); }
+/* change how this works: the drafted amendment (task 1004530) — the struck and
+   inserted words, then who, how and why, on the card's own form pieces */
+.inside-draft { display: flex; flex-direction: column; gap: 12px; padding: 14px 0 4px; border-top: 1px solid var(--street-rule); }
+.inside-draft[hidden] { display: none; }
+.inside-draft__change { gap: 6px; }
+.inside-draft__picks { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; }
+.inside-draft__fixed { font-size: 14px; line-height: 1.45; color: var(--ink-soft); min-height: 36px; display: flex; align-items: center; }
 .inside-meter { display: flex; flex-direction: column; gap: 6px; }
 .inside-meter__track { height: 6px; border-radius: 999px; background: var(--street-wash); overflow: hidden; }
 .inside-meter__fill { height: 6px; width: 0; background: color-mix(in srgb, var(--ink) 30%, var(--bg)); }
@@ -284,6 +291,7 @@ html:has(body[data-page="street"]) { height: 100%; }
 
 /* narrow: the drawing in its own sideways strip, the panel below it */
 @media (max-width: 899px) {
+  .inside-draft__picks { grid-template-columns: 1fr; }
   .inside { display: block; overflow-x: hidden; overflow-y: auto; }
   .inside-sizer { width: auto !important; height: auto !important; margin: 0; overflow: visible; }
   .inside-board { position: static; width: auto; height: auto; transform: none; display: flex; flex-direction: column; gap: 16px; padding: 8px 16px 24px; }

package/modules/hall-ui/public/street.html

@@ -138,9 +138,10 @@
           <svg class="inside-glyph" width="18" height="18" aria-hidden="true" focusable="false"><path id="insideGlyphF" d=""></path><path id="insideGlyphL" d=""></path></svg>
           <span class="inside-gov__text" id="insideHow"></span>
           <span class="inside-gov__fill"></span>
-          <button type="button" class="inside-textbtn" id="insideAmend" aria-describedby="insideAmendNote">change how this works</button>
+          <button type="button" class="inside-textbtn" id="insideAmend" aria-expanded="false" aria-controls="insideDraft">change how this works</button>
         </div>
         <p class="inside-note" id="insideAmendNote" role="status" hidden></p>
+        <div class="inside-draft" id="insideDraft" hidden></div>
         <div class="inside-meter">
           <div class="inside-meter__track"><div class="inside-meter__fill" id="insideFill"></div></div>
           <span class="inside-meter__line" id="insideGrowth"></span>
@@ -188,8 +189,9 @@
 
 <script src="/builders/city-draw.js?v=2026-10-02-street1"></script>
 <script src="/builders/street-draw.js?v=2026-10-02-street1"></script>
-<script src="/builders/street-card.js?v=2026-10-02-card1"></script>
+<script src="/builders/street-card.js?v=2026-10-02-amend1"></script>
 <script src="/builders/street-inside.js?v=2026-10-02-inside1"></script>
-<script src="/builders/street.js?v=2026-10-02-inside1"></script>
+<script src="/builders/street-amend.js?v=2026-10-02-amend1"></script>
+<script src="/builders/street.js?v=2026-10-02-amend1"></script>
 </body>
 </html>

package/modules/hall-ui/public/street.js

@@ -362,7 +362,7 @@
   function drawInside(h, mode) {
     var box = $('streetInside');
     var same = view.inside && view.inside.kind === h.kind && view.inside.key === h.key;
-    if (!same) view.inside = { kind: h.kind, key: h.key, floor: null, drawer: null, picks: 0, note: false };
+    if (!same) view.inside = { kind: h.kind, key: h.key, floor: null, drawer: null, picks: 0, draft: null };
     var arriving = box.hidden;
     box.hidden = false;
     box.setAttribute('data-kind', h.kind);
@@ -448,8 +448,7 @@
     if (gf) gf.setAttribute('d', bv.gf || '');
     if (gl) gl.setAttribute('d', bv.gl || '');
     setText('insideHow', bv.howText);
-    var note = $('insideAmendNote');
-    if (note) { note.textContent = st.note ? AMEND_NOTE : ''; note.hidden = !st.note; }
+    drawDraft(false);
     var fill = $('insideFill');
     if (fill) { fill.style.width = bv.fill + '%'; fill.className = 'inside-meter__fill' + (bv.fill >= 80 ? ' inside-meter__fill--full' : ''); }
     setText('insideGrowth', bv.growth);
@@ -528,14 +527,167 @@
     for (var k = 0; k < kids.length; k++) if (kids[k].getAttribute('data-floor') === String(i)) { if (kids[k].focus) kids[k].focus(); break; }
   }
 
-  // Change how this works: drafting the amendment is task 1004530. Until then
-  // the button is present and says so, rather than doing nothing silently.
-  var AMEND_NOTE = 'Drafting an amendment from here is not built yet. For now, raise it with the council on the board.';
+  // ---------- change how this works (task 1004530) ----------
+  // The button opens a drafted amendment to this building's row of the
+  // who-decides-what table: GovAmend (street-amend.js) builds the draft from the
+  // constitution as it stands (read fresh, so the struck words are the rule in
+  // force), this draws it — the struck and inserted words, who, which rule, why
+  // — and files it. The server's permission checks decide; a refusal is said in
+  // the draft, plainly. Filed, the street answers: a toast, back to the street,
+  // the Charter lights and its new pin settles. No settings page anywhere.
   function amend() {
-    if (!view.inside) return;
-    view.inside.note = true;
-    var note = $('insideAmendNote');
-    if (note) { note.textContent = AMEND_NOTE; note.hidden = false; }
+    var st = view.inside;
+    if (!st || st.kind !== 'building') return Promise.resolve(false);
+    if (st.draft) { closeDraft(); return Promise.resolve(false); }
+    var dr = st.draft = { d: null, error: '', busy: false, reading: true, rev: 1, drawn: 0 };
+    drawDraft(true);
+    return getJson(FEEDS.constitution).then(function (c) {
+      if (view.inside !== st || st.draft !== dr) return false;
+      if (c && c.board) data.constitution = c;
+      var A = window.GovAmend;
+      dr.reading = false;
+      dr.d = A ? A.draftFor(st.key, c && c.board ? c : null) : { ok: false, reason: 'unread' };
+      dr.rev++;
+      drawDraft(true);
+      var who = $('insideDraftWho');
+      if (who && who.focus) who.focus();
+      return !!(dr.d && dr.d.ok);
+    });
+  }
+  function closeDraft() {
+    var st = view.inside;
+    if (!st || !st.draft) return;
+    st.draft = null;
+    drawDraft(true);
+    var am = $('insideAmend');
+    if (am && am.focus) am.focus();
+  }
+  function bumpDraft(focusId) {
+    var dr = view.inside && view.inside.draft;
+    if (!dr) return;
+    dr.rev++;
+    drawDraft(true);
+    var el = focusId ? $(focusId) : null;
+    if (el && el.focus) el.focus();
+  }
+  function draftSelect(id, list, value, onPick) {
+    var sel = node('select', 'mcard-form__select');
+    sel.setAttribute('id', id);
+    list.forEach(function (o) {
+      var op = node('option', '', o.words);
+      op.setAttribute('value', o.value);
+      if (o.value === value) op.setAttribute('selected', '');
+      sel.appendChild(op);
+    });
+    sel.value = value == null ? '' : value;
+    sel.addEventListener('change', function () { onPick(sel.value); });
+    return sel;
+  }
+  function draftField(labelText, forId, control) {
+    var f = node('div', 'mcard-form');
+    var l = node(forId ? 'label' : 'span', 'mcard-form__label', labelText);
+    if (forId) l.setAttribute('for', forId);
+    f.appendChild(l);
+    f.appendChild(control);
+    return f;
+  }
+  // Draw the draft into #insideDraft. A redraw of the building leaves an
+  // unchanged draft alone (force false), so a feed landing mid-sentence never
+  // takes the governor's place in the form.
+  function drawDraft(force) {
+    var st = view.inside, box = $('insideDraft'), note = $('insideAmendNote'), am = $('insideAmend');
+    var dr = st && st.draft;
+    if (am) am.setAttribute('aria-expanded', dr ? 'true' : 'false');
+    if (note) {
+      var said = !dr ? '' : dr.reading ? 'Reading how this building decides…' : dr.d && dr.d.ok ? '' : 'How this building decides could not be read just now.';
+      note.textContent = said;
+      note.hidden = !said;
+    }
+    if (!box) return;
+    if (!dr || !dr.d || !dr.d.ok) { box.hidden = true; clear(box); return; }
+    if (!force && dr.drawn === dr.rev) return;
+    dr.drawn = dr.rev;
+    var A = window.GovAmend, d = dr.d;
+    clear(box);
+    box.hidden = false;
+    box.appendChild(node('span', 'street-label', 'drafted amendment · ' + d.name));
+    var rows = A.change(d);
+    var ch = node('div', 'mcard-change inside-draft__change');
+    if (rows.length) {
+      rows.forEach(function (r) {
+        var p = node('p', 'mcard-change__row');
+        p.appendChild(node('span', 'mcard-change__label', r.label));
+        if (r.struck) p.appendChild(node('del', 'mcard-del', r.struck));
+        p.appendChild(node('ins', 'mcard-ins', r.inserted));
+        ch.appendChild(p);
+      });
+    } else ch.appendChild(node('p', 'inside-note', 'This is how it works today. Pick who decides, or how, to change it.'));
+    box.appendChild(ch);
+    var picks = node('div', 'inside-draft__picks');
+    picks.appendChild(draftField('who decides', 'insideDraftWho', draftSelect('insideDraftWho', d.whoOptions, d.decided_by, function (v) {
+      dr.d = A.pick(dr.d, 'who', v); dr.error = ''; bumpDraft('insideDraftWho');
+    })));
+    if (d.ruleOptions.length) {
+      picks.appendChild(draftField('how they decide', 'insideDraftRule', draftSelect('insideDraftRule', d.ruleOptions, d.rule, function (v) {
+        dr.d = A.pick(dr.d, 'rule', v); dr.error = ''; bumpDraft('insideDraftRule');
+      })));
+    } else {
+      picks.appendChild(draftField('how they decide', null, node('span', 'inside-draft__fixed', d.decided_by === 'nobody' ? 'nothing is decided until someone holds it' : 'decides alone, as today')));
+    }
+    box.appendChild(picks);
+    var why = node('textarea', 'mcard-form__text');
+    why.setAttribute('id', 'insideDraftWhy');
+    why.setAttribute('rows', '3');
+    why.setAttribute('maxlength', '5000');
+    why.value = d.reason;
+    why.addEventListener('input', function () { dr.d = A.pick(dr.d, 'reason', why.value); });
+    box.appendChild(draftField('why', 'insideDraftWhy', why));
+    box.appendChild(node('p', 'inside-note', 'Filed, it goes on the Charter and the council votes on it there.'));
+    if (dr.error) {
+      var err = node('p', 'mcard-error', dr.error);
+      err.setAttribute('role', 'alert');
+      err.setAttribute('id', 'insideDraftError');
+      box.appendChild(err);
+    }
+    var acts = node('div', 'mcard-actions');
+    var file = node('button', 'mcard-btn mcard-btn--primary', dr.busy ? 'filing…' : 'file the amendment');
+    file.setAttribute('type', 'button');
+    file.setAttribute('id', 'insideDraftFile');
+    if (dr.busy) file.setAttribute('disabled', '');
+    file.addEventListener('click', fileDraft);
+    acts.appendChild(file);
+    var not = node('button', 'mcard-btn mcard-btn--quiet', 'not now');
+    not.setAttribute('type', 'button');
+    not.addEventListener('click', closeDraft);
+    acts.appendChild(not);
+    box.appendChild(acts);
+  }
+  function fileDraft() {
+    var A = window.GovAmend, st = view.inside, dr = st && st.draft;
+    if (!A || !dr || !dr.d || dr.busy) return Promise.resolve(false);
+    var why = $('insideDraftWhy');
+    if (why && why.value != null) dr.d = A.pick(dr.d, 'reason', why.value);
+    var refused = A.check(dr.d);
+    if (refused) { dr.error = refused; bumpDraft(refused.indexOf('Say why') === 0 ? 'insideDraftWhy' : 'insideDraftWho'); return Promise.resolve(false); }
+    dr.error = '';
+    dr.busy = true;
+    bumpDraft(null);
+    return send(A.request(dr.d)).then(function (out) {
+      dr.busy = false;
+      if (!out.ok) {
+        dr.error = A.refusal(out.status, out.body);
+        if (view.inside === st && st.draft === dr) bumpDraft('insideDraftFile');
+        return false;
+      }
+      var a = A.answer(dr.d, out.body);
+      say(a.toast);
+      if (view.inside === st) st.draft = null;
+      card.answer = { building: a.building, matter: a.matter, kind: a.kind, at: Date.now() };
+      data.room = null;
+      data.constitution = null;
+      goStreet();
+      return load().then(function () { return true; });
+    });
   }
 
   function drawDistrict(mode) {
@@ -744,6 +896,7 @@
 
   function onKey(e) {
     if (e.key === 'Escape' && view.open) { e.preventDefault(); closeCard(true); }
+    else if (e.key === 'Escape' && view.inside && view.inside.draft) { e.preventDefault(); closeDraft(); }
   }
 
   function boot() {
@@ -767,6 +920,6 @@
     return load();
   }
 
-  window.GovStreetPage = { boot: boot, draw: draw, load: load, fit: fit, openCard: openCard, closeCard: closeCard, actOn: actOn, pickFloor: pickFloor, goStreet: goStreet, FEEDS: FEEDS, THEME_KEY: THEME_KEY };
+  window.GovStreetPage = { boot: boot, draw: draw, load: load, fit: fit, openCard: openCard, closeCard: closeCard, actOn: actOn, pickFloor: pickFloor, goStreet: goStreet, amend: amend, fileDraft: fileDraft, FEEDS: FEEDS, THEME_KEY: THEME_KEY };
   window.GovStreetPage.ready = boot();
 }());

package/modules/hall-ui/public/street.states.json

@@ -3,7 +3,10 @@
   "page": "/builders/street",
   "surface": "hall-ui",
   "stub": {
-    "prefix": "/builders/"
+    "prefix": "/builders/",
+    "fixtures": {
+      "government-constitution": "government-constitution-rules"
+    }
   },
   "modeQuery": false,
   "ignoreRequests": [
@@ -311,8 +314,8 @@
     },
     "amend": {
       "auth": true,
-      "_": "Change how this works pressed: it says, in words, that drafting an amendment from here is not built yet (task 1004530).",
-      "url": "/builders/street#building=charter",
+      "_": "Change how this works pressed inside Review: the drafted amendment to its row, the rule in force struck and the proposed one inserted, who and how to pick, why, and file (task 1004530).",
+      "url": "/builders/street#building=review",
       "actions": [
         [
           "wait",
@@ -324,12 +327,16 @@
         ],
         [
           "wait",
-          200
+          600
         ]
       ],
       "expect": {
         "visible": [
-          "#insideAmendNote"
+          "#insideDraft",
+          "#insideDraftWho",
+          "#insideDraftRule",
+          "#insideDraftWhy",
+          "#insideDraftFile"
         ]
       }
     },