@maka/maka-cli 5.209.0 → 5.211.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.209.0",
+  "version": "5.211.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",

package/bundle/typescript/src/commands/game/sideQuest/commands/erase-mark.js

@@ -101,16 +101,19 @@ export class EraseMarkCommand extends Command {
         };
         if (target.kind === 'self') {
             for (const [placer, count] of actor.panMarksBy.entries()) {
-                if (count > 0)
-                    out.push({ name: placer, count, drop: () => dec(actor.panMarksBy, placer) });
+                if (count > 0) {
+                    out.push({ name: placer, count, defence: this.defenceOfPersona(placer), drop: () => dec(actor.panMarksBy, placer) });
+                }
             }
             for (const room of Object.values(this.scene.getRooms())) {
                 const host = room.host;
                 const n = host?.marksOn.get(actor.name) ?? 0;
                 if (n > 0 && host) {
+                    const d = hostDefensePool(host);
                     out.push({
                         name: hostLabel(room),
                         count: n,
+                        defence: { label: `${d.label}, rating standing in for Willpower`, pool: d.pool },
                         drop: () => {
                             dec(host.marksOn, actor.name);
                             // A key gone is a sighting gone: an icon it no longer
@@ -128,11 +131,27 @@ export class EraseMarkCommand extends Command {
             // Your own key is not a mark you "erase" -- p.239 is about reaching
             // into an icon to scrub somebody ELSE's recognition pattern.
             if (count > 0 && placer !== actor.name) {
-                out.push({ name: placer, count, drop: () => dec(ledger, placer) });
+                out.push({ name: placer, count, defence: this.defenceOfPersona(placer), drop: () => dec(ledger, placer) });
             }
         }
         return out;
     }
+    /**
+     * A NAMED PLACER'S OWN DEFENCE. p.237-238: "when a defense test calls
+     * for a Mental attribute, use the owner's rating", and an unattended
+     * device falls back to its Device Rating. A placer who has left the
+     * scene cannot roll, so the mark comes off unopposed -- which is the
+     * honest reading of erasing a key nobody is behind any more.
+     */
+    defenceOfPersona(name) {
+        const who = this.scene.allActors.find(a => a.name === name);
+        if (!who)
+            return { label: 'nobody behind it any more', pool: 0 };
+        return {
+            label: 'Willpower + Firewall',
+            pool: Math.max(0, who.willpower + who.matrixAttribute('firewall')),
+        };
+    }
     async execute(args = []) {
         const actor = this.actor;
         if (actor.plane !== 'matrix') {
@@ -176,7 +195,9 @@ export class EraseMarkCommand extends Command {
         const pool = Math.max(1, actor.logic + (computer > 0 ? computer : -1)
             + penalty + actor.matrixActionPenalty + actor.woundModifier - actor.sustainingPenalty);
         const limit = actor.matrixAttribute('attack');
-        const defence = this.defenceFor(target);
+        // THE PLACER ROLLS, not the icon the key is written on (p.239, see
+        // IPlacer). `chosen` is the icon whose keys this action is scrubbing.
+        const defence = chosen.defence;
         const attempt = rollPool(pool, limit, { gremlins: actor.deckGremlins });
         const resist = rollPool(defence.pool);
         if (showsMechanics(this.scene, actor)) {
@@ -212,18 +233,6 @@ export class EraseMarkCommand extends Command {
             ...(god.length > 0 ? [`\n${god.join('\n')}`] : []),
         ].join('');
     }
-    /** p.239: Willpower + Firewall. A host has no Willpower; its rating stands in. */
-    defenceFor(target) {
-        if (target.kind === 'host') {
-            const d = hostDefensePool(target.room.host);
-            return { label: `${d.label}, rating standing in for Willpower`, pool: d.pool };
-        }
-        const who = target.player;
-        return {
-            label: 'Willpower + Firewall',
-            pool: Math.max(0, who.willpower + who.matrixAttribute('firewall')),
-        };
-    }
     remainingOn(target, actor) {
         if (target.kind !== 'self')
             return 0;

package/bundle/typescript/src/commands/game/sideQuest/commands/rest.js

@@ -4,10 +4,11 @@ import { rollPool, formatRoll } from '../utilities/dice.js';
 import { ownedDrones } from '../utilities/owned-drones.js';
 /**
  * The free road to STUN recovery (stim patches are the fast, risky one --
- * see use.ts): catch your breath somewhere safe. "Safe" means somewhere
- * that houses you -- a Residence-type room, or a room whose seed says it
- * quarters your lifestyle tier -- or a room with no one else in it:
- * nobody naps in front of an audience in the sprawl.
+ * see use.ts): catch your breath somewhere safe. "Safe" means your own
+ * hideout (a Residence-type room) or a room with no one else in it:
+ * nobody naps in front of an audience in the sprawl. Only the hideout
+ * counts as SLEEP -- the tier's rest dice, the sleep debt and the
+ * fatigue unlock are all a bed-that-is-yours thing.
  *
  * Each rest is SR5 p.207's Stun half: Body + Willpower, one box per hit.
  * A night in a bed that's yours is also the day of NATURAL RECOVERY for
@@ -60,25 +61,27 @@ export class RestCommand extends Command {
             .map(d => d.item)
             .filter(i => i.droneDamage > 0);
         const othersHere = this.scene.getActorsInRoom(room).filter(a => a !== actor);
-        // WHERE THIS RUNNER SLEEPS, NOT WHERE THE ENGINE KEEPS ITS HOME ROOM
-        // (YxFKFqmXMgAvxwpce). 'Residence' is the roomType of Game._homeRoom
-        // and of nothing else -- and _homeRoom is only ever added to the
-        // scene on a SOLO boot (game.ts: `if (!options.sharedRun && ...)`).
-        // headless.ts hard-codes sharedRun: true, so every browser session,
-        // hub included, ran with no residence room in the world at all:
-        // isResidence was permanently false, markSlept() could never fire,
-        // the sleep-locked fatigue floor in Player.healStun never lifted,
-        // and rest printed a roll and "0 stun recovered" with nothing to
-        // explain it.
+        // A BED IS A BED, AND A STREET IS NOT ONE.
         //
-        // The seed already says where a runner of a given tier beds down --
-        // supportedLifestyles.residenceTypes, which the hub's own start room
-        // carries ("Street", "Squatter"). A room that houses your lifestyle
-        // IS your doss, whoever is hosting the session.
-        const tier = this.game?.lifestyleTier;
-        const housesMe = !!tier && (room.supportedLifestyles?.residenceTypes ?? [])
-            .some(t => t.toLowerCase() === tier.toLowerCase());
-        const isResidence = room.roomType?.toLowerCase() === 'residence' || housesMe;
+        // 'Residence' is the roomType of Game._homeRoom and of nothing else,
+        // which is exactly right: going home to sleep IS the mechanic.
+        //
+        // This briefly also accepted any room whose seed listed your
+        // lifestyle tier in supportedLifestyles.residenceTypes, on the
+        // belief that a hosted session had no hideout to go to. That belief
+        // was wrong -- see the note on IMainGameConfig.sharedRun -- and the
+        // cost was real: the hub's own Neon Strip carries ["Street",
+        // "Squatter"], so a runner on either tier could bed down IN THE
+        // STREET and collect a night's sleep, the fatigue unlock and the
+        // lifestyle rest dice for it. scenes/scene1.json:119 carries the
+        // same field, so it landed there too.
+        //
+        // supportedLifestyles means something else in any case: its reader
+        // is Scene.validateLifestyleSupport, which checks an actor's
+        // lifestyleChoices residence against the rooms the seed provides.
+        // It answers "may someone of this tier live in this scene", never
+        // "is this particular room your bedroom".
+        const isResidence = room.roomType?.toLowerCase() === 'residence';
         if (actor.stunTaken === 0 && actor.damageTaken === 0 && damagedDecks.length === 0 && damagedDrones.length === 0) {
             // Nothing to heal -- but sleeping is its own point now (needs
             // system: edge refills only fed-and-slept, see Game.

package/bundle/typescript/src/commands/game/sideQuest/engine-version.js

@@ -797,14 +797,14 @@
 //   - REST WAS SHORT AN ATTRIBUTE AND LONG A FREE BOX
 //     (YxFKFqmXMgAvxwpce). p.207's Stun half is Body + Willpower, one
 //     box per hit; this rolled Body alone and paid hits + 1. The free
-//     box is why nobody measured the missing attribute. And 'Residence'
-//     is the roomType of Game._homeRoom alone, which is only added to
-//     the scene on a SOLO boot -- headless.ts hard-codes sharedRun, so
-//     every browser session had no bed in the world at all: no sleep, no
-//     unlock for sleep-locked fatigue (p.172), a roll that moved
-//     nothing, and no line saying why. A room whose seed quarters your
-//     lifestyle tier is now your doss, and blocked recovery names what
-//     is blocking it.
+//     box is why nobody measured the missing attribute. Blocked
+//     recovery also names what is blocking it now: fatigue boxes are
+//     locked to their need (p.172), so a runner whose stun IS hunger or
+//     exhaustion watched a roll happen and the track not budge, with no
+//     line connecting the two.
+//     WHAT THIS NOTE CLAIMED AND 1.68.0 TAKES BACK: that no hosted
+//     session had a bed. See the 1.68.0 entry -- it was read off one of
+//     two headless entry points and was wrong.
 //   - BREACH COULD NOT REACH A DOOR (Gfx5RFFpHJdKB87Bh, "I cant Breach
 //     East"). BypassCommand lists room.openableDevices(), which knows
 //     only Device objects, so a plain keyed Door matched nothing and
@@ -927,5 +927,62 @@
 //   ONE list (utilities/nameables.ts), which is what that module always
 //   claimed. The refusal listed hosts only, under a sentence promising
 //   it had looked for a PAN and a camera too.
-export const ENGINE_VERSION = '1.69.0';
+// 1.70.0 (2026-09-16): A STREET IS NOT A BEDROOM -- taking back half of
+//   what 1.67.0 did to rest, because the premise under it was wrong.
+//   1.67.0 widened rest's "am I somewhere I can sleep" test to accept any
+//   room whose seed listed the runner's lifestyle tier in
+//   supportedLifestyles.residenceTypes. The belief was that a hosted
+//   session had no hideout to go home to. It does.
+//   - HOW THE MISTAKE WAS MADE, because that is the reusable part: there
+//     are TWO headless entry points and only one was read.
+//     createHeadlessSession (a shared JOB) sets sharedRun: true
+//     unconditionally; createHeadlessHub (the browser's hub, 1.51.0)
+//     never sets it, so a hosted hub takes the ordinary branch, gets its
+//     hideout and its door, and the runner wakes on their own cot.
+//     Generalising the first to "every hosted session" produced the
+//     claim. What settled it: a live web hub renders `@D` beside the
+//     player, and the reporter's own CLI log walks `go down` into a
+//     High-tier hideout with a working Footlocker.
+//   - WHAT IT COST. The hub's Neon Strip carries ["Street","Squatter"],
+//     so a runner on either tier could bed down IN THE STREET and take a
+//     night's sleep, the fatigue unlock and the lifestyle rest dice for
+//     it; scene1.json's start room carries the same field. Going home to
+//     sleep IS the mechanic, and this quietly removed the going-home.
+//     supportedLifestyles was never a bedroom flag: its reader is
+//     Scene.validateLifestyleSupport, which asks whether someone of a
+//     tier may LIVE IN THIS SCENE, not which room is your cot.
+//   - WHAT STAYS, because it was right on its own terms: Body +
+//     Willpower and one box per hit (p.207), the line that names the
+//     fatigue floor when recovery is refused, and the isDown() narrowing.
+//   A shared JOB still has no hideout -- deliberate and unchanged: the
+//   crew rode to the jobsite, and nobody's cot is stapled to it.
+// 1.71.0 (2026-09-16): WHAT f79LLqTerep4nKWcA'S OWN BENCH PRINTED. The
+//   repro bench for this item ran clean and then said three things a
+//   reviewer would have caught, which is what a bench is for.
+//   - ERASE MARK WAS DEFENDED BY THE WRONG ICON (p.239, RAG-checked).
+//     The book's worked example is explicit: "You roll your Computer +
+//     Logic ... opposed by THE IC'S RATING (standing in for Willpower) +
+//     Firewall to erase its mark on your icon." 1.61.0's defenceFor()
+//     switched on the TARGET instead, so "unmark me" rolled the
+//     DECKER'S OWN Willpower + Firewall while the line said the host was
+//     resisting -- 8 dice where a rating-8 host owes 18, and a label
+//     naming an icon that was not in the test. The defence now rides
+//     each placer (IPlacer), because the placer is who the book has
+//     rolling; the marked icon only ever mattered for the three-mark
+//     gate. A placer who has left the scene rolls nothing, which is the
+//     honest reading of scrubbing a key nobody is behind any more.
+//   - "SEALED" SURVIVED IN TWO MORE RENDERERS, gridSculpt and the host
+//     icon, and printed two lines above a row rewritten in 1.68.0 to
+//     stop saying it. It read as English there rather than as the
+//     jargon token hostLine used -- but the reporter named the word, and
+//     a reviewer meeting it twice cannot be expected to know one was
+//     innocent. Both say what they mean now.
+//   - THE DIVIDER DIVIDED NOTHING. gridIcons splices a "-- and NEAR it
+//     ... --" heading after the host's own icon; gridIconBlock then
+//     pulls the host line out into its own section, leaving the heading
+//     at the top of ICONS IN REACH with nothing above it -- a bullet
+//     that reads like an icon you could act on. It is dropped when it
+//     lands first. (1.69.0 fixed the same heading leaking into the
+//     distance bands; this is the other half.)
+export const ENGINE_VERSION = '1.71.0';
 //# sourceMappingURL=engine-version.js.map

package/bundle/typescript/src/commands/game/sideQuest/utilities/grid-view.js

@@ -119,7 +119,7 @@ export function gridIcons(scene, actor, room) {
                 room.host?.spotted.has(actor.name) ? 'and it can see you'
                     : room.hostAlert ? 'and it knows someone is on the grid' : undefined,
             ].filter(Boolean).join(', ');
-            icons.push(`● ${hostLabel(room, { capital: true })}${hr}${purpose} -- sculpted ice geometry, sealed. Whatever it holds is inside it.${standing.length > 0 ? ` ${standing.charAt(0).toUpperCase()}${standing.slice(1)}.` : ''} (${ways.join('; ')})`);
+            icons.push(`● ${hostLabel(room, { capital: true })}${hr}${purpose} -- sculpted ice geometry, closed all the way round. Whatever it holds is inside it.${standing.length > 0 ? ` ${standing.charAt(0).toUpperCase()}${standing.slice(1)}.` : ''} (${ways.join('; ')})`);
         }
     }
     // WHERE THE HOST'S OWN ICON ENDS AND THE STREET BEGINS.
@@ -521,7 +521,13 @@ export function gridSculpt(actor, room) {
     const flat = `{light-blue-fg}Black flatland under a black sky -- the icons are the only things out here.${grid ? ` Riding ${grid.name}${grid.userPenalty ? ' (-2 on everything you do, p.233)' : ''}.` : ''}{/light-blue-fg}`;
     if (!room.hasNode)
         return `${header}\n${flat}`;
-    return `${header}\n${flat}\n{light-blue-fg}${hostLabel(room, { capital: true })} hangs directly overhead, sealed. What it holds is inside it.{/light-blue-fg}`;
+    // "SEALED" IS A WORD THE REPORTER NAMED (f79LLqTerep4nKWcA). It read
+    // as English here rather than as the jargon token hostLine used it
+    // as -- but it survived into this item's own repro bench two lines
+    // above a row that had just been rewritten to stop saying it, and a
+    // reviewer meeting the same word twice cannot be expected to know one
+    // of them was innocent. Says what it means instead.
+    return `${header}\n${flat}\n{light-blue-fg}${hostLabel(room, { capital: true })} hangs directly overhead -- a closed shape. Everything it holds is inside it, and you get in by putting a mark on it.{/light-blue-fg}`;
 }
 /**
  * The icons rendered as the standard cyan block, or the thin-grid line.
@@ -559,7 +565,18 @@ export function gridIconBlock(scene, actor, room, rooms) {
     out.push(hosts.length > 0
         ? `{light-blue-fg}HOSTS OVERHEAD:{/light-blue-fg}\n${hosts.map(h => `  {light-blue-fg}${hostLine(h, actor)}{/light-blue-fg}`).join('\n')}`
         : `{light-blue-fg}Nothing overhead -- no host stands over this district.{/light-blue-fg}`);
-    const near = gridIcons(scene, actor, gridVicinity(actor)).filter(i => !isHostLine(i));
+    // THE DIVIDER DIVIDES NOTHING HERE. gridIcons puts the host's own icon
+    // first and splices a "-- and NEAR it ... --" heading after it; this
+    // block then pulls the host line OUT (it has its own HOSTS OVERHEAD
+    // section above), which left the heading standing at the top of the
+    // list with nothing above it to be divided from -- a bullet reading
+    // "-- and NEAR it, out on the open grid (not inside the host): --"
+    // as if it were an icon you could act on. Seen in this item's own
+    // repro bench (f79LLqTerep4nKWcA). It earns its place only when
+    // something survives above it.
+    const near = gridIcons(scene, actor, gridVicinity(actor))
+        .filter(i => !isHostLine(i))
+        .filter((i, idx) => !(idx === 0 && isNearDivider(i)));
     out.push(near.length > 0
         ? `{light-blue-fg}ICONS IN REACH:{/light-blue-fg}\n${near.map(i => `  {light-blue-fg}${i}{/light-blue-fg}`).join('\n')}`
         : `{light-blue-fg}Nothing near -- background noise around your signal.{/light-blue-fg}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.209.0",
+  "version": "5.211.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",