pixelkiln 0.89.1 → 0.89.2

package/dist/cli.js

@@ -772,8 +772,9 @@ function specHash(spec, styleImageHashes, providerOptionIdentity = spec.provider
       uiColorPalette: spec.uiColorPalette,
       // The older terrain knobs (terrainMode, terrainTransitionSize, and the
       // rest) were never part of this hash, and adding them now would make
-      // every existing terrain entry stale. The Pro shape controls added
-      // after them are identity, each only when set.
+      // every existing terrain entry stale; terrainSettings below records
+      // them per entry instead. The Pro shape controls added after them are
+      // identity, each only when set.
       terrainRoundness: spec.terrainRoundness,
       terrainBoundaryAmplitude: spec.terrainBoundaryAmplitude,
       terrainBoundarySeed: spec.terrainBoundarySeed,
@@ -899,6 +900,22 @@ function specHash(spec, styleImageHashes, providerOptionIdentity = spec.provider
     })
   );
 }
+function terrainSettings(spec) {
+  if (spec.generator !== "terrain") return void 0;
+  const settings = {
+    terrainMode: spec.terrainMode,
+    terrainShapeStyle: spec.terrainShapeStyle,
+    terrainSpreadX: spec.terrainSpreadX,
+    terrainSlopeSize: spec.terrainSlopeSize,
+    terrainRaggedness: spec.terrainRaggedness,
+    terrainTransitionSize: spec.terrainTransitionSize,
+    terrainView: spec.terrainView,
+    terrainLowerDescription: spec.terrainLowerDescription,
+    terrainUpperDescription: spec.terrainUpperDescription,
+    terrainTransitionDescription: spec.terrainTransitionDescription
+  };
+  return Object.fromEntries(Object.entries(settings).filter(([, value]) => value !== void 0));
+}
 
 // src/pipeline/mirror.ts
 import { mkdir as mkdir2, readFile as readFile2, rename as rename2, writeFile as writeFile2 } from "fs/promises";
@@ -2224,6 +2241,18 @@ var LockTerrainConnectSchema = z.record(
   TerrainSideSchema,
   z.object({ sourceAssetId: z.string().min(1), sourceObjectId: z.string().min(1) }).strict()
 );
+var LockTerrainSettingsSchema = z.object({
+  terrainMode: z.string().optional(),
+  terrainShapeStyle: z.string().optional(),
+  terrainSpreadX: z.number().optional(),
+  terrainSlopeSize: z.number().optional(),
+  terrainRaggedness: z.number().optional(),
+  terrainTransitionSize: z.number().optional(),
+  terrainView: z.string().optional(),
+  terrainLowerDescription: z.string().optional(),
+  terrainUpperDescription: z.string().optional(),
+  terrainTransitionDescription: z.string().optional()
+});
 var LockHistoryEntrySchema = z.object({
   specHash: z.string(),
   generator: GeneratorSchema,
@@ -2248,6 +2277,8 @@ var LockHistoryEntrySchema = z.object({
   postprocess: PostprocessSchema.optional(),
   /** A connected terrain set's other sets; see LockEntrySchema.terrainConnect. */
   terrainConnect: LockTerrainConnectSchema.optional(),
+  /** A terrain set's settings outside specHash; see LockEntrySchema.terrainSettings. */
+  terrainSettings: LockTerrainSettingsSchema.optional(),
   /** When the replacement was submitted. */
   retiredAt: z.string()
 });
@@ -2322,6 +2353,14 @@ var LockEntrySchema = z.object({
    * Absent (not null) otherwise, so other entries do not grow the key.
    */
   terrainConnect: LockTerrainConnectSchema.optional(),
+  /**
+   * For a terrain set: the settings it was submitted with that `specHash`
+   * leaves out (see LockTerrainSettingsSchema). The plan marks the entry
+   * stale when the manifest's differ. Absent on entries submitted before
+   * it was recorded, which are taken as current, and on every other
+   * generator's entries.
+   */
+  terrainSettings: LockTerrainSettingsSchema.optional(),
   /**
    * Output hashes owned by the previous generation while its replacement is
    * pending. They authorize replacing only unchanged PixelKiln-owned files.
@@ -4905,6 +4944,15 @@ function changedTerrainConnection(spec, entry, lock) {
   }
   return null;
 }
+function changedTerrainSettings(spec, entry) {
+  const recorded = entry.terrainSettings;
+  const current = terrainSettings(spec);
+  if (!recorded || !current) return null;
+  const show = (value) => value === void 0 ? "unset" : JSON.stringify(value);
+  const fields = /* @__PURE__ */ new Set([...Object.keys(recorded), ...Object.keys(current)]);
+  const changes = [...fields].filter((field) => recorded[field] !== current[field]).map((field) => `${field} changed from ${show(recorded[field])} to ${show(current[field])}`);
+  return changes.length ? changes.join("; ") : null;
+}
 function resumeCommandForStatus(status) {
   if (status === "pending" || status === "processing") return "poll";
   if (status === "review") return "pick";
@@ -4937,6 +4985,7 @@ async function buildPlan(specs, lock, opts = {}) {
     let state;
     let reason;
     const changedConnection = entry ? changedTerrainConnection(spec, entry, lock) : null;
+    const changedSettings = entry ? changedTerrainSettings(spec, entry) : null;
     const revision = await inspectRevisionReadiness(spec, lock);
     if (revision && !revision.ready) {
       state = "blocked";
@@ -4975,6 +5024,9 @@ async function buildPlan(specs, lock, opts = {}) {
     } else if (changedConnection) {
       state = "stale";
       reason = `connected set ${changedConnection} was regenerated; draw this set from its new terrain`;
+    } else if (changedSettings) {
+      state = "stale";
+      reason = changedSettings;
     } else if (entry.status === "download-failed") {
       state = "recoverable";
       const force = entry.error?.includes("pass --force") ? " --force" : "";
@@ -17394,6 +17446,7 @@ function retireGeneration(entry, retiredAt) {
     provider: entry.provider,
     postprocess: entry.postprocess,
     ...entry.terrainConnect ? { terrainConnect: entry.terrainConnect } : {},
+    ...entry.terrainSettings ? { terrainSettings: entry.terrainSettings } : {},
     retiredAt
   };
 }
@@ -17488,6 +17541,9 @@ async function revertGeneration(provider, spec, lock, lockPath, opts) {
     // A connected set comes back with the connection it was drawn from, so
     // the plan compares the restored generation, not the one it replaced.
     terrainConnect: generation.terrainConnect,
+    // Likewise its settings; a generation from before they were recorded
+    // comes back with none and is taken as current.
+    terrainSettings: generation.terrainSettings,
     history
   });
   await saveLock(lockPath, lock);
@@ -18889,6 +18945,9 @@ async function submit(provider, loaded, items, lock, lockPath, opts = {}) {
         referenceSha256: spec.character.outfit.reference.sha256
       } : null,
       terrainConnect: spec.terrainConnect ? terrainConnect : void 0,
+      // The terrain knobs specHash leaves out, so the plan can tell a
+      // changed one; undefined (no key) for every other generator.
+      terrainSettings: terrainSettings(spec),
       status: "pending",
       jobId: previousJobId ?? null,
       ...previousJobId ? { submissionComplete: false } : { submissionComplete: void 0 },