@bongos/core 1.21.5 → 1.21.6

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

@@ -0,0 +1,177 @@
+// modules/hall-ui/public/city.js — THE GOVERNOR CITY's home, wired (task
+// 1004524, goal 1000125, R02).
+//
+// city-draw.js computes the city as data; this file reads the three feeds,
+// hands them to GovCity.cityModel(), and turns its lists into DOM: SVG paths
+// for the ground and the buildings, one span per parcel (CSS offset-path) and
+// one per pin. It also owns the sun/moon switch and the stage's fit to the
+// window. No innerHTML anywhere: every node is created, and every docket string
+// lands as text or an attribute.
+//
+// THE FEEDS (all GETs, all gated server-side):
+//   /api/bongos/government/docket  the pins and the one line (task 1004523)
+//   /api/bongos/goals              the open goals: one district each
+//   /api/bongos/goals/rollups      each goal's task counts: a building per task
+// A feed that fails leaves its part of the city out (no pins, or no districts)
+// and the line says the docket could not be read; it never draws sample data.
+//
+// THE SWITCH. Light and dark use the hall's own preference ('hall-theme' in
+// localStorage, else the OS setting) and the hall's own attribute
+// (html[data-theme]), so the city opens in the mode every other hall page is
+// in, and a change here carries back to them. The drawing's faces come from
+// the mode, so a toggle redraws the city from the last feeds (no refetch).
+//
+// MOTION is CSS only (city.css); nothing here animates. The scale write on
+// resize is layout, not motion.
+
+(function () {
+  'use strict';
+  var City = window.GovCity;
+  var SVG_NS = 'http://www.w3.org/2000/svg';
+  var THEME_KEY = 'hall-theme';
+  var SUN = 'M7 1.5V3M7 11v1.5M1.5 7H3M11 7h1.5M3.1 3.1l1 1M9.9 9.9l1 1M3.1 10.9l1-1M9.9 4.1l1-1M9.5 7A2.5 2.5 0 1 1 4.5 7A2.5 2.5 0 1 1 9.5 7Z';
+  var MOON = 'M11.5 8.6A5 5 0 0 1 5.4 2.5A5 5 0 1 0 11.5 8.6Z';
+  var FEEDS = {
+    docket: '/api/bongos/government/docket',
+    goals: '/api/bongos/goals',
+    rollups: '/api/bongos/goals/rollups',
+  };
+
+  var $ = function (id) { return document.getElementById(id); };
+  var media = window.matchMedia ? window.matchMedia('(prefers-color-scheme: dark)') : null;
+  var data = { docket: null, goals: [], rollups: [], loaded: false };
+
+  // ---------- light / dark ----------
+  // A choice made on this page when storage is blocked (private mode) still
+  // holds for this page view.
+  var chosen = null;
+  function storedTheme() {
+    try { var v = window.localStorage.getItem(THEME_KEY); if (v === 'dark' || v === 'light') return v; } catch (_) { /* blocked */ }
+    return chosen;
+  }
+  function effectiveTheme() { return storedTheme() || (media && media.matches ? 'dark' : 'light'); }
+  function applyTheme() {
+    var t = effectiveTheme();
+    document.documentElement.setAttribute('data-theme', t);
+    var btn = $('cityMode');
+    var label = t === 'dark' ? 'Switch to light mode' : 'Switch to dark mode';
+    if (btn) { btn.setAttribute('aria-label', label); btn.setAttribute('title', label); }
+    var icon = $('cityModeIcon');
+    if (icon) icon.setAttribute('d', t === 'dark' ? SUN : MOON);
+    return t;
+  }
+  function toggleTheme() {
+    var next = effectiveTheme() === 'dark' ? 'light' : 'dark';
+    chosen = next;
+    try { window.localStorage.setItem(THEME_KEY, next); } catch (_) { /* private mode: this page only */ }
+    draw(applyTheme());
+  }
+
+  // ---------- fit the 1440 x 900 artboard to the window ----------
+  // 1440 x 900 is scale 1, the prototype exactly. Narrower or shorter, the
+  // city (960 px wide on the artboard) shrinks to fit; wider and taller, it grows.
+  function fit() {
+    var stage = $('cityStage');
+    if (!stage) return;
+    var w = window.innerWidth || 1440, h = window.innerHeight || 900;
+    var s = Math.min(w / 1000, h / 900);
+    stage.style.setProperty('--city-scale', String(Math.round(s * 1000) / 1000));
+  }
+
+  // ---------- the feeds ----------
+  function getJson(url) {
+    return fetch(url, { credentials: 'same-origin', headers: { accept: 'application/json' } })
+      .then(function (r) { return r && r.ok ? r.json() : null; })
+      .catch(function () { return null; });
+  }
+  function load() {
+    return Promise.all([getJson(FEEDS.docket), getJson(FEEDS.goals), getJson(FEEDS.rollups)]).then(function (res) {
+      data.docket = res[0] && Array.isArray(res[0].matters) ? res[0] : null;
+      data.goals = res[1] && Array.isArray(res[1].goals) ? res[1].goals : [];
+      data.rollups = res[2] && Array.isArray(res[2].rollups) ? res[2].rollups : [];
+      data.loaded = true;
+      draw(effectiveTheme());
+    });
+  }
+
+  // ---------- drawing ----------
+  function clear(el) { while (el && el.firstChild) el.removeChild(el.firstChild); }
+  function pathEl(p) {
+    var el = document.createElementNS(SVG_NS, 'path');
+    el.setAttribute('d', p.d);
+    el.setAttribute('fill', p.f);
+    el.setAttribute('stroke', p.s);
+    if (p.dash && p.dash !== 'none') el.setAttribute('stroke-dasharray', p.dash);
+    el.setAttribute('stroke-width', String(p.w || 1));
+    return el;
+  }
+  function span(cls) { var el = document.createElement('span'); el.className = cls; return el; }
+
+  function drawPin(pin) {
+    var el = span('city-pin city-pin--' + pin.state);
+    el.setAttribute('data-matter', pin.key);
+    el.setAttribute('data-building', pin.building);
+    el.style.left = pin.x + 'px';
+    el.style.top = pin.y + 'px';
+    el.style.height = pin.h + 'px';
+    el.style.animationDelay = pin.delay + 's';
+    var head = span('city-pin__head');
+    if (pin.state === 'needs') head.appendChild(span('city-pin__ring'));
+    var svg = document.createElementNS(SVG_NS, 'svg');
+    svg.setAttribute('width', '14');
+    svg.setAttribute('height', '14');
+    var fill = document.createElementNS(SVG_NS, 'path');
+    fill.setAttribute('d', pin.gf || '');
+    var line = document.createElementNS(SVG_NS, 'path');
+    line.setAttribute('d', pin.gl || '');
+    svg.appendChild(fill);
+    svg.appendChild(line);
+    head.appendChild(svg);
+    el.appendChild(head);
+    el.appendChild(span('city-pin__stem'));
+    return el;
+  }
+
+  function drawParcel(pc) {
+    var el = span(pc.out ? 'city-parcel city-parcel--out' : 'city-parcel');
+    el.style.offsetPath = "path('" + pc.d + "')";
+    el.style.animationDuration = pc.dur + 's';
+    el.style.animationDelay = pc.delay + 's';
+    return el;
+  }
+
+  function draw(mode) {
+    var model = City.cityModel({ docket: data.docket, goals: data.goals, rollups: data.rollups, mode: mode });
+    var flat = $('cityFlat'), blds = $('cityBlds'), parcels = $('cityParcels'), pins = $('cityPins');
+    clear(flat); clear(blds); clear(parcels); clear(pins);
+    model.flat.forEach(function (p) { flat.appendChild(pathEl(p)); });
+    model.blds.forEach(function (b) {
+      var g = document.createElementNS(SVG_NS, 'g');
+      g.setAttribute('data-key', b.key);
+      b.polys.forEach(function (p) { g.appendChild(pathEl(p)); });
+      blds.appendChild(g);
+    });
+    model.parcels.forEach(function (pc) { parcels.appendChild(drawParcel(pc)); });
+    model.pins.forEach(function (pin) { pins.appendChild(drawPin(pin)); });
+    var lineEl = $('cityLine');
+    if (lineEl && data.loaded) lineEl.textContent = model.line;
+    var stage = $('cityStage');
+    if (stage) stage.setAttribute('aria-label', model.label);
+    return model;
+  }
+
+  function boot() {
+    var start = $('cityStart');
+    if (start) start.setAttribute('href', City.STREET_HREF);
+    var btn = $('cityMode');
+    if (btn) btn.addEventListener('click', toggleTheme);
+    if (media && media.addEventListener) media.addEventListener('change', function () { if (!storedTheme()) draw(applyTheme()); });
+    window.addEventListener('resize', fit);
+    fit();
+    draw(applyTheme());
+    return load();
+  }
+
+  window.GovCityPage = { boot: boot, draw: draw, load: load, fit: fit, FEEDS: FEEDS, THEME_KEY: THEME_KEY };
+  window.GovCityPage.ready = boot();
+}());

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

