@maka/maka-cli 5.123.1 → 5.125.0

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

@@ -18,12 +18,14 @@ import { Item } from './models/item.js';
 import { Room, Container } from './models/_index.js';
 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, spillPathFor, } from './utilities/persistence.js';
+import { serializePlayer, restorePlayer, captureHubOverlay, applyHubOverlay, applyHomeBlock, writeSaveAtomic, deleteSave, restoreItem, readSave, serializeItem, saveSlug, spillPathFor, } from './utilities/persistence.js';
 import { heartbeatPresence, heartbeatPresenceNow } from './utilities/social.js';
 import { presenceBeatAllowed } from './utilities/presence-gate.js';
 import { pushSave, burnCloudSaveFor, enqueueBoundPush, flushPushQueue, writeSpill, takeLastMemorial, authToken, clearSpill, hasPendingPush, } from './utilities/cloud-saves.js';
 import { DOCWAGON_TIERS, RESUSC_FEE, DEATH_COMP } from './utilities/docwagon.js';
-import { isFence, LIFESTYLE_TIERS, canonicalLifestyleTier } from './utilities/commerce.js';
+import { isFence, LIFESTYLE_TIERS, LIFESTYLE_OPTIONS, canonicalLifestyleTier, canonicalLifestyleOption, lifestyleOptionAllowed } from './utilities/commerce.js';
+import { reconcileGarage } from './models/home-containers.js';
+import { ownedDrones } from './utilities/owned-drones.js';
 import { attachBrandMark, attachBrandMarkBottomRight } from './utilities/brand-mark.js';
 import { logoPanelLines } from './utilities/logo-mark.js';
 import { bestFakeSin, wandRead, processArrest } from './utilities/sin.js';
@@ -89,7 +91,6 @@ import { LeadCommand, RecruitCommand } from './commands/lead.js';
 import { CrewCommand, HireCommand, DismissCommand, TrainCommand } from './commands/crew.js';
 import { PalmCommand } from './commands/palm.js';
 import { CatalogCommand } from './commands/catalog.js';
-import { ensureCatalog } from './utilities/catalog.js';
 import { PerformCommand } from './commands/perform.js';
 import { EdgeCommand } from './commands/edge.js';
 import { SheetCommand } from './commands/sheet.js';
