@maka/maka-cli 5.61.0 → 5.62.0

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

@@ -72,12 +72,14 @@ import { PickCommand } from './commands/pick.js';
 import { HackCommand } from './commands/hack.js';
 import { CastCommand } from './commands/cast.js';
 import { StanceCommand } from './commands/stance.js';
+import { FollowCommand, UnfollowCommand } from './commands/follow.js';
 import { SurrenderCommand } from './commands/surrender.js';
 import { JackCommand } from './commands/jack.js';
 import { ProjectCommand, ReturnCommand } from './commands/project.js';
 import { AssenseCommand } from './commands/assense.js';
 import { DroneCommand } from './commands/drone.js';
 import { PanCommand } from './commands/pan.js';
+import { ArCommand, ArosCommand } from './commands/ar.js';
 import { RebootCommand } from './commands/reboot.js';
 import { BrandishCommand, HolsterCommand } from './commands/brandish.js';
 import { AdvanceCommand } from './commands/advance.js';
@@ -198,7 +200,16 @@ export default class Game {
     /** Verbs that must run on the player's OWN machine even mid-shared-run:
      *  they write local files or read local state, and mean nothing to the
      *  table. See the guard in handleInput. */
-    static LOCAL_ONLY_VERBS = new Set(['note', 'backlog', 'roles']);
+    static LOCAL_ONLY_VERBS = new Set(['note', 'backlog', 'roles', 'hints']);
+    /** The same rule at PHRASE level, for a local-only setting that hangs
+     *  off a verb which must stay remote. "map" reads the live scene and
+     *  belongs to the server in a shared run; "map overlay" only flips a
+     *  preference in ~/.meteor/.maka/global-config.json and belongs here.
+     *  Found 2026-08-27 -- this and `hints` were the last two instances of
+     *  the `note` bug fixed in v5.57.0: mid-shared-run they crossed the
+     *  wire, wrote the SERVER's config file, and the player's own toggle
+     *  silently did nothing. */
+    static LOCAL_ONLY_PHRASES = new Set(['map overlay']);
     /** An account-less runner: nothing about them leaves this machine.
      *  Read by anything that would otherwise push to maka-cli.com -- the
      *  backlog command among them. */
@@ -939,7 +950,7 @@ export default class Game {
             if (wc)
                 wc.payout = 0;
             const stained = this.player.addNotoriety(`killed their own Johnson on "${this.currentJobName ?? 'a job'}"`);
-            Logger.getInstance().logWithColor(`\n=== JOB DEAD === You just killed your paymaster. Whatever this was worth, nobody's left to pay it${stained ? ` -- and word WILL travel (+1 Notoriety, now ${this.player.notoriety})` : ''}.`, 'red');
+            Logger.getInstance().logWithColor(`\nJOB DEAD -- You just killed your paymaster. Whatever this was worth, nobody's left to pay it${stained ? ` -- and word WILL travel (+1 Notoriety, now ${this.player.notoriety})` : ''}.`, 'red');
         }
         const entry = this.companions.find(c => c.npc.name === name);
         if (!entry)
@@ -1640,6 +1651,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
     registerCommands() {
         CommandFactory.registerCommand('look', LookCommand);
         CommandFactory.registerCommand('go', GoCommand);
+        // TAILING A PARTNER (commands/follow.ts): a human partner heels
+        // only because they said so -- two players asked for this.
+        CommandFactory.registerCommand('follow', FollowCommand);
+        CommandFactory.registerCommand('unfollow', UnfollowCommand);
         CommandFactory.registerCommand('take', TakeCommand);
         CommandFactory.registerCommand('loot', LootCommand);
         CommandFactory.registerCommand('note', NoteCommand);
@@ -1722,6 +1737,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('assense', AssenseCommand);
         CommandFactory.registerCommand('drone', DroneCommand);
         CommandFactory.registerCommand('pan', PanCommand);
+        // THE AR LAYER (commands/ar.ts): `ar` mutes your own overlay,
+        // `aros` reads what it is showing you -- player requests
+        // 2026-08-26, "we need AROs on anything online" and "there
+        // should be a way to toggle AR".
+        CommandFactory.registerCommand('ar', ArCommand);
+        CommandFactory.registerCommand('aros', ArosCommand);
         CommandFactory.registerCommand('reboot', RebootCommand);
         CommandFactory.registerCommand('brandish', BrandishCommand);
         CommandFactory.registerCommand('draw', BrandishCommand);
@@ -2163,6 +2184,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this._pendingRunSeed = save.game.pendingRun.seed;
             this._pendingRunTier = save.game.pendingRun.tier;
             this._pendingRide = save.game.pendingRun.ride;
+            // A seed Krow DRAFTED is not a fare (see call.ts's taxi gate --
+            // playtest 2026-08-27: "I was able to call a taxi before calling
+            // Mr. Krow"). Saves written before this field carried no answer
+            // and restore as UN-accepted: one extra "call Krow" once, rather
+            // than reopening the hole for every existing campaign.
+            this.pendingRunAccepted = save.game.pendingRun.accepted ?? false;
         }
         this.player.currentLocation = this._homeRoom;
         this.updateEquipment(this.player.equipment);
@@ -2256,7 +2283,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 gigAvailable: this.gigAvailable,
                 activeGig: this.activeGig,
                 pendingRun: this._pendingRunSeed && this._pendingRunTier !== undefined
-                    ? { seed: this._pendingRunSeed, tier: this._pendingRunTier, ride: this._pendingRide }
+                    ? { seed: this._pendingRunSeed, tier: this._pendingRunTier, ride: this._pendingRide, accepted: this.pendingRunAccepted }
                     : undefined,
             },
             hub: captureHubOverlay(this._hubScene, this._hubSeed, this.player, this._homeRoom),
