@maka/maka-cli 5.117.0 → 5.119.0

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

@@ -1,4 +1,10 @@
+import { agentRatingFromName } from './utilities/programs.js';
 import blessed from 'blessed';
+import { hostLabel } from './utilities/grid-names.js';
+import { marksPlaced, marksOnYou } from './utilities/marks.js';
+import { settleUnresolvedHarm } from './utilities/harm-settlement.js';
+import { hostInteriorPanel } from './utilities/grid-view.js';
+import { DEFAULT_GRID_PROVIDER, PUBLIC_GRID, globalGrid } from './utilities/grids.js';
 import { hostsInReach, hostDockLine, gridVicinity } from './utilities/grid-reach.js';
 import { nameThem, scrubHandles } from './utilities/identity.js';
 import { dirname } from 'path';
@@ -27,7 +33,7 @@ import { rollPool, formatRoll } from './utilities/dice.js';
 import { Direction } from './types/shared/direction-enum.js';
 import { Logger } from './utilities/logger.js';
 import { runHostTurn } from './utilities/ic.js';
-import { leaveMatrix } from './utilities/planes.js';
+import { leaveMatrix, endPersona } from './utilities/planes.js';
 import { CommandQueue } from './utilities/command-queue.js';
 import { currentSession } from './utilities/session-context.js';
 import { PlayersCommand } from './commands/players.js';
@@ -66,6 +72,7 @@ import { EquipmentCommand } from './commands/equipment.js';
 import { MapCommand } from './commands/map.js';
 import { SilentCommand } from './commands/silent.js';
 import { EnterHostCommand, ExitHostCommand } from './commands/enter-host.js';
+import { HopCommand } from './commands/hop.js';
 import { RestCommand } from './commands/rest.js';
 import { ReloadCommand } from './commands/reload.js';
 import { SubdueCommand } from './commands/subdue.js';
@@ -1295,6 +1302,55 @@ export default class Game {
         return npc;
     }
     _remoteFixer;
