@maka/maka-cli 5.73.0 → 5.75.0

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

@@ -1,5 +1,5 @@
 import blessed from 'blessed';
-import { nameThem } from './utilities/identity.js';
+import { nameThem, scrubHandles } from './utilities/identity.js';
 import { dirname } from 'path';
 import { capitalCase } from 'change-case';
 import { Category, Size, Rating } from './types/shared/item-enum.js';
@@ -13,9 +13,9 @@ 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 { renderMapViewport } from './utilities/map-view.js';
+import { renderMapViewport, mapCaption } from './utilities/map-view.js';
 import { tallestRoomRows } from './utilities/room-grid.js';
-import { renderRoomLayoutCompact, crewOfTable } from './utilities/room-view.js';
+import { renderRoomLayoutCompact, crewOfTable, roomCaption } from './utilities/room-view.js';
 import { getPref } from './utilities/prefs.js';
 import { rollPool, formatRoll } from './utilities/dice.js';
 import { Direction } from './types/shared/direction-enum.js';
@@ -71,7 +71,7 @@ import { EdgeCommand } from './commands/edge.js';
 import { SheetCommand } from './commands/sheet.js';
 import { CallCommand } from './commands/call.js';
 import { EndCallCommand } from './commands/end-call.js';
-import { fuzzyPickName, levenshteinDistance } from './utilities/fuzzy-match.js';
+import { fuzzyPickName, guessVerb } from './utilities/fuzzy-match.js';
 import { PickCommand } from './commands/pick.js';
 import { HackCommand } from './commands/hack.js';
 import { CastCommand } from './commands/cast.js';
@@ -102,6 +102,7 @@ import { ThreadCommand } from './commands/thread.js';
 import { RegisterCommand } from './commands/register.js';
 import { SpritesCommand } from './commands/sprites.js';
 import { StandbyCommand } from './commands/standby.js';
+import { SustainCommand } from './commands/sustain.js';
 import { AbandonCommand } from './commands/abandon.js';
 import { UnravelCommand } from './commands/unravel.js';
 import { OrderCommand } from './commands/order.js';
