@magicpixelart/cli 0.5.35 → 0.5.36

package/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to `@magicpixelart/cli` will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.5.36] - 2026-10-07
+
+### Changed
+- `push --force` no longer replaces files whose newer copy was saved in the MagicPixel editor; they are listed as "edited in MagicPixel — skipped". Add `--overwrite-editor-changes` to replace them too.
+
 ## [0.5.35] - 2026-10-07
 
 ### Changed

package/README.md

@@ -150,6 +150,10 @@ npx @magicpixelart/cli sync --watch --only Runtime/Sprites/Entities/decorations
 
 Only that folder is pushed, pulled, or pruned. Every other file stays exactly as it is. Repeat `--only` for more folders, or set `"syncOnly"` in `magicpixel.json`. Changing the folder list triggers one full check. `sync <folder>` without `--only` stops with an error instead of syncing everything.
 
+## Forced pushes and editor edits
+
+`push --force` keeps your local copy when a sprite changed on both sides, except for files last saved in the MagicPixel editor: those are skipped and listed, so a forced push never silently undoes editor work. Add `--overwrite-editor-changes` to replace them as well.
+
 ## Keep a folder out of MagicPixel
 
 To leave game files on disk but out of your library, add them to `exclude` in `magicpixel.json`:

package/dist/commands/push.js

@@ -255,7 +255,7 @@ export async function runPushWith(config, state, opts = {}) {
         // 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);
+            const retry = forcedRetrySprites(results, spriteByKey, opts.flatten === true, opts.overwriteEditorChanges === true);
             if (retry.length === 0)
                 break;
             const retryResults = await pushSpritesAdaptive(retry);
@@ -300,7 +300,7 @@ export async function runPushWith(config, state, opts = {}) {
         for (const r of results) {
             if (r.status === 'conflict') {
                 if (printedIssues++ < 10)
-                    console.log(`  ${kleur.yellow('!')} ${r.key}: ${conflictHint(r.reason)}`);
+                    console.log(`  ${kleur.yellow('!')} ${r.key}: ${opts.force && r.lastWriteSource === 'editor' && !opts.overwriteEditorChanges ? `edited in MagicPixel — skipped. Add --overwrite-editor-changes to replace it.` : conflictHint(r.reason)}`);
             }
             else if (r.status === 'error') {
                 if (printedIssues++ < 10)
@@ -344,11 +344,14 @@ export function collectKeptAssetIds(candidates, synced, results) {
  * reported. Not a bypass — the server still compares, so a save that lands in
  * between refuses again.
  */
-export function forcedRetrySprites(results, spriteByKey, flatten) {
+export function forcedRetrySprites(results, spriteByKey, flatten, overwriteEditorChanges = false) {
     const out = [];
     for (const r of results) {
         if (r.status !== 'conflict' || r.reason !== 'cloud-changed' || !r.assetId)
             continue;
+        // A newer save made in the MagicPixel editor is never silently undone.
+        if (r.lastWriteSource === 'editor' && !overwriteEditorChanges)
+            continue;
         const original = spriteByKey.get(r.key);
         if (!original)
             continue;

package/dist/index.js

@@ -108,7 +108,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')
-    .option('--force', 'Keep your local copy when a sprite also changed in MagicPixel')
+    .option('--force', 'Keep your local copy when a sprite also changed in MagicPixel (skips files saved in the MagicPixel editor)')
+    .option('--overwrite-editor-changes', 'With --force: also replace files saved in the MagicPixel editor')
     .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

package/package.json

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