@maka/maka-cli 5.17.17 → 5.17.18

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

@@ -6,8 +6,7 @@ import { Room } from './models/_index.js';
 import { Door } from './models/door.js';
 import { SAVE_VERSION } from './types/save-file.js';
 import { serializePlayer, restorePlayer, captureHubOverlay, applyHubOverlay, writeSaveAtomic, deleteSave, restoreItem, readSave, serializeItem, saveSlug, } from './utilities/persistence.js';
-import { appendCrewLedger } from './utilities/crew-ledger.js';
-import { heartbeatPresence, heartbeatPresenceNow, ghostHireable, syncCrewLedger, claimGhostEarnings } from './utilities/social.js';
+import { heartbeatPresence, heartbeatPresenceNow } from './utilities/social.js';
 import { pushSave, burnCloudSaveFor } from './utilities/cloud-saves.js';
 import { DOCWAGON_TIERS, RESUSC_FEE, DEATH_COMP } from './utilities/docwagon.js';
 import { isFence, LIFESTYLE_TIERS } from './utilities/commerce.js';
@@ -77,7 +76,9 @@ import { ContactsCommand } from './commands/contacts.js';
 import { JumpCommand } from './commands/jump.js';
 import { InitiateCommand } from './commands/initiate.js';
 import { SummonCommand } from './commands/summon.js';
-import { CompileCommand } from './commands/compile.js';
+import { CompileCommand, SPRITE_TYPES } from './commands/compile.js';
+import { ThreadCommand } from './commands/thread.js';
+import { RegisterCommand } from './commands/register.js';
 import { OrderCommand } from './commands/order.js';
 import { DeployCommand, AgentCommand, RecallCommand } from './commands/companions.js';
 import { DeckCommand, LoadProgramCommand, UnloadProgramCommand } from './commands/deck.js';
