@bongos/core 1.24.81 → 1.24.83

package/modules/hall-ui/public/shell-game.js

@@ -7,18 +7,25 @@
 // the same html[data-fullscreen="on"] state, the same corner button and the same
 // Escape hand-off (a page listener that calls preventDefault keeps the press).
 //
-// The mode is one localStorage key (`hall-game`), so it follows the browser across
-// every hall page, and one attribute, html[data-game="on"], for a sheet or script
-// that wants to read it. Leaving full screen in game mode (the corner button)
-// brings the bars back for THAT page load only: the next page opens without them
-// again, and a page's own remembered choice is never overwritten. `?game=on` /
-// `?game=off` on any hall URL sets it by hand; the start screen's Start sets it on (R03, below).
+// GAME OR CLASSIC, never both (task 1005200; owner, 2026-11-11). Classic is the hall
+// as it always was; game is full screen with NO way back to the bars inside it (no
+// corner button, no Escape-to-leave: shell.js) and only the game PLACES below, so any
+// other hall page sends you to the city. The view is chosen at every sign-in (the
+// chooser in front of the start screen) and switched only in Options → Preferences →
+// View. It is kept on the ACCOUNT (GET/PATCH /api/bongos/me/hall-view, builder-settings
+// hall-view-prefs.js) so it follows the builder to any browser; one localStorage key
+// (`hall-game`) is only the copy a page paints from before that read answers, and one
+// attribute, html[data-game="on"], is what a sheet or script reads.
 // Loaded BEFORE shell.js on every hall page; a page without this file is simply
 // never in game mode.
 (function () {
   'use strict';
   var KEY = 'hall-game';
-  var HINT_KEY = 'hall-game-hint';
+  var VIEW_API = '/api/bongos/me/hall-view';
+  // The game's places, by page id (body data-page). Every other page is classic and is
+  // not reachable in game mode; a page joins this list when it has a game version.
+  var PLACES = ['home', 'city', 'goal-map', 'thinking', 'atlas', 'settings', 'profile'];
+  var embedded = false;   // set below, once: inside the options menu's frame
   function read(store, key) { try { return window[store].getItem(key); } catch (_) { return null; } }
   function write(store, key, value) { try { window[store].setItem(key, value); } catch (_) { /* private mode */ } }
   function on() { return read('localStorage', KEY) === 'on'; }
@@ -26,21 +33,57 @@
     var root = document.documentElement;
     if (on()) root.dataset.game = 'on'; else delete root.dataset.game;
   }
-  // Turn the mode on or off, and have the shell show what this page should now show.
-  function set(value) {
+  // '/builders' on the apex, '' on the builders host: the hall's own base.
+  function base() {
+    var p = String((window.location && window.location.pathname) || '');
+    return p.indexOf('/builders/') === 0 || p === '/builders' ? '/builders' : '';
+  }
+  // The page id an in-hall path names ('/city' → 'city', '/' → 'home'), or null.
+  function pageOf(path) {
+    var p = String(path || '').split(/[?#]/)[0].replace(/^\/builders(?=\/|$)/, '').replace(/\.html$/, '');
+    p = p.replace(/^\/+|\/+$/g, '');
+    if (p === '' || p === 'index') return 'home';
+    return p.indexOf('/') >= 0 ? null : p;
+  }
+  function isPlace(path) { return PLACES.indexOf(pageOf(path)) >= 0; }
+  function herePage() {
+    var b = document.body;
+    return (b && b.getAttribute && b.getAttribute('data-page')) || pageOf(window.location.pathname);
+  }
+  // In game mode a classic page is not there: go to the city. True when leaving.
+  function keepToPlaces() {
+    if (!on() || embedded) return false;
+    var page = herePage();
+    if (!page || PLACES.indexOf(page) >= 0) return false;
+    window.location.replace(base() + '/');
+    return true;
+  }
+  function save(view) {
+    if (typeof fetch !== 'function') return;
+    fetch(VIEW_API, { method: 'PATCH', credentials: 'same-origin', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ view: view }) })
+      .catch(function () { /* the browser's copy stands; the next choice saves again */ });
+  }
+  // Switch views: the browser's copy, the account (unless o.local: the account said so),
+  // then what this page shows. A classic page switched to game goes to the city.
+  function set(value, o) {
     write('localStorage', KEY, value ? 'on' : 'off');
+    if (!(o && o.local)) save(value ? 'game' : 'classic');
     stamp();
+    if (keepToPlaces()) return;
     if (window.OTBShell && window.OTBShell.setFullscreen) window.OTBShell.setFullscreen(null);
   }
-  // Whether the shell should say how to leave full screen. Outside game mode,
-  // always (its own rule); inside it, once per tab — every page opens in full
-  // screen there, and the same sentence on every page load is noise.
-  function hint() {
-    if (!on()) return true;
-    if (read('sessionStorage', HINT_KEY)) return false;
-    write('sessionStorage', HINT_KEY, '1');
-    return true;
+  // The account's view wins over the browser's copy (another browser may have switched).
+  // Never chosen (null), signed out, or no answer: the copy stands.
+  function sync() {
+    if (embedded || typeof fetch !== 'function') return;
+    fetch(VIEW_API, { credentials: 'same-origin' }).then(function (r) { return r.ok ? r.json() : null; }).then(function (d) {
+      var view = d && d.view;
+      if (view !== 'game' && view !== 'classic') return;
+      if ((view === 'game') !== on()) set(view === 'game', { local: true });
+    }, function () { /* offline: the copy stands */ });
   }
+  // The shell's "how to leave full screen" line. Game mode has no way to leave it.
+  function hint() { return !on(); }
 
   // ---------- the start screen and the load screen (task 1005143, BONGOS-V3 R03) ----------
   // A fresh sign-in opens on the start screen: Start, Options, Achievements, Extras, Quit over a
@@ -58,7 +101,6 @@
   var EXTRAS = [
     { label: 'The thinking sky', href: '/thinking' },
     { label: 'The atlas', href: '/atlas' },
-    { label: 'The docs', href: '/docs' },
   ];
   var TIPS = [
     'Escape opens the options menu, where every setting lives.',
@@ -91,6 +133,19 @@
     if (m.href) return '<li><a' + inner + ' href="' + esc(m.href) + '">' + esc(m.label) + '</a></li>';
     return '<li><button type="button"' + inner + (m.id === 'extras' ? ' aria-expanded="false" aria-controls="gs-extras"' : '') + '>' + esc(m.label) + '</button></li>';
   }
+  // The chooser in front of the start screen (task 1005200): game or classic, the view
+  // chosen last time marked and focused, so Enter keeps it.
+  var VIEWS = [
+    { id: 'game', label: 'Game', sub: 'The city, full screen' },
+    { id: 'classic', label: 'Classic', sub: 'The hall with its sidebar' },
+  ];
+  function lastView() { var v = read('localStorage', KEY); return v === 'on' ? 'game' : v === 'off' ? 'classic' : null; }
+  function viewHtml(v) {
+    var last = lastView() === v.id;
+    return '<li><button type="button" class="gs__item gs__item--view' + (last ? ' gs__item--last' : '') + '" data-gs="view-' + v.id + '">' +
+      '<span class="gs__view">' + esc(v.label) + (last ? '<span class="gs__last">Last time</span>' : '') + '</span>' +
+      '<span class="gs__sub">' + esc(v.sub) + '</span></button></li>';
+  }
   // The project's own logo where it has one (ADR 0358), else the shared mark, as the sidebar draws it.
   function markHtml() {
     var theme = (window.__BRANDING__ && window.__BRANDING__.theme) || {};
@@ -106,7 +161,9 @@
             '<h2 class="gs__title" id="gs-title">' + esc(o.name || 'This project') + '</h2>' +
           '</div>' +
           '<div class="gs__list">' +
-            '<ul class="gs__items">' + MENU.map(itemHtml).join('') + '</ul>' +
+            '<p class="gs__ask" id="gs-ask">How do you want to see it?</p>' +
+            '<ul class="gs__items" id="gs-views">' + VIEWS.map(viewHtml).join('') + '</ul>' +
+            '<ul class="gs__items" id="gs-items" hidden>' + MENU.map(itemHtml).join('') + '</ul>' +
             '<ul class="gs__items gs__items--extras" id="gs-extras" hidden>' + EXTRAS.map(function (x) {
               return '<li><a class="gs__item gs__item--extra" href="' + esc(x.href) + '">' + esc(x.label) + '</a></li>';
             }).join('') + '</ul>' +
@@ -244,10 +301,24 @@
     btn.setAttribute('aria-expanded', open ? 'true' : 'false');
     if (open) box.querySelector('a').focus();
   }
+  // Game: on to the start screen. Classic: the screen goes and the hall is as it always was.
+  function choose(view) {
+    if (phase !== 'choose') return;
+    if (view === 'classic') { set(false); close(); return; }
+    set(true);
+    phase = 'menu';
+    root.querySelector('#gs-ask').hidden = true;
+    root.querySelector('#gs-views').hidden = true;
+    root.querySelector('#gs-items').hidden = false;
+    var first = root.querySelector('[data-gs="start"]');
+    if (first && first.focus) first.focus();
+  }
   function onClick(e) {
     var el = e.target.closest && e.target.closest('.gs__item');
-    if (!el || phase !== 'menu') return;
+    if (!el) return;
     var id = el.getAttribute('data-gs');
+    if (id === 'view-game' || id === 'view-classic') { choose(id.slice(5)); return; }
+    if (phase !== 'menu') return;
     if (id === 'start') load();
     else if (id === 'extras') toggleExtras(el);
     else if (id === 'quit') quit();
@@ -262,7 +333,7 @@
       if (phase === 'menu' && !box.hidden) { var b = root.querySelector('[data-gs="extras"]'); toggleExtras(b); b.focus(); }
       return;
     }
-    if (phase !== 'menu') return;
+    if (phase !== 'menu' && phase !== 'choose') return;
     var f = items(), at = f.indexOf(document.activeElement), step = 0;
     if (e.key === 'ArrowDown') step = 1;
     else if (e.key === 'ArrowUp') step = -1;
@@ -277,7 +348,7 @@
   function start(o) {
     if (root || !document.body) return !!root;
     opts = o || {};
-    phase = 'menu';
+    phase = 'choose';
     root = document.createElement('div');
     root.className = 'gs';
     root.id = 'game-start';
@@ -289,15 +360,11 @@
     document.addEventListener('keydown', onKey, true);
     document.body.appendChild(root);
     document.documentElement.classList.add('gs-open');
-    var first = root.querySelector('.gs__item');
+    var first = root.querySelector('.gs__item--last') || root.querySelector('.gs__item');
     if (first && first.focus) first.focus();
     return true;
   }
 
-  try {
-    var asked = new URLSearchParams(window.location.search || '').get('game');
-    if (asked === 'on' || asked === 'off') write('localStorage', KEY, asked);
-  } catch (_) { /* old engine: the stored value stands */ }
   stamp();
 
   // ---------- the options menu (task 1005144, BONGOS-V3 R04, ADR 0401) ----------
@@ -309,7 +376,6 @@
   // Escape nobody used goes to the menu. Only inside a frame: the same URL opened
   // on its own is the page with its chrome (the server sends a plain visit of the
   // old address to the menu, serve-internal.js).
-  var embedded = false;
   try {
     embedded = new URLSearchParams(window.location.search || '').get('embed') === '1'
       && !!window.parent && window.parent !== window;
@@ -320,10 +386,9 @@
     if (document.body && document.body.setAttribute) document.body.setAttribute('data-fullscreen-switch', 'off');
   }
   // The hall's address for the menu: '/settings' on the builders host, '/builders/settings' on the apex.
-  function menuPath() {
-    var p = String((window.location && window.location.pathname) || '');
-    return (p.indexOf('/builders/') === 0 || p === '/builders' ? '/builders' : '') + '/settings';
-  }
+  function menuPath() { return base() + '/settings'; }
+  keepToPlaces();
+  sync();
   function inField(el) {
     var tag = el && el.tagName ? String(el.tagName).toLowerCase() : '';
     return tag === 'input' || tag === 'textarea' || tag === 'select' || !!(el && el.isContentEditable);
@@ -359,5 +424,5 @@
     }, true);
   }
   window.OTBShellGame = { on: on, set: set, hint: hint, start: start, tipAt: tipAt, historySteps: historySteps, whenLabel: whenLabel, segsDone: segsDone, MENU: MENU, TIPS: TIPS,
-    embedded: function () { return embedded; }, menuPath: menuPath };
+    embedded: function () { return embedded; }, menuPath: menuPath, PLACES: PLACES, pageOf: pageOf, isPlace: isPlace };
 })();

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

