@maka/maka-cli 5.129.0 → 5.130.0

package/bundle/typescript/package.json

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

@@ -5281,9 +5281,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 +5316,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 +5330,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

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

@@ -824,8 +824,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

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

@@ -3631,7 +3631,7 @@ export class Player extends AbstractPlayer {
             return;
         this._sustainedArmor = next;
         if (next === 0)
-            this.sustainedForces.delete('armor');
+            this.onSustainDropped('armor');
         // SUSTAINS BEAT ON FLIP (web report 2026-09-02: "I cast armor on myself
         // and don't see it in the sustained list"): the sheet only caught up on
         // the next unrelated beat. Every sustain mutator fires the hook now.
@@ -3682,8 +3682,27 @@ export class Player extends AbstractPlayer {
      * spells in `sustainedForces`.
      */
     sustainedWorkings() {
+        const mine = this.wornWorkings().filter(w => w.caster === undefined).map(({ caster: _c, ...w }) => w);
+        const onOthers = [];
+        for (const bearer of this.sustainedBearers) {
+            const held = bearer.wornWorkings().filter(w => w.caster === this);
+            if (held.length === 0) {
+                this.sustainedBearers.delete(bearer);
+                continue;
+            }
+            for (const { caster: _c, ...w } of held)
+                onOthers.push({ ...w, bearer: bearer.name });
+        }
+        return [...mine, ...onOthers];
+    }
+    /**
+     * Every working whose STATE is on this character, with who holds it
+     * up when that is somebody else. The bearer's view; sustainedWorkings
+     * is the holder's.
+     */
+    wornWorkings() {
         const spell = (key, force) => ({
-            key, kind: 'spell', force, category: spellFor(key)?.category.toLowerCase(),
+            key, kind: 'spell', force, category: spellFor(key)?.category.toLowerCase(), caster: this.sustainedCasters.get(key),
         });
         return [
             ...this.sustainedForms.map((f) => ({ key: f.key, kind: 'form', force: f.level })),
@@ -3749,15 +3768,22 @@ export class Player extends AbstractPlayer {
         }
     }
     releaseSustainedWorkings() {
-        const count = this.sustainedWorkings().length;
-        this.sustainedForms = [];
-        this._sustainedArmor = 0;
-        this.sustainedInvisibility = false;
-        this.sustainedReflexes = false;
-        this.sustainedBarrier = undefined;
-        this.sustainedManaBarrier = undefined;
-        this.sustainedForces.clear();
-        return count;
+        // What this character HOLDS -- their own, and what they hold on
+        // others (which ends on the bearer). A spell somebody else holds on
+        // this character is that caster's concentration, and sleeping in
+        // it does not break it.
+        const held = this.sustainedWorkings();
+        for (const w of held) {
+            if (w.bearer === undefined) {
+                this.dropSustainedWorking(w.key);
+                continue;
+            }
+            for (const bearer of this.sustainedBearers) {
+                if (bearer.name === w.bearer)
+                    bearer.dropSustainedWorking(w.key);
+            }
+        }
+        return held.length;
     }
     // The other sustained spells (RAW gear/spell pass): invisibility bends
     // light around the bearer (+3 on sneak contests, npc.ts), increase
@@ -3770,7 +3796,7 @@ export class Player extends AbstractPlayer {
             return;
         this._sustainedInvisibility = v;
         if (!v)
-            this.sustainedForces.delete('invisibility');
+            this.onSustainDropped('invisibility');
         this.noteConditionChanged();
     }
     _sustainedReflexes = false;
@@ -3780,9 +3806,72 @@ export class Player extends AbstractPlayer {
             return;
         this._sustainedReflexes = v;
         if (!v)
-            this.sustainedForces.delete('reflexes');
+            this.onSustainDropped('reflexes');
         this.noteConditionChanged();
     }
+    /**
+     * WHO HOLDS A SPELL THAT IS ON THIS CHARACTER, when it is not them
+     * (2026-09-06: "bill the caster, not the bearer"). SR5 p.282 puts the
+     * -2 on whoever SUSTAINS the spell; the subject only wears it. Until
+     * this the engine taxed the bearer -- a mundane street sam with an
+     * ally's armor on them lost two dice off every pool, and the mage
+     * holding it up paid nothing.
+     *
+     * The effect state stays on the bearer (that is what grants the
+     * soak); this map is the other half, and the caster's ledger reads
+     * it through `sustainedBearers`. Session-only, like every sustain.
+     */
+    sustainedCasters = new Map();
+    /** The characters this one holds a spell on. Pruned at read time. */
+    sustainedBearers = new Set();
+    /** Record that `caster` is the one holding `key` up on this character. */
+    sustainedBy(key, caster) {
+        if (caster === this) {
+            this.sustainedCasters.delete(key);
+            return;
+        }
+        this.sustainedCasters.set(key, caster);
+        caster.sustainedBearers.add(this);
+        caster.noteConditionChanged();
+    }
+    /** The caster holding `key` on this character, when it is somebody else. */
+    wornSpellCaster(key) {
+        return this.sustainedCasters.get(key);
+    }
+    /** Bookkeeping when a spell on this character ends, whoever ended it. */
+    onSustainDropped(key) {
+        this.sustainedForces.delete(key);
+        const caster = this.sustainedCasters.get(key);
+        if (caster) {
+            this.sustainedCasters.delete(key);
+            caster.noteConditionChanged();
+        }
+    }
+    /** End one working by key, whatever kind it is. */
+    dropSustainedWorking(key) {
+        switch (key) {
+            case 'armor':
+                this.setSustainedArmor(0);
+                return;
+            case 'invisibility':
+                this.sustainedInvisibility = false;
+                return;
+            case 'reflexes':
+                this.sustainedReflexes = false;
+                return;
+            case 'barrier':
+                this.sustainedBarrier = undefined;
+                return;
+            case 'manabarrier':
+                this.sustainedManaBarrier = undefined;
+                return;
+            default: {
+                const i = this.sustainedForms.findIndex(f => f.key === key);
+                if (i >= 0)
+                    this.sustainedForms.splice(i, 1);
+            }
+        }
+    }
     /** The sustained PHYSICAL BARRIER spell (ruling 2026-08-24): seals
      *  one exit of one room while held -- go.ts and move refuse passage
      *  for everyone (the caster included; walls don't play favorites).
@@ -3793,6 +3882,8 @@ export class Player extends AbstractPlayer {
         if (this._sustainedBarrier === v)
             return;
         this._sustainedBarrier = v;
+        if (!v)
+            this.onSustainDropped('barrier');
         this.noteConditionChanged();
     }
     /** The MANA BARRIER twin (canon p.294, RAG-checked): blocks SPIRITS
@@ -3804,6 +3895,8 @@ export class Player extends AbstractPlayer {
         if (this._sustainedManaBarrier === v)
             return;
         this._sustainedManaBarrier = v;
+        if (!v)
+            this.onSustainDropped('manabarrier');
         this.noteConditionChanged();
     }
     // THREADED COMPLEX FORMS (M4.15, see commands/thread.ts): the

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

@@ -105,7 +105,18 @@ export function parseCatalogVersion(raw) {
     const n = Number(raw);
     return Number.isFinite(n) ? n : undefined;
 }
+/**
+ * Set by resetCatalogForTest and never cleared: a suite that has reset
+ * the catalog wants ONLY what it applies. Found 2026-09-06, the day the
+ * developer's cache moved to v17 -- every fixture pinned at 16 lost the
+ * "highest version wins" contest to a file in the home directory, and
+ * eleven accessor tests went red on one machine and green on every
+ * other. Exactly the failure the note above says a test must not have.
+ */
+let diskCacheDisabled = false;
 function readCache() {
+    if (diskCacheDisabled)
+        return undefined;
     try {
         const parsed = JSON.parse(fs.readFileSync(cachePath(), 'utf8'));
         if (Array.isArray(parsed?.items) && parsed.items.length > 0)
@@ -571,6 +582,10 @@ export function resetCatalogForTest() {
     liveSource = undefined;
     resolved = undefined;
     fetchAttempted = false;
+    // The machine's cache is out of the contest from here on: a fixture
+    // applied after this is the whole catalog, whatever version it says.
+    // A test that wants a cache passes its own reader (CacheReader).
+    diskCacheDisabled = true;
     resetCatalogIndexes();
 }
 /**

package/package.json

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