@@ -227,9 +228,9 @@ export default class Game {
     // talent pool churns; whoever you HIRED is the persistent part.
     crewForHire = [];
     // PRESENCE (social layer, Phase B): a hub heartbeat announces this
-    // runner to the street's player list on maka-cli.com -- and carries
-    // the "hireable while away" ghost opt-in. Only beats while the scene
-    // IS the hub (the run is nobody's business); silent no-op logged out.
+    // runner to the street's player list on maka-cli.com. Only beats
+    // while the scene IS the hub (the run is nobody's business); silent
+    // no-op logged out.
     _presenceTimer;
     static PRESENCE_TICK_MS = 60_000;
     presencePayload() {
@@ -237,7 +238,6 @@ export default class Game {
             playerName: this.player.name,
             slug: saveSlug(this.player.name),
             hubName: this._hubName,
-            ghostHireable: ghostHireable(),
             // ONLINE means the LINK is live (player ruling): commlink equipped
             // and broadcasting. Pull the link or run silent -> off the street.
             linkUp: this.player.equipment.head?.commlink != null && !this.player.runningSilent,
@@ -294,23 +294,6 @@ export default class Game {
         this._presenceTimer = setInterval(() => this.beatPresence(), Game.PRESENCE_TICK_MS);
         this._presenceTimer.unref();
     }
-    /** Ghost earnings home delivery: what YOUR runner made riding in
-     *  other players' crews since last time. Fire-and-forget from hub
-     *  arrival beats; pays onto the job credstick when anything landed. */
-    async collectGhostEarnings() {
-        try {
-            const claimed = await claimGhostEarnings(saveSlug(this.player.name));
-            if (!claimed || this.scene !== this._hubScene)
-                return;
-            const paid = this.scene.payRunner(claimed.total, 'ghost earnings');
-            if (!paid)
-                return;
-            const jobs = claimed.entries.map(e => `"${e.job}" with ${e.hiredBy} (${e.amount}¥)`).join(', ');
-            Logger.getInstance().logWithColor(`While you were gone, your runner rode other crews: ${jobs}. ${paid.net}¥ certified lands on your stick.`, 'green');
-            this.updateStatus();
-        }
-        catch { /* offline -- next homecoming */ }
-    }
     static HIRE_NAMES = [
         'Jax', 'Sable', 'Vex', 'Rook', 'Nyx', 'Cinder', 'Halo', 'Grifter',
         'Static', 'Mercy', 'Tinder', 'Chrome Marie', 'Deacon', 'Fetch', 'Loa',
@@ -460,9 +443,6 @@ export default class Game {
             const cut = Math.floor(gross * (member.cutPct * scale) / 100);
             taken += cut;
             parts.push(`${member.name} ${member.cutPct}% (${cut}¥)`);
-            if (member.ghost) {
-                appendCrewLedger({ slug: member.ghost.slug, owner: member.ghost.owner, amount: cut, job: this.currentJobName ?? 'a job', when: new Date().toISOString() });
-            }
         }
         return { share: gross - taken, line: `Crew cut: ${parts.join(', ')}.` };
     }
@@ -732,6 +712,9 @@ export default class Game {
     // death both remove the entry; persistent state (the frame, the deck)
     // lives on Items in the player's possession, never here.
     companions = [];
+    /** A registered sprite folded for travel, waiting to re-shell at the
+     *  destination (the drone _pendingRedeploys school). */
+    _pendingSpriteRedeploy;
     // Drones deployed at travel time re-shell on arrival ("the rotors spin
     // back up at the curb") -- tracked as their items across the swap.
     _pendingRedeploys = [];
@@ -933,7 +916,15 @@ export default class Game {
                 lines.push(`Your bound spirit thins into the rain -- the summons doesn't outlast the ride.`);
             }
             else if (entry.kind === 'sprite') {
-                lines.push(`Your sprite decompiles into clean static -- the thread doesn't outlast the ride.`);
+                // A REGISTERED sprite persists (register.ts): it folds into
+                // your PAN for the ride and re-shells at the curb.
+                if (entry.registered && entry.spriteType) {
+                    this._pendingSpriteRedeploy = { spriteType: entry.spriteType, level: entry.force, tasks: entry.services ?? 0 };
+                    lines.push(`${entry.npc.name} folds into your PAN for the ride -- registered code travels with you.`);
+                }
+                else {
+                    lines.push(`Your sprite decompiles into clean static -- the thread doesn't outlast the ride.`);
+                }
             }
             else if (entry.kind === 'drone') {
                 lines.push(`The ${entry.boundDevice?.name ?? 'drone'} autopilots home to your hand for the ride.`);
@@ -960,8 +951,42 @@ export default class Game {
             if (shell)
                 lines.push(`The ${item.name}'s rotors spin back up at the curb.`);
         }
+        // A REGISTERED sprite re-shells from the PAN (register.ts).
+        if (this._pendingSpriteRedeploy) {
+            const spec = this._pendingSpriteRedeploy;
+            this._pendingSpriteRedeploy = undefined;
+            const line = this.respawnRegisteredSprite(spec);
+            if (line)
+                lines.push(line);
+        }
         return lines;
     }
+    /** Re-shell a registered sprite (travel arrival, or a resumed save).
+     *  Returns the arrival line, or undefined when the shell can't land
+     *  (name collision -- vanishingly rare). */
+    respawnRegisteredSprite(spec) {
+        const type = SPRITE_TYPES[spec.spriteType];
+        if (!type)
+            return undefined;
+        const shell = this.spawnCompanionShell({
+            name: `${type.name} Sprite (Level ${spec.level})`,
+            description: `A registered ${type.name.toLowerCase()} sprite riding ${this.player.name}'s PAN -- ${type.blurb}. It serves until its ${spec.tasks} task${spec.tasks === 1 ? '' : 's'} are spent.`,
+            kind: 'sprite',
+            combat: type.combat(spec.level),
+            room: this.player.currentLocation,
+            plane: 'matrix',
+            force: spec.level,
+            services: spec.tasks,
+        });
+        if (!shell)
+            return undefined;
+        const entry = this.companions.find(c => c.npc === shell);
+        if (entry) {
+            entry.registered = true;
+            entry.spriteType = spec.spriteType;
+        }
+        return `${shell.name} unfolds from your PAN, luminous and patient -- ${spec.tasks} task${spec.tasks === 1 ? '' : 's'} standing.`;
+    }
     /**
      * Records a real transaction with a hub NPC: first contact opens the
      * relationship at Loyalty 1 (a safeguard -- the hub cast is pre-seeded
@@ -1582,6 +1607,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('conjure', SummonCommand);
         CommandFactory.registerCommand('compile', CompileCommand);
         CommandFactory.registerCommand('decompile', CompileCommand);
+        CommandFactory.registerCommand('thread', ThreadCommand);
+        CommandFactory.registerCommand('register', RegisterCommand);
         // "At" spots (utilities/spots.ts): walk/move/approach are one
         // crossing; run and sprint are the fast modes (combat semantics in
         // the spot-move phase).
@@ -1768,16 +1795,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             // First deal of the for-hire board (rotates each homecoming).
             this.rollHireCandidates();
             // The street learns you're home (social layer): presence beats,
-            // unsynced ghost earnings go up, and anything YOUR runner earned
-            // riding other crews comes down. All fire-and-forget. The DDP hub
-            // link (run invites, shared sessions -- Phase C) warms up behind
-            // them.
+            // and the DDP hub link (run invites, shared sessions -- Phase C)
+            // warms up behind them. All fire-and-forget.
             this.startPresenceHeartbeat();
             void import('./utilities/shared-run.js')
                 .then(m => m.ensureHubLink(this))
                 .catch(() => undefined);
-            void syncCrewLedger();
-            void this.collectGhostEarnings();
             // The next run starts cooking the moment you're home (player
             // request): generation takes 20-40s, and waiting for the player
             // to CALL first meant "give me a bit" every time. Draft now --
@@ -1825,6 +1848,15 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         if (this._hubScene && this.scene === this._hubScene) {
             this.requestSave('hub-arrival');
         }
+        // A REGISTERED sprite from the save re-shells at the cot (the
+        // technomancer's persistent companion -- register.ts).
+        if (this._pendingSpriteRedeploy && this.scene === this._hubScene) {
+            const spec = this._pendingSpriteRedeploy;
+            this._pendingSpriteRedeploy = undefined;
+            const line = this.respawnRegisteredSprite(spec);
+            if (line)
+                Logger.getInstance().logWithColor(line, 'cyan');
+        }
         if (this._resume) {
             const pendingNote = this._pendingRunSeed
                 ? hint(`\n\n${FIXER_NAME}'s job is still on offer: "${this._pendingRunSeed.name}". "call taxi" when you're ready, or "call ${FIXER_NAME}" to hear it again.`)
@@ -1889,7 +1921,16 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.docwagon = save.game.docwagon ? { ...save.game.docwagon } : undefined;
         // THE CREW rides the save; the deprecated one-slot enlistedAlly
         // migrates in once (old saves) and is never written again.
-        this.crew = (save.game.crew ?? []).map(m => ({ ...m, gear: [...m.gear] }));
+        // GHOST MIGRATION (mechanic removed 2026-08-23): hired AI copies of
+        // other players' runners dissolve on load -- live seats (liveOnly)
+        // and ordinary hires ride on unchanged.
+        this.crew = (save.game.crew ?? [])
+            .filter(m => !(m.ghost && !m.ghost.liveOnly))
+            .map(m => ({ ...m, gear: [...m.gear] }));
+        // The registered sprite stages for its re-shell at hub arrival.
+        if (save.game.registeredSprite) {
+            this._pendingSpriteRedeploy = { ...save.game.registeredSprite };
+        }
         if (this.crew.length === 0 && save.game.enlistedAlly) {
             const legacy = save.game.enlistedAlly;
             this.crew.push({
@@ -1991,6 +2032,14 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 contacts: [...this.contacts.entries()],
                 procurements: [...this.pendingProcurements],
                 docwagon: this.docwagon ? { ...this.docwagon } : undefined,
+                registeredSprite: (() => {
+                    // A live registered sprite rides the save; a travel-folded one
+                    // is in the redeploy stash. Either way it survives the session.
+                    const live = this.companions.find(c => c.kind === 'sprite' && c.registered && c.spriteType);
+                    if (live)
+                        return { spriteType: live.spriteType, level: live.force, tasks: live.services ?? 0 };
+                    return this._pendingSpriteRedeploy ? { ...this._pendingSpriteRedeploy } : undefined;
+                })(),
                 crew: this.crew.map(m => ({ ...m, gear: [...m.gear] })),
                 commandRefusals: { ...this.commandRefusals },
                 fencedCategories: [...this.fencedCategories],
@@ -2191,11 +2240,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // homecoming lines (obituaries, write-back) rode in above. Fresh
         // faces on the for-hire board each homecoming.
         this.rollHireCandidates();
-        // Social settlement: presence resumes, ghost cuts sync up, earnings
-        // come home.
+        // Social settlement: the street hears you're home.
         this.beatPresence();
-        void syncCrewLedger();
-        void this.collectGhostEarnings();
         const allyLine = crewLines.length > 0 ? `\n${crewLines.join('\n')}` : '';
         // DOCWAGON's year ticks in homecomings (12 = a street year, player
         // ruling): the contract lapses quietly unless renewed at Doc's.
@@ -3190,9 +3236,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         { title: 'party', entries: [['crew', 'party'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall']] },
         { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project'], ['return'], ['assense']] },
         { title: 'matrix', entries: [['jack'], ['deck'], ['load'], ['unload'], ['hack'], ['pan'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
-        // The Emerged get their own shelf (player request: compile was
-        // buried mid-matrix). Threading/complex forms join here when built.
-        { title: 'resonance', entries: [['compile', 'decompile']] },
+        // The Emerged get their own shelf (player request: "there MUST be
+        // resonance" -- matrix is the place, Resonance is the talent).
+        { title: 'resonance', entries: [['compile', 'decompile'], ['thread'], ['register']] },
         { title: 'social', entries: [['say'], ['talk-to'], ['call'], ['end-call', 'end', 'hangup'], ['accept'], ['decline', 'deny', 'refuse'], ['haggle', 'negotiate'], ['persuade', 'convince'], ['ask'], ['contacts']] },
         { title: 'street', entries: [['browse', 'buy'], ['sell'], ['catalog'], ['source', 'procure'], ['work', 'gig'], ['perform'], ['palm'], ['docwagon'], ['treat'], ['eat'], ['drink'], ['lifestyle'], ['pay']] },
         { title: 'barriers', entries: [['solve'], ['pick'], ['bluff'], ['unlock'], ['lock']] },
@@ -3235,14 +3281,44 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 }
                 return lines.join('\n');
             }
-            // "help <command>": one description, aliases resolved to their primary.
-            const allVerbs = [...covered, ...uncategorized];
-            const pickedVerb = fuzzyPickName(query, allVerbs);
+            // "help <command>" (and "help <command> <sub>"): the command's
+            // one-liner plus a TIDY subcommand table when it declares one
+            // (player ruling: structured rows, not a paragraph; a second word
+            // drills into one row).
+            const words = query.split(/\s+/);
+            const pickedVerb = fuzzyPickName(words[0], [...covered, ...uncategorized])
+                ?? fuzzyPickName(query, [...covered, ...uncategorized]);
             if (pickedVerb) {
                 const entry = Game.HELP_CATEGORIES.flatMap(c => c.entries).find(e => e.includes(pickedVerb));
                 const primary = entry?.[0] ?? pickedVerb;
                 const aliases = entry?.slice(1) ?? [];
-                return `${primary}${aliases.length > 0 ? ` (${aliases.join(', ')})` : ''}: ${this.describeVerb(primary)}`;
+                const CommandClass = CommandFactory.getAllRegisteredCommands()[primary];
+                const subs = CommandClass?.getSubcommands?.();
+                const title = `${primary}${aliases.length > 0 ? ` (${aliases.join(', ')})` : ''}`;
+                if (subs && subs.length > 0) {
+                    // Drill-down: "help crew hire" -> just the hire row, long form.
+                    const subQuery = words.slice(1).join(' ');
+                    if (subQuery) {
+                        // A row's key: the word after the primary verb when usage
+                        // starts with it, else its first word.
+                        const subKey = (s) => {
+                            const t = s.usage.split(/\\s+/);
+                            return (t[0] === primary ? t[1] ?? t[0] : t[0]).replace(/[<>|]/g, '');
+                        };
+                        const pickedSub = fuzzyPickName(subQuery, subs.map(subKey));
+                        const sub = pickedSub ? subs.find(s => subKey(s) === pickedSub) : undefined;
+                        if (sub)
+                            return `${sub.usage}\n  ${sub.long ?? sub.short}`;
+                        return `${title}: no subcommand matching "${subQuery}".\n${subs.map(s => `  ${s.usage.padEnd(24)} ${s.short}`).join('\n')}`;
+                    }
+                    const lines = [`${title}: ${this.describeVerb(primary).split('. ')[0]}.`];
+                    for (const s of subs)
+                        lines.push(`  ${s.usage.padEnd(24)} ${s.short}`);
+                    lines.push('');
+                    lines.push(`"help ${primary} <sub>" drills into one.`);
+                    return lines.join('\n');
+                }
+                return `${title}: ${this.describeVerb(primary)}`;
             }
             return `No command or category called "${query}". Try plain "help".`;
         }