@magicpixelart/cli 0.5.32 → 0.5.35

package/CHANGELOG.md

@@ -5,6 +5,25 @@ 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.35] - 2026-10-07
+
+### Changed
+- `exclude` now also stops uploads: game PNGs matching an exclude glob are never pushed, even when `connect` is `**`.
+- Removed the 10,000-PNG game index / connect cap: every sprite in the project is now indexed, connected and pushed. The server's daily allowance still applies; re-running resumes where it stopped.
+
+## [0.5.34] - 2026-10-06
+
+### Fixed
+- `push --force` no longer fails with "Too many sprites (max 20 per request)" when more than 20 files are retried; the retry round is now sent in small batches.
+
+## [0.5.33] - 2026-10-06
+
+### Fixed
+- Local edits to game files that were never changed in MagicPixel no longer fail as "also changed in MagicPixel". Push now sends the cloud timestamp it last saw, and sync no longer records the local file as MagicPixel's copy when the server has no cached hash.
+
+### Changed
+- Watch header now reads "N game sprites connected" — it counts game PNGs matched by `connect`, not files waiting in MagicPixel.
+
 ## [0.5.32] - 2026-10-05
 
 ### Fixed

package/README.md

@@ -150,13 +150,23 @@ 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.
 
+## Keep a folder out of MagicPixel
+
+To leave game files on disk but out of your library, add them to `exclude` in `magicpixel.json`:
+
+```json
+{ "exclude": [".SpineRaw/rabbit_nft/**"] }
+```
+
+Excluded files are never uploaded, even when `connect` is `**`, and the CLI never deletes them from your game. Then delete the folder in the MagicPixel library (it goes to Trash) and it stays gone.
+
 ## Config (`magicpixel.json`)
 
 | Field      | Type       | Default                 | Meaning                                          |
 | ---------- | ---------- | ----------------------- | ------------------------------------------------ |
 | `outDir`   | `string`   | framework-dependent     | Where PNGs (and `index.ts`) are written.         |
 | `include`  | `string[]` | `["**/*"]`              | Globs (picomatch) matched against `folder/slug`. |
-| `exclude`  | `string[]` | `[]`                    | Globs to exclude.                                |
+| `exclude`  | `string[]` | `[]`                    | Globs to skip in both directions: never downloaded, and game PNGs matching them are never uploaded (wins over `connect`). |
 | `connect`  | `string[]` | `["**"]` on engines | Game PNG globs to keep in Connected. Empty on JS projects. |
 | `emitIndex`| `boolean`  | `true`                  | Emit `<outDir>/index.ts` with typed asset map.   |
 | `unityPpu` | `number?`  | `32`                    | Unity only: pixels-per-unit in generated `.meta`. |

package/dist/api.js

@@ -423,6 +423,15 @@ function isTransientPushError(e) {
 export async function pushSpritesAdaptive(sprites, retryOpts) {
     if (sprites.length === 0)
         return [];
+    // Never send more than one batch per request — callers (e.g. the --force
+    // retry round) may hand over every refused sprite at once.
+    if (sprites.length > PUSH_BATCH_SIZE) {
+        const out = [];
+        for (let i = 0; i < sprites.length; i += PUSH_BATCH_SIZE) {
+            out.push(...(await pushSpritesAdaptive(sprites.slice(i, i + PUSH_BATCH_SIZE), retryOpts)));
+        }
+        return out;
+    }
     try {
         return await pushSprites(sprites, retryOpts);
     }

package/dist/commands/connect.js

@@ -3,7 +3,7 @@ import ora from 'ora';
 import { loadConfig, saveConfig } from '../config.js';
 import { assertSafeGlob } from '../util/security.js';
 import { detectProjectKind, isEngineKind } from '../util/framework.js';
-import { indexGamePngs, matchConnectGlobs, GAME_INDEX_CAP_HINT, connectCapMessage, countingSpritesText } from '../util/gameScan.js';
+import { indexGamePngs, matchConnectGlobs, countingSpritesText } from '../util/gameScan.js';
 import { isAllSpritesGlob, nextConnectGlobs } from '../util/engineConnect.js';
 import { cmd } from '../util/invoke.js';
 import { runPush } from './push.js';
@@ -36,23 +36,15 @@ export async function connectCommand(glob) {
         onProgress: (p) => { spinner.text = countingSpritesText(p); },
     });
     spinner.stop();
-    if (index.capped) {
-        console.log(kleur.yellow(`! ${GAME_INDEX_CAP_HINT}`));
-    }
-    const matched = matchConnectGlobs(index, config.connect);
-    if (matched.capped) {
-        console.log(kleur.yellow(`! ${connectCapMessage(matched.total, matched.entries.length)}`));
-    }
+    const matched = matchConnectGlobs(index, config.connect, config.exclude);
     if (matched.entries.length === 0) {
         console.log(kleur.yellow(`  No PNGs matched. Try \`${cmd('search')} <name>\` to see indexed paths.`));
         return;
     }
     const n = matched.entries.length;
-    console.log(kleur.dim(`  ${n} sprite${n === 1 ? '' : 's'} to sync (of ${index.files.length} in your game` +
-        (matched.capped ? `, ${matched.total} matched` : '') +
-        `).`));
+    console.log(kleur.dim(`  ${n} sprite${n === 1 ? '' : 's'} to sync (of ${index.files.length} in your game).`));
     if (n >= 200) {
-        console.log(kleur.dim(`  Already-imported sprites are skipped; only new or changed files upload.`));
+        console.log(kleur.dim(`  Found ${n} sprites. Only new or changed files upload.`));
     }
     await runPush({ gameIndex: index });
 }

