@maka/maka-cli 5.3.17 → 5.5.0

package/bundle/typescript/src/commands/game/sideQuest/types/player-equipment.d.ts

@@ -9,6 +9,7 @@ export type HeadEquipment = {
     commlink: Item | null;
 };
 export type TorsoEquipment = {
+    clothing: Item | null;
     armorVest: Item | null;
     armorCoat: Item | null;
     backpack: Item | null;

package/bundle/typescript/src/commands/game/sideQuest/types/seed/exit-seed.d.ts

@@ -3,4 +3,5 @@ export interface IExitSeedJson {
     targetRoom: string;
     keyRequired?: string;
     doorName?: string;
+    puzzle?: string;
 }

package/bundle/typescript/src/commands/game/sideQuest/types/seed/item-seed.d.ts

@@ -20,4 +20,5 @@ export interface IItemSeedJson {
     heldBy?: string;
     owner?: string;
     transferable?: boolean;
+    plane?: 'meat' | 'matrix' | 'astral';
 }

package/bundle/typescript/src/commands/game/sideQuest/types/seed/npc-seed.d.ts

@@ -2,5 +2,6 @@ import { IPlayerSeedJson } from './player-seed.js';
 export interface INPCSeedJson {
     dialogue?: string[];
     description?: string;
+    plane?: 'meat' | 'matrix' | 'astral';
     player: IPlayerSeedJson;
 }

package/bundle/typescript/src/commands/game/sideQuest/types/seed/player-seed.d.ts

@@ -1,8 +1,50 @@
 import { LifestyleChoice } from './lifestyle-seed.js';
 import { IItemSeedJson } from './item-seed.js';
+/**
+ * Optional Shadowrun-style combat attributes (see Player's combat fields
+ * for the defaults applied when omitted). Street-level runners sit around
+ * 3-4 in everything; a hardened enforcer 5-6; a soft civilian 1-2.
+ */
+export interface ICombatSeedJson {
+    body?: number;
+    agility?: number;
+    reaction?: number;
+    combatSkill?: number;
+    /**
+     * Innate magical talent. Omit (or 0) for the mundane majority; 3-6 makes
+     * an Awakened mage/shaman who knows every spell without needing any
+     * formula or grimoire, casting from raw talent.
+     */
+    magic?: number;
+    /** Melee/unarmed damage and carrying capacity. */
+    strength?: number;
+    /** Stun track size and drain resistance. */
+    willpower?: number;
+    /** First aid effectiveness and hacking. */
+    logic?: number;
+    /** Defense (half weight) and perception. */
+    intuition?: number;
+    /** Social presence. */
+    charisma?: number;
+    /** Luck pool, burned to push key strikes. */
+    edge?: number;
+    /** Technomancer talent: the Matrix with no deck, all Matrix damage as real stun. */
+    resonance?: number;
+    /** Physical adept: magic channeled into meat combat -- no spells, no projection. */
+    adept?: boolean;
+    /**
+     * Per-skill ratings 1-8 (see Player SkillName: firearms, blades,
+     * unarmed, sneaking, perception, athletics, hacking, locksmith,
+     * negotiation, con, intimidation, first-aid, assensing, spellcasting,
+     * piloting). Optional: combat skills default to combatSkill, others to
+     * 0 -- so a plain combatSkill block keeps working exactly as before.
+     */
+    skills?: Record<string, number>;
+}
 export interface IPlayerSeedJson {
     name: string;
     startLocation: string;
     lifestyleChoices: LifestyleChoice[];
     startingItems?: IItemSeedJson[];
+    combat?: ICombatSeedJson;
 }

package/bundle/typescript/src/commands/game/sideQuest/types/seed/puzzle-seed.d.ts

@@ -1,6 +1,7 @@
+export type PuzzleBypassType = 'lockpick' | 'hack' | 'spell' | 'con';
 export interface IPuzzleSeedJson {
     name: string;
-    room: string;
+    room?: string;
     riddle: string;
     requiredPhrase?: string;
     requiredItem?: string;
@@ -8,4 +9,17 @@ export interface IPuzzleSeedJson {
     successMessage?: string;
     failureMessage?: string;
     hobbyTags?: string[];
+    /** Name of another puzzle in this same scene that must be solved first. */
+    requiresPuzzle?: string;
+    /** Shown when attempting to solve this puzzle before requiresPuzzle is met. */
+    lockedMessage?: string;
+    /**
+     * Optional risky alternate route to the same reward, matching this
+     * barrier's in-fiction nature (a lock -> "pick", a terminal -> "hack", a
+     * ward -> "cast") -- a coin-flip chance to bypass without ever knowing
+     * requiredPhrase, but a failed attempt is loud (see Puzzle.attemptBypass).
+     * Leave unset for a puzzle with no such physical/technical/magical route
+     * (e.g. a purely social one, solvable only by knowing the actual answer).
+     */
+    bypassType?: PuzzleBypassType;
 }

package/bundle/typescript/src/commands/game/sideQuest/types/seed/room-seed.d.ts

@@ -7,6 +7,10 @@ export interface IRoomSeedJson {
     owner?: string;
     tags?: string[];
     exits: IExitSeedJson[];
+    reachable?: boolean;
+    hasNode?: boolean;
+    nodeAccess?: 'wireless' | 'wired';
+    warded?: boolean;
     supportedLifestyles?: {
         residenceTiers?: string[];
         employmentTags?: string[];

package/bundle/typescript/src/commands/game/sideQuest/types/seed/scene-seed.d.ts

@@ -3,6 +3,7 @@ import { INPCSeedJson } from './npc-seed.js';
 import { IItemSeedJson } from './item-seed.js';
 import { IPuzzleSeedJson } from './puzzle-seed.js';
 import { IPlayerSeedJson } from './player-seed.js';
+import { IWinConditionSeedJson } from './win-condition-seed.js';
 export interface ISceneSeedJson {
     name: string;
     currency: {
@@ -17,4 +18,11 @@ export interface ISceneSeedJson {
     story: string;
     /** The logging-in player who will be actively controlled */
     player: IPlayerSeedJson;
+    /** Optional. When set, the scene is a "completable" run: meeting it
+     * triggers a reward and an offer to continue. */
+    winCondition?: IWinConditionSeedJson;
+    /** A HUB scene: the runner's persistent home base (no winCondition).
+     * Calling the fixer from a hub is what initiates a run, and completing
+     * a run drops the player back into the hub -- see Game.returnToHub. */
+    hub?: boolean;
 }

package/bundle/typescript/src/commands/game/sideQuest/types/seed/win-condition-seed.d.ts

@@ -0,0 +1,15 @@
+export interface IWinConditionSeedJson {
+    type: 'give' | 'possess';
+    item: string;
+    toNpc?: string;
+    rewardItem?: string;
+    completionMessage: string;
+    /**
+     * The job's agreed pay in nuyen. The engine ACTUALLY transfers this to
+     * the player on completion (certified credstick), and every NPC's AI
+     * prompt is told the exact figure so what the fixer promises is what
+     * gets paid -- found via a real session where dialogue offered 50k and
+     * the seed's loot credstick held 2000.
+     */
+    payout?: number;
+}

package/bundle/typescript/src/commands/game/sideQuest/types/seed/win-condition-seed.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=win-condition-seed.js.map

package/bundle/typescript/src/commands/game/sideQuest/types/seed/win-condition-seed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"win-condition-seed.js","sourceRoot":"","sources":["../../../../../../../../src/commands/game/sideQuest/types/seed/win-condition-seed.ts"],"names":[],"mappings":""}

package/bundle/typescript/src/commands/game/sideQuest/types/shared/abstracts.d.ts

@@ -60,6 +60,7 @@ export declare abstract class AbstractDoor {
     abstract roomB: Room;
     abstract isLocked: boolean;
     unlockItemOrSolution?: string;
+    puzzle?: Puzzle;
     abstract logger: Logger;
     abstract isLockable: boolean;
     abstract getOtherSide(currentRoom: Room): Room;

package/bundle/typescript/src/commands/game/sideQuest/types/shared/abstracts.js

@@ -20,6 +20,11 @@ export class AbstractRoom extends EventEmitter {
  */
 export class AbstractDoor {
     unlockItemOrSolution;
+    // A door can be guarded by a real Puzzle instead of (or alongside) a
+    // physical key -- the only difference from a room's puzzle is that
+    // success unlocks the door rather than granting an item. See
+    // Door.attachPuzzle().
+    puzzle;
 }
 /**
  * The Inventory class represents a collection of items that can be carried by a player or stored

package/bundle/typescript/src/commands/game/sideQuest/types/shared/abstracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstracts.js","sourceRoot":"","sources":["../../../../../../../../src/commands/game/sideQuest/types/shared/abstracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAsBtC;;;GAGG;AACH,MAAM,OAAgB,aAAa;CAkBlC;AAED;;;;GAIG;AACH,MAAM,OAAgB,YAAa,SAAQ,YAAY;IAK9C,MAAM,CAAU;CAaxB;AAED;;;;GAIG;AACH,MAAM,OAAgB,YAAY;IAKhC,oBAAoB,CAAU;CAQ/B;AAED;;;GAGG;AACH,MAAM,OAAgB,iBAAiB;CAWtC;AAED;;;GAGG;AACH,MAAM,OAAgB,YAAY;CAYjC;AAED;;;;;;GAMG;AACH,MAAM,OAAgB,cAAe,SAAQ,YAAY;IAOvD;QACE,KAAK,EAAE,CAAC,CAAC,0BAA0B;IACrC,CAAC;CAsBF;AAED;;;;GAIG;AACH,MAAM,OAAgB,cAAc;CAgBnC"}
+{"version":3,"file":"abstracts.js","sourceRoot":"","sources":["../../../../../../../../src/commands/game/sideQuest/types/shared/abstracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAsBtC;;;GAGG;AACH,MAAM,OAAgB,aAAa;CAkBlC;AAED;;;;GAIG;AACH,MAAM,OAAgB,YAAa,SAAQ,YAAY;IAK9C,MAAM,CAAU;CAaxB;AAED;;;;GAIG;AACH,MAAM,OAAgB,YAAY;IAKhC,oBAAoB,CAAU;IAC9B,qEAAqE;IACrE,mEAAmE;IACnE,6DAA6D;IAC7D,uBAAuB;IACvB,MAAM,CAAU;CAQjB;AAED;;;GAGG;AACH,MAAM,OAAgB,iBAAiB;CAWtC;AAED;;;GAGG;AACH,MAAM,OAAgB,YAAY;CAYjC;AAED;;;;;;GAMG;AACH,MAAM,OAAgB,cAAe,SAAQ,YAAY;IAOvD;QACE,KAAK,EAAE,CAAC,CAAC,0BAA0B;IACrC,CAAC;CAsBF;AAED;;;;GAIG;AACH,MAAM,OAAgB,cAAc;CAgBnC"}

package/bundle/typescript/src/commands/game/sideQuest/types/shared/item-enum.d.ts

@@ -46,6 +46,7 @@ export declare enum Category {
     Clothing = "clothing",
     ArmorClothing = "armor clothing",
     Medical = "medical",
+    StimPatch = "stim patch",
     Tool = "tool",
     Consumable = "consumable",
     Sensor = "sensor",

package/bundle/typescript/src/commands/game/sideQuest/types/shared/item-enum.js

@@ -54,6 +54,7 @@ export var Category;
     Category["Clothing"] = "clothing";
     Category["ArmorClothing"] = "armor clothing";
     Category["Medical"] = "medical";
+    Category["StimPatch"] = "stim patch";
     Category["Tool"] = "tool";
     Category["Consumable"] = "consumable";
     Category["Sensor"] = "sensor";

package/bundle/typescript/src/commands/game/sideQuest/types/shared/item-enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"item-enum.js","sourceRoot":"","sources":["../../../../../../../../src/commands/game/sideQuest/types/shared/item-enum.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,IAMX;AAND,WAAY,IAAI;IACd,qBAAa,CAAA;IACX,uBAAe,CAAA;IACf,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,gCAAwB,CAAA;AAC5B,CAAC,EANW,IAAI,KAAJ,IAAI,QAMf;AAED,MAAM,CAAN,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,2BAAiB,CAAA;IACf,+BAAqB,CAAA;IACrB,uBAAa,CAAA;IACb,iCAAuB,CAAA;IACvB,0CAAgC,CAAA;AACpC,CAAC,EANW,MAAM,KAAN,MAAM,QAMjB;AAED,MAAM,CAAN,IAAY,QAmEX;AAnED,WAAY,QAAQ;IAClB,SAAS;IACT,6BAAiB,CAAA;IACjB,wCAA4B,CAAA;IAC5B,0CAA8B,CAAA;IAC9B,qCAAyB,CAAA;IACzB,mCAAuB,CAAA;IACvB,oCAAwB,CAAA;IACxB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,kCAAsB,CAAA;IACtB,kCAAsB,CAAA;IACtB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IAEjB,sCAAsC;IACtC,mCAAuB,CAAA;IACvB,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IAErB,yBAAyB;IACzB,iCAAqB,CAAA;IACrB,mCAAuB,CAAA;IACvB,uBAAW,CAAA;IACX,2BAAe,CAAA;IACf,iCAAqB,CAAA;IACrB,uCAA2B,CAAA;IAC3B,oCAAwB,CAAA;IAExB,QAAQ;IACR,2BAAe,CAAA;IACf,0CAA8B,CAAA;IAC9B,8CAAkC,CAAA;IAClC,8CAAkC,CAAA;IAClC,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IAErB,mBAAmB;IACnB,iCAAqB,CAAA;IACrB,4CAAgC,CAAA;IAChC,+BAAmB,CAAA;IACnB,yBAAa,CAAA;IACb,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;IACjB,oCAAwB,CAAA;IACxB,kDAAsC,CAAA;IACtC,uBAAW,CAAA;IACX,+BAAmB,CAAA;IAEnB,qBAAqB;IACrB,uBAAW,CAAA;IACX,gCAAoB,CAAA;IACpB,+BAAmB,CAAA;IACnB,oDAAwC,CAAA;IACxC,mCAAuB,CAAA;IAEvB,iBAAiB;IACjB,yBAAa,CAAA;IACb,yBAAa,CAAA;IACb,uBAAW,CAAA;IACX,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IACrB,2BAAe,CAAA;IACf,+BAAmB,CAAA;AACrB,CAAC,EAnEW,QAAQ,KAAR,QAAQ,QAmEnB"}
+{"version":3,"file":"item-enum.js","sourceRoot":"","sources":["../../../../../../../../src/commands/game/sideQuest/types/shared/item-enum.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,IAMX;AAND,WAAY,IAAI;IACd,qBAAa,CAAA;IACX,uBAAe,CAAA;IACf,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,gCAAwB,CAAA;AAC5B,CAAC,EANW,IAAI,KAAJ,IAAI,QAMf;AAED,MAAM,CAAN,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,2BAAiB,CAAA;IACf,+BAAqB,CAAA;IACrB,uBAAa,CAAA;IACb,iCAAuB,CAAA;IACvB,0CAAgC,CAAA;AACpC,CAAC,EANW,MAAM,KAAN,MAAM,QAMjB;AAED,MAAM,CAAN,IAAY,QAoEX;AApED,WAAY,QAAQ;IAClB,SAAS;IACT,6BAAiB,CAAA;IACjB,wCAA4B,CAAA;IAC5B,0CAA8B,CAAA;IAC9B,qCAAyB,CAAA;IACzB,mCAAuB,CAAA;IACvB,oCAAwB,CAAA;IACxB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,kCAAsB,CAAA;IACtB,kCAAsB,CAAA;IACtB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IAEjB,sCAAsC;IACtC,mCAAuB,CAAA;IACvB,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IAErB,yBAAyB;IACzB,iCAAqB,CAAA;IACrB,mCAAuB,CAAA;IACvB,uBAAW,CAAA;IACX,2BAAe,CAAA;IACf,iCAAqB,CAAA;IACrB,uCAA2B,CAAA;IAC3B,oCAAwB,CAAA;IAExB,QAAQ;IACR,2BAAe,CAAA;IACf,0CAA8B,CAAA;IAC9B,8CAAkC,CAAA;IAClC,8CAAkC,CAAA;IAClC,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IAErB,mBAAmB;IACnB,iCAAqB,CAAA;IACrB,4CAAgC,CAAA;IAChC,+BAAmB,CAAA;IACnB,oCAAwB,CAAA;IACxB,yBAAa,CAAA;IACb,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;IACjB,oCAAwB,CAAA;IACxB,kDAAsC,CAAA;IACtC,uBAAW,CAAA;IACX,+BAAmB,CAAA;IAEnB,qBAAqB;IACrB,uBAAW,CAAA;IACX,gCAAoB,CAAA;IACpB,+BAAmB,CAAA;IACnB,oDAAwC,CAAA;IACxC,mCAAuB,CAAA;IAEvB,iBAAiB;IACjB,yBAAa,CAAA;IACb,yBAAa,CAAA;IACb,uBAAW,CAAA;IACX,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IACrB,2BAAe,CAAA;IACf,+BAAmB,CAAA;AACrB,CAAC,EApEW,QAAQ,KAAR,QAAQ,QAoEnB"}

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

@@ -3,5 +3,8 @@ export interface IMainGameConfig {
     debug?: boolean;
     logFilePath: string;
     useAi: boolean;
+    generationNotice?: string;
+    /** Archetype name picked at launch -- sets the player's attribute sheet. */
+    archetype?: string;
 }
 export declare function main(playerName: string, sceneSeed: ISceneSeedJson, options: IMainGameConfig): Promise<void>;

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

@@ -3,6 +3,9 @@ import { capitalCase } from 'change-case';
 import Game from './game.js';
 import { Player, Room, } from './models/_index.js';
 import { Logger } from './utilities/logger.js';
+import { getArchetype, outfitArchetype } from './archetypes.js';
+import { STANCE_CYCLE } from './models/player.js';
+import { AutoFight } from './utilities/auto-fight.js';
 export async function main(playerName, sceneSeed, options) {
     // Create a screen object
     const screen = blessed.screen({
@@ -21,19 +24,67 @@ export async function main(playerName, sceneSeed, options) {
             description: 'A featureless room where lost souls drift.',
             roomType: 'void'
         });
-        const player = new Player({ playerName, startLocation: nexus });
+        // The archetype spread picked at launch becomes the player's sheet,
+        // and its requisite gear comes with it -- granted on top of the
+        // scene's generic loadout, wearables equipped so a samurai starts
+        // with the Predator in hand and a Face wearing the good suit.
+        const archetype = getArchetype(options.archetype);
+        const player = new Player({ playerName, startLocation: nexus, combat: archetype.combat });
+        outfitArchetype(player, archetype);
         // Create the game instance
         const game = await Game.getInstance(player, sceneSeed);
         const ready = await game.init(options, screen);
         // Print welcome message or initial room description
-        game.logBox.setContent(ready); // getWelcomeMessage should return the initial game introduction or room description
+        const notice = options.generationNotice
+            ? `{yellow-fg}${options.generationNotice}{/yellow-fg}\n\n`
+            : '';
+        game.logBox.setContent(notice + ready); // getWelcomeMessage should return the initial game introduction or room description
         game.updateEquipment(game.player.equipment);
         game.updateInventory(game.player.inventory, capitalCase(game.scene.getCurrencyType()));
         game.updateExits(game.player.currentLocation);
+        game.updateStatus();
+        // Tab cycles the fight autopilot: manual -> guarded -> aggressive (see
+        // utilities/auto-fight.ts; "stance" is the typed twin). Bound on the
+        // input box because that's where focus lives during play.
+        game.inputBox.key(['tab'], () => {
+            // Blessed's textarea reader appends the literal '\t' to the box
+            // value on this same keypress (listener order isn't guaranteed
+            // either way) -- strip it now AND on the next tick so Tab stays a
+            // pure control key.
+            const stripTab = () => {
+                const v = game.inputBox.getValue();
+                if (v.includes('\t')) {
+                    game.inputBox.setValue(v.replace(/\t/g, ''));
+                }
+            };
+            stripTab();
+            setImmediate(() => { stripTab(); screen.render(); });
+            const cycle = STANCE_CYCLE;
+            const next = cycle[(cycle.indexOf(game.player.autoStance) + 1) % cycle.length];
+            game.player.autoStance = next;
+            game.autoFight.cancelPending();
+            // white for manual, not gray -- gray is ANSI bright-black, illegible
+            // on stock dark palettes (same fix as the HUD stance in game.ts).
+            const color = next === 'aggressive' ? 'red' : next === 'guarded' ? 'yellow' : 'white';
+            gameLog.logWithColor(`⚔ Stance: ${next.toUpperCase()} -- ${AutoFight.describe(next)}.`, color);
+            game.updateStatus();
+            screen.render();
+        });
         game.inputBox.key(['enter'], () => {
             void (async () => {
                 try {
                     const input = game.inputBox.getValue();
+                    // Typing takes over: any submitted command cancels a pending
+                    // auto-fight action (the interruptible beat -- see
+                    // utilities/auto-fight.ts). The next settled exchange re-arms it.
+                    game.autoFight.cancelPending();
+                    // Clear the box the moment the command is submitted, not after
+                    // it resolves -- a slow command (combat narration beats, an AI
+                    // round trip on a call) used to leave the typed text sitting in
+                    // the box for seconds, and worse, the late clear would wipe
+                    // whatever the player had started typing NEXT during the wait.
+                    game.inputBox.clearValue();
+                    screen.render();
                     const response = await game.handleInput(input); // handleInput is the method that processes commands
                     if (['take', 'equip', 'unequip'].includes(input.split(' ')[0])) {
                         // Example usage: update the inventory with a new list of items
@@ -43,6 +94,11 @@ export async function main(playerName, sceneSeed, options) {
                     if (['go', 'lock', 'unlock'].includes(input.split(' ')[0])) {
                         game.updateExits(game.player.currentLocation);
                     }
+                    // Unconditional (not gated on the verb typed) since a call can
+                    // also end on the NPC's own initiative -- this stays in sync
+                    // with whatever state actually resulted, not just what the
+                    // player directly asked for.
+                    game.updateStatus();
                     if (input.split(' ')[0] === 'clear') {
                         game.logBox.setContent('');
                     }
@@ -53,13 +109,46 @@ export async function main(playerName, sceneSeed, options) {
                         process.exit(0); // Exit the game
                     }
                     game.logBox.pushLine(response);
-                    game.logBox.scroll(1);
-                    game.inputBox.clearValue();
-                    game.inputBox.focus();
-                    screen.render();
+                    game.logBox.scrollTo(game.logBox.getScrollHeight());
                 }
                 catch (error) {
+                    // A crashed command must FAIL VISIBLY -- the old silent
+                    // log-and-return left the player staring at a game that
+                    // apparently ignored them (real session: a puzzle-data crash
+                    // made "search" a no-op five times running, with the errors
+                    // only in the log file).
                     gameLog.error(`Error handling input: ${error}`);
+                    game.logBox.pushLine(`{red-fg}Something glitched handling that command -- it's been logged. The game is still running.{/red-fg}`);
+                    game.logBox.scrollTo(game.logBox.getScrollHeight());
+                }
+                finally {
+                    // Focus restoration runs on EVERY path -- the same real session
+                    // showed that when a command threw, this block (then inside the
+                    // try) was skipped, the input reader died, and the player
+                    // couldn't type at all ("focus is being removed").
+                    //
+                    // NEVER blind-focus() the input box here. Blessed's _focus() has
+                    // no old === el guard, so focusing the box while it's already
+                    // focused fires a self-blur that cancels the active input reader
+                    // and starts another -- and because the reader attaches its
+                    // keypress listener on a DELAYED tick, a fast (all-microtask)
+                    // command lands this cancel while the previous attach is still
+                    // pending: the cancel removes nothing, both attaches then land,
+                    // and the orphaned listener doubles every subsequent keystroke
+                    // (found via a real session typing "exit" and getting "eexxiitt").
+                    // The submit path already re-focuses the box internally
+                    // (rewindFocus), so the common case needs no touch at all; only
+                    // actually restart things when focus genuinely went elsewhere
+                    // (e.g. a lockpick/hack minigame took the screen) or reading
+                    // somehow stopped while still focused.
+                    const inputBox = game.inputBox;
+                    if (screen.focused !== inputBox) {
+                        inputBox.focus();
+                    }
+                    else if (!inputBox._reading) {
+                        inputBox.readInput();
+                    }
+                    screen.render();
                 }
             })();
         });

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

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

package/bundle/typescript/src/commands/game/sideQuest/utilities/auto-fight.d.ts

@@ -0,0 +1,60 @@
+import type Game from '../game.js';
+import type { Player, FightStance } from '../models/player.js';
+import type { NPC } from '../models/npc.js';
+/**
+ * Fight-or-flight autopilot -- the FIGHT half. The player sets a
+ * temperature (Tab in the UI, or the "stance" command) and the game keeps
+ * swinging for them; flight stays manual, always, because stopping YOUR
+ * swings never stops THEIRS -- the only real defense is the door, and
+ * that's the player's call.
+ *
+ *   manual     -- today's behavior, every action typed
+ *   guarded    -- auto-fights, but wins non-lethally: switches to subdue
+ *                 when the target is nearly down, and stands down the
+ *                 moment they surrender
+ *   aggressive -- fights until they're dead; a surrender changes nothing
+ *
+ * Wiring: CombatExchange.finishExchange() -> Scene.notifyExchangeSettled()
+ * -> onExchangeSettled() here. If the player was a combatant and the
+ * stance says fight, the next action is scheduled a short, interruptible
+ * beat later (REENGAGE_DELAY_MS). Submitting ANY command in the UI cancels
+ * the pending action and takes over (see ui.ts) -- the beat exists exactly
+ * so fleeing and healing stay possible mid-autofight. Everything is
+ * revalidated at fire time: the fight may have ended, moved, or been
+ * surrendered out of during the delay.
+ *
+ * Auto actions lead with whatever hits hardest: a caster whose manabolt
+ * out-damages their equipped weapon throws the bolt (and eats the drain);
+ * everyone else uses the gun/blade/fists they're holding. A dry gun's
+ * refusal (reload prompt) is surfaced to the player and auto simply waits
+ * for them to deal with it -- reloading is a decision, not a reflex.
+ */
+export declare class AutoFight {
+    private game;
+    static REENGAGE_DELAY_MS: number;
+    private static MANABOLT_POWER;
+    private pending?;
+    constructor(game: Game);
+    /** The pending auto action, dropped. The player typed, or the stance changed. */
+    cancelPending(): void;
+    /**
+     * Called after every combat exchange resolves (player-involved or not).
+     * Schedules the player's next action when the autopilot should act.
+     */
+    onExchangeSettled(combatants: (Player | NPC)[]): void;
+    /**
+     * The beat elapsed uninterrupted -- act, if the fight still stands.
+     * Every guard here re-checks live state: the target may have died, fled,
+     * surrendered, or started another exchange during the delay.
+     */
+    private fire;
+    /**
+     * Lead with what hits hardest -- except Guarded near the end, which
+     * finishes non-lethally: when the target is within a few boxes of death,
+     * the next auto action is a subdue (stun damage, bare hands) instead of
+     * another killing blow.
+     */
+    private chooseAction;
+    /** One-line HUD/announce description for a stance. */
+    static describe(stance: FightStance): string;
+}

package/bundle/typescript/src/commands/game/sideQuest/utilities/auto-fight.js

@@ -0,0 +1,138 @@
+import { Logger } from './logger.js';
+/**
+ * Fight-or-flight autopilot -- the FIGHT half. The player sets a
+ * temperature (Tab in the UI, or the "stance" command) and the game keeps
+ * swinging for them; flight stays manual, always, because stopping YOUR
+ * swings never stops THEIRS -- the only real defense is the door, and
+ * that's the player's call.
+ *
+ *   manual     -- today's behavior, every action typed
+ *   guarded    -- auto-fights, but wins non-lethally: switches to subdue
+ *                 when the target is nearly down, and stands down the
+ *                 moment they surrender
+ *   aggressive -- fights until they're dead; a surrender changes nothing
+ *
+ * Wiring: CombatExchange.finishExchange() -> Scene.notifyExchangeSettled()
+ * -> onExchangeSettled() here. If the player was a combatant and the
+ * stance says fight, the next action is scheduled a short, interruptible
+ * beat later (REENGAGE_DELAY_MS). Submitting ANY command in the UI cancels
+ * the pending action and takes over (see ui.ts) -- the beat exists exactly
+ * so fleeing and healing stay possible mid-autofight. Everything is
+ * revalidated at fire time: the fight may have ended, moved, or been
+ * surrendered out of during the delay.
+ *
+ * Auto actions lead with whatever hits hardest: a caster whose manabolt
+ * out-damages their equipped weapon throws the bolt (and eats the drain);
+ * everyone else uses the gun/blade/fists they're holding. A dry gun's
+ * refusal (reload prompt) is surfaced to the player and auto simply waits
+ * for them to deal with it -- reloading is a decision, not a reflex.
+ */
+export class AutoFight {
+    game;
+    static REENGAGE_DELAY_MS = 2000;
+    // Manabolt's damage base, mirrored from cast.ts SPELLS (power). Used
+    // only for the "what hits hardest" comparison.
+    static MANABOLT_POWER = 4;
+    pending;
+    constructor(game) {
+        this.game = game;
+    }
+    /** The pending auto action, dropped. The player typed, or the stance changed. */
+    cancelPending() {
+        if (this.pending) {
+            clearTimeout(this.pending);
+            this.pending = undefined;
+        }
+    }
+    /**
+     * Called after every combat exchange resolves (player-involved or not).
+     * Schedules the player's next action when the autopilot should act.
+     */
+    onExchangeSettled(combatants) {
+        const player = this.game.player;
+        if (!combatants.includes(player))
+            return;
+        if (player.autoStance === 'manual')
+            return;
+        const target = combatants.find(c => c !== player);
+        if (!target)
+            return;
+        this.cancelPending();
+        this.pending = setTimeout(() => {
+            this.pending = undefined;
+            void this.fire(target);
+        }, AutoFight.REENGAGE_DELAY_MS);
+    }
+    /**
+     * The beat elapsed uninterrupted -- act, if the fight still stands.
+     * Every guard here re-checks live state: the target may have died, fled,
+     * surrendered, or started another exchange during the delay.
+     */
+    async fire(target) {
+        const player = this.game.player;
+        const logger = Logger.getInstance();
+        if (player.autoStance === 'manual')
+            return;
+        if (player.isIncapacitated() || target.isIncapacitated())
+            return;
+        if (player.currentLocation !== target.currentLocation)
+            return;
+        // Cross-plane fights don't exist: a dump or a return mid-beat (see
+        // utilities/planes.ts) ends the engagement, autopilot included.
+        if (player.plane !== target.plane)
+            return;
+        // A fresh exchange is already in flight -- when IT settles,
+        // onExchangeSettled reschedules us. No waiting here.
+        if (player.inExchange || target.inExchange)
+            return;
+        // Guarded honors a surrender -- the fight is over, hold fire. The
+        // stand-down is announced once; no reschedule, so the autopilot stays
+        // quiet unless violence actually resumes (a new exchange re-arms it).
+        if (player.autoStance === 'guarded' && target.surrendered) {
+            logger.logWithColor(`⚔ ${target.name} has surrendered -- you hold fire. (guarded)`, 'yellow');
+            this.game.updateStatus();
+            return;
+        }
+        const cmd = this.chooseAction(player, target);
+        // Cyan, not gray: the autopilot announcing it acted must be legible on
+        // stock dark palettes (gray = ANSI bright-black, near-invisible there).
+        logger.logWithColor(`⚔ [${player.autoStance}] ${cmd}`, 'cyan');
+        const result = await this.game.handleInput(cmd);
+        // Player-initiated exchanges self-announce ('' result); anything else
+        // (a dry-gun reload prompt, a refusal) is information the player needs.
+        if (result) {
+            logger.log(result);
+        }
+        this.game.updateStatus();
+    }
+    /**
+     * Lead with what hits hardest -- except Guarded near the end, which
+     * finishes non-lethally: when the target is within a few boxes of death,
+     * the next auto action is a subdue (stun damage, bare hands) instead of
+     * another killing blow.
+     */
+    chooseAction(player, target) {
+        // Subduing takes real hands (meat plane only); a guarded decker
+        // "killing" ice is just crashing a program, and astral entities go
+        // down by force -- no non-lethal switch off the meat plane.
+        if (player.autoStance === 'guarded' && player.plane === 'meat' &&
+            target.maxConditionBoxes - target.damageTaken <= 3) {
+            return `subdue ${target.name}`;
+        }
+        // Magic doesn't compile in the Matrix (see cast.ts); everywhere else,
+        // lead with the harder hit.
+        if (player.plane !== 'matrix' && player.isCaster() && AutoFight.MANABOLT_POWER > player.getWeaponProfile().damage) {
+            return `cast manabolt at ${target.name}`;
+        }
+        return `attack ${target.name}`;
+    }
+    /** One-line HUD/announce description for a stance. */
+    static describe(stance) {
+        switch (stance) {
+            case 'manual': return 'you type every action yourself';
+            case 'guarded': return 'auto-fight; subdues instead of killing when they are nearly down, holds fire on surrender';
+            case 'aggressive': return 'auto-fight to the death; surrender means nothing';
+        }
+    }
+}
+//# sourceMappingURL=auto-fight.js.map

package/bundle/typescript/src/commands/game/sideQuest/utilities/auto-fight.js.map

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