@maka/maka-cli 5.7.0 → 5.9.0

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

@@ -7,10 +7,46 @@ import { getArchetype, outfitArchetype } from './archetypes.js';
 import { STANCE_CYCLE } from './models/player.js';
 import { AutoFight } from './utilities/auto-fight.js';
 import { TERMINAL_RESET_SEQUENCE } from './utilities/terminal-reset.js';
+// Windows Terminal draws astral-plane emoji (📞 call icon, 📍 HUD pin,
+// 👥 companions, 💀) TWO columns wide, but blessed's 2015-era unicode
+// tables predate emoji being classified wide and count them as ONE. The
+// one-cell drift on every icon row pushed box borders sideways into the
+// next panel and left smartCSR's partial redraws smearing stray orphan
+// characters (two player screenshots; the text-presentation ⚔, one cell
+// on both sides, stayed flush). Teaching charWidth the pictograph blocks
+// fixes the model: strWidth (wrapping) and the cell renderer both route
+// through this same export. BMP dingbats stay untouched -- the terminal
+// really does draw those narrow.
+// TWO patches, and they only work as a pair (blessed's own draw comment:
+// "eat the next character which should be a space due to parseContent's
+// behavior"): charWidth makes wrapping count 2 and the emitter skip the
+// filler cell; chars.all makes parseContent actually INSERT that \x03
+// filler after each pictograph. Either alone leaves rows misaligned or
+// eats a real character.
+{
+    const uni = blessed.unicode;
+    const origCharWidth = uni.charWidth;
+    uni.charWidth = function (text, i) {
+        const point = typeof text === 'number' ? text : uni.codePointAt(text, i ?? 0);
+        if (point >= 0x1F300 && point <= 0x1FAFF)
+            return 2;
+        return origCharWidth.call(this, text, i);
+    };
+    // U+1F300-1FAFF as surrogate pairs. Wrapped in a fresh outer group so
+    // parseContent's "$1\x03" replacement still means "the whole match".
+    const pictographs = '\\ud83c[\\udf00-\\udfff]|\\ud83d[\\udc00-\\udfff]|\\ud83e[\\udc00-\\udeff]';
+    uni.chars.all = new RegExp(`(${uni.chars.all.source}|${pictographs})`, 'g');
+}
 export async function main(playerName, sceneSeed, options) {
     // Create a screen object
     const screen = blessed.screen({
         smartCSR: true,
+        // Without this, blessed strips every astral-plane character (all
+        // modern emoji -- the 📞 call icon, companion icons) to "?" during
+        // content parsing, no matter what the terminal can render. BMP
+        // symbols like ⚔ slipped through, which is why a session showed
+        // swords but question-mark phones.
+        fullUnicode: true,
         title: 'Side Quest Adventure Game',
     });
     // TERMINAL HYGIENE: blessed arms xterm modes (mouse tracking, alt
@@ -75,6 +111,7 @@ export async function main(playerName, sceneSeed, options) {
             ? `{yellow-fg}${options.generationNotice}{/yellow-fg}\n\n`
             : '';
         game.logBox.setContent(notice + ready); // getWelcomeMessage should return the initial game introduction or room description
+        gameLog.transcript(notice + ready); // the transcript opens the way the session did
         game.updateEquipment(game.player.equipment);
         game.updateInventory(game.player.inventory, capitalCase(game.scene.getCurrencyType()));
         game.updateExits(game.player.currentLocation);
@@ -101,8 +138,10 @@ export async function main(playerName, sceneSeed, options) {
             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).
+            // Mechanics ticker, not the narrative: the HUD already shows the
+            // standing stance; this is the change notice (readability pass).
             const color = next === 'aggressive' ? 'red' : next === 'guarded' ? 'yellow' : 'white';
-            gameLog.logWithColor(`⚔ Stance: ${next.toUpperCase()} -- ${AutoFight.describe(next)}.`, color);
+            gameLog.meta(`⚔ Stance: ${next.toUpperCase()} -- ${AutoFight.describe(next)}.`, color);
             game.updateStatus();
             screen.render();
         });