+    /**
+     * The live-sheet read of everything this runner has out (contract
+     * 2026-09-02): the ledger's companions plus the drone they are jumped
+     * into. `where` is the room, or the host/grid for a construct;
+     * `damage` is the thing's OWN track -- a drone's hull, an agent's deck
+     * (shared monitor, p.246), a spirit's or sprite's shell.
+     */
+    companionsForBeat(player) {
+        const whereOf = (a) => a.plane === 'matrix'
+            ? (a.hostInside ? hostLabel(a.hostInside.over, { capital: true }) : (a.currentGrid?.name ?? 'the grid'))
+            : a.currentLocation?.name;
+        const out = [];
+        for (const c of this.companions) {
+            const dev = c.boundDevice;
+            const services = typeof c.services === 'number' ? `, ${c.services} service${c.services === 1 ? '' : 's'}` : '';
+            const line = c.kind === 'drone' && dev ? `Pilot ${2 + dev.qualityBonus}, hull ${dev.droneSummary()}`
+                : c.kind === 'agent' && dev ? `rating ${c.force} on ${dev.name} ${dev.deckSummary()}`
+                    : c.kind === 'sprite' ? `${c.spriteType ?? 'sprite'} level ${c.force}${services}${c.registered ? ', registered' : ''}`
+                        : c.kind === 'spirit' ? `Force ${c.force}${services}`
+                            : c.npc.archetypeName ?? undefined;
+            const damage = c.kind === 'drone' && dev ? { taken: dev.droneDamage, max: dev.maxDroneBoxes }
+                : c.kind === 'agent' && dev ? { taken: dev.deckDamage, max: dev.maxDeckBoxes }
+                    : { taken: c.npc.damageTaken, max: c.npc.maxConditionBoxes };
+            out.push({ name: dev?.name ?? c.npc.name, kind: c.kind, deployed: true, where: whereOf(c.npc), line, damage });
+        }
+        if (player.riggedDrone) {
+            const d = player.riggedDrone;
+            out.push({ name: d.name, kind: 'drone', deployed: true, where: `jumped in${player.bodyRoom ? ` from ${player.bodyRoom.name}` : ''}`, line: `hull ${d.droneSummary()}`, damage: { taken: d.droneDamage, max: d.maxDroneBoxes } });
+        }
+        // STOWED (addendum 2026-09-02: "and when they are deployed or not"): the
+        // 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())) {
+            if (out.some(o => o.name === d.name))
+                continue;
+            out.push({ name: d.name, kind: 'drone', deployed: false, line: `Pilot ${2 + d.qualityBonus}, 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')) {
+            const chips = player.inventory.getAllItems().map(i => agentRatingFromName(i.name)).filter((r) => r !== undefined);
+            const rating = Math.max(3 + deck.qualityBonus, ...(chips.length ? chips : [0]));
+            out.push({ name: `Agent (${deck.name})`, kind: 'agent', deployed: false, line: `rating ${rating} on ${deck.name} ${deck.deckSummary()}`, damage: { taken: deck.deckDamage, max: deck.maxDeckBoxes } });
+        }
+        for (const sp of this.registeredSpritesWaiting()) {
+            out.push({ name: sp.name, kind: 'sprite', deployed: false, line: `${sp.spriteType} level ${sp.level}, ${sp.tasks} task${sp.tasks === 1 ? '' : 's'}, registered` });
+        }
+        return out;
+    }
     spawnCompanionShell(opts) {
         if (this.scene.getActor(opts.name)) {
             Logger.getInstance().write(`spawnCompanionShell: name "${opts.name}" already in scene -- refusing.`);
@@ -1312,6 +1368,7 @@ export default class Game {
         this.scene.addActor(npc);
         this.scene.setCharacterLocation(npc, opts.room.name);
         npc.scene = this.scene;
+        this.player.noteConditionChanged(); // the crew rides the beat (companions)
         this.companions.push({ npc, kind: opts.kind, services: opts.services, force: opts.force, boundDevice: opts.boundDevice });
         Logger.getInstance().write(`Companion spawned: ${opts.name} (${opts.kind}, force ${opts.force}) in ${opts.room.name}.`);
         return npc;
@@ -1364,6 +1421,7 @@ export default class Game {
         const idx = this.companions.indexOf(entry);
         if (idx >= 0)
             this.companions.splice(idx, 1);
+        this.player.noteConditionChanged(); // the crew rides the beat (companions)
         Logger.getInstance().write(`Companion dismissed: ${entry.npc.name} -- ${reason}`);
     }
     /**
@@ -1425,6 +1483,7 @@ export default class Game {
         const idx = this.companions.indexOf(entry);
         if (idx >= 0)
             this.companions.splice(idx, 1);
+        this.player.noteConditionChanged(); // the crew rides the beat (companions)
         if (entry.kind === 'drone' && entry.boundDevice && !entry.npc.deathClaimed) {
             entry.boundDevice.takeDroneDamage(entry.boundDevice.maxDroneBoxes);
             Logger.getInstance().logWithColor(`👥 The ${entry.boundDevice.name} is WRECKED where it fell -- rest to repair the frame.`, 'yellow');
@@ -1659,6 +1718,8 @@ 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';
+    /** 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;
     /** The active lifestyle tier's row (falls back to Squatter). */
     get lifestyle() {
@@ -2213,19 +2274,26 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // The one-word role on the live sheet's actor entries: the contact
         // ledger's word, else "fence" when the room's fence stands here,
         // else nothing (utilities/condition-report.ts setActorRoleResolver).
-        void import('./utilities/condition-report.js').then(m => m.setActorRoleResolver(a => {
-            const contact = this.contacts.get(a.name)?.role;
-            if (contact)
-                return contact;
-            // The same classifier the ledger uses, on anyone -- minus its
-            // "Street Contact" default, which is a ledger word, not a role: an
-            // extra it cannot place carries nothing rather than a wrong word.
-            const classified = Game.roleOf(a);
-            if (classified !== 'Street Contact')
-                return classified;
-            const room = a.currentLocation;
-            return room && isFence(a, room) ? 'Fence' : undefined;
-        })).catch(() => undefined);
+        void import('./utilities/condition-report.js').then(m => {
+            // The marks this persona HOLDS (contract 2026-09-02, web accepted first):
+            // the same names the "marks" listing prints.
+            m.setMarksPlacedResolver(p => marksPlaced(this.scene, p.name));
+            m.setMarksOnYouResolver(p => marksOnYou(this.scene, p));
+            m.setCompanionsResolver(p => this.companionsForBeat(p));
+            return m.setActorRoleResolver(a => {
+                const contact = this.contacts.get(a.name)?.role;
+                if (contact)
+                    return contact;
+                // The same classifier the ledger uses, on anyone -- minus its
+                // "Street Contact" default, which is a ledger word, not a role: an
+                // extra it cannot place carries nothing rather than a wrong word.
+                const classified = Game.roleOf(a);
+                if (classified !== 'Street Contact')
+                    return classified;
+                const room = a.currentLocation;
+                return room && isFence(a, room) ? 'Fence' : undefined;
+            });
+        }).catch(() => undefined);
     }
     registerCommands() {
         CommandFactory.registerCommand('look', LookCommand);
@@ -2287,6 +2355,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // branch ROUTES a bare "exit" to this command while the persona is
         // inside a host, and 'exit-host' is the always-reachable name.
         CommandFactory.registerCommand('enter', EnterHostCommand);
+        CommandFactory.registerCommand('hop', HopCommand);
         CommandFactory.registerCommand('exit-host', ExitHostCommand);
         CommandFactory.registerCommand('rest', RestCommand);
         CommandFactory.registerCommand('reload', ReloadCommand);
@@ -2662,6 +2731,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             throw new Error(`Scene generation failed: ${err.message}`);
         }
         this.scene.initialize(this);
+        this.resolveHostGrids();
         this.player.currentLocation = this.determineStartRoom();
         this.applySeedStartSpot(this.sceneSeed);
         this.registerCommands();
@@ -2862,6 +2932,16 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this._resumedAt = room;
     }
     /** The location a save carries: the current hub room and spot. */
+    /** Each host's seeded grid word ('public' | 'local' | 'global:<corp>') against this scene's local grid. */
+    resolveHostGrids() {
+        for (const room of Object.values(this.scene.getRooms())) {
+            const host = room.host;
+            if (!host?.gridSeed)
+                continue;
+            const w = host.gridSeed.trim().toLowerCase();
+            host.grid = w === 'public' ? PUBLIC_GRID : w === 'local' ? this.scene.localGrid : w.startsWith('global:') ? globalGrid(host.gridSeed.slice('global:'.length)) : undefined;
+        }
+    }
     hubLocationSnapshot() {
         // The BODY's room, never the persona's: jacked in, currentLocation is
         // wherever the persona stands (a host's room inside one), and a resume
@@ -2903,6 +2983,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // local file never knew -- that is the cloud repair's job, and the
         // sync protocol's, see the repair-visibility ruling in cloud-saves.)
         this.lifestyleTier = canonicalLifestyleTier(save.game.lifestyleTier) ?? 'Street';
+        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;
@@ -3169,6 +3251,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             player: serializePlayer(this.player),
             game: {
                 location: this.hubLocationSnapshot(),
+                gridProvider: this.gridProvider,
                 lifestyleTier: this.lifestyleTier,
                 rentDebt: this.rentDebt,
                 tier: this._tier,
@@ -3417,7 +3500,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.linkLockedBy.clear();
         // Same enumeration, same reason: insideHost is persona state and these
         // paths end the persona without passing through planes.leaveMatrix.
-        this.player.insideHost = undefined;
+        endPersona(this.player);
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -3521,7 +3604,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.linkLockedBy.clear();
         // Same enumeration, same reason: insideHost is persona state and these
         // paths end the persona without passing through planes.leaveMatrix.
-        this.player.insideHost = undefined;
+        endPersona(this.player);
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -3973,7 +4056,11 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // forward), and no blocking AI-redressing pass either -- the chunked
         // rooms pass already wrote this scene's prose.
         this.scene = await SceneSynthesizer.synthesizeFromJson(seed, this.player, false, false);
+        // A run happens in the same metroplex: it rides the hub's local grid.
+        if (this._hubScene)
+            this.scene.localGrid = this._hubScene.localGrid;
         this.scene.initialize(this);
+        this.resolveHostGrids();
         this.player.currentLocation = this.determineStartRoom();
         this.applySeedStartSpot(seed);
         // New job -- and the needs come due at the door (see
@@ -4842,7 +4929,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // each under the picture it belongs to, so the HUD stops repeating
         // what two panels already show. The breadcrumb went with it -- the
         // district map draws the way you came far better than a text trail.
-        const stanceColor = player.autoStance === 'aggressive' ? 'red' : player.autoStance === 'guarded' ? 'yellow' : 'white';
+        const stanceColor = player.autoStance === 'lethal' ? 'red' : player.autoStance === 'non-lethal' ? 'yellow' : 'white';
         // WHAT'S IN YOUR HANDS rides alongside the stance (player ruling
         // 2026-08-25). The two answer the same question -- how ready are you
         // -- and the stance line was left short and lonely once the location
@@ -5128,12 +5215,19 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 this.setRoomOverlay(logoPanelLines(Game.MAP_DOCK_ROWS - 2, boxWidth ?? 16));
                 return;
             }
+            // INSIDE A HOST there is no floor to draw (p.219, p.246): the dock
+            // shows the interior's icons, not the room the body sits in.
+            const inside = this.player.hostInside;
+            if (inside) {
+                this.setRoomOverlay(hostInteriorPanel(this.scene, this.player, inside, Game.MAP_DOCK_ROWS - 2, boxWidth ?? 16));
+                return;
+            }
         }
         else {
             const mapInner = mapWidth ?? 15;
             const mapView = Math.max(7, mapInner % 2 === 0 ? mapInner - 1 : mapInner);
             const mapLines = renderMapViewport(this.scene.getRooms(), here, (r, d) => this.scene.barrierSealing(r, d), {
-                visited: this.player.visitedRooms,
+                visited: this.player.hasSoft('mapsoft') ? undefined /* Mapsoft (p.442): the district drawn and named */ : this.player.visitedRooms,
                 arEyes: this.player.hasMatrixEyes(),
             }, mapView, tallestRoomRows());
             // The captions the HUD used to carry: where you are under the
@@ -5316,6 +5410,13 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         if (actor.isUnconscious() && this.scene.getKnockout(actor.name)) {
             return out(`You're out cold -- the world moves without you.`);
         }
+        // HARM NOBODY SETTLED (user report 2026-09-02: killed by ice, still
+        // walking): a track that filled outside an exchange -- IC biofeedback,
+        // dumpshock, a blow to the empty body -- is judged before the next
+        // command runs, and again after it (utilities/harm-settlement.ts).
+        const settledBefore = await settleUnresolvedHarm(this.scene, actor);
+        if (settledBefore.length > 0)
+            return out(settledBefore.join('\n'));
         if (verb === 'maka') {
             return out('You are still in the game, type "quit" to exit');
         }
@@ -5341,7 +5442,13 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         const command = CommandFactory.createCommand(verb, context);
         if (command) {
             const result = await command.execute(args);
-            return out(this.withEphemeralTurn(actor, this.withAlarmTurn(actor, this.withICTurn(actor, result))));
+            const wrapped = this.withEphemeralTurn(actor, this.withAlarmTurn(actor, this.withICTurn(actor, result)));
+            // The IC turn above may have filled a track -- settle it now, not
+            // on the next keystroke.
+            const settled = await settleUnresolvedHarm(this.scene, actor);
+            if (settled.length === 0)
+                return out(wrapped);
+            return out([wrapped ?? '', ...settled].filter((l, i) => i > 0 || l.length > 0).join('\n'));
         }
         // Typo tolerance: two straight sessions bounced on slips like "searh"
         // and "maop". Reuse the same fuzzy matcher item/NPC names go through
@@ -5455,16 +5562,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
     withICTurn(actor, result) {
         if (result === null)
             return null;
-        const room = actor.currentLocation;
-        // Phase 1b widened this gate. It used to ask hostIsHunting, which is
-        // only true AFTER the host had made someone -- so the host could
-        // never notice you in the first place, and measurement said so:
-        // twelve runs, twelve cracked hosts, zero sightings. A host with a
-        // node gets its turn whenever a persona is standing in it, and
-        // ic.ts decides whether that turn is eyes or ice.
-        if (!room || actor.plane !== 'matrix' || !room.hasNode)
+        // The host's turn happens INSIDE it (p.246-247): the ice acts on what
+        // is in the host, and the persona's position says whether it is.
+        const host = actor.hostInside;
+        if (!host || actor.plane !== 'matrix')
             return result;
-        const turn = runHostTurn(room, actor);
+        const turn = runHostTurn(host.over, actor, this.scene);
         if (turn.lines.length === 0 && turn.meta.length === 0)
             return result;
         // Dice to the Mechanics pane, and only for a human -- the same gate
@@ -5545,7 +5648,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // players" / "crew street"); the bare verb still answers quietly.
         { title: 'party', entries: [['crew', 'party'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall']] },
         { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project', 'astral'], ['return'], ['assense']] },
-        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['download'], ['enter'], ['exit-host'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['download'], ['enter'], ['exit-host'], ['hop'], ['tap', 'splice'], ['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).
         // `sustain` shelves here and not under magic: the command is