@maka/maka-cli 5.133.0 → 5.134.0

package/bundle/typescript/package.json

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

@@ -14,6 +14,7 @@ import { spotsActive, resolveSpot, spotOf, describeSpotRoster, OPEN_FLOOR, pathB
 // 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) {
@@ -762,6 +773,7 @@ export class MoveCommand extends Command {
         // 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
@@ -867,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.` : '';
@@ -1016,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

@@ -353,5 +353,11 @@
 //   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';
+// 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/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/package.json

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