@bongos/core 1.25.31 → 1.25.32

package/src/module-api.js

@@ -81,7 +81,7 @@ const { sleep } = require('./sleep');
 // MAJOR (see allowBoxScope below): passes the request through untouched.
 function deprecatedNoopMiddleware(_req, _res, next) { next(); }
 
-const CORE_VERSION = '1.25.31'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
+const CORE_VERSION = '1.25.32'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
 
 // A namespaced logger so a module's log lines are attributable + consistent.
 // Usage: const log = api.logger('discord'); log.info('mounted');

package/tests/hall_sky_time.mjs

@@ -112,8 +112,9 @@ test('the sky tokens are art: no control, no text and no chrome spends one', ()
       const sel = m[1].trim();
       if (f === 'style.css' && /(^|\n):root$/.test(sel)) continue; // the token block itself
       // only the two scenes spend them: the City page's frame, stage and cloud; Home's scene, its
-      // stage, and (in game mode) the ground of the Home view
-      if (!/^(\.city-frame|\.city-stage|\.city-cloud|\.city-stars|\.hc-svg|\.hc-cloud|\.hc-stage|html\[data-game="on"\] body\[data-page="home"\]$)/.test(sel)) { hits.push(`${f}: ${sel}`); continue; }
+      // stage, and (in game mode) the ground of the Home view; and the cloud scene behind the welcome
+      // and the game's start screens (task 1005308)
+      if (!/^(\.city-frame|\.city-stage|\.city-cloud|\.city-stars|\.hc-svg|\.hc-cloud|\.hc-stage|\.cloud-scene|html\[data-game="on"\] body\[data-page="home"\]$)/.test(sel)) { hits.push(`${f}: ${sel}`); continue; }
       for (const d of m[2].split(';')) {
         const prop = d.split(':')[0].trim();
         if (/--sky-/.test(d) && (prop === 'color' || /^border|^outline|^caret|^text-/.test(prop))) hits.push(`${f}: ${sel} { ${prop} }`);

package/tests/hall_start_screen.mjs

@@ -95,13 +95,14 @@ test('the load screen fills one segment per week, up to the week it is showing (
   assert.equal(G.segsDone(0, 0), 0);
 });
 
-test('a fresh sign-in is handed to the start screen with the still, and the craft picker waits for the world', () => {
+test('a fresh sign-in is handed to the start screen with the city in the clouds, and the craft picker waits for the world', () => {
   const s = sandbox({ store: { 'hall-welcome-signin': '1' } });
   const access = { authed: true }, builder = { id: 7, display_name: 'Ada' };
   assert.equal(s.window.OTBWelcome.onAccess(access, builder), true, 'the shell is told a screen is up, so it asks no picker');
   assert.equal(s.started.length, 1);
   assert.equal(s.started[0].name, 'Harbor');
-  assert.match(s.started[0].art, /^\/builders\/welcome-(day|night)\.webp$/);
+  assert.equal(typeof s.started[0].scene, 'function', 'the scene is painted, not a picture (task 1005308)');
+  assert.equal(s.started[0].art, undefined, 'the circuit-city painting is retired');
   assert.equal(s.store['hall-welcome-signin'], undefined, 'the flag is spent');
   assert.deepEqual(s.asked, [], 'nothing is asked while the start screen is up');
   s.started[0].done();

package/tests/welcome_boot.mjs

@@ -1,8 +1,8 @@
 // tests/welcome_boot.mjs — the welcome's pure parts (tasks 1004785, 1004818).
 //
 // WHY. The welcome decides things a reader would only notice going wrong over days: whether today
-// is the first visit, whether it is day or night (and so which painting), what the banner names,
-// where each role goes, and whether the motion still sits on the painting. Those are pure, so this
+// is the first visit, whether it is day or night, what the banner names, where each role goes,
+// and that the scene is the city in the clouds with its doors taken out (task 1005308). Those are pure, so this
 // runs the REAL welcome-boot.js (it is Node-require-safe). The overlay itself is
 // tests/welcome_boot_browser.mjs.
 import assert from 'node:assert/strict';
@@ -39,40 +39,48 @@ test('the greeting follows the local hour, and the name falls back sensibly', ()
   assert.equal(W.nameOf({}), 'builder');
 });
 
-test('day is 06:00 to 17:59 local, night the rest, and each has its painting (task 1004818)', () => {
+test('day is 06:00 to 17:59 local, night the rest (the ink and the veil follow it)', () => {
   const at = (h, m = 0) => W.timeOfDay(new Date(2026, 9, 23, h, m));
   assert.deepEqual([at(5, 59), at(6), at(12), at(17, 59), at(18), at(23, 30), at(0)],
     ['night', 'day', 'day', 'day', 'night', 'night', 'night']);
-  assert.equal(W.artFor('day'), '/builders/welcome-day.webp');
-  assert.equal(W.artFor('night'), '/builders/welcome-night.webp');
 });
 
-test('both paintings ship, as WebP, in the one shape the motion is laid out for', () => {
-  for (const url of Object.values(W.ART)) {
-    const file = path.join(HALL, url.replace(/^\/builders\//, ''));
-    const buf = fs.readFileSync(file);
-    assert.equal(buf.toString('latin1', 0, 4) + buf.toString('latin1', 8, 12), 'RIFFWEBP', url + ' is a WebP');
-    assert.ok(buf.length < 400 * 1024, url + ' stays small enough for a first paint');
-    // The VP8X header carries the canvas size (24-bit, minus one) at bytes 24..29.
-    assert.equal(buf.toString('latin1', 12, 16), 'VP8X', url + ' carries its size');
-    const w = 1 + buf.readUIntLE(24, 3), h = 1 + buf.readUIntLE(27, 3);
-    assert.deepEqual([w, h], [W.AW, W.AH], url + ' is the painting the lights were placed on');
+// Task 1005308 (owner, 2026-11-14): the circuit-city painting is retired everywhere; the scene is the
+// city in the clouds Home's own painters draw (task 1005196), as a backdrop.
+test('the circuit-city painting is retired: no picture file, no lights pinned to its pixels', () => {
+  for (const name of ['welcome-day.webp', 'welcome-night.webp']) assert.equal(fs.existsSync(path.join(HALL, name)), false, name + ' is gone');
+  for (const gone of ['ART', 'artFor', 'TOWERS', 'LANES', 'AW', 'AH', 'pulseRuns', 'BEACONS']) assert.equal(W[gone], undefined, gone + ' went with the painting');
+  for (const file of ['welcome-boot.js', 'welcome-boot.css', 'shell-game.js', 'shell-game.css', 'index.html']) {
+    assert.doesNotMatch(fs.readFileSync(path.join(HALL, file), 'utf8'), /welcome-(day|night)\.webp|wb__img|gs__img|wb-motion/, file + ' names no part of the painting');
   }
 });
 
-test('every light sits inside the painting, and every pulse climbs inside its tower', () => {
-  const inside = ([x, y]) => x >= 0 && x <= W.AW && y >= 0 && y <= W.AH;
-  assert.equal(W.BEACONS, undefined, 'the blinking mast lights are gone (task 1005087)');
-  for (const t of W.TOWERS) assert.ok(inside([t.x, t.y]) && inside([t.x + t.w, t.y + t.h]), 'tower inside the painting');
-  const runs = W.pulseRuns(W.TOWERS, 3, 7);
-  assert.equal(runs.length, W.TOWERS.length * 3);
-  for (const r of runs) {
-    const t = W.TOWERS[r.tower];
-    assert.ok(r.x >= t.x && r.x <= t.x + t.w, 'a pulse runs up its own tower');
-    assert.ok(r.y1 > r.y0 && r.y0 >= t.y && r.y1 <= t.y + t.h, 'bottom to top, within the tower');
-    assert.ok(r.dur > 0 && r.delay >= 0);
+test("the scene is the city in the clouds, drawn by Home's own painters, with every door taken out", async () => {
+  const vm = await import('node:vm');
+  const ctx = { window: {}, console };
+  vm.createContext(ctx);
+  vm.runInContext(fs.readFileSync(path.join(HALL, 'city-draw.js'), 'utf8'), ctx);
+  const Gov = ctx.window.GovCity;
+  const Draw = require(path.join(HALL, 'home-city-draw.js'));
+  assert.ok(Gov && Draw, 'the painters load');
+  const s = W.sceneShapes(Draw, Gov);
+  assert.match(s.viewBox, /^0 0 1000 \d+$/);
+  const all = [];
+  (function walk(n) { all.push(n); n.kids.forEach(walk); })({ tag: 'root', attrs: {}, kids: s.nodes });
+  assert.ok(all.some((n) => /hc-cloud/.test(n.attrs.class || '')), 'it stands in cloud');
+  assert.ok(all.filter((n) => n.tag === 'path').length > 50, 'the core and the museum are drawn');
+  assert.equal(all.filter((n) => n.tag === 'a').length, 0, 'no link: it is a backdrop');
+  for (const n of all) {
+    for (const k of ['href', 'tabindex', 'aria-label', 'data-tip', 'data-tip-body', 'data-goal']) assert.equal(n.attrs[k], undefined, k + ' is taken out');
+    if (n.attrs.id) assert.ok(n.attrs.id.startsWith(W.SCENE_ID), "its ids never meet Home's own city's");
+    for (const v of Object.values(n.attrs)) assert.doesNotMatch(String(v), /url\(#(?!cs-)/, 'every reference points at its own prefixed id');
+    assert.doesNotMatch(n.attrs.class || '', /hc-quiet/, 'nothing is faded: the core leads');
   }
-  assert.deepEqual(W.pulseRuns(W.TOWERS, 3, 7), runs, 'seeded: every visit draws the same picture');
+  const json = JSON.stringify(s);
+  assert.doesNotMatch(json, /#[0-9a-f]{6}\b/i, "no typed colour: the hour's sky tokens only");
+  assert.match(json, /--sky-now-/, "it paints in the hour's sky");
+  assert.equal(W.sceneShapes(null, Gov), null, 'no painters: no city, and the sky stands alone');
+  assert.equal(W.paintScene(null), false);
 });
 
 test('the banner is the logo, named from the branding pack, never a hardcoded word (task 1004953)', () => {

package/tests/welcome_boot_browser.mjs

@@ -1,9 +1,9 @@
 // tests/welcome_boot_browser.mjs — the welcome in a real browser (tasks 1004785, 1004818).
 //
 // WHY. "Once a day", "Skip", "the craft picker does not also open", "Patron only with a seat", the day
-// and night paintings and the slow way out are behaviour across the real shell.js, craft-mode.js and
+// and night veils over the city in the clouds and the slow way out are behaviour across the real shell.js, craft-mode.js and
 // welcome-boot.js together — the shell is what decides which of the two greets a builder — so this
-// serves the REAL Home markup, the REAL hall scripts and the REAL paintings from a routed origin
+// serves the REAL Home markup and the REAL hall scripts (the city's painters too) from a routed origin
 // (localStorage needs one) in the ui-design kit's launcher. Every wait is on DOM state, never on a
 // flag that flips before the DOM settles (the task 1004780 CI flake). Skips when the machine has no
 // system Edge or Chrome, as ui_design_kit_fit does.
@@ -33,7 +33,9 @@ const INDEX = fs.readFileSync(path.join(HALL, 'index.html'), 'utf8')
   .replace(/<script\b[^>]*>[\s\S]*?<\/script>/g, '')
   .replace(/\{\{[^}]*\}\}/g, '');
 const STUB = '<script>window.__BRANDING__ = { identity: { worldName: "Harbor" } }; window.BongosClient = { createClient: () => ({ request: async () => ({ ok: false, status: 404, data: null }) }) };</script>';
-const SCRIPTS = ['dom-utils.js', 'shell-trail.js', 'craft-mode.js', 'welcome-boot.js', 'shell.js'] // dom-utils first, as on the real page (task 1004876)
+// The city's three painters draw the scene (task 1005308: the city in the clouds, not a painting).
+const PAINTERS = ['sky-time.js', 'city-draw.js', 'home-city-draw.js'];
+const SCRIPTS = ['dom-utils.js', ...PAINTERS, 'shell-trail.js', 'craft-mode.js', 'welcome-boot.js', 'shell.js'] // dom-utils first, as on the real page (task 1004876)
   .map((f) => `<script src="/builders/${f}"></script>`).join('');
 const PAGE = INDEX.replace('</body>', STUB + SCRIPTS + '</body>');
 
@@ -46,7 +48,7 @@ async function hall({ art = true, reducedMotion = 'no-preference', time = null }
     if (p === '/api/bongos/auth/web/start') return route.fulfill({ contentType: 'text/html', body: '<!doctype html><title>github</title><p id="auth">sign in</p>' });
     if (p === '/studio' || p === '/city') return route.fulfill({ contentType: 'text/html', body: '<!doctype html><title>room</title><p id="room">' + p + '</p>' });
     const ext = path.extname(p);
-    if (ext === '.webp' && !art) return route.fulfill({ status: 404, body: '' });
+    if (!art && PAINTERS.includes(path.basename(p))) return route.fulfill({ status: 404, body: '' });
     const f = path.join(HALL, p.replace(/^\/builders\//, ''));
     if (p.startsWith('/builders/') && TYPES[ext] && fs.existsSync(f)) return route.fulfill({ contentType: TYPES[ext], body: fs.readFileSync(f) });
     return route.fulfill({ status: 404, body: '' });
@@ -91,8 +93,8 @@ test('first visit of the day: the welcome, not the craft picker; Skip brings the
     'the welcome shows, the picker is marked asked and does not stack on it');
   assert.equal(await page.evaluate(() => document.querySelector('.wb__banner').tagName), 'DIV',
     'over a signed-in hall the shell keeps the one <header>; the banner is a plain block (task 1005080)');
-  // The painting loads and its motion is laid over it.
-  await page.waitForFunction(() => { const i = document.querySelector('#welcome-boot .wb__img'); return i && i.complete && i.naturalWidth === 1024; });
+  // The city in the clouds is drawn behind it (task 1005308).
+  await page.waitForSelector('#welcome-boot .cloud-scene .cloud-scene__svg path');
   assert.equal(await page.isVisible('[data-wb-skip]'), true);
   await page.click('[data-wb-skip]');
   await done(page);
@@ -227,17 +229,18 @@ test('roles: a seat holder sees Patron; Artisan stays on Home in Artisan', { ski
   await ctx.close();
 });
 
-test('no painting: the greeting and the choice still come up, over the sky colour', { skip }, async () => {
+test('no city painters: the greeting and the choice still come up, over the sky colour', { skip }, async () => {
   const ctx = await hall({ art: false });
   const { page } = await open(ctx);
   await signIn(page);
   await done(page);
   const s = await page.evaluate(() => ({
     bare: document.getElementById('welcome-boot').classList.contains('wb--bare'),
-    img: document.querySelector('#welcome-boot .wb__img').hidden,
+    city: !!document.querySelector('#welcome-boot .cloud-scene__svg'),
+    sky: !!document.querySelector('#welcome-boot .cloud-scene'),
     choices: document.querySelectorAll('.wb__choice').length,
   }));
-  assert.deepEqual(s, { bare: true, img: true, choices: 2 });
+  assert.deepEqual(s, { bare: true, city: false, sky: true, choices: 2 });
   await ctx.close();
 });
 
@@ -256,15 +259,16 @@ const look = (page) => page.evaluate(() => {
   return {
     day: r.classList.contains('wb--day'), night: r.classList.contains('wb--night'),
     veil: getComputedStyle(r.querySelector('.wb__veil')).backgroundColor,
-    art: r.querySelector('.wb__img').getAttribute('src'),
-    beacons: r.querySelectorAll('.wb-beacon').length,
+    city: !!r.querySelector('.cloud-scene__svg'),
+    hour: document.documentElement.getAttribute('data-sky-hour'),
+    img: r.querySelectorAll('img:not(.wb__logo)').length,
   };
 });
 
-test('by day the day painting opens from a white veil; by night the night one from black, with its lights', { skip }, async () => {
+test('by day the city opens from a white veil, by night from black, in the sky of that hour (task 1005308)', { skip }, async () => {
   for (const [time, want] of [
-    [new Date(2026, 9, 23, 10, 0), { day: true, night: false, veil: 'rgb(255, 255, 255)', art: '/builders/welcome-day.webp', beacons: 0 }],
-    [new Date(2026, 9, 23, 22, 0), { day: false, night: true, veil: 'rgb(0, 0, 0)', art: '/builders/welcome-night.webp', beacons: 0 }], // task 1005087 took the beacons out
+    [new Date(2026, 9, 23, 10, 0), { day: true, night: false, veil: 'rgb(255, 255, 255)', city: true, hour: '10', img: 0 }],
+    [new Date(2026, 9, 23, 22, 0), { day: false, night: true, veil: 'rgb(0, 0, 0)', city: true, hour: '22', img: 0 }],
   ]) {
     const ctx = await hall({ time });
     const { page } = await open(ctx);
@@ -305,19 +309,21 @@ test('the banner is the animated logo, the motion is laid on, and the drawn towe
   const ctx = await hall();
   const { page } = await open(ctx);
   await signIn(page);
-  await page.waitForSelector('#welcome-boot.wb--lit .wb-motion');
+  await page.waitForSelector('#welcome-boot.wb--lit .cloud-scene__svg');
   const s = await page.evaluate(() => ({
     banner: document.querySelector('.wb__banner').textContent,
     name: document.querySelector('.wb__banner .wb__name').textContent,
     mark: !!document.querySelector('.wb__banner svg.wb__mark .wb__moonlet'),
     ringAnim: getComputedStyle(document.querySelector('.wb__ring')).animationName,
-    pulses: document.querySelectorAll('#wb-fx .wb-pulse').length,
-    cars: document.querySelectorAll('#wb-fx .wb-car').length,
-    old: document.querySelectorAll('.wb-floor, .wb-bldg, .wb-person, #wb-scene, #wb-beam, #wb-city').length,
+    // anywhere on the page, under any container: the painting's lights must not come back
+    pulses: document.querySelectorAll('.wb-pulse, .wb-pulses').length,
+    cars: document.querySelectorAll('.wb-car').length,
+    // every earlier scene: the drawn tower and city, the painting and its light layer
+    old: document.querySelectorAll('.wb-floor, .wb-bldg, .wb-person, #wb-beam, #wb-city, #wb-fx, .wb-motion, .wb-moon, .wb-star, .wb__img').length,
   }));
   assert.doesNotMatch(s.banner, /Working on the core of/, 'task 1004953: the banner text is gone');
   assert.deepEqual({ name: s.name, mark: s.mark, ringAnim: s.ringAnim, pulses: s.pulses, cars: s.cars, old: s.old },
-    { name: 'Harbor', mark: true, ringAnim: 'wb-ring', pulses: 21, cars: 3, old: 0 });
+    { name: 'Harbor', mark: true, ringAnim: 'wb-ring', pulses: 0, cars: 0, old: 0 }, 'the painting\'s lights went with it (task 1005308)');
   await ctx.close();
 });