@@ -0,0 +1,30 @@
+{
+  "_": "THE GOVERNOR CITY's home (task 1004524, goal 1000125) through modules/ui-design/kit/render.js. The page draws GET /government/docket, GET /goals and GET /goals/rollups; against the kit's own stub none exists, so every state renders the city with no districts and no pins and the line saying the docket could not be read: a real state the floors must hold in. To look at the populated city, run it against the hall-preview harness, whose government__docket.json fixture carries the reference design's seven sample matters (3 need you, 2 moving, 2 settled) and whose goals fixtures carry the open goals:\n\n  node scripts/hall-preview/server.js --port 4624 --fixture-me\n  node modules/ui-design/kit/render.js --states modules/hall-ui/public/city.states.json --base-in http://localhost:4624 --base-out http://localhost:4624\n\nThe page follows the OS mode until the switch is pressed (then the hall's own 'hall-theme' preference), so the kit's dark/light emulation renders both modes.",
+  "page": "/builders/city",
+  "surface": "hall-ui",
+  "stub": { "prefix": "/builders/" },
+  "modeQuery": false,
+  "ignoreRequests": ["/api/(gds|bongos)/", "fonts\\.g(oogleapis|static)\\.com"],
+  "ignoreConsole": ["/api/(gds|bongos)/", "\\b401\\b", "\\b403\\b", "\\b404\\b", "Unauthorized", "Forbidden", "Not Found", "load failed", "fonts\\.g(oogleapis|static)\\.com"],
+  "states": {
+    "city": {
+      "auth": true,
+      "_": "The home: the wordmark, the switch, the city, start governing and the one line.",
+      "actions": [["wait", 900]],
+      "expect": { "visible": ["#cityStage", "#cityStart", "#cityLine", "#cityMode"], "href": [["#cityStart", "/builders/street"]] }
+    },
+    "switched": {
+      "auth": true,
+      "_": "The sun/moon switch pressed once: the other mode, the city redrawn in it.",
+      "actions": [["wait", 600], ["click", "#cityMode"], ["wait", 400]],
+      "expect": { "visible": ["#cityStage", "#cityStart"] }
+    },
+    "focus": {
+      "auth": true,
+      "_": "Keyboard: the start button focused, its ring drawn.",
+      "actions": [["wait", 600], ["focus", "#cityStart"], ["wait", 100]],
+      "expect": { "activeId": "cityStart" }
+    }
+  },
+  "reducedMotion": { "auth": true, "actions": [["wait", 600]] }
+}

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

