@maka/maka-cli 5.10.0 → 5.12.0

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

@@ -5,8 +5,9 @@ import { Item } from './models/item.js';
 import { Room } 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, } from './utilities/persistence.js';
+import { serializePlayer, restorePlayer, captureHubOverlay, applyHubOverlay, writeSaveAtomic, deleteSave, restoreItem, readSave, } from './utilities/persistence.js';
 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 { rollPool, formatRoll } from './utilities/dice.js';
 import { Direction } from './types/shared/direction-enum.js';
@@ -38,6 +39,14 @@ import { RestCommand } from './commands/rest.js';
 import { ReloadCommand } from './commands/reload.js';
 import { SubdueCommand } from './commands/subdue.js';
 import { GrappleCommand, ReleaseCommand, StruggleCommand } from './commands/grapple.js';
+import { AcceptCommand, DeclineCommand } from './commands/job-offer.js';
+import { SourceCommand } from './commands/source.js';
+import { DocwagonCommand } from './commands/docwagon.js';
+import { LeadCommand, RecruitCommand } from './commands/lead.js';
+import { PalmCommand } from './commands/palm.js';
+import { CatalogCommand } from './commands/catalog.js';
+import { refreshCatalog } from './utilities/catalog.js';
+import { PerformCommand } from './commands/perform.js';
 import { EdgeCommand } from './commands/edge.js';
 import { SheetCommand } from './commands/sheet.js';
 import { CallCommand } from './commands/call.js';
@@ -64,6 +73,8 @@ import { InitiateCommand } from './commands/initiate.js';
 import { SummonCommand } from './commands/summon.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 { HintsCommand } from './commands/hints.js';
 import { hint } from './utilities/hints.js';
