pixelkiln 0.85.0 → 0.86.0

package/dist/cli.js

@@ -777,6 +777,7 @@ function specHash(spec, styleImageHashes, providerOptionIdentity = spec.provider
       revision: spec.revision ? {
         mode: spec.revision.mode,
         from: spec.revision.sourceAssetId,
+        fromStyle: spec.revision.sourceStyleId,
         sourceSha256: spec.revision.sourceSha256,
         maskSha256: spec.revision.maskSha256,
         strength: spec.revision.strength,
@@ -1126,8 +1127,16 @@ var RevisionDitheringSchema = z.enum(["none", "2x2", "4x4", "8x8"]);
 var RevisionSchema = z.object({
   /** What kind of controlled change the provider workflow performs. */
   mode: RevisionModeSchema,
-  /** Parent asset id in the same style. */
+  /** Parent asset id. It lives in this asset's own style unless `fromStyle` names another. */
   from: z.string().min(1),
+  /**
+   * The style the parent lives in, when it is not this asset's own. The
+   * parent is generated by that style's provider and model, and this
+   * revision starts from its output file, so a chain (generate with one
+   * model, clean up with another) is declared instead of restated by hand.
+   * Styles may depend on one another but not in a cycle.
+   */
+  fromStyle: z.string().min(1).optional(),
   /** Manifest-relative black/white PNG. Required only for masked inpainting. */
   mask: z.string().min(1).optional(),
   /** Provider-neutral edit strength. The active adapter must bind it explicitly. */
@@ -1988,6 +1997,7 @@ var LockEntrySchema = z.object({
   revision: z.object({
     mode: RevisionModeSchema,
     sourceAssetId: z.string().min(1),
+    sourceStyleId: z.string().min(1).optional(),
     sourceSha256: z.string().regex(/^[0-9a-f]{64}$/),
     maskSha256: z.string().regex(/^[0-9a-f]{64}$/).optional(),
     strength: z.number().min(0).max(1).optional(),
@@ -4405,7 +4415,7 @@ async function inspectRevision(spec, lock, seen) {
   if (!dependency.ready) {
     return {
       ready: false,
-      reason: `revision source ${spec.styleId}/${revision.sourceAssetId} is not ready: ${dependency.reason}`
+      reason: `revision source ${revision.sourceStyleId ?? spec.styleId}/${revision.sourceAssetId} is not ready: ${dependency.reason}`
     };
   }
   if (revision.sourceMembers) {
@@ -10836,13 +10846,24 @@ ${issues}`);
       }
     }
     if (asset.revision) {
-      if (!parsed.data.assets[asset.revision.from]) {
+      const parent = parsed.data.assets[asset.revision.from];
+      if (!parent) {
         unknownReferences.push(
           `assets.${assetId}.revision.from: unknown asset "${asset.revision.from}"`
         );
       } else if (asset.revision.from === assetId) {
         unknownReferences.push(`assets.${assetId}.revision.from: an asset cannot revise itself`);
       }
+      const fromStyle = asset.revision.fromStyle;
+      if (fromStyle) {
+        if (!styleIds.has(fromStyle)) {
+          unknownReferences.push(`assets.${assetId}.revision.fromStyle: unknown style "${fromStyle}"`);
+        } else if (parent && parent.styles.length && !parent.styles.includes(fromStyle)) {
+          unknownReferences.push(
+            `assets.${assetId}.revision.fromStyle: "${asset.revision.from}" is not in style "${fromStyle}"`
+          );
+        }
+      }
     }
     for (const shape of ["state", "animation"]) {
       const of = asset[shape]?.of;
@@ -10958,7 +10979,7 @@ async function resolveSpecs(loaded, filter) {
     return provider;
   };
   const specs = [];
-  const styleIds = Object.keys(manifest.styles).filter(
+  const requestedStyleIds = Object.keys(manifest.styles).filter(
     (id) => !filter?.styles?.length || filter.styles.includes(id)
   );
   for (const unknownStyle of filter?.styles ?? []) {
@@ -10983,6 +11004,39 @@ async function resolveSpecs(loaded, filter) {
       current = parentAssetId(manifest.assets[current]);
     }
   }
+  const styleDependencies = /* @__PURE__ */ new Map();
+  for (const styleId of Object.keys(manifest.styles)) {
+    const needed = /* @__PURE__ */ new Set();
+    for (const assetId of resolutionAssetIds) {
+      const asset = manifest.assets[assetId];
+      if (asset?.styles.length && !asset.styles.includes(styleId)) continue;
+      const fromStyle = asset?.revision?.fromStyle;
+      if (fromStyle && fromStyle !== styleId) needed.add(fromStyle);
+    }
+    styleDependencies.set(styleId, needed);
+  }
+  const styleIds = [];
+  const emitStyles = new Set(requestedStyleIds);
+  {
+    const placed = /* @__PURE__ */ new Set();
+    const visiting = [];
+    const place = (styleId) => {
+      if (placed.has(styleId)) return;
+      const cycleStart = visiting.indexOf(styleId);
+      if (cycleStart >= 0) {
+        throw new Error(
+          `Styles revise each other in a cycle: ${[...visiting.slice(cycleStart), styleId].join(" -> ")}. revision.fromStyle must form a chain, not a loop.`
+        );
+      }
+      visiting.push(styleId);
+      for (const dependency of styleDependencies.get(styleId) ?? []) place(dependency);
+      visiting.pop();
+      placed.add(styleId);
+      styleIds.push(styleId);
+    };
+    for (const styleId of requestedStyleIds) place(styleId);
+  }
+  const styleFinalizers = /* @__PURE__ */ new Map();
   const styleImageCache = /* @__PURE__ */ new Map();
   async function loadStyleImage(rel, what = "Style image") {
     const abs = path14.resolve(root, rel);
@@ -11370,7 +11424,8 @@ async function resolveSpecs(loaded, filter) {
             `Provider "${activeProvider.id}" does not support ${asset.revision.mode} revisions`
           );
         }
-        const sourceSpec = await finalize(asset.revision.from);
+        const sourceStyleId = asset.revision.fromStyle && asset.revision.fromStyle !== styleId ? asset.revision.fromStyle : void 0;
+        const sourceSpec = sourceStyleId ? await styleFinalizers.get(sourceStyleId)(asset.revision.from) : await finalize(asset.revision.from);
         const sourceStem = sourceSpec.quality?.outFile ?? (sourceSpec.source ? path14.resolve(root, sourceSpec.source) : sourceSpec.outFile);
         const sourceMembers = await revisionSourceMembers(sourceStem, `revision source ${asset.revision.from}`);
         const sourceFile = sourceMembers?.[0]?.file ?? sourceStem;
@@ -11392,6 +11447,7 @@ async function resolveSpecs(loaded, filter) {
         resolved.revision = {
           mode: asset.revision.mode,
           sourceAssetId: asset.revision.from,
+          ...sourceStyleId ? { sourceStyleId } : {},
           sourceFile,
           sourceSha256: sourceImage?.hash ?? null,
           sourceWidth: sourceImage?.width ?? null,
@@ -11513,6 +11569,8 @@ async function resolveSpecs(loaded, filter) {
       finalized.add(assetId);
       return resolved;
     };
+    styleFinalizers.set(styleId, finalize);
+    if (!emitStyles.has(styleId)) continue;
     for (const assetId of Object.keys(manifest.assets)) {
       if (!requestedAssetIds.has(assetId) || !styleSpecs.has(assetId)) continue;
       specs.push(await finalize(assetId));
@@ -15913,7 +15971,7 @@ async function buildGallerySnapshot(opts) {
       recordedSpecHash: entry?.specHash ?? null,
       currentSpecHash: spec.specHash,
       revision: entry?.revision ?? null,
-      revisionParentKey: spec.revision ? lockKey(spec.styleId, spec.revision.sourceAssetId) : entry?.revision ? lockKey(spec.styleId, entry.revision.sourceAssetId) : null,
+      revisionParentKey: spec.revision ? lockKey(spec.revision.sourceStyleId ?? spec.styleId, spec.revision.sourceAssetId) : entry?.revision ? lockKey(entry.revision.sourceStyleId ?? spec.styleId, entry.revision.sourceAssetId) : null,
       mirrorOfKey: spec.mirror ? lockKey(spec.styleId, spec.mirror.sourceAssetId) : entry?.mirror ? lockKey(spec.styleId, entry.mirror.sourceAssetId) : null,
       skeleton: spec.revision?.mode === "animate-skeleton" && spec.revision.keypointsFile ? {
         keypointsFile: portableOutputPath(spec.revision.keypointsFile, root),
@@ -15983,7 +16041,7 @@ async function buildGallerySnapshot(opts) {
       recordedSpecHash: entry.specHash,
       currentSpecHash: null,
       revision: entry.revision,
-      revisionParentKey: entry.revision ? lockKey(entry.styleId, entry.revision.sourceAssetId) : null,
+      revisionParentKey: entry.revision ? lockKey(entry.revision.sourceStyleId ?? entry.styleId, entry.revision.sourceAssetId) : null,
       mirrorOfKey: entry.mirror ? lockKey(entry.styleId, entry.mirror.sourceAssetId) : null,
       skeleton: null,
       character: describeCharacter(void 0, entry),
@@ -16919,6 +16977,7 @@ async function submit(provider, loaded, items, lock, lockPath, opts = {}) {
       revision: spec.revision ? {
         mode: spec.revision.mode,
         sourceAssetId: spec.revision.sourceAssetId,
+        ...spec.revision.sourceStyleId ? { sourceStyleId: spec.revision.sourceStyleId } : {},
         sourceSha256: spec.revision.sourceSha256,
         ...spec.revision.maskSha256 ? { maskSha256: spec.revision.maskSha256 } : {},
         ...spec.revision.strength == null ? {} : { strength: spec.revision.strength },