@maka/maka-cli 5.84.0 → 5.86.0

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

@@ -1,6 +1,8 @@
 import { Logger } from './logger.js';
 import { rollPool, formatRoll } from './dice.js';
 import { isWatched } from './surveillance.js';
+import { spawnEphemeral } from './ephemeral.js';
+import { AI } from '../../../../tools/ai/ai.class.js';
 /**
  * IDENTITY AT THE COUNTER (SINs & commerce, player go 2026-08-24;
  * canon p.363-368, values engine-adapted -- the RAG was down). The
@@ -128,6 +130,52 @@ export function paperPurchase(p, basePrice, availability, meta) {
 const SWEEP_CHANCE_WATCHED = 0.10;
 const SWEEP_CHANCE_STREET = 0.04;
 const SWEEP_HOT_BONUS = 0.05;
+/**
+ * THE OFFICER IS A MOUTH, NOT A JUDGE (7ALf6u7PvTg6TZSm7).
+ *
+ * Every ruling in this sweep is already made by the time this runs:
+ * wandRead returned the band, addHeat billed it, a burned fake is
+ * already out of the inventory. Spawning a body afterwards adds someone
+ * to talk to and changes NOTHING about the outcome, which is why it is
+ * safe -- the worst a bad brief can do here is write bad dialogue.
+ *
+ * NO AI, NO GOVERNOR (ruling). With AI off the sweep keeps exactly its
+ * existing prose and no body is spawned at all: a stranger standing
+ * mute in the room is a bug report waiting ("this cop won't talk"),
+ * while the prose alone is a working game. sweep-officer.test.ts asserts
+ * that path is byte-identical to the old output.
+ */
+function postSweepOfficer(game, room, band) {
+    if (!game.scene || !game.ephemerals || !AI.isConfigured())
+        return;
+    const stance = band === 'clean'
+        ? `Their wand just went green on the person in front of them, so they are already half-turned toward the next face in the room -- bored, procedural, done with this one.`
+        : band === 'odd'
+            ? `Their wand muttered something they did not like about the person in front of them and they waved them on anyway. They are not satisfied, and they are still watching.`
+            : band === 'busted'
+                ? `Their wand just CHOKED on a forgery. They want this person off the floor, not processed -- paperwork is somebody else's afternoon.`
+                : `The person in front of them has no SIN at all, which in a place like this is the whole offense. They have already taken the photographs.`;
+    spawnEphemeral({ scene: game.scene, ephemerals: game.ephemerals }, {
+        name: SWEEP_OFFICER_NAME,
+        description: `a private-security patrol officer working this floor with a SIN wand. ${stance} They are a uniform doing a shift -- not a character in anyone's story, not connected to whatever brought these people here, and off this floor the moment the sweep moves on.`,
+        kind: 'authority',
+        // EXCHANGE-scoped: they exist for as long as the player stands
+        // there talking. Walking out ends it (ruling), and the officer does
+        // not follow.
+        until: 'exchange',
+        room,
+        // A working rent-a-cop, not a boss fight. Deliberately ordinary:
+        // the player who decides to swing at security should be picking a
+        // fight with a person, not a set piece.
+        combat: {
+            body: 3, agility: 3, reaction: 3, strength: 3, willpower: 3,
+            logic: 3, intuition: 3, charisma: 3, edge: 1, combatSkill: 3,
+            skills: { perception: 3, firearms: 3, intimidation: 2 },
+        },
+    });
+}
+/** One name, so a second sweep in the same room can never double-spawn. */
+export const SWEEP_OFFICER_NAME = 'Patrol Officer';
 export function maybeSinSweep(game, actor, room, meta) {
     if (!game.onRun || actor.plane !== 'meat')
         return '';
@@ -156,6 +204,9 @@ export function maybeSinSweep(game, actor, room, meta) {
     if (actor.qualities.has('sinner-criminal')) {
         game.addHeat(3, 'sweep: criminal SIN logged on site');
         lines.push(`Your CRIMINAL SIN answers before you can. They log it, photograph you, and wave you on -- but this site now KNOWS a felon walked its floor, and the district feed has your route.`);
+        // A logged felon waved on is the 'odd' stance exactly: not
+        // satisfied, still watching, no grounds to hold you.
+        postSweepOfficer(game, room, 'odd');
         return lines.join('\n');
     }
     const fake = bestFakeSin(actor);
@@ -167,20 +218,24 @@ export function maybeSinSweep(game, actor, room, meta) {
         if (band === 'clean') {
             game.addHeat(1, 'sweep: fake SIN logged (datatrail)');
             lines.push(`Your Rating ${fake.rating} fake answers -- green light. A name that isn't yours goes in their log, and the patrol moves on.`);
+            postSweepOfficer(game, room, 'clean');
             return lines.join('\n');
         }
         if (band === 'odd') {
             game.addHeat(2, 'sweep: fake SIN read as ODD');
             lines.push(`The wand mutters over your Rating ${fake.rating} fake -- "something's odd," the officer says, and stares a beat too long before waving you on. The fake survives; the extra attention doesn't wash off.`);
+            postSweepOfficer(game, room, 'odd');
             return lines.join('\n');
         }
         actor.inventory.removeItem(fake.item.name);
         game.addHeat(3, 'sweep: fake SIN burned');
         lines.push(`The wand CHOKES on your Rating ${fake.rating} fake -- BURNED, flagged everywhere at once. Security wants you gone, not processed: they shove you toward the door and put your face on the district feed.`);
+        postSweepOfficer(game, room, 'busted');
         return lines.join('\n');
     }
     game.addHeat(4, 'sweep: SINless, face remembered');
     lines.push(`No SIN at all -- in a place like this that IS the offense. They photograph you from three angles and escort you off the floor. The district feed has your face now; the ride home will be interesting.`);
+    postSweepOfficer(game, room, 'sinless');
     return lines.join('\n');
 }
 export function venueSinCheck(p, host, opts) {

package/bundle/typescript/src/commands/game/sideQuest/utilities/sin.js.map

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

package/bundle/typescript/src/commands/game/sideQuest/utilities/street-gang.d.ts

@@ -0,0 +1,17 @@
+import { Player } from '../models/player.js';
+import { Room } from '../models/room.js';
+import { IEphemeralHost } from './ephemeral.js';
+export interface IGangHost extends IEphemeralHost {
+    /** Rooms that have already had their encounter -- once each, ever. */
+    gangedRooms: Set<string>;
+}
+/**
+ * Maybe somebody is holding this corner. Returns the line to show, or
+ * '' for the overwhelmingly common case of nothing happening.
+ *
+ * NO AI, NO GOVERNOR (ruling, and the same branch the officer takes):
+ * with AI off nothing spawns and nothing is narrated, because a mute
+ * hostile stranger is worse than an empty street. The test asserts this
+ * path returns the empty string exactly.
+ */
+export declare function maybeStreetGang(host: IGangHost, actor: Player, room: Room): string;

package/bundle/typescript/src/commands/game/sideQuest/utilities/street-gang.js

@@ -0,0 +1,139 @@
+import { Logger } from './logger.js';
+import { isOutdoorsPlace } from './outdoors.js';
+import { spawnEphemeral } from './ephemeral.js';
+import { AI } from '../../../../tools/ai/ai.class.js';
+/**
+ * THE SECOND EPHEMERAL KIND: a street gang holding its block
+ * (7ALf6u7PvTg6TZSm7, Maka named three kinds -- "authority checking
+ * SINs, hostile mobs, neutral npcs"). The officer shipped first; this
+ * is the mob, on the rails that officer proved.
+ *
+ * A GANG IS NOT A RESPONSE TEAM, and that distinction is the whole
+ * reason this is safe to add. The engine deliberately promises that
+ * NOBODY COMES when heat climbs (see Game.heatBand): SR5 p.352 and Run
+ * Faster p.220 put HTR response at 2D6 HOURS in a Zone 0 barrens, every
+ * shipped scene is a barrens district, and a player already reported
+ * the old lie -- "HTR assembling somewhere close, warning, but it never
+ * resulted in anything". Nothing arriving is the CORRECT outcome there.
+ *
+ * So this must never read as security responding to heat, or it
+ * reintroduces exactly the defect that was removed. It is not wired to
+ * heat at all. Gangers are territorial predators who were already
+ * standing on that corner: canon-supported and explicitly separate from
+ * HTR (core p.34-35 "street gangs claim territory ... and defend it
+ * against all comers, usually by challenging strangers to fights";
+ * Splintered State p.11 "law enforcement will not show up at any point
+ * -- this is the Barrens"; Run Faster p.220 on Zone 0).
+ *
+ * THEY DO NOT ATTACK ON SIGHT. They are spawned `hostile`, which per
+ * Player.hostile adds a REASON to the brief and nothing else -- the AI
+ * still chooses, and challenging, shaking down, or sizing you up are
+ * all likelier openings than shooting. That keeps the governor's
+ * founding property intact: an ephemeral voices, it does not rule.
+ */
+/**
+ * PROFESSIONAL RATING 1 GANGER, canon stats (SR5 p.382, "Gangers &
+ * Street Scum"): B/A/R/S 4, W/L/I/C 3, with Blades, Clubs,
+ * Intimidation, Pistols and Unarmed Combat.
+ *
+ * Copied rather than invented, and deliberately NOT scaled up. Canon's
+ * own barrens encounter calls a gang ambush "a straightforward, quick,
+ * and easy fight" for runners (Splintered State p.11). A mob that
+ * threatened a professional crew would be a set piece, and a set piece
+ * is a scene NPC's job, not a passing face's.
+ */
+const GANGER_COMBAT = {
+    body: 4, agility: 4, reaction: 4, strength: 4,
+    willpower: 3, logic: 3, intuition: 3, charisma: 3,
+    edge: 1, combatSkill: 3,
+    skills: { blades: 3, clubs: 3, intimidation: 3, firearms: 3, unarmed: 3, perception: 2 },
+};
+/** How often a street corner turns out to be somebody's corner. */
+const GANG_CHANCE = 0.08;
+/**
+ * The most that can ever be standing at once. THE CAP IS THE
+ * ACCUMULATION RULE (coordinator: a mob must NOT accumulate), and it is
+ * enforced against every ephemeral of this kind currently alive, not
+ * per spawn -- a per-spawn limit would let three quiet blocks in a row
+ * put nine gangers on the map.
+ */
+const MAX_STANDING = 3;
+const GANG_NAMES = ['Halloweener', 'Ancient', 'Cutter', 'Spike', 'Blood Mountain Boy'];
+/**
+ * Maybe somebody is holding this corner. Returns the line to show, or
+ * '' for the overwhelmingly common case of nothing happening.
+ *
+ * NO AI, NO GOVERNOR (ruling, and the same branch the officer takes):
+ * with AI off nothing spawns and nothing is narrated, because a mute
+ * hostile stranger is worse than an empty street. The test asserts this
+ * path returns the empty string exactly.
+ */
+export function maybeStreetGang(host, actor, room) {
+    if (!AI.isConfigured())
+        return '';
+    if (actor.plane !== 'meat')
+        return '';
+    // Gangs prowl STREETS. Indoors is somebody's premises, and whoever
+    // owns it is a scene NPC's job.
+    if (!isOutdoorsPlace(room))
+        return '';
+    if (host.gangedRooms.has(room.name))
+        return '';
+    // ALREADY-STANDING CHECK BEFORE THE ROLL, so a busy street cannot
+    // stack. Counted across the whole registry, which is what makes the
+    // cap mean "on the map" rather than "in this doorway".
+    const standing = [...host.ephemerals.values()].filter(m => m.kind === 'mob').length;
+    if (standing >= MAX_STANDING)
+        return '';
+    if (Math.random() >= GANG_CHANCE)
+        return '';
+    host.gangedRooms.add(room.name);
+    // Sized to what is left under the cap, never to the player's party:
+    // scaling opposition to the crew is a SCENE's job, and a passing
+    // shakedown that grew with the table would quietly become the set
+    // piece this is not.
+    const wanted = Math.min(2, MAX_STANDING - standing);
+    const spawned = [];
+    for (let i = 0; i < wanted; i++) {
+        const name = uniqueName(host, i);
+        if (!name)
+            break;
+        const npc = spawnEphemeral(host, {
+            name,
+            description: `a ganger holding this block -- colors on, hands loose, watching a stranger walk onto their corner. They are local muscle and nothing more: not security, not police, not anybody's employee, and they have never heard of whatever brought you here.`,
+            kind: 'mob',
+            // FIGHT-SCOPED, which for a territorial gang is also the honest
+            // reading of canon: they hold the block. Walk away without a
+            // fight and they let you go rather than following (see the
+            // despawn call in go.ts, which passes fightActive from the
+            // recency of your last exchange). Start something and they stay
+            // with it through the doorway.
+            until: 'fight',
+            room,
+            combat: GANGER_COMBAT,
+        });
+        if (!npc)
+            continue;
+        // OPPOSITION, not an ambush (Player.hostile): this gives them a
+        // reason, and the AI still chooses what to do with it.
+        npc.hostile = true;
+        spawned.push(npc.name);
+    }
+    if (spawned.length === 0)
+        return '';
+    Logger.getInstance().write(`Street gang on ${room.name}: ${spawned.join(', ')}.`);
+    return `{yellow-fg}This corner is somebody's corner. ${spawned.length === 1 ? `${spawned[0]} peels off a wall and squares up -- not in a hurry, just interested.` : `${spawned.join(' and ')} peel off a wall and spread out, unhurried, taking their time about it.`}{/yellow-fg}`;
+}
+/** A name nobody in the scene is already using. */
+function uniqueName(host, offset) {
+    for (let i = 0; i < GANG_NAMES.length; i++) {
+        const base = GANG_NAMES[(offset + i) % GANG_NAMES.length];
+        for (const suffix of ['', ' (2)', ' (3)']) {
+            const candidate = `${base}${suffix}`;
+            if (!host.scene.getActor(candidate))
+                return candidate;
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=street-gang.js.map

package/bundle/typescript/src/commands/game/sideQuest/utilities/street-gang.js.map

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

package/bundle/typescript/src/commands/testCmd/mocha.sub.cmd.js

@@ -18,7 +18,8 @@ Command.create({
         { name: 'rawLogs', boolFlag: true, description: 'Display raw test output without formatting' },
         { name: 'port', description: 'Specify the port number for the test server' },
         { name: 'inspect', boolFlag: true, description: 'Enable Node.js inspector for debugging tests' },
-        { name: 'testAppPath', description: 'Specify a custom path to the test app directory' }
+        { name: 'testAppPath', description: 'Specify a custom path to the test app directory' },
+        { name: 'settings', description: 'Path to a custom settings.json file (defaults to the resolved env config)' }
     ],
     usage: 'maka test:mocha',
     aliases: ['m'],
@@ -35,16 +36,8 @@ Command.create({
         }
         await this.pkg.checkNpmPackage('@testing-library/dom meteor-node-stubs chai', { shouldInstall: true });
         const env = (opts.env) ? this.cfg.getEnvFromShorthand(opts.env) : 'local';
-        if (!opts.unit || !!opts.once) {
-            args = args.concat([
-                '--full-app'
-            ]);
-        }
-        // meteor doesn't understand "unit"
-        if (opts.unit) {
-            delete opts.unit;
-        }
-        let driver = opts['driver-package'] || opts['driver'] || 'none';
+        const usePackages = !!opts.packages;
+        let driver = opts.driverPackage || opts.driver || 'none';
         if (driver === 'none') {
             const config = JSON.parse(fs.readFileSync(path.join(this.fsi.findProjectDirectory(), '.maka', 'config.json'), 'utf8'));
             if (config.engines.test === 'jasmine') {
@@ -57,12 +50,6 @@ Command.create({
         if (driver === 'none') {
             throw new Error('This project does not have a mocha test driver');
         }
-        if (!opts['driver-package'] || !opts['driver']) {
-            args = args.concat([
-                '--driver-package',
-                driver
-            ]);
-        }
         // always ensure local exists
         const localExists = this.cfg.checkConfigExists('local');
         if (!localExists) {
@@ -72,17 +59,10 @@ Command.create({
         }
         const configPath = this.cfg.getAppConfigPath(env);
         const processDotEnvPath = path.join(configPath, 'process.env');
-        let settingsPath = path.join(configPath, 'settings.json');
         // allow settings override
-        if (opts.settings) {
-            settingsPath = opts.settings;
-        }
-        else {
-            settingsPath = path.join(configPath, 'settings.json');
-        }
+        const settingsPath = opts.settings || path.join(configPath, 'settings.json');
         // source the env file into the process environment
         if (this.fsi.isFile(processDotEnvPath)) {
-            // Use path.relative to compute the relative path
             const relativeDotEnvPath = path.relative(process.cwd(), processDotEnvPath);
             Log.notice('Node Env Config: ' + relativeDotEnvPath);
             this.dotenvx.load(processDotEnvPath);
@@ -92,33 +72,55 @@ Command.create({
             Log.info('Cannot find Node Environment file, creating: ' + relativeDotEnvPath);
             await this.fsi.createFile({ filePath: processDotEnvPath, data: '' });
         }
+        // Meteor's own binary understands a completely different, kebab-case
+        // flag surface than the one this command advertises -- several of ours
+        // are camelCase aliases with no meteor equivalent under that spelling
+        // at all. Building meteorArgs explicitly from validated `opts`, rather
+        // than re-forwarding raw process.argv with ad-hoc filtering, is the
+        // only way to guarantee nothing maka-only or wrongly-cased leaks
+        // through to a binary that aborts on the first option it doesn't
+        // recognize. Confirmed against a real Meteor 3.5 install: --unit,
+        // --driverPackage, --rawLogs, --testAppPath, and a bare --driver each
+        // die with "--x: unknown option" and meteor's usage text instead of
+        // running anything; --env's VALUE leaked through too, as an orphaned
+        // positional argument, even in the old code's attempt to strip it.
+        const meteorArgs = [];
+        // --unit has no meteor flag of its own -- Meteor's own distinction is
+        // `test` (isolated/"unit") vs `test --full-app`. Its only real job is
+        // suppressing --full-app. --full-app is meaningless for test-packages
+        // (there is no "app" to run fully; every package test is already
+        // isolated by nature), so this only applies in `test` mode.
+        if (!usePackages && !opts.unit) {
+            meteorArgs.push('--full-app');
+        }
+        if (opts.once)
+            meteorArgs.push('--once');
+        // --raw-logs is `test`-only; test-packages has no such flag.
+        if (opts.rawLogs && !usePackages)
+            meteorArgs.push('--raw-logs');
+        if (opts.inspect)
+            meteorArgs.push('--inspect');
+        if (opts.port)
+            meteorArgs.push('--port', opts.port);
+        if (opts.testAppPath)
+            meteorArgs.push('--test-app-path', opts.testAppPath);
+        meteorArgs.push('--driver-package', driver);
         if (this.fsi.isFile(settingsPath)) {
-            // Use path.relative to compute the relative path
             const relativeSettingsPath = path.relative(process.cwd(), settingsPath);
             Log.notice('Meteor Settings: ' + relativeSettingsPath);
-            args = args.concat([
-                '--settings',
-                settingsPath
-            ]);
+            meteorArgs.push('--settings', settingsPath);
         }
         else {
             const relativeSettingsPath = path.relative(process.cwd(), settingsPath);
             Log.warn('Cannot find Meteor Settings File: ' + relativeSettingsPath);
         }
-        const processArgv = process.argv.slice(2)
-            .filter(value => value !== '--env')
-            .filter(value => value !== 'test')
-            .filter(value => value !== args[0]);
-        processArgv.forEach((arg, idx) => {
-            if (arg === '--env' || arg === '--driver') {
-                processArgv.splice(idx, 2);
-            }
-            if (arg === '--packages') {
-                processArgv.splice(idx, 1);
-            }
-        });
-        const cmd = (opts.packages) ? 'test-packages' : 'test';
-        await this.mpi.invokeMeteorCommand(cmd, args.concat(processArgv));
+        // Positional args (e.g. package names/paths for test-packages) pass
+        // through as-is -- they were already separated from flags by the
+        // command framework, so there is nothing maka-only or mis-cased to
+        // translate here.
+        meteorArgs.push(...args);
+        const cmd = usePackages ? 'test-packages' : 'test';
+        await this.mpi.invokeMeteorCommand(cmd, meteorArgs);
     }
     catch (e) {
         console.error(e);

package/bundle/typescript/src/commands/testCmd/mocha.sub.cmd.js.map

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

package/bundle/typescript/src/commands/update.js

@@ -1,33 +1,19 @@
 import { Command } from '../command.js';
 import { Log } from '../tools/log/log.class.js';
-// `maka update maka` -- update the CLI itself, and nothing else.
-//
-// THE ARGUMENT IS MANDATORY AND LITERAL on purpose: "update" alone is the
-// kind of verb people aim at their PROJECT (dependencies, Meteor release),
-// and a bare `maka update` quietly replacing the CLI would be an answer to
-// a question nobody asked. validArgs pins the one accepted target; project
-// Meteor versions stay where they were (`maka version:use`,
-// `maka install meteor --release`).
-//
-// TWO INSTALL SHAPES, ONE COMMAND. A packaged binary fetches its successor
-// from the public dist repo's latest release, verifies GitHub's sha256
-// digest, and swaps itself in place -- no Node, no npm, no Meteor involved.
-// An npm-installed maka delegates to npm, which owns that install's layout.
-//
-// The flow itself lives in tools/self-update/update-maka.ts so the repro
-// version lock can offer "update now?" and act on a yes -- this file is
-// only the command's front door.
 Command.create({
     name: 'update',
-    validOpts: [],
+    validOpts: [
+        { name: 'binary', boolFlag: true, description: 'From an npm install, switch to the standalone release binary instead of updating via npm (removes the npm install once the binary is verified on PATH)' },
+    ],
     validArgs: ['maka'],
     minArgLength: 1,
     usage: 'maka update maka',
     shortDesc: 'Updates the maka CLI itself to the latest release.',
     examples: [
         'maka update maka',
+        'maka update maka --binary',
     ]
-}, async function (args) {
+}, async function (args, opts) {
     try {
         if (args[0] !== 'maka') {
             Log.error('The only thing this command updates is the maka CLI itself: `maka update maka`.');
@@ -35,7 +21,7 @@ Command.create({
             process.exit(1);
         }
         const { updateMakaCli } = await import('../tools/self-update/update-maka.js');
-        await updateMakaCli();
+        await updateMakaCli({ binary: opts.binary });
     }
     catch (e) {
         Log.error(`Update failed: ${e.message}`);

package/bundle/typescript/src/commands/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAEhD,iEAAiE;AACjE,EAAE;AACF,0EAA0E;AAC1E,2EAA2E;AAC3E,2EAA2E;AAC3E,2EAA2E;AAC3E,4DAA4D;AAC5D,oCAAoC;AACpC,EAAE;AACF,2EAA2E;AAC3E,uEAAuE;AACvE,4EAA4E;AAC5E,4EAA4E;AAC5E,EAAE;AACF,yEAAyE;AACzE,wEAAwE;AACxE,iCAAiC;AAEjC,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,EAAE;IACb,SAAS,EAAE,CAAC,MAAM,CAAC;IACnB,YAAY,EAAE,CAAC;IACf,KAAK,EAAE,kBAAkB;IACzB,SAAS,EAAE,oDAAoD;IAC/D,QAAQ,EAAE;QACR,kBAAkB;KACnB;CACF,EAAE,KAAK,WAAW,IAAc;IAC/B,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YACvB,GAAG,CAAC,KAAK,CAAC,iFAAiF,CAAC,CAAC;YAC7F,GAAG,CAAC,MAAM,CAAC,qGAAqG,CAAC,CAAC;YAClH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC9E,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,kBAAmB,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AA6BhD,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE;QACT,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,wJAAwJ,EAAE;KAC1M;IACD,SAAS,EAAE,CAAC,MAAM,CAAC;IACnB,YAAY,EAAE,CAAC;IACf,KAAK,EAAE,kBAAkB;IACzB,SAAS,EAAE,oDAAoD;IAC/D,QAAQ,EAAE;QACR,kBAAkB;QAClB,2BAA2B;KAC5B;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAiB;IAClD,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YACvB,GAAG,CAAC,KAAK,CAAC,iFAAiF,CAAC,CAAC;YAC7F,GAAG,CAAC,MAAM,CAAC,qGAAqG,CAAC,CAAC;YAClH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC9E,MAAM,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,kBAAmB,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}