@maka/maka-cli 5.151.0 → 5.153.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.151.0",
+  "version": "5.153.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",

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

@@ -211,12 +211,15 @@ export class AttackCommand extends Command {
         }
         // A deliberately INITIATED attack with a dry gun is blocked with a
         // reload prompt -- the involuntary strikes (retaliation) auto-fall-back
-        // to fists instead (see CombatExchange.weaponProfile).
+        // to fists instead (see CombatExchange.weaponProfile). Only a DRAWN
+        // gun is actually "in play" for this swing (2jbprbSYqF7EPXrkR) -- a
+        // holstered dry/jammed piece is not what's being attacked with, so it
+        // must not block a bare-fisted attack the player never asked to fail.
         const weaponItem = this.actor.equipment.rightHand?.weapon ?? this.actor.equipment.leftHand?.weapon;
-        if (this.usesEquippedWeapon() && weaponItem?.isFirearm() && weaponItem.jammed) {
+        if (this.usesEquippedWeapon() && this.actor.weaponDrawn && weaponItem?.isFirearm() && weaponItem.jammed) {
             return `The ${weaponItem.name}'s smartlink is LOCKED -- someone cracked your PAN. "reboot" to clear it, or go in swinging.`;
         }
-        if (this.usesEquippedWeapon() && weaponItem?.isFirearm() && weaponItem.ammo <= 0) {
+        if (this.usesEquippedWeapon() && this.actor.weaponDrawn && weaponItem?.isFirearm() && weaponItem.ammo <= 0) {
             return `Click -- the ${weaponItem.name} is dry. "reload" (needs ammunition), or go in swinging with something else.`;
         }
         // THE COMBAT TURN (utilities/combat-turn.ts): on the physical planes
@@ -360,11 +363,15 @@ export class AttackCommand extends Command {
             return notYourPhase(enc, actor);
         }
         enc.noteAttack(actor, target);
-        // READY WEAPON (p.165) is an action, not a beat.
-        if (this.usesEquippedWeapon() && weaponItem && !actor.weaponDrawn) {
-            return `The ${weaponItem.name} is holstered -- "draw" it first (Ready Weapon, a Simple Action, SR5 p.165).${phaseHint(this.scene, actor)}`;
-        }
-        const isMelee = !this.usesEquippedWeapon() || !weaponItem?.isFirearm();
+        // A holstered weapon doesn't back this attack -- SR5 always allows a
+        // bare-handed strike, and weaponProfile() already resolves the punch's
+        // own pool/damage the moment the weapon isn't drawn (the character
+        // sheet advertises it: "Attack ... (bare fists) -- holstered"). Only a
+        // DRAWN weapon is what this swing is actually attacking WITH; want to
+        // shoot or swing the blade instead? READY WEAPON (p.165) is its own
+        // Simple Action -- "draw" first (2jbprbSYqF7EPXrkR).
+        const activeWeapon = this.usesEquippedWeapon() && actor.weaponDrawn ? weaponItem : undefined;
+        const isMelee = !activeWeapon || !activeWeapon.isFirearm();
         const report = [];
         // MELEE REACH: ground costs (p.161-162).
         if (isMelee) {

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

@@ -552,6 +552,33 @@ export default class Game {
             return `{yellow-fg}🔥 Heat: ears up all over the block{/yellow-fg}`;
         return `{yellow-fg}🔥 Heat: somebody heard something{/yellow-fg}`;
     }
+    /**
+     * THE SAME BAND, FOR AN NPC'S MOUTH (YE9G3Q5P85y5xcP7n: "Mr. Ibis said
+     * 'Quiet as promised' however, there's a status of: 🔥 Heat: sirens
+     * circling closer"). heatBand() paints the player's own HUD; nothing
+     * fed the run's actual heat into NPC.respondTo's prompt at all, so an
+     * NPC narrating "the coast is clear" had no way to know it wasn't --
+     * the same shape as payoutSummary's fix for an invented payout, here
+     * for an invented all-clear.
+     *
+     * DELIBERATELY NOT ITS OWN THRESHOLDS. heat-band-honesty.test.ts pins
+     * the top band's heat check to the ONE line inside heatBand(), on
+     * purpose: the HUD's promise and checkpointOnRideHome's verifierDice
+     * escalation share that number so they cannot drift apart. A second
+     * copy of the same comparison here for the AI prompt would be exactly
+     * the drift that guard exists to catch. So this reads heatBand()'s OWN
+     * text -- strip the color codes and the HUD's "🔥 Heat: " lede, and
+     * what is left is plain enough for a prompt -- rather than re-deriving
+     * the bands.
+     */
+    heatSummaryForDialogue() {
+        if (!this.onRun)
+            return undefined;
+        const band = this.heatBand();
+        if (!band)
+            return undefined;
+        return band.replace(/\{[^}]*\}/g, '').replace(/^🔥\s*Heat:\s*/, '');
+    }
     // THE FOR-HIRE BOARD: archetype-built candidates, fresh faces each
     // homecoming (the gig-pool rotation school). Not saved -- the street's
     // talent pool churns; whoever you HIRED is the persistent part.

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

@@ -1660,6 +1660,15 @@ ${worldEventsSummary}
         const payoutSummary = payout
             ? `The agreed payout for the current job is EXACTLY ${payout} nuyen, paid as ONE LUMP SUM on delivery -- there is no advance and no half up front; never speak as if part has already been paid. Any time you mention payment, reward, or what the job is worth, use exactly this figure -- never invent a different one. Payment transfers automatically when the job completes; you never need to hand it over.`
             : '';
+        // HEAT IS MECHANICALLY REAL TOO (YE9G3Q5P85y5xcP7n: an NPC said
+        // "Quiet as promised" while the player's own HUD read "Heat: sirens
+        // circling closer"). Same shape as payoutSummary above -- nothing
+        // told the model the run's actual heat, so a reassuring line had
+        // nothing to check itself against.
+        const heat = this._scene?.ownerGame?.heatSummaryForDialogue?.();
+        const heatSummary = heat
+            ? `The district's current HEAT on this run is ${heat}. If you would naturally reassure them that things are quiet, clean, or under control, that claim has to be TRUE against this -- never tell them the coast is clear, that nobody noticed, or that things went quiet if heat says otherwise. Speak honestly about how hot it actually is instead.`
+            : '';
         // If nothing else has happened to/around this NPC yet this scene, this
         // is the first time anyone's reached out -- nudge toward volunteering
         // the job rather than waiting to be asked, which real playtesting
@@ -2103,6 +2112,7 @@ Your objective is to drive the story line.`}
     ${eph ? '' : objectiveSummary}
     ${dialogueSummary}
     ${eph ? '' : payoutSummary}
+    ${eph ? '' : heatSummary}
 
     ${roomDesc}${spotBlock}${combatSpatialBlock}
     ${formattedExitsStr}

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

@@ -652,7 +652,37 @@ export class Player extends AbstractPlayer {
             return true;
         if (this.arOffline)
             return false;
-        return !!this.getPanMaster();
+        if (!this.getPanMaster())
+            return false;
+        return this.hasARDisplay();
+    }
+    /**
+     * THE MISSING HALF OF AR (canon p.53-54/221-222, RAG-checked
+     * 2026-09-10, acBi46ZKKJCPyBKXb: "it looks like I'm able to see AR
+     * with the Hermes Ikon, however, I don't have a method to interface
+     * to it -- no trode, or commlink jack. I think this is a gap"). It
+     * was: "a commlink alone does not automatically give you AR -- the
+     * commlink processes and sends the information, but you still need a
+     * display device to receive it." hasMatrixEyes gated ONLY on a
+     * PAN master existing, never on having any way to actually SEE what
+     * it sends -- so a runner with a commlink in their pocket and nothing
+     * on their face or in their skull got the full overlay regardless.
+     *
+     * Two independent roads in, matching what the rulebook actually lists:
+     * a DNI (trodes/datajack/technomancer -- Player.hasDirectNeuralInterface,
+     * "you can use all your senses to view AR without any extra devices"),
+     * or a worn visual display (cybereyes, glasses, goggles, contacts --
+     * same head.eyes slot and same two categories smartlink detection
+     * already reads, Category.Glasses / Category.EyeCyberwere). Audio-only
+     * and haptic-only AROs have their own separate gear (earbuds/cyberear,
+     * AR gloves, p.222/439) and are not modelled here -- this predicate is
+     * specifically the VISUAL overlay hasMatrixEyes has always been about.
+     */
+    hasARDisplay() {
+        if (this.hasDirectNeuralInterface())
+            return true;
+        const onFace = this._equipment.head?.eyes;
+        return !!onFace && (onFace.category === Category.Glasses || onFace.category === Category.EyeCyberwere);
     }
     /**
      * A DIRECT NEURAL INTERFACE -- what VR needs and AR does not (SR5 core

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

@@ -592,10 +592,21 @@ export class Scene extends AbstractScene {
         this.logger.write(`Removed actor: ${name}`);
         // A fallen participant's Action Phase, if it was live, moves on;
         // the encounter itself re-checks who is still standing on its next
-        // step (utilities/combat-turn.ts run).
+        // step (utilities/combat-turn.ts run). But run()'s own stillHostile()
+        // check only fires from ITS OWN loop, which never runs again while a
+        // human's Action Phase stays open (they can still move/loot before
+        // "end turn") -- so killing the last hostile mid-phase left the fight
+        // "still going" until the human explicitly ended their turn
+        // (5aqFRn2xPtRYDvNxR). Mirrors leave()'s own direct stillHostile()
+        // check for the same "nobody left to fight" shape.
         const enc = room ? this.encounterIn(room) : undefined;
-        if (enc && enc.phaseActor === actor) {
-            void enc.dropPhaseActor(actor);
+        if (enc && !enc.ended) {
+            if (enc.phaseActor === actor) {
+                void enc.dropPhaseActor(actor);
+            }
+            else if (!enc.stillHostile()) {
+                void enc.end('over');
+            }
         }
         // Tell the Game an actor left the world -- the companion roster
         // (Game.onActorRemoved) prunes shells and settles their bound

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

@@ -225,10 +225,17 @@ export function arStatusSlots(actor) {
                 ? `{white-fg}◌ AR OFF{/white-fg}`
                 : !actor.getPanMaster() && !actor.isTechnomancer()
                     ? `{white-fg}◌ no AR rig{/white-fg}`
-                    // Off-plane, or any future state that puts the overlay down
-                    // without being one of the above. game.ts drops the slot
-                    // entirely while off-plane -- a persona has its own HUD line.
-                    : `{white-fg}◌ AR dark{/white-fg}`;
+                    // A processor with nothing to paint it on (acBi46ZKKJCPyBKXb):
+                    // a commlink sends the overlay, but nothing here receives it
+                    // (Player.hasARDisplay -- no DNI, no worn glasses/goggles/
+                    // cybereyes). Distinct from "no AR rig" -- the player HAS a
+                    // rig, it just has nowhere to show up.
+                    : !actor.hasARDisplay()
+                        ? `{white-fg}◌ no display -- trodes or eyewear{/white-fg}`
+                        // Off-plane, or any future state that puts the overlay down
+                        // without being one of the above. game.ts drops the slot
+                        // entirely while off-plane -- a persona has its own HUD line.
+                        : `{white-fg}◌ AR dark{/white-fg}`;
     // The link slot asks for the LIVE LINK -- worn commlink or working
     // deck -- because that is what call.ts now asks for (p.223: a deck
     // performs all commlink functions). The old "AR ON | Link offline"

package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.js

@@ -956,6 +956,15 @@ export class CombatExchange {
             // icon must drop to ☹ the moment they go down, not on the
             // player's next step.
             this.scene.updateExits(room);
+            // Same "combat sat there until 'end turn'" gap as removeActor
+            // below (5aqFRn2xPtRYDvNxR): a KO'd-not-killed last hostile also
+            // stops being present() (isIncapacitated), but nothing re-runs
+            // run()'s own stillHostile() check while the killer's own Action
+            // Phase stays open. End it directly, the same way leave() does.
+            const koEnc = this.scene.encounterFor?.(fallen);
+            if (koEnc && !koEnc.ended && koEnc.phaseActor !== fallen && !koEnc.stillHostile()) {
+                void koEnc.end('over');
+            }
             return ['', ...lines];
         }
         // A BODY ALWAYS FORMS (except for companion shells, which leave

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.151.0",
+  "version": "5.153.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",