@maka/maka-cli 5.87.0 → 5.89.0

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

@@ -14,6 +14,7 @@ import { pushSave, burnCloudSaveFor } from './utilities/cloud-saves.js';
 import { DOCWAGON_TIERS, RESUSC_FEE, DEATH_COMP } from './utilities/docwagon.js';
 import { isFence, LIFESTYLE_TIERS } from './utilities/commerce.js';
 import { bestFakeSin, wandRead, processArrest } from './utilities/sin.js';
+import { tickEphemerals } from './utilities/ephemeral.js';
 import { renderMapViewport, mapCaption } from './utilities/map-view.js';
 import { tallestRoomRows } from './utilities/room-grid.js';
 import { renderRoomLayoutCompact, crewOfTable, roomCaption } from './utilities/room-view.js';
@@ -825,6 +826,35 @@ export default class Game {
      *  off the job). The hosting server writes their snapshot back and
      *  marks them 'left'. */
     onPlayerExtracted;
+    /**
+     * Shared-run hook: THE SCENE UNDERNEATH EVERYONE JUST CHANGED.
+     *
+     * `repaintForScene` is how this Game tells its own UI that the world
+     * moved. On a hosted table there IS no UI here -- `_mapBox` is
+     * undefined on the server, so `updateExits` (and with it both map
+     * panels) is a NO-OP, measured rather than assumed: a real headless
+     * boot emits map/room/status 1,1,1 and calling updateExits +
+     * updateStatus by hand leaves it at 1,1,1, while one `command` takes
+     * it to 2,2,2.
+     *
+     * So every rider's panels move only when headless.ts's pushMap /
+     * pushStatus run, and those run from `command`, `addPlayer` and boot
+     * -- nowhere else. A scene swap that does not happen inside somebody's
+     * command therefore changes the server's truth and sends NOTHING, and
+     * `draftNextSceneInBackground` is exactly that shape: fire-and-forget
+     * over 20-40 seconds, long after the command that started it returned
+     * and pushed the OLD scene.
+     *
+     * This hook is the missing wire, same shape as onPlayerDeath /
+     * onPlayerExtracted above and installed in the same place.
+     *
+     * HARDENING, NOT A BUG FIX. The inert joint is proven; the swap
+     * arriving outside a command is READ IN THE SOURCE AND NOT EXECUTED
+     * (continueToNextScene is gated on job completion, so the harness
+     * cannot drive it end to end). Nothing here is offered as the cause of
+     * a live report.
+     */
+    onSceneChanged;
     /**
      * The per-player band (shared runs -- scene.players.length > 1):
      * resolves the FALLEN player's own contract, bills THAT player
@@ -1017,6 +1047,13 @@ export default class Game {
      * already answered upstream.
      */
     ephemerals = new Map();
+    /**
+     * Every ephemeral name this session has ever issued. Session-only like
+     * the registry above, but CUMULATIVE where that one is a census -- see
+     * IEphemeralHost.spentNames for why a name outliving its body is the
+     * whole point.
+     */
+    spentNames = new Set();
     /** Corners that have already had their encounter -- once each, and
      *  never saved, on the same session-only model as sweptRooms. */
     gangedRooms = new Set();
@@ -2831,10 +2868,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this.pendingRunAccepted = save.game.pendingRun.accepted ?? false;
         }
         this.player.currentLocation = this._homeRoom;
-        this.updateEquipment(this.player.equipment);
-        this.updateInventory(this.player.inventory, capitalCase(this.scene.getCurrencyType()));
-        this.updateExits(this.player.currentLocation);
-        this.updateStatus();
+        this.repaintForScene();
         this.refreshLogLabel();
         Logger.getInstance().write(`Resumed save for ${save.playerName} (saved ${save.savedAt}, reason ${save.reason}).`);
     }
@@ -3109,7 +3143,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.currentLocation = this._homeRoom;
         this.player.cameFrom = undefined;
         const arrivalLines = this.unfoldCompanionsOnArrival();
-        this.refreshHubUi();
+        this.repaintForScene();
         return [...foldLines, ...arrivalLines].join('\n');
     }
     /** Back to the job you left standing. */
@@ -3128,7 +3162,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.cameFrom = undefined;
         this._openRun = undefined;
         const arrivalLines = this.unfoldCompanionsOnArrival();
-        this.refreshHubUi();
+        this.repaintForScene();
         return [...foldLines, ...arrivalLines].join('\n');
     }
     /** Cross-plane and combat state that must not ride in a cab, shared
@@ -3158,11 +3192,34 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.autoFight.cancelPending();
     }
     /** The panel refresh both errand legs need. */
