@maka/maka-cli 5.152.0 → 5.154.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.152.0",
+  "version": "5.154.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/commands/reload.js

@@ -2,6 +2,7 @@ import { Command } from './command.js';
 import { Category } from '../types/shared/item-enum.js';
 import { Item } from '../models/item.js';
 import { billAction, encounterOf, phaseHint } from '../utilities/action-cost.js';
+import { fuzzyPickName } from '../utilities/fuzzy-match.js';
 /**
  * Refills the equipped firearm's magazine by consuming one
  * Ammunition-category item from the pack. Every shot spends a round --
@@ -20,7 +21,7 @@ import { billAction, encounterOf, phaseHint } from '../utilities/action-cost.js'
 export class ReloadCommand extends Command {
     static verb = 'reload';
     static description = 'Reload your equipped firearm -- consumes one Ammunition item from your pack. In a fight it takes the whole Action Phase (Remove Clip + Insert Clip, SR5 p.163), or a Free + a Simple with a smartgun you\'re linked to (p.164).';
-    async execute(_args = []) {
+    async execute(args = []) {
         const actor = this.actor;
         if (this.scene.isHumanControlled(actor) && this.scene.isPlayerExchangeActive(actor.name)) {
             return `No time -- the exchange is still resolving. Reload in the lull.`;
@@ -32,10 +33,25 @@ export class ReloadCommand extends Command {
         if (weapon.ammo >= weapon.magazineCapacity) {
             return `The ${weapon.name} is already fully loaded (${weapon.ammo}/${weapon.magazineCapacity}).`;
         }
-        // NON-LETHAL STANCE: stun rounds first if you carry any (gel,
-        // stick-n-shock -- p.434); otherwise whatever is in the pack.
         const boxes = actor.inventory.getAllItems().filter(i => i.category === Category.Ammunition);
-        const ammo = (actor.autoStance === 'non-lethal' ? boxes.find(b => Item.isStunAmmo(b)) : undefined) ?? boxes[0];
+        // "reload APDS Rounds" names which box to slap home -- the arg was
+        // being silently discarded (bktSfejkhvmjFZ5EH), always loading the
+        // stance default instead of what the player actually asked for.
+        let ammo;
+        if (args.length > 0) {
+            const requested = args.join(' ');
+            const picked = fuzzyPickName(requested, boxes.map(b => b.name));
+            ammo = picked ? boxes.find(b => b.name === picked) : undefined;
+            if (!ammo) {
+                const present = boxes.map(b => b.name).join(', ') || 'none';
+                return `You're not carrying any ammunition named "${requested}" -- carrying: ${present}.`;
+            }
+        }
+        else {
+            // NON-LETHAL STANCE: stun rounds first if you carry any (gel,
+            // stick-n-shock -- p.434); otherwise whatever is in the pack.
+            ammo = (actor.autoStance === 'non-lethal' ? boxes.find(b => Item.isStunAmmo(b)) : undefined) ?? boxes[0];
+        }
         if (!ammo) {
             return `No ammunition in your pack -- the ${weapon.name} stays at ${weapon.ammo}/${weapon.magazineCapacity}. Find a spare clip.`;
         }

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/backlog-dump.js

@@ -130,7 +130,7 @@ function renderRow(item) {
         // extra steps (user, 2026-08-30).
         const liveReason = liveReasonOf(item.repro);
         Log.plain(liveReason
-            ? `         ${Log.colors.warn(`${liveReason} -- card: maka play --backlog ${item._id}`)}`
+            ? `         ${Log.colors.warn(`${liveReason} -- card: maka play:backlog ${item._id}`)}`
             : `         ${Log.colors.success(`bench: maka play --repro ${item._id}`)}${benchLockNote(item)}`);
     }
 }
@@ -286,7 +286,7 @@ export async function dumpBacklog(opts = {}) {
         if (!found) {
             if (!items.some(it => it._id.startsWith(id))) {
                 Log.error(`No item with id "${id}" on the board${filter ? ` in ${filter}` : ''}.`);
-                Log.info('`maka play --backlog` lists them -- every row carries its id.');
+                Log.info('`maka play:backlog` lists them -- every row carries its id.');
             }
             return;
         }

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/bundle/typescript/src/commands/game/sideQuest.sub.cmd.js

@@ -333,7 +333,7 @@ const ShadowrunCommand = Command.create({
         }
         if (found.outcome === 'not-found') {
             Log.error(`Nothing in your review queue matches "${reproTarget}".`);
-            Log.info('`maka play --backlog --filter in-review` lists them, with ids.');
+            Log.info('`maka play:backlog --filter in-review` lists them, with ids.');
             return;
         }
         if (found.outcome === 'no-repro') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.152.0",
+  "version": "5.154.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.",