@bongos/core 1.25.1 → 1.25.3

package/modules/ui-design/kit/fixtures/founding-genesis-votes.json

@@ -0,0 +1,193 @@
+{
+  "_": "Genesis with several stages in the Board Room at once (task 1005199): scope, strategize and charter sitting on the founder, legalize finished and not yet put up, legislation in progress.",
+  "genesis": {
+    "stage": "scope",
+    "stage_number": 1,
+    "stage_count": 5,
+    "day": 2,
+    "deciding": false,
+    "plan": {
+      "days": {
+        "scope": 7,
+        "strategize": 7,
+        "charter": 4,
+        "legalize": 7,
+        "legislation": 3
+      },
+      "passes": 1,
+      "advisors": "none",
+      "government": "monarchy",
+      "expected_builders": 1,
+      "existing": false
+    },
+    "demo": null,
+    "stages": [
+      {
+        "key": "scope",
+        "number": 1,
+        "label": "Scope",
+        "life": "primordial sea",
+        "plate": "r5-life-1-primordial-sea",
+        "done_when": "The scope is written: what you are making, for whom, and what is left out.",
+        "wakes": [
+          "goals",
+          "goal-map"
+        ],
+        "days": 7,
+        "minutes": null,
+        "due": "2026-11-17T09:00:00.000Z",
+        "state": "now",
+        "tasks": [
+          {
+            "id": "2001",
+            "title": "Scope: write it down",
+            "status": "shipped",
+            "finished": true
+          }
+        ],
+        "finished": 1,
+        "total": 1,
+        "can_close": false,
+        "board": {
+          "state": "sitting",
+          "item_id": "41",
+          "needs": "One yes decides: the first member to say yes closes it.",
+          "one_vote_decides": true,
+          "waiting_on": [
+            {
+              "builder_id": "1",
+              "display_name": "Founder"
+            }
+          ]
+        }
+      },
+      {
+        "key": "strategize",
+        "number": 2,
+        "label": "Strategize",
+        "life": "first cells",
+        "plate": "r5-life-2-first-cells",
+        "done_when": "The strategy is written out, or the one you have is linked.",
+        "wakes": [
+          "work"
+        ],
+        "days": 7,
+        "minutes": null,
+        "due": null,
+        "state": "later",
+        "tasks": [
+          {
+            "id": "2002",
+            "title": "Strategize: write it down",
+            "status": "shipped",
+            "finished": true
+          }
+        ],
+        "finished": 1,
+        "total": 1,
+        "can_close": false,
+        "board": {
+          "state": "sitting",
+          "item_id": "42",
+          "needs": "One yes decides: the first member to say yes closes it.",
+          "one_vote_decides": true,
+          "waiting_on": [
+            {
+              "builder_id": "1",
+              "display_name": "Founder"
+            }
+          ]
+        }
+      },
+      {
+        "key": "charter",
+        "number": 3,
+        "label": "Charter",
+        "life": "the genome",
+        "plate": "r5-life-3-genome",
+        "done_when": "The starting government is chosen and the bylaws are written.",
+        "wakes": [],
+        "days": 4,
+        "minutes": null,
+        "due": null,
+        "state": "later",
+        "tasks": [
+          {
+            "id": "2003",
+            "title": "Charter: write it down",
+            "status": "shipped",
+            "finished": true
+          }
+        ],
+        "finished": 1,
+        "total": 1,
+        "can_close": false,
+        "board": {
+          "state": "sitting",
+          "item_id": "43",
+          "needs": "One yes decides: the first member to say yes closes it.",
+          "one_vote_decides": true,
+          "waiting_on": [
+            {
+              "builder_id": "1",
+              "display_name": "Founder"
+            }
+          ]
+        }
+      },
+      {
+        "key": "legalize",
+        "number": 4,
+        "label": "Legalize",
+        "life": "the membrane",
+        "plate": "r5-life-4-membrane",
+        "done_when": "Rewards are decided, and who can be paid.",
+        "wakes": [],
+        "days": 7,
+        "minutes": null,
+        "due": null,
+        "state": "later",
+        "tasks": [
+          {
+            "id": "2004",
+            "title": "Legalize: write it down",
+            "status": "shipped",
+            "finished": true
+          }
+        ],
+        "finished": 1,
+        "total": 1,
+        "can_close": true,
+        "board": null
+      },
+      {
+        "key": "legislation",
+        "number": 5,
+        "label": "Legislation",
+        "life": "the nervous system",
+        "plate": "r5-life-5-nervous-system",
+        "done_when": "The voting rules are set: who votes, and how many must agree.",
+        "wakes": [],
+        "days": 3,
+        "minutes": null,
+        "due": null,
+        "state": "later",
+        "tasks": [
+          {
+            "id": "2005",
+            "title": "Legislation: write it down",
+            "status": "active",
+            "finished": false
+          }
+        ],
+        "finished": 0,
+        "total": 1,
+        "can_close": false,
+        "board": null
+      }
+    ],
+    "can_close": false,
+    "can_come_alive": false
+  },
+  "viewer_id": "1"
+}