@@ -259,8 +259,10 @@
   // decides what dead means and the route attaches it — so this page and any
   // future alert cannot drift into two definitions of the same word. These are
   // only the order to pick the runner to describe in, and the colour of its dot.
-  const HEALTH_RANK = { alive: 0, late: 1, restarting: 2, dead: 3, never_seen: 4 };
-  const HEALTH_DOT = { alive: 'ok', late: 'ok', restarting: 'info', dead: 'danger', never_seen: 'info' };
+  // idle_config (task 1004539): talking, but idle on a setting the owner can fix —
+  // it carries the fix as `remedy`, and draws as a warning, never as "ok".
+  const HEALTH_RANK = { alive: 0, late: 1, idle_config: 2, restarting: 3, dead: 4, never_seen: 5 };
+  const HEALTH_DOT = { alive: 'ok', late: 'ok', idle_config: 'warn', restarting: 'info', dead: 'danger', never_seen: 'info' };
 
   // The panel is drawn from both reads at once; each is kept so a write that only
   // reloads one of them redraws with the other's last answer.
@@ -284,7 +286,7 @@
   // `project`, and then there is no second layer to check.
   function readiness(runner, fence, mine) {
     const h = (runner && runner.health) || {};
-    const connected = ['alive', 'late', 'restarting'].includes(h.state);
+    const connected = ['alive', 'late', 'restarting', 'idle_config'].includes(h.state);
     const goals = (fence && fence.goals) || [];
     const items = [];
     if (!runner) {
@@ -316,6 +318,11 @@
     if (mine && fence && fence.enabled && mine.enabled === false && (mine.goals || []).length) {
       items.push({ key: 'mine-stop', state: 'todo', text: 'Your runner is held', hint: mine.paused_reason || 'It is not allowed to take work right now.' });
     }
+    // The runner's own word that a setting is holding it (task 1004539) — the one
+    // the fence read cannot see: an unreadable fence or a gauge with no reading.
+    if (h.state === 'idle_config') {
+      items.push({ key: 'config-idle', state: 'todo', text: h.why ? `Idle because ${h.why}` : 'Idle because of a setting', hint: h.remedy || '' });
+    }
     return { items, ready: !items.some((i) => i.state === 'todo') };
   }
 
@@ -535,7 +542,7 @@
       : 'has picked no goals, so their runner takes no work';
     const beats = (b.runners || []).map((r) => {
       const h = r.health || {};
-      const label = { dead: 'not checking in', late: 'quiet', alive: 'checking in', restarting: 'restarting' }[h.state] || 'unknown';
+      const label = { dead: 'not checking in', late: 'quiet', alive: 'checking in', restarting: 'restarting', idle_config: `idle on a setting — ${h.remedy || 'see Settings'}` }[h.state] || 'unknown';
       return `<span class="ov-fact"><span class="rn-dot rn-dot--sm rn-dot--${HEALTH_DOT[h.state] || 'info'}" aria-hidden="true"></span> ${escapeHtml(h.host || r.host || '')} ${escapeHtml(label)}</span>`;
     }).join('');
     const paused = b.owner_paused === true;

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

@@ -276,3 +276,7 @@
 @media (max-width: 640px) {
   .pg-ba { grid-template-columns: minmax(0, 1fr); }
 }
+
+/* The cross-project section's second band (task 1004440): each craft's own
+   numbers under the totals, the same glass, held apart by the scroll's own gap. */
+#xp-scroll .stat-row--craft { margin-top: 12px; }

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

@@ -331,6 +331,29 @@
     return `<tr><td>${nameCell}</td><td>${held}</td></tr>`;
   }
 