@@ -560,7 +560,8 @@
   // button and Escape bring them back. Opt out with <body data-fullscreen-switch="off">;
   // the bare attribute means the page lays itself out for it, else it is `plain`.
   // State: html[data-fullscreen="on"], remembered PER PAGE (`hall-fullscreen:<data-page>`).
-  // task 1005142: in game mode (shell-game.js) EVERY page opens in it, whatever it remembers.
+  // task 1005142: in game mode (shell-game.js) EVERY page opens in it, whatever it remembers,
+  // and since task 1005200 it STAYS in it: no button (style.css), no Escape-to-leave.
   var GAME = window.OTBShellGame || { on: function () { return false; }, hint: function () { return true; } };
   var FULLSCREEN_KEY = 'hall-fullscreen:';
   function fullscreenAttr() {
@@ -604,7 +605,7 @@
     leave: '<svg viewBox="0 0 18 18" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M7 3v4H3M15 7h-4V3M11 15v-4h4M3 11h4v4"/></svg>',
   };
   function applyFullscreen(on) {
-    if (!fullscreenPage()) on = false;
+    if (!fullscreenPage()) on = false; else if (GAME.on()) on = true;
     var root = document.documentElement;
     if (on) root.dataset.fullscreen = 'on'; else delete root.dataset.fullscreen;
     if (on && fullscreenAttr() === null) root.dataset.fullscreenPlain = 'on'; else delete root.dataset.fullscreenPlain;
@@ -641,7 +642,7 @@
   // a text field, where Escape belongs to the field. Page listeners may be on
   // the window AFTER this one, so the verdict waits for the dispatch to finish.
   function onFullscreenKey(e) {
-    if (e.key !== 'Escape' || !isFullscreen() || e.defaultPrevented || inTextField(e.target)) return;
+    if (e.key !== 'Escape' || !isFullscreen() || GAME.on() || e.defaultPrevented || inTextField(e.target)) return;
     window.setTimeout(function () { if (!e.defaultPrevented && isFullscreen()) setFullscreen(false); }, 0);
   }
 

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

@@ -10,7 +10,7 @@
   <!-- The faces (Manrope, JetBrains Mono) come from the branding pack's font
        links, injected into this head by the server like every hall page's
        (tests/hall_tokens.mjs: no hall page hardcodes a web-font stylesheet). -->
-  <link rel="stylesheet" href="/builders/style.css?v=2026-11-11-helm">
+  <link rel="stylesheet" href="/builders/style.css?v=2026-11-11-helm2">
   <link rel="stylesheet" href="/builders/street.css?v=2026-11-11-helm">
   <link rel="stylesheet" href="/builders/street-card.css?v=2026-10-04-record1">
   <link rel="stylesheet" href="/builders/street-deck.css?v=2026-10-17-tidy">
@@ -225,10 +225,10 @@
 </div>
 
 <script src="/builders/dom-utils.js?v=2026-11-05-numbers"></script>
-<script src="/builders/shell-game.js?v=2026-11-11-helm"></script>
+<script src="/builders/shell-game.js?v=2026-11-11-view2"></script>
 <script src="/builders/shell-trail.js?v=2026-11-05-numbers"></script>
 <script src="/builders/craft-mode.js?v=2026-11-10-visor"></script>
-<script src="/builders/shell.js?v=2026-11-11-helm"></script>
+<script src="/builders/shell.js?v=2026-11-11-view2"></script>
 <script src="/builders/hall-dialog.js"></script>
 <script src="/builders/palette.js" defer></script>
 <script src="/builders/gov-living.js?v=2026-10-09-positions1"></script>

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

@@ -12,7 +12,7 @@
   <link rel="icon" href="/modules/ui-design/public/brand/favicon.svg" type="image/svg+xml">
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link rel="stylesheet" href="/builders/style.css?v=2026-11-11-helm">
+  <link rel="stylesheet" href="/builders/style.css?v=2026-11-11-helm2">
   <link rel="stylesheet" href="/builders/studio.css?v=2026-10-09-day">
   <link rel="stylesheet" href="/builders/approval-queue.css?v=2026-09-29-aqfix">
   <link rel="stylesheet" href="/builders/home-gallery.css?v=2026-11-04-studio">
@@ -222,10 +222,10 @@
 <div id="toast" class="toast" role="status" aria-live="polite" data-visible="0"></div>
 
 <script src="/builders/dom-utils.js?v=2026-11-05-numbers"></script>
-<script src="/builders/shell-game.js?v=2026-11-11-helm"></script>
+<script src="/builders/shell-game.js?v=2026-11-11-view2"></script>
 <script src="/builders/shell-trail.js?v=2026-11-05-numbers"></script>
 <script src="/builders/craft-mode.js?v=2026-11-10-visor"></script>
-<script src="/builders/shell.js?v=2026-11-11-helm"></script>
+<script src="/builders/shell.js?v=2026-11-11-view2"></script>
 <script src="/builders/hall-dialog.js"></script>
 <script src="/builders/palette.js" defer></script>
 <!-- The kit, for its ONE renderer: the full-size ship-time visual figure