package/modules/ui-design/kit/fixtures/me-founding-demo.json

@@ -17,7 +17,6 @@
       "goals": "scope",
       "goal-map": "scope",
       "work": "strategize",
-      "board-room": "charter",
       "economy": "legalize",
       "ranks": "legislation",
       "collab": "alive",

package/modules/ui-design/kit/fixtures/me-founding.json

@@ -14,7 +14,6 @@
     "day": 9,
     "asleep": {
       "work": "strategize",
-      "board-room": "charter",
       "economy": "legalize",
       "ranks": "legislation",
       "collab": "alive",

package/package-lock.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bongos/core",
-  "version": "1.25.1",
+  "version": "1.25.3",
   "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",

package/release-notes.json

@@ -11700,5 +11700,17 @@
       "id": "1005040",
       "text": "Added the Stripe Connect test-mode payment adapter (economy.processor port). Every payout, cash-out, balance and ledger-check call now has a processor to talk to once a test key is set; nothing is live."
     }
+  ],
+  "1.25.2": [
+    {
+      "id": "1005248",
+      "text": "In game mode, no two buttons on the visor share a hotkey any more, and Options now sits only inside the Actions menu with its own key."
+    }
+  ],
+  "1.25.3": [
+    {
+      "id": "1005199",
+      "text": "Founding a project is faster: each finished stage goes to the Board Room by itself, every stage can be voted on at once with one \"vote yes on all\" button, and the Board Room no longer looks locked during genesis."
+    }
   ]
 }

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.1'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
+const CORE_VERSION = '1.25.3'; // 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/founding_mode.mjs

@@ -38,22 +38,32 @@ test('an unknown stage fails CLOSED — OFF, never a hall stuck half-asleep', ()
   assert.equal(fm.shapeFoundingMode({ active: 'true', stage: 'launch' }), null);
 });
 
