@maka/maka-cli 5.129.0 → 5.131.0

package/bundle/typescript/package.json

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

@@ -72,6 +72,15 @@ export class CallCommand extends Command {
         // before NPC resolution ("taxi" is a service, not a person).
         const spoken = rawWords.map(w => w.toLowerCase()).filter(w => w !== 'a' && w !== 'the');
         if (this.game?.hasHub && (spoken[0] === 'taxi' || spoken[0] === 'cab')) {
+            // A CAB IS THE RUNNER'S CALL (rigger pass 2026-09-06: a deployed
+            // drone must never start a run). `call` itself stays open -- NPCs
+            // phone people (npc.ts advertises the verb) -- but the taxi branch
+            // launches the PLAYER's pending run off this.game, so only a
+            // person at the table may hail one. Latent until now because NPC
+            // command contexts carry no `game`; a rule now rather than luck.
+            if (!this.scene.isHumanControlled(this.actor)) {
+                return `The dispatcher's bored voice: "No fare on the books for ${this.actor.name}, chummer." A cab is the runner's call.`;
+            }
             if (this.actor.plane !== 'meat') {
                 return this.actor.plane === 'matrix'
                     ? `Cabs take bodies, not personas -- "jack out" first.`

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

@@ -777,15 +777,20 @@ export class CastCommand extends BypassCommand {
             return error ?? `You don't see them here.`;
         const self = target === this.actor;
         // Sustained toggle per bearer: casting at them again unravels it, no
-        // drain to let go. (The caster is the only one who can release it --
-        // a mundane bearer has no way to drop a spell themselves.)
+        // drain to let go. The caster is the only one who can release it
+        // (p.282: the caster sustains) -- a weave somebody ELSE is holding
+        // on them is that caster's to drop, not yours to overwrite.
         if (target.sustainedArmor > 0) {
+            const holder = target.wornSpellCaster('armor');
+            if (holder && holder !== this.actor) {
+                return `${holder.name} is holding an armor weave on ${self ? 'you' : target.name} already -- only ${holder.name} can let it go.`;
+            }
             target.setSustainedArmor(0);
             this.scene.updateStatus();
             this.actor.performAction('releases armor spell', self ? '' : `on ${target.name}`);
             return this.finishSpell([self
                     ? `You let the armor spell go. The air stops humming, and the sustaining penalty lifts.`
-                    : `You unravel the armor weave around ${target.name}. The shimmer fades, and their sustaining burden lifts.`]);
+                    : `You unravel the armor weave around ${target.name}. The shimmer fades, and the burden of holding it lifts from you.`]);
         }
         if (target.isIncapacitated()) {
             return `${target.name} is down -- armor won't help now.`;
@@ -795,19 +800,20 @@ export class CastCommand extends BypassCommand {
         const focus = this.actor.getBestFocus();
         const bonus = Math.ceil(force / 3) + (focus?.ratingValue ?? 0); // the focus's Force (catalog v13)
         const spell = spellFor('armor');
-        // The weave taxes its BEARER: they get the soak and carry the -2
-        // sustaining burden. The caster pays only the drain.
+        // The BEARER wears the weave (the soak is theirs); the CASTER
+        // sustains it and carries the -2 (p.282), on top of the drain.
         target.setSustainedArmor(bonus);
         target.noteSustainedForce('armor', force);
+        target.sustainedBy('armor', this.actor);
         this.actor.performAction('casts armor', self ? '' : `on ${target.name}`);
         this.scene.addWorldEvent(`${this.actor.name} wrapped ${self ? 'themselves' : target.name} in a shimmering armor spell.`);
         this.scene.updateStatus();
-        // The burden is the bearer's ledger's, not a restated -2: a Focused
+        // The burden is the CASTER's ledger's, not a restated -2: a Focused
         // Concentration holder is told "no penalty" the moment it applies.
-        const burden = sustainBurden(target.sustainedLedger().find(w => w.key === 'armor'), ` to everything else ${self ? 'you do' : 'they do'}`);
+        const burden = sustainBurden(this.actor.sustainedLedger().find(w => w.key === 'armor' && (self ? w.bearer === undefined : w.bearer === target.name)), ' to everything else you do');
         const lines = [
             `${this.actor.name} casts armor at Force ${force}${self ? '' : ` on ${target.name}`}, ${this.castingLabel()}:`,
-            `  The air hardens around ${self ? 'you' : target.name} -- +${bonus} soak dice while sustained, ${burden}.`,
+            `  The air hardens around ${self ? 'you' : target.name} -- +${bonus} soak dice while sustained${self ? '' : '; you hold the weave up'}, ${burden}.`,
             hint(`  (Cast armor${self ? '' : ` on ${target.name}`} again to release it.)`),
             ...this.applyDrain(spell, force, overcast),
         ];
@@ -882,8 +888,8 @@ export class CastCommand extends BypassCommand {
     }
     /**
      * The sustained utility pair (invisibility / increase reflexes), same
-     * toggle shape as the armor spell: the BEARER carries the effect and
-     * its -2 sustaining burden, the caster pays the drain, and casting at
+     * toggle shape as the armor spell: the BEARER wears the effect, the
+     * CASTER sustains it (-2, p.282) and pays the drain, and casting at
      * the same bearer again releases it for free.
      */
     async castSustainedUtility(spellKey, force, overcast, rest = []) {
@@ -894,12 +900,16 @@ export class CastCommand extends BypassCommand {
         const flag = spellKey === 'invisibility' ? 'sustainedInvisibility' : 'sustainedReflexes';
         const label = spellKey === 'invisibility' ? 'invisibility' : 'increase reflexes';
         if (target[flag]) {
+            const holder = target.wornSpellCaster(spellKey);
+            if (holder && holder !== this.actor) {
+                return `${holder.name} is holding ${label} on ${self ? 'you' : target.name} already -- only ${holder.name} can let it go.`;
+            }
             target[flag] = false;
             this.scene.updateStatus();
             this.actor.performAction(`releases ${label}`, self ? '' : `on ${target.name}`);
             return this.finishSpell([spellKey === 'invisibility'
-                    ? `${self ? 'You shimmer back into the world' : `${target.name} shimmers back into the world`} -- the light remembers ${self ? 'you' : 'them'}, and the sustaining burden lifts.`
-                    : `${self ? 'Your' : `${target.name}'s`} nerves cool back to human speed. The sustaining burden lifts.`]);
+                    ? `${self ? 'You shimmer back into the world' : `${target.name} shimmers back into the world`} -- the light remembers ${self ? 'you' : 'them'}, and the sustaining burden lifts${self ? '' : ' from you'}.`
+                    : `${self ? 'Your' : `${target.name}'s`} nerves cool back to human speed. The sustaining burden lifts${self ? '' : ' from you'}.`]);
         }
         if (target.isIncapacitated()) {
             return `${target.name} is down -- ${label} won't help now.`;
@@ -911,15 +921,18 @@ export class CastCommand extends BypassCommand {
         const spell = spellFor(spellKey);
         target[flag] = true;
         target.noteSustainedForce(spellKey, force);
+        target.sustainedBy(spellKey, this.actor);
         this.actor.performAction(`casts ${label}`, self ? '' : `on ${target.name}`);
         this.scene.addWorldEvent(spellKey === 'invisibility'
             ? `${this.actor.name} wove an invisibility spell${self ? '' : ` over ${target.name}`}.`
             : `${this.actor.name} cast increase reflexes${self ? '' : ` on ${target.name}`}.`);
         this.scene.updateStatus();
-        const burden = sustainBurden(target.sustainedLedger().find(w => w.key === spellKey), ` to everything else ${self ? 'you do' : 'they do'}`);
+        // The CASTER's ledger: they hold it, they pay (p.282).
+        const burden = sustainBurden(this.actor.sustainedLedger().find(w => w.key === spellKey && (self ? w.bearer === undefined : w.bearer === target.name)), ' to everything else you do');
+        const holding = self ? '' : '; you hold it up';
         const effectLine = spellKey === 'invisibility'
-            ? `  The light slides around ${self ? 'you' : target.name} like water around a stone -- +3 dice on sneak contests while sustained, ${burden}. Loud acts still announce ${self ? 'you' : 'them'}.`
-            : `  ${self ? 'Your' : `${target.name}'s`} nerves run HOT -- +2 initiative while sustained, ${burden}.`;
+            ? `  The light slides around ${self ? 'you' : target.name} like water around a stone -- +3 dice on sneak contests while sustained${holding}, ${burden}. Loud acts still announce ${self ? 'you' : 'them'}.`
+            : `  ${self ? 'Your' : `${target.name}'s`} nerves run HOT -- +2 initiative while sustained${holding}, ${burden}.`;
         const lines = [
             `${this.actor.name} casts ${label} at Force ${force}${self ? '' : ` on ${target.name}`}, ${this.castingLabel()}:`,
             effectLine,

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

@@ -5,14 +5,18 @@ 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';
 /**
  * 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
- * needed, Pilot (2 + quality) standing in for every attribute it lacks.
- * It follows you, watches, and (armed frames only) shoots what threatens
- * you; damage lands on the HULL and a wreck is a wreck (rest to repair).
- * "recall" folds it back to your hand, and "jump" (jump.ts) seizes the
- * stick from the dog-brain wherever the frame flies.
+ * needed, Pilot (the row's, else 2 + quality: Item.pilotRating) standing
+ * in for every attribute it lacks. It follows you, watches, and (armed
+ * frames only) shoots what threatens you; damage lands on the HULL and a
+ * wreck is a wreck (rest to repair). "recall" folds it back to your
+ * hand, and "jump" (jump.ts) seizes the stick from the dog-brain
+ * wherever the frame flies. Every word about the frame moving comes
+ * from utilities/drone-prose.ts, classed by how it actually moves: a
+ * Steel Lynx rolls, a Fly-Spy whines up off your palm.
  */
 export class DeployCommand extends Command {
     static verb = 'deploy';
@@ -45,23 +49,27 @@ export class DeployCommand extends Command {
         if (!drone)
             return [`Which frame? ("deploy <name>")`, ...droneListLines(owned)].join('\n');
         if (drone.isWrecked)
-            return `The ${drone.name} is a wreck -- it deploys nowhere until you rest and true the rotors.`;
+            return `The ${drone.name} is a wreck -- ${droneWreckFragment(drone)} -- it deploys nowhere until you rest and rebuild it.`;
         if (game.companions.some(c => c.boundDevice === drone)) {
             return `The ${drone.name} is already in the air.`;
         }
         const shell = game.deployDroneShell(drone, actor.currentLocation);
         if (!shell)
             return `The autopilot stutters -- something already answers to that designation here.`;
-        const fromGarage = owned.find(d => d.item === drone)?.where === 'garage';
-        actor.performAction('deploys', fromGarage ? `${drone.name} -- rolling out of the garage under its own power` : `${drone.name} -- rotors spinning up to a hover`);
+        const from = owned.find(d => d.item === drone)?.where === 'garage' ? 'garage' : 'hand';
+        actor.performAction('deploys', `${drone.name} -- ${droneLaunchAction(drone, from)}`);
         this.logger.write(`DeployCommand: ${actor.name} deployed ${drone.name} on autopilot.`);
         this.scene.updateStatus();
         // ANY firearm skill, not one of them. A drone's mount is a gun; after
         // the split there is no single `firearms` rating to ask for, and
         // picking one would call a shell with a shotgun rating unarmed.
         const armed = FIREARM_SKILLS.some(k => shell.skillRating(k) > 0);
+        // The Pilot printed is the Pilot the shell RUNS ON (deployDroneShell
+        // reads Item.pilotRating, the catalog row's): this line used to
+        // inline the price-tier fallback and disagreed with the HUD for
+        // every catalog frame.
         return [
-            `The ${drone.name} lifts off your hand and settles into a watchful hover -- dog-brain running, Pilot ${2 + drone.qualityBonus}.`,
+            `${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.)`)}`,
         ].join('\n');
     }
@@ -159,7 +167,7 @@ export class RecallCommand extends Command {
         game.dismissCompanion(entry, 'recalled');
         this.actor.performAction('recalls', name);
         this.scene.updateStatus();
-        return `The ${name} banks once and settles back onto your hand, rotors folding.${entry.boundDevice && entry.boundDevice.droneDamage > 0 ? ` The airframe carries its dents (${entry.boundDevice.droneSummary()})${hint(' -- rest repairs it')}.` : ''}`;
+        return entry.boundDevice ? droneRecallLine(entry.boundDevice) : `The ${name} comes back to hand.`;
     }
     /**
      * CALL/DISMISS SPRITE (SR5 p.250, Simple Action), on this verb rather

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

@@ -2,6 +2,7 @@ import { Command } from './command.js';
 import { Door } from '../models/door.js';
 import { rollPool, formatRoll } from '../utilities/dice.js';
 import { ownedDrones } from '../utilities/owned-drones.js';
+import { droneReconLaunchLine, droneReconNowhereLine, droneReconReturnLine, droneSlipsVents } from '../utilities/drone-prose.js';
 /**
  * The rigger's mechanic: launch a carried surveillance drone for a live
  * sweep of every room adjacent to this one -- who's there, what's locked,
@@ -32,7 +33,7 @@ export class DroneCommand extends Command {
         const room = actor.currentLocation;
         const exits = Array.from(room.exits.entries());
         if (exits.length === 0) {
-            return `The ${drone.name} lifts, circles once -- nowhere to go from here.`;
+            return droneReconNowhereLine(drone);
         }
         actor.performAction('launches a drone', drone.name);
         this.logger.write(`${actor.name} launched ${drone.name} from ${room.name}.`);
@@ -43,18 +44,26 @@ export class DroneCommand extends Command {
         const roll = rollPool(Math.max(1, actor.reaction + (piloting > 0 ? piloting : -1) + actor.bonus('piloting') + actor.woundModifier - actor.sustainingPenalty));
         if (roll.hits === 0) {
             return [
-                `The ${drone.name} whirs off your palm -- Piloting: ${formatRoll(roll)}`,
+                droneReconLaunchLine(drone, formatRoll(roll), false),
                 `  It clips a railing, spins, and the feed dissolves into static. It limps home with nothing.`,
             ].join('\n');
         }
-        const lines = [`The ${drone.name} whirs off your palm and threads the gaps -- Piloting: ${formatRoll(roll)}. Feed incoming:`];
+        const lines = [droneReconLaunchLine(drone, formatRoll(roll), true)];
         for (const [direction, exit] of exits) {
             let target;
             let lockNote = '';
             if (exit instanceof Door) {
                 target = exit.getOtherSide(room);
-                if (exit.checkIfLocked())
+                if (exit.checkIfLocked()) {
+                    // Only a palm-sized flier slips a vent (drone-prose.ts): a
+                    // locked door stops a Roto-Drone or a Steel Lynx like anyone,
+                    // and the sweep says so instead of reading through it.
+                    if (!droneSlipsVents(drone)) {
+                        lines.push(`  • ${direction}: ${target?.name ?? '?'} [door LOCKED -- no way through for a ${drone.name}]`);
+                        continue;
+                    }
                     lockNote = ' [door LOCKED -- it slipped a vent]';
+                }
             }
             else if (typeof exit === 'string') {
                 target = this.rooms?.[exit];
@@ -68,7 +77,7 @@ export class DroneCommand extends Command {
             const node = target.hasNode ? ' -- a Matrix host node hums here' : '';
             lines.push(`  • ${direction}: ${target.name}${lockNote} -- ${who}${node}`);
         }
-        lines.push(`The ${drone.name} loops home and folds back into your kit.`);
+        lines.push(droneReconReturnLine(drone));
         return lines.join('\n');
     }
 }

package/bundle/typescript/src/commands/game/sideQuest/commands/job-offer.js

@@ -16,6 +16,12 @@ import { meetLocationFor } from '../utilities/meet-location.js';
  * with AI off it resolves immediately and the click is instant).
  */
 class JobOfferCommand extends Command {
+    // THE JOB IS THE PLAYER'S TO TAKE OR REFUSE (rigger pass 2026-09-06).
+    // Both verbs mutate this.game -- the player's run -- not the actor,
+    // so a companion shell ordered to "accept" would lock in the player's
+    // job. Declared once here: statics inherit, and Command.isHumanOnly()
+    // reads it off the subclass constructor (command-registry.ts).
+    static humanOnly = true;
     /** Bare "accept"/"decline" with NO job on the table but a PARTY
      *  INVITE waiting obviously means the invite (real session typed
      *  "accept" first and got the job-offer refusal) -- route it to the

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

@@ -3,6 +3,14 @@ import { hint } from '../utilities/hints.js';
 import { optionMark } from '../utilities/log-style.js';
 export class JobsCommand extends Command {
     static verb = 'jobs';
+    // THE JOB IS THE PLAYER'S TO TAKE (rigger pass 2026-09-06: "can a
+    // deployed drone take a job on its own? I don't think it should").
+    // "jobs take" acts on this.game -- the player's run -- not on the
+    // actor, so an ordered or AI-driven companion shell running it would
+    // put a job on the player's table. Latent until now only because NPC
+    // command contexts carry no `game`; now a rule, enforced and logged
+    // at command-registry.ts.
+    static humanOnly = true;
     static description = 'The job board: what\'s on offer, CREW vs LOCAL. "jobs take <n>" puts one on the table, "jobs dismiss <n>" scraps it.';
     async execute(args = []) {
         const game = this.game;

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

@@ -3,6 +3,7 @@ import { hint } from '../utilities/hints.js';
 import { enterDrone, leaveDrone } from '../utilities/planes.js';
 import { fuzzyPickName } from '../utilities/fuzzy-match.js';
 import { ownedDrones, droneListLines } from '../utilities/owned-drones.js';
+import { droneWreckFragment } from '../utilities/drone-prose.js';
 /**
  * Jumped-in rigging (SR5e p.266): "jump" pours the rigger into a carried
  * drone -- full VR through an IMPLANTED CONTROL RIG (the book's hard
@@ -15,7 +16,7 @@ import { ownedDrones, droneListLines } from '../utilities/owned-drones.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.';
+    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).';
     async execute(args = []) {
         const actor = this.actor;
         // Already riding: this is the jump OUT.
@@ -58,7 +59,7 @@ export class JumpCommand extends Command {
             return [`Which airframe? ("jump <name>", add "hot" for hot-sim)`, ...droneListLines(owned)].join('\n');
         }
         if (drone.isWrecked) {
-            return `The ${drone.name} is a wreck -- bent rotors and dead boards jump nowhere. It repairs while you rest somewhere safe.`;
+            return `The ${drone.name} is a wreck -- ${droneWreckFragment(drone)} -- and a wreck jumps nowhere. It repairs while you rest somewhere safe.`;
         }
         // Jumping into a DEPLOYED frame seizes it WHEREVER it flies (player
         // request -- jumping in rides the link, not your hands): the
@@ -66,15 +67,25 @@ export class JumpCommand extends Command {
         // position, not your body's. Only a frame mid-exchange refuses --
         // combat holds live references to the shell.
         let seizedRoom;
+        let seizedSpot;
+        let seizedCell;
         const flying = this.game?.companions.find(c => c.boundDevice === drone);
         if (flying) {
             if (flying.npc.inExchange) {
                 return `The ${drone.name} is fighting for its life -- the link can't seize a bucking frame mid-exchange. Let it settle first.`;
             }
+            // The frame's CELL comes with its room (rigger pass 2026-09-06):
+            // seizing used to carry the room and drop the cell, so the rigger
+            // snapped into the frame's room at their body's cell -- across the
+            // room from where the frame actually hovered.
             seizedRoom = flying.npc.currentLocation;
+            seizedSpot = flying.npc.atSpot;
+            seizedCell = flying.npc.atCell;
             this.game.dismissCompanion(flying, 'jumped into -- dog-brain yields the stick');
         }
         this.logger.write(`JumpCommand: ${actor.name} jumping into ${drone.name} (${mode}-sim)${seizedRoom ? ` -- seizing the deployed frame in ${seizedRoom.name}` : ''}.`);
+        // enterDrone FIRST: it sets the body's spot and cell aside from the
+        // actor's current values, which must still be the body's.
         const lines = enterDrone(this.scene, actor, drone, mode);
         if (seizedRoom && seizedRoom !== actor.currentLocation) {
             actor.currentLocation = seizedRoom;
@@ -83,6 +94,10 @@ export class JumpCommand extends Command {
         else if (flying) {
             lines.push(`The dog-brain stands down -- the stick is yours.`);
         }
+        if (flying) {
+            actor.atSpot = seizedSpot;
+            actor.atCell = seizedCell;
+        }
         this.scene.updateStatus();
         return lines.join('\n');
     }

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

@@ -2,6 +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';
 /**
  * What "you have nobody" says, one phrase per COMPANION KIND.
  *
@@ -93,7 +94,7 @@ export class OrderCommand extends Command {
         const cmd = commandWords.join(' ');
         // The feed wears its plane's colors (player request: what the
         // companion SEES should read as coming through its senses) -- the
-        // same visual language the HUD already speaks: yellow ✈ for a
+        // same visual language the HUD already speaks: amber ✈ for a
         // drone's sensor feed, magenta ✧ for a spirit's otherworldly report,
         // cyan ▣ for an agent on the grid.
         const feed = OrderCommand.FEED[entry.kind] ?? OrderCommand.FEED.ally;
@@ -137,7 +138,10 @@ export class OrderCommand extends Command {
             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'
-                    ? `${feed.icon} The ${entry.boundDevice?.name ?? entry.npc.name} banks once and settles back onto your hand, rotors folding.${entry.boundDevice && entry.boundDevice.droneDamage > 0 ? ` The airframe carries its dents (${entry.boundDevice.droneSummary()})${hint(' -- rest repairs it')}.` : ''}`
+                    // The same words "recall" 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.`}`
                     : 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.`;
@@ -211,7 +215,9 @@ export class OrderCommand extends Command {
     // kind fails the build here.
     static FEED = {
         spirit: { color: 'magenta', icon: '✧' },
-        drone: { color: 'yellow', icon: '✈' },
+        // The rigger's amber (drone-prose.ts): the same constant the HUD
+        // and the room map paint with.
+        drone: { color: DRONE_COLOUR, icon: DRONE_ICON },
         agent: { color: 'cyan', icon: '▣' },
         // A sprite is a Matrix construct and reads cyan like the agent.
         // Without a row of its own it fell through to `ally` and rendered

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

@@ -173,7 +173,7 @@ export class SheetCommand extends Command {
             ...(a.initiationGrade > 0 ? [row(a.isTechnomancer() ? 'Submersion' : 'Initiation', `grade ${a.initiationGrade} -- ${catalogMetamagics().filter(m => a.hasMetamagic(m.key)).map(m => m.name).join(', ')}`)] : []),
             ...(a.lockedFatigue > 0 ? [row('Fatigue', `${a.lockedFatigue} stun LOCKED until the need is met`)] : []),
             ...(a.woundModifier < 0 ? [row('Wounds', `${a.woundModifier} dice on everything`)] : []),
-            ...(a.sustainedArmor > 0 ? [row('Sustained', `armor +${a.sustainedArmor} soak (${sustainBurden(a.sustainedLedger().find(w => w.key === 'armor'))})`)] : []),
+            ...(a.sustainedArmor > 0 ? [row('Sustained', `armor +${a.sustainedArmor} soak (${a.wornSpellCaster('armor') ? `held by ${a.wornSpellCaster('armor').name}` : sustainBurden(a.sustainedLedger().find(w => w.key === 'armor' && w.bearer === undefined))})`)] : []),
         ];
         return lines.join('\n');
     }

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

@@ -70,14 +70,25 @@ export class SpellsCommand extends Command {
         // The cost per working is the engine's (Player.sustainedLedger): a
         // Focused Concentration holder reads "no penalty" here, not a
         // restated -2.
+        // The CASTER pays (p.282): a spell somebody else holds on you shows
+        // as worn, with the holder named; what you hold on others is listed
+        // after, with its bearer.
         const ledger = actor.sustainedLedger();
-        const burden = (key) => sustainBurden(ledger.find(w => w.key === key), ' to everything else');
+        const burden = (key) => {
+            const holder = actor.wornSpellCaster(key);
+            return holder ? `held by ${holder.name} -- their burden` : sustainBurden(ledger.find(w => w.key === key && w.bearer === undefined), ' to everything else');
+        };
         if (actor.sustainedArmor > 0) {
             lines.push(`Sustained: armor spell, +${actor.sustainedArmor} soak (${burden('armor')}).${hint(' Cast armor again to release.')}`);
         }
         if (actor.sustainedInvisibility) {
             lines.push(`Sustained: invisibility, +3 on sneak contests (${burden('invisibility')}).${hint(' Cast invisibility again to release.')}`);
         }
+        for (const w of ledger) {
+            if (w.bearer === undefined)
+                continue;
+            lines.push(`Sustaining on ${w.bearer}: ${w.key === 'reflexes' ? 'increase reflexes' : w.key} (${sustainBurden(w, ' to everything else')}).${hint(` Cast ${w.key} on ${w.bearer} again to release.`)}`);
+        }
         if (actor.sustainedBarrier) {
             lines.push(`Sustained: force barrier sealing ${actor.sustainedBarrier.direction} in ${actor.sustainedBarrier.roomName}, Force ${actor.sustainedBarrier.force} (${burden('barrier')}).${hint(' Cast barrier again to release.')}`);
         }

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

@@ -321,5 +321,20 @@
 //   blocks and is blocked like anyone, and the rigger's body keeps its own
 //   spot for jump-out. Two tables on different versions disagree about
 //   where a drone stands.
-export const ENGINE_VERSION = '1.35.0';
+// 1.36.0 (2026-09-06): JUMP-OUT LEAVES THE FRAME DEPLOYED. COMMAND SEMANTICS
+//   in shared scenes: "jump" (out) no longer autopilots the frame home -- it
+//   re-shells on its dog-brain where it was (SR5 p.266/p.268-269: the drone
+//   reverts to Pilot on jump-out; nothing flies it back), at the frame's
+//   cell, whether it was deployed first or jumped from the hand; "recall"
+//   brings it home. A WRECKED frame (forced dump) does not re-shell.
+//   Jumping into a deployed frame now lands you at the frame's cell, not
+//   your body's. The room map draws a jumped-in rigger as an amber ✈ at the
+//   frame and the slumped body as 👤; drone feed/HUD lines are amber
+//   (#ffbf00). "jobs", "accept", "decline" and "call taxi" refuse a
+//   non-human actor. Deploy reports the frame's real Pilot; very-large
+//   frames get their cargo cap; a frame you cannot carry follows the cab
+//   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';
 //# sourceMappingURL=engine-version.js.map

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

@@ -182,6 +182,7 @@ import { CALL_ICON, CALL_COLOR, END_CALL_SENTINEL } from './utilities/comm-style
 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';
 export default class Game {
     initialized;
     static instance;
@@ -1413,13 +1414,18 @@ export default class Game {
     }
     /**
      * The autonomous-drone shell, shared by the deploy command and
-     * arrival re-shelling: the frame's dog-brain (Pilot = 2 + quality)
-     * stands in for every attribute it lacks (RAW p.269-271).
+     * arrival re-shelling: the frame's dog-brain (Pilot: the row's, else
+     * 2 + quality -- Item.pilotRating) stands in for every attribute it
+     * lacks (RAW p.269-271).
      */
     // Cargo sling by frame class (player request: capacity enforced -- a
-    // palm-sized Fly-Spy is not a mule). Keyed by the frame Item's size.
+    // palm-sized Fly-Spy is not a mule). Keyed by the frame Item's size --
+    // the enum VALUE, and by the enum itself so a size the table forgets
+    // fails the build: this was a string map keyed `huge`, which is not a
+    // Size, while `'very large'` was missing, so every VeryLarge frame
+    // (a 400 kg Kodiak) fell to the 2 kg default -- less than a Medium.
     static DRONE_CARGO_KG = {
-        tiny: 0.5, small: 2, medium: 8, large: 20, huge: 40,
+        [Size.Tiny]: 0.5, [Size.Small]: 2, [Size.Medium]: 8, [Size.Large]: 20, [Size.VeryLarge]: 40,
     };
     deployDroneShell(item, room) {
         // The drone's own Pilot, Body and mount (catalog v13 vehicle block; the
@@ -1436,7 +1442,7 @@ export default class Game {
         // Take-command weight checks (Player.addInventory) enforce this cap
         // for the shell exactly as they do for a runner.
         if (shell)
-            shell.maxCarryingWeight = Game.DRONE_CARGO_KG[String(item.size)] ?? 2;
+            shell.maxCarryingWeight = Game.DRONE_CARGO_KG[item.size] ?? 2;
         return shell;
     }
     /** Drops a companion's shell and its roster entry. */
@@ -1622,7 +1628,12 @@ export default class Game {
                 }
             }
             else if (entry.kind === 'drone') {
-                lines.push(`The ${entry.boundDevice?.name ?? 'drone'} autopilots home to your hand for the ride.`);
+                // A frame you can carry rides with you; one you cannot (a 120 kg
+                // Steel Lynx, a 400 kg Kodiak) follows the cab on its own
+                // dog-brain and meets you at the curb (user ruling 2026-09-06;
+                // SR5 p.269 the Pilot drives). Same stash either way -- the
+                // shell re-lands at the arrival room -- only the words differ.
+                lines.push(entry.boundDevice ? droneFoldForTravelLine(entry.boundDevice) : `The drone folds for the ride.`);
                 if (entry.boundDevice)
                     this._pendingRedeploys.push(entry.boundDevice);
             }
@@ -1644,7 +1655,7 @@ export default class Game {
                 continue;
             const shell = this.deployDroneShell(item, this.player.currentLocation);
             if (shell)
-                lines.push(`The ${item.name}'s rotors spin back up at the curb.`);
+                lines.push(droneUnfoldAtCurbLine(item));
         }
         // EVERY registered sprite re-shells from the PAN (register.ts).
         // splice(0) drains the stash exactly once, the way the drone loop
@@ -3609,6 +3620,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         endPersona(this.player);
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
+        // A frame ridden into the cab is an Item in the pack again, not a
+        // companion (foldCompanionsForTravel ran first and never saw it), so
+        // unlike planes.leaveDrone this path re-shells nothing: the curb
+        // loop only re-lands what was folded.
         this.player.riggedDrone = undefined;
         this.player.astralPerceiving = false;
         this.player.sneaking = false;
@@ -5281,9 +5296,16 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // literal -2 until 2026-09-06, while sustainingPenalty was already
         // waiving a Focused Concentration holder's spell -- the HUD told the
         // player they were paying for what the pools were not charging.
+        //
+        // THE CASTER PAYS (p.282, 2026-09-06). A spell somebody else holds
+        // on this character is on their sheet as WORN -- soak and all --
+        // with the holder named and no cost; what this character holds on
+        // others rides the ledger below with its bearer named.
         const ledger = player.sustainedLedger();
+        const heldBy = (key) => player.wornSpellCaster(key)?.name;
         if (player.sustainedArmor > 0) {
-            lines.push(`{magenta-fg}Sustained: armor +${player.sustainedArmor} soak (${sustainBurden(ledger.find(w => w.key === 'armor'), ' to everything else')}){/magenta-fg}`);
+            const holder = heldBy('armor');
+            lines.push(`{magenta-fg}Sustained: armor +${player.sustainedArmor} soak (${holder ? `held by ${holder} -- their burden` : sustainBurden(ledger.find(w => w.key === 'armor' && w.bearer === undefined), ' to everything else')}){/magenta-fg}`);
         }
         // THE MAGE'S HALF OF THE SAME QUESTION (TNf9WrZGxCmCzqA4L, scope
         // completed by ruling).
@@ -5309,10 +5331,11 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // Naming it belongs with the condition monitors if it belongs
         // anywhere; that is a separate call and not this item's.
         const heldSpells = [];
+        const worn = (label, key) => heldSpells.push(heldBy(key) ? `${label} (held by ${heldBy(key)})` : label);
         if (player.sustainedInvisibility)
-            heldSpells.push('invisibility');
+            worn('invisibility', 'invisibility');
         if (player.sustainedReflexes)
-            heldSpells.push('increased reflexes');
+            worn('increased reflexes', 'reflexes');
         // The barriers say WHERE, because a wall you forgot you put up is
         // the one that strands the team -- and both of them seal an exit
         // that the caster cannot pass either.
@@ -5322,8 +5345,14 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         if (player.sustainedManaBarrier) {
             heldSpells.push(`mana barrier (${player.sustainedManaBarrier.roomName} ${player.sustainedManaBarrier.direction})`);
         }
+        // What this character holds on OTHERS -- the caster's burden, named
+        // by bearer so the mage knows whose armor is costing them two dice.
+        for (const w of ledger) {
+            if (w.bearer !== undefined)
+                heldSpells.push(`${w.key === 'reflexes' ? 'increased reflexes' : w.key} on ${w.bearer}`);
+        }
         if (heldSpells.length > 0) {
-            const these = ledger.filter(w => w.kind === 'spell' && w.key !== 'armor');
+            const these = ledger.filter(w => w.kind === 'spell' && !(w.key === 'armor' && w.bearer === undefined));
             lines.push(`{magenta-fg}✴ Sustained: ${heldSpells.join(', ')} (${sustainTotal(these)}){/magenta-fg}`);
         }
         // ACTIVE THREADS, WITHOUT ASKING (TNf9WrZGxCmCzqA4L: "instead of
@@ -5429,7 +5458,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             const drone = player.riggedDrone;
             const hull = drone ? `  Hull ${drone.droneSummary()}` : '';
             const mount = player.droneArmed ? ' ⌖ armed' : ' (recon -- no mounts)';
-            lines.push(`{yellow-fg}✈ JUMPED IN: ${drone?.name ?? 'drone'} ${(player.simMode ?? 'cold').toUpperCase()}-SIM${mount}${hull} -- body at ${player.bodyRoom?.name ?? '???'}{/yellow-fg}`);
+            // Amber, the rigger's colour (drone-prose.ts): the same hex the
+            // room map paints the jumped-in icon with.
+            lines.push(`{${DRONE_COLOUR}-fg}${DRONE_ICON} JUMPED IN: ${drone?.name ?? 'drone'} ${(player.simMode ?? 'cold').toUpperCase()}-SIM${mount}${hull} -- body at ${player.bodyRoom?.name ?? '???'}{/${DRONE_COLOUR}-fg}`);
         }
         return lines;
     }

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

@@ -10,6 +10,7 @@ import { spotsActive, spotOf, describeSpotRoster, spotDistanceMeters, spotCoverB
 import { classifyWeapon, rangePenalty, rangeBracketName } from '../utilities/range.js';
 import { priceOf } from '../utilities/commerce.js';
 import { catalogGear, ROLE_DOMAINS } from '../utilities/catalog.js';
+import { DRONE_COLOUR, DRONE_ICON } from '../utilities/drone-prose.js';
 /**
  * BARRIERS AT YOUR POST (a real session: a beaten sentry announced he
  * was "unlocking" a spell-sealed hatch he could never open -- his AI had
@@ -703,7 +704,9 @@ export class NPC extends Player {
     // HUD and order.ts speak.
     static LINK_STYLE = {
         spirit: { color: 'magenta', icon: '✧' },
-        drone: { color: 'yellow', icon: '✈' },
+        // The rigger's amber (drone-prose.ts): one constant for the feed,
+        // the HUD and the room map, so "amber" means one thing everywhere.
+        drone: { color: DRONE_COLOUR, icon: DRONE_ICON },
         agent: { color: 'cyan', icon: '▣' },
         // A sprite is a Matrix construct and relays cyan like the agent.
         // With no arm of its own it fell through to `ally` and a sprite
@@ -824,8 +827,8 @@ Available in-game commands (use with [COMMAND] prefix):
   "manabolt" (combat damage resisted by body, not armor), "heal [on <ally>]" (heal
   physical wounds -- your own by default, or an ally's in your room; healing a
   wounded ally is a strong support move), "armor [on <ally>]" (sustained protection
-  on yourself or an ally; its bearer gets +soak at -2 dice to all else; cast at them
-  again to release). EVERY cast costs drain -- stun damage to YOU the caster; fill
+  on yourself or an ally; its bearer gets +soak, and YOU carry -2 dice to all else
+  while you hold it; cast at them again to release). EVERY cast costs drain -- stun damage to YOU the caster; fill
   your stun track and you're out cold. Never cast if you're mundane with no magic gear.
 - cast — bare "cast" attempts to magically bypass the ward/barrier in this room
   without knowing the answer (requires the same talent or gear; failing burns the