@maka/maka-cli 5.83.0 → 5.85.0

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

@@ -9,6 +9,7 @@ import { Door } from './models/door.js';
 import { SAVE_VERSION } from './types/save-file.js';
 import { serializePlayer, restorePlayer, captureHubOverlay, applyHubOverlay, writeSaveAtomic, deleteSave, restoreItem, readSave, serializeItem, saveSlug, } from './utilities/persistence.js';
 import { heartbeatPresence, heartbeatPresenceNow } from './utilities/social.js';
+import { presenceBeatAllowed } from './utilities/presence-gate.js';
 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';
@@ -127,6 +128,7 @@ import { JournalCommand } from './commands/journal.js';
 import { CoverCommand } from './commands/cover.js';
 import { PostureCommand, LieDownCommand, StandCommand } from './commands/posture.js';
 import { TreatCommand } from './commands/treat.js';
+import { HealCommand } from './commands/heal.js';
 import { WorkCommand } from './commands/work.js';
 import { EatCommand } from './commands/eat.js';
 import { DrinkCommand } from './commands/drink.js';
@@ -529,8 +531,36 @@ export default class Game {
         }, 500);
         this._presenceEquipTimer.unref?.();
     }
+    /**
+     * Does this runner hold a LIVE SEAT right now -- riding at someone's
+     * table, or leading one that a real player sits at? Both sides are
+     * already tracked synchronously (HubLink.syncRiding fills ridingWith;
+     * the leader's live seats are liveOnly crew), so this needs no new
+     * state and no await.
+     */
+    holdsLiveSeat() {
+        return this.ridingWith.length > 0 || this.crew.some(m => m.ghost?.liveOnly);
+    }
     beatPresence() {
-        if (!this.hasHub || this.scene !== this._hubScene)
+        if (!this.hasHub)
+            return;
+        // THE SEATED RUNNER DEFENDS ITS OWN PRESENCE DOC.
+        //
+        // This used to be `scene !== hubScene -> return`, on the reasonable
+        // ground that the run is nobody's business. But presence is not only
+        // the street's player list: the server reads the doc's SLUG to
+        // decide whose seats are still real, and a beat carrying a different
+        // slug dissolves an account's seats. So the one process that most
+        // needs to hold the doc -- a runner sitting in a live shared run --
+        // was the only one not beating, for the whole run. Any other beat on
+        // that account (a stale second terminal at its own hub, an older
+        // character) won the doc uncontested, and the seat was cut at
+        // heartbeat cadence with nothing printed on either side. Four
+        // reports, both sides of one table, twice in ten minutes.
+        //
+        // The rule itself lives in utilities/presence-gate.ts so it can be
+        // tested without a Game, a hub, or a socket.
+        if (!presenceBeatAllowed(this.scene === this._hubScene, this.holdsLiveSeat()))
             return;
         void heartbeatPresence(this.presencePayload());
         // The hub link rides the same pulse: a failed connect at boot must
@@ -978,6 +1008,20 @@ export default class Game {
     // Roster invariant: entries are LIVE SHELLS only -- dismissal and
     // death both remove the entry; persistent state (the frame, the deck)
     // lives on Items in the player's possession, never here.
+    /**
+     * EPHEMERAL BODIES, and the reason this is a plain Map on the Game and
+     * not part of the save shape (7ALf6u7PvTg6TZSm7): ephemeral means
+     * ephemeral. Nothing here is ever written to a save file, so nothing
+     * here has to be reconciled on load -- see utilities/ephemeral.ts's
+     * despawnEphemerals for why the obvious mid-fight-save worry is
+     * already answered upstream.
+     */
+    ephemerals = new Map();
+    /** Corners that have already had their encounter -- once each, and
+     *  never saved, on the same session-only model as sweptRooms. */
+    gangedRooms = new Set();
+    /** Places already populated with texture -- once each, never saved. */
+    peopledRooms = new Set();
     companions = [];
     /** REGISTERED SPRITES WAITING IN THE RESONANCE (SR5 p.254-256):
      *  folded for travel, or staged from a resumed save, waiting to
@@ -2280,6 +2324,15 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('prone', LieDownCommand);
         CommandFactory.registerCommand('stand', StandCommand);
         CommandFactory.registerCommand('treat', TreatCommand);
+        // FIRST AID, and the words a player actually reaches for. Every one
+        // of these died at the parser before (see heal.ts): the mechanic was
+        // real but only `use <medkit>` could reach it.
+        CommandFactory.registerCommand('heal', HealCommand);
+        CommandFactory.registerCommand('firstaid', HealCommand);
+        CommandFactory.registerCommand('first', HealCommand); // "first aid"
+        CommandFactory.registerCommand('bandage', HealCommand);
+        CommandFactory.registerCommand('patch', HealCommand); // "patch up"
+        CommandFactory.registerCommand('apply', HealCommand); // "apply first aid"
         CommandFactory.registerCommand('work', WorkCommand);
         CommandFactory.registerCommand('gig', WorkCommand);
         CommandFactory.registerCommand('haggle', HaggleCommand);
@@ -4471,6 +4524,80 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         if (player.sustainedArmor > 0) {
             lines.push(`{magenta-fg}Sustained: armor +${player.sustainedArmor} soak (-2 dice to everything else){/magenta-fg}`);
         }
+        // THE MAGE'S HALF OF THE SAME QUESTION (TNf9WrZGxCmCzqA4L, scope
+        // completed by ruling).
+        //
+        // The item asked for threads, and threads got a line -- but
+        // invisibility, increased reflexes and both barrier spells bill the
+        // IDENTICAL -2 through the identical sustainingPenalty, and none of
+        // them appeared anywhere. Only the armor spell had a line. So the
+        // fix for one tradition left the other exactly where the report
+        // found it, and the mage filing the same report later was a bill
+        // already in the post.
+        //
+        // Armor and open astral senses keep their OWN lines, immediately
+        // below: each carries something this one cannot (the soak value it
+        // is buying, the verb that closes it). They are therefore excluded
+        // here rather than duplicated -- no line ever counts the same -2
+        // twice, which is the property that makes these totals readable at
+        // all.
+        //
+        // DUMPSHOCK IS DELIBERATELY NOT HERE. It bills the same -2, but it
+        // is damage done TO you, not a working you are holding up, and
+        // "Sustained: dumpshock" would tell the player they can drop it.
+        // Naming it belongs with the condition monitors if it belongs
+        // anywhere; that is a separate call and not this item's.
+        const heldSpells = [];
+        if (player.sustainedInvisibility)
+            heldSpells.push('invisibility');
+        if (player.sustainedReflexes)
+            heldSpells.push('increased reflexes');
+        // The barriers say WHERE, because a wall you forgot you put up is
+        // the one that strands the team -- and both of them seal an exit
+        // that the caster cannot pass either.
+        if (player.sustainedBarrier) {
+            heldSpells.push(`physical barrier (${player.sustainedBarrier.roomName} ${player.sustainedBarrier.direction})`);
+        }
+        if (player.sustainedManaBarrier) {
+            heldSpells.push(`mana barrier (${player.sustainedManaBarrier.roomName} ${player.sustainedManaBarrier.direction})`);
+        }
+        if (heldSpells.length > 0) {
+            lines.push(`{magenta-fg}✴ Sustained: ${heldSpells.join(', ')} (-${heldSpells.length * 2} dice){/magenta-fg}`);
+        }
+        // ACTIVE THREADS, WITHOUT ASKING (TNf9WrZGxCmCzqA4L: "instead of
+        // saying 'sustain' to see the active threads, list the threads in
+        // the status area").
+        //
+        // A sustained form is a standing -2 on every pool the technomancer
+        // rolls, which makes it exactly the kind of state the HUD exists for
+        // -- the player was paying that price and had to type a command to
+        // remember why. It sits with the other transient states rather than
+        // on a line of its own, and only when something is actually woven.
+        //
+        // SPRITE-HELD FORMS RIDE ALONG, because they are half the answer the
+        // `sustain` ledger gives and leaving them out would send the player
+        // back to the command this replaces. They are listed apart from
+        // yours on purpose: a form a sprite carries costs YOU nothing (p.256
+        // -- it takes the -2 instead), so folding both into one dice total
+        // would be a lie about the number that matters.
+        //
+        // The sprite keeps its full name, level suffix and all. It is longer
+        // than the HUD would like, but it is what `sustain` prints and what
+        // the player must type to take the form back -- and two sprites of
+        // the same type are told apart by nothing else.
+        const ownThreads = player.sustainedForms;
+        const spriteHeld = player === this.player
+            ? this.companions
+                .filter(c => c.kind === 'sprite' && (c.npc.sustainedForms?.length ?? 0) > 0)
+                .map(c => `${c.npc.name} holds ${c.npc.sustainedForms.map(f => f.key).join(', ')}`)
+            : [];
+        if (ownThreads.length > 0 || spriteHeld.length > 0) {
+            const mine = ownThreads.length > 0
+                ? `${ownThreads.map(f => f.key).join(', ')} (-${ownThreads.length * 2} dice)`
+                : `none yourself`;
+            const carried = spriteHeld.length > 0 ? `  |  ${spriteHeld.join('; ')}` : '';
+            lines.push(`{magenta-fg}✴ Threads: ${mine}${carried}{/magenta-fg}`);
+        }
         if (player.astralPerceiving) {
             lines.push(`{magenta-fg}✧ ASTRAL SENSES OPEN (-2 dice sustained)${hint(' -- "assense" to close')}{/magenta-fg}`);
         }
@@ -4562,10 +4689,20 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // this hook was kept as a no-op for exactly this -- it already
         // fires on movement (go/lock/unlock, move.ts, ui.ts), scene
         // transitions, and barrier changes (solve/bypass/lock/unlock).
-        // Session mode: the server's per-player kind:'map' events feed the
-        // district overlay instead (SharedRunSession.route); the room box
-        // has no server-pushed path yet, so it just stays hidden in a
-        // shared run, same as the district box did before that wiring.
+        // Session mode: the server's per-player kind:'map' AND kind:'room'
+        // events feed BOTH overlays instead (SharedRunSession.route).
+        //
+        // This used to say the room box "has no server-pushed path yet". It
+        // has had one since 2026-08-27, and the wire tap has since recorded
+        // 114 room frames arriving and rendering. A comment that describes a
+        // gap which was closed months earlier is not a stale detail -- it
+        // tells the next reader the panel is unimplemented, which is exactly
+        // the wrong place to start when the panel goes blank.
+        //
+        // What the panels are NOT fed by, in a shared run, is this function:
+        // it returns here, which is why entering a run blanks them
+        // explicitly (utilities/shared-run.ts blankRunPanels) rather than
+        // leaving the hub's paint on screen to be mistaken for live.
         if (!this._mapBox || this.remoteSession)
             return;
         const here = this.player.currentLocation;
@@ -4912,7 +5049,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
     static HELP_CATEGORIES = [
         { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach'], ['run'], ['sprint'], ['climb', 'mantle', 'scale', 'clamber'], ['descend'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow'], ['unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
         { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['loot'], ['drop'], ['give'], ['store'], ['equip'], ['unequip'], ['brandish', 'draw'], ['holster', 'stow'], ['reload'], ['use'], ['read']] },
-        { title: 'combat', entries: [['attack'], ['kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['cover'], ['stance'], ['surrender'], ['edge'], ['rest']] },
+        { title: 'combat', entries: [['attack'], ['kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['cover'], ['stance'], ['surrender'], ['edge'], ['rest'], ['heal', 'firstaid', 'bandage', 'patch']] },
         // The party layer: everyone who walks (or flies, or manifests) at
         // your side answers to these.
         // "players" folded back under crew after playtesting ("crew
@@ -4937,7 +5074,11 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      *  -- "crew players" is the advertised path; the bare verb still
      *  answers). Without this, the uncategorized sweep resurrects them
      *  in an "other" bucket. */
-    static HIDDEN_VERBS = ['players'];
+    // 'first' and 'apply' exist ONLY to catch the two-word phrasings
+    // ("first aid", "apply first aid") that used to die at the parser. As
+    // bare words they mean nothing, so they are claimed but not advertised
+    // -- `heal` is the verb the help screen teaches.
+    static HIDDEN_VERBS = ['players', 'first', 'apply'];
     /** Session verbs that only a play-tester (or admin) can actually use
      *  -- the server role-gates both and 403s everyone else. Listed in
      *  help ONLY for a confirmed play-tester; see helpCategories. `roles`