@maka/maka-cli 5.9.0 → 5.11.0

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

@@ -13,6 +13,9 @@ import { Player } from './sideQuest/models/player.js';
 import { Room } from './sideQuest/models/room.js';
 import { Logger } from './sideQuest/utilities/logger.js';
 import { AI } from '../../tools/ai/ai.class.js';
+import { savesDir, savePathFor, listSaves, deleteSave, readSave, writeSaveAtomic } from './sideQuest/utilities/persistence.js';
+import { SAVE_VERSION } from './sideQuest/types/save-file.js';
+import { authToken, fetchSummaries, fetchSave, pushSave, deleteCloudSave, reconcile } from './sideQuest/utilities/cloud-saves.js';
 const shadowrunConfig1 = require('./sideQuest/scenes/scene1.json');
 const shadowrunConfig2 = require('./sideQuest/scenes/scene2.json');
 import { fileURLToPath } from 'url';
@@ -37,18 +40,154 @@ Command.create({
         const sessionId = new Date().toISOString().replace(/[:.]/g, '-');
         const sessionDir = path.join(makaDir, 'side-quest-sessions', sessionId);
         const logFilePath = path.join(sessionDir, 'game.log');
-        const playerName = (opts.player) ? opts.player : await Actions.ask('What is your name? [Maka]') || 'Maka';
-        // Pick who you are before what the job is -- the archetype spread
-        // becomes the player's full attribute sheet (see archetypes.ts), and
-        // the mage archetypes are the road to playing Awakened.
-        const archetypeName = await Actions.select({
-            message: 'Who are you on the street?',
-            name: 'archetypeName',
-            // The quality ledger deliberately does NOT ride the menu (it doubled
-            // every line -- player request): "sheet" in-game is where the traits
-            // and their karma math live.
-            choices: ARCHETYPES.map(a => ({ name: `${a.name} -- ${a.description}`, value: a.name })),
-        });
+        // PERSISTENCE (see sideQuest/utilities/persistence.ts): saved runners
+        // get a Continue menu before any prompts. One slot per character
+        // name; version-mismatched saves are excluded and KEPT.
+        const saveDir = savesDir(makaDir);
+        // CLOUD SYNC (local-first, see cloud-saves.ts): reconcile the local
+        // slots with the maka-cli.com mirror BEFORE listing them, so the
+        // Continue menu shows the freshest life everywhere. Logged out or
+        // offline, this whole block quietly does nothing. The Logger must be
+        // primed headless first -- cloud-saves and Player both grab the
+        // singleton, and its first call demands a screen.
+        Logger.getInstance(logFilePath, { children: [], render: () => { } });
+        if (authToken()) {
+            const fsMod = await import('fs');
+            // Tombstones first: a runner who died offline still owes the
+            // mirror a burial -- never resurrect the dead from the cloud.
+            const tombstones = fsMod.existsSync(saveDir)
+                ? fsMod.readdirSync(saveDir).filter(f => f.endsWith('.dead'))
+                : [];
+            for (const tomb of tombstones) {
+                const slug = tomb.replace(/\.dead$/, '');
+                const burned = await deleteCloudSave(slug);
+                if (burned === 'ok')
+                    fsMod.rmSync(path.join(saveDir, tomb), { force: true });
+            }
+            const deadSlugs = new Set(tombstones.map(t => t.replace(/\.dead$/, '')));
+            const cloud = await fetchSummaries();
+            if (cloud.ok) {
+                const cloudSlugs = new Set(cloud.saves.map(c => c.slug));
+                for (const c of cloud.saves) {
+                    if (c.version !== SAVE_VERSION || deadSlugs.has(c.slug))
+                        continue;
+                    const localPath = path.join(saveDir, `${c.slug}.json`);
+                    const localRead = readSave(localPath);
+                    const local = localRead.ok
+                        ? { savedAt: localRead.save.savedAt, lastCloudSavedAt: localRead.save.sync?.lastCloudSavedAt }
+                        : undefined;
+                    const verdict = reconcile(local, { savedAt: c.savedAt });
+                    if (verdict === 'cloud-only' || verdict === 'pull-cloud') {
+                        const full = await fetchSave(c.slug);
+                        if (full) {
+                            full.sync = { lastCloudSavedAt: full.savedAt };
+                            writeSaveAtomic(localPath, full);
+                        }
+                    }
+                    else if (verdict === 'push-local' && localRead.ok) {
+                        await pushSave(localPath, localRead.save);
+                    }
+                    else if (verdict === 'diverged' && localRead.ok) {
+                        // A real fork: both sides advanced since the last mirror.
+                        // NEWEST WINS, silently (player ruling: "just take the
+                        // latest one" -- the prompt was friction, not safety, since
+                        // the common cause was a quit whose push couldn't outlive
+                        // the process). One informative line, no question.
+                        const survivor = localRead.save.savedAt >= c.savedAt ? 'local' : 'cloud';
+                        if (survivor === 'cloud') {
+                            const full = await fetchSave(c.slug);
+                            if (full) {
+                                full.sync = { lastCloudSavedAt: full.savedAt };
+                                writeSaveAtomic(localPath, full);
+                                Log.info(`"${c.playerName}": cloud copy was newer -- took it.`);
+                            }
+                        }
+                        else {
+                            await pushSave(localPath, localRead.save);
+                            Log.info(`"${c.playerName}": this machine was newer -- pushed it.`);
+                        }
+                    }
+                }
+                // Local-only lives get mirrored up on the way past.
+                for (const s of listSaves(saveDir)) {
+                    if (!s.result.ok)
+                        continue;
+                    const slug = path.basename(s.filePath, '.json');
+                    if (!cloudSlugs.has(slug) && !deadSlugs.has(slug)) {
+                        await pushSave(s.filePath, s.result.save);
+                    }
+                }
+            }
+        }
+        const slots = listSaves(saveDir);
+        const readableSlots = slots.flatMap(s => s.result.ok ? [{ filePath: s.filePath, save: s.result.save }] : []);
+        for (const bad of slots.filter(s => !s.result.ok && s.result.error === 'version-mismatch')) {
+            const v = bad.result.version;
+            Log.error(`Save "${path.basename(bad.filePath)}" was written by a different version (v${v}) -- skipped, file kept.`);
+        }
+        let resumeSave;
+        let resumeSavePath;
+        if (readableSlots.length > 0) {
+            const NEW_CHARACTER = 'NEW_CHARACTER';
+            const pick = await Actions.select({
+                message: 'The street remembers. Pick up where you left off?',
+                name: 'continuePick',
+                choices: [
+                    ...readableSlots.map(r => ({
+                        name: `Continue as ${r.save.playerName} -- ${r.save.summary.archetypeName ?? 'runner'}, karma ${r.save.summary.karma}, ${r.save.summary.currency} nuyen, ${r.save.summary.lifestyleTier}`,
+                        value: r.filePath,
+                    })),
+                    { name: 'Start a new character', value: NEW_CHARACTER },
+                ],
+            });
+            if (pick !== NEW_CHARACTER) {
+                resumeSavePath = pick;
+                resumeSave = readableSlots.find(r => r.filePath === resumeSavePath).save;
+            }
+        }
+        let playerName;
+        let archetypeName;
+        if (resumeSave) {
+            playerName = resumeSave.playerName;
+            archetypeName = resumeSave.summary.archetypeName;
+        }
+        else {
+            // A new character reusing a saved name OVERWRITES -- after a
+            // confirm, and the old save is deleted IMMEDIATELY so dying
+            // before the first autosave can't resurrect the old life.
+            const { existsSync } = await import('fs');
+            let providedName = opts.player;
+            for (;;) {
+                playerName = providedName ?? (await Actions.ask('What is your name? [Maka]') || 'Maka');
+                providedName = undefined; // a rejected --player name falls back to asking
+                const slotPath = savePathFor(saveDir, playerName);
+                if (!existsSync(slotPath))
+                    break;
+                const overwrite = await Actions.select({
+                    message: `A runner named ${playerName} already has a saved life. Overwrite it?`,
+                    name: 'overwrite',
+                    choices: [
+                        { name: 'No -- pick another name', value: 'no' },
+                        { name: 'Yes -- overwrite (the old save is gone for good)', value: 'yes' },
+                    ],
+                });
+                if (overwrite === 'yes') {
+                    deleteSave(slotPath);
+                    break;
+                }
+            }
+            // Pick who you are before what the job is -- the archetype spread
+            // becomes the player's full attribute sheet (see archetypes.ts), and
+            // the mage archetypes are the road to playing Awakened.
+            archetypeName = await Actions.select({
+                message: 'Who are you on the street?',
+                name: 'archetypeName',
+                // The quality ledger deliberately does NOT ride the menu (it doubled
+                // every line -- player request): "sheet" in-game is where the traits
+                // and their karma math live.
+                choices: ARCHETYPES.map(a => ({ name: `${a.name} -- ${a.description}`, value: a.name })),
+            });
+        }
         const gameOptions = {
             ...opts,
             logFilePath,
@@ -58,7 +197,11 @@ Command.create({
             // AI.isConfigured() picks whichever provider is set up (OpenAI or
             // Anthropic -- see tools/ai/ai.class.ts).
             useAi: AI.isConfigured(),
-            archetype: archetypeName
+            archetype: archetypeName,
+            // The character's save slot -- autosaves land here (hub sessions
+            // only; classic scenes never save, see Game.requestSave's guards).
+            saveFilePath: resumeSavePath ?? savePathFor(saveDir, playerName),
+            resume: resumeSave !== undefined,
         };
         const GENERATE_NEW_RUN = 'GENERATE_NEW_RUN';
         // The hub (Tacoma Purple Haze) leads the list -- it's the intended
@@ -72,11 +215,15 @@ Command.create({
         if (gameOptions.useAi) {
             choices.push({ name: 'Generate a new Run (AI)', value: GENERATE_NEW_RUN });
         }
-        let sideQuestAnswer = await Actions.select({
-            message: 'Which Run would you like to play?',
-            name: 'sideQuestAnswer',
-            choices
-        });
+        // Resuming skips the scene pick: the save EMBEDS its hub seed, so an
+        // old runner's world never depends on today's scene2.json.
+        let sideQuestAnswer = resumeSave
+            ? resumeSave.hubSeed
+            : await Actions.select({
+                message: 'Which Run would you like to play?',
+                name: 'sideQuestAnswer',
+                choices
+            });
         if (sideQuestAnswer === GENERATE_NEW_RUN) {
             const spinner = Log.withSpinner();
             spinner.start('Generating a new Run');

package/bundle/typescript/src/commands/game/sideQuest.sub.cmd.js.map

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

package/package.json

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