@maka/maka-cli 5.68.0 → 5.70.0

package/bundle/typescript/src/commands/game/sideQuest/game.d.ts

@@ -376,6 +376,25 @@ export default class Game {
      * so this refuses it rather than quietly destroying it.
      */
     dismissSpriteToResonance(entry: (typeof this.companions)[number]): boolean;
+    /**
+     * STANDBY (SR5 p.256, a registered sprite TASK): "tells the sprite to
+     * return to the Resonance but come when you call it. This keeps the
+     * sprite from giving away your presence or getting in harm's way."
+     * Costs ONE task.
+     *
+     * The middle option dismissal made visible. Dismissing is free at the
+     * door and costs everything the sprite owes you (p.250); standby
+     * costs one and keeps the rest, which is the whole reason the book
+     * sells it. Without this the only way to park a sprite was to spend
+     * its entire usefulness, and a player who wanted it out of sight for
+     * one room paid for that with every favour it had left.
+     *
+     * Returns false when there is no task to spend with. A registered
+     * sprite that owes you nothing cannot pay for standby -- and does not
+     * need to, because dismissing it releases nothing it still had. The
+     * caller says that out loud rather than silently doing the other one.
+     */
+    standbySpriteToResonance(entry: (typeof this.companions)[number]): boolean;
     /**
      * CALL half of Call/Dismiss Sprite (p.250): "You call a registered
      * sprite you have waiting in the Resonance."
@@ -693,6 +712,12 @@ export default class Game {
      */
     runStartedAt?: Date;
     forfeitArmed: boolean;
+    /** Set by "abandon": the next taxi WALKS OUT instead of running an
+     *  errand (mYTCzJbsdZxYsTsZo). The reversible trip is the default and
+     *  the irreversible one is asked for -- Notoriety, a forfeited payout
+     *  and a destroyed scene should require the deliberate word, and a
+     *  round trip you can undo by getting back in the cab should not. */
+    walkOutArmed: boolean;
     /**
      * The meet and the wrap-up, triggered by the player's first/next real
      * interaction with the client (talk-to, a connected call, a give).
@@ -811,6 +836,66 @@ export default class Game {
      * state (a persona still jacked in, an astral projection, a sneak,
      * open combat bookkeeping) is settled on the way home.
      */
+    /**
+     * THE JOB YOU LEFT STANDING (mYTCzJbsdZxYsTsZo: "I'd like it to not
+     * fail the run -- I should be able to come and go to the job as I
+     * need (to get new gear)").
+     *
+     * Held in memory only, and deliberately NOT saved. Mid-run state
+     * never is -- "runs are disposable, a quit resumes to the hub with
+     * the job back on offer" -- so an errand is SESSION-SCOPED and needs
+     * no save-schema change. Quit mid-errand and you get exactly today's
+     * behaviour rather than a half-restored scene from a save that was
+     * never designed to hold one.
+     *
+     * The rooms survive because something finally holds them: returnToHub
+     * orphans a run "wholesale" only because nothing kept a reference.
+     */
+    private _openRun?;
+    /** Is there a job waiting for the runner to come back to it? */
+    get hasOpenRun(): boolean;
+    /** The room an open run is waiting in, for the surfaces that say so. */
+    get openRunSceneName(): string | undefined;
+    /**
+     * AN ERRAND IS NOT A HOMECOMING, and that is the whole design.
+     *
+     * returnToHub is a RITUAL, not a journey. Walking its full length
+     * twice per gear run would hand a player, free and on demand: a full
+     * stun heal at High lifestyle ("the shower runs hot until the run is
+     * a rumor"), every vendor's shelves restocked, a fresh legwork pull
+     * from every contact, the busking cycle reset, and a rerolled
+     * for-hire board -- while ALSO charging rent again and burning a
+     * twelfth of the DocWagon contract, whose year "ticks in homecomings".
+     * Wrong in both directions at once: the exploit and the punishment
+     * are the same line of code.
+     *
+     * So this is its own path rather than a flag on that one. Written as
+     * a separate method ON PURPOSE: parameterising the ritual would mean
+     * every future line added to it silently joins the errand too, and
+     * the failure would be invisible -- a restock nobody notices is not a
+     * crash. Here, anything an errand should do has to be written here.
+     *
+     * WHAT IT DOES: state hygiene the cab demands (a persona cannot ride
+     * in a taxi), companions fold and unfold as on any trip, and the
+     * scene swaps. Nothing else.
+     *
+     * WHAT IT DOES NOT DO, all of it deliberate: no client settlement, no
+     * crew settlement or disband, no jobsRun tally, no lifestyle upkeep,
+     * no restock, no rumor, no gig advance, no hire reroll, no DocWagon
+     * tick, no legwork refresh -- and NO per-job reset. A RETURN LEG IS
+     * NOT A NEW JOB: Edge does not refill, haggledThisJob does not clear,
+     * First Impression does not re-arm. You come back as you left, which
+     * is the difference between fetching a gun and starting over.
+     */
+    leaveRunForErrand(): string | undefined;
+    /** Back to the job you left standing. */
+    resumeOpenRun(): string | undefined;
+    /** Cross-plane and combat state that must not ride in a cab, shared
+     *  by both legs of an errand. A persona has no body to put in a taxi
+     *  and a fight does not travel. */
+    private settleTravelState;
+    /** The panel refresh both errand legs need. */
+    private refreshHubUi;
     private returnToHub;
     /**
      * KNIGHT ERRANT CHECKPOINT (SINs & getting caught, ruling 2026-08-24;

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

@@ -101,12 +101,15 @@ import { DecompileCommand } from './commands/decompile.js';
 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 { AbandonCommand } from './commands/abandon.js';
 import { UnravelCommand } from './commands/unravel.js';
 import { OrderCommand } from './commands/order.js';
 import { DeployCommand, AgentCommand, RecallCommand } from './commands/companions.js';
 import { DeckCommand, LoadProgramCommand, UnloadProgramCommand } from './commands/deck.js';
 import { getProgram } from './utilities/programs.js';
 import { MoveCommand, RunCommand, SprintCommand } from './commands/move.js';
+import { ClimbCommand, DescendCommand } from './commands/climb.js';
 import { HintsCommand } from './commands/hints.js';
 import { hint } from './utilities/hints.js';
 import { camerasLive } from './utilities/surveillance.js';
@@ -1015,6 +1018,41 @@ export default class Game {
         this.dismissCompanion(entry, 'dismissed to the Resonance');
         return true;
     }
+    /**
+     * STANDBY (SR5 p.256, a registered sprite TASK): "tells the sprite to
+     * return to the Resonance but come when you call it. This keeps the
+     * sprite from giving away your presence or getting in harm's way."
+     * Costs ONE task.
+     *
+     * The middle option dismissal made visible. Dismissing is free at the
+     * door and costs everything the sprite owes you (p.250); standby
+     * costs one and keeps the rest, which is the whole reason the book
+     * sells it. Without this the only way to park a sprite was to spend
+     * its entire usefulness, and a player who wanted it out of sight for
+     * one room paid for that with every favour it had left.
+     *
+     * Returns false when there is no task to spend with. A registered
+     * sprite that owes you nothing cannot pay for standby -- and does not
+     * need to, because dismissing it releases nothing it still had. The
+     * caller says that out loud rather than silently doing the other one.
+     */
+    standbySpriteToResonance(entry) {
+        if (entry.kind !== 'sprite' || !entry.registered || !entry.spriteType)
+            return false;
+        const owed = entry.services ?? 0;
+        if (owed < 1)
+            return false;
+        this._pendingSpriteRedeploy.push({
+            spriteType: entry.spriteType,
+            level: entry.force,
+            // The task it spends going quiet. The REST survive, which is the
+            // entire difference between this and dismissal.
+            tasks: owed - 1,
+            name: entry.npc.name,
+        });
+        this.dismissCompanion(entry, 'sent to standby');
+        return true;
+    }
     /**
      * CALL half of Call/Dismiss Sprite (p.250): "You call a registered
      * sprite you have waiting in the Resonance."
@@ -1770,6 +1808,12 @@ export default class Game {
     // Taxi warn-once (player ruling): leaving with the pay unclaimed
     // arms this; the second "call taxi" forfeits. Mirrors _quitArmed.
     forfeitArmed = false;
+    /** Set by "abandon": the next taxi WALKS OUT instead of running an
+     *  errand (mYTCzJbsdZxYsTsZo). The reversible trip is the default and
+     *  the irreversible one is asked for -- Notoriety, a forfeited payout
+     *  and a destroyed scene should require the deliberate word, and a
+     *  round trip you can undo by getting back in the cab should not. */
+    walkOutArmed = false;
     /**
      * The meet and the wrap-up, triggered by the player's first/next real
      * interaction with the client (talk-to, a connected call, a give).
@@ -2078,6 +2122,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('register', RegisterCommand);
         // The sprite database (p.256-259) -- reference, the way "spells" is.
         CommandFactory.registerCommand('sprites', SpritesCommand);
+        // STANDBY (p.256): the registered-sprite task that parks one for 1.
+        CommandFactory.registerCommand('standby', StandbyCommand);
+        // Walk out for good -- the taxi's irreversible half (mYTCzJbs...).
+        CommandFactory.registerCommand('abandon', AbandonCommand);
         // Kill Complex Form (p.250) -- the Resonance counterpart to dispel.
         CommandFactory.registerCommand('unravel', UnravelCommand);
         // "At" spots (utilities/spots.ts): walk/move/approach are one
@@ -2086,6 +2134,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('walk', MoveCommand);
         CommandFactory.registerCommand('move', MoveCommand);
         CommandFactory.registerCommand('approach', MoveCommand);
+        // Vertical travel by name (commands/climb.ts) -- shortcuts over
+        // move, which already crosses levels.
+        CommandFactory.registerCommand('climb', ClimbCommand);
+        CommandFactory.registerCommand('descend', DescendCommand);
         CommandFactory.registerCommand('run', RunCommand);
         CommandFactory.registerCommand('sprint', SprintCommand);
         CommandFactory.registerCommand('hints', HintsCommand);
@@ -2754,6 +2806,124 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * state (a persona still jacked in, an astral projection, a sneak,
      * open combat bookkeeping) is settled on the way home.
      */
+    /**
+     * THE JOB YOU LEFT STANDING (mYTCzJbsdZxYsTsZo: "I'd like it to not
+     * fail the run -- I should be able to come and go to the job as I
+     * need (to get new gear)").
+     *
+     * Held in memory only, and deliberately NOT saved. Mid-run state
+     * never is -- "runs are disposable, a quit resumes to the hub with
+     * the job back on offer" -- so an errand is SESSION-SCOPED and needs
+     * no save-schema change. Quit mid-errand and you get exactly today's
+     * behaviour rather than a half-restored scene from a save that was
+     * never designed to hold one.
+     *
+     * The rooms survive because something finally holds them: returnToHub
+     * orphans a run "wholesale" only because nothing kept a reference.
+     */
+    _openRun;
+    /** Is there a job waiting for the runner to come back to it? */
+    get hasOpenRun() {
+        return this._openRun !== undefined;
+    }
+    /** The room an open run is waiting in, for the surfaces that say so. */
+    get openRunSceneName() {
+        return this._openRun?.room.name;
+    }
+    /**
+     * AN ERRAND IS NOT A HOMECOMING, and that is the whole design.
+     *
+     * returnToHub is a RITUAL, not a journey. Walking its full length
+     * twice per gear run would hand a player, free and on demand: a full
+     * stun heal at High lifestyle ("the shower runs hot until the run is
+     * a rumor"), every vendor's shelves restocked, a fresh legwork pull
+     * from every contact, the busking cycle reset, and a rerolled
+     * for-hire board -- while ALSO charging rent again and burning a
+     * twelfth of the DocWagon contract, whose year "ticks in homecomings".
+     * Wrong in both directions at once: the exploit and the punishment
+     * are the same line of code.
+     *
+     * So this is its own path rather than a flag on that one. Written as
+     * a separate method ON PURPOSE: parameterising the ritual would mean
+     * every future line added to it silently joins the errand too, and
+     * the failure would be invisible -- a restock nobody notices is not a
+     * crash. Here, anything an errand should do has to be written here.
+     *
+     * WHAT IT DOES: state hygiene the cab demands (a persona cannot ride
+     * in a taxi), companions fold and unfold as on any trip, and the
+     * scene swaps. Nothing else.
+     *
+     * WHAT IT DOES NOT DO, all of it deliberate: no client settlement, no
+     * crew settlement or disband, no jobsRun tally, no lifestyle upkeep,
+     * no restock, no rumor, no gig advance, no hire reroll, no DocWagon
+     * tick, no legwork refresh -- and NO per-job reset. A RETURN LEG IS
+     * NOT A NEW JOB: Edge does not refill, haggledThisJob does not clear,
+     * First Impression does not re-arm. You come back as you left, which
+     * is the difference between fetching a gun and starting over.
+     */
+    leaveRunForErrand() {
+        const hub = this._hubScene;
+        if (!hub || this.scene === hub)
+            return undefined;
+        this._openRun = {
+            scene: this.scene,
+            room: this.player.currentLocation,
+            spot: this.player.atSpot,
+        };
+        const foldLines = this.foldCompanionsForTravel();
+        this.settleTravelState();
+        this.scene = hub;
+        this.scene.addRoom(this._homeRoom);
+        this.connectHomeRoom(hub.determineStartRoom());
+        this.player.currentLocation = this._homeRoom;
+        this.player.cameFrom = undefined;
+        const arrivalLines = this.unfoldCompanionsOnArrival();
+        this.refreshHubUi();
+        return [...foldLines, ...arrivalLines].join('\n');
+    }
+    /** Back to the job you left standing. */
+    resumeOpenRun() {
+        const open = this._openRun;
+        if (!open)
+            return undefined;
+        const foldLines = this.foldCompanionsForTravel();
+        this.settleTravelState();
+        this.scene = open.scene;
+        this.player.currentLocation = open.room;
+        // AFTER currentLocation: its setter clears atSpot on every room
+        // change, so the order here is load-bearing (same trap as
+        // scene-factory's stationing).
+        this.player.atSpot = open.spot;
+        this.player.cameFrom = undefined;
+        this._openRun = undefined;
+        const arrivalLines = this.unfoldCompanionsOnArrival();
+        this.refreshHubUi();
+        return [...foldLines, ...arrivalLines].join('\n');
+    }
+    /** Cross-plane and combat state that must not ride in a cab, shared
+     *  by both legs of an errand. A persona has no body to put in a taxi
+     *  and a fight does not travel. */
+    settleTravelState() {
+        this.player.plane = 'meat';
+        this.player.bodyRoom = undefined;
+        this.player.simMode = undefined;
+        this.player.astralTicks = 0;
+        this.player.activeDeck = undefined;
+        this.player.riggedDrone = undefined;
+        this.player.astralPerceiving = false;
+        this.player.sneaking = false;
+        this.player.inExchange = false;
+        this.player.combatOpponent = undefined;
+        this.player.activeCallPartner = undefined;
+        this.autoFight.cancelPending();
+    }
+    /** The panel refresh both errand legs need. */
+    refreshHubUi() {
+        this.updateEquipment(this.player.equipment);
+        this.updateInventory(this.player.inventory, capitalCase(this.scene.getCurrencyType()));
+        this.updateExits(this.player.currentLocation);
+        this.updateStatus();
+    }
     returnToHub() {
         const hub = this._hubScene;
         if (!hub)
@@ -2785,6 +2955,25 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
+        // THE JOB'S NEGOTIATION ENDS WITH THE JOB (d4yoYPcRAtWpLtm9y).
+        //
+        // haggledThisJob is per-JOB and was only ever cleared on DEPARTURE
+        // (applyDepartureNeeds -> refreshEdge). Coming home cleared nothing,
+        // so a runner who pushed on the number at this job's meet carried
+        // the flag back to the hub -- and launchPendingRun's offer-window
+        // capture then restored that stale true over the next job's fresh
+        // clear, refusing their first real haggle with "you already pushed
+        // on the number once this job."
+        //
+        // Cleared HERE rather than papering over it at the capture, because
+        // the flag's meaning is "this job", and the moment the job ends is
+        // when that stops being true. Anything set afterwards belongs to
+        // the next offer, which is exactly what the capture wants to keep.
+        //
+        // Deliberately NOT refreshEdge(): Edge refills on departure, fed
+        // and slept (SR5e p.56), and refilling it on arrival home would
+        // hand back a resource the next run is supposed to start without.
+        this.player.haggledThisJob = false;
         this.player.astralPerceiving = false;
         this.player.sneaking = false;
         this.player.inExchange = false;
@@ -3335,6 +3524,28 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // The departure save: hub state with the job still on offer -- what
         // a mid-run quit resumes to (the "runs are disposable" ruling).
         this.requestSave('job-accept');
+        // CARRY THE OFFER'S HAGGLE ACROSS THE TRAVEL, BUT ONLY THIS
+        // OFFER'S (d4yoYPcRAtWpLtm9y: "I got a notice that I've already
+        // pushed the number once, however I haven't").
+        //
+        // activateRunScene below refreshes per-job state, which clears
+        // haggledThisJob -- correct, a new job is a new negotiation. This
+        // capture/restore exists because the offer itself has a haggle
+        // window at the hub ("call <fixer>" delivers it), and a push made
+        // there must not be forgotten by the drive over.
+        //
+        // THE BUG WAS THAT THE CAPTURE COULD NOT TELL WHOSE HAGGLE IT WAS.
+        // haggledThisJob survives a finished run -- returnToHub clears
+        // neither it nor Edge -- so a runner who haggled at LAST job's meet
+        // came back to the hub still flagged, accepted a new job, and this
+        // line captured that stale true and faithfully restored it over the
+        // fresh clear. Their first haggle of the new job was then refused
+        // with "you already pushed on the number once this job", which was
+        // false, and the meet had just told them the rate was negotiable.
+        //
+        // Fixed at the source rather than here: returnToHub now ends the
+        // job's negotiation with the job, so anything still set when a ride
+        // is called genuinely belongs to the offer in hand.
         const haggledAtOffer = this.player.haggledThisJob;
         try {
             const banner = await this.activateRunScene(seed, tier, { startInHideout: false });
@@ -4355,7 +4566,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * future command can't silently fall out of help.
      */
     static HELP_CATEGORIES = [
-        { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach', 'run', 'sprint'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow', 'unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
+        { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach', 'run', 'sprint'], ['climb', 'descend'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow', 'unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
         { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['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']] },
         // The party layer: everyone who walks (or flies, or manifests) at
@@ -4367,9 +4578,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         { title: 'matrix', entries: [['jack'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
         // The Emerged get their own shelf (player request: "there MUST be
         // resonance" -- matrix is the place, Resonance is the talent).
-        { title: 'resonance', entries: [['compile', 'decompile'], ['thread'], ['unravel'], ['register'], ['sprites']] },
+        { title: 'resonance', entries: [['compile', 'decompile'], ['thread'], ['unravel'], ['register'], ['standby'], ['sprites']] },
         { title: 'social', entries: [['say'], ['emote', 'me'], ['talk-to'], ['call'], ['end-call', 'end', 'hangup'], ['accept'], ['decline', 'deny', 'refuse'], ['haggle', 'negotiate'], ['persuade', 'convince'], ['ask'], ['contacts']] },
-        { title: 'street', entries: [['browse', 'buy'], ['sell'], ['catalog'], ['source', 'procure'], ['work', 'gig'], ['jobs'], ['journal'], ['perform'], ['palm'], ['docwagon'], ['treat'], ['eat'], ['drink'], ['lifestyle'], ['pay']] },
+        { title: 'street', entries: [['abandon'], ['browse', 'buy'], ['sell'], ['catalog'], ['source', 'procure'], ['work', 'gig'], ['jobs'], ['journal'], ['perform'], ['palm'], ['docwagon'], ['treat'], ['eat'], ['drink'], ['lifestyle'], ['pay']] },
         { title: 'barriers', entries: [['pick'], ['breach'], ['dispel', 'dispell'], ['bluff'], ['unlock'], ['lock']] },
         { title: 'character', entries: [['sheet', 'stats'], ['advance'], ['qualities', 'quality'], ['sin', 'sins', 'papers'], ['initiate', 'submerge'], ['install', 'chrome']] },
         { title: 'session', entries: [['help'], ['hints'], ['time', 'clock'], ['note'], ['backlog'], ['roles'], ['clear'], ['quit', 'exit']] },