@bongos/core 1.21.166 → 1.21.168

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

@@ -242,7 +242,13 @@
       ring.appendChild(arc);
       head.appendChild(ring);
     }
-    if (pin.state !== 'settled') {
+    // the switchboard's marker: a small toggle, on or off
+    if (pin.state === 'switch') {
+      el.className += pin.on ? ' city-pin--on' : ' city-pin--off';
+      var tg = span('city-pin__toggle');
+      tg.appendChild(span('city-pin__toggle-knob'));
+      head.appendChild(tg);
+    } else if (pin.state !== 'settled') {
       var svg = document.createElementNS(SVG_NS, 'svg');
       svg.setAttribute('width', '14');
       svg.setAttribute('height', '14');
@@ -433,7 +439,7 @@
   // route the deck takes (GovDeck.sendAnswer: the desk row's own request); then
   // two doors, "decide all N in a row" to the deck and "go inside" to the
   // building on the street. Without the deck's scripts it is the row and doors.
-  var here = { done: {}, busy: false, said: '', room: null, roomAsked: false, cv: null };
+  var here = { done: {}, busy: false, said: '', room: null, roomAsked: false, cv: null, at: 0, n: 0 };
   function civicOf(key) { return model && model.civic ? model.civic.filter(function (c) { return c.key === key; })[0] || null : null; }
   // The building's button: the keyboard's way in, and where the card is placed beside.
   function hitFor(key) {
@@ -449,14 +455,16 @@
   function openCard(key, from) {
     var was = openKey;
     openKey = key;
-    if (was !== key) { here.said = ''; here.cv = null; }
+    if (was !== key) { here.said = ''; here.cv = null; here.at = 0; }
     if (was && was !== key) showPlate(was, false);
     showPlate(key, true);
     var el = renderCard(key);
     if (!el) return;
     place(el, from || hitFor(key));
-    var first = el.querySelector ? el.querySelector('.ask__opt, .city-card__go, .city-card__enter') : null;
-    if (first && first.focus) first.focus();
+    // the first thing to act on takes focus, without scrolling the card: it always opens at its top
+    var first = el.querySelector ? el.querySelector('.ask__opt, .swb__toggle, .city-card__go, .city-card__arrow') : null;
+    if (first && first.focus) { try { first.focus({ preventScroll: true }); } catch (_) { first.focus(); } }
+    el.scrollTop = 0;
   }
   function closeCard() {
     var el = $('cityCard');
@@ -473,9 +481,15 @@
   function firstAsk(key) {
     var K = window.GovDeck;
     if (!K || !K.drawAsk || !data.living || !data.docket) return null;
-    var q = K.queueOf(data.living, { done: here.done, delegated: {}, skipped: [], extra: [] }, key);
+    // what is out for a rewrite leaves the queue until its new words land (city-decide.js)
+    var G = window.GovCityDecide;
+    var done = G && G.withoutReworded ? G.withoutReworded(here.done, data.docket) : here.done;
+    var q = K.queueOf(data.living, { done: done, delegated: {}, skipped: [], extra: [] }, key);
+    here.n = q.length;
+    here.yours = q.filter(function (x) { return x.needs_you; }).length;
     if (!q.length) return null;
-    var cv = K.cardView(q[0], { docket: data.docket, room: here.room, constitution: data.raw.constitution, goals: (data.goals || []).filter(function (g) { return g && g.status === 'open'; }), now: Date.now(), viewerId: data.docket.viewer ? String(data.docket.viewer.id) : null });
+    if (here.at >= q.length) here.at = 0;
+    var cv = K.cardView(q[here.at], { docket: data.docket, room: here.room, constitution: data.raw.constitution, goals: (data.goals || []).filter(function (g) { return g && g.status === 'open'; }), now: Date.now(), viewerId: data.docket.viewer ? String(data.docket.viewer.id) : null });
     // a sitting's ballot is read once, when a vote's card first needs it
     if (cv && cv.card && cv.card.loading && !here.roomAsked) {
       here.roomAsked = true;
@@ -497,46 +511,157 @@
     el.className = 'city-card gov-glass';
     el.setAttribute('data-building', key);
     el.setAttribute('aria-label', card.name);
-    var head = node('div', 'city-card__head');
+    // a building that waits on you wears the project's colour and glows it
+    if (card.on_you) el.className += ' city-card--you';
+    // the head: its name, and "Total N / Yours M" top right
     var top = node('div', 'city-card__top');
-    top.appendChild(node('p', 'city-card__name', card.name));
-    var close = node('button', 'city-card__close');
-    close.setAttribute('type', 'button');
-    close.setAttribute('aria-label', 'Close');
-    close.setAttribute('aria-keyshortcuts', 'Escape');
-    close.appendChild(node('kbd', null, 'esc'));
-    close.addEventListener('click', closeCard);
-    top.appendChild(close);
-    head.appendChild(top);
-    // who holds it, one fact, and what waits there (salmon only while it is yours)
+    var name = node('p', 'city-card__name', card.name);
+    // who holds it is a hover hint now, not a line of its own
     var hold = K && K.holdWords ? K.holdWords(data.living, key) : card.plate ? (card.lead ? 'Led by ' + card.plate + '.' : 'The owner holds it until a Lead is seated.') : '';
-    var words = [hold, card.fact && card.fact.text ? sentence(card.fact.text) : ''].filter(Boolean).join(' ');
-    var line = node('p', 'city-card__f', words);
-    var waits = K && K.waitWords ? K.waitWords(card.on_you, card.on_others) : sentence(countText(card));
-    line.appendChild(node('span', card.on_you ? 'city-card__count city-card__count--you' : 'city-card__count', (words ? ' ' : '') + waits));
-    head.appendChild(line);
-    el.appendChild(head);
-    var cv = firstAsk(key);
+    if (hold) name.setAttribute('title', hold);
+    top.appendChild(name);
+    var total = card.open != null ? card.open : (card.on_you || 0) + (card.on_others || 0);
+    var mine = card.on_you || 0;
+    // what is still open after answers given here, as the decide view counts it
+    var cv0 = key !== 'automation' && window.GovDeck && data.living ? firstAsk(key) : null;
+    if (window.GovDeck && data.living && key !== 'automation') { total = here.n; mine = here.yours; }
+    var counts = node('span', 'city-card__counts', 'Total ' + total + ' / ');
+    counts.appendChild(node('b', mine ? 'city-card__count--you' : null, 'Yours ' + mine));
+    var RW = window.GovCityDecide;
+    var rw = RW && RW.rewordingCount ? RW.rewordingCount(data.docket, key) : 0;
+    if (rw) counts.appendChild(node('span', 'city-card__rewording', 'Rewording ' + rw));
+    // a switchboard has no queue to count
+    if (key !== 'automation' || !window.GovCitySwitchboard) top.appendChild(counts);
+    el.appendChild(top);
+    // Automation is a switchboard, not a queue (city-switchboard.js)
+    var SW = key === 'automation' ? window.GovCitySwitchboard : null;
+    var cv = SW ? null : cv0;
     here.cv = cv;
-    if (cv) el.appendChild(K.drawAsk(document, cv, { pick: function (op) { answer(key, cv, op); } }, { inner: true, busy: here.busy, cls: 'city-ask' }));
+    if (SW) {
+      el.className += ' city-card--board';
+      SW.draw(document, el, data.docket, { now: Date.now(), viewerId: data.docket && data.docket.viewer ? String(data.docket.viewer.id) : null, goals: (data.goals || []).filter(function (g) { return g && g.status === 'open'; }) }, {
+        busy: here.busy,
+        send: function (req) { here.busy = true; return send(req); },
+        done: function (toast, ok) {
+          here.busy = false;
+          here.said = toast;
+          var flashIt = function () { var f = $('cityCard'); if (ok && window.GovCityDecide && window.GovCityDecide.flash && f) window.GovCityDecide.flash(f, 'Switched'); };
+          if (ok) load().then(flashIt); else renderCard(key);
+        },
+      });
+    }
+    // the glow says it is yours: the 'only you can answer' line is left off
+    if (cv) {
+      // answerable in place: the desk row's acts, chips and typed fields are the card's own (city-decide.js)
+      var G = window.GovCityDecide;
+      var drawn = G && G.drawCard ? G.drawCard(document, K, cv, { pick: function (op) { answer(key, cv, op); }, said: function (t) { here.said = t; renderCard(key); }, reworded: function (t) { here.said = t; if (window.GovFeeds && window.GovFeeds.changed) window.GovFeeds.changed(); draw(painted || effectiveTheme()); }, send: send, docket: function () { return data.docket; } }, { inner: true, busy: here.busy, cls: 'city-ask' }) : { node: K.drawAsk(document, quiet(cv), { pick: function (op) { answer(key, cv, op); } }, { inner: true, busy: here.busy, cls: 'city-ask' }), cv: cv };
+      here.cv = drawn.cv;
+      el.appendChild(drawn.node);
+      // which of this building's items this is; Tab and the up / down arrows step through them
+      if (here.n > 1) {
+        var step = node('div', 'city-card__step');
+        var up = node('button', 'city-card__stepbtn', '↑');
+        up.setAttribute('type', 'button');
+        up.setAttribute('aria-label', 'Previous item');
+        up.setAttribute('aria-keyshortcuts', 'Shift+Tab ArrowUp');
+        up.addEventListener('click', function () { stepItem(-1); });
+        var down = node('button', 'city-card__stepbtn', '↓');
+        down.setAttribute('type', 'button');
+        down.setAttribute('aria-label', 'Next item');
+        down.setAttribute('aria-keyshortcuts', 'Tab ArrowDown');
+        down.addEventListener('click', function () { stepItem(1); });
+        step.appendChild(up);
+        step.appendChild(node('span', 'city-card__stepn', (here.at + 1) + ' of ' + here.n));
+        step.appendChild(down);
+        step.appendChild(node('span', 'city-card__hint', 'Tab · ↑ ↓ items   ← → buildings'));
+        el.appendChild(step);
+      }
+    }
+    else if (!SW) el.appendChild(node('p', 'city-card__f', 'Nothing waits here.'));
     if (here.said) {
       var said = node('p', 'city-card__said', here.said);
       said.setAttribute('role', 'status');
       el.appendChild(said);
     }
+    // the foot: flip between buildings, decide them all, and a small esc
     var acts = node('div', 'city-card__acts');
-    var n = card.on_you || card.on_others;
+    var prev = node('button', 'city-card__arrow', '‹');
+    prev.setAttribute('type', 'button');
+    prev.setAttribute('aria-label', 'Previous building');
+    prev.setAttribute('aria-keyshortcuts', 'ArrowLeft');
+    prev.addEventListener('click', function () { flipCard(-1); });
+    var next = node('button', 'city-card__arrow', '›');
+    next.setAttribute('type', 'button');
+    next.setAttribute('aria-label', 'Next building');
+    next.setAttribute('aria-keyshortcuts', 'ArrowRight');
+    next.addEventListener('click', function () { flipCard(1); });
+    acts.appendChild(prev);
+    acts.appendChild(next);
+    // what is still open here, after answers and rewrites (firstAsk counted it)
+    var n = cv ? here.n : (card.on_you || card.on_others);
     if (n) {
-      var go = node('a', 'city-card__go', n === 1 ? 'decide it on the deck' : 'decide all ' + n + ' in a row');
-      go.setAttribute('href', card.deck_href);
+      var go = node('button', 'city-card__go', n === 1 ? 'decide it' : 'decide all ' + n);
+      go.setAttribute('type', 'button');
+      go.addEventListener('click', function () { openDecide(key); });
       acts.appendChild(go);
     }
-    var enter = node('a', 'city-card__enter', 'go inside');
-    enter.setAttribute('href', card.enter_href);
-    acts.appendChild(enter);
+    acts.appendChild(node('span', 'city-card__gap'));
+    var close = node('button', 'city-card__close');
+    close.setAttribute('type', 'button');
+    close.setAttribute('aria-label', 'Close');
+    close.setAttribute('aria-keyshortcuts', 'Escape');
+    close.appendChild(node('kbd', null, 'esc'));
+    close.addEventListener('click', closeCard);
+    acts.appendChild(close);
     el.appendChild(acts);
+    // a pick waiting on its confirm survives a redraw of the same card, never a move to another
+    var G2 = window.GovCityDecide;
+    if (el.__armed && (!here.cv || here.cv.id !== el.__armed.id)) el.__armed = null;
+    else if (G2 && G2.paintArmed) G2.paintArmed(el);
     return el;
   }
+  function quiet(cv) { var f = cv.foot || {}; var c = {}; for (var k in cv) c[k] = cv[k]; c.foot = { you: '', rest: f.rest || '' }; return c; }
+  // Tab / ↑ ↓ step through this building's items (wrapping)
+  function stepItem(d) {
+    if (!openKey || here.n < 2) return;
+    here.at = (here.at + d + here.n) % here.n;
+    here.said = '';
+    var el = renderCard(openKey);
+    var first = el && el.querySelector ? el.querySelector('.ask__opt, .ask-field__input') : null;
+    if (first && first.focus) first.focus();
+  }
+  // ← / → walk the buildings that have something open, else all of them
+  function flipCard(d) {
+    if (!model || !model.civic || !openKey) return;
+    var keys = model.civic.filter(function (c) { return c.key === 'automation' || (c.card && (c.card.open || c.card.on_you || c.card.on_others)); }).map(function (c) { return c.key; });
+    if (keys.indexOf(openKey) < 0) keys = model.civic.map(function (c) { return c.key; });
+    var i = keys.indexOf(openKey);
+    var to = keys[(i + d + keys.length) % keys.length];
+    if (to && to !== openKey) openCard(to);
+  }
+  // the decide view (city-decide.js): one by one or a table, over the city
+  var decide = null;
+  // how: 'one' (default) or 'table'
+  function openDecide(scope, how) {
+    if (!window.GovCityDecide || !window.GovDeck) { window.location.href = City.STREET_HREF + '#deck' + (scope ? '=' + scope : ''); return; }
+    if (!decide) decide = window.GovCityDecide.make({
+      data: function () { return data; },
+      done: here.done,
+      send: send,
+      changed: function () { if (window.GovFeeds && window.GovFeeds.changed) window.GovFeeds.changed(); draw(painted || effectiveTheme()); },
+      root: function () { return $('hall-main'); },
+      room: function () { return here.room; },
+    });
+    if (openKey) closeCard();
+    if (!here.roomAsked) {
+      here.roomAsked = true;
+      getJson('/api/bongos/government/board/items').then(function (r) {
+        here.room = r && (Array.isArray(r.open) || Array.isArray(r.closed)) ? r : { open: [], closed: [] };
+        if (decide && decide.isOpen()) decide.render();
+      });
+    }
+    decide.open(scope || null, how);
+  }
   // One answer, through the deck's own sender: the same request its desk row sends.
   function send(req) {
     return fetch(req.url, { method: req.method, credentials: 'same-origin', headers: { accept: 'application/json', 'content-type': 'application/json' }, body: JSON.stringify(req.body || {}) })
@@ -560,8 +685,12 @@
         // every count on the page leaves out what was answered here (gov-feeds.js)
         if (window.GovFeeds && window.GovFeeds.changed) window.GovFeeds.changed();
       }
-      if (res.ok && res.stored) return load().then(function () { return true; });
+      // a decision lands with a beat you can see: the card pulses and says so (city-decide.js flash)
+      var G = window.GovCityDecide;
+      var cheer = function () { var f = $('cityCard'); if (res.ok && G && G.flash && f) G.flash(f, 'Decided'); };
+      if (res.ok && res.stored) return load().then(function () { cheer(); return true; });
       if (openKey) { draw(painted || effectiveTheme()); var f = $('cityCard'); var first = f && f.querySelector ? f.querySelector('.ask__opt, .city-card__go') : null; if (first && first.focus) first.focus(); }
+      cheer();
       return res.ok;
     });
   }
@@ -569,10 +698,19 @@
   function cardKey(e) {
     if (!e) return;
     if (e.key === 'Escape') { closeCard(); return; }
-    if (!here.cv || !openKey || e.ctrlKey || e.metaKey || e.altKey || !/^[1-3]$/.test(String(e.key))) return;
+    if ((e.key === 'ArrowLeft' || e.key === 'ArrowRight') && !e.ctrlKey && !e.metaKey && !e.altKey && !(e.target && /^(INPUT|TEXTAREA)$/.test(String(e.target.tagName)))) { if (e.preventDefault) e.preventDefault(); flipCard(e.key === 'ArrowLeft' ? -1 : 1); return; }
+    var inText = e.target && /^(INPUT|TEXTAREA)$/.test(String(e.target.tagName));
+    // Tab is the next thing that needs you in this building, never the next button
+    if (e.key === 'Tab' && openKey && !inText) { if (e.preventDefault) e.preventDefault(); stepItem(e.shiftKey ? -1 : 1); return; }
+    if (inText) return;
+    if ((e.key === 'ArrowDown' || e.key === 'ArrowUp') && openKey) { if (e.preventDefault) e.preventDefault(); stepItem(e.key === 'ArrowUp' ? -1 : 1); return; }
+    if (!here.cv || !openKey || e.ctrlKey || e.metaKey || e.altKey || !/^[1-9]$/.test(String(e.key))) return;
     var op = here.cv.options[Number(e.key) - 1];
     if (!op) return;
     if (e.preventDefault) e.preventDefault();
+    // the first press picks that answer, the same number again confirms it
+    var G = window.GovCityDecide;
+    if (G && G.armKey && !G.armKey($('cityCard'), here.cv, Number(e.key))) return;
     answer(openKey, here.cv, op);
   }
   // Beside the building on a wide stage, over a light hush with the building
@@ -603,15 +741,24 @@
 
   function boot() {
     var start = $('cityStart');
-    if (start) start.setAttribute('href', City.STREET_HREF);
+    // the big button opens the decide view in place; the street is archived
+    if (start) start.setAttribute('href', '#decide');
+    if (start) start.addEventListener('click', function (e) { if (window.GovCityDecide && window.GovDeck) { if (e.preventDefault) e.preventDefault(); openDecide(null); } });
+    window.addEventListener('hashchange', function () { var h = window.location && window.location.hash; if (/^#decide/.test(h || '')) openDecide(h.split('=')[1] || null); });
     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);
     var card = $('cityCard');
+    // the card's keys work wherever focus is while it is open (Tab never walks its buttons)
     if (card) card.addEventListener('keydown', cardKey);
+    if (document.addEventListener) document.addEventListener('keydown', function (e) {
+      var t = e && e.target;
+      if (!openKey || e.defaultPrevented || (decide && decide.isOpen()) || (card && t && card.contains && card.contains(t))) return;
+      cardKey(e);
+    });
     // the page's counts leave out what the card answered (gov-feeds.js)
-    if (window.GovFeeds && typeof window.GovFeeds.useSession === 'function') window.GovFeeds.useSession(function () { return { answered: Object.keys(here.done), extra: [] }; });
+    if (window.GovFeeds && typeof window.GovFeeds.useSession === 'function') window.GovFeeds.useSession(function () { var G = window.GovCityDecide; return { answered: Object.keys(G && G.withoutReworded ? G.withoutReworded(here.done, data.docket) : here.done), extra: [] }; });
     var frame = $('cityFrame');
     // a click anywhere on the city but a building (its faces, its pin, its plate) closes the card
     if (frame) frame.addEventListener('click', function (e) {
@@ -623,9 +770,9 @@
     painted = applyTheme();
     draw(painted);
     watchShellTheme();
-    return load();
+    return load().then(function (r) { var h = window.location && window.location.hash; if (/^#decide/.test(h || '')) openDecide(h.split('=')[1] || null); return r; });
   }
 
-  window.GovCityPage = { boot: boot, draw: draw, load: load, fit: fit, openCard: openCard, closeCard: closeCard, FEEDS: FEEDS, LIVING_FEEDS: LIVING_FEEDS, THEME_KEY: THEME_KEY };
+  window.GovCityPage = { boot: boot, draw: draw, load: load, fit: fit, openCard: openCard, closeCard: closeCard, openDecide: function (scope, how) { openDecide(scope, how); return decide; }, FEEDS: FEEDS, LIVING_FEEDS: LIVING_FEEDS, THEME_KEY: THEME_KEY };
   window.GovCityPage.ready = boot();
 }());

package/modules/hall-ui/public/sky-data.js

@@ -147,7 +147,10 @@
       id: String(g.goal_id), title: g.title || 'A private goal', subtitle: g.subtitle || null, version: g.version_id, status: g.status,
       taskTotal: Number(g.task_total) || 0, taskDone: Number(g.task_done) || 0, createdAt: g.created_at || null,
       crit: (g.criteria || []).map((c) => ({ id: String(c.id), text: c.criterion_md || '', satisfied: c.satisfied === true, tasks: (c.task_ids || []).map(String), pendingReview: c.pending_review === true, uat: c.uat_state || null, uatLabel: uatLabel(c.uat_state), backendOnly: c.backend_only === true })),
-      tasks: (g.tasks || []).map((t) => ({ id: String(t.id), title: t.title || 'a task', status: t.status, credits: t.credits_reward == null ? 0 : Number(t.credits_reward), createdAt: t.created_on || null, sourceRef: t.idea_id != null ? String(t.idea_id) : null })),
+      // task 1004782 — abandoned (or merged-away) work carries no credits: it is listed, at zero, and never adds to a
+      // well's mass or a ring. A merged-away task is always abandoned (tasks.merged_into_task_id is CHECK-constrained to
+      // abandoned rows), so the status test covers both; /sky does not send the pointer.
+      tasks: (g.tasks || []).map((t) => ({ id: String(t.id), title: t.title || 'a task', status: t.status, credits: t.status === 'abandoned' || t.credits_reward == null ? 0 : Number(t.credits_reward), createdAt: t.created_on || null, sourceRef: t.idea_id != null ? String(t.idea_id) : null })),
     };
   }
   const taskRow = (t) => ({ id: String(t.task_id ?? t.id), title: t.title || 'a task', status: t.status, goalId: t.goal_id != null ? String(t.goal_id) : null, origin: t.origin || null });

package/modules/hall-ui/public/tweak-editor-lib.js

@@ -25,7 +25,7 @@
   'use strict';
 
   // The ADR's words (D4), and the read's own `notes` wins when it carries them.
-  const NOTES = Object.freeze({ shared: 'changes this on every page', engineer: 'goes to an engineer' });
+  const NOTES = Object.freeze({ shared: 'changes this on every page', engineer: 'goes to an engineer', guarded: 'must still say' });
 
   function sectionsOf(lines) {
     const out = [];
@@ -43,12 +43,31 @@
     return typeof value === 'string' && value !== line.text;
   }
 
+  // task 1004776: the phrases a guarded line's new text no longer contains (the
+  // server's guarded-lines.js rule, case-insensitive), so the warning shows while
+  // the artist types, not only at submit.
+  function droppedPhrases(line, value) {
+    const t = String(value == null ? '' : value).toLowerCase();
+    return (line.must_contain || []).filter((p) => !t.includes(String(p).toLowerCase()));
+  }
+
+  // The submit's warning (the server's `warnings`), as plain sentences; the
+  // editor escapes them. Empty when nothing was warned.
+  function submitWarningHtml(warnings) {
+    return (warnings || []).map((w) => `A line you changed no longer says what it must: ${w.must_still_say} It was sent anyway; the person approving it will see this.`);
+  }
+
   // The mock's rule: a shared or engineer line always shows its own note, and
   // any other changed line shows the words it replaced. An emptied line says it
   // will be removed first, since that is what sending it now does.
   function noteFor(line, value, notes) {
     const n = notes || NOTES;
     if (isRemoved(line, value)) return { kind: 'removed', text: `to be removed · goes to an engineer · was: ${line.text}` };
+    // task 1004776: a line that must keep its meaning says what it must still say.
+    if (line.note === 'guarded' && line.must_still_say) {
+      const drops = isChanged(line, value) && droppedPhrases(line, value).length;
+      return { kind: 'guarded', text: `${drops ? 'this no longer says what it must · ' : ''}${n.guarded || 'must still say'}: ${line.must_still_say}` };
+    }
     if (line.note === 'shared') return { kind: 'shared', text: n.shared || NOTES.shared };
     if (line.note === 'engineer') return { kind: 'engineer', text: n.engineer || NOTES.engineer };
     if (isChanged(line, value)) return { kind: 'was', text: `was: ${line.text}` };
@@ -260,7 +279,7 @@
     return null;
   }
 
-  const api = { OPEN_WORDS, openChoice, clampSplit, splitFromPointer, splitFromKey, canFrame, FRAME_SIBLINGS, splitWindowFeatures, HINT, nextLineKey, confirmedCount, hintText, confirmStoreKey, parseConfirmed, NOTES, sectionsOf, isChanged, isRemoved, noteFor, draftBody, changedCount, counterText, initialValues, rowsFor, liveUrl, uploadedLabel, uploadRefusal, displayTitle, pageIdFrom };
+  const api = { OPEN_WORDS, openChoice, clampSplit, splitFromPointer, splitFromKey, canFrame, FRAME_SIBLINGS, splitWindowFeatures, HINT, nextLineKey, confirmedCount, hintText, confirmStoreKey, parseConfirmed, NOTES, sectionsOf, isChanged, isRemoved, droppedPhrases, noteFor, draftBody, submitWarningHtml, changedCount, counterText, initialValues, rowsFor, liveUrl, uploadedLabel, uploadRefusal, displayTitle, pageIdFrom };
   if (typeof window !== 'undefined') window.OTBTweakEditor = api;
   if (typeof module !== 'undefined' && module.exports) module.exports = api;
 })();

package/modules/hall-ui/public/tweak-editor.css

@@ -412,6 +412,8 @@ html[data-fullscreen="on"] .tw-frame { left: 0; }
 .tw-note { padding-top: 9px; font-size: 12px; line-height: 1.4; color: var(--tw-paper-faint); overflow-wrap: anywhere; }
 .tw-note--shared { color: var(--tw-shared); }
 .tw-note--engineer { color: var(--tw-engineer); }
+/* task 1004776: a line that must keep its meaning. */
+.tw-note--guarded { color: var(--tw-engineer); font-weight: 600; }
 .tw-sr {
   position: absolute;
   width: 1px;

package/modules/hall-ui/public/tweak-editor.js

@@ -525,7 +525,9 @@
     }
     st.submitted = true;
     st.writable = false;
-    notice('');
+    // task 1004776: a guarded line that dropped its promise is warned, never refused.
+    const warned = lib.submitWarningHtml(r.data && r.data.warnings);
+    notice(warned.length ? warned.map((s) => `<p>${escapeHtml(s)}</p>`).join('') : '');
     document.querySelectorAll('textarea.tw-line').forEach((ta) => { ta.readOnly = true; });
     document.querySelectorAll('.tw-line--holes').forEach((box) => { box.setAttribute('contenteditable', 'false'); });
     document.querySelectorAll('.tw-ctl').forEach((c) => { c.hidden = true; });

package/modules/lifecycle/db-claims.js

@@ -36,6 +36,7 @@ const { siblingOverlaps, RESOLVED_STATUSES } = require('./goal-conflicts.js');
 const { claimGate, claimPermissionsFor, disambiguateWorktreeName, foldWorktreeName } = require('./db-rank-authz.js');
 const { sealSessionLog } = require('./db-shared.js');
 const { gatingRebaseTasksForBuilder, shouldRefuseClaimResolve } = require('./db-ship.js');
+const { splitRebaseGate, rebaseRefusalTasks } = require('./rebase-gate.js');
 const { REWARD_SUGGESTION_CAP, rewardGateAssignment } = require('./db-tasks.js');
 const { autoPickupRefusal } = require('./autopickup.js');
 
@@ -135,13 +136,16 @@ async function claimTask({ taskId, builderId, worktreeName, headSha, creatorSess
     // ship that clears the last flag.
     // The GATING subset, not the surfacing one: a strand the builder cannot clear
     // stops blocking after a grace, while still being reported (task 1003294).
-    const owedRebases = await gatingRebaseTasksForBuilder(builderId, client);
-    if (owedRebases.length > 0 && !isRebaseGateExempt(
+    // task 1004788: split by the shared predicate (rebase-gate.js) — a strand that
+    // waits on something outside the builder never gates, and fixable ones gate
+    // only once REBASE_GATE_LIMIT of them pile up.
+    const rebaseSplit = splitRebaseGate(await gatingRebaseTasksForBuilder(builderId, client));
+    if (rebaseSplit.gates && !isRebaseGateExempt(
       (await client.query(`SELECT kind, priority FROM tasks WHERE id = $1`, [taskId])).rows[0],
     )) {
       throw {
         code: 'REBASE_REQUIRED',
-        rebaseTasks: owedRebases.map((t) => ({ id: t.id, title: t.title, reason: t.needs_rebase_reason })),
+        rebaseTasks: rebaseRefusalTasks(rebaseSplit),
       };
     }
 
@@ -539,11 +543,19 @@ async function claimTasksBatch({ taskIds, builderId, worktreePrefix, creatorSess
 
     // Lock every requested task row up front (sorted to avoid deadlocks).
     const { rows: taskRows } = await client.query(
-      `SELECT id, status, touches, newcomer_friendly, requires_rank, needs_migration, module_key, goal_id FROM tasks WHERE id = ANY($1::bigint[]) ORDER BY id FOR UPDATE`,
+      `SELECT id, status, touches, newcomer_friendly, requires_rank, needs_migration, module_key, goal_id, kind, priority FROM tasks WHERE id = ANY($1::bigint[]) ORDER BY id FOR UPDATE`,
       [uniqIds]
     );
 
     const failures = [];
+    // task 1004788: the REBASE_REQUIRED gate, by the SAME predicate as claimTask
+    // (rebase-gate.js). Before this the batch path skipped the gate entirely.
+    const batchRebaseSplit = splitRebaseGate(await gatingRebaseTasksForBuilder(builderId, client));
+    if (batchRebaseSplit.gates) {
+      for (const t of taskRows) {
+        if (!isRebaseGateExempt(t)) failures.push({ task_id: t.id, reason: 'REBASE_REQUIRED', rebaseTasks: rebaseRefusalTasks(batchRebaseSplit) });
+      }
+    }
     // node-pg returns bigint/bigserial columns (tasks.id) as JS STRINGS, not
     // numbers (learning #94) — Number() them before comparing against uniqIds
     // (which are already numbers). Without this, foundIds.has(requestedId)
@@ -939,10 +951,12 @@ async function validateClaimBatch({ taskIds, builderId }) {
   const builderRank = builderRows[0] ? builderRows[0].rank : null;
 
   const { rows: taskRows } = await pool.query(
-    `SELECT id, status, touches, newcomer_friendly, requires_rank, module_key, goal_id
+    `SELECT id, status, touches, newcomer_friendly, requires_rank, module_key, goal_id, kind, priority
        FROM tasks WHERE id = ANY($1::bigint[])`,
     [uniqIds]
   );
+  // task 1004788: the dry run asks the same rebase-gate question as the real paths.
+  const dryRebaseSplit = splitRebaseGate(await gatingRebaseTasksForBuilder(builderId, pool));
   // node-pg returns tasks.id (bigserial) as a STRING (learning #94) — Number()
   // it so lookups below (byId.get(id), id from uniqIds) actually hit.
   const byId = new Map(taskRows.map((r) => [Number(r.id), r]));
@@ -968,6 +982,7 @@ async function validateClaimBatch({ taskIds, builderId }) {
     if (builderInactive) push(id, { reason: 'BUILDER_INACTIVE' });
     const t = byId.get(id);
     if (!t) { push(id, { reason: 'TASK_NOT_FOUND' }); continue; }
+    if (dryRebaseSplit.gates && !isRebaseGateExempt(t)) push(id, { reason: 'REBASE_REQUIRED', rebaseTasks: rebaseRefusalTasks(dryRebaseSplit) });
     if (t.status !== 'ready') push(id, { reason: 'TASK_NOT_READY', currentStatus: t.status });
     // task 1003196: same composed decision as claimTask and claimTasksBatch, and
     // the same deliberate xenos-only queue short-circuit the batch path carries.

package/modules/lifecycle/rebase-gate.js

@@ -0,0 +1,78 @@
+'use strict';
+
+// rebase-gate.js — the ONE predicate behind the REBASE_REQUIRED claim gate, shared
+// by all three claim surfaces (claimTask, claimTasksBatch, validateClaimBatch; task
+// 1004788, ADR 0120 part 3).
+//
+// WHY. The gate refused EVERY new claim while the builder had ANY confirmed task
+// flagged needs_rebase. On 2026-10-23 one task parked on a server-side guard
+// (strand:branch_modifies_executed_code, which no action of its builder clears)
+// plus two peer-session strands froze a six-task build chain for over an hour.
+// Owner: "if i send something for lars to do it shouldnt shut down all other
+// merges and ships" — and, refining it, such a task is SET ASIDE: out of the claim
+// gate, marked as waiting with what it waits on, and still swept, so it re-enters
+// the land on its own.
+//
+// THE RULE. Each owed rebase (gatingRebaseTasksForBuilder's rows) is split:
+//   • WAITING — stuck on something outside the builder. Its reason names a
+//     server-side guard (branch_modifies_executed_code: the conflict resolver will
+//     not run code the branch changes; a person or a moved main lands it) or an
+//     explicit hold (a `waiting:<what>` reason). It never gates. It stays flagged,
+//     reported, and swept by the publish-reconciler every pass, so the moment the
+//     thing it waits on clears (main moves so it merges clean, the branch is
+//     brought up to date, a person lands it) the ordinary sweep lands it and ship
+//     clears the flag. Set aside, never dropped.
+//   • FIXABLE — everything else (an unresolvable hand-written conflict, a red
+//     check, an unpushed branch). These are the builder's to fix, and the gate
+//     keeps its purpose for them — but only once they pile up: it refuses at
+//     REBASE_GATE_LIMIT fixable strands, not on the first one.
+//
+// Pure: no DB. The rows come from db-ship.gatingRebaseTasksForBuilder, which keeps
+// its own unprovable-strand grace (task 1003294).
+
+// Fixable strands at which new claims are refused. Read per call so an operator
+// (or a test) can move it with REBASE_GATE_LIMIT without a restart.
+const REBASE_GATE_LIMIT = 3;
+function gateLimit() { return Math.max(1, Number(process.env.REBASE_GATE_LIMIT) || REBASE_GATE_LIMIT); }
+
+// Reasons (as stored: `strand:<reason>[:files]`) that wait on something outside
+// the builder, with the words the refusal and the CLI say for each.
+const WAITING_REASONS = Object.freeze({
+  branch_modifies_executed_code: 'a server-side guard: the merge resolver will not run code this branch changes, so it lands once main moves or a person lands it',
+});
+
+// waitsOn(reason) -> null (the builder's to fix) | string (what it waits on).
+function waitsOn(reason) {
+  const r = String(reason == null ? '' : reason);
+  const m = /^waiting:(.+)$/.exec(r);
+  if (m) return m[1].trim() || 'something outside the builder';
+  const key = r.replace(/^strand:/, '').split(':')[0];
+  return Object.prototype.hasOwnProperty.call(WAITING_REASONS, key) ? WAITING_REASONS[key] : null;
+}
+
+// splitRebaseGate(rows, { limit }) -> { gates, gating, waiting, fixable }
+//   gating  — the rows that refuse (all fixable rows once there are `limit` of them; else [])
+//   waiting — set-aside rows, each with waits_on
+//   fixable — every fixable row, gating or not
+function splitRebaseGate(rows, { limit = gateLimit() } = {}) {
+  const waiting = [];
+  const fixable = [];
+  for (const t of rows || []) {
+    const w = waitsOn(t && t.needs_rebase_reason);
+    if (w) waiting.push({ ...t, waits_on: w });
+    else fixable.push(t);
+  }
+  const gates = fixable.length >= limit;
+  return { gates, gating: gates ? fixable : [], waiting, fixable };
+}
+
+// The refusal's task list: gating tasks as before, plus the waiting ones marked so
+// the hint and the CLI can say "waiting, not on you".
+function rebaseRefusalTasks(split) {
+  return [
+    ...split.gating.map((t) => ({ id: t.id, title: t.title, reason: t.needs_rebase_reason })),
+    ...split.waiting.map((t) => ({ id: t.id, title: t.title, reason: t.needs_rebase_reason, waiting: true, waits_on: t.waits_on })),
+  ];
+}
+
+module.exports = { REBASE_GATE_LIMIT, WAITING_REASONS, waitsOn, splitRebaseGate, rebaseRefusalTasks };

package/modules/lifecycle/routes/claims.js

@@ -97,9 +97,17 @@ function taskNotReadyHint(taskId, currentStatus) {
 // up-to-date branch and stays a fast-forward, which is why the recovery text in
 // ship-land.js already names merge and explicitly says "Do NOT reset or
 // re-rebase". This is the same advice, given BEFORE the deadlock instead of after.
+// task 1004788: only the FIXABLE tasks gate (rebase-gate.js); a task set aside
+// because it waits on something outside the builder is listed after them as
+// "waiting, not on you" so nobody chases it.
 function rebaseRequiredHint(rebaseTasks) {
-  const ids = (rebaseTasks || []).map((t) => `task ${t.id}`);
-  return `Your queue is gated: ${ids.length} confirmed task(s) are waiting to land (${ids.join(', ') || 'unknown'}). Clear it with /strand-fix N (works on any machine), or bring the branch up to date with \`git merge origin/main\` and re-ship — MERGE, never rebase: server-mediated publish is append-only, and rewriting a published branch makes it un-pushable (task 1002788). /merge-mode only if this machine has a GitHub push credential. To give up on one instead, /builder-release it. If CI is simply backed up, waiting is correct: a task already landed clears the gate on its own. If main's CI is red for a reason outside your branch, the fix is still claimable: a P1 kind=infra task passes this gate (task 1004370).`;
+  const all = rebaseTasks || [];
+  const ids = all.filter((t) => !t.waiting).map((t) => `task ${t.id}`);
+  const waiting = all.filter((t) => t.waiting);
+  const aside = waiting.length
+    ? ` Waiting, not on you (set aside; they land on their own when what they wait on clears): ${waiting.map((t) => `task ${t.id} (${t.waits_on || 'outside you'})`).join('; ')}.`
+    : '';
+  return `Your queue is gated: ${ids.length} confirmed task(s) of yours are waiting to land and need you (${ids.join(', ') || 'unknown'}).${aside} Clear it with /strand-fix N (works on any machine), or bring the branch up to date with \`git merge origin/main\` and re-ship — MERGE, never rebase: server-mediated publish is append-only, and rewriting a published branch makes it un-pushable (task 1002788). /merge-mode only if this machine has a GitHub push credential. To give up on one instead, /builder-release it. If CI is simply backed up, waiting is correct: a task already landed clears the gate on its own. If main's CI is red for a reason outside your branch, the fix is still claimable: a P1 kind=infra task passes this gate (task 1004370).`;
 }
 
 // task 1642 (+ the worktree-keying fix) — the pure one-active-claim decision.

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bongos/core",
-  "version": "1.21.166",
+  "version": "1.21.168",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bongos/core",
-      "version": "1.21.166",
+      "version": "1.21.168",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "express": "^4.21.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bongos/core",
-  "version": "1.21.166",
+  "version": "1.21.168",
   "description": "Cloud Bongos — the AI-first build platform core (GDS + platform surfaces + module system), installed as a versioned dependency (ADR 0108).",
   "license": "AGPL-3.0-or-later",
   "main": "src/platform-server.js",