@maka/maka-cli 5.132.0 → 5.134.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.132.0",
+  "version": "5.134.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,13 +7,14 @@ 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
 // do fall a level.
 import { fallDamageDVMeters, climbHitsFor, climbMetersFrom, climbSurfaceModifier, METERS_PER_CELL, METERS_PER_LEVEL, key, distanceMeters } from '../utilities/room-grid.js';
 import { rollPool, formatRoll } from '../utilities/dice.js';
+import { trailMaster } from '../utilities/companion-heel.js';
 /**
  * "walk to <spot>" / "run to <spot>" / "sprint to <spot>" -- crossing
  * the CURRENT room to one of its "at" spots (see utilities/spots.ts;
@@ -101,6 +102,15 @@ export class MoveCommand extends Command {
         }
         return `Spots are a meat-world concern -- on the grid there is no distance at all, so "go <room>" puts your persona anywhere by name.`;
     }
+    /** Your shells trail you across the room (companion-heel.ts
+     *  trailMaster): after every in-room move they re-place themselves
+     *  beside you. An NPC mover has no Game in its context and drags
+     *  nobody. */
+    trailCompanions() {
+        if (!this.game)
+            return;
+        trailMaster(this.actor, this.game.companions);
+    }
     async execute(args = []) {
         const actor = this.actor;
         const room = actor.currentLocation;
@@ -633,6 +643,7 @@ export class MoveCommand extends Command {
         // an NPC's own spot is a social event for them (the bartender greets
         // you when you reach the bar).
         actor.performAction('moves to', `the ${spot.name}`);
+        this.trailCompanions();
         this.logger.write(`MoveCommand: ${actor.name} ${this.mode()}s to ${spot.name} in ${room.name}.`);
         // Companions drift along with their master (go.ts follow precedent).
         if (actor === this.scene.getPlayer() && this.game) {
@@ -759,7 +770,10 @@ 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.trailCompanions();
         this.scene.updateStatus();
         this.scene.updateExits(room);
         // QUIET STEPS (user, 2026-09-01: "You step 1 pace east" is spammy now
@@ -865,6 +879,7 @@ export class MoveCommand extends Command {
         actor.atCell = cell;
         actor.atSpot = spotForCell(room, cell);
         actor.performAction('steps up beside', target.name);
+        this.trailCompanions();
         this.scene.updateStatus();
         this.scene.updateExits(room);
         const pace = actor.isRunningThisTurn ? ` You're running now -- everything else this turn is at -2.` : '';
@@ -1014,6 +1029,7 @@ export class MoveCommand extends Command {
         actor.atCell = cell;
         actor.atSpot = spotForCell(room, cell);
         actor.performAction('moves to', `the ${direction} doorway`);
+        this.trailCompanions();
         this.scene.updateStatus();
         this.scene.updateExits(room);
         return `You cross to the ${direction} way out.${hint(` ("go ${direction}" to step through.)`)}`;

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

@@ -345,5 +345,19 @@
 //   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".
+// 1.39.0 (2026-09-06): COMPANIONS TRAIL YOU ACROSS THE ROOM. COMMAND SEMANTICS
+//   in shared scenes: every in-room move ("move <direction>", "move to
+//   <spot>", the doorway) re-places your shells on the nearest free square
+//   beside you (companion-heel.ts trailMaster) -- they used to heel only on
+//   a room change and sat in the doorway while you paced. "recall" judges
+//   "already at your side" by cells, not spot names.
+export const ENGINE_VERSION = '1.39.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/companion-heel.js

@@ -1,22 +1,80 @@
+import { actorCell, standingRoomNear, onTheFloor, heelsTo } from './spots.js';
+/** Chebyshev distance in cells, or undefined when either has no cell. */
+function cellGap(room, a, b) {
+    const ca = actorCell(room, a);
+    const cb = actorCell(room, b);
+    if (!ca || !cb)
+        return undefined;
+    return Math.max(Math.abs(ca.x - cb.x), Math.abs(ca.y - cb.y), Math.abs(ca.z - cb.z));
+}
+/** Is the shell beside its master -- same room, same spot, and at most
+ *  one square away (or on a room with no grid to measure)? */
+export function atMastersSide(entry, master) {
+    const room = master.currentLocation;
+    if (entry.npc.currentLocation !== room || entry.npc.atSpot !== master.atSpot)
+        return false;
+    const gap = cellGap(room, entry.npc, master);
+    return gap === undefined || gap <= 1;
+}
+/** Put the shell on the nearest free square beside its master, at the
+ *  master's spot. */
+export function placeBeside(entry, master) {
+    const room = master.currentLocation;
+    if (entry.npc.currentLocation !== room)
+        entry.npc.currentLocation = room;
+    entry.npc.atSpot = master.atSpot;
+    const here = actorCell(room, master);
+    entry.npc.atCell = here ? standingRoomNear(room, here, entry.npc) : undefined;
+}
 /**
  * BRING A COMPANION TO HEEL (player ruling 2026-09-06: "recall" is
  * "return to me" -- the frame comes to your side and follows again;
  * putting it away is "stow"). The shell crosses to the master's room
- * and spot, its cell is released so seating finds it a place beside
- * them, and any HOLDING flag clears so the next "go" drags it along
- * like any companion. Returns whether it had anywhere to come from.
+ * and spot, takes the nearest free square beside them, and any HOLDING
+ * flag clears so the next move drags it along like any companion.
+ * Returns whether it had anywhere to come from -- judged by CELLS, not
+ * spot names: a frame eight squares off on the same open floor shares
+ * the spot name and is not "at your side" (transcript 2026-09-06).
  *
  * One function, used by Game.heelCompanion and by the tests that pin
  * recall, so a mock Game and the real one cannot disagree about it.
  */
 export function bringToHeel(entry, master) {
-    const here = master.currentLocation;
-    const moved = entry.npc.currentLocation !== here || entry.npc.atSpot !== master.atSpot || !!entry.holding;
-    if (entry.npc.currentLocation !== here)
-        entry.npc.currentLocation = here;
-    entry.npc.atSpot = master.atSpot;
-    entry.npc.atCell = undefined;
+    const moved = !!entry.holding || !atMastersSide(entry, master);
+    placeBeside(entry, master);
     entry.holding = false;
     return { moved };
 }
+/**
+ * COMPANIONS TRAIL THEIR MASTER ACROSS THE ROOM (playtest 2026-09-06:
+ * "It will follow to another room, but then just sit at the door").
+ * go.ts heels every shell on a ROOM change; nothing did on an in-room
+ * move, so a rigger who paced eight squares across the Neon Strip left
+ * the frame parked in the doorway. Called after every successful
+ * in-room move (move.ts): each shell of the mover's that is on the
+ * floor here, not HOLDING and not hired crew, is re-placed beside them.
+ * The frame answers to the meat body only (go.ts HEELS_ON): a rigger
+ * flying one frame does not drag the others around.
+ */
+export function trailMaster(master, entries) {
+    if (master.plane !== 'meat')
+        return [];
+    const room = master.currentLocation;
+    const moved = [];
+    for (const entry of entries) {
+        if (entry.holding || entry.kind === 'ally')
+            continue;
+        if (!heelsTo(entry.npc, master))
+            continue;
+        if (entry.npc.currentLocation !== room || !onTheFloor(entry.npc))
+            continue;
+        if (entry.npc.isIncapacitated() || entry.npc.inExchange)
+            continue;
+        if (atMastersSide(entry, master))
+            continue;
+        placeBeside(entry, master);
+        moved.push(entry.npc);
+    }
+    return moved;
+}
 //# sourceMappingURL=companion-heel.js.map

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.134.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.",