@maka/maka-cli 5.131.0 → 5.133.0

package/bundle/typescript/package.json

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

@@ -5,7 +5,8 @@ import { agentRatingFromName } from '../utilities/programs.js';
 import { resonanceAction } from '../resonance-actions.js';
 import { FIREARM_SKILLS } from '../models/player.js';
 import { ownedDrones, droneListLines } from '../utilities/owned-drones.js';
-import { droneLaunchAction, droneLaunchLine, droneRecallLine, droneWreckFragment } from '../utilities/drone-prose.js';
+import { droneLaunchAction, droneLaunchLine, droneRecallLine, droneStowLine, droneHandHeld, droneWreckFragment } from '../utilities/drone-prose.js';
+import { HolsterCommand } from './brandish.js';
 /**
  * The rigger's autonomous frames (SR5e p.269-271): "deploy <drone>" puts
  * a carried frame in the air under its own DOG-BRAIN -- no control rig
@@ -70,7 +71,7 @@ export class DeployCommand extends Command {
         // every catalog frame.
         return [
             `${droneLaunchLine(drone, from)} -- dog-brain running, Pilot ${drone.pilotRating}.`,
-            `  It follows where you walk${armed ? ` and its mount tracks what threatens you` : ` -- cameras only; it will not fight`}. Hull ${drone.droneSummary()}.${hint(` ("order ${drone.name.toLowerCase()} ..." to direct it, "recall" to bring it home, "jump" to take the stick yourself, wherever it flies.)`)}`,
+            `  It follows where you walk${armed ? ` and its mount tracks what threatens you` : ` -- cameras only; it will not fight`}. Hull ${drone.droneSummary()}.${hint(` ("order ${drone.name.toLowerCase()} ..." to direct it, "recall" to bring it to your side, "stow" to pack it away, "jump" to take the stick yourself, wherever it flies.)`)}`,
         ].join('\n');
     }
 }
@@ -137,15 +138,66 @@ export class AgentCommand extends Command {
         ].join('\n');
     }
 }
-/** "recall": fold a deployed autonomous drone back to hand, spin a
- * remote agent down into its deck, or work CALL/DISMISS SPRITE -- see
- * the sprite branch below. */
+function pickDeployedDrone(game, args) {
+    if (!game || args.length === 0)
+        return undefined;
+    const drones = game.companions.filter(c => c.kind === 'drone');
+    const names = drones.map(c => c.boundDevice?.name ?? c.npc.name);
+    const picked = fuzzyPickName(args.join(' '), names);
+    return picked ? drones[names.indexOf(picked)] : undefined;
+}
+/**
+ * "stow <drone>": fold a deployed frame back into your pack -- what
+ * "recall" used to do before the 2026-09-06 ruling made recall "return
+ * to me". Hand-held frames only (drone-prose.ts droneHandHeld): a Steel
+ * Lynx is not a pocket job and stays deployed ("store" parks it in the
+ * garage at the hideout). The verb was already the holster's ("stow"
+ * = holster your weapon) and still is: only a deployed frame the words
+ * name -- or a bare "stow" with a frame out and no steel drawn -- goes
+ * to the drone; everything else holsters exactly as before.
+ */
+export class StowCommand extends Command {
+    static verb = 'stow';
+    static description = 'Stow a deployed drone back into your pack ("stow <drone>"; frames too big to carry stay out), or holster your drawn weapon.';
+    async execute(args = []) {
+        const game = this.game;
+        const drones = game?.companions.filter(c => c.kind === 'drone') ?? [];
+        const named = pickDeployedDrone(game, args);
+        const bareForDrone = args.length === 0 && drones.length > 0 && !this.actor.weaponDrawn;
+        const entry = named ?? (bareForDrone ? drones[0] : undefined);
+        if (!entry) {
+            return new HolsterCommand({ actor: this.actor, scene: this.scene, rooms: this.rooms, game: this.game }).execute(args);
+        }
+        const item = entry.boundDevice;
+        const name = item?.name ?? entry.npc.name;
+        if (this.actor.plane !== 'meat') {
+            return `Stowing is a hands job -- come back to your body.`;
+        }
+        if (item && !droneHandHeld(item)) {
+            return `The ${name} is not a pocket job -- it stays deployed.${game?.homeRoom ? ` At the hideout, "store ${name.toLowerCase()}" parks it in the garage.` : ''} "recall" brings it to your side.`;
+        }
+        if (entry.npc.currentLocation !== this.actor.currentLocation) {
+            return `The ${name} isn't here to stow -- it's in ${entry.npc.currentLocation.name}. "recall" it first.`;
+        }
+        if (entry.npc.inExchange) {
+            return `The ${name} is fighting for its life -- let the exchange settle before folding it.`;
+        }
+        game.dismissCompanion(entry, 'stowed');
+        this.actor.performAction('stows', name);
+        this.logger.write(`StowCommand: ${this.actor.name} stowed ${name}.`);
+        this.scene.updateStatus();
+        return item ? droneStowLine(item) : `The ${name} folds into your pack.`;
+    }
+}
+/** "recall": bring a deployed drone to your side (it stays deployed and
+ * follows again -- "stow" is the fold), spin a remote agent down into
+ * its deck, or work CALL/DISMISS SPRITE -- see the sprite branch below. */
 export class RecallCommand extends Command {
     static verb = 'recall';
-    static description = `Recall your deployed drone to your hand, fold a running agent back into its deck, or call a registered sprite out of the Resonance. "${resonanceAction('call-dismiss-sprite')?.name}" (${resonanceAction('call-dismiss-sprite')?.actionType}, SR5 p.250): "recall <name>" also sends a standing registered sprite back -- which releases every task it still owes you. To park one cheaply instead, "standby" spends a single task (p.256).`;
+    static description = `Recall your deployed drone to your side -- it comes to you and follows again ("stow <drone>" folds it into your pack) -- fold a running agent back into its deck, or call a registered sprite out of the Resonance. "${resonanceAction('call-dismiss-sprite')?.name}" (${resonanceAction('call-dismiss-sprite')?.actionType}, SR5 p.250): "recall <name>" also sends a standing registered sprite back -- which releases every task it still owes you. To park one cheaply instead, "standby" spends a single task (p.256).`;
     async execute(args = []) {
         const game = this.game;
-        const entry = game?.companions.find(c => c.kind === 'drone');
+        const entry = pickDeployedDrone(game, args) ?? game?.companions.find(c => c.kind === 'drone');
         if (!entry) {
             // No drone aloft -- but an agent on the grid answers to the same
             // word (a real session tried every phrasing but the bare "agent"
@@ -163,11 +215,23 @@ export class RecallCommand extends Command {
                 return sprite;
             return `Nothing of yours is in the air.`;
         }
+        // RECALL IS "RETURN TO ME" (player ruling 2026-09-06, after a
+        // playtest: recall folded the frame into the hand and "it
+        // disappeared, which doesn't make sense -- it should just return to
+        // me and begin following me again"). The frame comes to your side,
+        // stays deployed, and is back on heel; "stow" is the fold.
         const name = entry.boundDevice?.name ?? entry.npc.name;
-        game.dismissCompanion(entry, 'recalled');
+        if (entry.npc.inExchange) {
+            return `The ${name} is fighting for its life -- let the exchange settle before calling it off.`;
+        }
+        const { moved } = game.heelCompanion(entry);
+        if (!moved)
+            return `The ${name} is already at your side.`;
+        entry.npc.performAction('returns', `to ${this.actor.name}'s side`);
         this.actor.performAction('recalls', name);
+        this.logger.write(`RecallCommand: ${name} recalled to ${this.actor.name}'s side in ${this.actor.currentLocation.name}.`);
         this.scene.updateStatus();
-        return entry.boundDevice ? droneRecallLine(entry.boundDevice) : `The ${name} comes back to hand.`;
+        return entry.boundDevice ? droneRecallLine(entry.boundDevice) : `The ${name} comes to your side and follows again.`;
     }
     /**
      * CALL/DISMISS SPRITE (SR5 p.250, Simple Action), on this verb rather

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

@@ -50,6 +50,23 @@ export class GoCommand extends Command {
         sprite: (plane) => plane === 'matrix',
         ally: () => false
     };
+    /**
+     * Does this companion follow the master's step? Hired crew never do
+     * (ruling 2026-08-25, above); a shell whose plane can't keep up does
+     * not; one that is down does not; and a drone HOLDING POSITION -- the
+     * frame a rigger jumped out of and left where it was (rigger pass
+     * 2026-09-06) -- waits there until "recall" brings it to heel. Pulled
+     * out of the loop so the rule is one function a test can ask.
+     */
+    static heels(c, plane) {
+        if (c.kind === 'ally')
+            return false;
+        if (c.holding)
+            return false;
+        if (c.npc.isIncapacitated())
+            return false;
+        return GoCommand.HEELS_ON[c.kind](plane);
+    }
     static verb = 'go';
     static description = 'Move in the specified direction ("go back" retraces your last move). Fleeing someone you just fought hands them one free parting shot. Jacked in, the grid sees no distance: "go <any room>" jumps your persona straight there ("map" lights the icons). Inside a host there is no distance to cross at all -- "exit" first.';
     async execute(args) {
@@ -470,10 +487,7 @@ export class GoCommand extends Command {
                 // with their own feet: they hold whatever ground they're on
                 // until they decide to move or you "order" them to, which is
                 // also what makes sending one ahead to scout mean anything.
-                if (c.kind === 'ally')
-                    continue;
-                const canFollow = GoCommand.HEELS_ON[c.kind](this.actor.plane);
-                if (!canFollow || c.npc.currentLocation === dest || c.npc.isIncapacitated())
+                if (!GoCommand.heels(c, this.actor.plane) || c.npc.currentLocation === dest)
                     continue;
                 c.npc.currentLocation = dest;
                 c.npc.atSpot = this.actor.atSpot; // at their master's heel = at their spot

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

@@ -16,7 +16,7 @@ import { droneWreckFragment } from '../utilities/drone-prose.js';
  */
 export class JumpCommand extends Command {
     static verb = 'jump';
-    static description = 'Jump INTO a drone (control rig required): fly it, see through it, fight with its mount. A deployed frame is seized wherever it flies. "jump hot" for hot-sim; "jump" again returns to your body and leaves the frame out on its dog-brain where you left it ("recall" brings it home).';
+    static description = 'Jump INTO a drone (control rig required): fly it, see through it, fight with its mount. A deployed frame is seized wherever it flies. "jump hot" for hot-sim; "jump" again returns to your body and leaves the frame out on its dog-brain where you left it ("recall" brings it to your side, "stow" packs it away).';
     async execute(args = []) {
         const actor = this.actor;
         // Already riding: this is the jump OUT.
@@ -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/commands/order.js

@@ -2,7 +2,7 @@ import { Command } from './command.js';
 import { hint } from '../utilities/hints.js';
 import { fuzzyPickName, significantWords, normalizeLoose, wordsAreCloseEnough } from '../utilities/fuzzy-match.js';
 import { AI } from '../../../../tools/ai/ai.class.js';
-import { DRONE_COLOUR, DRONE_ICON, droneRecallLine } from '../utilities/drone-prose.js';
+import { DRONE_COLOUR, DRONE_ICON, droneRecallLine, droneStowLine, droneHandHeld } from '../utilities/drone-prose.js';
 /**
  * What "you have nobody" says, one phrase per COMPANION KIND.
  *
@@ -107,8 +107,20 @@ export class OrderCommand extends Command {
         // body." (a real session's agent couldn't be brought home by any
         // natural phrasing: "order agent return", "return to deck"...).
         // ("return fire" is exempt -- that's a shooting order, not a fold.)
+        // A DRONE ORDERED TO COME comes -- and stays deployed, back on heel
+        // (player ruling 2026-09-06: recall is "return to me"). "fold" /
+        // "stow" is the pack, handled with the other kinds below.
+        if (entry.kind === 'drone'
+            && /^(return(?!\s+fire)|recall|come(\s+(back|home|here|to\s+me))?|follow(\s+me)?|heel|stand\s+down|go\s+home)\b/i.test(cmd)) {
+            const { moved } = game.heelCompanion(entry);
+            this.scene.updateStatus();
+            const line = !moved
+                ? `${entry.npc.name} is already at your heel.`
+                : entry.boundDevice ? droneRecallLine(entry.boundDevice) : `${entry.npc.name} comes to your side.`;
+            return `{${feed.color}-fg}${feed.icon} ${line}{/${feed.color}-fg}`;
+        }
         if (entry.kind !== 'ally'
-            && /^(return(?!\s+fire)|recall|come\s+(back|home)|fold|dismiss|stand\s+down|go\s+home)\b/i.test(cmd)) {
+            && /^(return(?!\s+fire)|recall|come\s+(back|home)|fold|dismiss|stand\s+down|go\s+home|stow|pack)\b/i.test(cmd)) {
             // A SPRITE ORDERED HOME IS DISMISSED, NOT DESTROYED, and it is not
             // an agent. This branch had no sprite case at all: the ternary
             // fell through to the AGENT wording, so a technomancer who told
@@ -135,13 +147,21 @@ export class OrderCommand extends Command {
                     : `${feed.icon} ${name} unravels into clean static -- an unregistered thread has no Resonance to wait in.`;
                 return `{${feed.color}-fg}${line}{/${feed.color}-fg}`;
             }
+            // A frame you cannot carry has no pack to fold into; one across
+            // the district has to be recalled first -- stowing is hands-on.
+            if (entry.kind === 'drone' && entry.boundDevice && !droneHandHeld(entry.boundDevice)) {
+                return `{${feed.color}-fg}${feed.icon} The ${entry.boundDevice.name} is not a pocket job -- it stays deployed. "recall" brings it to your side.{/${feed.color}-fg}`;
+            }
+            if (entry.kind === 'drone' && entry.npc.currentLocation !== this.actor.currentLocation) {
+                return `{${feed.color}-fg}${feed.icon} The ${entry.boundDevice?.name ?? entry.npc.name} isn't here to stow -- "recall" it first.{/${feed.color}-fg}`;
+            }
             const foldLine = entry.kind === 'spirit'
                 ? `${feed.icon} You speak the release. The spirit inclines its head -- the bargain closes${(entry.services ?? 0) > 0 ? `, ${entry.services} unspent service${entry.services === 1 ? '' : 's'} forfeit` : ''} -- and it thins back to its own plane.`
                 : entry.kind === 'drone'
-                    // The same words "recall" speaks (drone-prose.ts), classed by
+                    // The same words "stow" speaks (drone-prose.ts), classed by
                     // how the frame moves -- this line used to be a verbatim copy
                     // of companions.ts's, and both said rotors to a Steel Lynx.
-                    ? `${feed.icon} ${entry.boundDevice ? droneRecallLine(entry.boundDevice) : `The ${entry.npc.name} comes back to hand.`}`
+                    ? `${feed.icon} ${entry.boundDevice ? droneStowLine(entry.boundDevice) : `The ${entry.npc.name} folds into your pack.`}`
                     : this.actor.plane === 'matrix'
                         ? `${feed.icon} Your agent's icon collapses back into your persona -- folded into the deck.`
                         : `${feed.icon} The deck spins its agent down -- the DECK IN AR light dies as the icon folds home.`;

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

@@ -336,5 +336,22 @@
 //   under its own power; a locked door stops every frame but a palm-flier
 //   on the recon sweep. Two tables on different versions disagree about
 //   where a frame is after a jump-out.
-export const ENGINE_VERSION = '1.36.0';
+// 1.37.0 (2026-09-06): RECALL IS "RETURN TO ME"; STOW PUTS IT AWAY. COMMAND
+//   SEMANTICS in shared scenes: "recall <drone>" now brings a deployed frame
+//   to your side and back on heel, still deployed (it used to fold the frame
+//   into your hand -- playtest: "it disappeared, which doesn't make sense");
+//   "stow <drone>" is the fold (hand-held frames only; the holster meaning
+//   of "stow" is untouched), and "order <drone> come/return/follow" heels
+//   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".
+// 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/game.js

@@ -132,7 +132,7 @@ import { SustainCommand } from './commands/sustain.js';
 import { AbandonCommand } from './commands/abandon.js';
 import { UnravelCommand } from './commands/unravel.js';
 import { OrderCommand } from './commands/order.js';
-import { DeployCommand, AgentCommand, RecallCommand } from './commands/companions.js';
+import { DeployCommand, AgentCommand, RecallCommand, StowCommand } from './commands/companions.js';
 import { DeckCommand, LoadProgramCommand, UnloadProgramCommand } from './commands/deck.js';
 import { getProgram } from './utilities/programs.js';
 import { MoveCommand, RunCommand, SprintCommand } from './commands/move.js';
@@ -183,6 +183,7 @@ import { AI } from '../../../tools/ai/ai.class.js';
 import { BULLET } from './utilities/log-style.js';
 import { spotOf, resolveSpot } from './utilities/spots.js';
 import { DRONE_COLOUR, DRONE_ICON, droneFoldForTravelLine, droneUnfoldAtCurbLine } from './utilities/drone-prose.js';
+import { bringToHeel } from './utilities/companion-heel.js';
 export default class Game {
     initialized;
     static instance;
@@ -1445,6 +1446,17 @@ export default class Game {
             shell.maxCarryingWeight = Game.DRONE_CARGO_KG[item.size] ?? 2;
         return shell;
     }
+    /**
+     * 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 and any HOLDING flag clears, so the next "go" drags it
+     * along like any companion. Returns whether it had anywhere to come
+     * from.
+     */
+    heelCompanion(entry) {
+        return bringToHeel(entry, this.player);
+    }
     /** Drops a companion's shell and its roster entry. */
     dismissCompanion(entry, reason) {
         if (this.scene.getActor(entry.npc.name) === entry.npc) {
@@ -2508,7 +2520,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('brandish', BrandishCommand);
         CommandFactory.registerCommand('draw', BrandishCommand);
         CommandFactory.registerCommand('holster', HolsterCommand);
-        CommandFactory.registerCommand('stow', HolsterCommand);
+        // "stow" is the holster's word AND the drone fold's (2026-09-06):
+        // StowCommand takes a deployed frame the words name and hands
+        // everything else to HolsterCommand unchanged.
+        CommandFactory.registerCommand('stow', StowCommand);
         // "end" and "hangup" both bounced in real sessions when players
         // wanted to end a call -- the intent is unambiguous mid-call.
         CommandFactory.registerCommand('end', EndCallCommand);
@@ -5420,7 +5435,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             // PILOT rating, agents run at a RATING, and a spirit's Force is
             // already in its name.
             const grade = c.kind === 'drone' ? `Pilot ${c.force} -- ` : c.kind === 'agent' ? `Rating ${c.force} -- ` : c.kind === 'sprite' ? `Level ${c.force} -- ` : '';
-            lines.push(`{green-fg}👥 ${c.npc.name} -- ${grade}${track}{/green-fg}`);
+            // A frame left on its dog-brain says where it waits.
+            const hold = c.holding ? ` -- holding at ${c.npc.currentLocation.name}` : '';
+            lines.push(`{green-fg}👥 ${c.npc.name} -- ${grade}${track}${hold}{/green-fg}`);
         }
         // DECK-AR INDICATOR (player request): "Link online" is the
         // COMMLINK's AR overlay; this is the DECK's -- lit when an agent
@@ -5970,13 +5987,13 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      */
     static HELP_CATEGORIES = [
         { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach'], ['run'], ['sprint'], ['climb', 'mantle', 'scale', 'clamber'], ['descend'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow'], ['unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
-        { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['loot'], ['drop'], ['give'], ['store'], ['open'], ['close'], ['put'], ['equip'], ['unequip'], ['fit'], ['unfit'], ['brandish', 'draw'], ['holster', 'stow'], ['reload'], ['use'], ['read']] },
+        { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['loot'], ['drop'], ['give'], ['store'], ['open'], ['close'], ['put'], ['equip'], ['unequip'], ['fit'], ['unfit'], ['brandish', 'draw'], ['holster'], ['reload'], ['use'], ['read']] },
         { title: 'combat', entries: [['attack'], ['kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['cover'], ['stance'], ['surrender'], ['edge'], ['rest'], ['heal', 'firstaid', 'bandage', 'patch']] },
         // The party layer: everyone who walks (or flies, or manifests) at
         // your side answers to these.
         // "players" folded back under crew after playtesting ("crew
         // players" / "crew street"); the bare verb still answers quietly.
-        { title: 'party', entries: [['crew', 'party'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall']] },
+        { title: 'party', entries: [['crew', 'party'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall'], ['stow']] },
         { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project', 'astral'], ['return'], ['assense']] },
         { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['download'], ['enter'], ['exit-host'], ['hop'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
         // The Emerged get their own shelf (player request: "there MUST be

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

@@ -0,0 +1,22 @@
+/**
+ * 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.
+ *
+ * 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;
+    entry.holding = false;
+    return { moved };
+}
+//# sourceMappingURL=companion-heel.js.map

package/bundle/typescript/src/commands/game/sideQuest/utilities/drone-prose.js

@@ -113,21 +113,42 @@ export function droneLaunchLine(item, from) {
         missile: `The ${name} kicks off its rail and holds a tight circle overhead`,
     });
 }
-/** Recall / "order <drone> home": the frame comes back to you. */
+/**
+ * Recall / "order <drone> come": the frame comes to your side and is
+ * back at heel, still deployed (player ruling 2026-09-06: "recall is
+ * just return to me"; putting it away is "stow" -- droneStowLine).
+ */
 export function droneRecallLine(item) {
     const name = item.name;
     const back = pick(item, {
-        'flier-palm': `The ${name} loops back and settles onto your palm, rotors stilling.`,
-        flier: `The ${name} banks once and settles back onto your hand, rotors folding.`,
-        ground: `The ${name} rolls back to your side and powers down.`,
-        walker: `The ${name} picks its way back and folds its legs into your hand.`,
-        anthro: `The ${name} walks back and powers down at your side.`,
-        missile: `The ${name} comes around and settles onto its rail, turbine spooling down.`,
+        'flier-palm': `The ${name} loops back and hangs at your shoulder, rotors whining.`,
+        flier: `The ${name} banks once and settles into a hover at your shoulder.`,
+        ground: `The ${name} rolls back to your side and idles, motors ticking.`,
+        walker: `The ${name} picks its way back and settles at your feet.`,
+        anthro: `The ${name} walks back and falls in at your side.`,
+        missile: `The ${name} comes around and picks up station overhead.`,
+    });
+    const dents = item.droneDamage > 0
+        ? ` The frame carries its dents (${item.droneSummary()})${hint(' -- rest repairs it')}.`
+        : '';
+    return `${back} It follows where you walk again.${dents}`;
+}
+/** Stow: the frame folds back into your pack -- hand-held frames only
+ *  (droneHandHeld); a frame you cannot carry stays deployed. */
+export function droneStowLine(item) {
+    const name = item.name;
+    const away = pick(item, {
+        'flier-palm': `The ${name} settles onto your palm, rotors stilling, and goes back in your pocket.`,
+        flier: `The ${name} settles back onto your hand, rotors folding, and goes into the pack.`,
+        ground: `The ${name} powers down and you sling it.`,
+        walker: `The ${name} folds its legs into your hand and goes into the pack.`,
+        anthro: `The ${name} climbs into the pack and goes still.`,
+        missile: `The ${name} settles onto its rail, turbine spooling down.`,
     });
     const dents = item.droneDamage > 0
         ? ` The frame carries its dents (${item.droneSummary()})${hint(' -- rest repairs it')}.`
         : '';
-    return `${back}${dents}`;
+    return `${away}${dents}`;
 }
 /** Pre-travel: how the frame gets to the cab, or does not need one. */
 export function droneFoldForTravelLine(item) {
@@ -212,7 +233,7 @@ export function droneJumpOutLine(item, frameRoom, bodyRoom) {
         missile: 'holds its circle overhead',
     });
     const where = frameRoom === bodyRoom ? 'where you left it' : `in ${frameRoom.name}`;
-    return `You're back in your body in ${bodyRoom.name}; the ${item.name} ${holds} ${where} -- dog-brain on the stick.${hint(' ("recall" brings it home.)')}`;
+    return `You're back in your body in ${bodyRoom.name}; the ${item.name} ${holds} ${where} -- dog-brain on the stick, holding until you "recall" it.${hint(' ("recall" brings it to your side; "stow" packs it away.)')}`;
 }
 /** The recon sweep ("drone"): nowhere to go, launch, and return. */
 export function droneReconNowhereLine(item) {

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

@@ -298,7 +298,7 @@ export function enterDrone(scene, actor, drone, mode) {
         : ` Cold-sim: hits on the hull sting through the link as stun, half strength.`;
     return [
         `The rig takes hold and the world snaps to sensor-sight -- you ARE the ${drone.name} now, ${droneJumpInFragment(drone)}, your body slumped and empty in ${actor.bodyRoom.name}.${hotWarning}${hullNote}`,
-        hint(`Move with "go" (you fly the meat world; locked doors still stop an airframe), "look" through the sensors, "jump" again to drop back into your body -- the frame stays out on its dog-brain where you leave it; "recall" brings it home.`),
+        hint(`Move with "go" (you fly the meat world; locked doors still stop an airframe), "look" through the sensors, "jump" again to drop back into your body -- the frame stays out on its dog-brain where you leave it; "recall" brings it to your side, "stow" packs it away.`),
     ].filter(l => l.length > 0);
 }
 /**
@@ -361,6 +361,12 @@ export function leaveDrone(scene, actor, opts) {
         if (shell) {
             shell.atSpot = frameSpot;
             shell.atCell = frameCell;
+            // It HOLDS there (Game.companions.holding): a frame you left in
+            // the next room must not teleport to your heel on your next step
+            // -- "recall" fetches it.
+            const entry = game.companions.find(c => c.npc === shell);
+            if (entry)
+                entry.holding = true;
             Logger.getInstance().write(`${drone.name} re-shelled on its dog-brain in ${frameRoom.name} after ${actor.name} jumped out.`);
         }
         lines.push(shell && drone

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