@magicpixelart/cli 0.6.4 → 0.6.5

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.6.5] - 2026-10-17
+
+### Fixed
+- Spine rigs bind to the folder named like them (`bubble.json` → `bubble/`, `glyph_heart.json` → `heart/`) before falling back to matching part names, which are too generic for props (`bubble` had bound to `Environment/`, `mushrooms` to `turret/`).
+- A rig an earlier upload bound to a folder that no rig binds to now is taken off that folder, so one object's rig no longer shows on another's parts. `spine --dry-run` lists these.
+
 ## [0.6.4] - 2026-10-17
 
 ### Fixed

package/dist/api.js

@@ -463,26 +463,37 @@ export function resolveSpineEndpoint() {
     const override = process.env.MAGICPIXEL_SPINE_ENDPOINT?.trim();
     return override ? validateEndpointUrl(override) : DEFAULT_SPINE_ENDPOINT;
 }
-/** Upload up to 10 rigs; the server attaches each to its library folder. */
-export async function pushSpineRigs(rigs, retryOpts) {
+/** POST to the spine endpoint; returns the parsed JSON body. */
+async function postSpine(body, retryOpts) {
     const url = resolveSpineEndpoint();
     return retryTransient('spine', async () => {
         const { headers, requestId } = buildHeaders({ 'Content-Type': 'application/json' });
-        const res = await safeFetch(url, { method: 'POST', headers, body: JSON.stringify({ rigs }) }, { timeoutMs: ASSET_TIMEOUT_MS });
+        const res = await safeFetch(url, { method: 'POST', headers, body: JSON.stringify(body) }, { timeoutMs: ASSET_TIMEOUT_MS });
         const serverRequestId = res.headers.get('x-request-id') ?? requestId;
         if (res.ok) {
             const data = (await res.json());
-            const results = data && typeof data === 'object' ? data.results : undefined;
-            if (!Array.isArray(results)) {
+            if (!data || typeof data !== 'object' || !Array.isArray(data.results)) {
                 throw new ApiError(502, withRequestId('spine: unexpected server response shape (results missing).', serverRequestId), serverRequestId);
             }
-            return results;
+            return data;
         }
         const bodyText = await res.text();
         const errorCode = errorCodeFromResponse(res);
         throw new ApiError(res.status, withRequestId(friendlyApiError(res.status, bodyText, 'spine', errorCode), serverRequestId), serverRequestId, retryAfterMsFromResponse(res), errorCode);
     }, retryOpts);
 }
+/** Upload up to 10 rigs; the server attaches each to its library folder. */
+export async function pushSpineRigs(rigs, retryOpts) {
+    return (await postSpine({ rigs }, retryOpts)).results;
+}
+/**
+ * Take this CLI's rigs off folders it no longer binds them to. Returns the
+ * folder paths (`a/b`) the server cleared; an older server clears none.
+ */
+export async function removeSpineRigs(folderPaths, retryOpts) {
+    const data = await postSpine({ rigs: [], remove: folderPaths }, retryOpts);
+    return Array.isArray(data.removed) ? data.removed.filter((p) => typeof p === 'string') : [];
+}
 // ---------- folder resync (local folder is the source of truth) -------------
 export function resolveResyncEndpoint() {
     return resolveIngestEndpoint().replace(/\/ingest$/, '/resync');

package/dist/commands/spine.js

@@ -10,7 +10,7 @@ import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import kleur from 'kleur';
 import { loadConfig, loadState, saveState } from '../config.js';
-import { ApiError, pushSpineRigs } from '../api.js';
+import { ApiError, pushSpineRigs, removeSpineRigs } from '../api.js';
 import { detectProjectKind, isEngineKind, readWorkspaceMembers } from '../util/framework.js';
 import { indexGamePngs, matchConnectGlobs } from '../util/gameScan.js';
 import { batchRigs, describeRig, detectRigs, findSkeletonFiles, rigsToUpload, rigVersionSupported, SUPPORTED_SPINE_VERSION, syncedPngsFromEntries, } from '../util/spine.js';
@@ -25,7 +25,7 @@ export function skeletonRoots(cwd) {
 }
 export async function runSpineRigs(opts = {}) {
     const cwd = opts.cwd ?? process.cwd();
-    const empty = { skeletons: 0, rigs: [], skippedFiles: [] };
+    const empty = { skeletons: 0, rigs: [], skippedFiles: [], removed: [] };
     const config = opts.config ?? (await loadConfig(cwd));
     const kind = await detectProjectKind(cwd);
     if (!isEngineKind(kind))
@@ -52,9 +52,9 @@ export async function runSpineRigs(opts = {}) {
             pending.delete(rig);
         }
     }
+    const record = {};
     if (!opts.dryRun && pending.size > 0) {
         const upload = opts.upload ?? pushSpineRigs;
-        const record = {};
         for (const batch of batchRigs([...pending])) {
             try {
                 const payload = await Promise.all(batch.map(async (r) => ({
@@ -82,14 +82,38 @@ export async function runSpineRigs(opts = {}) {
                     outcomes.set(rig, { rig, status: 'error', error: message });
             }
         }
-        if (Object.keys(record).length > 0) {
-            // Re-read: the push that just ran saved its own state.
-            const fresh = await loadState(cwd);
-            fresh.spineRigs = { ...(fresh.spineRigs ?? {}), ...record };
-            await saveState(fresh, cwd);
+    }
+    // Folders an earlier upload bound a rig to that no rig binds to now (an
+    // export was deleted, or better matching moved it): take those rigs off, so
+    // the preview doesn't show one object's rig on another's parts. Skipped when
+    // nothing was detected at all, which is more likely a broken scan.
+    const bound = new Set(rigs.map((r) => r.folderPath.join('/')));
+    const stale = rigs.length ? Object.keys(state.spineRigs ?? {}).filter((k) => !bound.has(k)) : [];
+    let removed = [];
+    if (!opts.dryRun && stale.length > 0) {
+        try {
+            removed = await (opts.remove ?? removeSpineRigs)(stale.map((k) => k.split('/')));
+        }
+        catch {
+            /* tried again next run */
         }
     }
-    return { skeletons: found.skeletons.length, rigs: rigs.map((r) => outcomes.get(r)), skippedFiles: found.skipped };
+    if (Object.keys(record).length > 0 || removed.length > 0) {
+        // Re-read: the push that just ran saved its own state.
+        const fresh = await loadState(cwd);
+        const next = { ...(fresh.spineRigs ?? {}), ...record };
+        for (const k of removed)
+            if (!bound.has(k))
+                delete next[k];
+        fresh.spineRigs = next;
+        await saveState(fresh, cwd);
+    }
+    return {
+        skeletons: found.skeletons.length,
+        rigs: rigs.map((r) => outcomes.get(r)),
+        skippedFiles: found.skipped,
+        removed: opts.dryRun ? stale : removed,
+    };
 }
 function spineErrorMessage(e) {
     if (e instanceof ApiError && e.status === 404)
@@ -188,6 +212,9 @@ export async function spineCommand(opts = {}) {
     }
     for (const o of outcome.rigs)
         console.log(formatSpineOutcome(o));
+    for (const k of outcome.removed) {
+        console.log(`${icon(opts.dryRun ? 'ghost' : 'ok')} ${kleur.dim(`${opts.dryRun ? 'Would take' : 'Took'} the old Spine rig off ${k}/`)}`);
+    }
     if (opts.dryRun) {
         console.log();
         console.log(ui.dryRun());

package/dist/util/spine.js

@@ -277,6 +277,18 @@ export function rigHash(rig) {
     return h.digest('hex');
 }
 const label = (names) => `${names[names.length - 1]}/`;
+/** Folder-name key: `container_item`, `Container Item` and `container-item` all read `containeritem`. */
+const folderKey = (name) => name.toLowerCase().replace(/[^a-z0-9]+/g, '');
+/**
+ * Folder names a rig's parts are likely kept under, best first: the rig name,
+ * then the rig name past its first word (King Rabbit's `glyph_heart.json`
+ * draws the parts in `heart/`). Not the skeleton's directory: that is often
+ * generic (`base/`).
+ */
+export function rigFolderNames(rigName) {
+    const rest = rigName.replace(/^[^_\-. ]+[_\-. ]+/, '');
+    return [...new Set([folderKey(rigName), folderKey(rest)])].filter(Boolean);
+}
 /**
  * Turns skeleton files + the synced PNGs into rigs bound to library folders.
  * Rigs whose images match no synced folder are left out.
@@ -293,13 +305,29 @@ export function detectRigs(skeletons, pngs, base = process.cwd()) {
         const keys = new Set(files.flatMap((f) => f.images.map(imageKey)));
         if (keys.size === 0)
             continue;
-        // Skin folders: mostly made of this rig's images.
-        const skins = [];
-        for (const f of folders.values()) {
-            const hits = countIn(f.pngs, keys);
-            if (hits > 0 && hits >= SKIN_SHARE * f.pngs.size)
-                skins.push({ f, hits });
+        const name = rigName(files.map((f) => basename(f.abs)), basename(dirname(files[0].abs)));
+        // Skin folders: a folder named like the rig (or one directly below it)
+        // that holds any of its images, else folders mostly made of its images.
+        // Part names alone are too generic for props (`shadow`, `glow`, `base`):
+        // `bubble` would bind to `Environment/`, `mushrooms` to `turret/`.
+        const inFolders = (keep) => {
+            const out = [];
+            for (const f of folders.values()) {
+                const hits = countIn(f.pngs, keys);
+                if (hits > 0 && keep(f, hits))
+                    out.push({ f, hits });
+            }
+            return out;
+        };
+        let skins = [];
+        for (const key of rigFolderNames(name)) {
+            const named = (segments) => segments.length > 0 && folderKey(segments[segments.length - 1]) === key;
+            skins = inFolders((f) => named(f.segments) || named(f.segments.slice(0, -1)));
+            if (skins.length)
+                break;
         }
+        if (skins.length === 0)
+            skins = inFolders((f, hits) => hits >= SKIN_SHARE * f.pngs.size);
         if (skins.length === 0)
             continue;
         // Several skin folders side by side → bind to their parent (`rabbit/`).
@@ -341,7 +369,6 @@ export function detectRigs(skeletons, pngs, base = process.cwd()) {
         }
         if (baseFolder && baseFolder.hits < COVER_SHARE * keys.size)
             baseFolder = null;
-        const name = rigName(files.map((f) => basename(f.abs)), basename(dirname(files[0].abs)));
         const baseFolderPath = baseFolder?.f.segments ?? null;
         rigs.push({
             name,

package/package.json

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