@@ -152,7 +163,191 @@ export default class Game {
     // against the real pending-run seed. One pull per contact per
     // homecoming (asked resets in returnToHub).
     contacts = new Map();
+    // SWAG orders in flight (SR5e p.387/418, commands/source.ts): a
+    // contact shopping the black market for you. Paid up front on a won
+    // Availability test; the goods land at the NEXT HOMECOMING (the
+    // delivery-times table, abstracted to the job-cycle clock the same
+    // way rest is). Rides the save (ISavedGameState.procurements).
+    pendingProcurements = [];
+    // DOCWAGON (SR5e p.450, utilities/docwagon.ts): the wristband between
+    // a runner and the morgue. Rides the save; ticks down at homecomings.
+    docwagon;
+    // LEADERSHIP's Command action (SR5e p.141-142, commands/lead.ts): a
+    // recruited contact rides the NEXT run as an 'ally' companion shell
+    // (spawned at activateRunScene, released at homecoming). RAW's teeth:
+    // a refusal stands until Loyalty deepens past the level it happened
+    // at. Both ride the save.
+    enlistedAlly;
+    commandRefusals = {};
+    // PERFORMANCE's busking gate (commands/perform.ts): one set per job
+    // cycle, reset at homecoming like a contact's legwork. Deliberately
+    // NOT saved -- a relaunch is as good as a homecoming for new material.
+    performedThisCycle = false;
+    /** The recruited contact joins at the jobsite curb ("takes their own
+     *  ride and meets you there" -- the companion convention). */
+    spawnEnlistedAlly() {
+        const ally = this.enlistedAlly;
+        if (!ally)
+            return [];
+        const shell = this.spawnCompanionShell({
+            name: ally.name,
+            description: `${ally.description} Right now they run as ${this.player.name}'s crew: they fight beside them, follow their lead, and expect to be home by morning.`,
+            kind: 'ally',
+            combat: ally.combat,
+            room: this.player.currentLocation,
+            plane: 'meat',
+            force: Number(ally.combat.body ?? 3),
+        });
+        return shell ? [`${ally.name} is already leaning on the wall when you arrive -- "Took my own ride. Let's work."`] : [];
+    }
+    /** Bills a DocWagon fee: cred first, shortfall onto the rent tab (the
+     *  street's one universal collections agency). Returns the line. */
+    billDocwagon(amount, label) {
+        if (amount <= 0)
+            return '';
+        const paid = Math.min(this.player.currency, amount);
+        if (paid > 0)
+            this.player.adjustCurrency(-paid);
+        const owed = amount - paid;
+        if (owed > 0)
+            this.rentDebt += owed;
+        return owed > 0
+            ? `DocWagon bills ${amount} for ${label} -- ${paid} paid, ${owed} on your tab.`
+            : `DocWagon bills ${amount} for ${label}.`;
+    }
+    /**
+     * The band answers (SR5e p.450). 'htr': a High Threat Response team
+     * extracts a flatlining KO'd runner instead of the street deciding.
+     * 'resusc': clinical death reversed -- a free resuscitation or the
+     * 5,000 fee -- the sanctioned carve-out to permadeath (player ruling;
+     * overflow-past-Body instant death isn't modeled yet, so every death
+     * is currently within reach of the crash cart). Returns true when the
+     * rescue engages -- the caller must then NOT end the game.
+     */
+    tryDocwagonRescue(kind, opts = {}) {
+        const contract = this.docwagon;
+        if (!contract || !this.initialized || this._dead)
+            return false;
+        const tier = DOCWAGON_TIERS[contract.tier];
+        const logger = Logger.getInstance();
+        const bills = [];
+        if (kind === 'resusc') {
+            if (contract.resuscsLeft > 0) {
+                contract.resuscsLeft -= 1;
+                bills.push(`A contract resuscitation is burned -- ${contract.resuscsLeft} left this year.`);
+            }
+            else {
+                bills.push(this.billDocwagon(RESUSC_FEE, 'resuscitation'));
+            }
+            // Back from the white light, barely: two boxes shy of the track.
+            const p = this.player;
+            p.healDamage(Math.max(0, p.damageTaken - (p.maxConditionBoxes - 2)));
+            p.healStun(Math.max(0, p.stunTaken - Math.max(0, p.maxStunBoxes - 2)));
+        }
+        else {
+            bills.push(this.billDocwagon(tier.htrFee, 'High Threat Response'));
+            // Extraction under fire: hostiles still standing can cost DocWagon
+            // a medic -- and the client eats the 20,000 death compensation
+            // (p.450), unless the contract says otherwise.
+            const hostiles = opts.standingHostiles ?? [];
+            if (hostiles.length > 0 && tier.deathComp) {
+                const casualtyRoll = rollPool(Math.min(4, hostiles.length));
+                if (casualtyRoll.hits > 0) {
+                    bills.push(this.billDocwagon(DEATH_COMP, 'employee death compensation -- a medic did not make it out'));
+                }
+            }
+            // Conscious enough to be carried: the band's medics stabilize.
+            const p = this.player;
+            p.healStun(Math.max(0, p.stunTaken - Math.max(0, p.maxStunBoxes - 2)));
+        }
+        logger.logWithColor(kind === 'resusc'
+            ? `${CALL_ICON} Your wristband SCREAMS the flatline. Ten minutes later there is foam, light, and a trauma team refusing to let you go.`
+            : `${CALL_ICON} The band reads the flatline and howls -- a DocWagon HTR team storms the scene behind riot shields and suppression foam.`, CALL_COLOR);
+        for (const b of bills.filter(Boolean))
+            logger.logWithColor(b, 'yellow');
+        this.scene.addWorldEvent(`A DocWagon team extracted ${this.player.name} under the ${contract.tier} contract.`);
+        void this.docwagonMedevac();
+        return true;
+    }
+    /** Where the wagon drops you (player ruling: the CLINIC, not your own
+     *  cot): the district Street Doc's room, generically -- so generated
+     *  hubs work too. Falls back to the hideout if the hub has no doc. */
+    docwagonDropOff() {
+        for (const [name, c] of this.contacts) {
+            if (c.role === 'Street Doc') {
+                const doc = this.hubActor(name);
+                if (doc?.currentLocation)
+                    return doc.currentLocation;
+            }
+        }
+        return this._homeRoom;
+    }
+    /** The ride out on a stretcher: mid-run this is a homecoming (rent and
+     *  all), then the recovery bed at the clinic. */
+    async docwagonMedevac() {
+        const logger = Logger.getInstance();
+        try {
+            const clinic = this.docwagonDropOff();
+            if (this.hasHub && this.scene !== this._hubScene) {
+                const home = await this.continueToNextScene();
+                logger.log(home);
+            }
+            this.player.currentLocation = clinic;
+            this.player.cameFrom = undefined;
+            this.updateExits(this.player.currentLocation);
+            this.updateStatus();
+            logger.log(clinic === this._homeRoom
+                ? `You wake on your own cot, taped, stapled, and alive.`
+                : `You wake on a recovery cot under bad fluorescents -- ${clinic.name}. Taped, stapled, and alive.`);
+            this.requestSave('homecoming');
+        }
+        catch (err) {
+            logger.error(`docwagonMedevac failed: ${err}`);
+        }
+    }
     /** How much juice the name carries, read off the role. */
+    /**
+     * A contact's ROLE, the SR5e archetype list (p.98: fixer, arms dealer,
+     * smuggler, talismonger, street doc, mechanic, bartender...) -- same
+     * keyword school as connectionFor below. Stored on the contact entry
+     * at open time so the roster (and the save) carry it.
+     */
+    static roleOf(npc) {
+        const hay = `${npc.description ?? ''} ${npc.name}`.toLowerCase();
+        // Mr. Johnson is NOT the fixer (player ruling: don't overload his
+        // role). Canon splits them: a Johnson is the anonymous CLIENT who
+        // commissions the run; a fixer is the street middleman (scene1's
+        // Mr. Krow, e.g.). He gets his own archetype label.
+        if (npc.name === FIXER_NAME || /job broker|johnson/.test(hay))
+            return 'Job Broker';
+        if (/fixer/.test(hay))
+            return 'Fixer';
+        // "charms" deliberately absent: a market kid hawking LUCKY charms is
+        // a Vendor, not a talismonger (Skitter proved it).
+        if (/talismonger|magical goods|foci|spell formula/.test(hay))
+            return 'Talismonger';
+        if (/street doc|clinic|surgeon|medic|stitch|chop shop/.test(hay))
+            return 'Street Doc';
+        if (/fence|pawn|launder|no questions/.test(hay))
+            return 'Fence';
+        if (/smuggl/.test(hay))
+            return 'Smuggler';
+        if (/mechanic|drone|rigger|garage|airframe/.test(hay))
+            return 'Mechanic';
+        if (/gunsmith|weapons? (and armor|dealer)|armorer|ironmonger/.test(hay))
+            return 'Arms Dealer';
+        if (/bartender|barkeep|tends the .{0,40}bar|pour(s|ed) drinks/.test(hay))
+            return 'Bartender';
+        if (/decker|data broker|host|electronics/.test(hay))
+            return 'Data Broker';
+        if (/priest|sister|chapel|choir|shaman/.test(hay))
+            return 'Spiritual';
+        if (/noodle|food|cook|kitchen|vendor|stall|merchant|shopkeep|market/.test(hay))
+            return 'Vendor';
+        if (/gang|muscle|enforcer|lieutenant|sentry|lookout|bruiser/.test(hay))
+            return 'Muscle';
+        return 'Street Contact';
+    }
     static connectionFor(npc) {
         const hay = `${npc.description ?? ''} ${npc.name}`.toLowerCase();
         if (npc.name === FIXER_NAME || /fixer|johnson/.test(hay))
@@ -180,7 +375,7 @@ export default class Game {
                 continue;
             if (this.contacts.has(actor.name))
                 continue;
-            this.contacts.set(actor.name, { connection: Game.connectionFor(actor), loyalty: 1, spent: 0, gigs: 0, asked: false });
+            this.contacts.set(actor.name, { connection: Game.connectionFor(actor), loyalty: 1, spent: 0, gigs: 0, asked: false, role: Game.roleOf(actor) });
         }
         Logger.getInstance().write(`Home turf: ${this.contacts.size} contacts seeded from the hub cast.`);
     }
@@ -419,6 +614,19 @@ export default class Game {
      * cumulative spend raises it at each full 1,000 nuyen (cap 3).
      * Returns a player-facing line when something changed, else null.
      */
+    /** A hub-cast member by name, for roster displays that need the live
+     *  actor (contacts.ts reads their commlink to show reachability). */
+    hubActor(name) {
+        return this._hubScene?.allActors?.find(a => a.name === name && a !== this.player);
+    }
+    /** The whole hub cast -- call.ts merges these into its candidates so
+     *  a linked contact answers from ANYWHERE (a real mid-run session:
+     *  "call Ratchet" bounced with "you don't know anyone by that name"
+     *  while the roster promised 📞). The hub Scene instance survives
+     *  runs, so these are live actors, not ghosts. */
+    hubCast() {
+        return this._hubScene?.allActors?.filter(a => a !== this.player) ?? [];
+    }
     touchContact(name, kind, spent = 0) {
         if (!this.hasHub)
             return null;
@@ -427,7 +635,7 @@ export default class Game {
             return null;
         let c = this.contacts.get(name);
         if (!c) {
-            c = { connection: Game.connectionFor(npc), loyalty: 1, spent: 0, gigs: 0, asked: false };
+            c = { connection: Game.connectionFor(npc), loyalty: 1, spent: 0, gigs: 0, asked: false, role: Game.roleOf(npc) };
             this.contacts.set(name, c);
             if (kind === 'trade')
                 c.spent += spent;
@@ -623,6 +831,18 @@ export default class Game {
     // "call Mr. Johnson" hears the offer, "travel" goes.
     _pendingRunSeed;
     _pendingRunTier;
+    // The explicit handshake (player ruling, commands/job-offer.ts):
+    // "accept" locks the offer -- rate final, haggle closed, decline
+    // refused -- until "call taxi" installs it. Reset wherever the
+    // pending seed changes hands.
+    pendingRunAccepted = false;
+    /** Trash the offer wholesale ("decline", and any future fixer snub). */
+    clearPendingRun() {
+        this._pendingRunSeed = undefined;
+        this._pendingRunTier = undefined;
+        this._pendingRide = undefined;
+        this.pendingRunAccepted = false;
+    }
     get pendingRun() {
         return this._pendingRunSeed;
     }
@@ -731,6 +951,23 @@ export default class Game {
         CommandFactory.registerCommand('reload', ReloadCommand);
         CommandFactory.registerCommand('subdue', SubdueCommand);
         // SUBDUING p.195 (see commands/grapple.ts): restrain without damage.
+        // Canon skill hooks (see SkillName in models/player.ts).
+        CommandFactory.registerCommand('palm', PalmCommand);
+        CommandFactory.registerCommand('perform', PerformCommand);
+        // LEADERSHIP (commands/lead.ts): rally/direct/inspire + Command recruiting.
+        CommandFactory.registerCommand('lead', LeadCommand);
+        CommandFactory.registerCommand('command', RecruitCommand);
+        // DOCWAGON (commands/docwagon.ts): the wristband between you and the morgue.
+        CommandFactory.registerCommand('docwagon', DocwagonCommand);
+        // SWAG (commands/source.ts): contacts shop the black market for you.
+        CommandFactory.registerCommand('source', SourceCommand);
+        CommandFactory.registerCommand('catalog', CatalogCommand);
+        CommandFactory.registerCommand('procure', SourceCommand);
+        // Job-offer outcomes (commands/job-offer.ts): explicit accept/decline.
+        CommandFactory.registerCommand('accept', AcceptCommand);
+        CommandFactory.registerCommand('decline', DeclineCommand);
+        CommandFactory.registerCommand('deny', DeclineCommand);
+        CommandFactory.registerCommand('refuse', DeclineCommand);
         CommandFactory.registerCommand('grapple', GrappleCommand);
         CommandFactory.registerCommand('restrain', GrappleCommand);
         CommandFactory.registerCommand('clinch', GrappleCommand);
@@ -786,6 +1023,9 @@ export default class Game {
         CommandFactory.registerCommand('deploy', DeployCommand);
         CommandFactory.registerCommand('recall', RecallCommand);
         CommandFactory.registerCommand('agent', AgentCommand);
+        CommandFactory.registerCommand('deck', DeckCommand);
+        CommandFactory.registerCommand('load', LoadProgramCommand);
+        CommandFactory.registerCommand('unload', UnloadProgramCommand);
         CommandFactory.registerCommand('install', InstallCommand);
         CommandFactory.registerCommand('chrome', InstallCommand);
         CommandFactory.registerCommand('buy', BuyCommand);
@@ -860,6 +1100,9 @@ export default class Game {
         this._useAi = options.useAi;
         this._logFilePath = options.logFilePath;
         this._saveFilePath = options.saveFilePath;
+        // The swag catalog warms from maka-cli.com in the background
+        // (utilities/catalog.ts): live list > local cache > baked-in floor.
+        void refreshCatalog();
         this.initInputBox(screen);
         this.initLogBox(screen);
         this.initMetaBox(screen);
@@ -982,6 +1225,39 @@ export default class Game {
         this.player.lifestyleEdgeBonus = this.lifestyle.edgeBonus;
         this._tier = save.game.tier;
         this.contacts = new Map(save.game.contacts);
+        // Roles are DERIVED, not earned -- re-derive them all on every
+        // resume so old saves self-heal (pre-role saves read all "Street
+        // Contact"; the next vintage had Johnson stored as "Fixer" before
+        // the Job Broker split). Missing actors keep whatever the save said.
+        for (const [name, c] of this.contacts) {
+            const npc = this._hubScene?.allActors?.find(a => a.name === name);
+            if (npc)
+                c.role = Game.roleOf(npc);
+            else if (!c.role)
+                c.role = 'Street Contact';
+        }
+        // SEED-TRUTH for commlinks: the hub overlay replaces NPC inventories
+        // wholesale, so a link granted to the CAST by a newer seed (player
+        // request: Torque, Ratchet, Doc, Old Cray, Skitter, and Whisper all
+        // answer calls now) would be wiped by an older save. Re-grant any
+        // seed-held commlink its bearer no longer carries.
+        for (const seedItem of this._hubSeed?.items ?? []) {
+            if (seedItem.category !== 'Commlink' || !seedItem.heldBy)
+                continue;
+            const bearer = this._hubScene?.allActors?.find(a => a.name === seedItem.heldBy);
+            if (!bearer)
+                continue;
+            const hasLink = bearer.inventory.getAllItems().some(i => i.category === Category.Commlink)
+                || bearer.equipment.head?.commlink != null;
+            if (!hasLink) {
+                bearer.inventory.addItem(restoreItem(seedItem));
+                Logger.getInstance().write(`Resume heal: re-granted "${seedItem.name}" to ${seedItem.heldBy}.`);
+            }
+        }
+        this.pendingProcurements = [...(save.game.procurements ?? [])];
+        this.docwagon = save.game.docwagon ? { ...save.game.docwagon } : undefined;
+        this.enlistedAlly = save.game.enlistedAlly ? { ...save.game.enlistedAlly } : undefined;
+        this.commandRefusals = { ...(save.game.commandRefusals ?? {}) };
         this.fencedCategories = new Set(save.game.fencedCategories);
         this._rumorIndex = save.game.rumorIndex;
         this.activeRumor = save.game.activeRumor;
@@ -1022,6 +1298,15 @@ export default class Game {
             return;
         try {
             const save = this.buildSaveFile(reason);
+            // Carry the cloud-sync stamp FORWARD through local writes: the
+            // stamp means "the cloud's savedAt as of our last mirror", and a
+            // new local beat doesn't change what the cloud holds. Without
+            // this, every quit (whose async push can't outlive the process)
+            // left a stampless file that the next launch misread as a FORK
+            // and prompted over (a real session hit it on every reload).
+            const prev = readSave(this._saveFilePath);
+            if (prev.ok && prev.save.sync)
+                save.sync = prev.save.sync;
             writeSaveAtomic(this._saveFilePath, save);
             logger.write(`Saved (${reason}) -> ${this._saveFilePath}`);
             // Local-first: the beat is DONE the moment the file lands. The
@@ -1053,6 +1338,10 @@ export default class Game {
                 rentDebt: this.rentDebt,
                 tier: this._tier,
                 contacts: [...this.contacts.entries()],
+                procurements: [...this.pendingProcurements],
+                docwagon: this.docwagon ? { ...this.docwagon } : undefined,
+                enlistedAlly: this.enlistedAlly ? { ...this.enlistedAlly } : undefined,
+                commandRefusals: { ...this.commandRefusals },
                 fencedCategories: [...this.fencedCategories],
                 rumorIndex: this._rumorIndex,
                 activeRumor: this.activeRumor,
@@ -1181,6 +1470,8 @@ export default class Game {
         // pull each per homecoming (see commands/ask.ts).
         for (const contact of this.contacts.values())
             contact.asked = false;
+        // Fresh material for the buskers too (commands/perform.ts).
+        this.performedThisCycle = false;
         // LIFESTYLE upkeep comes due with the homecoming: this tier's share
         // plus any standing debt, paid from carried cred as far as it goes.
         // Coming up short SLIDES YOU DOWN a tier (the district notices) and
@@ -1230,14 +1521,56 @@ export default class Game {
         // Drones spin back up beside the cot.
         const companionArrivalLines = this.unfoldCompanionsOnArrival();
         const companionBlock = [...companionFoldLines, ...companionArrivalLines];
+        // The commanded ally's tour ends with the run (RAW's Command lasts
+        // turns; ours lasts the job): the crew disbands at the curb.
+        let allyLine = '';
+        if (this.enlistedAlly) {
+            allyLine = `\n${this.enlistedAlly.name} peels off at the curb -- "Call it even, chummer." The crew's back to just you.`;
+            this.enlistedAlly = undefined;
+        }
+        // DOCWAGON's year ticks in homecomings (12 = a street year, player
+        // ruling): the contract lapses quietly unless renewed at Doc's.
+        let docwagonLine = '';
+        if (this.docwagon) {
+            this.docwagon.homecomingsLeft -= 1;
+            if (this.docwagon.homecomingsLeft <= 0) {
+                docwagonLine = `\nYour DocWagon ${this.docwagon.tier} contract LAPSES -- the wristband goes dark.${hint(` ("docwagon <tier>" at Doc's renews it.)`)}`;
+                this.docwagon = undefined;
+            }
+            else if (this.docwagon.homecomingsLeft <= 2) {
+                docwagonLine = `\nDocWagon renewal coming due: ${this.docwagon.homecomingsLeft} homecoming${this.docwagon.homecomingsLeft === 1 ? '' : 's'} left on the ${this.docwagon.tier} contract.`;
+            }
+        }
+        // SWAG deliveries (commands/source.ts): the contact's shopping run
+        // lands with the homecoming -- straight into your gear, paid for at
+        // order time.
+        let deliveryLine = '';
+        if (this.pendingProcurements.length > 0) {
+            const delivered = [];
+            for (const order of this.pendingProcurements.splice(0)) {
+                try {
+                    const item = restoreItem(order.itemConfig);
+                    item.owner = this.player.name;
+                    this.player.inventory.addItem(item);
+                    delivered.push(`${item.name} (${order.contact} came through)`);
+                }
+                catch (err) {
+                    Logger.getInstance().error(`Procurement delivery failed: ${err}`);
+                }
+            }
+            if (delivered.length > 0) {
+                this.updateInventory(this.player.inventory, capitalCase(this.scene.getCurrencyType()));
+                deliveryLine = `\nWaiting with your gear: ${delivered.join(', ')}.`;
+            }
+        }
         // The homecoming save: everything above (payout, rent, restock,
-        // contacts reset) settled first, so the save reflects the hub as
-        // the player will find it.
+        // contacts reset, deliveries) settled first, so the save reflects
+        // the hub as the player will find it.
         this.requestSave('homecoming');
         const fateLine = wrappedRun
             ? `The run's wrapped and the street swallows you back up.`
             : `The run's behind you -- unfinished, unpaid, already someone else's problem. The street doesn't ask.`;
-        return `\n=== ${this._hubName.toUpperCase()} ===\n${fateLine} You're home -- your hideout, one door off ${hub.determineStartRoom().name}.${hint(` Call ${FIXER_NAME} when you're hungry for the next job.`)}\n${rentLine}${comfortLine}${restockLine}${companionBlock.length > 0 ? `\n${companionBlock.join('\n')}` : ''}`;
+        return `\n=== ${this._hubName.toUpperCase()} ===\n${fateLine} You're home -- your hideout, one door off ${hub.determineStartRoom().name}.${hint(` Call ${FIXER_NAME} when you're hungry for the next job.`)}\n${rentLine}${comfortLine}${restockLine}${deliveryLine}${docwagonLine}${allyLine}${companionBlock.length > 0 ? `\n${companionBlock.join('\n')}` : ''}`;
     }
     /**
      * The actual drafting work, split out from continueToNextScene() purely
@@ -1282,6 +1615,7 @@ export default class Game {
             this._pendingRunSeed = nextSeed;
             this._pendingRunTier = nextTier;
             this._pendingRide = Game.RIDE_POOL[Math.floor(Math.random() * Game.RIDE_POOL.length)];
+            this.pendingRunAccepted = false;
             return `Your link pings -- 1 new message: ${FIXER_NAME}.${hint(` ("call ${FIXER_NAME}" to hear the job.)`)}`;
         }
         // Classic sessions transition immediately, hideout-first, as always.
@@ -1335,11 +1669,13 @@ export default class Game {
         // Deployed drones spin back up at the curb -- BEFORE appearance
         // warming so re-shelled companions get warmed with the cast.
         const arrivalLines = this.unfoldCompanionsOnArrival();
+        // A commanded ally meets you at the jobsite (commands/lead.ts).
+        const allyLines = this.spawnEnlistedAlly();
         this.warmNpcAppearancesInBackground();
         this.refreshLogLabel();
         // No "=== JOB #n ===" banner on entry (player request) -- the Game
         // Log window's own title carries the job name now.
-        const companionBlock = [...companionLines, ...arrivalLines];
+        const companionBlock = [...companionLines, ...arrivalLines, ...allyLines];
         return `\n${this.scene.story}${needsLines.length > 0 ? `\n${needsLines.join('\n')}` : ''}${companionBlock.length > 0 ? `\n${companionBlock.join('\n')}` : ''}`;
     }
     /**
@@ -1426,16 +1762,12 @@ export default class Game {
         const haggledAtOffer = this.player.haggledThisJob;
         try {
             const banner = await this.activateRunScene(seed, tier, { startInHideout: false });
-            this._pendingRunSeed = undefined;
-            this._pendingRunTier = undefined;
-            this._pendingRide = undefined;
+            this.clearPendingRun();
             this.player.haggledThisJob = haggledAtOffer;
             return `You travel to ${this.player.currentLocation.name}.\n${banner}`;
         }
         catch (err) {
-            this._pendingRunSeed = undefined;
-            this._pendingRunTier = undefined;
-            this._pendingRide = undefined;
+            this.clearPendingRun();
             Logger.getInstance().error(`launchPendingRun failed: ${err}`);
             return `The ride never shows and the job address goes dead. ${FIXER_NAME} will not enjoy hearing this -- call him for another.`;
         }
@@ -1652,12 +1984,35 @@ export default class Game {
             style: {
                 border: { fg: 'blue' }
             },
-            label: ' Mechanics ',
+            // The label teaches its own scroll keys -- a real session hit
+            // PgUp/PgDn (the world log's) and concluded the panel can't move.
+            label: ' Mechanics (C-PgUp/Dn) ',
             scrollable: true,
             alwaysScroll: true,
             tags: true,
         });
         this._metaBox = metaBox;
+        // Scrolling (player report: menus render here now and PgUp/PgDn
+        // don't reach it): PgUp/PgDn stay the WORLD LOG's (that binding is
+        // itself a playtest fix -- see initLogBox), so the Mechanics column
+        // pages on Ctrl-PgUp/PgDn. Same focus problem, same cure: the input
+        // box holds focus forever and grabKeys mutes screen-level handlers,
+        // so the modified names must join ignoreLocked too. Ctrl-End snaps
+        // back to the bottom (new content always scrolls to bottom anyway).
+        screen.ignoreLocked.push('C-pageup', 'C-pagedown', 'C-end');
+        const metaPage = () => Math.max(1, (typeof metaBox.height === 'number' ? metaBox.height : 20) - 3);
+        screen.key(['C-pageup'], () => {
+            metaBox.scroll(-metaPage());
+            screen.render();
+        });
+        screen.key(['C-pagedown'], () => {
+            metaBox.scroll(metaPage());
+            screen.render();
+        });
+        screen.key(['C-end'], () => {
+            metaBox.scrollTo(metaBox.getScrollHeight());
+            screen.render();
+        });
         screen.append(metaBox);
     }
     /**
@@ -1751,7 +2106,7 @@ export default class Game {
         // Off-plane the profile is attack programs / astral will and reads as
         // Armed. White, not gray, for the same legibility reason as the stance.
         const armed = player.plane === 'meat' && weaponItem && !player.weaponDrawn
-            ? `{white-fg}Holstered: ${weaponItem.name}${ammoNote} -- "brandish"{/white-fg}`
+            ? `{white-fg}Holstered: ${weaponItem.name}${ammoNote}${hint(' -- "brandish"')}{/white-fg}`
             : weapon.name === 'bare fists'
                 ? `{gray-fg}Unarmed{/gray-fg}`
                 : `Armed: ${weapon.name} (DV ${weapon.damage}${weapon.poolBonus > 0 ? `, +${weapon.poolBonus} dice` : ''})${ammoNote}`;
@@ -1771,10 +2126,10 @@ export default class Game {
             lines.push(`{magenta-fg}Sustained: armor +${player.sustainedArmor} soak (-2 dice to everything else){/magenta-fg}`);
         }
         if (player.astralPerceiving) {
-            lines.push(`{magenta-fg}✧ ASTRAL SENSES OPEN (-2 dice sustained) -- "assense" to close{/magenta-fg}`);
+            lines.push(`{magenta-fg}✧ ASTRAL SENSES OPEN (-2 dice sustained)${hint(' -- "assense" to close')}{/magenta-fg}`);
         }
         if (player.sneaking) {
-            lines.push(`{white-fg}🐾 SNEAKING -- entries are opposed vs their perception; loud acts break it{/white-fg}`);
+            lines.push(`{white-fg}🐾 SNEAKING${hint(' -- entries are opposed vs their perception; loud acts break it')}{/white-fg}`);
         }
         if (player.activeCallPartner) {
             lines.push(`{${CALL_COLOR}-fg}${CALL_ICON} On a call with ${player.activeCallPartner.name}{/${CALL_COLOR}-fg}`);
@@ -1806,11 +2161,19 @@ export default class Game {
         // Off-plane context: which reality you're in, your persona's Matrix
         // track (cold-sim damage lands there), and where your empty body lies.
         if (player.plane === 'matrix') {
-            // Matrix damage is hardware damage: show the DECK's track. A
+            // Matrix damage is hardware damage: show the DECK's track -- and
+            // its stat line: the ASDF deal ("deck config" is a live combat
+            // decision now, so the HUD shows what you're currently rigged for)
+            // plus running programs, first-word-abbreviated to keep the line
+            // inside the box (Biofeedback Filter -> Biofeedback). A
             // technomancer has no deck -- their stun track (already on line 2)
             // is what the ice chews on.
-            const track = player.activeDeck
-                ? `  Deck ${player.activeDeck.deckSummary()}${player.simMode === 'hot' ? ' +biofeedback' : ''}`
+            const jackedDeck = player.activeDeck;
+            const pgms = jackedDeck && jackedDeck.loadedPrograms.length > 0
+                ? ` [${jackedDeck.loadedPrograms.map(k => getProgram(k)?.name.split(' ')[0] ?? k).join(' ')}]`
+                : '';
+            const track = jackedDeck
+                ? `  Deck A${jackedDeck.attack} S${jackedDeck.sleaze} D${jackedDeck.dataProcessing} F${jackedDeck.firewall} ${jackedDeck.deckSummary()}${player.simMode === 'hot' ? ' +biofeedback' : ''}${pgms}`
                 : `  (living persona -- damage is REAL stun)`;
             lines.push(`{cyan-fg}▣ MATRIX ${(player.simMode ?? 'cold').toUpperCase()}-SIM${track} -- body at ${player.bodyRoom?.name ?? '???'}{/cyan-fg}`);
         }
@@ -1854,6 +2217,14 @@ export default class Game {
         }
         return Game.instance;
     }
+    /**
+     * The verb the LAST handleInput actually ran, after typo correction
+     * ("sjeet" -> "sheet"). ui.ts routes menu output to the Mechanics
+     * panel on THIS, not the typed word -- a real session's corrected
+     * "sjeet" dumped the whole sheet into the world log. The recursive
+     * correction call overwrites it with the corrected verb.
+     */
+    lastResolvedVerb = '';
     async handleInput(input) {
         // "jack-in"/"jack-out" read naturally but parse as unknown verbs (a
         // real session typed "jack-in" and bounced) -- normalize the hyphen.
@@ -1861,6 +2232,7 @@ export default class Game {
         const parts = normalized.trim().split(' ');
         const verb = parts[0].toLowerCase();
         const args = parts.slice(1);
+        this.lastResolvedVerb = verb;
         // Quitting takes a CONFIRM (player request: "I just exited by
         // mistake"): the first "quit" arms it, "y"/"yes" (or quit again)
         // seals it, anything else disarms and runs as the command it is.
@@ -1949,11 +2321,14 @@ export default class Game {
     static HELP_CATEGORIES = [
         { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach', 'run', 'sprint'], ['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'], ['order'], ['stance'], ['surrender'], ['edge'], ['rest']] },
+        { title: 'combat', entries: [['attack', 'kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['stance'], ['surrender'], ['edge'], ['rest']] },
+        // The party layer: everyone who walks (or flies, or manifests) at
+        // your side answers to these.
+        { title: 'party', entries: [['order'], ['lead'], ['command'], ['deploy'], ['recall']] },
         { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project'], ['return'], ['assense']] },
-        { title: 'matrix', entries: [['jack'], ['hack'], ['pan'], ['silent'], ['reboot'], ['agent'], ['drone'], ['deploy'], ['recall'], ['jump', 'rig']] },
-        { title: 'social', entries: [['say'], ['talk-to'], ['call'], ['end-call', 'end', 'hangup'], ['haggle', 'negotiate'], ['persuade', 'convince'], ['ask'], ['contacts']] },
-        { title: 'street', entries: [['browse', 'buy'], ['sell'], ['work', 'gig'], ['treat'], ['eat'], ['drink'], ['lifestyle'], ['pay']] },
+        { title: 'matrix', entries: [['jack'], ['deck'], ['load'], ['unload'], ['hack'], ['pan'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { title: 'social', entries: [['say'], ['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'], ['perform'], ['palm'], ['docwagon'], ['treat'], ['eat'], ['drink'], ['lifestyle'], ['pay']] },
         { title: 'barriers', entries: [['solve'], ['pick'], ['bluff'], ['unlock'], ['lock']] },
         { title: 'character', entries: [['sheet', 'stats'], ['advance', 'train'], ['qualities', 'quality'], ['initiate', 'submerge'], ['install', 'chrome']] },
         { title: 'session', entries: [['help'], ['hints'], ['clear'], ['quit', 'exit']] },
@@ -1961,8 +2336,8 @@ export default class Game {
     /** Descriptions for the verbs handled inline in handleInput() rather than registered. */
     static BUILTIN_DESCRIPTIONS = {
         help: 'This overview. "help <category>" for one group with full descriptions; "help <command>" for one command.',
-        clear: 'Clear the screen.',
-        quit: 'Exit the game.',
+        clear: 'Clear the world log and the Mechanics panel.',
+        quit: 'Exit the game (asks to confirm; a hub campaign autosaves on the way out).',
     };
     describeVerb(verb) {
         const builtin = Game.BUILTIN_DESCRIPTIONS[verb];
@@ -1999,14 +2374,34 @@ export default class Game {
             }
             return `No command or category called "${query}". Try plain "help".`;
         }
-        // The overview: compact category lines, primaries only.
+        // The overview: category lines with primaries only, chunked so no
+        // line outgrows the Mechanics column (help renders there now --
+        // blessed's mid-list wrap lost the left-column alignment).
         const lines = ['=== COMMANDS ==='];
         const pad = Math.max(...Game.HELP_CATEGORIES.map(c => c.title.length));
+        const pushWrapped = (title, verbs) => {
+            const rows = [];
+            let cur = '';
+            for (const v of verbs) {
+                const next = cur ? `${cur}, ${v}` : v;
+                if (next.length > 40 && cur) {
+                    rows.push(cur + ',');
+                    cur = v;
+                }
+                else {
+                    cur = next;
+                }
+            }
+            rows.push(cur);
+            lines.push(`${title.padEnd(pad)}  ${rows[0]}`);
+            for (const r of rows.slice(1))
+                lines.push(`${' '.repeat(pad)}  ${r}`);
+        };
         for (const category of Game.HELP_CATEGORIES) {
-            lines.push(`${category.title.padEnd(pad)}  ${category.entries.map(e => e[0]).join(', ')}`);
+            pushWrapped(category.title, category.entries.map(e => e[0]));
         }
         if (uncategorized.length > 0) {
-            lines.push(`${'other'.padEnd(pad)}  ${uncategorized.join(', ')}`);
+            pushWrapped('other', uncategorized);
         }
         lines.push('');
         lines.push(`"help <category>" for a group with descriptions ("help combat"); "help <command>" for one ("help haggle").`);