+  // Each craft's own numbers across every project (task 1004440 / WA6.RP10): an
+  // artist's approved pages and an ideator's thoughts, so neither reads on the hub
+  // as an engineer with nothing shipped. The hub sends a craft only once the
+  // builder has earned credits in it, so an absent craft has no tile. A count no
+  // project could report is a dash, never 0 ("could not ask" is not "nothing
+  // there"). The words are the role-shaped profile's own (profile-roles.js).
+  function xpCount(n) {
+    return Number.isInteger(n) && n >= 0 ? fmtNum(n) : '—';
+  }
+  function xpCraftTiles(crafts) {
+    if (!crafts || typeof crafts !== 'object') return '';
+    const out = [];
+    const artist = crafts.artist;
+    if (artist && typeof artist === 'object') out.push(tile('Pages approved', xpCount(artist.pages_approved), 'as an artist'));
+    const ideator = crafts.ideator;
+    if (ideator && typeof ideator === 'object') {
+      out.push(tile('Thoughts filed', xpCount(ideator.filed), 'as an ideator'));
+      const ratified = Number.isInteger(ideator.ratified) ? `${fmtNum(ideator.ratified)} ratified by the board` : '';
+      out.push(tile('Full Ideas', xpCount(ideator.full_ideas), ratified));
+    }
+    return out.length ? `<div class="stat-row stat-row--craft">${out.join('')}</div>` : '';
+  }
+
   function renderCrossProject(data, selfId) {
     const section = $('#xp-scroll');
     const body = $('#xp-body');
@@ -357,7 +380,8 @@
       tile('Works shipped', fmtNum(t.works_shipped)) +
       tile('Credits', fmtNum(t.credits)) +
       tile('Karma', fmtNum(t.karma)) +
-      `</div>`;
+      `</div>` +
+      xpCraftTiles(cp.crafts);
     const discs = Array.isArray(cp.disciplines) ? cp.disciplines.filter((d) => typeof d === 'string') : [];
     const metaBits = [];
     if (discs.length) metaBits.push(`${window.OTB.roleAxisLabel()}s: ${discs.map((d) => window.OTB.roleLabel(d)).join(', ')}`);

package/modules/hall-ui/public/settings-autobongos.js

@@ -38,6 +38,14 @@
     const project = fence.project || {};
     const scope = fence.scope || {};
     const out = [];
+    // First, because it is the one that has already cost time: a runner of yours
+    // that has been idle on a setting past its grace (task 1004539). The verdict
+    // and the fix are the server's (runner-health.js); this only draws them.
+    for (const r of myRunners) {
+      const h = r.health || {};
+      if (h.state !== 'idle_config') continue;
+      out.push(`<strong>Your runner${h.host ? ` on ${escapeHtml(h.host)}` : ''} is idle</strong> because ${escapeHtml(h.why || 'of a setting')}. ${escapeHtml(h.remedy || '')}`);
+    }
     if (project.enabled !== true) {
       out.push(`The project's runner switch is off right now${project.paused_reason ? `: ${escapeHtml(project.paused_reason)}` : ''}. Your choices are kept and apply when it is back on.`);
     }
@@ -62,6 +70,16 @@
   }
   const goalLabel = (id) => goalNames.get(Number(id)) || `Goal ${id}`;
 
