@maka/maka-cli 5.380.1 → 5.380.3

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.380.1",
+  "version": "5.380.3",
   "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/drop.js

@@ -20,6 +20,14 @@ export class DropCommand extends Command {
         if (bill)
             return bill;
         const itemName = args.join(' ').toLowerCase(); // Assuming the item name may contain spaces
+        // HELD COUNTS AS CARRIED (user ruling 2026-10-04): the thing in your
+        // hand or on your back drops too -- back to the bag first, which is
+        // what the path below reads.
+        if (!this.actor.inventory.hasItem(itemName)) {
+            const worn = this.actor.findEquipped(itemName);
+            if (worn)
+                this.actor.bagEquipped(worn.name);
+        }
         // Check if the item exists in the player's inventory
         if (!this.actor.inventory.hasItem(itemName)) {
             this.logger.write(`Item "${itemName}" not found in ${this.actor.name}'s inventory during 'Drop' command.`);

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

@@ -76,6 +76,17 @@ export class GiveCommand extends Command {
         }
         // === Try to give an item ===
         let item = this.actor.inventory.getItem(itemOrAmount);
+        // HELD COUNTS AS CARRIED (user ruling 2026-10-04; qW2HZD5HQCX42FN29: a
+        // Johnson with the cargo case in his hand could not give it). Bagged at
+        // the handover below, not here, so a refused give leaves it held.
+        let fromSlot = false;
+        if (!item) {
+            const worn = this.actor.findEquipped(itemOrAmount);
+            if (worn) {
+                item = worn;
+                fromSlot = true;
+            }
+        }
         // DATA ON A DEVICE IS IN YOUR HANDS TOO (digital inventory, user ruling
         // 2026-10-04): a file in your commlink's library is beamed across the
         // table, no chip required. Pack first -- a chip by that name wins --
@@ -225,7 +236,8 @@ export class GiveCommand extends Command {
                 receiveData(recipient, item);
         }
         else {
-            didTransfer = this.actor.inventory.transferItemTo(item.name, recipient.inventory);
+            didTransfer = (!fromSlot || this.actor.bagEquipped(item.name))
+                && this.actor.inventory.transferItemTo(item.name, recipient.inventory);
         }
         if (!didTransfer) {
             this.logger.write(`Item "${item.name}" is not transferable.`);

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

@@ -60,7 +60,7 @@ export class LockCommand extends Command {
             return `${crossNote}The door leading to "${door.getOtherSideToName(room)}" is already locked.`;
         }
         const requiredKeyOrSolution = door.unlockItemOrSolution?.toLowerCase();
-        if (requiredKeyOrSolution && this.actor.inventory.hasItem(requiredKeyOrSolution)) {
+        if (requiredKeyOrSolution && this.actor.carries(requiredKeyOrSolution) && this.actor.bagEquipped(requiredKeyOrSolution)) {
             const key = this.actor.inventory.getItem(requiredKeyOrSolution);
             if (key) {
                 door.isLocked = true;
@@ -78,7 +78,7 @@ export class LockCommand extends Command {
             return `The door "${label}" is already locked.`;
         }
         const requiredKeyOrSolution = door.unlockItemOrSolution?.toLowerCase();
-        if (requiredKeyOrSolution && this.actor.inventory.hasItem(requiredKeyOrSolution)) {
+        if (requiredKeyOrSolution && this.actor.carries(requiredKeyOrSolution) && this.actor.bagEquipped(requiredKeyOrSolution)) {
             door.isLocked = true;
             this.logger.write(`LockCommand: ${this.actor.name} locked the door: ${label}`);
             this.actor.performAction('lock', label);

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

@@ -153,8 +153,10 @@ export class MoveCommand extends Command {
         // was buyable and inert, the same shape as the hostility flag:
         // wired at one end only.
         //
-        // Carried, not worn: a kit in the pack is a kit you can rig.
-        const assisted = actor.inventory.getAllItems().some(i => /climbing gear|climbing kit|\brope\b|harness|carabiner|crampon|grapple gun/i.test(`${i.name} ${i.description ?? ''}`));
+        // Carried OR worn (user ruling 2026-10-04: an equipped item is a
+        // carried item): a kit in the pack is a kit you can rig, and a
+        // harness already on you more so.
+        const assisted = [...actor.inventory.getAllItems(), ...actor.equippedItems()].some(i => /climbing gear|climbing kit|\brope\b|harness|carabiner|crampon|grapple gun/i.test(`${i.name} ${i.description ?? ''}`));
         // SURFACE AND CONDITION (p.134), read off the room's own prose and
         // the level's name -- see climbSurfaceModifier. Zero unless the
         // fiction says otherwise, which is why adding this could not

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

@@ -44,7 +44,7 @@ export class SellCommand extends Command {
         const pending = this.game?.pendingSale;
         // Bare "sell": close the standing quote, or show what's fenceable.
         if (!wanted) {
-            if (pending && pending.fence === fence.name && (pending.lot || actor.inventory.hasItem(pending.itemName))) {
+            if (pending && pending.fence === fence.name && (pending.lot || (actor.carries(pending.itemName) && actor.bagEquipped(pending.itemName)))) {
                 return pending.lot ? this.closeLot(fence) : this.close(fence);
             }
             return this.listSellables(fence);

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

@@ -10,6 +10,13 @@ export class StoreCommand extends Command {
     }
     store(args) {
         const itemName = args.join(' ').toLowerCase(); // Handle multi-word item names
+        // HELD COUNTS AS CARRIED (user ruling 2026-10-04): what you hold or
+        // wear stores too -- back to the bag first, which the path below reads.
+        if (!this.actor.inventory.hasItem(itemName)) {
+            const worn = this.actor.findEquipped(itemName);
+            if (worn)
+                this.actor.bagEquipped(worn.name);
+        }
         // Check if the item exists in the player's inventory
         if (!this.actor.inventory.hasItem(itemName)) {
             this.logger.write(`Item "${itemName}" not found in ${this.actor.name}'s inventory during 'Store' command.`);

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

@@ -69,7 +69,7 @@ export class UnlockCommand extends Command {
             return reach.refusal;
         const crossNote = reach.line ? `${reach.line}\n` : '';
         if (holder) {
-            if (holder.keyItem && this.actor.inventory.hasItem(holder.keyItem.name)) {
+            if (holder.keyItem && this.actor.carries(holder.keyItem.name) && this.actor.bagEquipped(holder.keyItem.name)) {
                 const result = holder.offer('', this.actor.inventory);
                 this.logger.write(`UnlockCommand: ${this.actor.name} turned ${holder.keyItem.name} in ${holder.name}: ${result.success}`);
                 this.actor.performAction('unlocked', result.message);
@@ -86,7 +86,7 @@ export class UnlockCommand extends Command {
             return crossNote + `${holder.name} holds it. ${takes} Or force it: ${ways}.`;
         }
         const requiredKeyOrSolution = door.unlockItemOrSolution?.toLowerCase();
-        if (requiredKeyOrSolution && this.actor.inventory.hasItem(requiredKeyOrSolution)) {
+        if (requiredKeyOrSolution && this.actor.carries(requiredKeyOrSolution) && this.actor.bagEquipped(requiredKeyOrSolution)) {
             const key = this.actor.inventory.getItem(requiredKeyOrSolution);
             if (key) {
                 const unlockMessage = room.attemptUnlockExit(direction, key.name);

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

@@ -249,7 +249,7 @@ export class UseCommand extends Command {
         // NOTHING TYPED AFTER THE NAME. Say what this particular thing
         // wants, which depends on what it IS.
         if (!rest) {
-            if (device.keyItem && this.actor.inventory.hasItem(device.keyItem.name)) {
+            if (device.keyItem && this.actor.carries(device.keyItem.name) && this.actor.bagEquipped(device.keyItem.name)) {
                 // They are carrying what opens it -- that IS the offer.
                 return crossNote + this.openWith(device, '', 'use');
             }

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

@@ -24,7 +24,7 @@ export class WorkCommand extends Command {
         }
         const gig = this.game.activeGig;
         if (gig) {
-            return actor.inventory.hasItem(gig.itemName)
+            return actor.carries(gig.itemName)
                 ? `You've got work: get the ${gig.itemName} to ${gig.to}. ${gig.pay} nuyen on delivery.`
                 : `You took ${gig.from}'s gig but the ${gig.itemName} isn't on you anymore -- find it, or that bridge stays burned this cycle.`;
         }

package/bundle/typescript/src/commands/game/sideQuest/engine-version.js

@@ -3276,5 +3276,19 @@
 //   ("IN PROGRESS") instead of "Nothing on offer" and the size menu.
 // - A standing draft ("jobs take") and a crew change no longer swap an
 //   accepted job aside; a ride that never shows keeps the job.
-export const ENGINE_VERSION = '1.192.1';
+// 1.192.2 (2026-10-04): A GUARD WHO STEPS OFF THE POST IS DRAWN WHERE HE
+// STANDS (dfFCcY3oDfsvd8gmi). seatingIn pinned every `guarding` NPC to
+// the post before reading exact cells, so a picket the combat brain
+// walked toward a runner was narrated stepping while the map, melee
+// reach and ranges all read the post. A picket with an exact cell is
+// now seated from it.
+// 1.192.3 (2026-10-04): AN EQUIPPED ITEM IS A CARRIED ITEM, for every
+// actor (user ruling; qW2HZD5HQCX42FN29). Scene build slotted Mr.
+// Vellum's delivery case, the meet asked his bag for it, and the cargo
+// never changed hands -- his prompt never named it the runner's, and his
+// own "give" could not move it either. Player.carries()/bagEquipped():
+// the meet (give and upload cargo), the job-item prompt line, give,
+// drop, store, sell, keys (lock/unlock/use), the gig check and climbing
+// gear now see what is held or worn.
+export const ENGINE_VERSION = '1.192.3';
 //# sourceMappingURL=engine-version.js.map

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

@@ -4517,7 +4517,10 @@ export default class Game {
             // exactly the job it is for.
             const wc = this.scene.getWinCondition();
             const johnson = this.scene.getActor(client.name);
-            if (wc?.type === 'give' && wc.item && johnson && johnson.inventory.hasItem(wc.item)) {
+            // HELD COUNTS (qW2HZD5HQCX42FN29): scene build may have put the
+            // cargo in the client's hand -- carries() asks the slots too, and
+            // bagEquipped() brings it back to the bag the transfer reads.
+            if (wc?.type === 'give' && wc.item && johnson && johnson.carries(wc.item) && johnson.bagEquipped(wc.item)) {
                 const handed = johnson.inventory.transferItemTo(wc.item, this.player.inventory);
                 if (handed) {
                     this.scene.updateInventory(this.player.inventory);
@@ -4540,7 +4543,7 @@ export default class Game {
             // device (data-library receiveData; a chip only for a runner who
             // carries no device at all). The drop is a HOST, and the meet says
             // which, on its own line for the same terse() reason as above.
-            if (wc?.type === 'upload' && wc.item && johnson && johnson.inventory.hasItem(wc.item)) {
+            if (wc?.type === 'upload' && wc.item && johnson && johnson.carries(wc.item) && johnson.bagEquipped(wc.item)) {
                 const cargo = johnson.inventory.getItem(wc.item);
                 johnson.inventory.removeItem(cargo.name);
                 const { device } = receiveData(this.player, cargo);

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

@@ -2116,7 +2116,9 @@ ${worldEventsSummary}
         // delivery the thing in its pocket actually was, so "carry it to
         // the Stitch yourself" came out as a refusal instead of a handover.
         const wc = this._scene?.getWinCondition?.();
-        const carriesPrize = !!wc?.item && this.inventory.getAllItems().some(i => i.name === wc.item);
+        // Held or worn counts as carried (qW2HZD5HQCX42FN29: Vellum's case was
+        // in his hand, so this line never told him it was the runner's cargo).
+        const carriesPrize = !!wc?.item && this.carries(wc.item);
         // THE EXTRACTION, FROM THE INSIDE (commands/bring.ts, p.336-337):
         // the person the job is about is told which of the book's two shapes
         // they are, and their security is told whose security it is.

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

@@ -670,6 +670,42 @@ export class Player extends AbstractPlayer {
         }
         return out;
     }
+    /**
+     * AN EQUIPPED ITEM IS A CARRIED ITEM (user ruling 2026-10-04). Equipping
+     * moves an item out of the bag into a slot, so `inventory.hasItem` alone
+     * says a hand holding the thing is empty. The reported session
+     * (qW2HZD5HQCX42FN29): scene build auto-equipped Mr. Vellum's Hardshell
+     * Heirloom Case, the meet asked his BAG for the cargo, found nothing,
+     * and never handed it over -- while the runner was data-spiking the
+     * very case "smoking in his hand". Exact name, any case.
+     */
+    carries(name) {
+        if (this._inventory.hasItem(name))
+            return true;
+        const wanted = name.toLowerCase();
+        return this.equippedItems().some(i => i.name.toLowerCase() === wanted);
+    }
+    /**
+     * Put a held or worn item (exact name) back in the bag, so the bag's
+     * transfer can move it to someone else. True when it is in the bag
+     * afterwards -- already there counts. A housed device never comes out.
+     */
+    bagEquipped(name) {
+        if (this._inventory.hasItem(name))
+            return true;
+        const wanted = name.toLowerCase();
+        for (const [groupName, group] of Object.entries(this._equipment)) {
+            if (!group)
+                continue;
+            for (const [slotName, item] of Object.entries(group)) {
+                if (item?.name.toLowerCase() !== wanted)
+                    continue;
+                this.unequipBySlot(groupName, slotName);
+                return this._inventory.hasItem(item.name);
+            }
+        }
+        return false;
+    }
     /**
      * THE WORN OR HELD ITEM A PLAYER MEANS (user ask 2026-09-24: "I'd like
      * to be able to look my equipped gear"). Equipping moves an item out of

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

@@ -641,11 +641,22 @@ export function seatingIn(room) {
     // -- every press on that door flipped the dot between two cells. The
     // fallen hold no ground (standingOccupants); they are seated with
     // everyone else below.
+    //
+    // ...AND ONLY WHILE SHE IS STILL ON IT (dfFCcY3oDfsvd8gmi, player
+    // 2026-10-04: "I see Grit moved, but I don't see it happened on the
+    // map"). A picket is positioned by spot and holds no exact cell; one
+    // that HAS one stepped there -- the combat brain closing on a runner,
+    // a walk, a shove. Pinning her to the post anyway drew the post while
+    // her steps were narrated, and inMeleeReach measured from the post too,
+    // so she paced every phase and "couldn't get any closer". She is
+    // seated from her cell in the pass below, like anyone who stepped.
     for (const a of seated) {
         if (!a.guarding)
             continue;
         if (a.isIncapacitated())
             continue;
+        if (a.atCell)
+            continue;
         const spot = spotOf(a);
         const anchor = seatAnchorFor(room, spot);
         if (!anchor)

package/package.json

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