-    refreshHubUi() {
+    /**
+     * REPAINT EVERYTHING FOR THE SCENE YOU ARE NOW STANDING IN.
+     *
+     * These same four calls, in this same order, were written out three
+     * times -- here (as refreshHubUi), at the end of returnToHub, and at
+     * the end of activateRunScene. Three copies of one rule is how a
+     * fourth arrival gets two of them and reads as done, and it is the
+     * shape that has already cost this file twice.
+     *
+     * Public because a shared run's homecoming has to reach it: the ride
+     * home used to repaint the STATUS box alone, so a runner arrived back
+     * at the hub with the RUN's map still drawn beside the log -- the
+     * exact mirror of the hub's map surviving into a run, which is the bug
+     * blankRunPanels was added to end (575fc700). One boundary, repainted
+     * in one direction only, is a half-swept family.
+     *
+     * ORDER IS LOAD-BEARING at the shared-run call sites: updateExits
+     * early-returns while `remoteSession` is set, so this must be called
+     * AFTER SharedRunSession.finish() clears it, never before.
+     */
+    repaintForScene() {
         this.updateEquipment(this.player.equipment);
         this.updateInventory(this.player.inventory, capitalCase(this.scene.getCurrencyType()));
         this.updateExits(this.player.currentLocation);
         this.updateStatus();
+        // Local UI is repainted above; a hosted table has none, and learns
+        // the scene moved from here. See onSceneChanged.
+        this.onSceneChanged?.();
     }
     returnToHub() {
         const hub = this._hubScene;
@@ -3278,10 +3335,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         const restocked = this.restockVendorShelves();
         const restockLine = restocked > 0 ? `\nThe district has restocked around you -- the wok steams, the bar's shelf is full, the market stalls are loud again.` : '';
         this.advanceGig();
-        this.updateEquipment(this.player.equipment);
-        this.updateInventory(this.player.inventory, capitalCase(this.scene.getCurrencyType()));
-        this.updateExits(this.player.currentLocation);
-        this.updateStatus();
+        this.repaintForScene();
         this.refreshLogLabel();
         Logger.getInstance().write(`Returned to hub "${this._hubName}". Lifestyle ${this.lifestyleTier}: ${paid} paid, ${this.rentDebt} owed. Restocked ${restocked}. Rumor: ${this.activeRumor ?? '(none)'}`);
         // Drones spin back up beside the cot.
@@ -3657,10 +3711,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 this.player.currentLocation = this._homeRoom;
             }
         }
-        this.updateEquipment(this.player.equipment);
-        this.updateInventory(this.player.inventory, capitalCase(this.scene.getCurrencyType()));
-        this.updateExits(this.player.currentLocation);
-        this.updateStatus();
+        this.repaintForScene();
         // Fresh streets, no trail yet (see Player.cameFrom / the HUD crumb).
         this.player.cameFrom = undefined;
         // Deployed drones spin back up at the curb -- BEFORE appearance
@@ -4425,7 +4476,24 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
     armedLine(player) {
         const weapon = player.getWeaponProfile();
         const weaponItem = player.getCarriedWeapon();
-        const ammoNote = weaponItem?.isFirearm()
+        // THE AMMO BELONGS TO THE GUN, AND THE GUN IS ON THE BODY YOU LEFT
+        // (Dt2zDhMk87eHjCL3a: "I see '[10 rd]' next to the attack program").
+        //
+        // getWeaponProfile() correctly returns "attack programs" in the
+        // Matrix, "astral strike" on the astral, a mount on a drone -- but
+        // the ammo note was read from getCarriedWeapon() on every plane and
+        // appended to whatever that profile said. So a decker whose slumped
+        // body was carrying a loaded pistol read "Armed: attack programs
+        // (DV 4) [10 rds]", counting the rounds of a weapon their persona
+        // cannot touch, on a thing that does not fire.
+        //
+        // Canon has no consumable for programs at all, asked directly: they
+        // are files that provide a benefit while running, with no charges,
+        // no per-use cost, and nothing to spend (p.243 PROGRAMS). The only
+        // limit is whether the program is loaded. So there is no Matrix
+        // number that belongs in this slot -- the fix is to print nothing,
+        // not to find a different count.
+        const ammoNote = player.plane === 'meat' && weaponItem?.isFirearm()
             ? (weaponItem.jammed
                 ? ` {red-fg}[JAMMED -- reboot]{/red-fg}`
                 : weaponItem.ammo === 0 ? ` {red-fg}[DRY]{/red-fg}` : ` [${weaponItem.ammo} rds]`)
@@ -4930,7 +4998,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         const command = CommandFactory.createCommand(verb, context);
         if (command) {
             const result = await command.execute(args);
-            return out(this.withICTurn(actor, result));
+            return out(this.withEphemeralTurn(actor, this.withICTurn(actor, result)));
         }
         // Typo tolerance: two straight sessions bounced on slips like "searh"
         // and "maop". Reuse the same fuzzy matcher item/NPC names go through
@@ -4976,6 +5044,27 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * utilities/ic.ts decides whether anything happens at all
      * (hostIsHunting); this only carries the result to the panes.
      */
+    /**
+     * THE EPHEMERAL TURN, appended the same way the host's is.
+     *
+     * One player action is one beat for every passing face in the room --
+     * the same engine mapping withICTurn makes below, and hung off the
+     * same single dispatch for the same reason: a mob closes on you while
+     * you look, talk, or check your gear, not only while you walk. Hooking
+     * one verb is the "fixed one verb, left its siblings" shape CLAUDE.md
+     * warns about.
+     *
+     * utilities/ephemeral.ts decides what each kind does with its beat;
+     * this only carries the narration back. Only a mob ever produces any.
+     */
+    withEphemeralTurn(actor, result) {
+        if (result === null)
+            return null;
+        if (actor !== this.player || this.ephemerals.size === 0)
+            return result;
+        const lines = tickEphemerals(this, actor);
+        return lines.length === 0 ? result : `${result}\n\n${lines.join('\n')}`;
+    }
     withICTurn(actor, result) {
         if (result === null)
             return null;