+  // The caller's own runners, with the server's health verdict attached. Best-
+  // effort like the names: a failed read just means no runner warning is drawn.
+  let myRunners = [];
+  async function loadMyRunners() {
+    try {
+      const res = await api.request('GET', `${API}/autonomy/runners`);
+      if (res.ok && res.data && Array.isArray(res.data.runners)) myRunners = res.data.runners;
+    } catch (_) { /* the picker works without it */ }
+  }
+
   function render(fence) {
     const body = $('#autobongos-body');
     if (!body) return;
@@ -138,7 +156,7 @@
     const section = $('#autobongos-scroll');
     if (!section) return;
     try {
-      const [fence] = await Promise.all([load(), loadGoalNames()]);
+      const [fence] = await Promise.all([load(), loadGoalNames(), loadMyRunners()]);
       if (!fence) return;
       render(fence);
       section.hidden = false;

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

@@ -327,3 +327,29 @@ select.voices__select { min-width: 140px; }
   text-underline-offset: 3px;
 }
 .su-entries a:hover { color: var(--ink); text-decoration-color: currentColor; }
+
+/* ---- MAIN ROLE (task 1004541) -------------------------------------------- */
+/* A sub-group of Preferred roles: the shell's chip control with a RADIO in it.
+   The 24px target and 14px drawn mark are panel.css's; only the shape changes
+   (a ring, and a dot when chosen), so a choice of one never reads as a tick. */
+.craft-main { border: 0; margin: var(--sp-sm) 0 0; padding: 0; min-width: 0; }
+.craft-main__h {
+  padding: 0;
+  font-family: var(--label-face);
+  font-size: var(--label-size);
+  letter-spacing: var(--label-space);
+  text-transform: var(--label-case);
+  color: var(--ink-faint);
+}
+.craft-main__lede { margin: 6px 0 0; font-size: 13.5px; color: var(--ink-soft); max-width: 62ch; }
+.craft-main .chip-ctl input::before { border-radius: 50%; }
+.craft-main .chip-ctl input:checked::after {
+  left: 9px;
+  top: 9px;
+  width: 6px;
+  height: 6px;
+  border: 0;
+  border-radius: 50%;
+  background: var(--accent-on);
+  transform: none;
+}

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

@@ -118,6 +118,14 @@
                 choices — pick one, several, or none.
               </p>
               <div class="craft-chips" id="craft-chips"></div>
+              <!-- MAIN ROLE (task 1004541): which of the roles above leads your
+                   profile, its tabs and your leaderboard entry. Saved with the
+                   chips, in the same PATCH (main_discipline). -->
+              <fieldset class="craft-main" id="craft-main">
+                <legend class="craft-main__h">Main role</legend>
+                <p class="craft-main__lede">Your main role leads your profile and your leaderboard entry. Let your work decide, and it is the role you have earned the most in.</p>
+                <div class="chips" id="craft-main-opts"></div>
+              </fieldset>
               <div class="craft-actions">
                 <button type="button" class="craft-save" id="craft-save">Save</button>
                 <span class="settings-status" id="craft-status" role="status" aria-live="polite"></span>

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

@@ -516,7 +516,10 @@
 
   // Current selection mutated in place as the builder toggles chips; saved on
   // the "Save" button (the hall's profile card behaviour) via PATCH.
-  const craft = { selected: new Set() };
+  // `main` (task 1004541) is the builder's chosen MAIN role, one of the ticked
+  // roles, or null for "let my work decide" (the profile then leads with the
+  // craft earned most in — src/bongos/role-stats.js resolveMainRole).
+  const craft = { selected: new Set(), main: null };
 
   function renderCraft() {
     const wrap = $('#craft-chips');
@@ -529,6 +532,29 @@
         `${escapeHtml(window.OTB.roleLabel(d))}</label>`
       );
     }).join('');