-test('active with no stage yet is the decide pre-stage, and every room sleeps', () => {
+test('active with no stage yet is the decide pre-stage, and every room but the Board Room sleeps', () => {
   const f = fm.shapeFoundingMode({ active: 'true' });
   assert.equal(f.stage, 'decide');
   assert.equal(f.stage_number, 0);
   assert.equal(f.stage_count, 5);
   // task 1005051: Roadmap folded into Goals; scope wakes Goals and its map.
-  for (const id of ['goals', 'goal-map', 'work', 'board-room', 'collab', 'roster']) {
+  for (const id of ['goals', 'goal-map', 'work', 'collab', 'roster']) {
     assert.ok(id in f.asleep, `${id} sleeps while deciding`);
   }
 });
 
+// task 1005199: every stage, from scope on, is closed by a vote in the Board Room, so
+// the room must never read as locked while genesis has a ballot in it.
+test('the Board Room is awake at every stage of genesis', () => {
+  for (const stage of fm.STAGES) {
+    const f = fm.shapeFoundingMode({ active: 'true', stage });
+    assert.ok(!('board-room' in f.asleep), `board-room is awake at ${stage}`);
+  }
+  assert.ok(!Object.values(fm.WAKES).some((ids) => ids.includes('board-room')), 'no stage wakes it, because it never sleeps');
+});
+
 test('a room wakes once the stage that wakes it is behind', () => {
   const f = fm.shapeFoundingMode({ active: 'true', stage: 'charter' });
   for (const id of ['goals', 'goal-map', 'work']) assert.ok(!(id in f.asleep), `${id} woke`);
   assert.ok(!('roadmap' in f.asleep), 'the folded Roadmap is no room to wake');
-  assert.equal(f.asleep['board-room'], 'charter');
+  assert.ok(!('board-room' in f.asleep), 'the Board Room never sleeps (task 1005199)');
   // task 1005046: Economy and Ranks were the rooms legalize and legislation woke;
   // they are Primer chapters now, and the Primer never sleeps.
   assert.ok(!('economy' in f.asleep) && !('ranks' in f.asleep), 'no retired Docs page is put to sleep');

package/tests/genesis_home.mjs

@@ -249,13 +249,65 @@ test('the owner can skip genesis from any stage: no sitting, hall opens, recorde
   assert.equal(await gh.readGenesis(mid.deps()), null);
 });
 
-test('only the stage in progress can be put to the board', async () => {
+test('a later stage can be put to the board once finished; a stage behind cannot (task 1005199)', async () => {
   const w = world();
   await gh.startFounding(1, w.deps());
   await gh.savePlan({}, 1, w.deps());
+  assert.equal((await gh.closeStage('charter', 1, w.deps())).reason, 'stage_tasks_unfinished', 'the finished-tasks gate still holds');
+  w.finish('charter');
   const r = await gh.closeStage('charter', 1, w.deps());
-  assert.equal(r.reason, 'not_current_stage');
-  assert.equal(w.opened.length, 0);
+  assert.equal(r.reason, 'sitting_open', 'charter sits while the project is still at scope');
+  assert.deepEqual(w.opened.at(-1).stageKey, 'charter');
+  assert.equal((await gh.readGenesis(w.deps())).stage, 'scope');
+  w.finish('scope'); w.pass('scope'); await gh.onStagePassed(w.deps());
+  assert.equal((await gh.closeStage('scope', 1, w.deps())).reason, 'not_current_stage', 'a stage behind is refused');
+  assert.equal((await gh.closeStage('decide', 1, w.deps())).reason, 'unknown_stage');
+});
+
+test('every finished stage sits at once, and they pass in order (task 1005199)', async () => {
+  const w = world();
+  await gh.startFounding(1, w.deps());
+  await gh.savePlan({}, 1, w.deps());
+  for (const s of STAGES5) w.finish(s);
+  let g = await gh.readGenesis(w.deps());
+  assert.deepEqual(g.stages.map((s) => s.can_close), [true, true, true, true, true], 'every finished stage can be put up');
+  for (const s of STAGES5) await gh.closeStage(s, 1, w.deps());
+  g = await gh.readGenesis(w.deps());
+  assert.deepEqual(g.stages.map((s) => s.board && s.board.state), Array(5).fill('sitting'));
+  assert.deepEqual(g.stages.map((s) => s.can_close), [false, false, false, false, false], 'a sitting stage is not put up twice');
+  // A later pass does not move the project past an earlier stage still sitting.
+  w.pass('charter'); w.pass('legalize');
+  await gh.onStagePassed(w.deps());
+  assert.equal((await gh.readGenesis(w.deps())).stage, 'scope', 'scope still sits: the project waits for it');
+  w.pass('scope'); await gh.onStagePassed(w.deps());
+  assert.equal((await gh.readGenesis(w.deps())).stage, 'strategize', 'scope passed; strategize still sits, so the project stops there');
+  w.pass('strategize'); await gh.onStagePassed(w.deps());
+  assert.equal((await gh.readGenesis(w.deps())).stage, 'legislation', 'strategize passed: charter and legalize had passed already');
+  w.pass('legislation'); await gh.onStagePassed(w.deps());
+  g = await gh.readGenesis(w.deps());
+  assert.equal(g.can_come_alive, true, 'one click left: bring it to life');
+  assert.equal((await gh.comeAlive(1, w.deps())).ok, true);
+});
+
+test('shipping the last task of a stage puts it in the Board Room by itself (task 1005199)', async () => {
+  const w = world();
+  assert.deepEqual(await gh.onTaskShipped(w.deps()), [], 'not founding: nothing is put up');
+  await gh.startFounding(1, w.deps());
+  await gh.savePlan({}, 1, w.deps());
+  assert.deepEqual(await gh.onTaskShipped(w.deps()), [], 'no stage is finished yet');
+  w.finish('scope'); w.finish('legalize');
+  assert.deepEqual(await gh.onTaskShipped(w.deps()), ['scope', 'legalize'], 'every finished stage, current and later');
+  assert.equal(w.opened.length, 2);
+  assert.deepEqual(await gh.onTaskShipped(w.deps()), [], 'a stage already sitting is not put up again');
+  w.board.strategize = { state: 'returned', waiting_on: [] };
+  w.finish('strategize');
+  assert.deepEqual(await gh.onTaskShipped(w.deps()), [], 'a stage the board sent back waits for the founder');
+  assert.deepEqual(await gh.onTaskShipped({ ...w.deps(), government: { genesisStageStatus: async () => { throw new Error('down'); }, openGenesisStageClose: async () => ({}) } }), [], 'a failure never throws into the ship');
+});
+
+test('the route factory listens for ships (task 1005199)', () => {
+  const src = fs.readFileSync(path.join(ROOT, 'modules', 'onboarding', 'routes', 'onboarding.js'), 'utf8');
+  assert.match(src, /api\.on\('task\.shipped', \(\) => genesis\.onTaskShipped\(\)\)/);
 });
 
 test('a returned stage stays put and can be put up again', async () => {
@@ -316,7 +368,7 @@ function bootCard({ founding, data = { genesis: null } }) {
   const attrs = founding ? { 'data-founding': 'on' } : {};
   const sandbox = {
     window: {
-      OTB: { escapeHtml: (s) => String(s), contributeHallWidget: (w) => { widget = w; } },
+      OTB: { escapeHtml: (s) => String(s), statusPill: (s) => `<span>${s}</span>`, contributeHallWidget: (w) => { widget = w; } },
       BongosClient: { createClient: () => ({ request: async (m, p) => { calls.push(`${m} ${p}`); return { ok: true, status: 200, data }; } }) },
     },
     document: { documentElement: { getAttribute: (k) => attrs[k] || null } },
@@ -371,6 +423,42 @@ test('a demo\'s genesis card: no decide form, the settled plan in one line, each
   assert.doesNotMatch(host.innerHTML, /data-genesis-plan/, 'a demo never shows the decide form');
 });
 
+test('the card lists every stage vote waiting on the viewer, and votes yes on all in order (task 1005199)', async () => {
+  const me = [{ builder_id: '1', display_name: 'Founder' }];
+  const genesis = gh.shapeGenesis({
+    mode: { stage: 'scope', stage_number: 1, stage_count: 5, day: 1 },
+    plan: gh.parsePlan({}).plan,
+    tasks: Object.fromEntries(STAGES5.map((s, i) => [s, [{ id: String(100 + i), title: s, status: i < 4 ? 'shipped' : 'ready' }]])),
+    board: {
+      scope: { state: 'sitting', item_id: '11', waiting_on: me, needs: 'One yes decides.' },
+      strategize: { state: 'sitting', item_id: '12', waiting_on: me },
+      charter: { state: 'passed', item_id: '13', waiting_on: [] },
+    },
+  });
+  assert.deepEqual(genesis.stages.map((s) => s.can_close), [false, false, false, true, false], 'only legalize is finished and not yet on the board');
+  const b = bootCard({ founding: true, data: { genesis, viewer_id: '1' } });
+  let onClick = null;
+  b.host.addEventListener = (type, fn) => { if (type === 'click') onClick = fn; };
+  b.host.contains = () => true;
+  b.widget.mount(b.host); // re-mount so the click handler is captured
+  await new Promise((r) => setImmediate(r));
+  await new Promise((r) => setImmediate(r));
+  const html = b.host.innerHTML;
+  assert.match(html, /Waiting for your vote · 2 stages/);
+  assert.match(html, /data-genesis-vote-all>Vote yes on all 2</);
+  assert.match(html, /passed, waits its turn/, 'a later stage that passed says it waits for the earlier ones');
+  assert.match(html, /data-genesis-close="legalize">Put to the board</, 'a finished later stage can be put up from its row');
+  assert.doesNotMatch(html, /data-genesis-close="legislation"/, 'an unfinished stage cannot');
+  b.calls.length = 0;
+  const btn = { hasAttribute: (k) => k === 'data-genesis-vote-all' };
+  onClick({ target: { closest: () => btn } });
+  for (let i = 0; i < 6; i++) await new Promise((r) => setImmediate(r));
+  assert.deepEqual(b.calls.slice(0, 2), [
+    'POST /api/bongos/government/board/items/11/votes',
+    'POST /api/bongos/government/board/items/12/votes',
+  ], 'one yes per stage, earliest first');
+});
+
 test('the hall carries the five life plates byte-identical to the world\'s', () => {
   const world = path.join(ROOT, 'modules', 'public-landing', 'public', 'assets', 'world');
   const hall = path.join(ROOT, 'modules', 'hall-ui', 'public', 'genesis');

package/tests/hall_visor.mjs

@@ -77,6 +77,64 @@ test("a place's own key: the visor binds it only when the scene asks, and the ch
   assert.equal(V.keyFor('artisan', ev('c')).id, 'claim', "the character's key wins a clash");
 });
 
+// task 1005248 (owner, 2026-11-12): a key the visor shows is a recommendation, and no two
+// things on the glass or in the sheet ever share one. Every key comes from resolveKeys.
+function shownKeys(r) {
+  const out = [['a', 'Actions'], ['esc', 'Close']];
+  r.actions.forEach((a) => out.push([a.key, a.id]));
+  r.place.forEach((k, i) => out.push([k, 'place ' + i]));
+  r.lines.forEach((k, i) => out.push([k, 'line ' + i]));
+  out.push([r.options.key, 'options']);
+  return out.filter(([k]) => k);
+}
+function assertNoClash(V, who) {
+  for (const c of ['artisan', 'artist', 'patron']) {
+    const keys = shownKeys(V.resolveKeys(c)).map(([k]) => k);
+    assert.equal(new Set(keys).size, keys.length, `${who} / ${c}: one owner per key (${keys.join(' ')})`);
+  }
+}
+const SKY = { name: 'sky', place: '', actions: [{ label: 'Write a thought', key: '/', lead: true, run() {} }, { label: 'Jump to a goal or a thought', key: 'j', bind: true, run() {} }, { label: 'List', key: 'L', run() {} }, { label: 'Tour', key: '?', run() {} }, { label: 'Fit', key: '0', run() {} }, { label: 'Clock · off', key: '', run() {} }], keys: [{ label: 'Look around', key: 'drag' }, { label: 'Zoom', key: '+ −' }] };
+const CITY = { name: 'city', place: 'Governor city', actions: [{ label: 'decide 37 in a row', key: 'd', bind: true, lead: true, run() {} }, { label: 'Archived: Street', run() {} }], keys: [{ label: 'On a card: answer', key: '1–9' }, { label: 'On a card: next', key: '← →' }] };
+
+test('no key ever means two things: every character over every real scene, and Options never on Escape', () => {
+  const V = loadPure();
+  assertNoClash(V, 'no scene');
+  for (const sc of [SKY, CITY, { name: 'home', place: 'Home' }]) { V.scene(sc); assertNoClash(V, sc.name); }
+  for (const c of ['artisan', 'artist', 'patron']) {
+    const r = V.resolveKeys(c);
+    assert.notEqual(r.options.key, 'esc', `${c}: Options is not on Escape; Escape is Close`);
+    assert.ok(r.options.key, `${c}: Options has a key of its own`);
+  }
+  assert.equal(V.resolveKeys('artist').options.key, 'o', 'O is Options where nothing else holds it');
+  assert.equal(V.resolveKeys('patron').options.key, 'p', "the Patron's O is the Board room, so Options moves to its next letter");
+});
+
+test('a clash moves the later claimant to a free letter of its own name, and its key follows', () => {
+  const V = loadPure();
+  const ev = (key) => ({ key, defaultPrevented: false, ctrlKey: false, metaKey: false, altKey: false });
+  const run = () => {};
+  // the worst a scene can register: its own keys on A, Escape, a character key, and twice on one key
+  V.scene({ name: 'x', place: 'X', actions: [
+    { label: 'Grab', key: 'a', run }, { label: 'Exit', key: 'Esc', run }, { label: 'Go', key: 'g', run }, { label: 'Again', key: 'g', run },
+    { label: 'Claim here', key: 'c', bind: true, run }, { label: 'Thing', key: 't', bind: true, run }, { label: 'Open', key: 'o', bind: true, run },
+  ], keys: [{ label: 'Same as Go', key: 'G' }] });
+  assertNoClash(V, 'hostile scene');
+  const r = V.resolveKeys('artisan');
+  const plain = (x) => JSON.parse(JSON.stringify(x));
+  assert.deepEqual(plain(r.place.slice(0, 4)), ['', '', 'g', ''], "A and Escape are the visor's; the scene keeps G once, and a second claim shows no key");
+  assert.equal(r.lines[0], '', 'a key line on a taken key shows no key');
+  assert.equal(r.actions.find((a) => a.id === 'sky').key, 'o', 'Goal sky lost G to the scene, so it moves to the next letter of its name, O');
+  assert.equal(V.keyFor('artisan', ev('o')).id, 'sky', 'and O runs it');
+  assert.equal(V.keyFor('artisan', ev('g')), null, "G is the scene's own now, so the visor does not take it");
+  assert.ok(!['c', 'l', 'a'].includes(r.place[4]), 'Claim here: C is taken, L and A are never handed out');
+  assert.equal(V.keyFor('artisan', ev(r.place[4])).label, 'Claim here');
+  assert.equal(V.keyFor('artisan', ev('c')).id, 'claim', "the character's key still wins");
+  assert.ok(r.place[6] && r.place[6] !== 'o', "Open asked for O after Goal sky took it, so it moves");
+  assert.equal(V.keyFor('artisan', ev(r.place[6])).label, 'Open');
+  assert.equal(V.keyFor('artisan', ev(r.options.key)).id, 'options', 'and Options takes the next free letter');
+  assert.equal(V.keyFor('artisan', ev('Escape')), null, 'the ambient glass never takes Escape');
+});
+
 // task 1005203: the four segments are the version the project is building, in quarters.
 test('progress: the starred version while open, else the one building, else none', () => {
   const V = loadPure();
@@ -238,7 +296,8 @@ test('in game mode the glass shows the place, the main action, the key hints, th
   assert.equal(g.credits, '56,021 credits');
   assert.deepEqual([g.num, g.unit], ['56,021', 'credits'], 'the count and its word are two spans of the same text');
   // task 1005195: every other control is a quiet key hint. Actions kept its key and its sheet; nothing was dropped.
-  assert.deepEqual(g.hints, ['TYour thinking', 'AActions', 'EscOptions']);
+  // task 1005248: Options is only in the sheet, so Escape is on the glass nowhere.
+  assert.deepEqual(g.hints, ['TYour thinking', 'AActions']);
   assert.equal(g.arcs, 2, 'two arcs frame the glass');
   assert.equal(g.sprite, '/builders/characters/artisan-visor.png', 'your picture on the glass is you wearing the visor (task 1005218)');
   assert.deepEqual(errors, []);
@@ -295,7 +354,7 @@ test('a lead scene action is the first key hint, and its click and its key run i
   const { ctx, page, errors } = await open();
   await page.evaluate(() => OTBVisor.scene({ name: 'test', place: 'Test city', actions: [{ label: 'Decide 2 in a row', key: 'd', bind: true, lead: true, run() { window.decided = (window.decided || 0) + 1; } }] }));
   const hints = await page.$$eval('.visor__hints .visor__hint', (h) => h.map((x) => x.textContent));
-  assert.deepEqual(hints, ['DDecide 2 in a row', 'TYour thinking', 'AActions', 'EscOptions']);
+  assert.deepEqual(hints, ['DDecide 2 in a row', 'TYour thinking', 'AActions']);
   await page.click('.visor__hint--place');
   await page.keyboard.press('d');
   assert.equal(await page.evaluate(() => window.decided), 2, 'the hint and D both press it');
@@ -311,7 +370,8 @@ test('the sheet lists the character\'s actions, then this place, and runs a scen
   await page.click('[data-visor-sheet]');
   const rows = await page.$$eval('.visor__sheet .visor__row', (r) => r.map((x) => [...x.children].map((c) => c.textContent).join(' ')));
   // task 1005200: Claim a task and Blockers open classic pages, so they are off the glass.
-  assert.deepEqual(rows, ['Goal sky G', 'Your thinking T', 'Back to centre 0', 'Look around drag', 'Options Esc']);
+  assert.deepEqual(rows, ['Goal sky G', 'Your thinking T', 'Back to centre 0', 'Look around drag', 'Options O']);
+  assert.equal(await page.$eval('.visor__sheet [data-visor-close]', (b) => b.textContent), 'Esc', 'Escape is the Close of the sheet, and only that');
   await page.click('[data-visor-scene="0"]');
   assert.deepEqual(await page.evaluate(() => ({ centred: window.centred, open: OTBVisor.isOpen() })), { centred: true, open: false });
   await ctx.close();