@maka/maka-cli 5.113.0 → 5.115.0

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

@@ -32,6 +32,7 @@ import { currentSession } from './utilities/session-context.js';
 import { PlayersCommand } from './commands/players.js';
 import { LookCommand } from './commands/look.js';
 import { TakeCommand } from './commands/take.js';
+import { MessageCommand } from './commands/message.js';
 import { DownloadCommand } from './commands/download.js';
 import { LootCommand } from './commands/loot.js';
 import { NoteCommand } from './commands/note.js';
@@ -164,7 +165,7 @@ import { SceneSeedGenerator, FIXER_NAME, isFixerName } from './factories/scene-s
 import { CALL_ICON, CALL_COLOR, END_CALL_SENTINEL } from './utilities/comm-style.js';
 import { AI } from '../../../tools/ai/ai.class.js';
 import { BULLET } from './utilities/log-style.js';
-import { spotOf } from './utilities/spots.js';
+import { spotOf, resolveSpot } from './utilities/spots.js';
 export default class Game {
     initialized;
     static instance;
@@ -2174,6 +2175,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
     // transitions -- the player's own place, unlike every job's generated
     // rooms which get discarded wholesale when the next job replaces them.
     _homeRoom;
+    /** The hub room a resume seated the player in, when it was not home. */
+    _resumedAt;
     _homeRoomExitDirection;
     static HOME_DIRECTION_PRIORITY = [
         Direction.DOWN, Direction.UP, Direction.SOUTH, Direction.NORTH, Direction.EAST, Direction.WEST,
@@ -2200,6 +2203,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 .then(m => m.reportConditionSoon(this.player))
                 .catch(() => undefined);
         };
+        // A ROOM CHANGE IS A SAVE BEAT (player request 2026-09-02): where you
+        // stand in the hub is what a resume restores, so it has to reach the
+        // save -- and the server -- as you walk, not only at quit. requestSave
+        // carries its own guards (hub only, initialised, not down), so a
+        // room change mid-run or mid-boot is a silent no-op.
+        this.player.onRoomChanged = () => this.requestSave('move');
     }
     registerCommands() {
         CommandFactory.registerCommand('look', LookCommand);
@@ -2209,6 +2218,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('follow', FollowCommand);
         CommandFactory.registerCommand('unfollow', UnfollowCommand);
         CommandFactory.registerCommand('take', TakeCommand);
+        CommandFactory.registerCommand('message', MessageCommand);
         CommandFactory.registerCommand('download', DownloadCommand);
         CommandFactory.registerCommand('loot', LootCommand);
         CommandFactory.registerCommand('note', NoteCommand);
@@ -2792,7 +2802,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             const pendingNote = this._pendingRunSeed
                 ? hint(`\n\n${FIXER_NAME}'s job is still on offer: "${this._pendingRunSeed.name}". "call taxi" when you're ready, or "call ${FIXER_NAME}" to hear it again.`)
                 : '';
-            return `Welcome back, ${this.player.name}. The cot remembers your shape.\n ${this.scene.story}${pendingNote}`;
+            const where = this._resumedAt && this._resumedAt !== this._homeRoom
+                ? `You're back at the ${this._resumedAt.name}${this.player.atSpot ? `, by the ${this.player.atSpot}` : ''} -- right where you left off.`
+                : 'The cot remembers your shape.';
+            return `Welcome back, ${this.player.name}. ${where}\n ${this.scene.story}${pendingNote}`;
         }
         // Nudge the player toward "call" up front -- the fixer convention means
         // the story deliberately doesn't narrate a completed briefing, so
@@ -2804,6 +2817,40 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             : '';
         return `Welcome, ${this.player.name}\n ${this.scene.story}${callHint}`;
     }
+    /**
+     * WHERE YOU LOGGED OUT IS WHERE YOU LOG IN (player request 2026-09-02:
+     * "a player that logs in, logs back in at the server location"). The
+     * save carries the hub room and named spot (types/save-file.ts
+     * ISavedLocation); every hub room change writes a "move" beat, and
+     * quit writes the exact spot. On resume the player is seated there
+     * when the room still exists in the synthesized hub -- a save from a
+     * hub whose seed dropped the room wakes at home, logged, as before.
+     * The cell is not carried: a reload seats you on the spot's own seat.
+     */
+    restoreHubLocation(loc) {
+        if (!loc || !this._hubScene)
+            return;
+        // Not getRoom(): that one throws and logs an error for a miss, and a
+        // dropped room is an expected, quiet fall-through here.
+        const room = loc.room === this._homeRoom?.name
+            ? this._homeRoom
+            : Object.values(this._hubScene.getRooms()).find(r => r.name === loc.room);
+        if (!room) {
+            Logger.getInstance().write(`resume: saved room "${loc.room}" is not in this hub -- waking at home.`);
+            return;
+        }
+        this.player.currentLocation = room;
+        if (loc.spot && resolveSpot(room, loc.spot))
+            this.player.atSpot = loc.spot;
+        this._resumedAt = room;
+    }
+    /** The location a save carries: the current hub room and spot. */
+    hubLocationSnapshot() {
+        const room = this.player.currentLocation;
+        if (!room)
+            return undefined;
+        return { room: room.name, ...(this.player.atSpot ? { spot: this.player.atSpot } : {}) };
+    }
     /**
      * Everything a save restores beyond the seed synthesis: the player,
      * the hub world overlay, and the Game-level ledgers. Ordering inside
@@ -2941,6 +2988,8 @@ ${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;
+        // ...unless the save says where you actually were (see restoreHubLocation).
+        this.restoreHubLocation(save.game.location);
         this.repaintForScene();
         this.refreshLogLabel();
         Logger.getInstance().write(`Resumed save for ${save.playerName} (saved ${save.savedAt}, reason ${save.reason}).`);
@@ -2986,7 +3035,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * from it.
      */
     requestSave(reason) {
-        const logger = Logger.getInstance();
+        // GUARDS BEFORE THE LOGGER: the "move" beat fires from any room change,
+        // including ones outside a logging session (harnesses, benches). A
+        // no-op beat must cost nothing and touch nothing.
         if (!this.initialized || this._dead || !this._saveFilePath)
             return;
         if (!this.hasHub || this.scene !== this._hubScene || !this._hubSeed)
@@ -2995,6 +3046,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             return;
         if (this.scene.isPlayerExchangeActive())
             return;
+        const logger = Logger.getInstance();
         try {
             const save = this.buildSaveFile(reason);
             // Carry the cloud-sync stamp FORWARD through local writes: the
@@ -3094,6 +3146,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             hubSeed: this._hubSeed,
             player: serializePlayer(this.player),
             game: {
+                location: this.hubLocationSnapshot(),
                 lifestyleTier: this.lifestyleTier,
                 rentDebt: this.rentDebt,
                 tier: this._tier,
@@ -5455,7 +5508,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // technomancer-gated (a sprite task, SR5 p.256) and refuses anyone
         // else, so the Emerged shelf is where its audience looks.
         { title: 'resonance', entries: [['compile'], ['decompile'], ['thread'], ['unravel'], ['register'], ['standby'], ['sustain'], ['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: 'social', entries: [['say'], ['emote', 'me'], ['talk-to'], ['call'], ['message'], ['end-call', 'end', 'hangup'], ['accept'], ['decline', 'deny', 'refuse'], ['haggle', 'negotiate'], ['persuade', 'convince'], ['ask'], ['contacts']] },
         { 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']] },