+    renderCraftMain();
+  }
+
+  // The main-role choice: "Let my work decide", then each role ticked above. A
+  // role can only lead once it is one of your roles (the server refuses
+  // otherwise), so unticking the main role hands the choice back to your work —
+  // the same thing the server does when that role leaves the set.
+  const MAIN_BY_WORK = 'Let my work decide';
+  function renderCraftMain() {
+    const wrap = $('#craft-main-opts');
+    if (!wrap) return;
+    if (craft.main && !craft.selected.has(craft.main)) craft.main = null;
+    const opts = [{ value: '', label: MAIN_BY_WORK }].concat(
+      DISCIPLINES.filter((d) => craft.selected.has(d)).map((d) => ({ value: d, label: window.OTB.roleLabel(d) })),
+    );
+    wrap.innerHTML = opts.map((o) => {
+      const on = (craft.main || '') === o.value;
+      return (
+        `<label class="chip-ctl craft-main__opt">` +
+        `<input type="radio" name="craft-main" class="craft-main-pick" value="${escapeHtml(o.value)}"${on ? ' checked' : ''}>` +
+        `${escapeHtml(o.label)}</label>`
+      );
+    }).join('');
   }
 
   async function saveCraft() {
@@ -538,7 +564,10 @@
     if (btn) { btn.disabled = true; btn.textContent = 'Saving…'; }
     if (status) status.textContent = '';
     try {
-      const res = await api.request('PATCH', `${API}/me/disciplines`, { body: { preferred_disciplines: selected } });
+      const main = craft.main && selected.includes(craft.main) ? craft.main : null;
+      const res = await api.request('PATCH', `${API}/me/disciplines`, {
+        body: { preferred_disciplines: selected, main_discipline: main },
+      });
       if (res.status === 401) { toAuth(); return; }
       if (!res.ok) throw new Error(`disciplines PATCH → ${res.status}`);
       const data = res.data;
@@ -547,8 +576,10 @@
         ? data.builder.preferred_disciplines
         : selected;
       craft.selected = new Set(prefs.filter((d) => DISCIPLINES.includes(d)));
+      craft.main = data?.builder && 'main_discipline' in data.builder ? (data.builder.main_discipline || null) : main;
       renderCraft();
-      const msg = selected.length ? `Preferred work: ${selected.join(', ')}.` : 'Preference cleared.';
+      const leads = craft.main ? ` Main role: ${window.OTB.roleLabel(craft.main)}.` : '';
+      const msg = (selected.length ? `Preferred work: ${selected.join(', ')}.` : 'Preference cleared.') + leads;
       if (status) status.textContent = msg;
       toast(msg);
     } catch (err) {
@@ -570,6 +601,14 @@
         else craft.selected.delete(box.value);
         const chip = box.closest('.craft-chip');
         if (chip) chip.dataset.on = box.checked ? '1' : '0';
+        renderCraftMain();
+      });
+    }
+    const mainWrap = $('#craft-main-opts');
+    if (mainWrap) {
+      mainWrap.addEventListener('change', (e) => {
+        const pick = e.target.closest('.craft-main-pick');
+        if (pick) craft.main = pick.value || null;
       });
     }
     const btn = $('#craft-save');
@@ -1176,6 +1215,7 @@
     // Seed craft state from the /me payload, then render + reveal that section.
     const prefs = Array.isArray(builder.preferred_disciplines) ? builder.preferred_disciplines : [];
     craft.selected = new Set(prefs.filter((d) => DISCIPLINES.includes(d)));
+    craft.main = typeof builder.main_discipline === 'string' ? builder.main_discipline : null;
     renderCraft();
     wireCraft();
     $('#craft-scroll').hidden = false;

package/modules/platform-identity/craft-rollup.js

