@maka/maka-cli 5.164.0 → 5.166.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.164.0",
+  "version": "5.166.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",

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

@@ -28,9 +28,25 @@ export async function runNpcActionPhase(enc, npc) {
     const logger = Logger.getInstance();
     if (npc.isIncapacitated() || npc.surrendered)
         return;
+    // THE ROOM SEES THE PHASE (aCjJiDDJM9jGZJeER, web run 2026-09-11: "I
+    // can't see Hammerhead Joe doing any combat" -- a hostile NPC). The
+    // verbs below answer the ACTOR: their return text is second person,
+    // goes into the NPC's own history and to a shell's master, and to
+    // nobody else. Only an attack that connects narrates through the
+    // exchange. So a phase spent readying a gun, reloading, closing the
+    // distance or taking cover -- most of a melee NPC's phases -- read to
+    // the player as "Joe acts (Initiative 9)." followed by nothing, which
+    // is the report. One third-person line per action, room-scoped, the
+    // same scope the exchange itself announces on.
+    const room = npc.currentLocation;
+    const tell = (line) => {
+        if (room)
+            logger.log(line, { room: room.name });
+    };
     const enemies = enc.enemiesOf(npc);
     if (enemies.length === 0) {
         logger.write(`Brain: ${npc.name} has nobody to fight -- phase forfeited.`);
+        tell(`${npc.name} looks for a target and finds none.`);
         return;
     }
     const target = pickTarget(npc, enemies);
@@ -49,8 +65,11 @@ export async function runNpcActionPhase(enc, npc) {
         if (weapon && !npc.weaponDrawn) {
             const r = await npc.actInCombat('draw');
             logger.write(`Brain: ${npc.name} draw -> ${r}`);
-            if (!npc.weaponDrawn)
+            if (!npc.weaponDrawn) {
+                tell(`${npc.name} fumbles for ${weapon.name} and comes up empty-handed.`);
                 return; // refused -- nothing else will go better
+            }
+            tell(`${npc.name} readies ${weapon.name}.`);
             continue;
         }
         // 2. A dry gun: reload if the pack allows, else it is a club.
@@ -58,6 +77,7 @@ export async function runNpcActionPhase(enc, npc) {
         if (dry && !weapon.jammed && hasAmmo(npc)) {
             const r = await npc.actInCombat('reload');
             logger.write(`Brain: ${npc.name} reload -> ${r}`);
+            tell(`${npc.name} reloads ${weapon.name}.`);
             return; // a reload is the phase (p.163 Reloading Weapons)
         }
         const melee = !firearm || dry || weapon.jammed;
@@ -68,16 +88,22 @@ export async function runNpcActionPhase(enc, npc) {
                 logger.write(`Brain: ${npc.name} move to ${targetSpot} -> ${r}`);
                 if (!canReach(npc, targetSpot)) {
                     // Couldn't close this turn: get behind something and wait.
+                    tell(`${npc.name} closes on ${target.name} but can't cover the ground this turn.`);
                     if (!isInCover(npc) && coverAvailableFor(npc) && (enc.budgetOf(npc)?.simple ?? 0) > 0) {
                         await npc.actInCombat('cover');
+                        if (isInCover(npc))
+                            tell(`${npc.name} ducks behind cover.`);
                     }
                     return;
                 }
+                tell(`${npc.name} closes on ${target.name}.`);
             }
             const b = enc.budgetOf(npc);
             if (b?.complexAvailable) {
                 const r = await npc.actInCombat(`attack ${target.name}`);
                 logger.write(`Brain: ${npc.name} attack ${target.name} -> ${r.split('\n')[0]}`);
+                if (!enc.budgetOf(npc)?.attackTaken)
+                    tell(`${npc.name} goes for ${target.name} and can't make it count.`);
             }
             return;
         }
@@ -87,13 +113,18 @@ export async function runNpcActionPhase(enc, npc) {
             logger.write(`Brain: ${npc.name} cover -> ${r}`);
             if (!isInCover(npc))
                 return;
+            tell(`${npc.name} ducks behind cover.`);
             continue;
         }
         if (!budget.attackTaken && budget.simple >= 1) {
             const r = await npc.actInCombat(`attack ${target.name}`);
             logger.write(`Brain: ${npc.name} attack ${target.name} -> ${r.split('\n')[0]}`);
-            if (!enc.budgetOf(npc)?.attackTaken)
+            if (!enc.budgetOf(npc)?.attackTaken) {
+                // The shot was refused (range, line, a jam): the room should
+                // see the attempt, not silence.
+                tell(`${npc.name} lines up on ${target.name} and the shot doesn't come.`);
                 return; // refused: don't loop on it
+            }
             continue;
         }
         return;

package/bundle/typescript/src/commands/game/sideQuest/utilities/repro-launch.js

@@ -156,6 +156,70 @@ export function readReproFile(candidate) {
  * accepts a sink array, so per step we take the meta events emitted
  * since the last step and print them under the output they explain.
  */
+/** The bench's actor. One name, used for the seat and for the
+ *  visibility filter below. */
+export const REPRO_ACTOR = 'Tester';
+const stripTags = (s) => s.replace(/\{\/?[a-z-]+\}/g, '');
+/**
+ * ONE STEP OF TRANSCRIPT, pure: the command's return string, then what
+ * the actor HEARD, then the dice, then the panels.
+ *
+ * THE LOG CHANNEL IS PART OF THE TRANSCRIPT, and it was missing
+ * (aCjJiDDJM9jGZJeER, 2026-09-11). A command's return string is what the
+ * engine says to the one who typed it; everything a room is told -- an
+ * NPC drawing, closing, taking cover, a companion's line, the exchange
+ * narration itself -- goes out as `log` events scoped to the room and
+ * resolved to the players standing in it. The dry run printed the reply
+ * and the dice and dropped every one of those, so a bench whose whole
+ * point is "the room now sees Joe's Action Phase" showed Joe's roll in
+ * the mechanics block and NOT the line the fix added -- the same "a
+ * bench that cannot display its own point" shape this renderer has been
+ * extended for twice already (mechanics, then panels).
+ *
+ * Only what THE ACTOR can see: an event resolved to other players is
+ * not on this transcript, because the bench sits one runner at one
+ * table and a line they never saw is not evidence of anything.
+ */
+export function renderStepLines(step, text, fresh, actor = REPRO_ACTOR) {
+    const lines = [];
+    lines.push(`> ${step}`);
+    lines.push(stripTags(text ?? '(no output)'));
+    const heard = fresh.filter(e => e.channel === 'log'
+        && (e.visibleTo === 'all' || e.visibleTo.includes(actor)));
+    for (const h of heard) {
+        const body = stripTags(h.text).replace(/\s+$/gm, '');
+        if (body.trim().length === 0)
+            continue;
+        for (const row of body.split('\n'))
+            lines.push(`  [heard] ${row}`);
+    }
+    for (const m of fresh.filter(e => e.channel === 'meta')) {
+        lines.push(`  [mechanics] ${stripTags(m.text)}`);
+    }
+    // THE DOCKED PANELS ARE PART OF THE TRANSCRIPT TOO, for exactly
+    // the reason the mechanics ticker above is.
+    //
+    // The map and room boxes are a THIRD channel: not the command's
+    // return string, not the meta ticker, but per-player `system`
+    // events. A bench whose subject is a panel -- "the NPC I can see
+    // is not on the room map", an elevation bar, a district caption --
+    // dry-ran green while showing none of what it exists to show,
+    // which is the same "a bench that cannot display its own point"
+    // failure this function was already extended once to fix.
+    //
+    // Printed only when the panel has something to say: an empty
+    // event is the jacked-into-the-matrix contract, and blank
+    // [room]/[map] blocks on every step would bury the steps.
+    for (const p of fresh.filter(e => e.channel === 'system' && (e.kind === 'map' || e.kind === 'room'))) {
+        const body = stripTags(p.text ?? '').replace(/\s+$/gm, '');
+        if (body.trim().length === 0)
+            continue;
+        for (const row of body.split('\n'))
+            lines.push(`  [${p.kind}] ${row}`);
+    }
+    lines.push('');
+    return lines;
+}
 export async function dryRunRepro(repro) {
     const [{ buildReproScene, reproArchetypeName }, { bootSession, saveForArchetype }] = await Promise.all([
         import('../factories/repro-scene.js'),
@@ -170,10 +234,9 @@ export async function dryRunRepro(repro) {
     const events = [];
     const session = await bootSession({
         seed: built.seed,
-        players: [saveForArchetype('Tester', reproArchetypeName(fixture))],
+        players: [saveForArchetype(REPRO_ACTOR, reproArchetypeName(fixture))],
         events,
     });
-    const strip = (s) => s.replace(/\{\/?[a-z-]+\}/g, '');
     const lines = [];
     // THE FIRST PAINT IS NOT PART OF STEP ONE. bootSession pushes every
     // player's panels the moment the session comes up (B7NNNesy5gvRSbZpp),
@@ -183,40 +246,13 @@ export async function dryRunRepro(repro) {
     let drained = events.length;
     try {
         for (const step of repro.steps) {
-            const { text } = await session.command('Tester', step);
-            lines.push(`> ${step}`);
-            lines.push(strip(text ?? '(no output)'));
+            const { text } = await session.command(REPRO_ACTOR, step);
             // Only what THIS step produced: the cursor advances past
-            // everything seen, including log events, so a step that emits no
-            // dice prints no Mechanics block rather than repeating the last
-            // one that did.
+            // everything seen, so a step that emits no dice prints no
+            // Mechanics block rather than repeating the last one that did.
             const fresh = events.slice(drained);
             drained = events.length;
-            for (const m of fresh.filter(e => e.channel === 'meta')) {
-                lines.push(`  [mechanics] ${strip(m.text)}`);
-            }
-            // THE DOCKED PANELS ARE PART OF THE TRANSCRIPT TOO, for exactly
-            // the reason the mechanics ticker above is.
-            //
-            // The map and room boxes are a THIRD channel: not the command's
-            // return string, not the meta ticker, but per-player `system`
-            // events. A bench whose subject is a panel -- "the NPC I can see
-            // is not on the room map", an elevation bar, a district caption --
-            // dry-ran green while showing none of what it exists to show,
-            // which is the same "a bench that cannot display its own point"
-            // failure this function was already extended once to fix.
-            //
-            // Printed only when the panel has something to say: an empty
-            // event is the jacked-into-the-matrix contract, and blank
-            // [room]/[map] blocks on every step would bury the steps.
-            for (const p of fresh.filter(e => e.channel === 'system' && (e.kind === 'map' || e.kind === 'room'))) {
-                const body = strip(p.text ?? '').replace(/\s+$/gm, '');
-                if (body.trim().length === 0)
-                    continue;
-                for (const row of body.split('\n'))
-                    lines.push(`  [${p.kind}] ${row}`);
-            }
-            lines.push('');
+            lines.push(...renderStepLines(step, text, fresh));
         }
     }
     finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.164.0",
+  "version": "5.166.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",