@maka/maka-cli 5.132.0 → 5.133.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.132.0",
+  "version": "5.133.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/jump.js

@@ -38,10 +38,23 @@ export class JumpCommand extends Command {
         // (utilities/owned-drones.ts): a frame parked at home jumps from
         // home and stays parked while you ride it.
         const owned = ownedDrones(actor, this.game?.homeRoom, { reach: 'here' });
-        const drones = owned.map(d => d.item);
+        // ...AND EVERY DEPLOYED FRAME, WHEREVER IT FLIES (transcript
+        // 2026-09-06: a Direktionssekretar deployed from the garage could
+        // not be jumped into once the rigger left the hideout -- "Nothing
+        // to jump into -- no drone in your pack" -- while this verb's own
+        // description promised seizure "wherever it flies"). Jumping in
+        // rides the link, not your hands: the hands rule above is for
+        // frames still stowed; a frame already out is in reach by definition.
+        const deployed = (this.game?.companions ?? [])
+            .filter(c => c.kind === 'drone' && c.boundDevice && !owned.some(d => d.item === c.boundDevice));
+        const drones = [...owned.map(d => d.item), ...deployed.map(c => c.boundDevice)];
+        const listing = [
+            ...droneListLines(owned),
+            ...deployed.map(c => `  • ${c.boundDevice.name.padEnd(26)} deployed -- ${c.npc.currentLocation.name}${c.boundDevice.maxDroneBoxes > 0 ? `  hull ${c.boundDevice.droneSummary()}` : ''}`),
+        ];
         const atHome = this.game?.homeRoom !== undefined && actor.currentLocation === this.game.homeRoom;
         if (drones.length === 0) {
-            return `Nothing to jump into -- no drone in your pack${atHome ? ' or your garage' : ''}.${hint(` (Ratchet's Circuit Bazaar stocks airframes.)`)}`;
+            return `Nothing to jump into -- no drone in your pack${atHome ? ' or your garage' : ''}, none deployed.${hint(` (Ratchet's Circuit Bazaar stocks airframes.)`)}`;
         }
         // "jump hot" / "jump <drone> hot": strip the mode word, pick the frame.
         const words = args.map(w => w.toLowerCase());
@@ -52,11 +65,11 @@ export class JumpCommand extends Command {
             const picked = fuzzyPickName(nameWords.join(' '), drones.map(d => d.name));
             drone = picked ? drones.find(d => d.name === picked) : undefined;
             if (!drone) {
-                return [`No drone by that name in reach. Yours:`, ...droneListLines(owned)].join('\n');
+                return [`No drone by that name in reach. Yours:`, ...listing].join('\n');
             }
         }
         if (!drone) {
-            return [`Which airframe? ("jump <name>", add "hot" for hot-sim)`, ...droneListLines(owned)].join('\n');
+            return [`Which airframe? ("jump <name>", add "hot" for hot-sim)`, ...listing].join('\n');
         }
         if (drone.isWrecked) {
             return `The ${drone.name} is a wreck -- ${droneWreckFragment(drone)} -- and a wreck jumps nowhere. It repairs while you rest somewhere safe.`;

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

@@ -7,7 +7,7 @@ import { Direction } from '../types/shared/direction-enum.js';
 import { Door } from '../models/door.js';
 import { fuzzyPickName } from '../utilities/fuzzy-match.js';
 import { heldBy, holding, physicalLimit } from '../utilities/grapple.js';
-import { spotsActive, resolveSpot, spotOf, describeSpotRoster, OPEN_FLOOR, pathBetweenSpots, spotDistanceMeters, spotClimbSteps, blockingRegion, terrainRefusal, reseatOpenFloor, routeForMove, stepFrom, spotForCell, actorCell, standingRoomNear, furnitureCells, approachCellFor, exitSpot, concealedFrom, revealActor, onTheFloor } from '../utilities/spots.js';
+import { spotsActive, resolveSpot, spotOf, describeSpotRoster, OPEN_FLOOR, pathBetweenSpots, spotDistanceMeters, spotClimbSteps, blockingRegion, terrainRefusal, reseatOpenFloor, routeForMove, stepFrom, spotForCell, actorCell, standingRoomNear, yieldSquareToMaster, furnitureCells, approachCellFor, exitSpot, concealedFrom, revealActor, onTheFloor } from '../utilities/spots.js';
 // fallDamageDVMeters, not fallDamageDV: a climb that fell short drops
 // you from where you GOT to, which is a distance in metres, not a whole
 // storey. The storey-based wrapper still exists for callers that really
@@ -759,6 +759,8 @@ export class MoveCommand extends Command {
         const wasAt = actor.atSpot;
         actor.atCell = cell;
         actor.atSpot = spotForCell(room, cell);
+        // A shell of yours on that square steps aside (spots.ts heelsTo).
+        yieldSquareToMaster(room, actor);
         actor.performAction('steps', `${taken} ${taken === 1 ? 'pace' : 'paces'} ${direction}`);
         this.scene.updateStatus();
         this.scene.updateExits(room);

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

@@ -345,5 +345,13 @@
 //   while "order <drone> fold/stow" packs. A frame you jump out of HOLDS
 //   its position (Game.companions.holding) instead of teleporting to your
 //   heel on your next step; recall clears the hold. HUD shows "holding at".
-export const ENGINE_VERSION = '1.37.0';
+// 1.38.0 (2026-09-06): YOUR OWN SHELL IS NEVER IN YOUR WAY. COMMAND SEMANTICS
+//   in shared scenes: a companion shell (drone, spirit, sprite, agent) at its
+//   master's heel no longer blocks the master's "move <direction>" -- it
+//   yields the square (spots.ts heelsTo / yieldSquareToMaster); hired crew
+//   still hold theirs. "jump" reaches every DEPLOYED frame wherever it flies,
+//   garage-born or not (it used to answer "no drone in your pack" away from
+//   the hideout). An NPC with no dialogue and no AI no longer greets you
+//   with "<name>: undefined".
+export const ENGINE_VERSION = '1.38.0';
 //# sourceMappingURL=engine-version.js.map

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

@@ -1546,7 +1546,13 @@ ${worldEventsSummary}
         this._triedThisStimulus = [];
         if (!AI.isConfigured()) {
             this.logger.write(`No AI available`);
-            await actor.hear(this, this.speak());
+            // A shell with no dialogue -- every companion is built with
+            // `dialog: []` -- has nothing to say, and used to say so as
+            // "<name>: undefined" (transcript 2026-09-06: a drone waking as
+            // its rigger walked in). Silence is the right line.
+            const line = this.speak();
+            if (line)
+                await actor.hear(this, line);
             return;
         }
         // ---------- helpers ----------

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

@@ -2679,6 +2679,10 @@ export class Player extends AbstractPlayer {
         const overLink = opts?.viaLink || this.activeCallPartner === actor;
         if (!overLink && !this.canPerceive(actor))
             return;
+        // Nothing said is nothing heard: a caller passing an empty line
+        // (an NPC with no dialogue, AI off) must not print "<name>: undefined".
+        if (!message)
+            return;
         this.logger.write(`${this.name} heard ${actor.name}`);
         // A voice arriving over an active CALL from someone who isn't in the
         // room wears the comm dressing (player note: Mr. Johnson -- who lives

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

@@ -858,6 +858,15 @@ export function standingOccupants(room, mover) {
     const offPlane = new Set(room.getActors()
         .filter(a => !onTheFloor(a) && a.bodyRoom !== room)
         .map(a => a.name));
+    // YOUR OWN SHELL IS NEVER IN YOUR WAY (transcript 2026-09-06: a drone
+    // at heel sat on its master's next square -- "You can't step east --
+    // S-K Direktionssekretar (autopilot)'s in the way", a dozen times --
+    // and read as the frame refusing to follow). A companion shell heels
+    // AT its master's spot by construction (go.ts), so of course it is
+    // standing where the master wants to go next; it yields instead
+    // (yieldSquareToMaster, called by the step). Hired crew are people
+    // (ruling 2026-08-25) and still hold their square.
+    const heels = new Set(mover ? room.getActors().filter(a => heelsTo(a, mover)).map(a => a.name) : []);
     for (const [name, c] of seatingIn(room).entries()) {
         if (mover && name === mover.name)
             continue;
@@ -865,10 +874,40 @@ export function standingOccupants(room, mover) {
             continue;
         if (offPlane.has(name))
             continue;
+        if (heels.has(name))
+            continue;
         out.set(key(c), name);
     }
     return out;
 }
+/** Is `a` a companion SHELL of `master` -- a drone, spirit, sprite or
+ *  agent riding their bond? Hired crew (kind 'ally') are people and
+ *  answer no. */
+export function heelsTo(a, master) {
+    const shell = a;
+    return shell.allyOf === master.name && shell.companionKind !== undefined && shell.companionKind !== 'ally';
+}
+/**
+ * After `master` steps onto a square one of their own shells was
+ * holding, the shell gives it up: its cell is released so seatingIn
+ * finds it the nearest free square at the master's spot. Returns the
+ * shells that moved. */
+export function yieldSquareToMaster(room, master) {
+    const here = master.atCell ? key(master.atCell) : undefined;
+    if (!here)
+        return [];
+    const moved = [];
+    for (const a of room.getActors()) {
+        if (!heelsTo(a, master))
+            continue;
+        if (!a.atCell || key(a.atCell) !== here)
+            continue;
+        a.atCell = undefined;
+        a.atSpot = master.atSpot;
+        moved.push(a);
+    }
+    return moved;
+}
 /** The cell `mover` would end up in on arriving at `spotName` -- their
  *  seat around that fixture, with everyone else's seats already taken.
  *  This, not the fixture's anchor, is where movement actually paths to:

package/package.json

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