@@ -1363,10 +1364,17 @@ export default class Game {
         // roster the runner OWNS and has not sent out -- drones in the bag, the
         // deck's agent, registered sprites waiting in the Resonance. Spirits
         // exist only while summoned, so none is ever stowed.
-        for (const d of player.inventory.getAllItems().filter(i => i.isDrone())) {
+        // ...and the frames parked in the Garage (2026-09-05): owned, not
+        // deployed, and tagged so the sheet says where.
+        for (const { item: d, where } of ownedDrones(player, this._homeRoom, { reach: 'owned' })) {
             if (out.some(o => o.name === d.name))
                 continue;
-            out.push({ name: d.name, kind: 'drone', deployed: false, line: `Pilot ${d.pilotRating}, hull ${d.droneSummary()}${d.isWrecked ? ' -- WRECKED' : ''}`, damage: { taken: d.droneDamage, max: d.maxDroneBoxes } });
+            out.push({
+                name: d.name, kind: 'drone', deployed: false,
+                ...(where === 'garage' ? { where: 'garage' } : {}),
+                line: `Pilot ${d.pilotRating}, hull ${d.droneSummary()}${d.isWrecked ? ' -- WRECKED' : ''}`,
+                damage: { taken: d.droneDamage, max: d.maxDroneBoxes },
+            });
         }
         const deck = player.getAnyCyberdeck();
         if (deck && !this.companions.some(c => c.kind === 'agent')) {
@@ -1748,6 +1756,13 @@ export default class Game {
     // and while the tab stands, rest at the hideout recovers half (rest.ts;
     // "pay" squares it, pay.ts; "lifestyle" views and moves tiers).
     lifestyleTier = 'Squatter';
+    /**
+     * LIFESTYLE OPTIONS (SR5 p.370, 2026-09-05): riders on the tier, by
+     * canonical key -- today only 'garage', the Special Work Area that
+     * parks a rigger's frames (utilities/commerce.ts LIFESTYLE_OPTIONS).
+     * Barred on Street; a slide to Street drops them (returnToHub).
+     */
+    lifestyleOptions = [];
     /** The Big Ten grid a High lifestyle rides (SR5 p.222). A placeholder default until chargen offers the pick (grids.ts). */
     gridProvider = DEFAULT_GRID_PROVIDER;
     rentDebt = 0;
@@ -1755,15 +1770,41 @@ export default class Game {
     get lifestyle() {
         return LIFESTYLE_TIERS.find(t => t.name === this.lifestyleTier) ?? LIFESTYLE_TIERS[1];
     }
+    hasLifestyleOption(key) {
+        return this.lifestyleOptions.includes(key);
+    }
+    /** What the homecoming collects: the tier's share plus every option's. */
+    get lifestyleUpkeep() {
+        return this.lifestyle.upkeep
+            + LIFESTYLE_OPTIONS.filter(o => this.lifestyleOptions.includes(o.key)).reduce((n, o) => n + o.upkeep, 0);
+    }
+    /**
+     * Drop every option the current tier bars (p.370: none on Street).
+     * Returns the keys dropped, so the caller can say the lease lapsed.
+     */
+    dropBarredLifestyleOptions() {
+        const dropped = this.lifestyleOptions.filter(o => !lifestyleOptionAllowed(o, this.lifestyleTier));
+        if (dropped.length > 0)
+            this.lifestyleOptions = this.lifestyleOptions.filter(o => !dropped.includes(o));
+        return dropped;
+    }
     /**
      * Makes the hideout LOOK like what the rent buys: the room's description
      * follows the active tier (player request -- an upgraded lifestyle read
      * as the same windowless squat). Called wherever the tier moves: the
      * lifestyle command, and the shortfall slide in returnToHub.
+     *
+     * THE GARAGE FOLLOWS THE OPTION (2026-09-05): the bay exists exactly
+     * while the lifestyle carries 'garage'. Reconciling here, on the same
+     * call every tier move already makes, is what keeps the furniture and
+     * the lease from disagreeing. Returns the names of any frames a lapsed
+     * lease spilled onto the floor, for the caller to mention.
      */
     syncHomeToLifestyle() {
-        if (this._homeRoom)
-            this._homeRoom.description = this.lifestyle.homeDescription;
+        if (!this._homeRoom)
+            return [];
+        this._homeRoom.description = this.lifestyle.homeDescription;
+        return reconcileGarage(this._homeRoom, this.player.name, this.hasLifestyleOption('garage'), this.lifestyle.garageDescription ?? 'A bay with a roll-down door. Your frames park here.');
     }
     // RESTOCK (see returnToHub): consumable shop stock -- food, drink,
     // ammo, patches -- snapshotted at hub capture and restored to any shelf
@@ -2174,7 +2215,7 @@ export default class Game {
         if (client.dead) {
             this.contacts.delete(client.name);
             Logger.getInstance().write(`Client reputation settled: ${client.name} (dead -- no contact).`);
-            return `
+            return `
 ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and their friends ask questions.`;
         }
         const existing = this.contacts.get(client.name);
@@ -2746,14 +2787,11 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             Logger.getInstance().logWithColor(`⚠ Your AI provider refused: "${message.slice(0, 140)}" -- NPC voices and job generation are OFFLINE until the key or credits are fixed. Dice, combat, and coms still work.`, 'yellow');
             this.screenRender?.();
         };
-        // The catalog warms from maka-cli.com in the background
-        // (utilities/catalog.ts): live list > local cache > baked-in floor.
-        //
-        // A VERSION CHECK FIRST, not a download every boot. The server is
-        // asked for a number; the ~900KB list follows only if the local
-        // cache is behind it. Signed-out players are served their cache or
-        // the floor and nothing leaves the machine.
-        void ensureCatalog({ token: authToken() });
+        // THE CATALOG IS NOT FETCHED HERE ANY MORE (2026-09-05). The terminal
+        // client gates on it before this point (sideQuest.sub.cmd.ts and
+        // ui.ts call requireCatalog), and a server hosting headless sessions
+        // primes the engine from its own database (applyLiveCatalog) -- so
+        // initEngine, which both of them reach, must not touch the network.
         // No "Generating Scene... Please wait." box anymore: every path now
         // arrives with REAL prose (hand-authored static seeds, chunk-authored
         // generated scenes), so the old blocking AI-redressing pass -- 30-60
@@ -2997,35 +3035,61 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * matters less than its POSITION in init(): after seedHomeTurfContacts
      * and snapshotVendorStock (both deliberately pre-overlay).
      */
-    applyResumeState(save) {
-        restorePlayer(this.player, save.player);
-        // A BIRTH CERTIFICATE IS NOT A RESUME. A `reason: 'creation'` save
-        // (the web chargen factory) carries a player and a hub seed and
-        // NOTHING ELSE -- no world has happened to overlay. Applying its
-        // empty game/hub as if a session had produced them crashed the very
-        // first web-born runner at boot (`saved.deadActors is not iterable`,
-        // 2026-09-01) and would have zeroed the gig pool besides. The world
-        // boots fresh from the embedded seed, exactly as a CLI-born
-        // character's does; the first real requestSave writes the full state
-        // and every later resume takes the branch below.
-        if (save.reason === 'creation')
-            return;
-        applyHubOverlay(this.scene, save.hub, this.player, this._homeRoom);
-        // CANONICAL ON RESTORE (2026-09-01): the web factory once wrote a
-        // lowercase 'street' that matched no LIFESTYLE_TIERS name, and this
-        // line handed it to a getter that fell through to Squatter -- then
-        // the next save SERIALIZED that Squatter, local and cloud, burying
-        // any server-side repair. Canonicalizing here closes the fall-through
-        // for every save that still carries the old spelling: 'street' means
-        // Street, the factory's intent. (It cannot restore a PAID tier the
-        // local file never knew -- that is the cloud repair's job, and the
-        // sync protocol's, see the repair-visibility ruling in cloud-saves.)
+    /**
+     * THE LIFESTYLE THE SAVE PAID FOR, applied -- for EVERY save, a birth
+     * certificate included (2026-09-05). This used to sit below the
+     * `creation` early return in applyResumeState, so a web-born runner who
+     * had paid a first month of High booted at the Squatter default, and
+     * the first hub-arrival save then serialised that Squatter and buried
+     * the tier for good. The lifestyle is Game-owned, not seed-owned; there
+     * is no "world" it waits on.
+     *
+     * CANONICAL ON RESTORE (2026-09-01): the web factory once wrote a
+     * lowercase 'street' that matched no LIFESTYLE_TIERS name, and this
+     * line handed it to a getter that fell through to Squatter -- then
+     * the next save SERIALIZED that Squatter, local and cloud, burying
+     * any server-side repair. Canonicalizing here closes the fall-through
+     * for every save that still carries the old spelling: 'street' means
+     * Street, the factory's intent. (It cannot restore a PAID tier the
+     * local file never knew -- that is the cloud repair's job, and the
+     * sync protocol's, see the repair-visibility ruling in cloud-saves.)
+     */
+    applyLifestyleFromSave(save) {
         this.lifestyleTier = canonicalLifestyleTier(save.game.lifestyleTier) ?? 'Street';
+        // Options: canonical, known, and allowed on the tier -- a 'garage' a
+        // Street save somehow carries is dropped here rather than built.
+        this.lifestyleOptions = (save.game.lifestyleOptions ?? [])
+            .map(canonicalLifestyleOption)
+            .filter((o) => o !== undefined && lifestyleOptionAllowed(o, this.lifestyleTier));
         if (typeof save.game.gridProvider === 'string' && save.game.gridProvider.trim())
             this.gridProvider = save.game.gridProvider;
         this.rentDebt = save.game.rentDebt;
         this.syncHomeToLifestyle();
         this.player.lifestyleEdgeBonus = this.lifestyle.edgeBonus;
+    }
+    applyResumeState(save) {
+        restorePlayer(this.player, save.player);
+        this.applyLifestyleFromSave(save);
+        // A BIRTH CERTIFICATE IS NOT A RESUME. A `reason: 'creation'` save
+        // (the web chargen factory) carries a player and a hub seed and NO
+        // WORLD -- nothing has happened to overlay. Applying its empty hub as
+        // if a session had produced it crashed the very first web-born runner
+        // at boot (`saved.deadActors is not iterable`, 2026-09-01) and would
+        // have zeroed the gig pool besides. The world boots fresh from the
+        // embedded seed, exactly as a CLI-born character's does; the first
+        // real requestSave writes the full state and every later resume
+        // takes the branch below.
+        //
+        // WHAT A BIRTH CERTIFICATE DOES CARRY (2026-09-05): its lifestyle
+        // (applied above) and its HOME block -- the Game-owned hideout's
+        // furniture, which the factory fills when a rigger is born with a
+        // garage full of frames. Both are the runner's, not the world's, so
+        // both are applied; the seed-derived overlay stays skipped.
+        if (save.reason === 'creation') {
+            applyHomeBlock(this._homeRoom, save.hub?.home, this.player);
+            return;
+        }
+        applyHubOverlay(this.scene, save.hub, this.player, this._homeRoom);
         this._tier = save.game.tier;
         this.contacts = new Map(save.game.contacts);
         // Roles are DERIVED, not earned -- re-derive them all on every
@@ -3291,6 +3355,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 location: this.hubLocationSnapshot(),
                 gridProvider: this.gridProvider,
                 lifestyleTier: this.lifestyleTier,
+                lifestyleOptions: [...this.lifestyleOptions],
                 rentDebt: this.rentDebt,
                 tier: this._tier,
                 contacts: [...this.contacts.entries()],
@@ -3689,7 +3754,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // the shortfall becomes the tab -- rest.ts halves recovery while you
         // owe; "pay" squares it; "lifestyle" climbs back up.
         const tier = this.lifestyle;
-        const due = tier.upkeep + this.rentDebt;
+        // The tier's share plus every option's (the garage, p.370).
+        const upkeep = this.lifestyleUpkeep;
+        const due = upkeep + this.rentDebt;
         const paid = Math.min(this.player.currency, due);
         if (paid > 0)
             this.player.adjustCurrency(-paid);
@@ -3699,16 +3766,24 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             const tierIndex = LIFESTYLE_TIERS.findIndex(t => t.name === tier.name);
             if (tierIndex > 0) {
                 this.lifestyleTier = LIFESTYLE_TIERS[tierIndex - 1].name;
+                // A lease the new tier cannot carry lapses with it (Street bars
+                // every option), and the garage's frames land on the floor --
+                // still yours, still here, just not parked.
+                const dropped = this.dropBarredLifestyleOptions();
                 // The downgrade is visible the moment you look around.
-                this.syncHomeToLifestyle();
-                rentLine = `The landlord's drone pings before the door even shuts: ${paid > 0 ? `${paid} paid, ` : ''}${this.rentDebt} nuyen still owed. Your ${tier.name} arrangement lapses -- you're living ${this.lifestyleTier} now.${hint(` ("pay" the tab, "lifestyle" to climb back.)`)}`;
+                const spilled = this.syncHomeToLifestyle();
+                const lapse = dropped.length > 0
+                    ? ` The garage lease goes with it${spilled.length > 0 ? `; ${spilled.join(', ')} sit${spilled.length === 1 ? 's' : ''} in the alley now` : ''}.`
+                    : '';
+                rentLine = `The landlord's drone pings before the door even shuts: ${paid > 0 ? `${paid} paid, ` : ''}${this.rentDebt} nuyen still owed. Your ${tier.name} arrangement lapses -- you're living ${this.lifestyleTier} now.${lapse}${hint(` ("pay" the tab, "lifestyle" to climb back.)`)}`;
             }
             else {
                 rentLine = `Even the doorway costs something: ${this.rentDebt} nuyen on the tab.${hint(` ("pay" when you're flush.)`)}`;
             }
         }
         else {
-            rentLine = `The landlord's drone takes its ${paid} nuyen (${tier.name} upkeep) at the door and buzzes off satisfied.`;
+            const share = upkeep > tier.upkeep ? ` (${tier.name} upkeep plus the garage)` : ` (${tier.name} upkeep)`;
+            rentLine = `The landlord's drone takes its ${paid} nuyen${share} at the door and buzzes off satisfied.`;
         }
         this.player.lifestyleEdgeBonus = this.lifestyle.edgeBonus;
         // A High lifestyle erases the run: hot shower, real bed, full reset.