@maka/maka-cli 5.64.0 → 5.65.0

package/bundle/typescript/src/commands/game/sideQuest/commands/buy.d.ts

@@ -11,6 +11,14 @@ export declare class BuyCommand extends Command implements ICommand {
     protected static verb: string;
     protected static description: string;
     execute(args?: string[]): Promise<string>;
+    /**
+     * The shelf, flattened in PRINT ORDER across every vendor in the room
+     * -- the list "buy <n>" indexes into. One function so the numbers a
+     * player reads and the numbers the parser honours cannot drift apart:
+     * browse() and purchase() both call it rather than each walking the
+     * vendors themselves.
+     */
+    private shelf;
     private browse;
     /** Is what they asked for inside a present contact's TRADE (the same
      *  domain list their AI is briefed on in npc.ts)? Returns the item

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

@@ -2,6 +2,8 @@ import { Command } from './command.js';
 import { hint } from '../utilities/hints.js';
 import { priceOf, vendorsInRoom, waresOf, shelfNote } from '../utilities/commerce.js';
 import { findCatalogItem, ROLE_DOMAINS } from '../utilities/catalog.js';
+import { optionMark } from '../utilities/log-style.js';
+import { fuzzyPickName } from '../utilities/fuzzy-match.js';
 /**
  * Diegetic shopping: "browse" (or bare "buy") in a vendor's room reads
  * their shelves with live prices; "buy <item>" slides the nuyen across
@@ -31,19 +33,36 @@ export class BuyCommand extends Command {
         }
         return this.purchase(args.join(' '), vendors);
     }
+    /**
+     * The shelf, flattened in PRINT ORDER across every vendor in the room
+     * -- the list "buy <n>" indexes into. One function so the numbers a
+     * player reads and the numbers the parser honours cannot drift apart:
+     * browse() and purchase() both call it rather than each walking the
+     * vendors themselves.
+     */
+    shelf(vendors) {
+        const out = [];
+        for (const vendor of vendors) {
+            for (const item of waresOf(this.actor.currentLocation, vendor.name))
+                out.push(item);
+        }
+        return out;
+    }
     browse(vendors, room) {
         const lines = [];
+        let nth = 0;
         for (const vendor of vendors) {
             const wares = waresOf(this.actor.currentLocation, vendor.name);
             lines.push(`${vendor.name}'s wares:`);
             for (const item of wares) {
+                nth += 1;
                 const price = priceOf(item);
                 const dots = '.'.repeat(Math.max(2, 28 - item.name.length));
-                lines.push(`  ${item.name} ${dots} ${price} nuyen${shelfNote(item)}`);
+                lines.push(`${optionMark(nth)}${item.name} ${dots} ${price} nuyen${shelfNote(item)}`);
             }
         }
         lines.push('');
-        lines.push(`You're carrying ${this.actor.currency} nuyen.${hint(` "buy <item>" to make it yours.`)}`);
+        lines.push(`You're carrying ${this.actor.currency} nuyen.${hint(` "buy <item>" -- or "buy <number>" off this list.`)}`);
         this.logger.write(`BuyCommand: ${this.actor.name} browsed in ${room.name}.`);
         return lines.join('\n');
     }
@@ -71,6 +90,15 @@ export class BuyCommand extends Command {
     purchase(wanted, vendors) {
         const actor = this.actor;
         const room = actor.currentLocation;
+        // "buy 3" -- the row browse() printed. Resolved through the shared
+        // resolver against the same flattened shelf, so the index can only
+        // ever mean what was on screen. A name that IS a number still wins
+        // (see fuzzy-match.ts), and an out-of-range number falls through to
+        // the ordinary not-on-the-shelf refusal.
+        const shelf = this.shelf(vendors);
+        const byIndex = fuzzyPickName(wanted, shelf.map(i => i.name), { index: true });
+        if (byIndex)
+            wanted = byIndex;
         const item = room.inventory.getItem(wanted) ?? undefined;
         if (!item) {
             // NOT ON THE SHELF IS NOT THE SAME AS NOT AVAILABLE (playtest

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

@@ -1 +1 @@
-{"version":3,"file":"buy.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/buy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buy.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/buy.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/game/sideQuest/commands/bypass-command.d.ts

@@ -1,61 +1,52 @@
 import { Command, ICommand } from './command.js';
-import { PuzzleBypassType } from '../types/seed/puzzle-seed.js';
-import { PuzzleTarget } from '../models/room.js';
+import { Device } from '../models/device.js';
 /**
- * Shared implementation for pick/hack/cast/bluff. The gate check (already
- * solved? prerequisite met? does this puzzle even have this bypassType?
- * route already burned?) always runs first and synchronously, so a doomed
- * attempt never makes the player sit through an interactive challenge they
- * were never going to be allowed to attempt. Each concrete command differs
- * in its verb, description, bypass type, the "nothing to do that to"
- * message, how the outcome gets determined (see determineOutcome() --
- * every real bypass overrides it with a skill roll), and what failure
- * costs beyond the burned route (onBypassFailure()).
+ * Shared implementation for pick/breach/hack/cast/dispel -- FORCING a
+ * device rather than opening it the way it was meant to open.
+ *
+ * The gate check (is it already open? does this verb even bite on this
+ * kind of thing?) always runs first and synchronously, so a doomed
+ * attempt never makes the player sit through an interactive challenge
+ * they were never going to be allowed to attempt. Each concrete command
+ * differs in its verb, the kind of device it works, the "nothing to do
+ * that to" message, how the outcome gets determined (see
+ * determineOutcome() -- every real one overrides it with a skill roll),
+ * and what failure costs beyond the noise (onForceFailure()).
+ *
+ * WHAT LEFT WITH THE PUZZLE MECHANIC: there is no burned route any
+ * more. A lock you failed to pick is a lock you can try again, which is
+ * what a lock IS -- the one-shot shortcut was a property of a riddle
+ * pretending to be an object. Failure is still loud and still raises
+ * the world; it just doesn't spend the thing.
  */
 export declare abstract class BypassCommand extends Command implements ICommand {
-    protected abstract bypassType: PuzzleBypassType;
-    protected abstract noPuzzleMessage: string;
+    /** The kind of device this verb works. */
+    protected abstract deviceKind: Device['kind'];
+    protected abstract noDeviceMessage: string;
     /** The word the player typed -- used in disambiguation prompts. Two
-     * commands can share a bypassType (pick and breach both work 'lockpick'
-     * barriers), so this can't be derived from the type. */
+     * commands can share a kind (pick and breach both work a lock), so
+     * this can't be derived from it. */
     protected abstract verbName: string;
-    /** Optional: replaces the puzzle's stock per-type failure line -- for a
-     * verb that shares a bypassType but fails differently (a breach doesn't
-     * snap a pick). */
+    /** Optional: replaces the stock per-kind failure line -- for a verb
+     * that shares a kind but fails differently (a breach doesn't snap a
+     * pick). */
     protected failureFlavor?: string;
-    /** Optional: same idea one step later. The puzzle stores ONE burned
-     * flag per barrier and words it per TYPE, so a barrier burned by a
-     * breach used to re-refuse a breach with the snapped-pick line -- a
-     * pick the player never owned (playtest 2026-08-27). A verb that
-     * shares a bypassType but burns differently says so here. */
-    protected burnedFlavor?: string;
-    /** Fallback: a flat coin flip. Every real bypass overrides this with a
-     * skill roll (pick: Agility+locksmith, hack: Logic+hacking, bluff:
-     * Charisma+con, cast: the casting pool). */
+    /** Fallback: a flat coin flip. Every real one overrides this with a
+     *  skill roll. */
     protected determineOutcome(): Promise<boolean>;
+    /** Type-specific teeth for a failed forcing, beyond the noise.
+     *  Returns narration lines. */
+    protected onForceFailure(): Promise<string[]>;
+    /** Type-specific consequences of a forcing that WORKED, before the
+     *  success message renders (see breach.ts: smashing through is loud
+     *  whether or not it gives). */
+    protected onForceSuccess(device: Device): Promise<string[]>;
     /**
-     * Type-specific teeth for a failed bypass, beyond the burned route and
-     * the alarm world event both applied by execute(). Returns narration
-     * lines. Default: nothing extra -- the cost of a snapped pick or a blown
-     * story is the burned shortcut and a district that heard about it. The
-     * spell bypass overrides this with ward backlash (see cast.ts), which
-     * runs through the real damage tracks and can still knock out or kill.
-     */
-    protected onBypassFailure(): Promise<string[]>;
-    /**
-     * Type-specific consequences of a bypass that WORKED, before the success
-     * message renders. Default: nothing -- picking, hacking, and bluffing
-     * are quiet when they land. The forceful bypass overrides this (see
-     * breach.ts): smashing through a barrier is loud whether or not it
-     * gives, so success still raises the world and ends any sneak.
-     */
-    protected onBypassSuccess(target: PuzzleTarget): Promise<string[]>;
-    /**
-     * There's no typed answer here to disambiguate with (unlike solve.ts),
-     * so with more than one barrier in the room the player has to name which
-     * one: a direction ("pick north", for a locked door) or a word from the
-     * barrier's own name ("pick maglock"). With only one candidate, a bare
-     * "pick" still works exactly as before.
+     * There's no typed answer here to disambiguate with, so with more
+     * than one device in the room the player has to name which one: a
+     * direction ("pick north", for a device holding a door) or a word
+     * from its own name ("pick maglock"). With only one candidate, a bare
+     * "pick" still works.
      */
     private resolveTarget;
     execute(args: string[]): Promise<string>;

package/bundle/typescript/src/commands/game/sideQuest/commands/bypass-command.js

@@ -1,64 +1,55 @@
 import { Command } from './command.js';
 import { exitSpot, ensureAtSpot } from '../utilities/spots.js';
+import { applyDeviceOpened } from '../utilities/devices.js';
 /**
- * Shared implementation for pick/hack/cast/bluff. The gate check (already
- * solved? prerequisite met? does this puzzle even have this bypassType?
- * route already burned?) always runs first and synchronously, so a doomed
- * attempt never makes the player sit through an interactive challenge they
- * were never going to be allowed to attempt. Each concrete command differs
- * in its verb, description, bypass type, the "nothing to do that to"
- * message, how the outcome gets determined (see determineOutcome() --
- * every real bypass overrides it with a skill roll), and what failure
- * costs beyond the burned route (onBypassFailure()).
+ * Shared implementation for pick/breach/hack/cast/dispel -- FORCING a
+ * device rather than opening it the way it was meant to open.
+ *
+ * The gate check (is it already open? does this verb even bite on this
+ * kind of thing?) always runs first and synchronously, so a doomed
+ * attempt never makes the player sit through an interactive challenge
+ * they were never going to be allowed to attempt. Each concrete command
+ * differs in its verb, the kind of device it works, the "nothing to do
+ * that to" message, how the outcome gets determined (see
+ * determineOutcome() -- every real one overrides it with a skill roll),
+ * and what failure costs beyond the noise (onForceFailure()).
+ *
+ * WHAT LEFT WITH THE PUZZLE MECHANIC: there is no burned route any
+ * more. A lock you failed to pick is a lock you can try again, which is
+ * what a lock IS -- the one-shot shortcut was a property of a riddle
+ * pretending to be an object. Failure is still loud and still raises
+ * the world; it just doesn't spend the thing.
  */
 export class BypassCommand extends Command {
-    /** Optional: replaces the puzzle's stock per-type failure line -- for a
-     * verb that shares a bypassType but fails differently (a breach doesn't
-     * snap a pick). */
+    /** Optional: replaces the stock per-kind failure line -- for a verb
+     * that shares a kind but fails differently (a breach doesn't snap a
+     * pick). */
     failureFlavor;
-    /** Optional: same idea one step later. The puzzle stores ONE burned
-     * flag per barrier and words it per TYPE, so a barrier burned by a
-     * breach used to re-refuse a breach with the snapped-pick line -- a
-     * pick the player never owned (playtest 2026-08-27). A verb that
-     * shares a bypassType but burns differently says so here. */
-    burnedFlavor;
-    /** Fallback: a flat coin flip. Every real bypass overrides this with a
-     * skill roll (pick: Agility+locksmith, hack: Logic+hacking, bluff:
-     * Charisma+con, cast: the casting pool). */
+    /** Fallback: a flat coin flip. Every real one overrides this with a
+     *  skill roll. */
     async determineOutcome() {
         return Math.random() < 0.5;
     }
-    /**
-     * Type-specific teeth for a failed bypass, beyond the burned route and
-     * the alarm world event both applied by execute(). Returns narration
-     * lines. Default: nothing extra -- the cost of a snapped pick or a blown
-     * story is the burned shortcut and a district that heard about it. The
-     * spell bypass overrides this with ward backlash (see cast.ts), which
-     * runs through the real damage tracks and can still knock out or kill.
-     */
-    async onBypassFailure() {
+    /** Type-specific teeth for a failed forcing, beyond the noise.
+     *  Returns narration lines. */
+    async onForceFailure() {
         return [];
     }
-    /**
-     * Type-specific consequences of a bypass that WORKED, before the success
-     * message renders. Default: nothing -- picking, hacking, and bluffing
-     * are quiet when they land. The forceful bypass overrides this (see
-     * breach.ts): smashing through a barrier is loud whether or not it
-     * gives, so success still raises the world and ends any sneak.
-     */
-    async onBypassSuccess(target) {
-        void target;
+    /** Type-specific consequences of a forcing that WORKED, before the
+     *  success message renders (see breach.ts: smashing through is loud
+     *  whether or not it gives). */
+    async onForceSuccess(device) {
+        void device;
         return [];
     }
     /**
-     * There's no typed answer here to disambiguate with (unlike solve.ts),
-     * so with more than one barrier in the room the player has to name which
-     * one: a direction ("pick north", for a locked door) or a word from the
-     * barrier's own name ("pick maglock"). With only one candidate, a bare
-     * "pick" still works exactly as before.
+     * There's no typed answer here to disambiguate with, so with more
+     * than one device in the room the player has to name which one: a
+     * direction ("pick north", for a device holding a door) or a word
+     * from its own name ("pick maglock"). With only one candidate, a bare
+     * "pick" still works.
      */
-    resolveTarget(args, targets) {
-        // "cast at hatch" / "pick at the maglock" -- connectives are free.
+    resolveTarget(args, devices) {
         let words = [...args];
         if (words[0]?.toLowerCase() === 'at')
             words = words.slice(1);
@@ -66,160 +57,130 @@ export class BypassCommand extends Command {
             words = words.slice(1);
         const raw = words.join(' ').trim().toLowerCase();
         if (!raw) {
-            if (targets.length === 1)
-                return { target: targets[0] };
-            const options = targets.map(t => t.direction ?? t.label).join(', ');
+            if (devices.length === 1)
+                return { device: devices[0] };
+            const options = devices.map(d => d.opensExit ?? d.name).join(', ');
             return { error: `There's more than one thing to ${this.verbName} at here -- say which: ${options}.` };
         }
         if (this.isValidDirection(raw)) {
-            const match = targets.find(t => t.direction === raw);
-            return match ? { target: match } : { error: `There's nothing to bypass in that direction.` };
+            const match = devices.find(d => d.opensExit === raw);
+            return match ? { device: match } : { error: `There's nothing to force in that direction.` };
         }
-        // The barrier's own riddle names what it IS ("hatch", "glyph",
-        // "terminal") -- players target those nouns, not the puzzle's title
-        // (a real session tried "cast manabolt at hatch" three ways and
-        // bounced every time).
-        const matches = targets.filter(t => t.label.toLowerCase().includes(raw)
-            || (t.puzzle.riddle ?? '').toLowerCase().includes(raw));
+        const matches = devices.filter(d => d.name.toLowerCase().includes(raw)
+            || d.description.toLowerCase().includes(raw));
         if (matches.length === 1)
-            return { target: matches[0] };
+            return { device: matches[0] };
         if (matches.length > 1)
             return { error: `That could mean more than one thing here -- be more specific.` };
-        // Generic barrier words land when there's only one thing here anyway.
-        if (targets.length === 1 && /^(lock|door|ward|barrier|seal|gate|hatch|glyph|field|sigil|way|node|terminal)$/.test(raw)) {
-            return { target: targets[0] };
+        // Generic words land when there's only one thing here anyway.
+        if (devices.length === 1 && /^(lock|door|ward|barrier|seal|gate|hatch|glyph|field|sigil|way|node|terminal|panel|keypad)$/.test(raw)) {
+            return { device: devices[0] };
         }
         return { error: `There's nothing here called "${raw}".` };
     }
     async execute(args) {
         const room = this.actor.currentLocation;
-        const allTargets = room?.getPuzzleTargets() ?? [];
+        const all = room?.openableDevices() ?? [];
         // THE ONLY HONEST "nothing here" (blocker 2026-08-27, "the barrier
         // isn't allowing me to hack/pick/breach it"): the room holds no
-        // barrier at all. This used to filter by bypassType FIRST, which
-        // made a wrong verb indistinguishable from an empty room -- so a
-        // ward or a doorman answered ALL FOUR physical verbs with "there's
-        // nothing here to pick/breach/hack", denying to the player's face
-        // that the door they were staring at existed. checkBypassGate()
-        // has always had the right answer for a mismatch; nothing ever
-        // reached it. Now the filter only picks a PREFERRED target, and
-        // every refusal goes through the gate.
-        if (allTargets.length === 0) {
-            return this.noPuzzleMessage;
+        // device at all. Filtering by KIND first made a wrong verb
+        // indistinguishable from an empty room, so a ward answered every
+        // physical verb by denying the door the player was staring at
+        // existed. Now the filter only picks a PREFERRED target and every
+        // refusal goes through canForce().
+        if (all.length === 0) {
+            return this.noDeviceMessage;
         }
-        // WHO PICKS THE TARGET depends on whether the player named one.
-        //
-        // Bare "pick" in a room holding a maglock and a ward means the
-        // maglock -- so with no words to go on, prefer the barriers this
-        // verb actually works, exactly as before.
-        //
-        // But "pick terminal" NAMES a thing, and the name settles which
-        // object is meant before the verb gets a say. Resolving that
-        // against same-type targets only was quietly wrong: resolveTarget's
-        // generic-noun fallback ("lock", "door", "terminal"...) fires
-        // whenever the candidate list has exactly one entry, so naming the
-        // terminal in a mixed room picked the MAGLOCK instead -- the right
-        // verb aimed at the wrong barrier, and it opened. Named targets
-        // therefore resolve against every barrier here; the gate below
-        // decides whether the verb suits the thing the player pointed at.
-        const mine = allTargets.filter(t => t.puzzle.bypassType === this.bypassType);
+        // WHO PICKS THE TARGET depends on whether the player named one. A
+        // bare "pick" in a room holding a maglock and a ward means the
+        // maglock. But "pick terminal" NAMES a thing, and the name settles
+        // which object is meant before the verb gets a say.
+        const mine = all.filter(d => d.kind === this.deviceKind);
         const named = args.length > 0;
-        const primary = named ? allTargets : (mine.length > 0 ? mine : allTargets);
-        const { target: preferred, error } = this.resolveTarget(args, primary);
-        let target = preferred;
-        if (!target && named && mine.length > 0) {
-            // The name matched nothing room-wide. Retry against this verb's
-            // own barriers, which keeps the generic-noun convenience alive
-            // ("pick door" with one lock and one terminal still means the
-            // lock) without letting it hijack a name that DID match.
-            target = this.resolveTarget(args, mine).target;
+        const primary = named ? all : (mine.length > 0 ? mine : all);
+        const { device: preferred, error } = this.resolveTarget(args, primary);
+        let device = preferred;
+        if (!device && named && mine.length > 0) {
+            device = this.resolveTarget(args, mine).device;
         }
-        if (!target) {
-            return error ?? this.noPuzzleMessage;
+        if (!device) {
+            return error ?? this.noDeviceMessage;
         }
-        // GATE BEFORE THE WALK (2026-08-27): the gate is pure and
-        // synchronous, so a doomed attempt should cost nothing at all --
-        // and marching the player across the room only to tell them the
-        // verb was wrong is its own small insult. The class contract
-        // already said the gate "always runs first"; now it does.
-        const gate = target.puzzle.checkBypassGate(this.bypassType);
+        // GATE BEFORE THE WALK: the gate is pure and synchronous, so a
+        // doomed attempt costs nothing at all -- and marching the player
+        // across the room only to tell them the verb was wrong is its own
+        // small insult.
+        const gate = device.canForce(this.verbName);
         if (!gate.allowed) {
-            if (gate.reason === 'burned' && this.burnedFlavor)
-                return this.burnedFlavor;
             return gate.message ?? `You can't do that here.`;
         }
-        // "At" spots (user request: "cannot pick a doorlock from across the
-        // room"): a barrier has a PLACE -- a door's is its exit spot, a
-        // room puzzle carries its own atSpot. Out of combat you simply walk
-        // over (ensureAtSpot); mid-exchange the crossing refuses.
-        const barrierSpot = target.door && target.direction
-            ? exitSpot(room, target.direction)
-            : target.puzzle.atSpot;
-        const reach = ensureAtSpot(this.actor, barrierSpot);
+        // "At" spots: a device has a PLACE -- either its own atSpot, or the
+        // exit it holds. Out of combat you simply walk over; mid-exchange
+        // the crossing refuses.
+        // ATSPOT FIRST -- coordinator ruling 2026-08-27, reversing the
+        // original spec (`exitSpot(...) ?? atSpot`).
+        //
+        // atSpot is an AUTHOR'S EXPLICIT PLACEMENT; exitSpot is INFERRED.
+        // The migration only fills a device's atSpot from its exit's when
+        // the device had none of its own, so a device carrying BOTH means
+        // the seed said two different things -- and preferring the
+        // inference over the statement inverts the point of having the
+        // field. Generation starts emitting both once the generator moves
+        // to devices, so this is a decision about the future, not about
+        // the three seeds that exist today.
+        //
+        // It also keeps the refusal and the walk from contradicting each
+        // other: a locked door's refusal names WHERE THE MECHANISM IS, so
+        // walking the player somewhere else to touch it would say two
+        // things in one breath.
+        //
+        // NOT the pre-flip code's rule. bypass-command used to branch on
+        // door-ness (`door && direction ? exitSpot(...) : atSpot`); both
+        // call sites now ??-chain and agree with EACH OTHER, and with
+        // neither the old code nor the original spec. Do not "fix" one to
+        // match something older.
+        const where = device.atSpot
+            ?? (device.opensExit ? exitSpot(room, device.opensExit) : undefined);
+        const reach = ensureAtSpot(this.actor, where);
         if (reach.refusal)
             return reach.refusal;
         const crossNote = reach.line ? `${reach.line}\n` : '';
         const succeeded = await this.determineOutcome();
-        const result = target.puzzle.resolveBypass(this.bypassType, succeeded);
+        const result = device.force(succeeded);
         if (!result.success && this.failureFlavor) {
             result.message = this.failureFlavor;
         }
-        let successConsequence = [];
+        let consequence = [];
         if (result.success) {
-            successConsequence = await this.onBypassSuccess(target);
-            if (target.door) {
-                target.door.isLocked = false;
-                this.scene.updateExits(room);
-                this.scene.addWorldEvent(`${this.actor.name} bypassed (${this.bypassType}) the way ${target.direction} in ${room.name}.`);
-            }
-            else if (target.puzzle.rewardItem) {
-                this.actor.inventory.addItem(target.puzzle.rewardItem);
-                this.scene.addWorldEvent(`${this.actor.name} bypassed "${target.puzzle.name}" (${this.bypassType}) in ${room.name}.`);
-                this.scene.updateInventory(this.scene.getPlayer().inventory);
-            }
-            // ROOM GRIDS (spatial wave 2026-08-25): the same terrain-clearing
-            // solve.ts does -- a bypass is just the risky route to the same
-            // outcome. A silent no-op for the overwhelming majority of
-            // puzzles that never synthesized blocking terrain.
-            const opened = room.clearTerrainFor(target.puzzle.name);
-            if (opened) {
-                successConsequence.push(`The ${opened} comes apart -- the way through is open.`);
-                this.scene.addWorldEvent(`${this.actor.name} cleared ${opened} in ${room.name} by bypassing "${target.puzzle.name}".`);
-            }
+            consequence = await this.onForceSuccess(device);
+            // ONE HOME FOR WHAT HAPPENS WHEN A DEVICE OPENS (see
+            // utilities/devices.ts). This and use.ts used to hand-roll the
+            // same four side effects and had already drifted apart.
+            consequence.push(...applyDeviceOpened(this.scene, this.actor, room, device, this.verbName));
         }
         if (result.alarmed) {
-            // The consequence for a failed bypass: NPCs already listen for world
-            // events (see scene.ts's getWorldEventsSummary()), so this alone lets
-            // them react organically without a dedicated alarm/alert subsystem.
-            this.scene.addWorldEvent(`${this.actor.name}'s ${this.bypassType} attempt on "${target.puzzle.name}" in ${room.name} went loud.`);
-            // And the DISTRICT hears it too (heat -- SINs & getting caught).
-            this.game?.addHeat(2, `${this.bypassType} alarm on "${target.puzzle.name}"`);
+            // NPCs already listen for world events (scene.ts's
+            // getWorldEventsSummary()), so this alone lets them react without
+            // a dedicated alarm subsystem.
+            this.scene.addWorldEvent(`${this.actor.name}'s ${this.verbName} attempt on "${device.name}" in ${room.name} went loud.`);
+            this.game?.addHeat(2, `${this.verbName} alarm on "${device.name}"`);
         }
-        this.logger.write(`${this.actor.name} attempted to ${this.bypassType} "${target.puzzle.name}": ${result.success ? 'success' : 'failure'}${result.alarmed ? ' (alarmed)' : ''}`);
-        // The VERB, not the shared bypassType (2026-08-24 playtest: a
-        // BREACH was announced as "lockpicked" -- breach and pick share the
-        // 'lockpick' type but not the fiction).
+        this.logger.write(`${this.actor.name} attempted to ${this.verbName} "${device.name}": ${result.success ? 'success' : 'failure'}${result.alarmed ? ' (alarmed)' : ''}`);
         this.actor.performAction(this.verbName, result.message);
-        // A failed bypass used to be instant, unrecoverable death by fiat --
-        // no dice, no damage, just endGame(). Replaced (after a real session
-        // died to it) with consequences that run through the systems that now
-        // exist: the route BURNS (puzzle.bypassBurned -- this trick never works
-        // on this barrier again; the findable answer still does), the alarm
-        // world event above puts every NPC on notice, any sneak is over, and
-        // the type-specific teeth in onBypassFailure() (spell backlash damage,
-        // see cast.ts) can still put you down -- but through the damage
-        // tracks, resisted and narrated, not by administrative decree.
         if (result.alarmed) {
             this.actor.sneaking = false;
-            const consequence = await this.onBypassFailure();
+            const teeth = await this.onForceFailure();
             this.scene.updateStatus();
             return crossNote + [
                 result.message,
-                `  The route is BURNED -- that trick will never work on this barrier again. The real answer still will, if you can find it.`,
-                ...consequence,
+                // NO BURN LINE any more: the route is not spent. Say what IS
+                // true -- it held, and the noise carried -- rather than
+                // promising a permanence that no longer exists.
+                `  It holds. You can try again, but the noise has already carried.`,
+                ...teeth,
             ].join('\n');
         }
-        return crossNote + [result.message, ...successConsequence].join('\n');
+        return crossNote + [result.message, ...consequence].join('\n');
     }
 }
 //# sourceMappingURL=bypass-command.js.map

package/bundle/typescript/src/commands/game/sideQuest/commands/bypass-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"bypass-command.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/bypass-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bypass-command.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/bypass-command.ts"],"names":[],"mappings":"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"}