pixelkiln 0.89.3 → 0.89.5

package/dist/client/gallery.js

@@ -362,6 +362,15 @@
   }
 
   // src/gallery/client/src/form-kit.ts
+  var skeletonV3Allowed = (engine) => engine !== "standard";
+  var defaultLoopMode = (engine) => skeletonV3Allowed(engine) ? "skeleton-v3" : "template";
+  function syncSkeletonOption(select, engine) {
+    const option = [...select.options].find((o) => o.value === "skeleton-v3");
+    if (!option) return;
+    const allowed = skeletonV3Allowed(engine);
+    option.disabled = !allowed;
+    option.title = allowed ? "" : "PixelLab poses a template only onto a v3 character. A standard base has no 3D skeleton; use template.";
+  }
   var nextStep = () => GENERATION ? "Generate it from its record when you are ready." : "Nothing is generated until you run pixelkiln gen.";
   async function addAssetAndOpen(body, where, what = "Added to the manifest.") {
     S.snap = await postEdit(body);
@@ -455,7 +464,9 @@
       );
     }
     mode.append(new Option("v3 (text-described)", "v3"), new Option("pro (sequential, high quality)", "pro"));
-    mode.value = isCharacter ? "skeleton-v3" : "v3";
+    const engineId = isCharacter ? c.kind === "animation" ? S.snap.styles.find((st) => st.id === item.styleId && st.project === (item.project ?? null))?.characterMode : c.mode : null;
+    if (isCharacter) syncSkeletonOption(mode, engineId);
+    mode.value = isCharacter ? defaultLoopMode(engineId) : "v3";
     const template = el("input");
     template.type = "text";
     template.placeholder = "e.g. walk, breathing-idle";
@@ -5204,6 +5215,7 @@
     const characterStyles = () => S.snap.styles.filter((s) => s.generator === "character" && s.project === projectId());
     const chosenEngine = () => ENGINES.find((e) => e.id === engine.value);
     const isNewStyle = () => style.value === "";
+    const loopEngine = () => isNewStyle() ? chosenEngine().id : characterStyles().find((s) => s.id === style.value)?.characterMode ?? "standard";
     const styleDirections = () => {
       if (isNewStyle()) return Number(directions.value) === 4 ? FOUR : COMPASS2;
       return COMPASS2;
@@ -5233,7 +5245,10 @@
       newStyle.hidden = !isNewStyle();
       styleId.required = isNewStyle();
       if (!outDirTouched) outDir.value = "art/" + (styleId.value.trim() || "characters");
-      for (const row2 of loops2) syncLoopDirections(row2);
+      for (const row2 of loops2) {
+        syncLoopDirections(row2);
+        syncLoopEngine(row2);
+      }
     }
     function syncLoopDirections(row2) {
       const allowed = styleDirections();
@@ -5243,6 +5258,13 @@
         if (wrap.hidden) box.checked = false;
       }
     }
+    function syncLoopEngine(row2) {
+      const engineId = loopEngine();
+      syncSkeletonOption(row2.mode, engineId);
+      if (!row2.picked) row2.mode.value = defaultLoopMode(engineId);
+      else if (row2.mode.value === "skeleton-v3" && !skeletonV3Allowed(engineId)) row2.mode.value = "template";
+      syncLoopMode(row2);
+    }
     function syncLoopMode(row2) {
       const t = templated(row2.mode.value);
       row2.what.placeholder = t ? "template, e.g. walk, breathing-idle, running-8-frames" : 'the motion, e.g. "swings a sword overhead"';
@@ -5305,7 +5327,7 @@
       id.value = defaults.id ?? "";
       const mode = el("select");
       for (const m of LOOP_MODES) mode.append(new Option(m.label, m.id));
-      mode.value = defaults.mode ?? "skeleton-v3";
+      mode.value = defaults.mode ?? defaultLoopMode(loopEngine());
       const what = el("input");
       what.type = "text";
       what.required = true;
@@ -5325,7 +5347,7 @@
       remove.type = "button";
       const preview = el("div", "studio-tpl-preview");
       preview.hidden = true;
-      const row2 = { id, mode, what, directions: boxes, wrap, preview };
+      const row2 = { id, mode, picked: defaults.mode !== void 0, what, directions: boxes, wrap, preview };
       what.addEventListener("input", () => syncPreview(row2));
       remove.onclick = () => {
         loops2.splice(loops2.indexOf(row2), 1);
@@ -5334,6 +5356,7 @@
         keepDraft();
       };
       mode.onchange = () => {
+        row2.picked = true;
         syncLoopMode(row2);
         schedulePrice();
       };
@@ -5342,8 +5365,8 @@
       wrap.append(line, preview, dirs, remove);
       loopList.append(wrap);
       loops2.push(row2);
-      syncLoopMode(row2);
       syncLoopDirections(row2);
+      syncLoopEngine(row2);
     }
     function edits() {
       const out = [];
@@ -5646,8 +5669,8 @@
       note.append(discard);
       form.prepend(note);
     } else {
-      addLoopRow({ id: "walk", mode: "skeleton-v3", what: "walk", directions: ["south", "west", "north"] });
-      addLoopRow({ id: "idle", mode: "skeleton-v3", what: "breathing-idle", directions: ["south"] });
+      addLoopRow({ id: "walk", what: "walk", directions: ["south", "west", "north"] });
+      addLoopRow({ id: "idle", what: "breathing-idle", directions: ["south"] });
     }
     updatePrice();
     setTimeout(() => baseId.focus(), 0);