package/dist/commands/push.js

@@ -19,7 +19,7 @@ import { assetDiskPathFromKey, walkOutDirPngs } from '../util/paths.js';
 import { applyDiskFingerprints, indexSyncedBySourceRel, planPush, resolveSyncedKey } from '../util/pushPlan.js';
 import { cmd } from '../util/invoke.js';
 import { detectProjectKind, isEngineKind } from '../util/framework.js';
-import { indexGamePngs, matchConnectGlobs, GAME_INDEX_CAP_HINT, connectCapMessage, countingSpritesText } from '../util/gameScan.js';
+import { indexGamePngs, matchConnectGlobs, countingSpritesText } from '../util/gameScan.js';
 import { collectSourceRelMap, remapAbsToCloudKeys } from '../util/syncPath.js';
 import { assertSafeIoPath } from '../util/security.js';
 /** Parallel hashing / path checks — enough to saturate disk, low enough to stay polite. */
@@ -64,8 +64,8 @@ export async function runPushWith(config, state, opts = {}) {
             ? await indexGamePngs(kind, process.cwd(), config.outDir, {
                 onProgress: spinner ? (p) => { spinner.text = countingSpritesText(p); } : undefined,
             })
-            : { files: [], capped: false });
-    const matched = matchConnectGlobs(index, config.connect ?? []);
+            : { files: [] });
+    const matched = matchConnectGlobs(index, config.connect ?? [], config.exclude);
     const sourceByKey = collectSourceRelMap(matched.entries, state.synced);
     const disk = await walkOutDirPngs(config.outDir);
     const absByKey = new Map(disk.map((a) => [a.key, a.abs]));
@@ -151,12 +151,6 @@ export async function runPushWith(config, state, opts = {}) {
     const sendable = actions.filter((a) => a.kind === 'update' || a.kind === 'adopt');
     spinner?.succeed(`Local sprites: ${candidates.length} · to push ${sendable.length} · unchanged ${skipped}` +
         (matched.entries.length ? ` · connected ${matched.entries.length}` : ''));
-    if (index.capped && !quiet) {
-        console.log(kleur.yellow(`! ${GAME_INDEX_CAP_HINT}`));
-    }
-    if (matched.capped && !quiet) {
-        console.log(kleur.yellow(`! ${connectCapMessage(matched.total, matched.entries.length)}`));
-    }
     if (skippedUnsafe > 0 && !quiet) {
         console.log(kleur.yellow(`! skipped ${skippedUnsafe} path${skippedUnsafe === 1 ? '' : 's'} that were not regular files inside the project.`));
     }
@@ -215,6 +209,7 @@ export async function runPushWith(config, state, opts = {}) {
                 assetId: a.assetId,
                 layerIdx: a.layerIdx,
                 baseSha256: a.baseSha256,
+                ...(a.baseUpdatedAt ? { baseUpdatedAt: a.baseUpdatedAt } : {}),
                 flatten: opts.flatten === true,
                 ...(opts.replace ? { replace: true } : {}),
             });

