@maka/maka-cli 5.10.0 → 5.12.0

package/bundle/typescript/src/commands/game/sideQuest/scenes/scene2.json

@@ -12,7 +12,9 @@
   ],
   "currency": {
     "type": "nuyen",
-    "authorityRoomTags": ["Bank"]
+    "authorityRoomTags": [
+      "Bank"
+    ]
   },
   "rumors": [
     "The Haze Dragons doubled their watch on the Smuggler's Tunnel -- something's moving under the district that even Brick won't name.",
@@ -143,7 +145,7 @@
         "color": "Black",
         "texture": "Rugged",
         "rating": "Common",
-        "weight": 2.0
+        "weight": 2
       },
       {
         "name": "Knockoff Smart Glasses",
@@ -158,22 +160,38 @@
       }
     ]
   },
-
   "rooms": [
     {
       "name": "Neon Strip",
       "description": "The spine of the Purple Haze district: rain-slick pavement under a canopy of violet neon, food smoke, and AR graffiti three layers deep. Everyone you need is a block away in some direction.",
       "roomType": "Street",
-      "tags": ["residence"],
+      "tags": [
+        "residence"
+      ],
       "supportedLifestyles": {
-        "residenceTypes": ["Street", "Squatter"]
+        "residenceTypes": [
+          "Street",
+          "Squatter"
+        ]
       },
       "isStartRoom": true,
       "exits": [
-        { "direction": "north", "targetRoom": "Purple Haze Bar" },
-        { "direction": "east", "targetRoom": "Night Market" },
-        { "direction": "south", "targetRoom": "Rain-Chewed Alley" },
-        { "direction": "west", "targetRoom": "Mama Wu's Noodles" }
+        {
+          "direction": "north",
+          "targetRoom": "Purple Haze Bar"
+        },
+        {
+          "direction": "east",
+          "targetRoom": "Night Market"
+        },
+        {
+          "direction": "south",
+          "targetRoom": "Rain-Chewed Alley"
+        },
+        {
+          "direction": "west",
+          "targetRoom": "Mama Wu's Noodles"
+        }
       ]
     },
     {
@@ -182,13 +200,32 @@
       "roomType": "Bar",
       "size": "large",
       "spots": [
-        { "name": "door", "description": "The street door, where the neon bleeds in." },
-        { "name": "bar", "description": "The long counter, sticky with decades." },
-        { "name": "booths", "description": "High-backed booths built for quiet deals.", "tags": ["cover-partial"] },
-        { "name": "back corner", "description": "The dim table nobody chooses by accident." }
+        {
+          "name": "door",
+          "description": "The street door, where the neon bleeds in."
+        },
+        {
+          "name": "bar",
+          "description": "The long counter, sticky with decades."
+        },
+        {
+          "name": "booths",
+          "description": "High-backed booths built for quiet deals.",
+          "tags": [
+            "cover-partial"
+          ]
+        },
+        {
+          "name": "back corner",
+          "description": "The dim table nobody chooses by accident."
+        }
       ],
       "exits": [
-        { "direction": "north", "targetRoom": "Bar Backroom", "atSpot": "back corner" }
+        {
+          "direction": "north",
+          "targetRoom": "Bar Backroom",
+          "atSpot": "back corner"
+        }
       ]
     },
     {
@@ -197,9 +234,15 @@
       "roomType": "Bar",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "card table" },
-        { "name": "crates" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "card table"
+        },
+        {
+          "name": "crates"
+        }
       ]
     },
     {
@@ -208,8 +251,14 @@
       "roomType": "Restaurant",
       "size": "small",
       "spots": [
-        { "name": "door", "description": "A bead curtain and a blast of chili-scented steam." },
-        { "name": "counter", "description": "Six stools and the pot that never empties." }
+        {
+          "name": "door",
+          "description": "A bead curtain and a blast of chili-scented steam."
+        },
+        {
+          "name": "counter",
+          "description": "Six stools and the pot that never empties."
+        }
       ]
     },
     {
@@ -218,14 +267,35 @@
       "roomType": "Market",
       "size": "large",
       "spots": [
-        { "name": "entrance" },
-        { "name": "stalls" },
-        { "name": "shadowed edge", "tags": ["cover-partial"] }
+        {
+          "name": "entrance"
+        },
+        {
+          "name": "stalls"
+        },
+        {
+          "name": "shadowed edge",
+          "tags": [
+            "cover-partial"
+          ]
+        }
       ],
       "exits": [
-        { "direction": "north", "targetRoom": "Ironmonger's Arms", "atSpot": "stalls" },
-        { "direction": "east", "targetRoom": "Circuit Bazaar", "atSpot": "stalls" },
-        { "direction": "south", "targetRoom": "Doc Halloran's Clinic", "atSpot": "stalls" }
+        {
+          "direction": "north",
+          "targetRoom": "Ironmonger's Arms",
+          "atSpot": "stalls"
+        },
+        {
+          "direction": "east",
+          "targetRoom": "Circuit Bazaar",
+          "atSpot": "stalls"
+        },
+        {
+          "direction": "south",
+          "targetRoom": "Doc Halloran's Clinic",
+          "atSpot": "stalls"
+        }
       ]
     },
     {
@@ -235,9 +305,15 @@
       "owner": "Torque",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "counter" },