@@ -0,0 +1,72 @@
+// modules/platform-identity/craft-rollup.js — each craft by its own work, on the
+// hub (task 1004440 / WA6.RP10, goal 1000095, criterion
+// wa6-roles-read-true-in-public).
+//
+// A reporting instance sends, per craft the builder has EARNED credits in, that
+// craft's headline counts (src/bongos/auth-admission.js readCraftRollup):
+//
+//   engineer  { shipped, credits }
+//   artist    { pages_approved, credits }
+//   ideator   { filed, full_ideas, ratified, credits }
+//
+// Two halves live here, next to each other so they cannot disagree on the shape:
+//
+//   sanitizeCrafts — what upsertActivity BINDS. The report is third-party
+//     self-report (ADR 0171 D7), so the shape and the caps are the hub's, not
+//     the sender's: only the three crafts, only the named counts, each a
+//     non-negative integer under a ceiling or null. Anything else is dropped.
+//     A count is never text, so nothing here can carry a title or wording.
+//
+//   sumCrafts — the cross-project aggregate getRollupForBuilder returns. Summed
+//     over EVERY project row, named or not, exactly as the totals are: "the
+//     aggregate is not the leak, the name is" (ADR 0171 D2). It adds no field a
+//     hidden or private account could reach — it rides the same rollup
+//     predicate as credits and works shipped (account-visibility.js), and the
+//     recruiter sliver is untouched (ADR 0215: a ceiling, not a step).
+//
+// A craft appears in the sum when any project reported it. A count is null in the
+// sum only when no project could report it ("could not ask"), never because one
+// project could not while another could.
+'use strict';
+
+const CRAFT_FIELDS = Object.freeze({
+  engineer: Object.freeze(['shipped', 'credits']),
+  artist: Object.freeze(['pages_approved', 'credits']),
+  ideator: Object.freeze(['filed', 'full_ideas', 'ratified', 'credits']),
+});
+// Far above any honest count, low enough that a sum over every project stays a
+// safe integer and a hostile report cannot dominate a profile by one number.
+const MAX_CRAFT_COUNT = 10_000_000;
+
+function cleanCount(v) {
+  return Number.isInteger(v) && v >= 0 && v <= MAX_CRAFT_COUNT ? v : null;
+}
+
+function sanitizeCrafts(raw) {
+  const out = {};
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return out;
+  for (const [craft, fields] of Object.entries(CRAFT_FIELDS)) {
+    const block = raw[craft];
+    if (!block || typeof block !== 'object' || Array.isArray(block)) continue;
+    const clean = {};
+    for (const f of fields) clean[f] = cleanCount(block[f]);
+    out[craft] = clean;
+  }
+  return out;
+}
+
+function sumCrafts(rows) {
+  const out = {};
+  for (const row of Array.isArray(rows) ? rows : []) {
+    const crafts = sanitizeCrafts(row);
+    for (const [craft, block] of Object.entries(crafts)) {
+      const acc = out[craft] || (out[craft] = Object.fromEntries(CRAFT_FIELDS[craft].map((f) => [f, null])));
+      for (const f of CRAFT_FIELDS[craft]) {
+        if (block[f] != null) acc[f] = (acc[f] || 0) + block[f];
+      }
+    }
+  }
+  return out;
+}
+
+module.exports = { sanitizeCrafts, sumCrafts };

package/modules/platform-identity/migrations/platform_identity_029_activity_crafts.sql

@@ -0,0 +1,23 @@
+-- platform_identity_029_activity_crafts.sql — each craft's own numbers on a
+-- builder's activity row (task 1004440 / WA6.RP10, goal 1000095).
+--
+-- WHY. A rollup carried one ship count and a "Roles" list taken from the declared
+-- preference, so on the hub profile an artist with forty approved pages, or an
+-- ideator whose ideas the board ratified, read as an engineer with nothing
+-- shipped. A reporting instance now sends, for each craft the builder has earned
+-- credits in, that craft's headline counts (an artist's approved pages; an
+-- ideator's filed, Full and ratified ideas; an engineer's shipped works).
+--
+-- WHAT. One jsonb column, the sanitised `crafts` object (craft-rollup.js shapes and
+-- caps it before it is bound — never the raw body). '{}' is "no craft numbers
+-- reported": every row written before this column, and every report from an
+-- instance too old to send them. Counts only, never a title or wording.
+--
+-- Additive + platform_identity_-namespaced (ADR 0083 §5). Idempotent.
+
+BEGIN;
+
+ALTER TABLE platform_identity_builder_project_activity
+  ADD COLUMN IF NOT EXISTS crafts jsonb NOT NULL DEFAULT '{}'::jsonb;
+
+COMMIT;

package/modules/platform-identity/platform-identity.js

@@ -27,6 +27,7 @@ const { urlWithinOrigin } = require('./origin-containment');
 // The windowed data plane's append-only snapshot history (task 1002977, community
 // spec D2) — one call from upsertActivity below; the mechanism itself lives there.
 const { recordActivitySnapshot } = require('./activity-snapshots');
+const { sanitizeCrafts, sumCrafts } = require('./craft-rollup');
 
 const { pool: defaultPool } = api;
 const { ACCOUNT_VISIBILITY, accountVisibleSql, rollupVisibleSql, isRollupVisible, scoutingListableSql } = visibility;