package/dist/commands/resync.js

@@ -77,8 +77,7 @@ export async function runResync(segments, opts = {}) {
     if (plan.scanned === 0) {
         throw new Error(`No local sprites found in "${label}". Nothing was changed. Check the folder name with \`magicpixel search\`.`);
     }
-    const pruneAllowed = !gameIndex.capped;
-    const preview = pruneAllowed && plan.keptAssetIds.length > 0
+    const preview = plan.keptAssetIds.length > 0
         ? await pruneResyncFolder(segments, plan.keptAssetIds, true)
         : null;
     log(kleur.bold(`Resync ${label} from your game`));
@@ -90,8 +89,6 @@ export async function runResync(segments, opts = {}) {
         if (preview.wouldTrash.length > 10)
             log(kleur.dim(`    …and ${preview.wouldTrash.length - 10} more`));
     }
-    if (!pruneAllowed)
-        log(kleur.yellow('  ! game scan hit its file cap — nothing will be trashed.'));
     log(kleur.dim('  Local files win: MagicPixel copies are overwritten and resized to match.'));
     if (opts.dryRun) {
         log(kleur.dim('--dry-run: nothing sent.'));
@@ -105,9 +102,7 @@ export async function runResync(segments, opts = {}) {
     });
     let pruneSkipped = null;
     let trashed = 0;
-    if (!pruneAllowed)
-        pruneSkipped = 'game scan capped';
-    else if (push.error > 0 || push.conflict > 0)
+    if (push.error > 0 || push.conflict > 0)
         pruneSkipped = 'some sprites failed to upload';
     else if (push.keptAssetIds.length === 0)
         pruneSkipped = 'no files confirmed';

package/dist/commands/search.js

@@ -2,7 +2,7 @@ import kleur from 'kleur';
 import ora from 'ora';
 import { loadConfig } from '../config.js';
 import { detectProjectKind, isEngineKind } from '../util/framework.js';
-import { indexGamePngs, searchGameIndex, GAME_INDEX_CAP_HINT, countingSpritesText } from '../util/gameScan.js';
+import { indexGamePngs, searchGameIndex, countingSpritesText } from '../util/gameScan.js';
 import { cmd } from '../util/invoke.js';
 const PRINT_CAP = 50;
 /**
@@ -31,9 +31,6 @@ export async function searchCommand(query) {
         onProgress: (p) => { spinner.text = countingSpritesText(p); },
     });
     spinner.stop();
-    if (index.capped) {
-        console.log(kleur.yellow(`! ${GAME_INDEX_CAP_HINT}`));
-    }
     const hits = searchGameIndex(index, q);
     if (hits.length === 0) {
         console.log(kleur.dim(`  No indexed PNGs matching "${q}" (${index.files.length} scanned).`));

package/dist/commands/sync.js

@@ -12,7 +12,7 @@ import { createLimit } from '../util/limit.js';
 import { emitTypedIndex, ensureAgentsDoc, scanDiskAssets } from '../util/emitIndex.js';
 import { assertPathInsideRoot, assertSafeIoPath } from '../util/security.js';
 import { detectProjectKind, isEngineKind } from '../util/framework.js';
-import { indexGamePngs, matchConnectGlobs, GAME_INDEX_CAP_HINT, connectCapMessage, countingSpritesText } from '../util/gameScan.js';
+import { indexGamePngs, matchConnectGlobs, countingSpritesText } from '../util/gameScan.js';
 import { aliasCollisionKeys, collectSourceRelMap, isPathInside, syncDiskPathFromKey } from '../util/syncPath.js';
 import { DEFAULT_UNITY_PPU, writeMissingUnityMetas } from '../util/unityMeta.js';
 import { filterUnityManifest, isWorkingSetEntry, partitionWithheldEntries, shouldPruneDeselectedEntry, workingSetPullKeys } from '../util/unityFilter.js';
@@ -510,7 +510,7 @@ async function loadWatchHeader(onProgress) {
         const kind = await detectProjectKind();
         if (isEngineKind(kind) && (config.connect?.length ?? 0) > 0) {
             gameIndex = await indexGamePngs(kind, process.cwd(), config.outDir, { onProgress });
-            workingSet = matchConnectGlobs(gameIndex, config.connect).total;
+            workingSet = matchConnectGlobs(gameIndex, config.connect, config.exclude).entries.length;
         }
         else if (state.synced) {
             workingSet = Object.keys(state.synced).length;
@@ -649,14 +649,14 @@ async function runOnce(opts, runOpts = {}) {
                             : `Looking through your game sprites…  ${n}`);
                 },
             })
-            : { files: [], capped: false });
+            : { files: [] });
     if (!runOpts.gameIndex)
         runOpts.onGameIndex?.(gameIndex);
     const fullGameIndex = gameIndex;
     const scopedGameIndex = scope
         ? { ...fullGameIndex, files: fullGameIndex.files.filter((f) => pathInScope(scope, f.sourceRel)) }
         : fullGameIndex;
-    const connected = matchConnectGlobs(scopedGameIndex, config.connect ?? []);
+    const connected = matchConnectGlobs(scopedGameIndex, config.connect ?? [], config.exclude);
     const sourceByKey = collectSourceRelMap(connected.entries, state.synced);
     if (scope) {
         // Out-of-scope rows become hold-only: never pulled, and their folders are
@@ -686,15 +686,8 @@ async function runOnce(opts, runOpts = {}) {
         }
     }
     aliasCollisionKeys(sourceByKey, manifest.map((e) => e.key));
-    if (verbose && gameIndex.capped) {
-        console.log(kleur.yellow(`! ${GAME_INDEX_CAP_HINT}`));
-    }
-    if (verbose && connected.capped) {
-        console.log(kleur.yellow(`! ${connectCapMessage(connected.total, connected.entries.length)}`));
-    }
     if (verbose && isEngineKind(projectKind)) {
-        console.log(kleur.dim(`  game index → ${gameIndex.files.length} PNG${gameIndex.files.length === 1 ? '' : 's'} · working set ${connected.entries.length}` +
-            (connected.capped ? ` of ${connected.total} matched` : '')));
+        console.log(kleur.dim(`  game index → ${gameIndex.files.length} PNG${gameIndex.files.length === 1 ? '' : 's'} · working set ${connected.entries.length}`));
     }
     const pathForKey = (key) => syncDiskPathFromKey(config.outDir, key, sourceByKey);
     // Every folder on disk that belongs to a withheld document. Anything already
@@ -1377,12 +1370,14 @@ async function runOnce(opts, runOpts = {}) {
         // 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 prev = nextSynced[entry.key];
+        // Never let the local game file stand in for MagicPixel's composite when
+        // the manifest has no cached hash: keep the last real cloud baseline.
         const sha = writtenKeys.has(entry.key)
             ? await fileSha256(pathFor(entry))
-            : (entry.sha256 ?? (await fileSha256(pathFor(entry))));
+            : (entry.sha256 ?? prev?.sha256 ?? (await fileSha256(pathFor(entry))));
         if (!sha)
             continue;
-        const prev = nextSynced[entry.key];
         const diskSha256 = writtenKeys.has(entry.key)
             ? sha
             : (shaByEntryId.get(entry.id) ?? prev?.diskSha256 ?? sha);

package/dist/util/gameScan.js

@@ -47,15 +47,6 @@ export const GAME_SCAN_SKIP_HIDDEN = new Set([
 ]);
 /** Parallel directory reads while walking the game tree. */
 const SCAN_WALK_CONCURRENCY = 8;
-/** Cap on the search index (whole tree). Connect uses the same ceiling. */
-export const MAX_GAME_INDEX = 10_000;
-/** Cap on PNGs ingested for one working-set connect / push. */
-export const MAX_GAME_CONNECT = MAX_GAME_INDEX;
-export const GAME_INDEX_CAP_HINT = `Game index hit ${MAX_GAME_INDEX} PNGs — later files aren't searchable or connectable.`;
-export function connectCapMessage(total, ingested) {
-    return (`${total} sprites match — syncing the first ${ingested} (cap ${MAX_GAME_CONNECT}). ` +
-        `Connect a smaller folder if you don't need all of them.`);
-}
 /** True for a full Unity game project (not an embedded UPM package). */
 function isUnityGameProject(cwd, assetRoot) {
     return Boolean(assetRoot && existsSync(resolve(cwd, 'ProjectSettings')));
@@ -175,7 +166,7 @@ function samePath(a, b) {
 }
 /** Walk the engine tree and return index entries. Does not copy files. */
 export async function indexGamePngs(kind, cwd = process.cwd(), outDir = '', opts = {}) {
-    const empty = { files: [], capped: false };
+    const empty = { files: [] };
     if (!isEngineKind(kind))
         return empty;
     const scanRoot = resolve(cwd);
@@ -192,30 +183,27 @@ export async function indexGamePngs(kind, cwd = process.cwd(), outDir = '', opts
     // Library/Packages/cloud placeholders and looks hung at "1 folder".
     const startAt = isUnityGameProject(cwd, assetRoot) ? assetRoot : scanRoot;
     const preferFirst = startAt === scanRoot ? assetRoot : null;
-    await walkPngs(startAt, scanRoot, destNorm, found, MAX_GAME_INDEX + 1, io, report, stats, preferFirst);
+    await walkPngs(startAt, scanRoot, destNorm, found, Infinity, io, report, stats, preferFirst);
     report.flush?.();
     opts.onProgress?.({ pngs: found.length, folders: stats.folders });
     found.sort((a, b) => a.localeCompare(b));
-    const capped = found.length > MAX_GAME_INDEX;
-    if (capped)
-        found.length = MAX_GAME_INDEX;
     const files = [];
     for (const abs of found) {
         const entry = toEntry(abs, scanRoot, assetRoot);
         if (entry)
             files.push(entry);
     }
-    return { files, capped };
+    return { files };
 }
-/** Filter the index by connect globs (cwd-relative or asset-root-relative). */
-export function matchConnectGlobs(index, globs, max = MAX_GAME_CONNECT) {
+/** Filter the index by connect globs minus exclude globs (cwd-, asset-root-relative or manifest key). */
+export function matchConnectGlobs(index, globs, exclude = []) {
     if (globs.length === 0)
-        return { entries: [], total: 0, capped: false };
-    const matched = index.files.filter((e) => globs.some((g) => matchGlob(e.sourceRel, g) || matchGlob(e.adoptRel, g)));
+        return { entries: [] };
+    const hit = (e, g) => matchGlob(e.sourceRel, g) || matchGlob(e.adoptRel, g) || matchGlob(e.key, g);
+    // `exclude` wins over `connect`: excluded game files are never uploaded.
+    const matched = index.files.filter((e) => globs.some((g) => hit(e, g)) && !exclude.some((g) => hit(e, g)));
     matched.sort((a, b) => a.sourceRel.localeCompare(b.sourceRel));
-    const total = matched.length;
-    const capped = total > max;
-    return { entries: capped ? matched.slice(0, max) : matched, total, capped };
+    return { entries: matched };
 }
 export function searchGameIndex(index, query) {
     const q = query.trim().toLowerCase();

package/dist/util/pushPlan.js

@@ -151,6 +151,7 @@ export function planPush(candidates, synced, opts = {}) {
                 // A later explicit `push` can then safely keep the local copy without
                 // bypassing the server's optimistic-concurrency check.
                 baseSha256: known.pendingCloudSha256 ?? known.sha256,
+                ...(known.cloudUpdatedAt && !known.pendingCloudSha256 ? { baseUpdatedAt: known.cloudUpdatedAt } : {}),
             });
             continue;
         }

package/dist/util/watchCopy.js

@@ -13,10 +13,10 @@ export function formatWatchSpriteLine(c) {
     if (set === 0 && pulled === 0)
         return null;
     if (set > 0 && pulled > 0 && set !== pulled) {
-        return `   Sprites:  ${fmt(set)} in your game  ·  ${fmt(pulled)} last pulled from MagicPixel`;
+        return `   Sprites:  ${fmt(set)} game sprites connected  ·  ${fmt(pulled)} last pulled from MagicPixel`;
     }
     if (set > 0)
-        return `   Sprites:  ${fmt(set)} in your game`;
+        return `   Sprites:  ${fmt(set)} game sprites connected`;
     return `   Sprites:  ${fmt(pulled)}`;
 }
 /** How long a single watch tick may run before the heartbeat starts printing. */

package/package.json

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