@@ -456,8 +457,29 @@ export default class Game {
     heatBand() {
         if (this._runHeat <= 0)
             return undefined;
+        // NOBODY IS COMING, AND THAT IS CANON (oPqWB3CqzQmhpq3o2, player:
+        // "HTR assembling somewhere close, warning, but it never resulted in
+        // anything"). They were right, and the old line was the lie.
+        //
+        // SR5 p.352 gives HTR response times by the site's security level,
+        // and Run Faster p.220 extends it as neighbourhood zones: AA is
+        // 1D6+4 MINUTES, B is 1D6x5, and Zone 0 -- the lawless barrens --
+        // is 2D6 HOURS. Every shipped scene is a barrens district, so no
+        // response team reaches the player mid-run. Nothing arriving is the
+        // CORRECT outcome; promising an arrival was the defect.
+        //
+        // So the band now names what heat this high actually buys, which is
+        // not nothing: the ride home runs a Knight Errant checkpoint
+        // (checkpointOnRideHome), and at exactly this threshold the verifier
+        // there rolls 8 dice against a fake SIN instead of 6. Same number,
+        // deliberately -- a test pins the two together so the promise and
+        // the mechanic cannot drift apart.
+        //
+        // Security ratings per site are deferred by player ruling; when they
+        // land, a corporate site can honestly warn about a team that really
+        // is coming.
         if (this._runHeat >= 12)
-            return `{red-fg}🔥 Heat: HTR assembling somewhere close{/red-fg}`;
+            return `{red-fg}🔥 Heat: nobody's coming out here -- they'll be waiting at the checkpoint{/red-fg}`;
         if (this._runHeat >= Game.CHECKPOINT_HEAT)
             return `{red-fg}🔥 Heat: sirens circling closer{/red-fg}`;
         if (this._runHeat >= 3)
@@ -1236,11 +1258,42 @@ export default class Game {
             entry.npc.deathClaimed = true;
             this.scene.removeActor(entry.npc.name);
         }
+        this.returnSustainedForms(entry);
         const idx = this.companions.indexOf(entry);
         if (idx >= 0)
             this.companions.splice(idx, 1);
         Logger.getInstance().write(`Companion dismissed: ${entry.npc.name} -- ${reason}`);
     }
+    /**
+     * A FORM A SPRITE WAS CARRYING COMES HOME WHEN THE SPRITE GOES
+     * (SR5 p.256 Sustain Complex Form; see commands/sustain.ts).
+     *
+     * The task hands a technomancer's complex form to a registered sprite
+     * so the SPRITE eats the -2. That means the only entry point in the
+     * game that moves a form off its weaver is also the only one that
+     * could destroy it: dismiss, kill or park the sprite and the form
+     * would go into the Resonance with it, silently, looking exactly like
+     * a form the player had dropped on purpose.
+     *
+     * Canon says the technomancer "can then take over sustaining again",
+     * so taking over is the natural end of the arrangement -- and a sprite
+     * leaving is the arrangement ending whether or not anybody typed the
+     * verb. The weave was never the sprite's; it was only being carried.
+     *
+     * Called from BOTH teardown paths on purpose. dismissCompanion covers
+     * dismissal and standby (standbySpriteToResonance dismisses to park),
+     * onActorRemoved covers death. Either alone would leave a hole that
+     * only shows up as a missing form several minutes later.
+     */
+    returnSustainedForms(entry) {
+        const held = entry.npc.sustainedForms;
+        if (!held || held.length === 0)
+            return;
+        const owner = (entry.npc.allyOf ? this.scene?.getPlayerByName(entry.npc.allyOf) : undefined) ?? this.player;
+        owner.sustainedForms.push(...held);
+        entry.npc.sustainedForms = [];
+        Logger.getInstance().logWithColor(`👥 ${entry.npc.name} lets go of ${held.map(f => f.key).join(', ')} -- the weave falls back to you, and so does the sustaining.`, 'yellow');
+    }
     /**
      * An actor left the world (Scene.removeActor). For a companion shell
      * that DIED (not a deliberate dismissal -- those set deathClaimed
@@ -1265,6 +1318,8 @@ export default class Game {
         const entry = this.companions.find(c => c.npc.name === name);
         if (!entry)
             return;
+        // A dead sprite still gives back what it was only carrying.
+        this.returnSustainedForms(entry);
         const idx = this.companions.indexOf(entry);
         if (idx >= 0)
             this.companions.splice(idx, 1);
@@ -2154,6 +2209,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('sprites', SpritesCommand);
         // STANDBY (p.256): the registered-sprite task that parks one for 1.
         CommandFactory.registerCommand('standby', StandbyCommand);
+        CommandFactory.registerCommand('sustain', SustainCommand);
         // Walk out for good -- the taxi's irreversible half (mYTCzJbs...).
         CommandFactory.registerCommand('abandon', AbandonCommand);
         // Kill Complex Form (p.250) -- the Resonance counterpart to dispel.
@@ -2167,6 +2223,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // Vertical travel by name (commands/climb.ts) -- shortcuts over
         // move, which already crosses levels.
         CommandFactory.registerCommand('climb', ClimbCommand);
+        // The word a player actually typed (vkDz3cquad25GACpm). mantle is
+        // six edits from climb, so no amount of typo tolerance was ever
+        // going to find it -- a synonym has to be said out loud.
+        CommandFactory.registerCommand('mantle', ClimbCommand);
+        CommandFactory.registerCommand('scale', ClimbCommand);
+        CommandFactory.registerCommand('clamber', ClimbCommand);
         CommandFactory.registerCommand('descend', DescendCommand);
         CommandFactory.registerCommand('run', RunCommand);
         CommandFactory.registerCommand('sprint', SprintCommand);
@@ -2230,6 +2292,53 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
     determineStartRoom() {
         return this.scene.determineStartRoom();
     }
+    /**
+     * WHERE THE RUNNER IS STANDING, when the seed says.
+     *
+     * `startSpot` has been declared on player-seed.ts all along and
+     * nothing read it FOR THE PLAYER -- NPCs get theirs applied inside
+     * scene-factory, the runner got nothing. So spotOf() returned
+     * undefined for the one actor a person controls, and every
+     * SPOT-RELATIVE mechanic quietly did not apply to them: move.ts
+     * derives climbSteps from the actor's spot, so with none there is no
+     * path, no climb link and no climbing test at all. A repro bench with
+     * a catwalk walked you up it with no roll.
+     *
+     * APPLIED AFTER THE PLACEMENT, and the precise reason is worth
+     * stating because I first wrote it down wrong. The currentLocation
+     * setter clears atSpot only when the room actually CHANGES
+     * (`if (this._currentLocation !== room)`). On a fresh boot the player
+     * is already in the start room, so either order would work there --
+     * a reordering mutation stays green, and I am saying so rather than
+     * letting the comment claim a guarantee its test does not give.
+     *
+     * It matters on the TRAVEL path below, where the runner really does
+     * move from the hub into a new scene and the setter really does fire.
+     * Applying after placement is correct in both cases, which is why it
+     * is the order used in both -- resumeOpenRun documents the same
+     * ordering for the same reason.
+     *
+     * What IS covered by a red-on-removal test is the call existing at
+     * all: nothing read this field before.
+     *
+     * REFUSES A SPOT THE ROOM DOES NOT HAVE rather than setting a name
+     * nothing answers to: an atSpot with no cell behind it is the
+     * silently-inert state this codebase keeps finding, and the runner
+     * standing nowhere is strictly better than the runner standing
+     * somewhere imaginary.
+     *
+     * No shipped scene sets it -- scene1 and scene2 both leave it
+     * undefined -- so this changes nothing that exists today.
+     */
+    applySeedStartSpot(seed) {
+        const wanted = seed?.player?.startSpot;
+        if (!wanted)
+            return;
+        const room = this.player.currentLocation;
+        if (!room?.spots?.some(s => s.name === wanted))
+            return;
+        this.player.atSpot = wanted;
+    }
     /**
      * Wires a fresh, always-unlocked path between the persistent home base
      * and wherever the player is starting the current job from. Clears the
@@ -2366,6 +2475,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         }
         this.scene.initialize(this);
         this.player.currentLocation = this.determineStartRoom();
+        this.applySeedStartSpot(this.sceneSeed);
         this.registerCommands();
         // The description follows the rent from day one (see
         // syncHomeToLifestyle) -- a fresh session at the default Squatter tier
@@ -3231,7 +3341,24 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 // raw server error stitched into Krow's fiction read as an
                 // instruction to "update the server" (real player note) -- it
                 // means update THIS machine.
-                const skew = /runs engine ([\d.]+)/.exec(String(shared.declined));
+                // THE SERVER'S REASON IS SPOKEN ALOUD, so it goes through the
+                // identity rule first (5wjyaaY7EKGttGZLQ: "don't put player
+                // names (doubleglizzy) in the message about 'Couldn't raise the
+                // whole crew'. This should be character names").
+                //
+                // The `absent` list below was already fixed to name runners via
+                // nameThem. This is its SIBLING and was missed: a decline comes
+                // back as free text the server composed, and it can name the
+                // seat it could not raise -- by account handle, because that is
+                // what the seat plumbing scopes to. Stitched into Krow's quoted
+                // dialogue, that put a person's site-wide identity in the
+                // fiction.
+                //
+                // Scrubbed ONCE here rather than at each branch: two of the four
+                // branches below interpolate it, and the next one added would
+                // have had to remember.
+                const declined = scrubHandles(String(shared.declined), this.crew.map(m => ({ handle: m.ghost?.owner, name: m.name })));
+                const skew = /runs engine ([\d.]+)/.exec(declined);
                 sharedDeclineNote = skew
                     ? ` "Crew channel's scrambled tonight -- no job till it clears."\n{yellow-fg}(Out of character: engine mismatch -- this machine runs ${srMod?.engineVersion() ?? '?'}, the street runs ${skew[1]}. If yours is older: npm i -g @maka/maka-cli@latest, then relaunch. If newer, the street is still rolling out.){/yellow-fg}`
                     : shared.code === 'unverified'
@@ -3242,8 +3369,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                         : shared.code === 'not-your-table'
                             // Leader-only crew jobs (ruling 2026-08-24): Krow takes
                             // commissions from the head of the table, nobody else.
-                            ? ` "${shared.declined} Want crew work? Take theirs, or seat a table of your own."`
-                            : ` "Couldn't raise the whole crew -- ${shared.declined} No crew on the line, no job -- raise them and call again."`;
+                            ? ` "${declined} Want crew work? Take theirs, or seat a table of your own."`
+                            : ` "Couldn't raise the whole crew -- ${declined} No crew on the line, no job -- raise them and call again."`;
                 // CREW EXCLUSIVITY (ruling 2026-08-24): a declined crew draft
                 // never falls back to a solo quote -- the ping explains, and
                 // the docket stays empty until the table answers.
@@ -3401,6 +3528,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.scene = await SceneSynthesizer.synthesizeFromJson(seed, this.player, false, false);
         this.scene.initialize(this);
         this.player.currentLocation = this.determineStartRoom();
+        this.applySeedStartSpot(seed);
         // New job -- and the needs come due at the door (see
         // applyDepartureNeeds): edge only refills fed-and-slept, and ignored
         // needs land as locked fatigue. Lines ride the JOB banner below.
@@ -4366,10 +4494,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // justify the elevation bar and to trim the caption rows.
         const boxWidth = screenW > 0 ? Math.floor(screenW * Game.ROOM_DOCK_PCT) - 2 : undefined;
         const mapWidth = screenW > 0 ? Math.floor(screenW * Game.MAP_DOCK_PCT) - 2 : undefined;
-        const caption = (text, width) => {
-            const w = width ?? text.length;
-            return `{bold}${text.length > w ? `${text.slice(0, Math.max(1, w - 1))}…` : text}{/bold}`;
-        };
+        // ONE CAPTION BUILDER, shared with the server push in headless.ts
+        // -- see mapCaption. Two inline copies is how the district map ended
+        // up captioned solo and blank on a shared run (RwPkFsRwd4c2uHvGN).
+        const caption = mapCaption;
         // The district viewport must FIT ITS BOX. It was a hardcoded 15
         // columns, which was fine while the Map box was 35% wide and
         // silently overflowed into the Room box once it shrank to 12% --
@@ -4400,8 +4528,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 isOtherPlayer: a => this.scene.isHumanControlled(a),
             });
             if (roomLines.length > 0) {
-                const spot = spotOf(this.player);
-                roomLines.push(caption(spot ? `@ ${spot}` : '(moving through)', boxWidth));
+                // roomCaption owns BOTH halves now -- where you stand, and that
+                // somebody here has no cell to be drawn in (S6b4TLQWq46RN5kGu).
+                roomLines.push(caption(roomCaption(here, this.player), boxWidth));
             }
             this.setRoomOverlay(roomLines);
         }
@@ -4561,15 +4690,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // a note -- EXCEPT anything that ends the session, which only ever
         // gets a suggestion: a typo must never quit the game.
         const knownVerbs = [...Object.keys(CommandFactory.getAllRegisteredCommands()), 'help', 'clear', 'quit', 'exit'];
-        let guess = fuzzyPickName(verb, knownVerbs);
-        // The shared matcher refuses typo tolerance on words <= 3 chars (too
-        // risky for item/NPC names) -- but the verb list is small and
-        // distinct, so a unique edit-distance-1 hit is safe ("maop" -> "map").
-        if (!guess && verb.length >= 3) {
-            const close = knownVerbs.filter(v => levenshteinDistance(verb, v) <= 1);
-            if (close.length === 1)
-                guess = close[0];
-        }
+        // A near-miss SPELLING beats a substring for verbs -- see
+        // guessVerb, which owns the ordering and the reason.
+        const guess = guessVerb(verb, knownVerbs);
         if (guess && guess !== verb) {
             if (guess === 'quit' || guess === 'exit') {
                 return out(`I don't understand "${verb}" -- did you mean "${guess}"?`);