@maka/maka-cli 5.72.0 → 5.74.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,7 +13,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 { 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 { getPref } from './utilities/prefs.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';
@@ -1236,11 +1237,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 +1297,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);
@@ -1774,6 +1808,36 @@ export default class Game {
         this._pendingRide = undefined;
         this.pendingRunAccepted = false;
     }
+    /**
+     * EVERYTHING THAT BELONGS TO AN OFFER, RESET TOGETHER
+     * (8jZMqtXmxbLiACo3E: "I haven't pushed the number yet").
+     *
+     * An offer carries its own haggle window at the hub -- "call <fixer>"
+     * delivers it and `haggle` works on the spot. Push on one, decline
+     * it, hear the NEXT one, and nothing cleared the flag: not
+     * refreshEdge (departure only, and no ride was called), not
+     * returnToHub (no run to come home from). The first push on the new
+     * offer was then refused with "you already pushed on the number once
+     * this job" -- about a job the runner had turned down.
+     *
+     * THE THIRD HOLE IN ONE BOOLEAN, which is why this is a method and
+     * not another line at a call site. `haggledThisJob` had already been
+     * patched twice, each time for its own report and each time at the
+     * one site that report happened to name: returnToHub for
+     * d4yoYPcRAtWpLtm9y, the headless boot for the shared-run arrival.
+     * There are TWO places a fresh offer is installed -- the solo draft
+     * and the shared-run quote -- and both had the same gap, so a third
+     * per-site patch would have fixed one and left the other reporting
+     * the same sentence.
+     *
+     * NOT called from restoreFromSave, deliberately: a resumed pendingRun
+     * is the SAME offer, and clearing there would forget a push the
+     * runner really did make before they quit.
+     */
+    resetForNewOffer() {
+        this.pendingRunAccepted = false;
+        this.player.haggledThisJob = false;
+    }
     get pendingRun() {
         return this._pendingRunSeed;
     }
@@ -2124,6 +2188,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.
@@ -3201,7 +3266,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'
@@ -3212,8 +3294,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.
@@ -3237,7 +3319,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 // a server draft doesn't survive a quit).
                 this._pendingRunTier = undefined;
                 this._pendingRide = Game.RIDE_POOL[Math.floor(Math.random() * Game.RIDE_POOL.length)];
-                this.pendingRunAccepted = false;
+                this.resetForNewOffer();
                 // Off-street seat-mates were dropped from tonight's quote by the
                 // server (their seats survive -- back on the street, back on the
                 // job). Krow NAMES them; silence here already cost one playtest.
@@ -3334,7 +3416,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this._pendingRunSeed = nextSeed;
             this._pendingRunTier = nextTier;
             this._pendingRide = Game.RIDE_POOL[Math.floor(Math.random() * Game.RIDE_POOL.length)];
-            this.pendingRunAccepted = false;
+            this.resetForNewOffer();
             return `Your link pings -- 1 new message: ${FIXER_NAME}.${sharedDeclineNote}${hint(` ("call ${FIXER_NAME}" to hear the job -- "jobs" shows the board.)`)}`;
         }
         // Classic sessions transition immediately, hideout-first, as always.
@@ -4336,10 +4418,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% --