-        { "name": "racks" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "counter"
+        },
+        {
+          "name": "racks"
+        }
       ]
     },
     {
@@ -248,12 +324,21 @@
       "hasNode": true,
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "counter" },
-        { "name": "workbenches" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "counter"
+        },
+        {
+          "name": "workbenches"
+        }
       ],
       "exits": [
-        { "direction": "east", "targetRoom": "Talismonger's Hut" }
+        {
+          "direction": "east",
+          "targetRoom": "Talismonger's Hut"
+        }
       ]
     },
     {
@@ -264,8 +349,12 @@
       "warded": true,
       "size": "small",
       "spots": [
-        { "name": "doorway" },
-        { "name": "altar table" }
+        {
+          "name": "doorway"
+        },
+        {
+          "name": "altar table"
+        }
       ]
     },
     {
@@ -275,9 +364,15 @@
       "owner": "Doc Halloran",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "cots" },
-        { "name": "supply shelf" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "cots"
+        },
+        {
+          "name": "supply shelf"
+        }
       ]
     },
     {
@@ -285,8 +380,14 @@
       "description": "The way down: an alley chewed ragged by decades of acid rain, its storm drains breathing cold air up from the undermarket below.",
       "roomType": "Street",
       "exits": [
-        { "direction": "south", "targetRoom": "Flooded Undermarket" },
-        { "direction": "east", "targetRoom": "Union Pawnshop" }
+        {
+          "direction": "south",
+          "targetRoom": "Flooded Undermarket"
+        },
+        {
+          "direction": "east",
+          "targetRoom": "Union Pawnshop"
+        }
       ]
     },
     {
@@ -296,9 +397,15 @@
       "owner": "Whisper",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "counter" },