@@ -2512,7 +2539,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         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 `${checkpointBlock ? `\n${checkpointBlock}\n` : ''}\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.`)}${clientLine}\n${rentLine}${comfortLine}${restockLine}${deliveryLine}${docwagonLine}${allyLine}${companionBlock.length > 0 ? `\n${companionBlock.join('\n')}` : ''}`;
+        return `${checkpointBlock ? `\n${checkpointBlock}\n` : ''}\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.`)}${clientLine}\n${rentLine}${comfortLine}${restockLine}${deliveryLine}${docwagonLine}${allyLine}${companionBlock.length > 0 ? `\n${companionBlock.join('\n')}` : ''}`;
     }
     /**
      * KNIGHT ERRANT CHECKPOINT (SINs & getting caught, ruling 2026-08-24;
@@ -3429,8 +3456,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         if (player.plane === 'meat' && weaponItem && !player.weaponDrawn) {
             return `{white-fg}Holstered: ${weaponItem.name}${ammoNote}${hint(' -- "brandish"')}{/white-fg}`;
         }
+        // White, not gray: gray is ANSI bright-black and illegible on
+        // stock dark palettes -- the same ruling that moved the HUD
+        // stance and the Tab ticker off it. These are the HUD's QUIET
+        // states, not its hidden ones; they still have to be readable.
         if (weapon.name === 'bare fists')
-            return `{gray-fg}Unarmed{/gray-fg}`;
+            return `{white-fg}Unarmed{/white-fg}`;
         return `Armed: ${weapon.name} (DV ${weapon.damage}${weapon.poolBonus > 0 ? `, +${weapon.poolBonus} dice` : ''})${ammoNote}`;
     }
     /**
@@ -3504,12 +3535,19 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         const armorNote = `Armor +${player.getArmorValue()}`;
         const hasLink = player.equipment.head?.commlink != null;
         const link = !hasLink
-            ? `{gray-fg}Link offline{/gray-fg}`
+            ? `{white-fg}Link offline{/white-fg}`
             : player.runningSilent
                 ? `{magenta-fg}Link SILENT{/magenta-fg}`
                 : player.arOffline
                     ? `{red-fg}AR CUT -- reboot{/red-fg}`
-                    : `{${CALL_COLOR}-fg}Link online{/${CALL_COLOR}-fg}`;
+                    // MUTED BY CHOICE ranks LAST of the four on purpose: the two
+                    // states that COST you something -- silence you chose for a
+                    // price, and an overlay a hacker took -- outrank the one you
+                    // simply switched off. It reads "Link online" as well as "AR
+                    // OFF" because that IS the distinction the state exists to draw.
+                    : player.arMuted
+                        ? `{white-fg}Link online, AR OFF{/white-fg}`
+                        : `{${CALL_COLOR}-fg}Link online{/${CALL_COLOR}-fg}`;
         lines.push(`${armorNote}  |  ${link}`);
         // Lines 4+: transient states, present only while active. Future
         // contexts (astral projection, VR hot-sim) join here the same way.
@@ -3718,8 +3756,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             // player's own margin scribbles about the game. They have no
             // business crossing the wire, and the table has no business
             // hearing them. Run them on the machine that typed them.
-            const verb = input.trim().split(/\s+/)[0]?.toLowerCase() ?? '';
-            if (!Game.LOCAL_ONLY_VERBS.has(verb)) {
+            const words = input.trim().toLowerCase().split(/\s+/);
+            const verb = words[0] ?? '';
+            const phrase = words.slice(0, 2).join(' ');
+            if (!Game.LOCAL_ONLY_VERBS.has(verb) && !Game.LOCAL_ONLY_PHRASES.has(phrase)) {
                 return this.remoteSession.command(input);
             }
         }
@@ -3853,7 +3893,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'], ['map', 'exits'], ['search'], ['sneak']] },
+        { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach', 'run', 'sprint'], ['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'], ['stance'], ['surrender'], ['edge'], ['rest']] },
         // The party layer: everyone who walks (or flies, or manifests) at
@@ -3862,7 +3902,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'], ['return'], ['assense']] },
-        { title: 'matrix', entries: [['jack'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['snoop'], ['overwatch', 'os'], ['pan'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { 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'], ['register']] },
@@ -3902,7 +3942,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             const pickedCategory = fuzzyPickName(query, categoryNames);
             if (pickedCategory) {
                 const category = Game.HELP_CATEGORIES.find(c => c.title === pickedCategory);
-                const lines = [`=== ${category.title.toUpperCase()} ===`];
+                const lines = [`${category.title.toUpperCase()}`];
                 for (const [primary, ...aliases] of category.entries) {
                     lines.push(`${BULLET}${primary}${aliases.length > 0 ? ` (${aliases.join(', ')})` : ''}: ${this.describeVerb(primary)}`);
                 }
@@ -3929,13 +3969,32 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                         // A row's key: the word after the primary verb when usage
                         // starts with it, else its first word.
                         const subKey = (s) => {
-                            const t = s.usage.split(/\\s+/);
+                            // /\s+/, not /\\s+/ (found 2026-08-27). The escaped
+                            // backslash matched a LITERAL "\s" and never split, so
+                            // subKey returned the whole usage string. It looked fine
+                            // only because fuzzyPickName rescued it at the substring
+                            // tier -- "hire" matches inside "crew hire <name>" -- which
+                            // is exactly the kind of accident that stops working the
+                            // first time two rows share a word.
+                            const t = s.usage.split(/\s+/);
                             return (t[0] === primary ? t[1] ?? t[0] : t[0]).replace(/[<>|]/g, '');
                         };
-                        const pickedSub = fuzzyPickName(subQuery, subs.map(subKey));
-                        const sub = pickedSub ? subs.find(s => subKey(s) === pickedSub) : undefined;
-                        if (sub)
-                            return `${sub.usage}\n  ${sub.long ?? sub.short}`;
+                        // DEDUPE, or an exact match reads as AMBIGUOUS and
+                        // fuzzyPickName returns undefined. Two rows legitimately
+                        // share a key -- `crew hire` (the board) and `hire <name>`
+                        // (sign someone) are one sub-verb with and without an
+                        // argument -- so the moment the split above started working,
+                        // "help crew hire" broke outright.
+                        const pickedSub = fuzzyPickName(subQuery, [...new Set(subs.map(subKey))]);
+                        // ...and then render EVERY row sharing that key, not just the
+                        // first. A player asking "help crew hire" wants both halves:
+                        // what the bare form shows them, and what naming somebody
+                        // does. Answering with one and silently dropping the other is
+                        // how "crew hire" came to be asked about in the first place.
+                        const matches = pickedSub ? subs.filter(s => subKey(s) === pickedSub) : [];
+                        if (matches.length > 0) {
+                            return matches.map(s => `${s.usage}\n  ${s.long ?? s.short}`).join('\n\n');
+                        }
                         return `${title}: no subcommand matching "${subQuery}".\n${subs.map(s => `  ${s.usage.padEnd(24)} ${s.short}`).join('\n')}`;
                     }
                     const lines = [`${title}: ${this.describeVerb(primary).split('. ')[0]}.`];
@@ -3952,7 +4011,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // 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 lines = ['COMMANDS'];
         const pad = Math.max(...Game.HELP_CATEGORIES.map(c => c.title.length));
         const pushWrapped = (title, verbs) => {
             const rows = [];