@@ -121,6 +160,30 @@ export async function main(playerName, sceneSeed, options) {
                     // whatever the player had started typing NEXT during the wait.
                     game.inputBox.clearValue();
                     screen.render();
+                    // The transcript reads like the session: the typed command
+                    // first, the game's answer after (see Logger.transcript).
+                    if (input.trim().length > 0)
+                        gameLog.transcript(`> ${input}`);
+                    // TURN BLOCKS (readability pass): echo the command into the
+                    // visible log too, behind a blank line, so each command's
+                    // output reads as its own block -- BEFORE handleInput, so a
+                    // slow command (AI round trip, combat beats) shows what was
+                    // asked while it works. Cyan: blessed has no dim tag and gray
+                    // is banned; cyan is already this game's machine voice.
+                    // pushLine, not Logger -- the transcript line above already
+                    // recorded it. "clear" is exempt (echo-then-wipe is noise),
+                    // and "say" keeps only the blank separator -- your words
+                    // already land as the yellow speech line, and "> say hoi"
+                    // above "hoi" read as a stutter (playtest note).
+                    const echoVerb = input.trim().split(' ')[0]?.toLowerCase();
+                    if (input.trim().length > 0 && echoVerb !== 'clear') {
+                        game.logBox.pushLine('');
+                        if (echoVerb !== 'say') {
+                            game.logBox.pushLine(`{cyan-fg}> ${input.trim()}{/cyan-fg}`);
+                        }
+                        game.followLog();
+                        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
@@ -137,15 +200,28 @@ export async function main(playerName, sceneSeed, options) {
                     game.updateStatus();
                     if (input.split(' ')[0] === 'clear') {
                         game.logBox.setContent('');
+                        game.metaBox.setContent('');
+                        // Blessed repositions a box's LABEL on 'scroll' events --
+                        // setContent('') resets the scroll base without firing one,
+                        // stranding the title mid-box (screenshot bug: "Game Log"
+                        // sitting at the bottom after "clear"). Scrolling home
+                        // fires the event and the label snaps back to the border.
+                        game.logBox.scrollTo(0);
+                        game.metaBox.scrollTo(0);
                     }
-                    gameLog.write(`Input response: ${response}`);
+                    if (response)
+                        gameLog.transcript(response);
                     if (response === null) {
                         screen.render();
                         gameLog.write(`<<<<<<<<--------- Terminating game`);
                         process.exit(0); // Exit the game
                     }
-                    game.logBox.pushLine(response);
-                    game.logBox.scrollTo(game.logBox.getScrollHeight());
+                    // Empty responses stop printing blank filler -- the turn-block
+                    // echo above is the separator now.
+                    if (response) {
+                        game.logBox.pushLine(response);
+                        game.followLog();
+                    }
                 }
                 catch (error) {
                     // A crashed command must FAIL VISIBLY -- the old silent
@@ -155,7 +231,7 @@ export async function main(playerName, sceneSeed, options) {
                     // 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());
+                    game.followLog();
                 }
                 finally {
                     // Focus restoration runs on EVERY path -- the same real session

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.js

@@ -90,10 +90,24 @@ export class AutoFight {
         // 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).
+        // Guarded honors a surrender -- but doesn't trust it: the final
+        // action is a RESTRAIN (player request; SR5e Subduing p.195, the
+        // surrendered branch is an automatic no-roll hold). Hands-up
+        // prisoners get zip-tied, not taken at their word. One-shot: an
+        // already-held target (by anyone) means truly stand down, and off
+        // the meat plane there are no hands to hold with.
         if (player.autoStance === 'guarded' && target.surrendered) {
+            if (player.plane === 'meat' && target.plane === 'meat'
+                && player.grappling !== target.name && !target.grappledBy) {
+                const cmd = `restrain ${target.name}`;
+                logger.meta(`⚔ [guarded] ${cmd}`, 'cyan');
+                const result = await this.game.handleInput(cmd);
+                if (result) {
+                    logger.log(result);
+                }
+                this.game.updateStatus();
+                return;
+            }
             logger.logWithColor(`⚔ ${target.name} has surrendered -- you hold fire. (guarded)`, 'yellow');
             this.game.updateStatus();
             return;
@@ -101,7 +115,9 @@ export class AutoFight {
         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');
+        // Mechanics ticker, not the narrative -- the strike it triggers tells
+        // the story in the world log (readability pass).
+        logger.meta(`⚔ [${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.
@@ -141,7 +157,7 @@ export class AutoFight {
     static describe(stance) {
         switch (stance) {
             case 'manual': return 'counters when struck (every stance does) -- but pressing the fight is yours to type';
-            case 'guarded': return 'presses the fight for you; subdues instead of killing when they are nearly down, holds fire on surrender';
+            case 'guarded': return 'presses the fight for you; subdues instead of killing when they are nearly down, and RESTRAINS them when they surrender';
             case 'aggressive': return 'presses the fight to the death; surrender means nothing';
         }
     }

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

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

package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.d.ts

@@ -91,6 +91,7 @@ export declare class CombatExchange {
         second: Player | NPC;
         extraStriker: Player | NPC | null;
         lines: string[];
+        metaLines: string[];
     };
     /**
      * The player should see a fight's blow-by-blow only when they're actually
@@ -108,7 +109,7 @@ export declare class CombatExchange {
      * fight an NPC started. The status box refreshes with every block so the
      * condition monitor visibly ticks as damage lands.
      */
-    announce(lines: string[]): Promise<void>;
+    announce(lines: string[], meta?: string[]): Promise<void>;
     /**
      * The default, weapon-based strike profile. A firearm with a dry
      * magazine automatically falls back to bare fists -- this covers the
@@ -117,8 +118,19 @@ export declare class CombatExchange {
      * blocked with a reload prompt before ever reaching here (attack.ts).
      */
     weaponProfile(attacker: Player | NPC, defender: Player | NPC): IStrikeProfile;
-    /** One directed strike: attack vs defense, then soak. Mutates the defender. */
-    resolveStrike(attacker: Player | NPC, defender: Player | NPC, profile?: IStrikeProfile): string[];
+    /**
+     * One directed strike: attack vs defense, then soak. Mutates the
+     * defender. Readability split: `meta` carries the dice anatomy
+     * (Attack/Defense/Soak rolls, net-hit math) for the Mechanics ticker;
+     * `world` carries the narrative -- one compact header with the
+     * outcome, then the damage/flavor lines the player feels. Callers
+     * rebuild AI-history reports as [...world, ...meta] so an NPC's
+     * memory of the fight keeps the dice.
+     */
+    resolveStrike(attacker: Player | NPC, defender: Player | NPC, profile?: IStrikeProfile): {
+        world: string[];
+        meta: string[];
+    };
     /**
      * Death/knockout narration is announced BEFORE the removal side effects
      * run -- removeActor() fires the "drops what they carried" observer line
@@ -128,6 +140,16 @@ export declare class CombatExchange {
      * full STUN track -- see cast.ts drain) rather than a death: same
      * out-of-the-run consequences, honestly narrated as unconsciousness.
      */
+    /**
+     * The PLAYER dropped from a full STUN track: out of the fight, not out
+     * of the game (RAW p.379 "out of action for the rest of the fight";
+     * instant death is physical overflow only, p.170). No endGame here --
+     * Scene.beginPlayerKnockout defers judgment until the room settles:
+     * hostiles all down/surrendered/gone means the player comes to with a
+     * Body + Willpower recovery (p.207); a hostile left standing over them
+     * with nobody fighting for them means the street decides, as ever.
+     */
+    resolvePlayerKnockout(killer: Player | NPC): Promise<string[]>;
     resolveDeath(fallen: Player | NPC, killer: Player | NPC, opts?: {
         fallLine?: string;
         gameOverLine?: string;

package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.js

@@ -1,3 +1,4 @@
+import { NPC } from '../models/npc.js';
 import { rollPool, formatRoll } from './dice.js';
 import { leaveMatrix, leaveDrone } from './planes.js';
 /**
@@ -87,13 +88,21 @@ export class CombatExchange {
         // not every exchange of it -- "fresh" meaning this pairing wasn't
         // already trading blows moments ago. Armed here (before the opponent
         // bookkeeping overwrites the evidence), cashed in by rollInitiative.
+        // The same freshness check prices a SPIRIT companion's combat: one
+        // service per FIGHT joined (RAW p.302), ticked when the fight opens.
         const FIGHT_GAP_MS = 60000;
         for (const [combatant, other] of [[this.actor, target], [target, this.actor]]) {
-            if (!combatant.hasQuality('combat-paralysis'))
-                continue;
             const freshFight = combatant.combatOpponent !== other || now - combatant.lastExchangeAt > FIGHT_GAP_MS;
-            if (freshFight)
+            if (freshFight && combatant.hasQuality('combat-paralysis'))
                 combatant.paralysisFreeze = true;
+            if (freshFight) {
+                const spiritEntry = this.scene.ownerGame?.companions?.find(c => c.npc === combatant && c.kind === 'spirit');
+                if (spiritEntry && (spiritEntry.services ?? 0) > 0) {
+                    spiritEntry.services = (spiritEntry.services ?? 0) - 1;
+                    // Resource arithmetic -- Mechanics ticker (readability pass).
+                    this.logger.meta(`👥 ${combatant.name} joins the fight -- one service spent (${spiritEntry.services} left).`, 'green');
+                }
+            }
         }
         this.actor.combatOpponent = target;
         this.actor.lastExchangeAt = now;
@@ -161,12 +170,22 @@ export class CombatExchange {
         const net = Math.abs(aggRoll.hits - defRoll.hits);
         const extraStriker = net >= 3 ? first : null;
         this.logger.write(`Initiative: ${aggressor.name} ${aggRoll.hits} vs ${defender.name} ${defRoll.hits} -- ${first.name} first${extraStriker ? ' with an extra strike' : ''}.`);
+        // Readability split: the dice anatomy is Mechanics-ticker material
+        // (metaLines); the world log keeps only what the player FEELS --
+        // who froze, who moves first (lines). Callers rebuild AI-history
+        // reports as [...lines, ...metaLines] so NPC memories keep the dice.
+        // One line per roller (playtest note: the single "A vs B" line was
+        // hard to read) -- each carries its own right-justified wave.
+        const metaLines = [
+            `Initiative:`,
+            `  ${aggressor.name}: ${formatRoll(aggRoll)}`,
+            `  ${defender.name}: ${formatRoll(defRoll)}`,
+        ];
         const lines = [
             ...freezeLines,
-            `Initiative: ${aggressor.name} ${formatRoll(aggRoll)}  vs  ${defender.name} ${formatRoll(defRoll)}`,
-            `  ${first.name} moves first.${extraStriker ? ` And they're FAST -- an extra strike this exchange.` : ''}`,
+            `${first.name} moves first.${extraStriker ? ` And they're FAST -- an extra strike this exchange.` : ''}`,
         ];
-        return { first, second, extraStriker, lines };
+        return { first, second, extraStriker, lines, metaLines };
     }
     /**
      * The player should see a fight's blow-by-blow only when they're actually
@@ -190,10 +209,16 @@ export class CombatExchange {
      * fight an NPC started. The status box refreshes with every block so the
      * condition monitor visibly ticks as damage lands.
      */
-    async announce(lines) {
-        if (lines.length === 0 || !this.playerWitnesses())
+    async announce(lines, meta = []) {
+        if ((lines.length === 0 && meta.length === 0) || !this.playerWitnesses())
             return;
-        this.logger.log(lines.join('\n'));
+        // Dice anatomy ticks in the Mechanics panel; the world log gets the
+        // narrative behind a leading blank line -- the per-block separator
+        // the old wall-of-text never had (readability pass).
+        for (const m of meta)
+            this.logger.meta(m);
+        if (lines.length > 0)
+            this.logger.log(`\n${lines.join('\n')}`);
         this.scene.updateStatus();
         await new Promise(resolve => setTimeout(resolve, CombatExchange.BEAT_MS));
     }
@@ -254,10 +279,20 @@ export class CombatExchange {
             dealStun: fistsAreStun,
         };
     }
-    /** One directed strike: attack vs defense, then soak. Mutates the defender. */
+    /**
+     * One directed strike: attack vs defense, then soak. Mutates the
+     * defender. Readability split: `meta` carries the dice anatomy
+     * (Attack/Defense/Soak rolls, net-hit math) for the Mechanics ticker;
+     * `world` carries the narrative -- one compact header with the
+     * outcome, then the damage/flavor lines the player feels. Callers
+     * rebuild AI-history reports as [...world, ...meta] so an NPC's
+     * memory of the fight keeps the dice.
+     */
     resolveStrike(attacker, defender, profile) {
         const strike = profile ?? this.weaponProfile(attacker, defender);
-        const lines = [];
+        const world = [];
+        const meta = [];
+        const lines = world; // the damage branches below narrate into the world
         // Firing costs a round; the last one gets a warning line.
         if (strike.weaponItem?.isFirearm()) {
             strike.weaponItem.fireRound();
@@ -265,29 +300,61 @@ export class CombatExchange {
         }
         const attack = rollPool(strike.pool);
         const defense = rollPool(defender.getDefensePool());
-        lines.push(`${attacker.name} attacks ${defender.name} ${strike.label}:`);
-        lines.push(`  Attack:  ${formatRoll(attack)}`);
-        lines.push(`  Defense: ${formatRoll(defense)}`);
+        const header = `${attacker.name} attacks ${defender.name} ${strike.label}`;
+        meta.push(`${header}:`);
+        meta.push(`  Attack:  ${formatRoll(attack)}`);
+        meta.push(`  Defense: ${formatRoll(defense)}`);
         const dryWarning = strike.weaponItem?.isFirearm() && strike.weaponItem.ammo === 0
             ? [`  ${attacker.name}'s ${strike.weaponItem.name} clicks empty -- that was the last round.`]
             : [];
         const netHits = attack.hits - defense.hits;
         if (attack.criticalGlitch) {
-            lines.push(`  ${attacker.name}'s attack goes catastrophically wrong -- a clean miss, and everyone nearby heard it.`);
-            return [...lines, ...dryWarning];
+            world.push(`${header} -- and it goes catastrophically wrong: a clean miss, and everyone nearby heard it.`);
+            return { world: [...world, ...dryWarning], meta };
         }
         if (netHits <= 0) {
-            lines.push(`  ${defender.name} evades the attack.`);
-            return [...lines, ...dryWarning];
+            world.push(`${header} -- ${defender.name} evades.`);
+            return { world: [...world, ...dryWarning], meta };
         }
         const incoming = strike.damageBase + netHits;
         const soak = rollPool(strike.soakPool);
         const dealt = Math.max(0, incoming - soak.hits);
-        lines.push(`  Hit! ${netHits} net -- ${incoming} damage incoming.`);
-        lines.push(`  Soak:    ${formatRoll(soak)}`);
+        meta.push(`  Hit! ${netHits} net -- ${incoming} damage incoming.`);
+        meta.push(`  Soak:    ${formatRoll(soak)}`);
         if (dealt === 0) {
-            lines.push(`  ${defender.name} shrugs it off -- no damage gets through.`);
-            return [...lines, ...dryWarning];
+            world.push(`${header} -- ${defender.name} shrugs it off; nothing gets through.`);
+            return { world: [...world, ...dryWarning], meta };
+        }
+        world.push(`${header} -- HIT:`);
+        // A COMPANION SHELL routes damage into its persistent DEVICE: an
+        // autonomous drone's hull (Item.droneDamage), an agent's deck (RAW
+        // p.246: attacks on the agent damage the deck -- shared monitor).
+        // No biofeedback -- nobody's brain rides a dog-brain. When the
+        // device dies, the shell's own track is filled so the caller's
+        // normal death flow (resolveDeath -> removeActor -> onActorRemoved)
+        // fires without a parallel path.
+        if (defender instanceof NPC && defender.boundDevice) {
+            const device = defender.boundDevice;
+            if (device.isDrone()) {
+                device.takeDroneDamage(dealt);
+                this.logger.write(`${attacker.name} dealt ${dealt} HULL damage to companion ${defender.name} (${device.droneDamage}/${device.maxDroneBoxes}).`);
+                lines.push(`  ${defender.name} takes ${dealt} box${dealt === 1 ? '' : 'es'} to the airframe: ${device.droneSummary()}`);
+                if (device.isWrecked) {
+                    defender.takeDamage(defender.maxConditionBoxes);
+                    lines.push(`  The frame comes apart -- rotors, casing, sparks.`);
+                }
+                return { world: [...lines, ...dryWarning], meta };
+            }
+            if (device.isCyberdeck()) {
+                device.takeDeckDamage(dealt);
+                this.logger.write(`${attacker.name} dealt ${dealt} MATRIX damage to agent ${defender.name}'s host deck (${device.deckDamage}/${device.maxDeckBoxes}).`);
+                lines.push(`  The hit lands on the deck the agent runs on: ${device.deckSummary()}`);
+                if (device.isBricked) {
+                    defender.takeDamage(defender.maxConditionBoxes);
+                    lines.push(`  The deck BRICKS -- the agent derezzes mid-instruction.`);
+                }
+                return { world: [...lines, ...dryWarning], meta };
+            }
         }
         // A JUMPED-IN RIGGER's presence is the airframe: every box lands on
         // the drone's hull monitor, and HALF (rounded up) bleeds through the
@@ -315,7 +382,7 @@ export class CombatExchange {
                 lines.push(`  ${drone.name} comes apart mid-air -- rotors, casing, sparks --`);
                 lines.push(...leaveDrone(this.scene, defender, { forced: true, reason: `The airframe dies around you.` }));
             }
-            return [...lines, ...dryWarning];
+            return { world: [...lines, ...dryWarning], meta };
         }
         // A jacked-in visitor takes MATRIX damage (only visitors have a
         // simMode -- native ice's normal track IS its integrity, so it takes
@@ -344,7 +411,7 @@ export class CombatExchange {
                     lines.push(`  ${deck.name} BRICKS -- the persona collapses into static --`);
                     lines.push(...leaveMatrix(this.scene, defender, { forced: true, reason: `The ice burns your deck out from under you.` }));
                 }
-                return [...lines, ...dryWarning];
+                return { world: [...lines, ...dryWarning], meta };
             }
             // Deckless: the living persona. Fall through to the stun branch.
         }
@@ -363,7 +430,7 @@ export class CombatExchange {
             this.logger.write(`${attacker.name} dealt ${dealt} boxes to ${defender.name} (${defender.damageTaken}/${defender.maxConditionBoxes}).`);
             lines.push(`  ${defender.name} takes ${dealt} box${dealt === 1 ? '' : 'es'}: ${defender.conditionSummary()}`);
         }
-        return [...lines, ...dryWarning];
+        return { world: [...lines, ...dryWarning], meta };
     }
     /**
      * Death/knockout narration is announced BEFORE the removal side effects
@@ -374,6 +441,23 @@ export class CombatExchange {
      * full STUN track -- see cast.ts drain) rather than a death: same
      * out-of-the-run consequences, honestly narrated as unconsciousness.
      */
+    /**
+     * The PLAYER dropped from a full STUN track: out of the fight, not out
+     * of the game (RAW p.379 "out of action for the rest of the fight";
+     * instant death is physical overflow only, p.170). No endGame here --
+     * Scene.beginPlayerKnockout defers judgment until the room settles:
+     * hostiles all down/surrendered/gone means the player comes to with a
+     * Body + Willpower recovery (p.207); a hostile left standing over them
+     * with nobody fighting for them means the street decides, as ever.
+     */
+    async resolvePlayerKnockout(killer) {
+        const p = this.scene.getPlayer();
+        this.logger.write(`CombatExchange: ${killer.name} knocked out ${p.name} (stun-full) -- judgment deferred to the room.`);
+        const lines = [`The world tilts and goes dark -- you're out cold on the floor, breathing shallow. The fight goes on without you.`];
+        await this.announce(lines);
+        this.scene.beginPlayerKnockout([killer.name]);
+        return ['', ...lines];
+    }
     async resolveDeath(fallen, killer, opts) {
         const room = fallen.currentLocation;
         const isPlayer = fallen === this.scene.getPlayer();
@@ -405,9 +489,22 @@ export class CombatExchange {
             });
             return ['', ...lines];
         }
-        const npcFall = (opts?.fatal ?? true)
-            ? `${fallen.name} goes down -- dead before they hit the floor. Their gear scatters across ${room.name}.`
-            : `${fallen.name} collapses, out cold -- down for the count. Their gear scatters across ${room.name}.`;
+        // Companions don't die like meat. A spirit's condition track filling
+        // is a DISRUPTION -- the vessel ruptures and the spirit snaps back to
+        // its own plane (SR5e p.303). An agent derezzes with the deck it runs
+        // on, and a drone shell is just machinery coming apart -- none of
+        // them have a corpse or gear to scatter (a real session's ice kill
+        // read "gear scatters across Grid Vault" for a program).
+        const companionKind = fallen instanceof NPC ? fallen.companionKind : undefined;
+        const npcFall = companionKind === 'spirit'
+            ? `${fallen.name} ruptures -- a pressure-drop like the room exhaling -- DISRUPTED, snapped back to its own plane. The binding is over.`
+            : companionKind === 'agent'
+                ? `${fallen.name} DEREZZES -- its icon shears into static and rains out of the grid, gone with the deck that ran it.`
+                : companionKind === 'drone'
+                    ? `${fallen.name} comes apart -- rotors, plating, and sparks skidding across ${room.name}. The frame is wrecked.`
+                    : (opts?.fatal ?? true)
+                        ? `${fallen.name} goes down -- dead before they hit the floor. Their gear scatters across ${room.name}.`
+                        : `${fallen.name} collapses, out cold -- down for the count. Their gear scatters across ${room.name}.`;
         const lines = [opts?.fallLine ?? npcFall];
         await this.announce(lines);
         // scene.removeActor drops everything they carried AND wore where they
@@ -432,6 +529,9 @@ export class CombatExchange {
         // The fight autopilot's trigger: a settled exchange involving the
         // player schedules their next auto action (see utilities/auto-fight.ts).
         this.scene.notifyExchangeSettled(this._combatants);
+        // A spirit whose services ran out departs once the dust settles
+        // (RAW p.302: the bargain is spent).
+        this.scene.ownerGame?.settleSpiritServices?.();
         if (this.actor === this.scene.getPlayer()) {
             return '';
         }