package/dist/index.cjs

@@ -2438,7 +2438,8 @@ var PixelLabClient = class {
     });
     const text = await res.text();
     if (!res.ok) {
-      throw new PixelLabError(`${init?.method ?? "GET"} ${path39} \u2192 ${res.status}`, res.status, text);
+      const hint = res.status === 500 && text.includes("Failed to start any animation jobs") ? '; a skeleton-v3 loop needs a character with a stored 3D skeleton (a v3 base), use mode: "template" on a standard one' : "";
+      throw new PixelLabError(`${init?.method ?? "GET"} ${path39} \u2192 ${res.status}${hint}`, res.status, text);
     }
     if (!text) return {};
     try {
@@ -6064,6 +6065,11 @@ var PixelLabProvider = class _PixelLabProvider {
       if (character.animation.mode !== "template" && character.animation.mode !== "skeleton-v3" && !spec.prompt.trim()) {
         throw new Error(`${spec.styleId}/${spec.assetId} needs a prompt describing the motion, or a template`);
       }
+      if (character.animation.mode === "skeleton-v3" && character.mode === "standard") {
+        throw new Error(
+          `${spec.styleId}/${spec.assetId}: skeleton-v3 poses a template onto a 3D skeleton, which a ${character.mode} character has none of; use a v3 base (style mode: "v3"), or mode: "template" for this loop`
+        );
+      }
     }
   }
   validateObjectPro(spec, styleImages = []) {
@@ -6370,7 +6376,10 @@ var PixelLabProvider = class _PixelLabProvider {
           stateName: character.state_name ?? null,
           directions: character.directions,
           size: character.size,
-          updatedAt: character.updated_at ?? null
+          updatedAt: character.updated_at ?? null,
+          // Kept: this metadata replaces the submit-time `character` entry,
+          // and the job id is the only way to read the bill again later.
+          ...backgroundJobId ? { backgroundJobId } : {}
         }
       },
       billed: await this.billedForJob(backgroundJobId)
@@ -7021,7 +7030,12 @@ var PixelLabProvider = class _PixelLabProvider {
     if (!backgroundJobId) return null;
     try {
       const job = await this.client.getBackgroundJob(backgroundJobId);
-      return billedFromUsage(job.usage);
+      const nested = job.last_response?.billing_usage;
+      for (const usage of [job.usage, nested]) {
+        const billed = billedFromUsage(usage);
+        if (billed && !(billed.unit === "usd" && billed.amount === 0)) return billed;
+      }
+      return null;
     } catch {
       return null;
     }
@@ -17021,8 +17035,18 @@ GROUPS.forEach((g, gi) => {
     preview.loading = 'lazy';
     const index = document.createElement('span');
     index.className = 'idx';
-    index.textContent = (g.frameLabels?.[i] || String(i + 1)) + ' \xB7 ' +
-      g.width + '\xD7' + g.height + ' \xB7 ' + scaleLabel;
+    // A frame's own size, not the manifest's: a 96px loop of a 64px
+    // character is 96\xD796. Known up front for a cached file, else once loaded.
+    const label = (w, h) => {
+      index.textContent = (g.frameLabels?.[i] || String(i + 1)) + ' \xB7 ' + w + '\xD7' + h + ' \xB7 ' + scaleLabel;
+    };
+    const known = g.frameSizes?.[i];
+    label(known ? known.width : g.width, known ? known.height : g.height);
+    if (!known) {
+      preview.addEventListener('load', () => {
+        if (preview.naturalWidth && preview.naturalHeight) label(preview.naturalWidth, preview.naturalHeight);
+      }, { once: true });
+    }
     c.append(preview, index);
     if (g.recommendedIndex != null && i === recommended) {
       const badge = document.createElement('span');
@@ -17284,12 +17308,15 @@ async function prepareReview(provider, lock, opts = {}) {
       const urls = state.status === "review" ? state.candidateUrls : state.frameUrls;
       const frameUrls = [];
       const frameAssets = [];
+      const frameSizes = [];
       for (const [index, url] of urls.entries()) {
         const cached = await cachedFrame(url);
         if (!cached) {
           frameUrls.push(url);
+          frameSizes.push(null);
           continue;
         }
+        frameSizes.push(cached.contentType === "image/png" ? pngSize(await (0, import_promises19.readFile)(cached.path).catch(() => Buffer.alloc(0))) : null);
         const route = `${prefix}/review-frame/${encodeURIComponent(String(groups.length))}/${index}`;
         frameAssets.push([route, cached]);
         frameUrls.push(route);
@@ -17315,6 +17342,7 @@ async function prepareReview(provider, lock, opts = {}) {
         prompt: entry.prompt,
         reviewObjectId: entry.reviewObjectId,
         frameUrls,
+        ...frameSizes.some(Boolean) ? { frameSizes } : {},
         width: entry.width,
         height: entry.height,
         ...state.status === "review-set" ? {
@@ -19197,6 +19225,7 @@ async function buildGallerySnapshot(opts) {
       view: style?.view ?? null,
       noBackground: style?.noBackground ?? true,
       quality: Boolean(style?.quality),
+      characterMode: style?.generator === "character" ? style.mode ?? "standard" : null,
       characters: style?.generator === "character" || style?.generator === "objectPro" ? {
         bases: styleItems.filter((item) => item.character?.kind === "base").length,
         states: styleItems.filter((item) => item.character?.kind === "state").length,