@@ -665,7 +666,7 @@ function sanitizeRecentShips(raw, clientOrigin) {
 // origin-containment.js:urlWithinOrigin. `asOf` is when the instance read these
 // totals (task 1004268, migration 026): an older report never overwrites a newer
 // one; unstamped (an older instance) keeps last-writer-wins; a future stamp is clamped.
-async function upsertActivity({ clientId, githubId, credits = 0, tasksShipped = 0, karma = 0, rank = null, disciplines = [], recentShips = [], clientOrigin = null, asOf = null }, { pool = defaultPool } = {}) {
+async function upsertActivity({ clientId, githubId, credits = 0, tasksShipped = 0, karma = 0, rank = null, disciplines = [], recentShips = [], crafts = null, clientOrigin = null, asOf = null }, { pool = defaultPool } = {}) {
   // api.LIVE_RANK_LADDER is a published doorway export (src/module-api.js, a
   // lazy getter over db-kernel's canonical four-rank ladder).
   const safeRank = api.LIVE_RANK_LADDER.includes(rank) ? rank : null;
@@ -673,24 +674,26 @@ async function upsertActivity({ clientId, githubId, credits = 0, tasksShipped =
     .filter((d) => typeof d === 'string' && d.length > 0 && d.length <= MAX_DISCIPLINE_LENGTH)
     .slice(0, MAX_ROLLUP_DISCIPLINES);
   const ships = sanitizeRecentShips(recentShips, clientOrigin);
+  // Each craft's own counts (task 1004440), shaped and capped here — see craft-rollup.js.
+  const craftCounts = sanitizeCrafts(crafts);
   // One transaction with the snapshot: the upsert's row lock queues racing reports (task 1004244).
   return api.withTx(async (client) => {
     const { rows } = await client.query(
       `INSERT INTO platform_identity_builder_project_activity
-         (client_id, github_id, credits, tasks_shipped, karma, rank_held, disciplines, recent_ships, last_active, updated_at, reported_as_of)
+         (client_id, github_id, credits, tasks_shipped, karma, rank_held, disciplines, recent_ships, last_active, updated_at, reported_as_of, crafts)
        VALUES ($1, $2, $3, $4, $5, $6, $7, $8::jsonb, now(), now(),
-               CASE WHEN $9::timestamptz IS NULL THEN NULL ELSE LEAST($9::timestamptz, now()) END)
+               CASE WHEN $9::timestamptz IS NULL THEN NULL ELSE LEAST($9::timestamptz, now()) END, $10::jsonb)
        ON CONFLICT (client_id, github_id) DO UPDATE SET
          credits = EXCLUDED.credits, tasks_shipped = EXCLUDED.tasks_shipped, karma = EXCLUDED.karma,
          rank_held = EXCLUDED.rank_held, disciplines = EXCLUDED.disciplines,
-         recent_ships = EXCLUDED.recent_ships, reported_as_of = EXCLUDED.reported_as_of,
+         recent_ships = EXCLUDED.recent_ships, reported_as_of = EXCLUDED.reported_as_of, crafts = EXCLUDED.crafts,
          last_active = now(), updated_at = now()
        WHERE EXCLUDED.reported_as_of IS NULL OR platform_identity_builder_project_activity.reported_as_of IS NULL
           OR EXCLUDED.reported_as_of >= platform_identity_builder_project_activity.reported_as_of
        RETURNING id, client_id, github_id`,
       // jsonb is bound as a JSON STRING: node-postgres serializes a JS array as a
       // Postgres ARRAY literal, which the jsonb column would reject.
-      [clientId, githubId, credits | 0, tasksShipped | 0, karma | 0, safeRank, disc, JSON.stringify(ships), asOf],
+      [clientId, githubId, credits | 0, tasksShipped | 0, karma | 0, safeRank, disc, JSON.stringify(ships), asOf, JSON.stringify(craftCounts)],
     );
     // Windowed data plane (task 1002977) — best-effort, see activity-snapshots.js.
     await recordActivitySnapshot({ clientId, githubId }, { client });
@@ -804,7 +807,7 @@ async function getRollupForBuilder(githubId, { pool = defaultPool } = {}) {
   );
   const agg = aggRows[0];
   const { rows: projRows } = await pool.query(
-    `SELECT p.name, p.origin, a.rank_held, a.recent_ships,
+    `SELECT p.name, p.origin, a.rank_held, a.recent_ships, a.crafts,
             (p.id IS NOT NULL AND ${onMapSql('p')} AND p.visibility = 'public') AS is_public
        FROM platform_identity_builder_project_activity a
        LEFT JOIN platform_identity_sso_clients c ON c.client_id = a.client_id
@@ -834,6 +837,9 @@ async function getRollupForBuilder(githubId, { pool = defaultPool } = {}) {
       karma: agg.karma,
     },
     disciplines: agg.disciplines || [],
+    // Each craft's own numbers, summed over every project — named or not, like
+    // the totals above (task 1004440; craft-rollup.js says why that is safe).
+    crafts: sumCrafts(projRows.map((r) => r.crafts)),
     last_active: agg.last_active,
     projects: named,
     more_projects: projRows.length - named.length,