-        { "name": "back shelves" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "counter"
+        },
+        {
+          "name": "back shelves"
+        }
       ]
     },
     {
@@ -307,13 +414,27 @@
       "roomType": "Market",
       "size": "large",
       "spots": [
-        { "name": "entrance stair" },
-        { "name": "stilted stalls" },
-        { "name": "dry platforms" }
+        {
+          "name": "entrance stair"
+        },
+        {
+          "name": "stilted stalls"
+        },
+        {
+          "name": "dry platforms"
+        }
       ],
       "exits": [
-        { "direction": "south", "targetRoom": "Smuggler's Tunnel", "atSpot": "stilted stalls" },
-        { "direction": "west", "targetRoom": "Condemned Chapel", "atSpot": "dry platforms" }
+        {
+          "direction": "south",
+          "targetRoom": "Smuggler's Tunnel",
+          "atSpot": "stilted stalls"
+        },
+        {
+          "direction": "west",
+          "targetRoom": "Condemned Chapel",
+          "atSpot": "dry platforms"
+        }
       ]
     },
     {
@@ -321,8 +442,14 @@
       "description": "A bore of cracked ferrocrete running under the district, lit by chemlights and lined with cargo that never saw customs.",
       "roomType": "Tunnel",
       "exits": [
-        { "direction": "east", "targetRoom": "Haze Dragons Turf" },
-        { "direction": "south", "targetRoom": "Sim Den" }
+        {
+          "direction": "east",
+          "targetRoom": "Haze Dragons Turf"
+        },
+        {
+          "direction": "south",
+          "targetRoom": "Sim Den"
+        }
       ]
     },
     {
@@ -332,9 +459,18 @@
       "owner": "Brick",
       "size": "medium",
       "spots": [
-        { "name": "gate" },
-        { "name": "fire barrel" },
-        { "name": "stacked crates", "tags": ["cover-partial"] }
+        {
+          "name": "gate"
+        },
+        {
+          "name": "fire barrel"
+        },
+        {
+          "name": "stacked crates",
+          "tags": [
+            "cover-partial"
+          ]
+        }
       ]
     },
     {
@@ -343,12 +479,23 @@
       "roomType": "Chapel",
       "size": "medium",
       "spots": [
-        { "name": "doorway" },
-        { "name": "nave" },
-        { "name": "altar" }
+        {
+          "name": "doorway"
+        },
+        {
+          "name": "nave"
+        },
+        {
+          "name": "altar"
+        }
       ],
       "exits": [
-        { "direction": "down", "targetRoom": "Chapel Crypt", "puzzle": "Crypt Grate", "atSpot": "altar" }
+        {
+          "direction": "down",
+          "targetRoom": "Chapel Crypt",
+          "puzzle": "Crypt Grate",
+          "atSpot": "altar"
+        }
       ]
     },
     {
@@ -357,8 +504,12 @@
       "roomType": "Crypt",
       "size": "small",
       "spots": [
-        { "name": "entry stairs" },
-        { "name": "reliquary niches" }
+        {
+          "name": "entry stairs"
+        },
+        {
+          "name": "reliquary niches"
+        }
       ]
     },
     {
@@ -369,8 +520,12 @@
       "nodeAccess": "wired",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "couch rows" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "couch rows"
+        }
       ]
     },
     {
@@ -1208,6 +1363,90 @@
       "currencyAmount": 300,
       "room": "Chapel Crypt",
       "atSpot": "reliquary niches"
+    },
+    {
+      "name": "Torque's Commlink",
+      "description": "A ruggedized shop commlink, speed-dial worn down to the metal -- Torque answers for paying customers.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Gunmetal",
+      "texture": "Scarred Polymer",
+      "rating": "Standard",
+      "weight": 0.2,
+      "heldBy": "Torque",
+      "owner": "Torque",
+      "transferable": false
+    },
+    {
+      "name": "Ratchet's Commlink",
+      "description": "A franken-link of three generations of parts that somehow outperforms all of them.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Circuit Green",
+      "texture": "Taped Seams",
+      "rating": "Rare",
+      "weight": 0.2,
+      "heldBy": "Ratchet",
+      "owner": "Ratchet",
+      "transferable": false
+    },
+    {
+      "name": "Halloran's Commlink",
+      "description": "A clinic-grade commlink with a triage tone nobody in the district ignores.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Bone White",
+      "texture": "Antiseptic Plastic",
+      "rating": "Standard",
+      "weight": 0.2,
+      "heldBy": "Doc Halloran",
+      "owner": "Doc Halloran",
+      "transferable": false
+    },
+    {
+      "name": "Cray's Commlink",
+      "description": "An ancient rigger deck stripped down to a talk-box -- the dead datajack port still blinks.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Faded Orange",
+      "texture": "Worn Rubber",
+      "rating": "Common",
+      "weight": 0.2,
+      "heldBy": "Old Cray",
+      "owner": "Old Cray",
+      "transferable": false
+    },
+    {
+      "name": "Skitter's Commlink",
+      "description": "A knockoff commlink under three cracked screen protectors, ringtone set to a jingle.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Neon Pink",
+      "texture": "Sticker-Covered",
+      "rating": "Common",
+      "weight": 0.2,
+      "heldBy": "Skitter",
+      "owner": "Skitter",
+      "transferable": false
+    },
+    {
+      "name": "Whisper's Commlink",
+      "description": "A pawned-and-reclaimed executive commlink, call log encrypted twice.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Silver",
+      "texture": "Polished Glass",
+      "rating": "Standard",
+      "weight": 0.2,
+      "heldBy": "Whisper",
+      "owner": "Whisper",
+      "transferable": false
     }
   ],
   "puzzles": [

package/bundle/typescript/src/commands/game/sideQuest/types/save-file.d.ts

@@ -25,6 +25,9 @@ export interface ISavedItem extends IItemSeedJson {
     jammed?: boolean;
     deckDamage?: number;
     droneDamage?: number;
+    /** Cyberdeck runtime (p.227): programs in running memory + array deal. */
+    loadedPrograms?: string[];
+    deckOrder?: number[];
 }
 /**
  * Equipment layout keyed "group.slot" ("rightHand.weapon") -> the FULL
@@ -155,7 +158,29 @@ export interface ISavedGameState {
         spent: number;
         gigs: number;
         asked: boolean;
+        role?: string;
     }][];
+    /** SWAG orders in flight (commands/source.ts): paid, awaiting the
+     *  next homecoming. Optional -- absent in pre-swag v1 saves. */
+    procurements?: {
+        contact: string;
+        itemConfig: ISavedItem;
+        price: number;
+    }[];
+    /** DocWagon contract (utilities/docwagon.ts). Optional -- uninsured. */
+    docwagon?: {
+        tier: string;
+        resuscsLeft: number;
+        homecomingsLeft: number;
+    };
+    /** Leadership's Command action (commands/lead.ts): the recruit riding
+     *  the next run, and who refused you at what loyalty. */
+    enlistedAlly?: {
+        name: string;
+        description: string;
+        combat: Record<string, unknown>;
+    };
+    commandRefusals?: Record<string, number>;
     fencedCategories: string[];
     /** Rumor pool stays seed-sourced; only the cursor + active persist. */
     rumorIndex: number;

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

@@ -8,7 +8,17 @@ import { STANCE_CYCLE } from './models/player.js';
 import { AutoFight } from './utilities/auto-fight.js';
 import { TERMINAL_RESET_SEQUENCE } from './utilities/terminal-reset.js';
 import { readSave } from './utilities/persistence.js';
+import { acquireSessionLock, releaseSessionLock } from './utilities/session-lock.js';
 import { SAVE_VERSION } from './types/save-file.js';
+// MENU verbs (player direction): pure-reference panels render in the
+// Mechanics column instead of the world log, keeping the narrative
+// clean. Hybrid read/act verbs whose output is mostly reference (deck,
+// qualities) ride along; transactional verbs (docwagon, buy, install)
+// stay in the world log where actions belong.
+const MENU_VERBS = new Set([
+    'contacts', 'sheet', 'stats', 'inv', 'inventory', 'equipment', 'eq',
+    'map', 'exits', 'spells', 'catalog', 'qualities', 'quality', 'deck', 'help',
+]);
 // 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
@@ -40,6 +50,26 @@ import { SAVE_VERSION } from './types/save-file.js';
     uni.chars.all = new RegExp(`(${uni.chars.all.source}|${pictographs})`, 'g');
 }
 export async function main(playerName, sceneSeed, options) {
+    // ONE TERMINAL PER RUNNER (see utilities/session-lock.ts): claim the
+    // save slot BEFORE blessed takes the terminal, so a refusal prints as
+    // plain text instead of flashing through a dying screen. The launcher
+    // already warned politely; this is the authoritative claim that wins
+    // the race two simultaneous launches would otherwise share. Released
+    // on EVERY exit path via the hook below; a crash leaves it to go
+    // stale (~90s) instead.
+    if (options.saveFilePath) {
+        const claim = acquireSessionLock(options.saveFilePath);
+        if (!claim.ok) {
+            console.error(`This runner is already jacked in from another terminal${claim.pid ? ` (PID ${claim.pid})` : ''}. One life, one session -- quit that one first.`);
+            process.exit(1);
+        }
+        process.on('exit', () => {
+            try {
+                releaseSessionLock(options.saveFilePath);
+            }
+            catch { /* never block the way out */ }
+        });
+    }
     // Create a screen object
     const screen = blessed.screen({
         smartCSR: true,
@@ -220,7 +250,14 @@ export async function main(playerName, sceneSeed, options) {
                     // 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') {
+                    // MENU commands (player direction): reference panels render in
+                    // the Mechanics column, not the world log -- the narrative
+                    // stays narrative, and "contacts" doesn't scroll the fight off
+                    // the screen. These verbs echo into the panel (as its divider)
+                    // instead of the log. Transactional verbs (docwagon, buy...)
+                    // stay in the world log: their output is things HAPPENING.
+                    const isMenuVerb = MENU_VERBS.has(echoVerb ?? '');
+                    if (input.trim().length > 0 && echoVerb !== 'clear' && !isMenuVerb) {
                         game.logBox.pushLine('');
                         if (echoVerb !== 'say') {
                             game.logBox.pushLine(`{cyan-fg}> ${input.trim()}{/cyan-fg}`);
@@ -263,8 +300,41 @@ export async function main(playerName, sceneSeed, options) {
                     // Empty responses stop printing blank filler -- the turn-block
                     // echo above is the separator now.
                     if (response) {
-                        game.logBox.pushLine(response);
-                        game.followLog();
+                        // Route on the verb the game actually RAN, not the typed
+                        // word: a corrected typo ("sjeet" -> "sheet") must still
+                        // land its menu in the panel. The correction receipt line
+                        // stays in the world log (standing ruling: it's the only
+                        // receipt for a command you didn't type).
+                        const ranMenuVerb = MENU_VERBS.has(game.lastResolvedVerb || echoVerb || '');
+                        let panelBody = response;
+                        if (ranMenuVerb && !isMenuVerb && response.startsWith('(read ')) {
+                            const nl = response.indexOf('\n');
+                            const receipt = nl === -1 ? response : response.slice(0, nl);
+                            panelBody = nl === -1 ? '' : response.slice(nl + 1);
+                            game.logBox.pushLine(receipt);
+                            game.followLog();
+                        }
+                        if (ranMenuVerb && panelBody) {
+                            // pushLine, NOT insertBottom: insertBottom targets the
+                            // bottom of the VISIBLE view, and in a no-render loop it
+                            // reuses the same index -- every menu rendered bottom-up
+                            // (player screenshot). pushLine appends to the content.
+                            // Divider names the command as RUN: typed args survive, a
+                            // corrected verb replaces the typo'd one.
+                            const dividerLabel = isMenuVerb
+                                ? input.trim()
+                                : [game.lastResolvedVerb, ...input.trim().split(' ').slice(1)].join(' ').trim();
+                            game.metaBox.pushLine(`{blue-fg}── ${dividerLabel} ──{/blue-fg}`);
+                            for (const line of panelBody.split('\n')) {
+                                game.metaBox.pushLine(line);
+                            }
+                            game.metaBox.scrollTo(game.metaBox.getScrollHeight());
+                            screen.render();
+                        }
+                        else if (!ranMenuVerb) {
+                            game.logBox.pushLine(response);
+                            game.followLog();
+                        }
                     }
                 }
                 catch (error) {