@magicpixelart/cli 0.5.22 → 0.5.24

package/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.5.24] — 2026-09-21
+
+- `push --force` keeps your local copy when a sprite changed in both places. It
+  re-sends against the live cloud state rather than skipping the safety check,
+  so a save that lands in between is still reported instead of overwritten.
+- A both-sides-changed refusal now carries the live cloud fingerprint, so a
+  follow-up `push` works even for large documents whose hash wasn't cached —
+  the last case where the sync/push advice could still dead-end.
+- Conflict messages name both ways out: press Sync on the artboard, or
+  `push --force`.
+
+## [0.5.23] — 2026-09-21
+
+- Pressing Sync on an artboard now explicitly chooses MagicPixel's copy when
+  that PNG was also edited locally, resolving the previous sync/push loop.
+- Conflict lists are capped, nested push warnings no longer repeat during
+  sync, and completion summaries include locally unchanged sprites accurately.
+
 ## [0.5.22] — 2026-09-14
 
 - Raised the daily sprite download allowance from 1 GiB to 10 GiB for large

package/dist/commands/push.js

@@ -110,6 +110,10 @@ export async function runPushWith(config, state, opts = {}) {
         const segments = entry
             ? entry.adoptRel.replace(/\.png$/i, '').split('/')
             : key.split('/');
+        if (opts.excludeKeys?.has(key)) {
+            reportHash();
+            return;
+        }
         candidates.push({
             key,
             segments,
@@ -141,12 +145,12 @@ export async function runPushWith(config, state, opts = {}) {
     if (skippedUnsafe > 0 && !quiet) {
         console.log(kleur.yellow(`! skipped ${skippedUnsafe} path${skippedUnsafe === 1 ? '' : 's'} that were not regular files inside the project.`));
     }
-    if (legacy.length > 0 && !quiet) {
+    if (legacy.length > 0 && !quiet && !opts.nestedSync) {
         console.log();
         console.log(kleur.yellow(`! ${legacy.length} sprite${legacy.length === 1 ? '' : 's'} came from a legacy single-image file — skipped.`));
         console.log(kleur.dim(`  Fix: open the file in MagicPixel and save it once, then re-run \`${cmd('sync')}\`.`));
     }
-    if (flattenBlocked.length > 0 && !quiet) {
+    if (flattenBlocked.length > 0 && !quiet && !opts.nestedSync) {
         console.log();
         console.log(kleur.yellow(`! ${flattenBlocked.length} sprite${flattenBlocked.length === 1 ? '' : 's'} would flatten a multi-layer artboard — skipped.`));
         for (const a of flattenBlocked.slice(0, 10)) {
@@ -225,7 +229,38 @@ export async function runPushWith(config, state, opts = {}) {
             await saveState({ ...state, synced });
         throw e;
     }
-    const counts = { created: 0, updated: 0, unchanged: 0, conflict: 0, error: 0 };
+    const spriteByKey = new Map(sprites.map((s) => [s.key, s]));
+    if (opts.force) {
+        // Two rounds at most: an adopt-shaped or hash-less refusal comes back
+        // without a live sha, and the retry as an update is what makes the server
+        // composite the artboard and report one.
+        for (let round = 0; round < 2; round++) {
+            const retry = forcedRetrySprites(results, spriteByKey, opts.flatten === true);
+            if (retry.length === 0)
+                break;
+            const retryResults = await pushSpritesAdaptive(retry);
+            synced = await commitPushResults({
+                synced,
+                batchResults: retryResults,
+                candidates,
+                sourceByKey,
+                shaByKey,
+                fpByKey,
+                outDir: config.outDir,
+            });
+            await saveState({ ...state, synced });
+            replaceResultsByKey(results, retryResults);
+            if (retryResults.every((r) => r.status === 'conflict' && !r.sha256))
+                break;
+        }
+    }
+    // Remember the live cloud sha a refusal reported, so a later `push` (with or
+    // without --force) has a baseline the concurrency check accepts. The manifest
+    // hash can be absent for big documents, which used to dead-end this path.
+    if (rememberRefusedCloudShas(synced, results)) {
+        await saveState({ ...state, synced });
+    }
+    const counts = { created: 0, updated: 0, unchanged: skipped, conflict: 0, error: 0 };
     for (const r of results) {
         if (r.status in counts)
             counts[r.status]++;
@@ -241,14 +276,19 @@ export async function runPushWith(config, state, opts = {}) {
             progress.succeed(`Pushed. ${summary}`);
     }
     if (!quiet) {
+        let printedIssues = 0;
         for (const r of results) {
             if (r.status === 'conflict') {
-                console.log(`  ${kleur.yellow('!')} ${r.key}: ${conflictHint(r.reason)}`);
+                if (printedIssues++ < 10)
+                    console.log(`  ${kleur.yellow('!')} ${r.key}: ${conflictHint(r.reason)}`);
             }
             else if (r.status === 'error') {
-                console.log(`  ${kleur.red('!')} ${r.key}: ${r.message ?? 'push failed'}`);
+                if (printedIssues++ < 10)
+                    console.log(`  ${kleur.red('!')} ${r.key}: ${r.message ?? 'push failed'}`);
             }
         }
+        if (printedIssues > 10)
+            console.log(kleur.dim(`  …and ${printedIssues - 10} more`));
         if (counts.created > 0) {
             console.log(kleur.dim(`  ${counts.created} new sprite${counts.created === 1 ? '' : 's'} now live in your MagicPixel library ` +
                 `(working set + ${relative(process.cwd(), outRoot)}). They appear in Connected as they import.`));
@@ -258,6 +298,62 @@ export async function runPushWith(config, state, opts = {}) {
         process.exitCode = 1;
     return { ...counts, imported: matched.entries.length };
 }
+/**
+ * Sprites to re-send under `--force`: every sprite the cloud refused because it
+ * also changed there, re-addressed as an update against the sha the refusal
+ * reported. Not a bypass — the server still compares, so a save that lands in
+ * between refuses again.
+ */
+export function forcedRetrySprites(results, spriteByKey, flatten) {
+    const out = [];
+    for (const r of results) {
+        if (r.status !== 'conflict' || r.reason !== 'cloud-changed' || !r.assetId)
+            continue;
+        const original = spriteByKey.get(r.key);
+        if (!original)
+            continue;
+        // Skip a round we already tried with this exact baseline.
+        if (r.sha256 && original.baseSha256 === r.sha256)
+            continue;
+        out.push({
+            key: original.key,
+            pngBase64: original.pngBase64,
+            diskSha256: original.diskSha256,
+            assetId: r.assetId,
+            layerIdx: typeof r.layerIdx === 'number' ? r.layerIdx : (original.layerIdx ?? 0),
+            baseSha256: r.sha256 ?? null,
+            flatten,
+        });
+    }
+    return out;
+}
+/** Overwrite the earlier outcome for every retried key, in place. */
+export function replaceResultsByKey(results, updates) {
+    for (const u of updates) {
+        const i = results.findIndex((r) => r.key === u.key);
+        if (i >= 0)
+            results[i] = u;
+        else
+            results.push(u);
+    }
+}
+/**
+ * Store the live cloud sha a `cloud-changed` refusal reported as this sprite's
+ * pending baseline. Returns true when anything changed.
+ */
+export function rememberRefusedCloudShas(synced, results) {
+    let changed = false;
+    for (const r of results) {
+        if (r.status !== 'conflict' || r.reason !== 'cloud-changed' || !r.sha256)
+            continue;
+        const prev = synced[r.key];
+        if (!prev || prev.pendingCloudSha256 === r.sha256)
+            continue;
+        synced[r.key] = { ...prev, pendingCloudSha256: r.sha256 };
+        changed = true;
+    }
+    return changed;
+}
 async function commitPushResults(opts) {
     const { batchResults, candidates, sourceByKey, shaByKey, fpByKey, outDir } = opts;
     const failedKeys = new Set(batchResults.filter((r) => r.status === 'conflict' || r.status === 'error').map((r) => r.key));
@@ -276,6 +372,7 @@ async function commitPushResults(opts) {
                 delete nextSynced[r.key];
             const diskSha256 = shaByKey.get(r.key) ?? shaByKey.get(stateKey) ?? nextSynced[stateKey]?.diskSha256;
             const fp = fpByKey.get(r.key) ?? fpByKey.get(stateKey);
+            const previous = nextSynced[stateKey];
             nextSynced[stateKey] = {
                 assetId: r.assetId,
                 layerIdx: typeof r.layerIdx === 'number' ? r.layerIdx : (nextSynced[stateKey]?.layerIdx ?? 0),
@@ -285,6 +382,8 @@ async function commitPushResults(opts) {
                 ...(fp?.diskMtimeMs != null ? { diskMtimeMs: fp.diskMtimeMs } : {}),
                 ...(fp?.diskSize != null ? { diskSize: fp.diskSize } : {}),
                 ...(sourceRel ? { sourceRel } : {}),
+                ...(previous?.releasedAt ? { releasedAt: previous.releasedAt } : {}),
+                ...(previous?.releasedVersion != null ? { releasedVersion: previous.releasedVersion } : {}),
             };
         }
     }
@@ -300,7 +399,7 @@ async function persistDiskFingerprints(state, candidates) {
 function conflictHint(reason) {
     switch (reason) {
         case 'cloud-changed':
-            return `changed in MagicPixel since the last sync — run \`${cmd('sync')}\` first, then re-push.`;
+            return `also changed in MagicPixel. Press Sync on that artboard to use MagicPixel's copy, or run \`${cmd('push --force')}\` to keep this local one.`;
         case 'would-flatten':
             return 'artboard has multiple layers or frames — re-run with --flatten to replace it.';
         case 'legacy-document':
@@ -308,7 +407,7 @@ function conflictHint(reason) {
         case 'not-found':
             return `artboard no longer exists in MagicPixel — run \`${cmd('sync')}\` to refresh.`;
         default:
-            return `conflict — run \`${cmd('sync')}\` and try again.`;
+            return `conflict — review both copies, then press the artboard's Sync button to use MagicPixel's copy.`;
     }
 }
 /**

package/dist/commands/sync.js

@@ -24,7 +24,7 @@ import { formatBytes } from '../util/format.js';
 import { computePreviousKeyOrphans } from '../util/previousKeyOrphans.js';
 import { cmd } from '../util/invoke.js';
 import { formatSlowTickLine, formatWatchSpriteLine, SLOW_TICK_HEARTBEAT_MS } from '../util/watchCopy.js';
-import { decidePull } from '../util/pullDecision.js';
+import { decidePull, hasNewExplicitRelease } from '../util/pullDecision.js';
 import { hasUnpushedLocalEdit } from '../util/localEdit.js';
 import { shouldReconcile } from '../util/reconcile.js';
 import { runPush } from './push.js';
@@ -727,6 +727,7 @@ async function runOnce(opts, runOpts = {}) {
     const shaByEntryId = new Map();
     const toDownload = [];
     const conflicts = [];
+    const failedDownloadKeys = new Set();
     let bytesSaved = 0;
     let unchanged = 0;
     const synced = state.synced ?? {};
@@ -761,7 +762,15 @@ async function runOnce(opts, runOpts = {}) {
         const inWorkingSet = isWorkingSetEntry(entry, workingSet);
         // Unchanged cloud composite: skip hashing the original PNG (it almost
         // never matches) unless the file is gone and we need to restore it.
-        if (entry.sha256 && previousCloudSha256 === entry.sha256 && existsSync(pathFor(entry))) {
+        const previousReleasedAt = synced[entry.key]?.releasedAt;
+        const freshRelease = hasNewExplicitRelease({
+            releasedAt: entry.released_at,
+            previousReleasedAt,
+            releasedVersion: entry.released_version,
+            previousReleasedVersion: synced[entry.key]?.releasedVersion,
+            lastSync: state.lastSync,
+        });
+        if (!freshRelease && entry.sha256 && previousCloudSha256 === entry.sha256 && existsSync(pathFor(entry))) {
             shaByEntryId.set(entry.id, null);
             unchanged++;
             if (entry.size_bytes)
@@ -776,6 +785,11 @@ async function runOnce(opts, runOpts = {}) {
             previousCloudSha256,
             lastPushedDiskSha256: synced[entry.key]?.diskSha256,
             inWorkingSet,
+            releasedAt: entry.released_at,
+            previousReleasedAt,
+            releasedVersion: entry.released_version,
+            previousReleasedVersion: synced[entry.key]?.releasedVersion,
+            lastSync: state.lastSync,
         });
         if (decision === 'conflict') {
             conflicts.push(entry.key);
@@ -1130,6 +1144,7 @@ async function runOnce(opts, runOpts = {}) {
         }
         catch (e) {
             result.failed++;
+            failedDownloadKeys.add(entry.key);
             progress?.stop();
             // Multi-line messages come from friendlyFsError — print all lines
             // so the user sees the fix hint. Single-line errors stay terse.
@@ -1270,9 +1285,21 @@ async function runOnce(opts, runOpts = {}) {
         // Conflicted keys keep their old baselines: recording the new cloud sha
         // (with the locally-edited disk sha) would make both halves believe they
         // are in sync and freeze the divergence forever.
-        if (conflictSet.has(entry.key))
+        if (conflictSet.has(entry.key)) {
+            const previous = nextSynced[entry.key];
+            if (previous && entry.sha256) {
+                nextSynced[entry.key] = { ...previous, pendingCloudSha256: entry.sha256 };
+            }
+            continue;
+        }
+        if (failedDownloadKeys.has(entry.key))
             continue;
-        const sha = entry.sha256 ?? (await fileSha256(pathFor(entry)));
+        // After a write, the actual downloaded bytes are the disk/cloud baseline.
+        // The manifest hash may be null or represent a cached composite while the
+        // download endpoint serves storage bytes for a single-artboard document.
+        const sha = writtenKeys.has(entry.key)
+            ? await fileSha256(pathFor(entry))
+            : (entry.sha256 ?? (await fileSha256(pathFor(entry))));
         if (!sha)
             continue;
         const prev = nextSynced[entry.key];
@@ -1284,7 +1311,16 @@ async function runOnce(opts, runOpts = {}) {
         // them anyway, flagged, so `push` skips them with a hint instead of
         // adopting the same art as a second document.
         if (typeof entry.layer_idx !== 'number' || entry.layer_idx < 0) {
-            nextSynced[entry.key] = { assetId: entry.asset_id, layerIdx: 0, sha256: sha, diskSha256, legacy: true, ...(sourceRel ? { sourceRel } : {}) };
+            nextSynced[entry.key] = {
+                assetId: entry.asset_id,
+                layerIdx: 0,
+                sha256: sha,
+                diskSha256,
+                legacy: true,
+                ...(sourceRel ? { sourceRel } : {}),
+                ...(entry.released_at ? { releasedAt: entry.released_at } : {}),
+                ...(entry.released_version != null ? { releasedVersion: entry.released_version } : {}),
+            };
             continue;
         }
         nextSynced[entry.key] = {
@@ -1294,6 +1330,8 @@ async function runOnce(opts, runOpts = {}) {
             diskSha256,
             ...(typeof entry.layer_count === 'number' ? { layers: entry.layer_count } : {}),
             ...(sourceRel ? { sourceRel } : {}),
+            ...(entry.released_at ? { releasedAt: entry.released_at } : {}),
+            ...(entry.released_version != null ? { releasedVersion: entry.released_version } : {}),
         };
     }
     const nextState = {
@@ -1372,6 +1410,8 @@ async function runOnce(opts, runOpts = {}) {
     if (result.failed > 0 && verbose) {
         console.log(kleur.yellow(`\n${result.failed} download${result.failed === 1 ? '' : 's'} failed — lastSync not advanced. Re-run to retry.`));
     }
+    onStatus?.('Checking your game files…');
+    const pushed = await maybePushLocalSprites(config.push, verbose, gameIndex, live && !!runOpts.watchMode, onStatus, conflictSet);
     if (verbose) {
         console.log();
         const summary = `downloaded ${downloaded} (added ${result.added.length}, modified ${result.modified.length}), ` +
@@ -1380,25 +1420,23 @@ async function runOnce(opts, runOpts = {}) {
             (shouldPrune ? `, pruned ${result.removed.length}` : '') +
             (renamed.length ? `, renamed ${renamed.length}` : '') +
             (result.failed ? `, failed ${result.failed}` : '');
-        console.log(result.failed ? kleur.yellow(`done with errors. ${summary}`) : kleur.green(`✓ done. ${summary}`));
-        // Per-file change list. Suppress renames here — printRenames below owns
-        // the rename block (it adds the import-update hints). Letting both fire
-        // would print each rename twice.
+        const pushFailed = (pushed?.conflict ?? 0) + (pushed?.error ?? 0);
+        console.log(result.failed || pushFailed
+            ? kleur.yellow(`Sync finished with issues. ${summary}`)
+            : kleur.green(`✓ Sync complete. ${summary}`));
         printChanges(result, '  ', { includeRenames: renamed.length === 0 });
         if (renamed.length > 0)
             printRenames(renamed, { withHints: true });
     }
-    onStatus?.('Checking your game files…');
-    const pushed = await maybePushLocalSprites(config.push, verbose, gameIndex, live && !!runOpts.watchMode, onStatus);
     if (result.failed)
         process.exitCode = 1;
     return { ...result, pushed };
 }
-async function maybePushLocalSprites(pushEnabled, verbose, gameIndex, announceErrors = verbose, onStatus) {
+async function maybePushLocalSprites(pushEnabled, verbose, gameIndex, announceErrors = verbose, onStatus, excludeKeys) {
     if (pushEnabled === false)
         return null;
     try {
-        return await runPush({ quiet: !verbose, gameIndex, onStatus });
+        return await runPush({ quiet: !verbose, nestedSync: true, gameIndex, onStatus, excludeKeys });
     }
     catch (e) {
         if (announceErrors) {
@@ -1474,11 +1512,13 @@ function humanTime(iso) {
 function printConflicts(keys, removedRemotely = new Set()) {
     console.log();
     console.log(kleur.yellow(`${keys.length} sprite${keys.length === 1 ? '' : 's'} changed in both places — not overwritten:`));
-    for (const key of keys) {
+    for (const key of keys.slice(0, 10)) {
         const note = removedRemotely.has(key) ? kleur.dim(' (no longer synced from MagicPixel)') : '';
         console.log(`  ${kleur.yellow('~')} ${key}${note}`);
     }
-    console.log(kleur.dim(`  Keep the local edit: run \`${cmd('push')}\` (it will report the cloud change), or delete the PNG to accept MagicPixel's copy.`));
+    if (keys.length > 10)
+        console.log(kleur.dim(`  …and ${keys.length - 10} more`));
+    console.log(kleur.dim(`  Use MagicPixel's copy: press Sync on that artboard. Keep the local edit: run \`${cmd('push --force')}\`.`));
     if (removedRemotely.size > 0) {
         console.log(kleur.dim(`  Marked (no longer synced): re-check "Sync to Unity" (or restore the document) to push the edit up, or delete the PNG to accept the removal.`));
     }

package/dist/index.js

@@ -97,7 +97,8 @@ program
     .description('Upload local sprite edits back to MagicPixel (two-way sync)')
     .option('--dry-run', 'Print what would be pushed without sending anything')
     .option('--flatten', 'Allow replacing multi-layer artboards with the flat local image')
-    .addHelpText('after', '\nExamples:\n  $ magicpixel push --dry-run      # see what changed on disk\n  $ magicpixel push                # send local edits + new sprites\n')
+    .option('--force', 'Keep your local copy when a sprite also changed in MagicPixel')
+    .addHelpText('after', '\nExamples:\n  $ magicpixel push --dry-run      # see what changed on disk\n  $ magicpixel push                # send local edits + new sprites\n  $ magicpixel push --force        # your local copy wins on both-sides-changed\n')
     .action(wrap("push", async (opts) => pushCommand(opts)));
 program
     .command('connect <glob>')

package/dist/util/pullDecision.js

@@ -14,10 +14,30 @@
  * that file, the entry is reported instead of downloaded.
  */
 import { isLocalEdit } from './localEdit.js';
+/** A newer editor Sync press explicitly chooses MagicPixel for this sprite. */
+export function hasNewExplicitRelease(opts) {
+    if (opts.releasedVersion != null && opts.previousReleasedVersion != null) {
+        return opts.releasedVersion > opts.previousReleasedVersion;
+    }
+    if (!opts.releasedAt)
+        return false;
+    const released = Date.parse(opts.releasedAt);
+    if (!Number.isFinite(released))
+        return false;
+    const baseline = opts.previousReleasedAt ?? opts.lastSync;
+    if (!baseline)
+        return false;
+    const previous = Date.parse(baseline);
+    return Number.isFinite(previous) && released > previous;
+}
 export function decidePull(opts) {
     const cloud = opts.cloudSha256 ?? null;
     const local = opts.localSha256;
     const prev = opts.previousCloudSha256;
+    // A fresh explicit release is the user's scoped instruction for the cloud
+    // copy to replace this PNG, even if the PNG also changed locally.
+    if (hasNewExplicitRelease(opts))
+        return 'pull';
     // Missing on disk → restore from cloud (MagicPixel-only art and deletions).
     if (!local)
         return 'pull';

package/dist/util/pushPlan.js

@@ -145,7 +145,10 @@ export function planPush(candidates, synced, opts = {}) {
                 key: c.key,
                 assetId: known.assetId,
                 layerIdx: known.layerIdx,
-                baseSha256: known.sha256,
+                // `sync` records the live cloud hash when it protects a dual edit.
+                // A later explicit `push` can then safely keep the local copy without
+                // bypassing the server's optimistic-concurrency check.
+                baseSha256: known.pendingCloudSha256 ?? known.sha256,
             });
             continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicpixelart/cli",
-  "version": "0.5.22",
+  "version": "0.5.24",
   "description": "Sync MagicPixel pixel-art assets to your local project.",
   "type": "module",
   "bin": {